diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-10-15 21:48:57 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@oath.com> | 2018-10-15 21:48:57 +0200 |
| commit | 3bc795f90c342de3d0be5ad5aa51897722acc3f2 (patch) | |
| tree | be74b16b6f5a4bcfe558700ccb9f0691b36261da /container-search/src/main/java/com/yahoo/search/federation | |
| parent | a4cb23e1a152e204d67f3cd5140590e9e037c885 (diff) | |
Avoid deprecated method
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/federation')
6 files changed, 14 insertions, 3 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 8abd6deb5f9..1607d108722 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 @@ -15,8 +15,10 @@ import com.yahoo.statistics.Statistics; * the provider and cache configurations to parameters which are passed upwards. * * @author bratseth + * @deprecated */ -@Deprecated +// TODO: Remove on Vespa 7 +@Deprecated // OK 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 22c2802c9e8..9f99a790df0 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,7 +19,8 @@ import java.util.Collections; * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a> * @author bratseth */ -@Deprecated +// TODO: Remove on Vespa 7 +@Deprecated // OK 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 dc0b5981e63..ee093adc6fc 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 @@ -90,8 +90,10 @@ import java.util.logging.Logger; * @author <a href="mailto:arnebef@yahoo-inc.com">Arne Bergene Fossaa</a> * @author bratseth + * @deprecated */ -@Deprecated +// TODO: Remove on Vespa 7 +@Deprecated // OK 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 d0f76b815dc..429c3dfff17 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 @@ -38,7 +38,9 @@ import java.util.logging.Logger; * * @author Arne Bergene Fossaa * @author bratseth + * @deprecated */ +// TODO: Remove on Vespa 7 @Deprecated public abstract class HTTPProviderSearcher extends HTTPSearcher { 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 80e785f0175..71bdaf76be8 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 @@ -135,7 +135,9 @@ import java.util.logging.Logger; * </dl> * * @author Arne Bergene Fossaa + * @deprecated */ +// TODO: Remove on Vespa 7 @Deprecated public abstract class HTTPSearcher extends ClusterSearcher<Connection> { 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 fdbee9c8f11..246732d0970 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 @@ -45,7 +45,9 @@ import edu.umd.cs.findbugs.annotations.Nullable; * * @author Arne Bergene Fossaa * @author Steinar Knutsen + * @deprecated */ +// TODO: Remove on Vespa 7 @Deprecated @Provides("Vespa") @After("*") |