Minor cleanup, no functional changes

80 files changed, 111 insertions, 387 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java
index 1069f1cdd53..7c042656bda 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceSerializer.java
@@ -9,7 +9,6 @@ import com.yahoo.slime.Slime;
  * Implements a config instance serializer, serializing a config instance to a slime object.
  *
  * @author Ulf Lilleengen
- * @since 5.1.14
  */
 public class ConfigInstanceSerializer implements Serializer {
     private final Slime slime;
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java
index fb2a3acbfdc..9710ee607eb 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInstanceUtil.java
@@ -38,9 +38,7 @@ public class ConfigInstanceUtil {
         }
     }
 
-    public static <T extends ConfigInstance> T getNewInstance(Class<T> type,
-                                                              String configId,
-                                                              ConfigPayload payload) {
+    public static <T extends ConfigInstance> T getNewInstance(Class<T> type, String configId, ConfigPayload payload) {
         T instance;
         try {
             ConfigTransformer<?> transformer = new ConfigTransformer<>(type);
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java b/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java
index 1eaada5ae9d..121dba1e555 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigInterruptedException.java
@@ -4,7 +4,6 @@ package com.yahoo.config.subscription;
 /**
  * This exception is thrown when any blocking call within the Config API is interrupted.
  * @author Ulf Lilleengen
- * @since 5.1
  */
 @SuppressWarnings("serial")
 public class ConfigInterruptedException extends RuntimeException {
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java
index 57f4ad863f2..c3ceb81d3db 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSet.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.config.ConfigKey;
 /**
  * Config source as a programmatically built set of {@link com.yahoo.config.ConfigInstance}s
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public class ConfigSet implements ConfigSource {
     private final Map<ConfigKey<?>, ConfigInstance.Builder> configs = new ConcurrentHashMap<>();
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
index d0eda9d27cc..0aac060abf6 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSource.java
@@ -4,7 +4,7 @@ package com.yahoo.config.subscription;
 /**
  * A type of source of config
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public interface ConfigSource {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
index ae6f14ad59e..5c0b932dcce 100644
--- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
+++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java
@@ -25,7 +25,7 @@ import static java.util.stream.Collectors.toList;
  * {@link #subscribe(Class, String)} on the configs needed, call {@link #nextConfig(long)} and get the config from the
  * {@link ConfigHandle} which {@link #subscribe(Class, String)} returned.
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public class ConfigSubscriber implements AutoCloseable {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/DirSource.java b/config/src/main/java/com/yahoo/config/subscription/DirSource.java
index d90a0493838..6e12a38faa3 100644
--- a/config/src/main/java/com/yahoo/config/subscription/DirSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/DirSource.java
@@ -5,8 +5,7 @@ import java.io.File;
 
 /**
  * Source specifying config from a local directory
- * @author vegardh
- * @since 5.1
+ * @author Vegard Havdal
  *
  */
 public class DirSource implements ConfigSource {
diff --git a/config/src/main/java/com/yahoo/config/subscription/FileSource.java b/config/src/main/java/com/yahoo/config/subscription/FileSource.java
index 27129853eae..9b6fb6442e8 100644
--- a/config/src/main/java/com/yahoo/config/subscription/FileSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/FileSource.java
@@ -6,7 +6,7 @@ import java.io.File;
 /**
  * Source specifying config from one local file
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public class FileSource implements ConfigSource {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/JarSource.java b/config/src/main/java/com/yahoo/config/subscription/JarSource.java
index 6275befe18c..a098dec7f21 100644
--- a/config/src/main/java/com/yahoo/config/subscription/JarSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/JarSource.java
@@ -5,8 +5,7 @@ import java.util.jar.JarFile;
 
 /**
  * Source specifying config as a jar file entry
- * @author vegardh
- * @since 5.1
+ * @author Vegard Havdal
  *
  */
 public class JarSource implements ConfigSource {
diff --git a/config/src/main/java/com/yahoo/config/subscription/RawSource.java b/config/src/main/java/com/yahoo/config/subscription/RawSource.java
index d68b503eb74..099a6bdc334 100644
--- a/config/src/main/java/com/yahoo/config/subscription/RawSource.java
+++ b/config/src/main/java/com/yahoo/config/subscription/RawSource.java
@@ -4,7 +4,7 @@ package com.yahoo.config.subscription;
 /**
  * Source specifying raw config, where payload is given programmatically
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public class RawSource implements ConfigSource {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSetSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSetSubscription.java
index aa80cc75ef0..d3a1bfb50a9 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSetSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSetSubscription.java
@@ -11,8 +11,7 @@ import java.lang.reflect.Constructor;
 
 /**
  * Subscription on a programmatically built set of configs
- * @author vegardh
- * @since 5.1
+ * @author Vegard Havdal
  */
 public class ConfigSetSubscription<T extends ConfigInstance> extends ConfigSubscription<T> {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
index c02301a0c17..3bf6093e872 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
@@ -21,7 +21,7 @@ import com.yahoo.vespa.config.protocol.DefContent;
 /**
  * Represents one active subscription to one config
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public abstract class ConfigSubscription<T extends ConfigInstance> {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java
index bcee06cd667..60c920d1dfa 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java
@@ -18,7 +18,7 @@ import com.yahoo.log.LogLevel;
 /**
  * Subscription used when config id is file:...
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public class FileConfigSubscription<T extends ConfigInstance> extends ConfigSubscription<T> {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigHandle.java b/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigHandle.java
index bf247dffb7c..a40da85c88b 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigHandle.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/GenericConfigHandle.java
@@ -7,7 +7,7 @@ import com.yahoo.vespa.config.RawConfig;
 /**
  * A config handle which does not use the config class, but payload instead. Used in config proxy.
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class GenericConfigHandle extends ConfigHandle {
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 82d4708f53b..324546230d9 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
@@ -16,7 +16,7 @@ import com.yahoo.vespa.config.TimingValues;
 /**
  * A subscriber that can subscribe without the class. Used by configproxy.
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public class GenericConfigSubscriber extends ConfigSubscriber {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
index c1f9ce02650..0887ed9aad5 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/GenericJRTConfigSubscription.java
@@ -16,7 +16,7 @@ import com.yahoo.vespa.config.protocol.JRTClientConfigRequest;
  * A JRT subscription which does not use the config class, but {@link com.yahoo.vespa.config.RawConfig} instead.
  * Used by config proxy.
  *
- * @author vegardh
+ * @author Vegard Havdal
  *
  */
 public class GenericJRTConfigSubscription extends JRTConfigSubscription<RawConfig> {
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 06c772ac456..6390be7b59c 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
@@ -233,7 +233,7 @@ public class JRTConfigRequester implements RequestWaiter {
         suspendWarningLogged = Instant.MIN;
         noApplicationWarningLogged = Instant.MIN;
         connection.setSuccess();
-        sub.setLastCallBackOKTS(System.currentTimeMillis());
+        sub.setLastCallBackOKTS(Instant.now());
         if (jrtReq.hasUpdatedGeneration()) {
             // We only want this latest generation to be in the queue, we do not preserve history in this system
             sub.getReqQueue().clear();
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
index d9366c28b9b..8327f1c1351 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
@@ -1,6 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.subscription.impl;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
@@ -28,8 +30,8 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
     private JRTConfigRequester requester;
     private TimingValues timingValues;
 
-    // Last time we got an OK JRT callback for this
-    private long lastOK = 0;
+    // Last time we got an OK JRT callback
+    private Instant lastOK = Instant.MIN;
 
     /**
      * The queue containing either nothing or the one (newest) request that has got callback from JRT,
@@ -40,9 +42,9 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
 
     public JRTConfigSubscription(ConfigKey<T> key, ConfigSubscriber subscriber, ConfigSource source, TimingValues timingValues) {
         super(key, subscriber);
-        this.timingValues=timingValues;
+        this.timingValues = timingValues;
         if (source instanceof ConfigSourceSet) {
-            this.sources=(ConfigSourceSet) source;
+            this.sources = (ConfigSourceSet) source;
         }
     }
 
@@ -53,7 +55,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
         ConfigState<T> configState = getConfigState();
         boolean gotNew = configState.isGenerationChanged() || configState.isConfigChanged() || hasException();
         // Return that now, if there's nothing in queue, so that ConfigSubscriber can move on to other subscriptions to check
-        if (getReqQueue().peek()==null && gotNew) {
+        if (getReqQueue().peek() == null && gotNew) {
             return true;
         }
         // Otherwise poll the queue for another generation or timeout
@@ -135,11 +137,11 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
 
     @Override
     public boolean subscribe(long timeout) {
-        lastOK=System.currentTimeMillis();
+        lastOK = Instant.now();
         requester = getRequester();
         requester.request(this);
         JRTClientConfigRequest req = reqQueue.peek();
-        while (req == null && (System.currentTimeMillis() - lastOK <= timeout)) {
+        while (req == null && (Instant.now().isBefore(lastOK.plus(Duration.ofMillis(timeout))))) {
             try {
                 Thread.sleep(10);
             } catch (InterruptedException e) {
@@ -152,7 +154,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
 
     private JRTConfigRequester getRequester() {
         JRTConfigRequester requester = subscriber.requesters().get(sources);
-        if (requester==null) {
+        if (requester == null) {
             requester = new JRTConfigRequester(new JRTConnectionPool(sources), timingValues);
             subscriber.requesters().put(sources, requester);
         }
@@ -164,8 +166,9 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
     public void close() {
         super.close();
         reqQueue = new LinkedBlockingQueue<>() {
+            @SuppressWarnings("NullableProblems")
             @Override
-            public void put(JRTClientConfigRequest e) throws InterruptedException {
+            public void put(JRTClientConfigRequest e) {
                 // When closed, throw away all requests that callbacks try to put
             }
         };
@@ -191,7 +194,7 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
         log.log(LogLevel.DEBUG, "reload() is without effect on a JRTConfigSubscription.");
     }
 
-    void setLastCallBackOKTS(long lastCallBackOKTS) {
+    void setLastCallBackOKTS(Instant lastCallBackOKTS) {
         this.lastOK = lastCallBackOKTS;
     }
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java
index a96499482c5..05da9a72837 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/JarConfigSubscription.java
@@ -21,7 +21,7 @@ import com.yahoo.vespa.config.ConfigPayload;
 /**
  * Subscription to use when config id is jar:.../foo.jar[!/pathInJar/]
  *
- * @author vegardh
+ * @author Vegard Havdal
  * @author gjoranv
  */
 public class JarConfigSubscription<T extends ConfigInstance> extends ConfigSubscription<T> {
@@ -33,8 +33,8 @@ public class JarConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
     // jar:configs/app.jar!/configs/
     JarConfigSubscription(ConfigKey<T> key, ConfigSubscriber subscriber, String jarName, String path) {
         super(key, subscriber);
-        this.jarName=jarName;
-        this.path=path;
+        this.jarName = jarName;
+        this.path = path;
     }
 
     @Override
@@ -43,17 +43,18 @@ public class JarConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
             // Not supporting changing the payload for jar
             return true;
         }
-        if (zipEntry==null) {
+        if (zipEntry == null) {
             // First time polled
-            JarFile jarFile = null;
+            JarFile jarFile;
             try {
                 jarFile = new JarFile(jarName);
             } catch (IOException e) {
                 throw new IllegalArgumentException(e);
             }
             zipEntry = getEntry(jarFile, path);
-            if (zipEntry==null) throw new IllegalArgumentException("Config '" + key.getName() + "' not found in '" + jarName + "!/" + path + "'.");
-            T config = null;
+            if (zipEntry == null)
+                throw new IllegalArgumentException("Config '" + key.getName() + "' not found in '" + jarName + "!/" + path + "'.");
+            T config;
             try {
                 ConfigPayload payload = new CfgConfigPayloadBuilder().deserialize(Arrays.asList(IOUtils.readAll(new InputStreamReader(jarFile.getInputStream(zipEntry), StandardCharsets.UTF_8)).split("\n")));
                 config = payload.toInstance(configClass, key.getConfigId());
@@ -78,6 +79,7 @@ public class JarConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
         }
         return false;
     }
+
     /**
      * Returns the entry corresponding to the ConfigInstance's defName/Version in the given directory in
      * the given JarFile.
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java b/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java
index 9ad8f5c6ba2..58eed7f9e78 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/MockConnection.java
@@ -15,7 +15,6 @@ import com.yahoo.vespa.config.util.ConfigUtils;
  * For unit testing
  *
  * @author hmusum
- * @since 5.1.11
  */
 public class MockConnection implements ConnectionPool, com.yahoo.vespa.config.Connection {
 
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java
index bc546cfdd1f..68ff6bb0135 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/RawConfigSubscription.java
@@ -12,10 +12,10 @@ import com.yahoo.vespa.config.ConfigPayload;
 
 /**
  * Subscription used when config id is raw:...
- *
+ * <p>
  * Config is the actual text given after the config id, with newlines
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public class RawConfigSubscription<T extends ConfigInstance> extends ConfigSubscription<T> {
 
@@ -24,7 +24,7 @@ public class RawConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
 
     RawConfigSubscription(ConfigKey<T> key, ConfigSubscriber subscriber, String pl) {
         super(key, subscriber);
-        this.inputPayload=pl;
+        this.inputPayload = pl;
     }
 
     @Override
@@ -32,7 +32,7 @@ public class RawConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
         if (checkReloaded()) {
             return true;
         }
-        if (payload==null) {
+        if (payload == null) {
             payload = inputPayload;
             ConfigPayload configPayload = new CfgConfigPayloadBuilder().deserialize(Arrays.asList(payload.split("\n")));
             setConfig(0L, false, configPayload.toInstance(configClass, key.getConfigId()));
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java b/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java
index 55cb05ec230..6fcdc19cf97 100755
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigKey.java
@@ -78,7 +78,7 @@ public class ConfigKey<CONFIGCLASS extends ConfigInstance> implements Comparable
         if (!(o instanceof ConfigKey)) {
             return false;
         }
-        ConfigKey<?> key = (ConfigKey) o;
+        ConfigKey<?> key = (ConfigKey<?>) o;
         return (name.equals(key.name) &&
                 configId.equals(key.configId) &&
                 namespace.equals(key.namespace));
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayload.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayload.java
index 4f02df04b9b..f4858843574 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayload.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayload.java
@@ -20,7 +20,6 @@ import java.io.OutputStream;
  * A class that holds a representation of a config payload.
  *
  * @author Ulf Lilleengen
- * @since 5.1.6
  */
 public class ConfigPayload {
     private final Slime slime;
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
index 65106f158fc..97e85f1a39b 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadApplier.java
@@ -33,7 +33,6 @@ import java.util.logging.Logger;
  * TODO: This can be refactored a lot, since many of the reflection methods are duplicated
  *
  * @author Ulf Lilleengen, hmusum, Tony Vaagenes
- * @since 5.1.6
  */
 public class ConfigPayloadApplier<T extends ConfigInstance.Builder> {
     private final static Logger log = Logger.getLogger(ConfigPayloadApplier.class.getPackage().getName());
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java
index bb974ddae42..2e470ec55e4 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigPayloadBuilder.java
@@ -12,7 +12,6 @@ import java.util.*;
  *
  * TODO: Add toString
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ConfigPayloadBuilder {
 
diff --git a/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java b/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java
index 163e010cdd6..6d2ae3ef13e 100644
--- a/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java
+++ b/config/src/main/java/com/yahoo/vespa/config/ConfigTransformer.java
@@ -12,7 +12,6 @@ import static com.yahoo.vespa.config.ConfigPayloadApplier.IdentityPathAcquirer;
  * A utility class that can be used to transform config from one format to another.
  *
  * @author Ulf Lilleengen, hmusum, Tony Vaagenes
- * @since 5.1.6
  */
 public class ConfigTransformer<T extends ConfigInstance> {
     /**
diff --git a/config/src/main/java/com/yahoo/vespa/config/DefaultValueApplier.java b/config/src/main/java/com/yahoo/vespa/config/DefaultValueApplier.java
index f34b66e17a8..5bbc985cce0 100644
--- a/config/src/main/java/com/yahoo/vespa/config/DefaultValueApplier.java
+++ b/config/src/main/java/com/yahoo/vespa/config/DefaultValueApplier.java
@@ -11,7 +11,6 @@ import com.yahoo.slime.*;
  * TODO: Support giving correct type of default values
  *
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class DefaultValueApplier {
 
@@ -31,21 +30,11 @@ public class DefaultValueApplier {
     }
 
     private void applyDefaultsToMap(final Cursor cursor, final InnerCNode def) {
-        cursor.traverse(new ObjectTraverser() {
-            @Override
-            public void field(String name, Inspector inspector) {
-                applyDefaultsToObject(cursor.field(name), def);
-            }
-        });
+        cursor.traverse((ObjectTraverser) (name, inspector) -> applyDefaultsToObject(cursor.field(name), def));
     }
 
     private void applyDefaultsToArray(final Cursor cursor, final InnerCNode def) {
-        cursor.traverse(new ArrayTraverser() {
-            @Override
-            public void entry(int idx, Inspector inspector) {
-                applyDefaultsToObject(cursor.entry(idx), def);
-            }
-        });
+        cursor.traverse((ArrayTraverser) (idx, inspector) -> applyDefaultsToObject(cursor.entry(idx), def));
     }
 
     private void applyDefaultsToObject(Cursor cursor, InnerCNode def) {
diff --git a/config/src/main/java/com/yahoo/vespa/config/GenerationCounter.java b/config/src/main/java/com/yahoo/vespa/config/GenerationCounter.java
index c151121f0e9..3da09d07016 100644
--- a/config/src/main/java/com/yahoo/vespa/config/GenerationCounter.java
+++ b/config/src/main/java/com/yahoo/vespa/config/GenerationCounter.java
@@ -5,7 +5,6 @@ package com.yahoo.vespa.config;
  * Interface for counters.
  *
  * @author Ulf Lilleengen
- * @since 5.9
  */
 public interface GenerationCounter {
     /**
diff --git a/config/src/main/java/com/yahoo/vespa/config/GenericConfig.java b/config/src/main/java/com/yahoo/vespa/config/GenericConfig.java
index 2fbbda2aa38..2f351cc2bd4 100644
--- a/config/src/main/java/com/yahoo/vespa/config/GenericConfig.java
+++ b/config/src/main/java/com/yahoo/vespa/config/GenericConfig.java
@@ -6,7 +6,6 @@ import com.yahoo.config.ConfigInstance;
 
 /**
  *
- /**
  * A generic config with an internal generic builder that mimics a real config builder in order to support builders
  * when we don't have the schema.
  *
diff --git a/config/src/main/java/com/yahoo/vespa/config/SlimeUtils.java b/config/src/main/java/com/yahoo/vespa/config/SlimeUtils.java
index 80e93977980..89b482c03f1 100644
--- a/config/src/main/java/com/yahoo/vespa/config/SlimeUtils.java
+++ b/config/src/main/java/com/yahoo/vespa/config/SlimeUtils.java
@@ -20,12 +20,7 @@ public class SlimeUtils {
         if (from.type() != Type.OBJECT) {
             throw new IllegalArgumentException("Cannot copy object: " + from);
         }
-        from.traverse(new ObjectTraverser() {
-            @Override
-            public void field(String name, Inspector inspector) {
-                setObjectEntry(inspector, name, to);
-            }
-        });
+        from.traverse((ObjectTraverser) (name, inspector) -> setObjectEntry(inspector, name, to));
 
     }
 
@@ -61,13 +56,7 @@ public class SlimeUtils {
     }
 
     private static void copyArray(Inspector from, final Cursor to) {
-        from.traverse(new ArrayTraverser() {
-            @Override
-            public void entry(int i, Inspector inspector) {
-                addValue(inspector, to);
-            }
-        });
-
+        from.traverse((ArrayTraverser) (i, inspector) -> addValue(inspector, to));
     }
 
     private static void addValue(Inspector from, Cursor to) {
diff --git a/config/src/main/java/com/yahoo/vespa/config/buildergen/CompilationTask.java b/config/src/main/java/com/yahoo/vespa/config/buildergen/CompilationTask.java
index 7ac03ea6151..05125f8b08b 100644
--- a/config/src/main/java/com/yahoo/vespa/config/buildergen/CompilationTask.java
+++ b/config/src/main/java/com/yahoo/vespa/config/buildergen/CompilationTask.java
@@ -11,7 +11,6 @@ import javax.tools.JavaFileObject;
  * TODO: Assumes that diagnostics is the same as given to the task, not ideal.
  *
  * @author Ulf Lilleengen
- * @since 5.2
  */
 class CompilationTask {
     private final JavaCompiler.CompilationTask task;
diff --git a/config/src/main/java/com/yahoo/vespa/config/buildergen/CompiledBuilder.java b/config/src/main/java/com/yahoo/vespa/config/buildergen/CompiledBuilder.java
index 80909ab653d..fa5cf427aad 100644
--- a/config/src/main/java/com/yahoo/vespa/config/buildergen/CompiledBuilder.java
+++ b/config/src/main/java/com/yahoo/vespa/config/buildergen/CompiledBuilder.java
@@ -7,7 +7,6 @@ import com.yahoo.config.ConfigInstance;
  * Represents a builder that can be instantiated.
  *
  * @author Ulf Lilleengen
- * @since 5.2
  */
 public interface CompiledBuilder {
     <BUILDER extends ConfigInstance.Builder> BUILDER newInstance();
diff --git a/config/src/main/java/com/yahoo/vespa/config/buildergen/StringSourceObject.java b/config/src/main/java/com/yahoo/vespa/config/buildergen/StringSourceObject.java
index 1939a007059..c67d2121844 100644
--- a/config/src/main/java/com/yahoo/vespa/config/buildergen/StringSourceObject.java
+++ b/config/src/main/java/com/yahoo/vespa/config/buildergen/StringSourceObject.java
@@ -8,7 +8,6 @@ import java.net.URI;
  * Represents an in memory source object that can be compiled.
  *
  * @author Ulf Lilleengen
- * @since 5.2
  */
 class StringSourceObject extends SimpleJavaFileObject {
     private final String code;
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/CompressionInfo.java b/config/src/main/java/com/yahoo/vespa/config/protocol/CompressionInfo.java
index ba9fa601c81..bc6f97a3e00 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/CompressionInfo.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/CompressionInfo.java
@@ -10,7 +10,6 @@ import java.io.IOException;
  * Contains info relevant for compression and decompression.
  *
  * @author Ulf Lilleengen
- * @since 5.19
  */
 public class CompressionInfo {
     private static final String COMPRESSION_TYPE = "compressionType";
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/CompressionType.java b/config/src/main/java/com/yahoo/vespa/config/protocol/CompressionType.java
index c6548f63cd7..5fbd61cde3d 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/CompressionType.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/CompressionType.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.config.protocol;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.18
  */
 public enum CompressionType {
     UNCOMPRESSED, LZ4;
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/DefContent.java b/config/src/main/java/com/yahoo/vespa/config/protocol/DefContent.java
index ea2cf1a1bd8..3aa1898fcd1 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/DefContent.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/DefContent.java
@@ -12,7 +12,6 @@ import java.util.List;
 
 /**
 * @author Ulf Lilleengen
-* @since 5.3
 */
 public class DefContent {
     private final List<String> data;
@@ -35,12 +34,7 @@ public class DefContent {
 
     static DefContent fromSlime(Inspector data) {
         final List<String> lst = new ArrayList<>();
-        data.traverse(new ArrayTraverser() {
-            @Override
-            public void entry(int idx, Inspector inspector) {
-                lst.add(inspector.asString());
-            }
-        });
+        data.traverse((ArrayTraverser) (idx, inspector) -> lst.add(inspector.asString()));
         return new DefContent(lst);
     }
 
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactory.java b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactory.java
index 9dec28b13e0..0861c5008c0 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactory.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/JRTConfigRequestFactory.java
@@ -12,7 +12,6 @@ import java.util.*;
  * To hide JRT implementations.
  *
  * @author Ulf Lilleengen
- * @since 5.3
  */
 public class JRTConfigRequestFactory {
 
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/NoCopyByteArrayOutputStream.java b/config/src/main/java/com/yahoo/vespa/config/protocol/NoCopyByteArrayOutputStream.java
index 79746127bcd..61a742ade3b 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/NoCopyByteArrayOutputStream.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/NoCopyByteArrayOutputStream.java
@@ -7,7 +7,6 @@ import java.io.ByteArrayOutputStream;
  * Subclass of {@link java.io.ByteArrayOutputStream} that gives effective {@link #toByteArray()} method.
  *
  * @author Ulf Lilleengen
- * @since 5.19
  */
 class NoCopyByteArrayOutputStream extends ByteArrayOutputStream {
     public NoCopyByteArrayOutputStream() {
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java b/config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java
index fed9a96504d..8c7c7f2703e 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/RequestValidation.java
@@ -14,7 +14,6 @@ import java.util.regex.Pattern;
  * Static utility methods for verifying common request properties.
  *
  * @author Ulf Lilleengen
- * @since 5.3
  */
 public class RequestValidation {
     private static final Logger log = Logger.getLogger(RequestValidation.class.getName());
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
index 3ccf71ec519..49fdde7c9a2 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
@@ -39,15 +39,15 @@ public abstract class SlimeClientConfigRequest implements JRTClientConfigRequest
                                        CompressionType compressionType,
                                        Optional<VespaVersion> vespaVersion) {
         Slime data = SlimeRequestData.encodeRequest(key,
-                hostname,
-                defSchema,
-                configMd5,
-                generation,
-                timeout,
-                trace,
-                getProtocolVersion(),
-                compressionType,
-                vespaVersion);
+                                                    hostname,
+                                                    defSchema,
+                                                    configMd5,
+                                                    generation,
+                                                    timeout,
+                                                    trace,
+                                                    getProtocolVersion(),
+                                                    compressionType,
+                                                    vespaVersion);
         Request jrtReq = new Request(getJRTMethodName());
         jrtReq.parameters().add(new StringValue(encodeAsUtf8String(data, true)));
 
@@ -134,7 +134,7 @@ public abstract class SlimeClientConfigRequest implements JRTClientConfigRequest
 
     protected long newGen() {
         long newGen = getNewGeneration();
-        if (newGen==0) return getRequestGeneration();
+        if (newGen == 0) return getRequestGeneration();
         return newGen;
     }
 
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeServerConfigRequest.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeServerConfigRequest.java
index 34d6f90cbcb..19dc4a4d51a 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeServerConfigRequest.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeServerConfigRequest.java
@@ -3,10 +3,12 @@ package com.yahoo.vespa.config.protocol;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.yahoo.jrt.*;
-import com.yahoo.slime.*;
+import com.yahoo.jrt.Request;
+import com.yahoo.jrt.StringValue;
+import com.yahoo.jrt.Value;
+import com.yahoo.slime.Slime;
 import com.yahoo.text.Utf8Array;
-import com.yahoo.vespa.config.*;
+import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.ErrorCode;
 
 import java.io.ByteArrayOutputStream;
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeTraceDeserializer.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeTraceDeserializer.java
index f4754f4b0e1..998d2c8bcf5 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeTraceDeserializer.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeTraceDeserializer.java
@@ -9,7 +9,6 @@ import com.yahoo.yolean.trace.TraceNode;
  * Deserializing from a {@link Inspector} (slime) representation to a {@link TraceNode}
  *
  * @author Ulf Lilleengen
- * @since 5.5
  */
 public class SlimeTraceDeserializer {
     private final Inspector entry;
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeTraceSerializer.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeTraceSerializer.java
index 62fa6f8a882..5f5f057a26b 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeTraceSerializer.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeTraceSerializer.java
@@ -12,7 +12,6 @@ import java.util.Stack;
  * Serialize a {@link TraceNode} to {@link com.yahoo.slime.Slime}.
  *
  * @author Ulf Lilleengen
- * @since 5.5
  */
 public class SlimeTraceSerializer extends TraceVisitor {
     static final String TIMESTAMP = "timestamp";
@@ -30,7 +29,6 @@ public class SlimeTraceSerializer extends TraceVisitor {
         current.setLong(TIMESTAMP, node.timestamp());
         encodePayload(current, node.payload());
         addChildrenCursors(current, node);
-
     }
 
     private void encodePayload(Cursor current, Object payload) {
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/Trace.java b/config/src/main/java/com/yahoo/vespa/config/protocol/Trace.java
index 17740c9f40d..fbeafdc3f6f 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/Trace.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/Trace.java
@@ -13,7 +13,6 @@ import java.time.Clock;
  * A trace utility that can serialize/deserialize to/from {@link Slime}
  *
  * @author Ulf Lilleengen
- * @since 5.3
  */
 public class Trace {
     private static final String TRACE_TRACELOG = "traceLog";
diff --git a/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java b/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java
index d7653572773..8f856ff4771 100644
--- a/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java
+++ b/config/src/main/java/com/yahoo/vespa/config/util/ConfigUtils.java
@@ -33,6 +33,7 @@ import java.util.regex.Pattern;
  * Utilities for mangling config text, finding md5sums, finding name and namespace in .def files etc.
  */
 public class ConfigUtils {
+
     /* Patterns used for finding ranges in config definitions */
     private static final Pattern intPattern = Pattern.compile(".*int.*range.*");
     private static final Pattern doublePattern = Pattern.compile(".*double.*range.*");
@@ -88,6 +89,7 @@ public class ConfigUtils {
 
     /**
      * Replaces sequences of spaces with 1 space, unless inside quotes. Public for testing;
+     *
      * @param str String to strip spaces from
      * @return String with spaces stripped
      */
@@ -103,15 +105,15 @@ public class ConfigUtils {
                 }
                 if (!inSpaceSequence) {
                     // start of space sequence
-                    inSpaceSequence=true;
+                    inSpaceSequence = true;
                     ret.append(" ");
                 }
             } else {
                 if (inSpaceSequence) {
-                    inSpaceSequence=false;
+                    inSpaceSequence = false;
                 }
-                if (c=='\"') {
-                    inQuotes=!inQuotes;
+                if (c == '\"') {
+                    inQuotes = !inQuotes;
                 }
                 ret.append(c);
             }
@@ -121,7 +123,7 @@ public class ConfigUtils {
 
     /**
      * Computes Md5 hash of a list of strings with the contents of a def-file.
-     *
+     * <p>
      * Each string is normalized according to the
      * rules of Vespa config definition files before they are used:
      * <ol>
@@ -132,12 +134,12 @@ public class ConfigUtils {
      * <li>Remove 'version=&lt;version-number&gt;'</li>
      * </ol>
      *
-     * @param lines  A list of lines constituting a def-file
+     * @param lines A list of lines constituting a def-file
      * @return the Md5 hash of the list, with lowercase letters
      */
     public static String getDefMd5(List<String> lines) {
         List<String> linesCopy = new ArrayList<>(lines);
-        for (Iterator<String> it=linesCopy.iterator(); it.hasNext(); ) {
+        for (Iterator<String> it = linesCopy.iterator(); it.hasNext(); ) {
             String line = it.next().trim();
             if (! line.startsWith("#") && ! line.equals("")) {
                 if (line.startsWith("version")) {
@@ -169,7 +171,7 @@ public class ConfigUtils {
             }
             if (line.length() > 0) {
                 line = stripSpaces(line);
-                m  = spaceBeforeCommaPatter.matcher(line);
+                m = spaceBeforeCommaPatter.matcher(line);
                 line = m.replaceAll(",");   // Remove space before comma (for enums)
                 sb.append(line).append("\n");
             }
@@ -188,7 +190,7 @@ public class ConfigUtils {
     public static String getDefNamespace(Reader in) {
         List<String> defLines = getDefLines(in);
         String defPackage = getDefKeyword(defLines, "package");
-        if (! defPackage.isEmpty()) return defPackage;
+        if (!defPackage.isEmpty()) return defPackage;
         return getDefKeyword(defLines, "namespace");
     }
 
@@ -285,7 +287,7 @@ public class ConfigUtils {
      */
     public static ConfigDefinitionKey createConfigDefinitionKeyFromDefFile(File file) throws IOException {
         String[] fileName = file.getName().split("\\.");
-        assert(fileName.length >= 2);
+        assert (fileName.length >= 2);
         String name = fileName[fileName.length - 2];
         byte[] content = IOUtils.readFileBytes(file);
 
@@ -295,7 +297,7 @@ public class ConfigUtils {
     /**
      * Creates a ConfigDefinitionKey from a name and the content of a config definition
      *
-     * @param name the name of the config definition
+     * @param name    the name of the config definition
      * @param content content of a config definition
      * @return a ConfigDefinitionKey
      */
@@ -306,6 +308,7 @@ public class ConfigUtils {
 
     /**
      * Escapes a config value according to the cfg format.
+     *
      * @param input the string to escape
      * @return the escaped string
      */
@@ -350,10 +353,10 @@ public class ConfigUtils {
      * Loop through values and return the first one that is set and non-empty.
      *
      * @param defaultValue The default value to use if no environment variables are set.
-     * @param envVars one or more environment variable strings
+     * @param envVars      one or more environment variable strings
      * @return a String with the value of the environment variable
      */
-    public static String getEnvValue(String defaultValue, String ... envVars) {
+    public static String getEnvValue(String defaultValue, String... envVars) {
         String value = null;
         for (String envVar : envVars) {
             if (value == null || value.isEmpty()) {
diff --git a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java
index d4280c6300f..c8693227920 100644
--- a/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/CfgConfigPayloadBuilderTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author hmusum
  * @author Vegard Sjonfjell
- * @since 5.1
  */
 public class CfgConfigPayloadBuilderTest {
 
@@ -135,7 +134,7 @@ public class CfgConfigPayloadBuilderTest {
                 "                'boolVal': 'true'",
                 "            },",
                 "            {",
-                "                'stringVal': 'blue a=\\\'escaped\\\'',",
+                "                'stringVal': 'blue a=\\'escaped\\'',",
                 "                'boolVal': 'false'",
                 "            }",
                 "        ],",
@@ -182,7 +181,7 @@ public class CfgConfigPayloadBuilderTest {
         assertDeserializedConfigEqualsJson("a b=\"escaped\"",
                 inputJson(
                         "{",
-                        " 'a': 'b=\\\'escaped\\\''",
+                        " 'a': 'b=\\'escaped\\''",
                         "}"
                 )
         );
@@ -305,7 +304,7 @@ public class CfgConfigPayloadBuilderTest {
     }
 
     private static void assertDeserializedConfigEqualsJson(String serializedConfig, String expectedJson) {
-        assertDeserializedConfigEqualsJson(Arrays.asList(serializedConfig), expectedJson);
+        assertDeserializedConfigEqualsJson(List.of(serializedConfig), expectedJson);
     }
 
     private static void assertDeserializedConfigEqualsJson(List<String> inputConfig, String expectedJson) {
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
index 2d0a40bcdc4..49fd25b6476 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.fail;
 
 /**
  * @author gjoranv
- * @since 5.1.6
  */
 public class ConfigInstancePayloadTest {
 
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializationTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializationTest.java
index 8d9b2d96b04..95ffb31fe7d 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializationTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializationTest.java
@@ -3,7 +3,6 @@ package com.yahoo.config.subscription;
 
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.foo.FunctionTestConfig;
-import com.yahoo.config.codegen.DefLine;
 import com.yahoo.vespa.config.ConfigPayload;
 import org.junit.Test;
 
@@ -18,14 +17,6 @@ import static org.junit.Assert.assertThat;
  */
 public class ConfigInstanceSerializationTest {
 
-    private DefLine.Type stringType = new DefLine.Type("string");
-    private DefLine.Type intType = new DefLine.Type("int");
-    private DefLine.Type longType = new DefLine.Type("long");
-    private DefLine.Type boolType = new DefLine.Type("bool");
-    private DefLine.Type doubleType = new DefLine.Type("double");
-    private DefLine.Type fileType = new DefLine.Type("file");
-    private DefLine.Type refType = new DefLine.Type("reference");
-
     @Test
     public void require_symmetrical_serialization_and_deserialization_with_builder() {
         FunctionTestConfig config = ConfigInstancePayloadTest.createVariableAccessConfigWithBuilder();
@@ -40,218 +31,4 @@ public class ConfigInstanceSerializationTest {
         assertThat(ConfigInstance.serialize(config), is(ConfigInstance.serialize(config2)));
     }
 
-/** Looks like everything in the commented block tests unused api's.. remove?
-
-    @Test
-    public void testSerializeAgainstConfigDefinitionAllowNothing() {
-        FunctionTestConfig config = ConfigInstancePayloadTest.createVariableAccessConfigWithBuilder();
-        InnerCNode def = new InnerCNode("function-test");
-        List<String> payload = Validator.serialize(config, def);
-        Assert.assertEquals(payload.size(), 0);
-    }
-
-    @Test
-    public void testSerializeAgainstConfigDefinitionAllLeaves() {
-        FunctionTestConfig config = ConfigInstancePayloadTest.createVariableAccessConfigWithBuilder();
-        InnerCNode def = new InnerCNode("function-test");
-        def.children().put("bool_val", LeafCNode.newInstance(boolType, def, "bool_val"));
-        def.children().put("bool_with_def", LeafCNode.newInstance(boolType, def, "bool_with_def"));
-        def.children().put("int_val", LeafCNode.newInstance(intType, def, "int_val"));
-        def.children().put("int_with_def", LeafCNode.newInstance(intType, def, "int_with_def"));
-        def.children().put("long_val", LeafCNode.newInstance(longType, def, "long_val"));
-        def.children().put("long_with_def", LeafCNode.newInstance(longType, def, "long_with_def"));
-        def.children().put("double_val", LeafCNode.newInstance(doubleType, def, "double_val"));
-        def.children().put("double_with_def", LeafCNode.newInstance(doubleType, def, "double_with_def"));
-        def.children().put("string_val", LeafCNode.newInstance(stringType, def, "string_val"));
-        def.children().put("stringwithdef", LeafCNode.newInstance(stringType, def, "stringwithdef"));
-        def.children().put("enum_val", LeafCNode.newInstance(enumType(new String[]{"FOO", "BAR", "FOOBAR"}), def, "enum_val"));
-        def.children().put("enumwithdef", LeafCNode.newInstance(enumType(new String[]{"FOO2", "BAR2", "FOOBAR2"}), def, "enumwithdef", "BAR2"));
-        def.children().put("refval", LeafCNode.newInstance(refType, def, "refval"));
-        def.children().put("refwithdef", LeafCNode.newInstance(refType, def, "refwithdef"));
-        def.children().put("fileVal", LeafCNode.newInstance(fileType, def, "fileVal"));
-
-        List<String> payload = Validator.serialize(config, def);
-        String plString = payload.toString();
-        Assert.assertTrue(plString.matches(".*bool_val false.*"));
-        Assert.assertTrue(plString.matches(".*bool_with_def true.*"));
-        Assert.assertTrue(plString.matches(".*int_val 5.*"));
-        Assert.assertTrue(plString.matches(".*int_with_def -14.*"));
-        Assert.assertTrue(plString.matches(".*long_val 12345678901.*"));
-        Assert.assertTrue(plString.matches(".*long_with_def -9876543210.*"));
-        Assert.assertTrue(plString.matches(".*double_val 41\\.23.*"));
-        Assert.assertTrue(plString.matches(".*double_with_def -12.*"));
-        Assert.assertTrue(plString.matches(".*string_val \"foo\".*"));
-        Assert.assertTrue(plString.matches(".*stringwithdef \"bar and foo\".*"));
-        Assert.assertTrue(plString.matches(".*enum_val FOOBAR.*"));
-        Assert.assertTrue(plString.matches(".*enumwithdef BAR2.*"));
-        Assert.assertTrue(plString.matches(".*refval \\:parent\\:.*"));
-        Assert.assertTrue(plString.matches(".*refwithdef \\:parent\\:.*"));
-        Assert.assertTrue(plString.matches(".*fileVal \"etc\".*"));
-    }
-
-    @Test
-    public void testSerializeAgainstConfigDefinitionSomeLeaves() {
-        FunctionTestConfig config = ConfigInstancePayloadTest.createVariableAccessConfigWithBuilder();
-        InnerCNode def = new InnerCNode("function-test");
-        def.children().put("stringwithdef", LeafCNode.newInstance(stringType, def, "stringwithdef"));
-        def.children().put("long_with_def", LeafCNode.newInstance(longType, def, "long_with_def"));
-        // But not double_with_def etc, and no structs/arrays
-        List<String> payload = Validator.serialize(config, def);
-        String plString = payload.toString();
-        Assert.assertTrue(plString.matches(".*long_with_def \\-9876543210.*"));
-        Assert.assertTrue(plString.matches(".*stringwithdef \"bar and foo\".*"));
-        Assert.assertFalse(plString.matches(".*double_with_def.*"));
-        Assert.assertFalse(plString.matches(".*fileVal \"etc\".*"));
-        Assert.assertFalse(plString.matches(".*basicStruct.*"));
-    }
-
-    @Test
-    public void testSerializationAgainstConfigDefinitionAddedValsInDef() {
-        FunctionTestConfig config = ConfigInstancePayloadTest.createVariableAccessConfigWithBuilder();
-        InnerCNode def = new InnerCNode("function-test");
-        def.children().put("stringwithdef", LeafCNode.newInstance(stringType, def, "stringwithdef"));
-        def.children().put("someotherstring", LeafCNode.newInstance(stringType, def, "someotherstring", "some other"));
-        def.children().put("long_with_def", LeafCNode.newInstance(longType, def, "long_with_def"));
-        def.children().put("some_other_long", LeafCNode.newInstance(longType, def, "some_other_long", "88"));
-        def.children().put("some_other_enum", LeafCNode.newInstance(enumType(new String[]{"hey", "ho", "lets", "go"}), def, "some_other_enum", "lets"));
-        def.children().put("int_val_nofdef", LeafCNode.newInstance(intType, def, "int_val_nodef", null));
-
-        // But not double_with_def etc, and no structs/arrays
-        List<String> payload = Validator.serialize(config, def);
-        String plString = payload.toString();
-        Assert.assertTrue(plString.matches(".*long_with_def \\-9876543210.*"));
-        Assert.assertTrue(plString.matches(".*stringwithdef \"bar and foo\".*"));
-        Assert.assertTrue(plString.matches(".*.someotherstring \"some other\".*"));
-        Assert.assertTrue(plString.matches(".*some_other_long 88.*"));
-        Assert.assertTrue(plString.matches(".*some_other_enum lets.*"));
-        Assert.assertFalse(plString.matches(".*double_with_def.*"));
-        Assert.assertFalse(plString.matches(".*fileVal \"etc\".*"));
-        Assert.assertFalse(plString.matches(".*basicStruct.*"));
-        Assert.assertFalse(plString.matches(".*int_val_nodef.*"));
-    }
-
-    @Test
-    public void testSerializeAgainstConfigDefinitionMismatchAllWays() {
-        FunctionTestConfig config = ConfigInstancePayloadTest.createVariableAccessConfigWithBuilder();
-
-        // Create all sorts of mismatches in the def schema used to serialize
-        InnerCNode def = new InnerCNode("function-test");
-        def.children().put("long_with_def", LeafCNode.newInstance(longType, def, "long_with_def"));
-        def.children().put("stringwithdef", LeafCNode.newInstance(intType, def, "stringwithdef"));
-        def.children().put("basicStruct", LeafCNode.newInstance(intType, def, "basicStruct"));
-        InnerCNode doubleValWrong = new InnerCNode("double_val");
-        doubleValWrong.children().put("foo", LeafCNode.newInstance(intType, def, "foo"));
-        def.children().put("double_val", doubleValWrong);
-        InnerCNode myArray = new InnerCNode("myarray");
-        myArray.children().put("intval", LeafCNode.newInstance(stringType, myArray, "foo"));
-        InnerCNode myStruct = new InnerCNode("myStruct");
-        myStruct.children().put("a", LeafCNode.newInstance(stringType, myStruct, "foo"));
-        myArray.children().put("myStruct", myStruct);
-        def.children().put("myarray", myArray);
-
-        List<String> payload = Validator.serialize(config, def);
-        String plString = payload.toString();
-        Assert.assertTrue(plString.matches(".*long_with_def.*"));
-        Assert.assertFalse(plString.matches(".*stringwithdef.*"));
-        Assert.assertFalse(plString.matches(".*basicStruct.*"));
-        Assert.assertFalse(plString.matches(".*double_val.*"));
-        Assert.assertFalse(plString.matches(".*intval.*"));
-        Assert.assertFalse(plString.matches(".*\\.a.*"));
-    }
-
-    @Test
-    public void testSerializeAgainstConfigDefinitionComplex() {
-        FunctionTestConfig config = ConfigInstancePayloadTest.createVariableAccessConfigWithBuilder();
-
-        // Build a pretty complex def programatically
-        InnerCNode def = new InnerCNode("function-test");
-        def.children().put("stringwithdef", LeafCNode.newInstance(stringType, def, "stringwithdef"));
-        def.children().put("someUnknownStringNoDefault", LeafCNode.newInstance(stringType, def, "someUnknownStringNoDefault"));
-        InnerCNode basicStruct = new InnerCNode("basicStruct");
-        basicStruct.children().put("foo", LeafCNode.newInstance(stringType, def, "foo")); // but not bar
-        InnerCNode rootStruct = new InnerCNode("rootStruct");
-        InnerCNode inner1 = new InnerCNode("inner1");
-        InnerCNode someUnknwonStruct = new InnerCNode("someUnknownStruct");
-        InnerCNode someUnknownInner = new InnerCNode("someUnknownInner");
-        InnerCNode innerArr = new InnerCNode("innerArr");
-        rootStruct.children().put("inner1", inner1);
-        rootStruct.children().put("someUnknownStruct", someUnknwonStruct);
-        rootStruct.children().put("someUnknownInner", someUnknownInner);
-        rootStruct.children().put("innerArr", innerArr);
-        InnerCNode myarray = new InnerCNode("myarray");
-        InnerCNode unknownInner = new InnerCNode("unknownInner");
-        def.children().put("basicStruct", basicStruct);
-        def.children().put("rootStruct", rootStruct);
-        def.children().put("myarray", myarray);
-        def.children().put("unknownInner", unknownInner);
-        inner1.children().put("index", LeafCNode.newInstance(intType, inner1, "index"));
-        inner1.children().put("someUnknownInt", LeafCNode.newInstance(intType, inner1, "someUnknownInt", "-98"));
-        inner1.children().put("someUnknownIntNoDefault", LeafCNode.newInstance(intType, inner1, "someUnknownIntNoDefault"));
-        inner1.children().put("someUnknownEnum", LeafCNode.newInstance(enumType(new String[]{"goo", "go", "gorilla"}), inner1, "someUnknownEnum", "go"));
-        inner1.children().put("someUnknownEnumNoDefault", LeafCNode.newInstance(enumType(new String[]{"foo", "bar", "baz"}), inner1, "someUnknownEnumNoDefault"));
-        someUnknwonStruct.children().put("anint", LeafCNode.newInstance(intType, someUnknwonStruct, "anint", "3"));// But no instances of this in config
-        someUnknownInner.children().put("along", LeafCNode.newInstance(longType, someUnknownInner, "along", "234"));// No instance in config
-        innerArr.children().put("boolVal", LeafCNode.newInstance(boolType, innerArr, "boolVal"));
-        innerArr.children().put("someUnknownDouble", LeafCNode.newInstance(doubleType, innerArr, "someUnknownDouble", "-675.789"));
-        innerArr.children().put("someUnknownDoubleNoDefault", LeafCNode.newInstance(doubleType, innerArr, "someUnknownDoubleNoDefault"));
-        myarray.children().put("fileVal", LeafCNode.newInstance(fileType, myarray, "fileVal"));
-        myarray.children().put("stringval", new InnerCNode("stringval[]"));
-        // TODO make sure default for file is not allowed
-        //myarray.children().put("someUnknownFile", LeafCNode.newInstance(fileType, myarray, "someUnknownFile", "opt/"));
-        unknownInner.children().put("aDouble", LeafCNode.newInstance(doubleType, unknownInner, "aDouble", "1234"));
-        def.children().put("longarr", new InnerCNode("longarr[]"));
-        def.children().put("boolarr", new InnerCNode("boolarr[]"));
-        def.children().put("doublearr", new InnerCNode("doublearr[]"));
-        def.children().put("stringarr", new InnerCNode("stringarr[]"));
-        def.children().put("fileArr", new InnerCNode("fileArr[]"));
-        def.children().put("refarr", new InnerCNode("refarr[]"));
-        def.children().put("enumarr", new InnerCNode("enumarr[]"));
-        List<String> payload = Validator.serialize(config, def);
-        String plString = payload.toString();
-        Assert.assertFalse(plString.matches(".*long_with_def \\-9876543210.*"));
-        Assert.assertFalse(plString.matches(".*someUnknownStringNoDefault.*"));
-        Assert.assertTrue(plString.matches(".*stringwithdef \"bar and foo\".*"));
-        Assert.assertFalse(plString.matches(".*double_with_def.*"));
-        Assert.assertFalse(plString.matches(".*fileVal etc.*"));
-        Assert.assertTrue(plString.matches(".*basicStruct\\.foo \"basicFoo\".*"));
-        Assert.assertFalse(plString.matches(".*basicStruct\\.bar.*"));
-        Assert.assertFalse(plString.matches(".*rootStruct\\.inner0.*"));
-        Assert.assertFalse(plString.matches(".*unknownInner.*"));
-        Assert.assertFalse(plString.matches(".*rootStruct\\.someUnknownStruct.*"));
-        Assert.assertFalse(plString.matches(".*rootStruct\\.someUnknownInner.*"));
-        Assert.assertFalse(plString.matches(".*rootStruct\\.inner1\\.name.*"));
-        Assert.assertTrue(plString.matches(".*rootStruct\\.inner1\\.index 12.*"));
-        Assert.assertTrue(plString.matches(".*rootStruct\\.inner1\\.someUnknownInt -98.*"));
-        Assert.assertTrue(plString.matches(".*rootStruct\\.inner1\\.someUnknownEnum go.*"));
-        Assert.assertTrue(plString.matches(".*rootStruct\\.innerArr\\[0\\]\\.boolVal true.*"));
-        Assert.assertFalse(plString.matches(".*someUnknownEnumNoDefault.*"));
-        Assert.assertFalse(plString.matches(".*someUnknownDoubleNoDefault.*"));
-        Assert.assertFalse(plString.matches(".*someUnknownIntNoDefault.*"));
-        Assert.assertTrue(plString.matches(".*rootStruct\\.innerArr\\[0\\]\\.someUnknownDouble -675.789.*"));
-        Assert.assertFalse(plString.matches(".*rootStruct\\.innerArr\\[0\\]\\.stringVal*"));
-        Assert.assertFalse(plString.matches(".*myarray\\[0\\].intval.*"));
-        Assert.assertTrue(plString.matches(".*myarray\\[0\\].fileVal \"file0\".*"));
-        //assertTrue(plString.matches(".*myarray\\[0\\].someUnknownFile \"opt/\".*"));
-        Assert.assertTrue(plString.matches(".*myarray\\[0\\].stringval\\[0\\] \"baah\".*"));
-        Assert.assertTrue(plString.matches(".*myarray\\[0\\].stringval\\[1\\] \"yikes\".*"));
-        Assert.assertTrue(plString.matches(".*myarray\\[1\\].fileVal \"file1\".*"));
-        Assert.assertFalse(plString.matches(".*myarray\\[1\\].enumVal.*"));
-        Assert.assertFalse(plString.matches(".*myarray\\[1\\].refVal.*"));
-        Assert.assertTrue(plString.matches(".*boolarr\\[0\\] false.*"));
-        Assert.assertTrue(plString.matches(".*longarr\\[0\\] 9223372036854775807.*"));
-        Assert.assertTrue(plString.matches(".*longarr\\[1\\] -9223372036854775808.*"));
-        Assert.assertTrue(plString.matches(".*doublearr\\[0\\] 2344\\.0.*"));
-        Assert.assertTrue(plString.matches(".*doublearr\\[1\\] 123\\.0.*"));
-        Assert.assertTrue(plString.matches(".*stringarr\\[0\\] \"bar\".*"));
-        Assert.assertTrue(plString.matches(".*enumarr\\[0\\] VALUES.*"));
-        Assert.assertTrue(plString.matches(".*refarr\\[0\\] \\:parent\\:.*"));
-        Assert.assertTrue(plString.matches(".*refarr\\[1\\] \\:parent.*"));
-        Assert.assertTrue(plString.matches(".*refarr\\[2\\] parent\\:.*"));
-        Assert.assertTrue(plString.matches(".*fileArr\\[0\\] \"bin\".*"));
-    }
-
-    private DefLine.Type enumType(String[] strings) {
-        return new DefLine.Type("enum").setEnumArray(strings);
-    }
-**/
 }
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 ee8682efe3c..7c08d0175a1 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceSerializerTest.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.fail;
 /**
  * @author Ulf Lilleengen
  * @author Vegard Sjonfjell
- * @since 5.1
  */
 public class ConfigInstanceSerializerTest {
+
     @Test
     public void test_that_leaf_types_are_serialized_to_json_types() {
         SimpletypesConfig.Builder builder = new SimpletypesConfig.Builder();
@@ -225,4 +225,5 @@ public class ConfigInstanceSerializerTest {
 
         assertJsonEquals(baos.toString(), expectedJson);
     }
+
 }
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceTest.java
index 1da53e4c3b9..4da0c3f51e0 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceTest.java
@@ -12,7 +12,7 @@ import static org.junit.Assert.fail;
 /**
  * Tests different aspects of the ConfigInstance class and its underlying Nodes.
  *
- * @author <a href="gv@yahoo-inc.com">G. Voldengen</a>
+ * @author gjoranv
  */
 public class ConfigInstanceTest {
     private ConfigSourceSet sourceSet = new ConfigSourceSet("config-instance-test");
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
index 078be819d33..3bdaee09eaf 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
@@ -22,7 +22,6 @@ import static com.yahoo.foo.FunctionTestConfig.*;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ConfigInstanceUtilTest {
 
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInterruptedExceptionTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInterruptedExceptionTest.java
index 35f4f14b4f4..a80da63afc9 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInterruptedExceptionTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInterruptedExceptionTest.java
@@ -8,9 +8,9 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ConfigInterruptedExceptionTest {
+
     @Test
     public void require_that_throwable_is_preserved() {
         ConfigInterruptedException e = new ConfigInterruptedException(new RuntimeException("foo"));
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSetTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSetTest.java
index a120f19c17b..48a51bbc02c 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigSetTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSetTest.java
@@ -10,9 +10,9 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ConfigSetTest {
+
     @Test
     public void testToString() {
         ConfigSet set = new ConfigSet();
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigSourceSetTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigSourceSetTest.java
index 38d4a6a4571..0879c330f45 100755
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigSourceSetTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigSourceSetTest.java
@@ -13,6 +13,7 @@ import static org.junit.Assert.*;
  * @author <a href="gv@yahoo-inc.com">G. Voldengen</a>
  */
 public class ConfigSourceSetTest {
+
     @Test
     public void testEquals() {
         assertEquals(new ConfigSourceSet(), new ConfigSourceSet());
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigURITest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigURITest.java
index 43e3cf658f3..555434837c8 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigURITest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigURITest.java
@@ -12,9 +12,9 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ConfigURITest {
+
     @Test
     public void testDefaultUri() {
         ConfigURI uri = ConfigURI.createFromId("foo");
diff --git a/config/src/test/java/com/yahoo/config/subscription/DefaultConfigTest.java b/config/src/test/java/com/yahoo/config/subscription/DefaultConfigTest.java
index 85346264837..1bcf09a4028 100644
--- a/config/src/test/java/com/yahoo/config/subscription/DefaultConfigTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/DefaultConfigTest.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
  * @author hmusum
  */
 public class DefaultConfigTest {
+
     static final String CONFIG_ID = "raw:" +
             "nondefaultstring ####-------missing--------\n" +
             "defaultstring \"thedefault\"\n" +
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 cb25de89bfb..08d215670db 100644
--- a/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/GenericConfigSubscriberTest.java
@@ -21,7 +21,6 @@ import static org.junit.Assert.*;
  * Test cases for the "generic" (class-less) subscription mechanism.
  *
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class GenericConfigSubscriberTest {
 
@@ -52,7 +51,6 @@ public class GenericConfigSubscriberTest {
         GenericConfigSubscriber sub = new GenericConfigSubscriber(requesters);
         assertEquals(sub.requesters().get(source1).getConnectionPool().getCurrent().getAddress(), "tcp/foo:78");
         assertEquals(sub.requesters().get(source2).getConnectionPool().getCurrent().getAddress(), "tcp/bar:79");
-
     }
 
     @Test(expected=UnsupportedOperationException.class)
diff --git a/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java b/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java
index 5e60c273ee4..430de894629 100644
--- a/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/NamespaceTest.java
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertThat;
  * @author gjoranv
  */
 public class NamespaceTest {
+
     @Test
     public void verifyConfigClassWithExplicitNamespace() {
         NamespaceConfig config = new ConfigGetter<>(NamespaceConfig.class).getConfig("raw: a 0\n");
diff --git a/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java b/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java
index 6512b5ea29e..f1bd164c874 100644
--- a/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/UnicodeTest.java
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertEquals;
  * @author Harald Musum
  */
 public class UnicodeTest {
+
     /**
      * Reads a config from a file which is exactly like one returned from
      * the config server given only default values for this config.
diff --git a/config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java b/config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java
index 2f550fc8e1e..71e7a9f08d7 100644
--- a/config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/impl/FileConfigSubscriptionTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1.7
  */
 public class FileConfigSubscriptionTest {
     private File TEST_TYPES_FILE;
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigBuilderMergeTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigBuilderMergeTest.java
index c77985c91d8..137d2894164 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigBuilderMergeTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigBuilderMergeTest.java
@@ -18,7 +18,6 @@ import static org.junit.Assert.assertThat;
  * SEO keywords: test override() on builders. overrideTest, testOverride
  *
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ConfigBuilderMergeTest {
 
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigCacheKeyTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigCacheKeyTest.java
index bb65fdaa153..fce61cc802c 100755
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigCacheKeyTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigCacheKeyTest.java
@@ -12,6 +12,7 @@ import static org.junit.Assert.*;
  * @author hmusum
  */
 public class ConfigCacheKeyTest {
+
     @Test
     public void testConfigCacheKey() {
         final String defMd5 = "md5";
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 dba73223097..810b9f58829 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigDefinitionBuilderTest.java
@@ -12,7 +12,6 @@ import java.io.IOException;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
-
 /**
  * Unit tests for ConfigDefinitionBuilder.
  *
diff --git a/config/src/test/java/com/yahoo/vespa/config/ConfigFileFormatterTest.java b/config/src/test/java/com/yahoo/vespa/config/ConfigFileFormatterTest.java
index 3cc030d944b..5198759d3e2 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigFileFormatterTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigFileFormatterTest.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ConfigFileFormatterTest {
 
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 eb0c47e3b0a..c13d3ec9b9b 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadBuilderTest.java
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ConfigPayloadBuilderTest {
 
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 f1b0adc03e7..b3db6e2ab43 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ConfigPayloadTest.java
@@ -24,8 +24,7 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**
- * @author Ulf Lilleengen                                               3
- * @since 5.1
+ * @author Ulf Lilleengen
  */
 public class ConfigPayloadTest {
 
diff --git a/config/src/test/java/com/yahoo/vespa/config/DefaultValueApplierTest.java b/config/src/test/java/com/yahoo/vespa/config/DefaultValueApplierTest.java
index e67489b4030..6ab3059f1c0 100644
--- a/config/src/test/java/com/yahoo/vespa/config/DefaultValueApplierTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/DefaultValueApplierTest.java
@@ -16,9 +16,9 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class DefaultValueApplierTest {
+
     public Slime apply(Slime slime, String ... extraFields) {
         StringBuilder defBuilder = new StringBuilder();
         defBuilder.append("namespace=test").append("\n");
diff --git a/config/src/test/java/com/yahoo/vespa/config/ErrorCodeTest.java b/config/src/test/java/com/yahoo/vespa/config/ErrorCodeTest.java
index 8e6cc1fc6a0..64210eaa4b8 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ErrorCodeTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ErrorCodeTest.java
@@ -8,9 +8,9 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author hmusum
- * @since 5.1.9
  */
 public class ErrorCodeTest {
+
     @Test
     public void basic() {
         assertThat(ErrorCode.getName(ErrorCode.INTERNAL_ERROR), is("INTERNAL_ERROR"));
diff --git a/config/src/test/java/com/yahoo/vespa/config/ErrorTypeTest.java b/config/src/test/java/com/yahoo/vespa/config/ErrorTypeTest.java
index 450d7e8d6d8..a0b2c1185a7 100644
--- a/config/src/test/java/com/yahoo/vespa/config/ErrorTypeTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/ErrorTypeTest.java
@@ -8,7 +8,6 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class ErrorTypeTest {
 
@@ -32,4 +31,5 @@ public class ErrorTypeTest {
         assertThat(ErrorType.getErrorType(ErrorCode.ILLEGAL_SUB_FLAG), is(ErrorType.FATAL));
         assertThat(ErrorType.getErrorType(0xdeadc0de), is(ErrorType.FATAL));
     }
+
 }
diff --git a/config/src/test/java/com/yahoo/vespa/config/GenericConfigBuilderTest.java b/config/src/test/java/com/yahoo/vespa/config/GenericConfigBuilderTest.java
index ee7845086c2..2c60ff95fee 100644
--- a/config/src/test/java/com/yahoo/vespa/config/GenericConfigBuilderTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/GenericConfigBuilderTest.java
@@ -13,9 +13,9 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class GenericConfigBuilderTest {
+
     @Test
     public void require_that_builder_can_be_overridden() throws IOException {
         ConfigPayloadBuilder ba = new ConfigPayloadBuilder();
diff --git a/config/src/test/java/com/yahoo/vespa/config/LZ4CompressionTest.java b/config/src/test/java/com/yahoo/vespa/config/LZ4CompressionTest.java
index a3125c73bea..805efc90ade 100644
--- a/config/src/test/java/com/yahoo/vespa/config/LZ4CompressionTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/LZ4CompressionTest.java
@@ -15,7 +15,6 @@ import java.nio.file.Files;
  * To run this test, place a payload in src/test/ca.json. The file is not checked in because it is huge.
  *
  * @author Ulf Lilleengen
- * @since 5.12
  */
 public class LZ4CompressionTest {
     private static LZ4Factory factory = LZ4Factory.safeInstance();
diff --git a/config/src/test/java/com/yahoo/vespa/config/LZ4PayloadCompressorTest.java b/config/src/test/java/com/yahoo/vespa/config/LZ4PayloadCompressorTest.java
index 06bbaad4271..635d6a96a7c 100644
--- a/config/src/test/java/com/yahoo/vespa/config/LZ4PayloadCompressorTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/LZ4PayloadCompressorTest.java
@@ -9,9 +9,9 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.19
  */
 public class LZ4PayloadCompressorTest {
+
     @Test
     public void testCompression() {
         assertCompression("hei hallo der");
diff --git a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java
index a564fea8b2e..3f6c54ea46e 100644
--- a/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/RawConfigTest.java
@@ -113,11 +113,11 @@ public class RawConfigTest {
         assertThat(config.getDefMd5(), is(defMd5));
         config = new RawConfig(key, null, payload, configMd5, generation, false, null, Optional.empty());
         assertNull(config.getDefMd5());
-        config = new RawConfig(key, null, payload, configMd5, generation, false, Arrays.asList(""), Optional.empty());
+        config = new RawConfig(key, null, payload, configMd5, generation, false,List.of(""), Optional.empty());
         assertThat(config.getDefMd5(), is(defMd5ForEmptyDefContent));
         config = new RawConfig(key, "", payload, configMd5, generation, false, null, Optional.empty());
         assertThat(config.getDefMd5(), is(""));
-        config = new RawConfig(key, "", payload, configMd5, generation, false, Arrays.asList(""), Optional.empty());
+        config = new RawConfig(key, "", payload, configMd5, generation, false, List.of(""), Optional.empty());
         assertThat(config.getDefMd5(), is(defMd5ForEmptyDefContent));
     }
 
diff --git a/config/src/test/java/com/yahoo/vespa/config/SlimeUtilsTest.java b/config/src/test/java/com/yahoo/vespa/config/SlimeUtilsTest.java
index ff7b640630e..5def6d899a0 100644
--- a/config/src/test/java/com/yahoo/vespa/config/SlimeUtilsTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/SlimeUtilsTest.java
@@ -14,9 +14,9 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.8
  */
 public class SlimeUtilsTest {
+
     @Test
     public void test_copying_slime_types_into_cursor() {
         Slime slime = new Slime();
@@ -79,4 +79,5 @@ public class SlimeUtilsTest {
         assertThat(slime.get().field("foo").asString(), is("foobie"));
         assertTrue(slime.get().field("bar").valid());
     }
+
 }
diff --git a/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java b/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java
index 3b97c360c4b..0be5e98ff0a 100644
--- a/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/TimingValuesTest.java
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertThat;
  * @author hmusum
  */
 public class TimingValuesTest {
+
     @Test
     public void basic() {
         TimingValues tv = new TimingValues();
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 75ba1392fd1..db594cb8c5b 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
@@ -24,7 +24,6 @@ import com.yahoo.vespa.config.util.ConfigUtils;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.Optional;
 
@@ -36,7 +35,6 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.3
  */
 public abstract class JRTConfigRequestBase {
 
@@ -54,19 +52,19 @@ public abstract class JRTConfigRequestBase {
     protected JRTServerConfigRequest serverReq;
 
     @Before
-    public void setupRequest() throws IOException {
+    public void setupRequest() {
         clientReq = createReq();
         serverReq = createReq(clientReq.getRequest());
         assertTrue(serverReq.validateParameters());
     }
 
-    private JRTClientConfigRequest createReq() throws IOException {
+    private JRTClientConfigRequest createReq() {
         trace = Trace.createNew(3, new ManualClock());
         trace.trace(1, "hei");
         return createReq(defName, defNamespace, defMd5, hostname, configId, configMd5, currentGeneration, timeout, trace);
     }
 
-    private JRTClientConfigRequest createReq(Payload payload) throws IOException {
+    private JRTClientConfigRequest createReq(Payload payload) {
         trace = Trace.createNew(3, new ManualClock());
         trace.trace(1, "hei");
         return createReq(defName, defNamespace, defMd5, hostname, configId, ConfigUtils.getMd5(payload.getData()), currentGeneration, timeout, trace);
@@ -195,7 +193,7 @@ public abstract class JRTConfigRequestBase {
     }
 
     @Test
-    public void payload_is_empty() throws IOException {
+    public void payload_is_empty() {
         Payload payload = Payload.from(ConfigPayload.empty());
         clientReq = createReq(payload);
         serverReq = createReq(clientReq.getRequest());
@@ -258,7 +256,7 @@ public abstract class JRTConfigRequestBase {
     protected abstract String getProtocolVersion();
 
     @Test
-    public void created_from_raw() throws IOException {
+    public void created_from_raw() {
         RawConfig rawConfig = new RawConfig(new ConfigKey<>(defName, configId, defNamespace), defMd5);
         long serverTimeout = 100000L;
         JRTClientConfigRequest request = createFromRaw(rawConfig, serverTimeout, Trace.createNew(9));
@@ -269,9 +267,8 @@ public abstract class JRTConfigRequestBase {
         assertThat(serverRequest.getDefContent().asList(), is(rawConfig.getDefContent()));
     }
 
-
     @Test
-    public void parameters_are_validated() throws IOException {
+    public void parameters_are_validated() {
         assertTrue(serverReq.validateParameters());
         assertValidationFail(createReq("35#$#!$@#", defNamespace, defMd5, hostname, configId, configMd5, currentGeneration, timeout, trace));
         assertValidationFail(createReq(defName, "abcd.o#$*(!&$", defMd5, hostname, configId, configMd5, currentGeneration, timeout, trace));
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 d50a92efc1a..e176ce6e8cd 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
@@ -17,7 +17,6 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.19
  */
 public class JRTConfigRequestV3Test extends JRTConfigRequestBase {
 
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 e5fc5190ad1..c52245ecb35 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
@@ -15,7 +15,6 @@ import static org.junit.Assert.assertThat;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.21
  */
 public class PayloadTest {
 
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 f2d9edc7c35..22baab85c1c 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
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.5
  */
 public class SlimeTraceSerializerTest {
+
     @Test
     public void test_serializer() throws IOException {
         TraceNode root = new TraceNode(null, 1);
diff --git a/config/src/test/java/com/yahoo/vespa/config/protocol/TraceTest.java b/config/src/test/java/com/yahoo/vespa/config/protocol/TraceTest.java
index 596983eebb8..4b191d85121 100644
--- a/config/src/test/java/com/yahoo/vespa/config/protocol/TraceTest.java
+++ b/config/src/test/java/com/yahoo/vespa/config/protocol/TraceTest.java
@@ -9,7 +9,6 @@ import static org.junit.Assert.assertTrue;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.3
  */
 public class TraceTest {
 
@@ -58,4 +57,5 @@ public class TraceTest {
         assertTrue(trace2Str.contains("barbaz"));
         assertTrue(trace2Str.contains("quux"));
     }
+
 }