From cf964397ea89d06916658df9b3c1c548a8960380 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 2 Jun 2022 14:00:04 +0200 Subject: Revoke com.yahoo.config.subscription as public API Also remove some deprecated methods in ConfigGetter --- .../main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java | 2 -- .../config/proxy/filedistribution/FileDistributionAndUrlDownload.java | 2 -- .../java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java | 2 -- .../src/test/java/com/yahoo/vespa/config/proxy/MockConfigSource.java | 1 - .../src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java | 1 - 5 files changed, 8 deletions(-) (limited to 'config-proxy') 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 8f844fdd3ee..02c5aeb33c7 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 @@ -47,7 +47,6 @@ 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<>(); @@ -62,7 +61,6 @@ 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 8e471aa1f5d..68570722117 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,7 +26,6 @@ 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); @@ -45,7 +44,6 @@ 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 2105bd72975..f743c0ed231 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,7 +256,6 @@ 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)); } @@ -265,7 +264,6 @@ 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 2b3624fe2b8..0377e20330a 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,7 +15,6 @@ 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 1bcd1562a85..0e25e62b925 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 @@ -216,7 +216,6 @@ 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); } -- cgit v1.2.3