Remove constructor only used in tests

3 files changed, 13 insertions, 16 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
index 91bb669f396..9c0f104f7de 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
@@ -124,8 +124,8 @@ public class MemoryCache {
             // First three lines are meta-data about config as comment lines, fourth line is empty
             writer.write("# defMd5:" + config.getDefMd5() + "\n");
             writer.write("# configMd5:" + config.getConfigMd5() + "\n");
-            writer.write("# generation:" + Long.toString(config.getGeneration()) + "\n");
-            writer.write("# protocolVersion:" + Long.toString(protocolVersion) + "\n");
+            writer.write("# generation:" + config.getGeneration() + "\n");
+            writer.write("# protocolVersion:" + protocolVersion + "\n");
             writer.write("\n");
             writer.write(payload.withCompression(CompressionType.UNCOMPRESSED).toString());
             writer.write("\n");
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigSubscriber.java b/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigSubscriber.java
index 328a4d5a0fd..457c15eda3d 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigSubscriber.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigSubscriber.java
@@ -27,10 +27,6 @@ public class GenericConfigSubscriber extends ConfigSubscriber {
         this.requester = requester;
     }
 
-    public GenericConfigSubscriber() {
-        super();
-    }
-
     /**
      * Subscribes to config without using a config class. For internal use in config proxy.
      *
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 14dd73c651b..7a10db49408 100644
--- a/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java
@@ -28,31 +28,32 @@ public class GenericConfigSubscriberTest {
     @Test
     public void testSubscribeGeneric() {
         ConfigSourceSet sourceSet = new ConfigSourceSet("blabla");
-        GenericConfigSubscriber sub = new GenericConfigSubscriber(new JRTConfigRequester(new MockConnection(), JRTConfigRequesterTest.getTestTimingValues()));
+        GenericConfigSubscriber subscriber = createSubscriber();
         final List<String> defContent = List.of("myVal int");
-        GenericConfigHandle handle = sub.subscribe(new ConfigKey<>("simpletypes", "id", "config"), defContent, sourceSet, JRTConfigRequesterTest.getTestTimingValues());
-        assertTrue(sub.nextConfig());
+        GenericConfigHandle handle = subscriber.subscribe(new ConfigKey<>("simpletypes", "id", "config"), defContent, sourceSet, JRTConfigRequesterTest.getTestTimingValues());
+        assertTrue(subscriber.nextConfig());
         assertTrue(handle.isChanged());
         assertThat(handle.getRawConfig().getPayload().withCompression(CompressionType.UNCOMPRESSED).toString(), is("{}")); // MockConnection returns empty string
-        assertFalse(sub.nextConfig());
+        assertFalse(subscriber.nextConfig());
         assertFalse(handle.isChanged());
     }
 
     @Test(expected=UnsupportedOperationException.class)
     public void testOverriddenSubscribeInvalid1() {
-        GenericConfigSubscriber sub = new GenericConfigSubscriber();
-        sub.subscribe(null, null);
+        createSubscriber().subscribe(null, null);
     }
 
     @Test(expected=UnsupportedOperationException.class)
     public void testOverriddenSubscribeInvalid2() {
-        GenericConfigSubscriber sub = new GenericConfigSubscriber();
-        sub.subscribe(null, null, 0L);
+        createSubscriber().subscribe(null, null, 0L);
     }
 
     @Test(expected=UnsupportedOperationException.class)
     public void testOverriddenSubscribeInvalid3() {
-        GenericConfigSubscriber sub = new GenericConfigSubscriber();
-        sub.subscribe(null, null, "");
+        createSubscriber().subscribe(null, null, "");
+    }
+
+    private GenericConfigSubscriber createSubscriber() {
+        return new GenericConfigSubscriber(new JRTConfigRequester(new MockConnection(), JRTConfigRequesterTest.getTestTimingValues()));
     }
 }