Deprecate HttpSearcher and its subclasses.

6 files changed, 7 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
index f201861bc0c..8abd6deb5f9 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPClientSearcher.java
@@ -16,6 +16,7 @@ import com.yahoo.statistics.Statistics;
  *
  * @author bratseth
  */
+@Deprecated
 public abstract class ConfiguredHTTPClientSearcher extends HTTPClientSearcher {
 
     /** Create this from a configuraton */
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
index c2a7e6fa640..22c2802c9e8 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/ConfiguredHTTPProviderSearcher.java
@@ -19,6 +19,7 @@ import java.util.Collections;
  * @author  <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a>
  * @author  bratseth
  */
+@Deprecated
 public abstract class ConfiguredHTTPProviderSearcher extends HTTPProviderSearcher {
 
     /** Create this from a configuraton */
diff --git a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPClientSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPClientSearcher.java
index 3d36994984d..dc0b5981e63 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/http/HTTPClientSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/http/HTTPClientSearcher.java
@@ -91,6 +91,7 @@ import java.util.logging.Logger;
  * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a>
  * @author bratseth
  */
+@Deprecated
 public abstract class HTTPClientSearcher extends HTTPSearcher {
 
     static final CompoundName REQUEST_META_CARRIER = new CompoundName("com.yahoo.search.federation.http.HTTPClientSearcher_requestMeta");
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 5348a687253..d0f76b815dc 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
@@ -39,6 +39,7 @@ import java.util.logging.Logger;
  * @author Arne Bergene Fossaa
  * @author bratseth
  */
+@Deprecated
 public abstract class HTTPProviderSearcher extends HTTPSearcher {
 
     private final Counter emptyResults;
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 3707d7fa77a..80e785f0175 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
@@ -136,6 +136,7 @@ import java.util.logging.Logger;
  *
  * @author Arne Bergene Fossaa
  */
+@Deprecated
 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/vespa/VespaSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/vespa/VespaSearcher.java
index dfa4f9ad9bb..b59578ab6a3 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/vespa/VespaSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/vespa/VespaSearcher.java
@@ -9,6 +9,7 @@ import java.net.URL;
 import java.util.Map;
 import java.util.Set;
 
+import com.yahoo.search.federation.http.ConfiguredHTTPProviderSearcher;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
@@ -28,7 +29,6 @@ import com.yahoo.search.Result;
 import com.yahoo.search.cache.QrBinaryCacheConfig;
 import com.yahoo.search.cache.QrBinaryCacheRegionConfig;
 import com.yahoo.search.federation.ProviderConfig;
-import com.yahoo.search.federation.http.ConfiguredHTTPProviderSearcher;
 import com.yahoo.search.federation.http.Connection;
 import com.yahoo.search.query.QueryTree;
 import com.yahoo.search.query.textserialize.TextSerialize;
@@ -46,6 +46,7 @@ import edu.umd.cs.findbugs.annotations.Nullable;
  * @author Arne Bergene Fossaa
  * @author Steinar Knutsen
  */
+@Deprecated
 @Provides("Vespa")
 @After("*")
 public class VespaSearcher extends ConfiguredHTTPProviderSearcher {