diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-02-18 14:48:46 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-02-18 14:48:46 +0100 |
commit | 97f2040ee1491911ea3f3c8991836e4b335e0eef (patch) | |
tree | 20739d04656eaf4afeb78aa7534055bebf442936 /config-proxy/src | |
parent | ae6eaa77738ec0ba96a3b22cb144573ef9b29c93 (diff) |
Remove unnecessary constructor argument
Diffstat (limited to 'config-proxy/src')
3 files changed, 10 insertions, 8 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 d77206aee81..0966de940f1 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 @@ -70,12 +70,11 @@ public class ProxyServer implements Runnable { defaultTimingValues = tv; } - ProxyServer(Spec spec, ConfigSourceSet source, TimingValues timingValues, - MemoryCache memoryCache, ConfigSourceClient configClient) { + ProxyServer(Spec spec, ConfigSourceSet source, MemoryCache memoryCache, ConfigSourceClient configClient) { this.delayedResponses = new DelayedResponses(); this.configSource = source; log.log(LogLevel.DEBUG, "Using config source '" + source); - this.timingValues = timingValues; + this.timingValues = defaultTimingValues; this.memoryCache = memoryCache; this.rpcServer = createRpcServer(spec); this.configClient = createClient(rpcServer, delayedResponses, source, timingValues, memoryCache, configClient); @@ -181,8 +180,7 @@ public class ProxyServer implements Runnable { Event.started("configproxy"); ConfigSourceSet configSources = new ConfigSourceSet(properties.configSources); - ProxyServer proxyServer = new ProxyServer(new Spec(null, port), configSources, - defaultTimingValues(), new MemoryCache(), null); + ProxyServer proxyServer = new ProxyServer(new Spec(null, port), configSources, new MemoryCache(), null); // catch termination and interrupt signal proxyServer.setupSignalHandler(); Thread proxyserverThread = new Thread(proxyServer); 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 dc1c995fbb5..29bd38ea891 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 @@ -264,7 +264,7 @@ public class ConfigProxyRpcServerTest { } private static ProxyServer createTestServer(ConfigSourceSet source) { - return new ProxyServer(null, source, ProxyServer.defaultTimingValues(), new MemoryCache(), null); + return new ProxyServer(null, source, new MemoryCache(), null); } private static class TestServer implements AutoCloseable { 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 712567774f1..bc35a8670a3 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 @@ -14,7 +14,11 @@ import org.junit.rules.TemporaryFolder; import java.util.Optional; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; /** * @author hmusum @@ -222,7 +226,7 @@ public class ProxyServerTest { private static ProxyServer createTestServer(ConfigSourceSet source, ConfigSourceClient configSourceClient, MemoryCache memoryCache) { - return new ProxyServer(null, source, ProxyServer.defaultTimingValues(), memoryCache, configSourceClient); + return new ProxyServer(null, source, memoryCache, configSourceClient); } static RawConfig createConfigWithNextConfigGeneration(RawConfig config, int errorCode) { |