move MapBackedConfigSource to src/test

3 files changed, 6 insertions, 10 deletions

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/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java
index 57adaa572bd..83e11e343be 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java
+++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java
@@ -17,7 +17,6 @@ import java.util.List;
  * @author hmusum
  * @since 5.1.10
  */
-// TODO Move to src/test/
 public class MapBackedConfigSource implements ConfigSource, ConfigSourceClient {
     private final HashMap<ConfigKey<?>, RawConfig> backing = new HashMap<>();
     private final ClientUpdater clientUpdater;
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