Cleanup, no functional changes

* Remove unused fields and methods, changes access level, syntax
  and comment fixese etc.

13 files changed, 26 insertions, 202 deletions

diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java
index 342e50821f4..b329d539757 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java
@@ -115,7 +115,7 @@ public class ConfigInstanceSerializerTest {
         builder.enumarr(ArraytypesConfig.Enumarr.Enum.VAL1);
         builder.enumarr(ArraytypesConfig.Enumarr.Enum.VAL2);
         builder.intarr(3);
-        builder.longarr(4l);
+        builder.longarr(4L);
         builder.stringarr("foo");
 
         final ArraytypesConfig config = new ArraytypesConfig(builder);
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 26b47f7621c..499772c60f4 100644
--- a/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java
@@ -64,7 +64,7 @@ public class GenericConfigSubscriberTest {
     @Test(expected=UnsupportedOperationException.class)
     public void testOverriddenSubscribeInvalid2() {
         GenericConfigSubscriber sub = new GenericConfigSubscriber();
-        sub.subscribe(null, null, 0l);
+        sub.subscribe(null, null, 0L);
     }
 
     @Test(expected=UnsupportedOperationException.class)
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
index 592bb7e4abf..5cad8e2890b 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
@@ -127,15 +127,7 @@ public class ConfigDefinitionBuilderTest {
         assertEquals(def.getStructMapDefs().get("myStructMap").getIntDefs().get("myIntDef").getDefVal(), (Integer)56);
         assertEquals(def.getStructMapDefs().get("myStructMap").getStringDefs().get("myStringDef").getDefVal(), "g");
 
+        // Ranges
     }
 
-    @Test
-    public void testCreateConfigDefinitionOverrideNamespace() throws IOException, InterruptedException {
-        File defFile = new File(DEF_NAME);
-        DefParser defParser = new DefParser(defFile.getName(), new FileReader(defFile));
-        CNode root = defParser.getTree();
-
-        ConfigDefinition def = ConfigDefinitionBuilder.createConfigDefinition(root, "foo");
-        assertThat(def.getNamespace(), is("foo"));
-    }
 }
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
index de2e30d66d7..0fae9b47467 100755
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionTest.java
@@ -110,7 +110,7 @@ public class ConfigDefinitionTest {
         def.addIntDef("myint");
         def.addIntDef("myintdef", 1);
         def.addLongDef("mylong");
-        def.addLongDef("mylongdef", 11l);
+        def.addLongDef("mylongdef", 11L);
         def.addDoubleDef("mydouble");
         def.addDoubleDef("mydoubledef", 2d);
         EnumDef ed = new EnumDef(new ArrayList<String>(){{add("a1"); add("a2");}}, null);
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java
index 35ceebe393c..8fc0b95ae97 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java
@@ -9,7 +9,6 @@ import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java
index 1e7b66fac38..397093d4359 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java
@@ -88,15 +88,15 @@ public class ConfigPayloadTest {
     @Test
     public void test_long_leaf() throws Exception {
         SimpletypesConfig config = createSimpletypesConfig("longval", "0");
-        assertThat(config.longval(), is(0l));
+        assertThat(config.longval(), is(0L));
         config = createSimpletypesConfig("longval", String.valueOf(Long.MIN_VALUE));
         assertThat(config.longval(), is(Long.MIN_VALUE));
         config = createSimpletypesConfig("longval", String.valueOf(Long.MAX_VALUE));
         assertThat(config.longval(), is(Long.MAX_VALUE));
         config = createSimpletypesConfig("longval", String.valueOf(10));
-        assertThat(config.longval(), is(10l));
+        assertThat(config.longval(), is(10L));
         config = createSimpletypesConfig("longval", String.valueOf(-10));
-        assertThat(config.longval(), is(-10l));
+        assertThat(config.longval(), is(- 10L));
     }
 
     @Test(expected = RuntimeException.class)
@@ -210,11 +210,11 @@ public class ConfigPayloadTest {
         // Normal behavior
         ArraytypesConfig config = createArraytypesConfig("longarr", new String[] { "2", "3", "1", "-2", "5"});
         assertThat(config.longarr().size(),  is(5));
-        assertThat(config.longarr(0), is(2l));
-        assertThat(config.longarr(1), is(3l));
-        assertThat(config.longarr(2), is(1l));
-        assertThat(config.longarr(3), is(-2l));
-        assertThat(config.longarr(4), is(5l));
+        assertThat(config.longarr(0), is(2L));
+        assertThat(config.longarr(1), is(3L));
+        assertThat(config.longarr(2), is(1L));
+        assertThat(config.longarr(3), is(- 2L));
+        assertThat(config.longarr(4), is(5L));
 
         final int size = 100;
         String [] largeArray = new String[size];
diff --git a/config/src/test/java/com/yahoo/vespa/config/SourceTest.java b/config/src/test/java/com/yahoo/vespa/config/SourceTest.java
deleted file mode 100644
index 989131c8256..00000000000
--- a/config/src/test/java/com/yahoo/vespa/config/SourceTest.java
+++ /dev/null
@@ -1,166 +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;
-
-import com.yahoo.config.ConfigurationRuntimeException;
-import com.yahoo.foo.SimpletypesConfig;
-import com.yahoo.vespa.config.protocol.CompressionType;
-import com.yahoo.vespa.config.protocol.DefContent;
-import com.yahoo.vespa.config.protocol.JRTClientConfigRequest;
-import com.yahoo.vespa.config.protocol.JRTClientConfigRequestV3;
-import com.yahoo.vespa.config.protocol.Payload;
-import com.yahoo.vespa.config.protocol.Trace;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
-
-/**
- * @author lulf
- * @since 5.1
- */
-public class SourceTest {
-
-    @Test
-    public void testSourceInterface() {
-        MockSourceConfig config = new MockSourceConfig(new ConfigKey<>(SimpletypesConfig.class, "foobio"));
-        assertThat(config.getKey().getConfigId(), is("foobio"));
-        config.setConfig(JRTClientConfigRequestV3.createWithParams(config.getKey(), DefContent.fromList(config.getDefContent()), "host", config.getDefMd5(), config.getGeneration(), 1000, Trace.createNew(), CompressionType.LZ4, Optional.empty()));
-        MockSource src = new MockSource(config);
-        assertThat(src.getState(), is(Source.State.NEW));
-        src.open();
-        assertTrue(src.opened);
-        assertTrue(src.getconfigged);
-        assertThat(src.getState(), is(Source.State.OPEN_PENDING));
-        src.open();
-        assertThat(src.getState(), is(Source.State.OPEN_PENDING));
-        src.getconfigged = false;
-        src.getConfig();
-        assertTrue(src.getconfigged);
-        assertThat(src.getState(), is(Source.State.OPEN_PENDING));
-        assertTrue(config.setConfigCalled);
-        assertTrue(src.openTimestamp > 0);
-        config.notifyInitMonitor();
-        config.setGeneration(4);
-        src.cancel();
-        assertTrue(src.canceled);
-        assertThat(src.getState(), is(Source.State.CANCEL_REQUESTED));
-        src.setState(Source.State.CANCELLED);
-        try {
-            src.open();
-            fail("Expected exception");
-        } catch (ConfigurationRuntimeException e) {
-        }
-        src.getconfigged = false;
-        src.getConfig();
-        assertFalse(src.getconfigged);
-        src.canceled = false;
-        src.cancel();
-        assertFalse(src.canceled);
-    }
-
-    public static class MockSource extends Source {
-        boolean opened, getconfigged, canceled = false;
-
-        public MockSource(SourceConfig sourceConfig) {
-            super(sourceConfig);
-        }
-
-        @Override
-        public void myOpen() {
-            opened = true;
-        }
-
-        @Override
-        protected void myGetConfig() {
-            getconfigged = true;
-        }
-
-        @Override
-        public void myCancel() {
-            canceled = true;
-        }
-    }
-
-    private static class MockSourceConfig implements SourceConfig {
-
-        boolean notifyCalled = false;
-        ConfigKey<?> key = null;
-        boolean setConfigCalled = false;
-        long generation = -1;
-        Payload payload;
-
-        public MockSourceConfig(ConfigKey<?> key) {
-            this.key = key;
-        }
-
-        @Override
-        public void notifyInitMonitor() {
-            notifyCalled = true;
-        }
-
-        @Override
-        public void setConfig(com.yahoo.vespa.config.protocol.JRTClientConfigRequest req) {
-            key = req.getConfigKey();
-            setConfigCalled = true;
-        }
-
-        @Override
-        public void setGeneration(long generation) {
-            this.generation = generation;
-        }
-
-        @Override
-        public String getDefName() {
-            return key.getName();
-        }
-
-        @Override
-        public String getDefNamespace() {
-            return key.getNamespace();
-        }
-
-        @Override
-        public String getDefVersion() {
-            return "";
-        }
-
-        @Override
-        public List<String> getDefContent() {
-            return Arrays.asList("foo");
-        }
-
-        @Override
-        public String getDefMd5() {
-            return key.getMd5();
-        }
-
-        @Override
-        public String getConfigId() {
-            return key.getConfigId();
-        }
-
-        @Override
-        public ConfigKey<?> getKey() {
-            return key;
-        }
-
-        @Override
-        public String getConfigMd5() {
-            return "bar";
-        }
-
-        @Override
-        public long getGeneration() {
-            return 0;
-        }
-
-        @Override
-        public RawConfig getConfig() {
-            return  new RawConfig(getKey(), getDefMd5(), payload, getConfigMd5(), generation, getDefContent(), Optional.empty());
-        }
-    }
-}
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/ConfigResponseTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/ConfigResponseTest.java
index e39c0a6f623..fe35a2cde91 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/ConfigResponseTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/ConfigResponseTest.java
@@ -35,7 +35,7 @@ public class ConfigResponseTest {
         assertNotNull(payload);
         assertThat(payload.size(), is(6));
         assertThat(payload.get(0), is("boolval false"));
-        assertThat(response.getGeneration(), is(3l));
+        assertThat(response.getGeneration(), is(3L));
         assertThat(response.getConfigMd5(), is("mymd5"));
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -56,7 +56,7 @@ public class ConfigResponseTest {
         assertNotNull(payload);
         assertThat(payload.size(), is(6));
         assertThat(payload.get(0), is("boolval false"));
-        assertThat(response.getGeneration(), is(3l));
+        assertThat(response.getGeneration(), is(3L));
         assertThat(response.getConfigMd5(), is("mymd5"));
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
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 0cf6491432d..4e2bd58e689 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
@@ -72,7 +72,9 @@ public abstract class JRTConfigRequestBase {
         return createReq(defName, defNamespace, defMd5, hostname, configId, ConfigUtils.getMd5(payload.getData()), currentGeneration, timeout, trace);
     }
 
-    protected abstract JRTClientConfigRequest createReq(String defName, String defNamespace, String defMd5, String hostname, String configId, String  configMd5, long currentGeneration, long timeout, Trace trace) throws IOException;
+    protected abstract JRTClientConfigRequest createReq(String defName, String defNamespace, String defMd5,
+                                                        String hostname, String configId, String configMd5,
+                                                        long currentGeneration, long timeout, Trace trace);
     protected abstract JRTServerConfigRequest createReq(Request request);
     protected abstract JRTClientConfigRequest createReq(JRTConfigSubscription<SimpletypesConfig> sub, Trace aNew);
     protected abstract JRTClientConfigRequest createFromRaw(RawConfig rawConfig, long serverTimeout, Trace aNew);
@@ -115,8 +117,8 @@ public abstract class JRTConfigRequestBase {
         assertThat(next.getConfigKey().getConfigId(), is(configId));
         assertThat(next.getDefContent().asStringArray(), is(expectedContent));
         assertFalse(next.noCache());
-        assertThat(next.getTimeout(), is(6l));
-        assertThat(next.getTimeout(), is(6l));
+        assertThat(next.getTimeout(), is(6L));
+        assertThat(next.getTimeout(), is(6L));
         return next;
     }
 
@@ -138,11 +140,11 @@ public abstract class JRTConfigRequestBase {
     public void ok_response_is_added() {
         Payload payload = createPayload("vale");
         String md5 = ConfigUtils.getMd5(payload.getData());
-        long generation = 4l;
+        long generation = 4L;
         serverReq.addOkResponse(payload, generation, md5);
         assertTrue(clientReq.validateResponse());
         assertThat(clientReq.getNewPayload().withCompression(CompressionType.UNCOMPRESSED).getData().toString(), is(payload.getData().toString()));
-        assertThat(clientReq.getNewGeneration(), is(4l));
+        assertThat(clientReq.getNewGeneration(), is(4L));
         assertThat(clientReq.getNewConfigMd5(), is(md5));
         assertTrue(clientReq.hasUpdatedConfig());
         assertTrue(clientReq.hasUpdatedGeneration());
@@ -166,7 +168,7 @@ public abstract class JRTConfigRequestBase {
     @Test
     public void generation_only_is_updated() {
         Payload payload = createPayload();
-        serverReq.addOkResponse(payload, 4l, ConfigUtils.getMd5(payload.getData()));
+        serverReq.addOkResponse(payload, 4L, ConfigUtils.getMd5(payload.getData()));
         boolean value = clientReq.validateResponse();
         assertTrue(clientReq.errorMessage(), value);
         assertFalse(clientReq.hasUpdatedConfig());
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java
index ec2ee479398..e88dda911d5 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactoryTest.java
@@ -10,8 +10,6 @@ import com.yahoo.vespa.config.RawConfig;
 import com.yahoo.vespa.config.TimingValues;
 import org.junit.Test;
 
-import java.util.Optional;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
index bcb88b2ff5e..e7e8a67dd49 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/JRTConfigRequestV3Test.java
@@ -8,7 +8,6 @@ import com.yahoo.vespa.config.*;
 import com.yahoo.vespa.config.util.ConfigUtils;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.Arrays;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -22,7 +21,9 @@ import static org.junit.Assert.assertTrue;
 public class JRTConfigRequestV3Test extends JRTConfigRequestBase {
 
     @Override
-    protected JRTClientConfigRequest createReq(String defName, String defNamespace, String defMd5, String hostname, String configId, String configMd5, long currentGeneration, long timeout, Trace trace) throws IOException {
+    protected JRTClientConfigRequest createReq(String defName, String defNamespace, String defMd5,
+                                               String hostname, String configId, String configMd5,
+                                               long currentGeneration, long timeout, Trace trace) {
         return JRTClientConfigRequestV3.createWithParams(ConfigKey.createFull(defName, configId, defNamespace, defMd5),
                 DefContent.fromList(Arrays.asList("namespace=my.name.space", "myfield string")),
                 hostname,
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java
index c3cbfecf1f1..9deedec2d19 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/PayloadTest.java
@@ -12,8 +12,6 @@ import java.io.UnsupportedEncodingException;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.fail;
 
 /**
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/SlimeTraceSerializerTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/SlimeTraceSerializerTest.java
index 4c69fa3e395..18e4cac8c8d 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/SlimeTraceSerializerTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/SlimeTraceSerializerTest.java
@@ -75,7 +75,7 @@ public class SlimeTraceSerializerTest {
 
     @Test
     public void test_long() throws IOException {
-        TraceNode root = new TraceNode(14l, 5);
+        TraceNode root = new TraceNode(14L, 5);
         assertThat(toJson(root), is("{\"timestamp\":5,\"payload\":14}"));
         assertSerialize(root);
     }