From 7ef996c748334231a6a1c3ace62ca8e39aca580f Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 31 Jan 2022 02:20:28 +0100 Subject: Remove redundant suppression --- .../java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java | 1 - 1 file changed, 1 deletion(-) (limited to 'container-search') diff --git a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java index 2a7e9da2992..ef3526f2fb1 100644 --- a/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/searcher/test/QuotingSearcherTestCase.java @@ -32,7 +32,6 @@ import static org.junit.Assert.assertTrue; * * @author Steinar Knutsen */ -@SuppressWarnings("deprecation") public class QuotingSearcherTestCase { public static QuotingSearcher createQuotingSearcher(String configId) { -- cgit v1.2.3 From f62a05ea11eeef5e6c7e1605bcb9968a4325e7d8 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Mon, 31 Jan 2022 02:21:02 +0100 Subject: Stop using deprecated ConfigGetter method --- .../search/searchers/ValidateNearestNeighborTestCase.java | 11 ++++++++--- .../searchers/test/ValidateMatchPhaseSearcherTestCase.java | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'container-search') 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 14fdd047391..9a760bfb0cb 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,6 +2,7 @@ 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; @@ -18,7 +19,11 @@ 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; @@ -32,8 +37,8 @@ public class ValidateNearestNeighborTestCase { public ValidateNearestNeighborTestCase() { searcher = new ValidateNearestNeighborSearcher( ConfigGetter.getConfig(AttributesConfig.class, - "raw:", - new RawSource("attribute[5]\n" + + "raw:" + + "attribute[5]\n" + "attribute[0].name simple\n" + "attribute[0].datatype INT32\n" + "attribute[1].name dvector\n" + @@ -57,7 +62,7 @@ public class ValidateNearestNeighborTestCase { "attribute[7].name threetypes\n" + "attribute[7].datatype TENSOR\n" + "attribute[7].tensortype tensor(x{})\n" - ))); + )); } private static TensorType tt_dense_dvector_42 = TensorType.fromSpec("tensor(x[42])"); 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 86ffb1f9830..01e360858c1 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 @@ -27,8 +27,8 @@ public class ValidateMatchPhaseSearcherTestCase { public ValidateMatchPhaseSearcherTestCase() { searcher = new ValidateMatchPhaseSearcher( ConfigGetter.getConfig(AttributesConfig.class, - "raw:", - new RawSource("attribute[4]\n" + + "raw:" + + "attribute[4]\n" + "attribute[0].name ok\n" + "attribute[0].datatype INT32\n" + "attribute[0].collectiontype SINGLE\n" + @@ -45,7 +45,7 @@ public class ValidateMatchPhaseSearcherTestCase { "attribute[3].datatype INT32\n" + "attribute[3].collectiontype ARRAY\n" + "attribute[3].fastsearch true" - ))); + )); } private static String getErrorMatch(String attribute) { -- cgit v1.2.3 From f11550dbab6e9b213ab141a8183935746ad6cc7f Mon Sep 17 00:00:00 2001 From: gjoranv Date: Wed, 2 Feb 2022 00:30:53 +0100 Subject: Add SuppressWarnings for removal of config.subscription types. --- .../src/test/java/com/yahoo/application/TestDocProc.java | 2 -- .../yahoo/config/model/producer/AbstractConfigProducer.java | 1 + .../com/yahoo/searchdefinition/derived/AttributeFields.java | 1 + .../com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java | 2 ++ .../filedistribution/FileDistributionAndUrlDownload.java | 2 ++ .../yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java | 2 ++ .../java/com/yahoo/vespa/config/proxy/MockConfigSource.java | 1 + .../java/com/yahoo/vespa/config/proxy/ProxyServerTest.java | 1 + .../vespa/config/server/filedistribution/FileServer.java | 1 + .../server/maintenance/ApplicationPackageMaintainer.java | 1 + .../core/config/testutil/HandlersConfigurerTestWrapper.java | 1 + .../main/java/com/yahoo/container/di/CloudSubscriber.java | 1 + .../java/com/yahoo/container/di/CloudSubscriberFactory.java | 1 + .../src/main/java/com/yahoo/container/di/Container.java | 1 + .../test/java/com/yahoo/container/di/DirConfigSource.java | 1 + .../com/yahoo/container/jdisc/ConfiguredApplication.java | 1 + .../search/query/profile/config/QueryProfileConfigurer.java | 1 + docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java | 1 + .../main/java/com/yahoo/document/DocumentTypeManager.java | 12 ++++++++++-- .../com/yahoo/document/DocumentTypeManagerConfigurer.java | 1 + .../src/main/java/com/yahoo/documentapi/DocumentAccess.java | 1 + .../messagebus/protocol/DocumentRouteSelectorPolicy.java | 1 + .../documentapi/messagebus/protocol/MessageTypePolicy.java | 1 + .../filedistribution/fileacquirer/FileAcquirerImpl.java | 4 ++++ .../filedistribution/FileDistributionConnectionPool.java | 1 + .../src/main/java/com/yahoo/messagebus/ConfigAgent.java | 1 + .../messagebus/network/rpc/SlobrokConfigSubscriber.java | 1 + .../test/java/com/yahoo/messagebus/ConfigAgentTestCase.java | 1 + .../container/standalone/StandaloneSubscriberFactory.java | 1 + .../java/com/yahoo/vdslib/distribution/Distribution.java | 3 +++ .../java/com/yahoo/feedapi/MessagePropertyProcessor.java | 1 + 31 files changed, 47 insertions(+), 4 deletions(-) (limited to 'container-search') diff --git a/application/src/test/java/com/yahoo/application/TestDocProc.java b/application/src/test/java/com/yahoo/application/TestDocProc.java index 37d428c773e..c2d24d38115 100644 --- a/application/src/test/java/com/yahoo/application/TestDocProc.java +++ b/application/src/test/java/com/yahoo/application/TestDocProc.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.application; -import com.yahoo.config.subscription.ConfigSubscriber; import com.yahoo.docproc.DocumentProcessor; import com.yahoo.docproc.Processing; import com.yahoo.document.config.DocumentmanagerConfig; @@ -12,7 +11,6 @@ import com.yahoo.document.config.DocumentmanagerConfig; public class TestDocProc extends DocumentProcessor { public TestDocProc(DocumentmanagerConfig config) { - new ConfigSubscriber().subscribe(DocumentmanagerConfig.class, "client"); } @Override diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java index 0ebc661f1d7..f64d71ee364 100644 --- a/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java +++ b/config-model/src/main/java/com/yahoo/config/model/producer/AbstractConfigProducer.java @@ -234,6 +234,7 @@ public abstract class AbstractConfigProducer toMap(List ls) { Map ret = new LinkedHashMap<>(); for (AttributesConfig.Attribute.Builder builder : ls) { diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java index 56fdae477b2..c09a868a786 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java @@ -45,6 +45,7 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable { private final Supervisor supervisor = new Supervisor(new Transport("config-source-client")); private final ResponseHandler responseHandler; + @SuppressWarnings("removal") // TODO Vespa 8: remove private final ConfigSourceSet configSourceSet; private final Object subscribersLock = new Object(); private final Map subscribers = new ConcurrentHashMap<>(); @@ -59,6 +60,7 @@ class RpcConfigSourceClient implements ConfigSourceClient, Runnable { Executors.newScheduledThreadPool(1, new DaemonThreadFactory("delayed responses")); private final ScheduledFuture delayedResponsesFuture; + @SuppressWarnings("removal") // TODO Vespa 8: remove RpcConfigSourceClient(ResponseHandler responseHandler, ConfigSourceSet configSourceSet) { this.responseHandler = responseHandler; this.configSourceSet = configSourceSet; diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java index 68570722117..8e471aa1f5d 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionAndUrlDownload.java @@ -26,6 +26,7 @@ public class FileDistributionAndUrlDownload { private final ScheduledExecutorService cleanupExecutor = new ScheduledThreadPoolExecutor(1, new DaemonThreadFactory("file references and downloads cleanup")); + @SuppressWarnings("removal") // TODO Vespa 8: remove public FileDistributionAndUrlDownload(Supervisor supervisor, ConfigSourceSet source) { fileDistributionRpcServer = new FileDistributionRpcServer(supervisor, createDownloader(supervisor, source)); urlDownloadRpcServer = new UrlDownloadRpcServer(supervisor); @@ -44,6 +45,7 @@ public class FileDistributionAndUrlDownload { } } + @SuppressWarnings("removal") // TODO Vespa 8: remove private FileDownloader createDownloader(Supervisor supervisor, ConfigSourceSet source) { return new FileDownloader(new FileDistributionConnectionPool(source, supervisor), supervisor, diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java index f743c0ed231..2105bd72975 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java @@ -256,6 +256,7 @@ public class ConfigProxyRpcServerTest { assertEquals("success", req.returnValues().get(0).asString()); } + @SuppressWarnings("removal") // TODO Vespa 8: remove private static ProxyServer createTestServer(ConfigSourceSet source) { return new ProxyServer(null, source, new RpcConfigSourceClient(new ResponseHandler(), source)); } @@ -264,6 +265,7 @@ public class ConfigProxyRpcServerTest { private static final Spec SPEC = new Spec(0); + @SuppressWarnings("removal") // TODO Vespa 8: remove private final ProxyServer proxyServer = createTestServer(new ConfigSourceSet(configSourceAddress)); private final Supervisor supervisor = new Supervisor(new Transport()); private final ConfigProxyRpcServer rpcServer = new ConfigProxyRpcServer(proxyServer, supervisor, SPEC); diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSource.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSource.java index 0377e20330a..2b3624fe2b8 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSource.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MockConfigSource.java @@ -15,6 +15,7 @@ import java.util.Set; * * @author hmusum */ +@SuppressWarnings("removal") // TODO Vespa 8: remove class MockConfigSource extends ConfigSourceSet { private final HashMap, RawConfig> backing = new HashMap<>(); diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java index ee058ba903e..09eae6a297d 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java @@ -222,6 +222,7 @@ public class ProxyServerTest { assertEquals(ProxyServer.DEFAULT_PROXY_CONFIG_SOURCES, properties.configSources[0]); } + @SuppressWarnings("removal") // TODO Vespa 8: remove private static ProxyServer createTestServer(ConfigSourceSet source, ConfigSourceClient configSourceClient) { return new ProxyServer(null, source, configSourceClient); } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java index 8e5eee2104c..a3f9dbfad11 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java @@ -223,6 +223,7 @@ public class FileServer { } private static ConnectionPool createConnectionPool(List configServers, Supervisor supervisor) { + @SuppressWarnings("removal") // TODO Vespa 8: remove ConfigSourceSet configSourceSet = new ConfigSourceSet(configServers); if (configServers.size() == 0) return FileDownloader.emptyConnectionPool(); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java index a0e8d83fba1..9d8a3d87811 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java @@ -96,6 +96,7 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer { File downloadDirectory, Supervisor supervisor) { List otherConfigServersInCluster = getOtherConfigServersInCluster(configserverConfig); + @SuppressWarnings("removal") // TODO Vespa 8: remove ConfigSourceSet configSourceSet = new ConfigSourceSet(otherConfigServersInCluster); ConnectionPool connectionPool = (otherConfigServersInCluster.isEmpty()) diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java index 5178b864e8e..729e1ca1f2e 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java @@ -39,6 +39,7 @@ import java.util.concurrent.Executors; */ public class HandlersConfigurerTestWrapper { + @SuppressWarnings("removal") // TODO Vespa 8: remove private final ConfigSourceSet configSources = new ConfigSourceSet(this.getClass().getSimpleName() + ": " + new Random().nextLong()); private final HandlersConfigurerDi configurer; diff --git a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java index 0247cda8bbd..2acbec2e388 100644 --- a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java +++ b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriber.java @@ -21,6 +21,7 @@ import static java.util.logging.Level.FINE; * @author Tony Vaagenes * @author ollivir */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class CloudSubscriber implements Subscriber { private static final Logger log = Logger.getLogger(CloudSubscriber.class.getName()); diff --git a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java index a6327b01e21..a58baa5b2bd 100644 --- a/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java +++ b/container-core/src/main/java/com/yahoo/container/di/CloudSubscriberFactory.java @@ -20,6 +20,7 @@ import java.util.WeakHashMap; * @author Tony Vaagenes * @author ollivir */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class CloudSubscriberFactory implements SubscriberFactory { private final ConfigSource configSource; diff --git a/container-core/src/main/java/com/yahoo/container/di/Container.java b/container-core/src/main/java/com/yahoo/container/di/Container.java index b37a7b9f69f..d7c94af2a97 100644 --- a/container-core/src/main/java/com/yahoo/container/di/Container.java +++ b/container-core/src/main/java/com/yahoo/container/di/Container.java @@ -217,6 +217,7 @@ public class Container { } } + @SuppressWarnings("removal") // TODO Vespa 8: remove private void invalidateGeneration(long generation, Throwable cause) { leastGeneration = Math.max(retriever.getComponentsGeneration(), retriever.getBootstrapGeneration()) + 1; if (!(cause instanceof InterruptedException) && !(cause instanceof ConfigInterruptedException)) { diff --git a/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java b/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java index d459070e2bd..34119163d2f 100644 --- a/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java +++ b/container-core/src/test/java/com/yahoo/container/di/DirConfigSource.java @@ -16,6 +16,7 @@ import java.util.Random; * @author gjoranv * @author ollivir */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class DirConfigSource { private final TemporaryFolder tempFolder = createTemporaryFolder(); public final ConfigSource configSource; diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index 606e2bf6cb4..55a0fba2758 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -285,6 +285,7 @@ public final class ConfiguredApplication implements Application { return builder; } + @SuppressWarnings("removal") // TODO Vespa 8: remove private void startReconfigurerThread() { reconfigurerThread = new Thread(() -> { while ( ! Thread.interrupted()) { 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 ceeed9d9167..c3bd4f7b962 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 @@ -19,6 +19,7 @@ import java.util.Set; /** * @author bratseth */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class QueryProfileConfigurer implements ConfigSubscriber.SingleSubscriber { private final ConfigSubscriber subscriber = new ConfigSubscriber(); diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java b/docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java index 8a544dea221..ffe89e5a405 100644 --- a/docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java +++ b/docproc/src/main/java/com/yahoo/docproc/proxy/SchemaMap.java @@ -16,6 +16,7 @@ import java.util.Map.Entry; * * @author vegardh */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class SchemaMap implements ConfigSubscriber.SingleSubscriber { /** Map key. Doctype can be null, not the others. */ diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java index ff6a7194e7d..7cbda1410c2 100644 --- a/document/src/main/java/com/yahoo/document/DocumentTypeManager.java +++ b/document/src/main/java/com/yahoo/document/DocumentTypeManager.java @@ -3,7 +3,6 @@ package com.yahoo.document; import com.google.inject.Inject; import com.yahoo.config.subscription.ConfigSubscriber; -import com.yahoo.document.annotation.AnnotationReferenceDataType; import com.yahoo.document.annotation.AnnotationType; import com.yahoo.document.annotation.AnnotationTypeRegistry; import com.yahoo.document.annotation.AnnotationTypes; @@ -14,7 +13,14 @@ import com.yahoo.io.GrowableByteBuffer; import com.yahoo.tensor.TensorType; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Logger; /** @@ -33,6 +39,8 @@ import java.util.logging.Logger; public class DocumentTypeManager { private final static Logger log = Logger.getLogger(DocumentTypeManager.class.getName()); + + @SuppressWarnings("removal") // TODO Vespa 8: remove private ConfigSubscriber subscriber; // *Configured data types* (not built-in/primitive) indexed by their id diff --git a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java index 73ee2ecaedd..be2c182426e 100644 --- a/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java +++ b/document/src/main/java/com/yahoo/document/DocumentTypeManagerConfigurer.java @@ -24,6 +24,7 @@ import com.yahoo.tensor.TensorType; * * @author Einar M R Rosenvinge */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class DocumentTypeManagerConfigurer implements ConfigSubscriber.SingleSubscriber { private final static Logger log = Logger.getLogger(DocumentTypeManagerConfigurer.class.getName()); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java index d40aaaf46d1..29fc470fe2a 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/DocumentAccess.java @@ -47,6 +47,7 @@ import com.yahoo.documentapi.messagebus.MessageBusDocumentAccess; public abstract class DocumentAccess { private final DocumentTypeManager documentTypeManager; + @SuppressWarnings("removal") // TODO Vespa 8: remove private final ConfigSubscriber documentTypeConfigSubscriber; /** diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java index 67ebe974e4e..a785438da80 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java @@ -23,6 +23,7 @@ import java.util.logging.Logger; * * @author Simon Thoresen Hult */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class DocumentRouteSelectorPolicy implements DocumentProtocolRoutingPolicy, ConfigSubscriber.SingleSubscriber { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java index 57cd70cf4b4..095d1f433d2 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/MessageTypePolicy.java @@ -15,6 +15,7 @@ import static java.util.stream.Collectors.toUnmodifiableMap; /** * @author baldersheim */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class MessageTypePolicy implements DocumentProtocolRoutingPolicy, ConfigSubscriber.SingleSubscriber { private final AtomicReference> configRef = new AtomicReference<>(); diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java index 9f8e7d253fc..5ab2d3d7246 100644 --- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java +++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java @@ -37,8 +37,11 @@ class FileAcquirerImpl implements FileAcquirer { private static final Logger log = Logger.getLogger(FileAcquirerImpl.class.getName()); private final Supervisor supervisor = new Supervisor(new Transport("fileaquirer")); + + @SuppressWarnings("removal") // TODO Vespa 8: remove private final ConfigSubscriber configSubscriber; + @SuppressWarnings("removal") // TODO Vespa 8: remove private class Connection implements ConfigSubscriber.SingleSubscriber { private final Lock targetLock = new ReentrantLock(); private Target target; @@ -122,6 +125,7 @@ class FileAcquirerImpl implements FileAcquirer { } } + @SuppressWarnings("removal") // TODO Vespa 8: remove public FileAcquirerImpl(String configId) { configSubscriber = new ConfigSubscriber(); configSubscriber.subscribe(connection, FiledistributorrpcConfig.class, configId); diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionConnectionPool.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionConnectionPool.java index 3a03e6a87d5..c292080a0e5 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionConnectionPool.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDistributionConnectionPool.java @@ -22,6 +22,7 @@ import java.util.List; */ public class FileDistributionConnectionPool extends JRTConnectionPool { + @SuppressWarnings("removal") // TODO Vespa 8: remove public FileDistributionConnectionPool(ConfigSourceSet sourceSet, Supervisor supervisor) { super(sourceSet, supervisor); } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/ConfigAgent.java b/messagebus/src/main/java/com/yahoo/messagebus/ConfigAgent.java index 4db97f0c083..10ebb2fc1ae 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/ConfigAgent.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/ConfigAgent.java @@ -14,6 +14,7 @@ import com.yahoo.messagebus.routing.RoutingTableSpec; * * @author Simon Thoresen Hult */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class ConfigAgent implements ConfigSubscriber.SingleSubscriber{ private final ConfigURI configURI; diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/SlobrokConfigSubscriber.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/SlobrokConfigSubscriber.java index 903a31d3f3a..02472d8f31f 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/SlobrokConfigSubscriber.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/SlobrokConfigSubscriber.java @@ -13,6 +13,7 @@ import java.util.logging.Logger; * * @author Simon Thoresen Hult */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class SlobrokConfigSubscriber implements ConfigSubscriber.SingleSubscriber{ private static final Logger log = Logger.getLogger(SlobrokConfigSubscriber.class.getName()); diff --git a/messagebus/src/test/java/com/yahoo/messagebus/ConfigAgentTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/ConfigAgentTestCase.java index a32175ff414..287529ae449 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/ConfigAgentTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/ConfigAgentTestCase.java @@ -22,6 +22,7 @@ public class ConfigAgentTestCase { @Rule public TemporaryFolder tmpFolder = new TemporaryFolder(); + @SuppressWarnings("removal") // TODO Vespa 8: remove @Test public void testRoutingConfig() throws InterruptedException { LocalHandler handler = new LocalHandler(); diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneSubscriberFactory.java b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneSubscriberFactory.java index d9db169ec54..11f799fcfd4 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneSubscriberFactory.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/StandaloneSubscriberFactory.java @@ -57,6 +57,7 @@ public class StandaloneSubscriberFactory implements SubscriberFactory { return ret; } + @SuppressWarnings("removal") // TODO Vespa 8: remove @Override public long waitNextGeneration(boolean isInitializing) { generation++; diff --git a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java index 04a577db554..b6455a7703c 100644 --- a/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java +++ b/vdslib/src/main/java/com/yahoo/vdslib/distribution/Distribution.java @@ -39,6 +39,7 @@ public class Distribution { private final boolean distributorAutoOwnershipTransferOnWholeGroupDown; } + @SuppressWarnings("removal") // TODO Vespa 8: remove private ConfigSubscriber configSub; private final AtomicReference config = new AtomicReference<>(new Config(null, 1, false)); @@ -60,6 +61,7 @@ public class Distribution { return p; } + @SuppressWarnings("removal") // TODO Vespa 8: remove // NOTE: keep in sync with the below private ConfigSubscriber.SingleSubscriber configSubscriber = config -> { try { @@ -146,6 +148,7 @@ public class Distribution { } } + @SuppressWarnings("removal") // TODO Vespa 8: remove public Distribution(String configId) { try { configSub = new ConfigSubscriber(); diff --git a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java index edf51d1bcd6..e5da51f0918 100644 --- a/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedapi/MessagePropertyProcessor.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; * Utility class for assigning properties to messages, either from implicit * config values or from explicit values in requests. */ +@SuppressWarnings("removal") // TODO Vespa 8: remove public class MessagePropertyProcessor implements ConfigSubscriber.SingleSubscriber { private static final Logger log = Logger.getLogger(MessagePropertyProcessor.class.getName()); -- cgit v1.2.3