From c337231793871102aaee4600ac9eaaa5ec2d5f66 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 10 Jun 2022 14:06:53 +0200 Subject: Remove deprecated methos on Vespa 8 --- client/src/main/java/ai/vespa/client/dsl/FixedQuery.java | 1 - container-search/abi-spec.json | 2 -- .../src/main/java/com/yahoo/search/cluster/ClusterMonitor.java | 7 ------- .../src/main/java/com/yahoo/search/searchchain/Execution.java | 8 -------- 4 files changed, 18 deletions(-) diff --git a/client/src/main/java/ai/vespa/client/dsl/FixedQuery.java b/client/src/main/java/ai/vespa/client/dsl/FixedQuery.java index 1c1b3b016b0..63d06e79998 100644 --- a/client/src/main/java/ai/vespa/client/dsl/FixedQuery.java +++ b/client/src/main/java/ai/vespa/client/dsl/FixedQuery.java @@ -94,7 +94,6 @@ public class FixedQuery { return this; } - @Deprecated public FixedQuery query(String query) { this.param("query", query); return this; diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index b738c697d89..7fe1702be8f 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -2107,7 +2107,6 @@ "public" ], "methods": [ - "public void (com.yahoo.search.cluster.NodeManager)", "public void (com.yahoo.search.cluster.NodeManager, boolean)", "public void start()", "public com.yahoo.search.cluster.MonitorConfiguration getConfiguration()", @@ -8122,7 +8121,6 @@ ], "methods": [ "public void (com.yahoo.search.searchchain.SearchChainRegistry, com.yahoo.prelude.IndexFacts, com.yahoo.search.schema.SchemaInfo, com.yahoo.language.process.SpecialTokenRegistry, com.yahoo.search.rendering.RendererRegistry, com.yahoo.language.Linguistics, java.util.concurrent.Executor)", - "public void (com.yahoo.search.searchchain.SearchChainRegistry, com.yahoo.prelude.IndexFacts, com.yahoo.language.process.SpecialTokenRegistry, com.yahoo.search.rendering.RendererRegistry, com.yahoo.language.Linguistics, java.util.concurrent.Executor)", "public static com.yahoo.search.searchchain.Execution$Context createContextStub()", "public static com.yahoo.search.searchchain.Execution$Context createContextStub(com.yahoo.search.searchchain.SearchChainRegistry)", "public static com.yahoo.search.searchchain.Execution$Context createContextStub(com.yahoo.prelude.IndexFacts)", diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java index 4bb1818e5d1..a862e6c2d98 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java @@ -38,13 +38,6 @@ public class ClusterMonitor { /** A map from Node to corresponding MonitoredNode */ private final Map> nodeMonitors = Collections.synchronizedMap(new java.util.LinkedHashMap<>()); - /** @deprecated It is not advised to start the monitoring thread in the constructor. - * Use ClusterMonitor(NodeManager manager, false) and explicit start(). */ - @Deprecated - public ClusterMonitor(NodeManager manager) { - this(manager, true); - } - public ClusterMonitor(NodeManager manager, boolean startPingThread) { nodeManager = manager; monitorThread = new MonitorThread("search.clustermonitor." + manager.name()); diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java index 576ac8449b1..02537e63a6b 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java @@ -130,14 +130,6 @@ public class Execution extends com.yahoo.processing.execution.Execution { this.executor = Objects.requireNonNull(executor, "The executor cannot be null"); } - /** @deprecated pass schemaInfo */ - @Deprecated - public Context(SearchChainRegistry searchChainRegistry, IndexFacts indexFacts, - SpecialTokenRegistry tokenRegistry, RendererRegistry rendererRegistry, Linguistics linguistics, - Executor executor) { - this(searchChainRegistry, indexFacts, SchemaInfo.empty(), tokenRegistry, rendererRegistry, linguistics, executor); - } - /** Creates a Context instance where everything except the given arguments is empty. This is for unit testing.*/ public static Context createContextStub() { return createContextStub(null, null, SchemaInfo.empty(), null); -- cgit v1.2.3