Avoid deprecated method

11 files changed, 30 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java
index f750685d18e..0fa235709f9 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredSearcherHelper.java
@@ -11,6 +11,7 @@ import com.yahoo.search.federation.ProviderConfig;
  *
  * @author bratseth
  */
+// TODO: Remove on Vespa 7
 class ConfiguredSearcherHelper {
 
     /** No instantiation */
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java b/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java
index 0b2711eed1c..4f624a12547 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/Connection.java
@@ -8,7 +8,10 @@ package com.yahoo.search.federation.http;
  * The host and port state is immutable.
  *
  * @author bratseth
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class Connection {
 
     private String host;
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/GzipDecompressingEntity.java b/container-search/src/main/java/com/yahoo/search/federation/http/GzipDecompressingEntity.java
index c686265f65d..0407ddeca1b 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/GzipDecompressingEntity.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/GzipDecompressingEntity.java
@@ -15,8 +15,11 @@ import java.util.zip.GZIPInputStream;
 /**
  * Used by HTTPSearcher when talking to services returning compressed content.
  *
- * @author <a href="mailto:mainak@yahoo-inc.com">Mainak Mandal</a>
+ * @author Mainak Mandal
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class GzipDecompressingEntity extends HttpEntityWrapper {
 
     private static class Resources {
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPParameters.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPParameters.java
index 99dae4e20aa..a7b32678c1a 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPParameters.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPParameters.java
@@ -15,7 +15,10 @@ import com.yahoo.search.federation.ProviderConfig;
  * A set of parameters for talking to an http backend
  *
  * @author bratseth
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public final class HTTPParameters {
 
     public static final String RETRIES = "com.yahoo.search.federation.http.retries";
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPProviderSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPProviderSearcher.java
index 429c3dfff17..c72c2f26a1c 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPProviderSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPProviderSearcher.java
@@ -41,7 +41,7 @@ import java.util.logging.Logger;
  * @deprecated
  */
 // TODO: Remove on Vespa 7
-@Deprecated
+@Deprecated // OK
 public abstract class HTTPProviderSearcher extends HTTPSearcher {
 
     private final Counter emptyResults;
@@ -91,7 +91,7 @@ public abstract class HTTPProviderSearcher extends HTTPSearcher {
     }
 
     /** @deprecated this method does nothing */
-    @Deprecated
+    @Deprecated // OK
     protected void configureCache(final QrBinaryCacheConfig cacheConfig,final QrBinaryCacheRegionConfig regionConfig) {
     }
 
@@ -255,7 +255,7 @@ public abstract class HTTPProviderSearcher extends HTTPSearcher {
     /**
      * @deprecated the cache key is ignored as there is no built-in caching support
      */
-    @Deprecated
+    @Deprecated // OK
     public abstract Map<String, String> getCacheKey(Query q);
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
index 71bdaf76be8..edf347bd84e 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPSearcher.java
@@ -138,7 +138,7 @@ import java.util.logging.Logger;
  * @deprecated
  */
 // TODO: Remove on Vespa 7
-@Deprecated
+@Deprecated // OK
 public abstract class HTTPSearcher extends ClusterSearcher<Connection> {
 
     protected static final String YCA_HTTP_HEADER = "Yahoo-App-Auth";
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/TimedHttpEntity.java b/container-search/src/main/java/com/yahoo/search/federation/http/TimedHttpEntity.java
index 04108784cdb..03ffe2b8a9c 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/TimedHttpEntity.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/TimedHttpEntity.java
@@ -12,7 +12,10 @@ import org.apache.http.HttpEntity;
  * Wrapper for adding timeout to an HttpEntity instance.
  *
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class TimedHttpEntity implements HttpEntity {
     /**
      * The wrapped entity. Never null.
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/TimedStream.java b/container-search/src/main/java/com/yahoo/search/federation/http/TimedStream.java
index 0bef2e97d8c..77a42ee0a34 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/TimedStream.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/TimedStream.java
@@ -8,7 +8,10 @@ import java.io.InputStream;
  * A stream which throws a TimeoutException if query timeout has been reached.
  *
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class TimedStream extends InputStream {
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/TimeoutException.java b/container-search/src/main/java/com/yahoo/search/federation/http/TimeoutException.java
index 1b49f220d42..18dd59ec37b 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/TimeoutException.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/TimeoutException.java
@@ -5,7 +5,10 @@ package com.yahoo.search.federation.http;
  * Timeout marker for slow HTTP connections.
  *
  * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @deprecated
  */
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class TimeoutException extends RuntimeException {
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
index 2bfec008761..3a0db9b76de 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/QueryMarshaller.java
@@ -11,7 +11,10 @@ import com.yahoo.prelude.query.*;
  *
  * @author Steinar Knutsen
  * @author Rong-En Fan
+ * @deprecated use YQL
  */
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 public class QueryMarshaller {
 
     private boolean atRoot = true;
diff --git a/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
index dd20472474d..a6aec30b496 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/ResultBuilder.java
@@ -29,8 +29,10 @@ import static com.yahoo.text.Lowercase.toLowerCase;
  * Parse Vespa XML results and create Result instances.
  *
  * @author Steinar Knutsen
+ * @deprecated
  */
-// Ripe for a rewrite or major refactoring.
+// TODO: Remove on Vespa 7
+@Deprecated // OK
 @SuppressWarnings("deprecation")
 public class ResultBuilder extends DefaultHandler {
     private static final String ERROR = "error";