From 2a64c712743594812dbf96ec5ff8d3b7482c4748 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 7 Jul 2022 12:19:09 +0200 Subject: Deprecate ConfigGetter --- .../yahoo/config/subscription/ConfigGetter.java | 3 +- .../config/subscription/ConfigGetterTest.java | 1 + .../yahoo/config/subscription/FunctionTest.java | 5 +--- .../yahoo/config/subscription/NamespaceTest.java | 1 + .../com/yahoo/config/subscription/UnicodeTest.java | 1 + .../di/componentgraph/core/ComponentGraphTest.java | 1 + .../componentgraph/core/ReuseComponentsTest.java | 3 ++ .../yahoo/messagebus/shared/SharedMessageBus.java | 10 +++---- .../profile/config/QueryProfileConfigurer.java | 1 + .../java/com/yahoo/prelude/IndexFactsFactory.java | 1 + .../prelude/query/parser/test/ParsingTester.java | 1 + .../test/ValidateSortingSearcherTestCase.java | 16 +++++----- .../semantics/test/ConfigurationTestCase.java | 7 ++--- .../com/yahoo/prelude/test/IndexFactsTestCase.java | 27 ++++++----------- .../test/QueryRewriteSearcherTestUtils.java | 1 + .../searchers/ValidateFuzzySearcherTestCase.java | 34 +++++++--------------- .../searchers/ValidateNearestNeighborTestCase.java | 11 ++----- .../test/ValidateMatchPhaseSearcherTestCase.java | 4 +-- .../indexing/IndexingProcessorTestCase.java | 1 + .../ai/vespa/models/evaluation/ModelTester.java | 4 +-- .../models/evaluation/ModelsEvaluatorTest.java | 3 +- .../vespa/models/evaluation/OnnxEvaluatorTest.java | 1 + .../handler/ModelsEvaluationHandlerTest.java | 1 + .../models/handler/OnnxEvaluationHandlerTest.java | 1 + .../java/com/yahoo/vespaclient/ClusterList.java | 1 + 25 files changed, 61 insertions(+), 79 deletions(-) diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java b/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java index aabfd211fac..316edda1ee8 100755 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigGetter.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.subscription; - import com.yahoo.config.ConfigInstance; /** @@ -13,7 +12,9 @@ import com.yahoo.config.ConfigInstance; * command-line tools. * * @author gjoranv + * @deprecated Use config builders where possible */ +@Deprecated public class ConfigGetter { private final Class clazz; diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java index fb116729640..68b5d6a37d3 100644 --- a/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/ConfigGetterTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertTrue; * * @author gjoranv */ +@SuppressWarnings("deprecation") public class ConfigGetterTest { private final ConfigSourceSet sourceSet = new ConfigSourceSet("config-getter-test"); diff --git a/config/src/test/java/com/yahoo/config/subscription/FunctionTest.java b/config/src/test/java/com/yahoo/config/subscription/FunctionTest.java index 42c2c599899..8656c0e945f 100644 --- a/config/src/test/java/com/yahoo/config/subscription/FunctionTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/FunctionTest.java @@ -2,20 +2,16 @@ package com.yahoo.config.subscription; import com.yahoo.foo.FunctionTestConfig; - import org.junit.Before; import org.junit.Test; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -28,6 +24,7 @@ import static org.junit.Assert.fail; * * @author gjoranv */ +@SuppressWarnings("deprecation") public class FunctionTest { public static final String PATH = "src/test/resources/configs/function-test/"; diff --git a/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java b/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java index 963f3de5e43..2e7beb0f0f4 100644 --- a/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertEquals; public class NamespaceTest { @Test + @SuppressWarnings("deprecation") public void verifyConfigClassWithExplicitNamespace() { NamespaceConfig config = new ConfigGetter<>(NamespaceConfig.class).getConfig("raw: a 0\n"); assertEquals(0, config.a()); diff --git a/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java b/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java index 8864f114d87..c1d98ac7e3e 100644 --- a/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java @@ -22,6 +22,7 @@ public class UnicodeTest { * received correctly from the server */ @Test + @SuppressWarnings("deprecation") public void testUnicodeConfigReading() { ConfigGetter getter = new ConfigGetter<>(UnicodeConfig.class); UnicodeConfig config = getter.getConfig("file:src/test/resources/configs/unicode/unicode.cfg"); diff --git a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java index 4d44281658c..f8f567e1890 100644 --- a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java +++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ComponentGraphTest.java @@ -50,6 +50,7 @@ public class ComponentGraphTest { super(); } + @SuppressWarnings("deprecation") public ConfigMap add(Class clazz, String configId) { ConfigKey key = new ConfigKey<>(clazz, configId); put(key, ConfigGetter.getConfig(key.getConfigClass(), key.getConfigId())); diff --git a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java index 29452f7babe..2215fcdf4dd 100644 --- a/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java +++ b/container-core/src/test/java/com/yahoo/container/di/componentgraph/core/ReuseComponentsTest.java @@ -62,6 +62,7 @@ public class ReuseComponentsTest { SimpleComponent throwsException = getComponent(newGraph, SimpleComponent.class); } + @SuppressWarnings("deprecation") @Test public void require_that_component_is_not_reused_when_config_is_changed() { Class componentClass = ComponentTakingConfig.class; @@ -80,6 +81,7 @@ public class ReuseComponentsTest { assertNotSame(instance2, instance); } + @SuppressWarnings("deprecation") @Test public void require_that_component_is_not_reused_when_injected_component_is_changed() { Function buildGraph = config -> { @@ -144,6 +146,7 @@ public class ReuseComponentsTest { assertNotSame(newSimpleComponentRegistry, oldSimpleComponentRegistry); } + @SuppressWarnings("deprecation") @Test public void require_that_injected_component_is_reused_even_when_dependent_component_is_changed() { Function buildGraph = config -> { diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedMessageBus.java b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedMessageBus.java index e3042310ad0..cf50eeb2c8d 100644 --- a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedMessageBus.java +++ b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedMessageBus.java @@ -1,12 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.messagebus.shared; +import com.yahoo.cloud.config.SlobroksConfig; import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.jdisc.AbstractResource; - -import java.util.Objects; -import java.util.logging.Level; - import com.yahoo.messagebus.DestinationSessionParams; import com.yahoo.messagebus.IntermediateSessionParams; import com.yahoo.messagebus.MessageBus; @@ -15,8 +12,8 @@ import com.yahoo.messagebus.SourceSessionParams; import com.yahoo.messagebus.network.Network; import com.yahoo.messagebus.network.rpc.RPCNetwork; import com.yahoo.messagebus.network.rpc.RPCNetworkParams; -import com.yahoo.cloud.config.SlobroksConfig; - +import java.util.Objects; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -57,6 +54,7 @@ public class SharedMessageBus extends AbstractResource { return new SharedMessageBus(new MessageBus(newNetwork(netParams), mbusParams)); } + @SuppressWarnings("deprecation") private static Network newNetwork(RPCNetworkParams params) { SlobroksConfig cfg = params.getSlobroksConfig(); if (cfg == null) { diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileConfigurer.java b/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileConfigurer.java index 31278af9579..5b30e3c383d 100644 --- a/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileConfigurer.java +++ b/container-search/src/main/java/com/yahoo/search/query/profile/config/QueryProfileConfigurer.java @@ -21,6 +21,7 @@ import java.util.Set; */ public class QueryProfileConfigurer { + @SuppressWarnings("deprecation") public static QueryProfileRegistry createFromConfigId(String configId) { return createFromConfig(ConfigGetter.getConfig(QueryProfilesConfig.class, configId)); } diff --git a/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java b/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java index 88cc066b665..482c9e3c6ba 100644 --- a/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java +++ b/container-search/src/test/java/com/yahoo/prelude/IndexFactsFactory.java @@ -23,6 +23,7 @@ public abstract class IndexFactsFactory { } + @SuppressWarnings("deprecation") private static T resolveConfig(Class configClass, String configId) { if (configId == null) return null; return ConfigGetter.getConfig(configClass, configId); diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParsingTester.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParsingTester.java index 229416f7a85..42bc1c22529 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParsingTester.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParsingTester.java @@ -62,6 +62,7 @@ public class ParsingTester { * Returns an unfrozen version of the IndexFacts this will use. * This can be used to add new indexes and passing the resulting IndexFacts to the constructor of this. */ + @SuppressWarnings("deprecation") public static IndexFacts createIndexFacts() { String indexInfoConfigID = "file:src/test/java/com/yahoo/prelude/query/parser/test/parseindexinfo.cfg"; ConfigGetter getter = new ConfigGetter<>(IndexInfoConfig.class); diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java index 84b8ef32871..6b8c268f4ca 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/ValidateSortingSearcherTestCase.java @@ -2,24 +2,23 @@ package com.yahoo.prelude.searcher.test; import com.yahoo.component.chain.Chain; -import com.yahoo.language.simple.SimpleLinguistics; -import com.yahoo.search.Searcher; -import com.yahoo.search.rendering.RendererRegistry; -import com.yahoo.search.searchchain.Execution; -import com.yahoo.vespa.config.search.AttributesConfig; -import com.yahoo.search.config.ClusterConfig; import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.container.QrSearchersConfig; import com.yahoo.prelude.searcher.ValidateSortingSearcher; import com.yahoo.search.Query; import com.yahoo.search.Result; +import com.yahoo.search.Searcher; +import com.yahoo.search.config.ClusterConfig; +import com.yahoo.search.searchchain.Execution; import com.yahoo.search.test.QueryTestCase; +import com.yahoo.vespa.config.search.AttributesConfig; import org.junit.Test; - import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * Check sorting validation behaves OK. @@ -30,6 +29,7 @@ public class ValidateSortingSearcherTestCase { private final ValidateSortingSearcher searcher; + @SuppressWarnings("deprecation") public ValidateSortingSearcherTestCase() { QrSearchersConfig.Builder qrsCfg = new QrSearchersConfig.Builder(); qrsCfg.searchcluster(new QrSearchersConfig.Searchcluster.Builder().name("giraffes")); diff --git a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java index 0515417f515..7d9ea07339f 100644 --- a/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/semantics/test/ConfigurationTestCase.java @@ -4,18 +4,16 @@ package com.yahoo.prelude.semantics.test; import com.yahoo.component.chain.Chain; import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.language.simple.SimpleLinguistics; -import com.yahoo.prelude.semantics.SemanticRulesConfig; -import com.yahoo.search.Query; import com.yahoo.prelude.semantics.RuleBase; import com.yahoo.prelude.semantics.RuleBaseException; +import com.yahoo.prelude.semantics.SemanticRulesConfig; import com.yahoo.prelude.semantics.SemanticSearcher; +import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; -import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.test.QueryTestCase; import org.junit.Test; - import java.util.ArrayList; import java.util.List; @@ -28,6 +26,7 @@ import static org.junit.Assert.fail; * * @author bratseth */ +@SuppressWarnings("deprecation") public class ConfigurationTestCase { private static final String root="src/test/java/com/yahoo/prelude/semantics/test/rulebases/"; diff --git a/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java b/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java index 0f7c9526533..6a54492f5e5 100644 --- a/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/test/IndexFactsTestCase.java @@ -1,39 +1,29 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.test; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - import com.google.common.collect.ImmutableList; import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.container.QrSearchersConfig; -import com.yahoo.search.config.IndexInfoConfig; -import com.yahoo.search.config.IndexInfoConfig.Indexinfo; -import com.yahoo.search.config.IndexInfoConfig.Indexinfo.Alias; -import com.yahoo.search.config.IndexInfoConfig.Indexinfo.Command; import com.yahoo.language.process.StemMode; import com.yahoo.prelude.Index; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.IndexModel; import com.yahoo.prelude.SearchDefinition; import com.yahoo.search.Query; +import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.search.searchchain.Execution; import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; /** * Tests using synthetic index names for IndexFacts class. @@ -45,6 +35,7 @@ public class IndexFactsTestCase { private static final String INDEXFACTS_TESTING = "file:src/test/java/com/yahoo/prelude/test/indexfactstesting.cfg"; + @SuppressWarnings("deprecation") private IndexFacts createIndexFacts() { ConfigGetter getter = new ConfigGetter<>(IndexInfoConfig.class); IndexInfoConfig config = getter.getConfig(INDEXFACTS_TESTING); diff --git a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java index da005871539..c12a3fb0e14 100644 --- a/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java +++ b/container-search/src/test/java/com/yahoo/search/query/rewrite/test/QueryRewriteSearcherTestUtils.java @@ -40,6 +40,7 @@ public class QueryRewriteSearcherTestUtils { * * @param configPath path for the searcher config */ + @SuppressWarnings("deprecation") public static RewritesConfig createConfigObj(String configPath) { return new ConfigGetter<>(RewritesConfig.class).getConfig(configPath); } diff --git a/container-search/src/test/java/com/yahoo/search/searchers/ValidateFuzzySearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/ValidateFuzzySearcherTestCase.java index 587b40dfd03..577963ef2b3 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/ValidateFuzzySearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/ValidateFuzzySearcherTestCase.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.searchers; -import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.IndexModel; import com.yahoo.prelude.SearchDefinition; @@ -13,10 +12,9 @@ import com.yahoo.search.query.parser.ParserEnvironment; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.yql.YqlParser; -import com.yahoo.vespa.config.search.AttributesConfig.Attribute; import com.yahoo.vespa.config.search.AttributesConfig; +import com.yahoo.vespa.config.search.AttributesConfig.Attribute; import org.junit.Test; - import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -33,35 +31,25 @@ public class ValidateFuzzySearcherTestCase { List attributes; public ValidateFuzzySearcherTestCase() { - int i = 0; attributes = new ArrayList<>(); - StringBuilder attributeConfig = new StringBuilder(); + AttributesConfig.Builder configBuilder = new AttributesConfig.Builder(); + List attributesList = new ArrayList<>(); for (Attribute.Datatype.Enum attr: Attribute.Datatype.Enum.values()) { for (Attribute.Collectiontype.Enum ctype: Attribute.Collectiontype.Enum.values()) { + AttributesConfig.Attribute.Builder attributesBuilder = new AttributesConfig.Attribute.Builder(); String attributeName = attr.name().toLowerCase() + "_" + ctype.name().toLowerCase(); + attributesBuilder.name(attributeName); + attributesBuilder.datatype(attr); + attributesBuilder.collectiontype(ctype); + attributesList.add(attributesBuilder); - attributeConfig.append("attribute[" + i + "].name "); - attributeConfig.append(attributeName); - attributeConfig.append("\n"); - - attributeConfig.append("attribute[" + i + "].datatype "); - attributeConfig.append(attr.name()); - attributeConfig.append("\n"); - - attributeConfig.append("attribute[" + i + "].collectiontype "); - attributeConfig.append(ctype.name()); - attributeConfig.append("\n"); - - i += 1; attributes.add(attributeName); } } + configBuilder.attribute(attributesList); + AttributesConfig config = configBuilder.build(); - searcher = new ValidateFuzzySearcher(ConfigGetter.getConfig( - AttributesConfig.class, - "raw: " + - "attribute[" + attributes.size() + "]\n" + - attributeConfig)); + searcher = new ValidateFuzzySearcher(config); } private String makeQuery(String attribute, String query, int maxEditDistance, int prefixLength) { diff --git a/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java index 9a760bfb0cb..c2f4ee31aa8 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/ValidateNearestNeighborTestCase.java @@ -2,28 +2,22 @@ package com.yahoo.search.searchers; import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.config.subscription.FileSource; -import com.yahoo.config.subscription.RawSource; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.IndexModel; import com.yahoo.prelude.SearchDefinition; import com.yahoo.search.Query; +import com.yahoo.search.Result; +import com.yahoo.search.query.QueryTree; import com.yahoo.search.query.parser.Parsable; import com.yahoo.search.query.parser.ParserEnvironment; -import com.yahoo.search.query.QueryTree; -import com.yahoo.search.Result; import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.yql.YqlParser; import com.yahoo.tensor.Tensor; import com.yahoo.tensor.TensorType; import com.yahoo.vespa.config.search.AttributesConfig; - -import com.yahoo.vespa.config.search.RankProfilesConfig; import org.junit.Test; -import java.io.File; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -34,6 +28,7 @@ public class ValidateNearestNeighborTestCase { ValidateNearestNeighborSearcher searcher; + @SuppressWarnings("deprecation") public ValidateNearestNeighborTestCase() { searcher = new ValidateNearestNeighborSearcher( ConfigGetter.getConfig(AttributesConfig.class, diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java index 01e360858c1..1b3689a94b0 100644 --- a/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/searchers/test/ValidateMatchPhaseSearcherTestCase.java @@ -3,7 +3,6 @@ package com.yahoo.search.searchers.test; import com.yahoo.component.chain.Chain; import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.config.subscription.RawSource; import com.yahoo.search.Searcher; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchers.ValidateMatchPhaseSearcher; @@ -15,7 +14,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * @author baldersheim @@ -24,6 +23,7 @@ public class ValidateMatchPhaseSearcherTestCase { private final ValidateMatchPhaseSearcher searcher; + @SuppressWarnings("deprecation") public ValidateMatchPhaseSearcherTestCase() { searcher = new ValidateMatchPhaseSearcher( ConfigGetter.getConfig(AttributesConfig.class, diff --git a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java index 76f4578ac87..c6ba63b7924 100644 --- a/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java +++ b/docprocs/src/test/java/com/yahoo/docprocs/indexing/IndexingProcessorTestCase.java @@ -125,6 +125,7 @@ public class IndexingProcessorTestCase { return lst.get(0); } + @SuppressWarnings("deprecation") private static IndexingProcessor newProcessor(String configId) { return new IndexingProcessor(new DocumentTypeManager(ConfigGetter.getConfig(DocumentmanagerConfig.class, configId)), ConfigGetter.getConfig(IlscriptsConfig.class, configId), diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java index a36215e005f..ab2f53db863 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java @@ -2,7 +2,6 @@ package ai.vespa.models.evaluation; import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.config.subscription.FileSource; import com.yahoo.filedistribution.fileacquirer.MockFileAcquirer; import com.yahoo.path.Path; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; @@ -10,7 +9,6 @@ import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.core.OnnxModelsConfig; import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import com.yahoo.vespa.config.search.core.RankingExpressionsConfig; - import java.util.Map; import static org.junit.Assert.assertEquals; @@ -31,8 +29,8 @@ public class ModelTester { public Map models() { return models; } + @SuppressWarnings("deprecation") private static Map createModels(String path) { - RankProfilesConfig config = ConfigGetter.getConfig(RankProfilesConfig.class, fileConfigId(path, "rank-profiles.cfg")); RankingConstantsConfig constantsConfig = ConfigGetter.getConfig(RankingConstantsConfig.class, fileConfigId(path, "ranking-constants.cfg")); RankingExpressionsConfig expressionsConfig = ConfigGetter.getConfig(RankingExpressionsConfig.class, fileConfigId(path, "ranking-expressions.cfg")); diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java index 540c534925e..c4e859bec9f 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java @@ -2,7 +2,6 @@ package ai.vespa.models.evaluation; import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.config.subscription.FileSource; import com.yahoo.filedistribution.fileacquirer.MockFileAcquirer; import com.yahoo.path.Path; import com.yahoo.searchlib.rankingexpression.ExpressionFunction; @@ -15,7 +14,6 @@ import com.yahoo.vespa.config.search.core.RankingConstantsConfig; import com.yahoo.vespa.config.search.core.RankingExpressionsConfig; import com.yahoo.yolean.Exceptions; import org.junit.Test; - import java.util.ArrayList; import java.util.List; @@ -128,6 +126,7 @@ public class ModelsEvaluatorTest { // TODO: Test argument-less function // TODO: Test with nested functions + @SuppressWarnings("deprecation") private ModelsEvaluator createModels() { RankProfilesConfig config = ConfigGetter.getConfig(RankProfilesConfig.class, fileConfigId("rank-profiles.cfg")); RankingConstantsConfig constantsConfig = ConfigGetter.getConfig(RankingConstantsConfig.class, fileConfigId("ranking-constants.cfg")); diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/OnnxEvaluatorTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/OnnxEvaluatorTest.java index 27d1c08ea39..992dae22aaf 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/OnnxEvaluatorTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/OnnxEvaluatorTest.java @@ -51,6 +51,7 @@ public class OnnxEvaluatorTest { assertEquals(function.evaluate(), Tensor.from("tensor(d0[2],d1[1]):[0.63931,0.67574]")); } + @SuppressWarnings("deprecation") private ModelsEvaluator createModels() { RankProfilesConfig config = ConfigGetter.getConfig(RankProfilesConfig.class, fileConfigId("rank-profiles.cfg")); RankingConstantsConfig constantsConfig = ConfigGetter.getConfig(RankingConstantsConfig.class, fileConfigId("ranking-constants.cfg")); diff --git a/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java b/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java index 7790f8a60d0..0de8ce5f061 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java @@ -257,6 +257,7 @@ public class ModelsEvaluationHandlerTest { handler.assertResponse(url, properties, 200, expected); } + @SuppressWarnings("deprecation") static private ModelsEvaluator createModels() { RankProfilesConfig config = ConfigGetter.getConfig(RankProfilesConfig.class, fileConfigId("rank-profiles.cfg")); RankingConstantsConfig constantsConfig = ConfigGetter.getConfig(RankingConstantsConfig.class, fileConfigId("ranking-constants.cfg")); diff --git a/model-evaluation/src/test/java/ai/vespa/models/handler/OnnxEvaluationHandlerTest.java b/model-evaluation/src/test/java/ai/vespa/models/handler/OnnxEvaluationHandlerTest.java index f065435ec15..8ab282668da 100644 --- a/model-evaluation/src/test/java/ai/vespa/models/handler/OnnxEvaluationHandlerTest.java +++ b/model-evaluation/src/test/java/ai/vespa/models/handler/OnnxEvaluationHandlerTest.java @@ -117,6 +117,7 @@ public class OnnxEvaluationHandlerTest { handler.assertResponse(url, properties, 200, expected); } + @SuppressWarnings("deprecation") static private ModelsEvaluator createModels() { RankProfilesConfig config = ConfigGetter.getConfig(RankProfilesConfig.class, fileConfigId("rank-profiles.cfg")); RankingConstantsConfig constantsConfig = ConfigGetter.getConfig(RankingConstantsConfig.class, fileConfigId("ranking-constants.cfg")); diff --git a/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterList.java b/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterList.java index d60463df581..c42d48b4821 100644 --- a/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterList.java +++ b/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterList.java @@ -20,6 +20,7 @@ public class ClusterList { this.contentClusters = List.copyOf(contentClusters); } + @SuppressWarnings("deprecation") public ClusterList(String configId) { this(new ConfigGetter<>(ClusterListConfig.class).getConfig(configId)); } -- cgit v1.2.3