From 61a205c08d1e32b7c325119762b180030a28cad3 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Thu, 9 Mar 2017 08:33:29 +0100 Subject: move MapBackedConfigSource to src/test --- .../vespa/config/proxy/MapBackedConfigSource.java | 68 ---------------------- .../com/yahoo/vespa/config/proxy/ProxyServer.java | 11 ++-- .../vespa/config/proxy/MapBackedConfigSource.java | 67 +++++++++++++++++++++ .../yahoo/vespa/config/proxy/ProxyServerTest.java | 4 +- 4 files changed, 73 insertions(+), 77 deletions(-) delete mode 100644 config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java create mode 100644 config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java (limited to 'config-proxy') diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java deleted file mode 100644 index 57adaa572bd..00000000000 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.config.proxy; - -import com.yahoo.config.subscription.ConfigSource; -import com.yahoo.vespa.config.ConfigKey; -import com.yahoo.vespa.config.RawConfig; -import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - -/** - * A simple class to be able to test config proxy without having an RPC config - * source. - * - * @author hmusum - * @since 5.1.10 - */ -// TODO Move to src/test/ -public class MapBackedConfigSource implements ConfigSource, ConfigSourceClient { - private final HashMap, RawConfig> backing = new HashMap<>(); - private final ClientUpdater clientUpdater; - - MapBackedConfigSource(ClientUpdater clientUpdater) { - this.clientUpdater = clientUpdater; - } - - MapBackedConfigSource put(ConfigKey key, RawConfig config) { - backing.put(key, config); - clientUpdater.updateSubscribers(config); - return this; - } - - @Override - public RawConfig getConfig(RawConfig input, JRTServerConfigRequest request) { - final RawConfig config = getConfig(input.getKey()); - clientUpdater.getMemoryCache().put(config); - return config; - } - - RawConfig getConfig(ConfigKey configKey) { - return backing.get(configKey); - } - - @Override - public void cancel() { - clear(); - } - - @Override - public void shutdownSourceConnections() { - } - - public void clear() { - backing.clear(); - } - - @Override - public String getActiveSourceConnection() { - return "N/A"; - } - - @Override - public List getSourceConnections() { - return Collections.singletonList("N/A"); - } -} diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java index 463fa163b20..4b92fbbe81a 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java @@ -88,13 +88,10 @@ public class ProxyServer implements Runnable { return createTestServer(source, null, new MemoryCache()); } - static ProxyServer createTestServer(MapBackedConfigSource source, MemoryCache memoryCache) { - return createTestServer(source, source, memoryCache); - } - - private static ProxyServer createTestServer(ConfigSource source, - ConfigSourceClient configSourceClient, - MemoryCache memoryCache) { + static ProxyServer createTestServer(ConfigSource source, + ConfigSourceClient configSourceClient, + MemoryCache memoryCache) + { final ConfigProxyStatistics statistics = new ConfigProxyStatistics(); final boolean delayedResponseHandling = false; return new ProxyServer(null, new DelayedResponses(statistics), diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java new file mode 100644 index 00000000000..83e11e343be --- /dev/null +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java @@ -0,0 +1,67 @@ +// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.config.proxy; + +import com.yahoo.config.subscription.ConfigSource; +import com.yahoo.vespa.config.ConfigKey; +import com.yahoo.vespa.config.RawConfig; +import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + +/** + * A simple class to be able to test config proxy without having an RPC config + * source. + * + * @author hmusum + * @since 5.1.10 + */ +public class MapBackedConfigSource implements ConfigSource, ConfigSourceClient { + private final HashMap, RawConfig> backing = new HashMap<>(); + private final ClientUpdater clientUpdater; + + MapBackedConfigSource(ClientUpdater clientUpdater) { + this.clientUpdater = clientUpdater; + } + + MapBackedConfigSource put(ConfigKey key, RawConfig config) { + backing.put(key, config); + clientUpdater.updateSubscribers(config); + return this; + } + + @Override + public RawConfig getConfig(RawConfig input, JRTServerConfigRequest request) { + final RawConfig config = getConfig(input.getKey()); + clientUpdater.getMemoryCache().put(config); + return config; + } + + RawConfig getConfig(ConfigKey configKey) { + return backing.get(configKey); + } + + @Override + public void cancel() { + clear(); + } + + @Override + public void shutdownSourceConnections() { + } + + public void clear() { + backing.clear(); + } + + @Override + public String getActiveSourceConnection() { + return "N/A"; + } + + @Override + public List getSourceConnections() { + return Collections.singletonList("N/A"); + } +} 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 47b4dd4d1ea..c21fad062eb 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 @@ -23,7 +23,7 @@ public class ProxyServerTest { MemoryCache memoryCache = new MemoryCache(); private final MapBackedConfigSource source = new MapBackedConfigSource(UpstreamConfigSubscriberTest.MockClientUpdater.create(memoryCache)); - private ProxyServer proxy = ProxyServer.createTestServer(source, memoryCache); + private ProxyServer proxy = ProxyServer.createTestServer(source, source, memoryCache); static final RawConfig fooConfig = Helper.fooConfigV2; @@ -41,7 +41,7 @@ public class ProxyServerTest { source.clear(); source.put(fooConfig.getKey(), createConfigWithNextConfigGeneration(fooConfig, 0)); source.put(errorConfigKey, createConfigWithNextConfigGeneration(fooConfig, ErrorCode.UNKNOWN_DEFINITION)); - proxy = ProxyServer.createTestServer(source, memoryCache); + proxy = ProxyServer.createTestServer(source, source, memoryCache); } @After -- cgit v1.2.3