diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-02-09 21:42:59 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-02-09 21:42:59 +0100 |
commit | ac2b4174ed619b80f346d40d8b042761f1f723ed (patch) | |
tree | e6546be363be993f1887ff425896464c3a1b9e52 /config | |
parent | 10a1c3d262d6fea9925cb50e239712727963f924 (diff) |
No need for a static method and constructor that are equal
Diffstat (limited to 'config')
3 files changed, 5 insertions, 16 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java index e9daafb779c..50f4eeae1b8 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java @@ -52,20 +52,10 @@ public class JRTConfigRequester implements RequestWaiter { /** * Returns a new requester - * @param connectionPool The connectionPool to use - * @param timingValues The timing values - * @return new requester object - */ - public static JRTConfigRequester get(ConnectionPool connectionPool, TimingValues timingValues) { - return new JRTConfigRequester(connectionPool, timingValues); - } - - /** - * New requester - * @param connectionPool the connectionPool this requester should use + * @param connectionPool the connectionPool this requester should use * @param timingValues timeouts and delays used when sending JRT config requests */ - JRTConfigRequester(ConnectionPool connectionPool, TimingValues timingValues) { + public JRTConfigRequester(ConnectionPool connectionPool, TimingValues timingValues) { this.connectionPool = connectionPool; this.timingValues = timingValues; } diff --git a/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java b/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java index 31388d7db70..14dd73c651b 100644 --- a/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java +++ b/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java @@ -10,7 +10,6 @@ import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.protocol.CompressionType; import org.junit.Test; -import java.util.Arrays; import java.util.List; import static org.hamcrest.CoreMatchers.is; @@ -29,8 +28,8 @@ public class GenericConfigSubscriberTest { @Test public void testSubscribeGeneric() { ConfigSourceSet sourceSet = new ConfigSourceSet("blabla"); - GenericConfigSubscriber sub = new GenericConfigSubscriber(JRTConfigRequester.get(new MockConnection(), JRTConfigRequesterTest.getTestTimingValues())); - final List<String> defContent = Arrays.asList("myVal int"); + GenericConfigSubscriber sub = new GenericConfigSubscriber(new JRTConfigRequester(new MockConnection(), JRTConfigRequesterTest.getTestTimingValues())); + final List<String> defContent = List.of("myVal int"); GenericConfigHandle handle = sub.subscribe(new ConfigKey<>("simpletypes", "id", "config"), defContent, sourceSet, JRTConfigRequesterTest.getTestTimingValues()); assertTrue(sub.nextConfig()); assertTrue(handle.isChanged()); diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java index 4491ee9e841..a9fbdde3dfa 100644 --- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java +++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestBase.java @@ -239,7 +239,7 @@ public abstract class JRTConfigRequestBase { }); ConfigSourceSet src = new ConfigSourceSet(); - ConfigSubscriber subscriber = new GenericConfigSubscriber(JRTConfigRequester.get(connection, new TimingValues())); + ConfigSubscriber subscriber = new GenericConfigSubscriber(new JRTConfigRequester(connection, new TimingValues())); JRTConfigSubscription<SimpletypesConfig> sub = new JRTConfigSubscription<>(new ConfigKey<>(SimpletypesConfig.class, configId), subscriber, src, new TimingValues()); sub.subscribe(120_0000); assertTrue(sub.nextConfig(120_0000)); |