Merge pull request #3182 from vespa-engine/bratseth/cleanup

Nonfunctional changes only

45 files changed, 62 insertions, 65 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
index cdfe1d706d7..bc890755ca9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
@@ -22,8 +22,7 @@ import java.util.stream.Collectors;
  * TODO: Merge with {@link Host}
  * Host resources are ordered by their host order.
  *
- * @author lulf
- * @since 5.12
+ * @author Ulf Lillengen
  */
 public class HostResource implements Comparable<HostResource> {
 
@@ -31,8 +30,9 @@ public class HostResource implements Comparable<HostResource> {
     final static int MAX_PORTS = 799;
     private final Host host;
 
-    // Map from "sentinel name" to service
+    /** Map from "sentinel name" to service */
     private final Map<String, Service> services = new LinkedHashMap<>();
+
     private final Map<Integer, Service> portDB = new LinkedHashMap<>();
 
     private int allocatedPorts = 0;
@@ -74,9 +74,7 @@ public class HostResource implements Comparable<HostResource> {
             }
             range++;
         }
-        return range == numPorts ?
-                port - range :
-                0;
+        return range == numPorts ? port - range : 0;
     }
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index 9a2c631a17b..b015e25f7ea 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -51,6 +51,7 @@ public class Container extends AbstractService implements
         ContainerHttpConfig.Producer,
         ContainerMbusConfig.Producer,
         ClusterMemberInfoConfig.Producer {
+
     public static final int BASEPORT = Defaults.getDefaults().vespaWebServicePort();
     public static final String SINGLENODE_CONTAINER_SERVICESPEC = "default_singlenode_container";
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index fe473015d3e..49229fcc87a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -62,7 +62,7 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
@@ -552,10 +552,10 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
     private List<Container> createNodesFromNodeList(ContainerCluster cluster, Element nodesElement) {
         List<Container> nodes = new ArrayList<>();
-        int nodeCount = 0;
+        int nodeIndex = 0;
         for (Element nodeElem: XML.getChildren(nodesElement, "node")) {
-            nodes.add(new ContainerServiceBuilder("container." + nodeCount, nodeCount).build(cluster, nodeElem));
-            nodeCount++;
+            nodes.add(new ContainerServiceBuilder("container." + nodeIndex, nodeIndex).build(cluster, nodeElem));
+            nodeIndex++;
         }
         return nodes;
     }
diff --git a/container-core/src/main/java/com/yahoo/container/ConfigHack.java b/container-core/src/main/java/com/yahoo/container/ConfigHack.java
index 10af4be554e..55cf208e163 100644
--- a/container-core/src/main/java/com/yahoo/container/ConfigHack.java
+++ b/container-core/src/main/java/com/yahoo/container/ConfigHack.java
@@ -11,7 +11,7 @@ import com.yahoo.container.config.StatisticsEmitter;
  * <p>
  * This class should not reach a final release.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public final class ConfigHack {
 
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
index bcfa6aaf420..293771cb0bd 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
@@ -25,7 +25,7 @@ import static com.yahoo.container.core.BundleLoaderProperties.DISK_BUNDLE_PREFIX
 /**
  * Manages the set of installed 3rd-party component bundles.
  *
- * @author  tonytv
+ * @author Tony Vaagenes
  */
 public class BundleLoader {
 
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
index 66fb4c73560..49cacb3a09b 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java
@@ -42,7 +42,7 @@ import static com.yahoo.container.util.Util.quote;
 /**
  * For internal use only.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 //TODO: rename
@@ -84,12 +84,7 @@ public class HandlersConfigurerDi {
         this.vespaContainer = vespaContainer;
         osgiWrapper = new OsgiWrapper(osgiFramework, vespaContainer.getBundleLoader());
 
-        container = new Container(
-                subscriberFactory,
-                configId,
-                deconstructor,
-                osgiWrapper
-        );
+        container = new Container(subscriberFactory, configId, deconstructor, osgiWrapper);
         try {
             runOnceAndEnsureRegistryHackRun(discInjector);
         } catch (InterruptedException e) {
diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
index 6ac2c40b3fc..d714d0211ab 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java
@@ -7,7 +7,7 @@ import com.google.common.annotations.Beta;
 /**
  * The coverage report for a result set.
  *
- * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  * @author baldersheim
  */
 public class Coverage {
diff --git a/container-core/src/main/java/com/yahoo/container/handler/Prefix.java b/container-core/src/main/java/com/yahoo/container/handler/Prefix.java
index 19aa819ce47..076e0b32a58 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/Prefix.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/Prefix.java
@@ -4,7 +4,7 @@ package com.yahoo.container.handler;
 /**
  * Wrapper to maintain indirections between prefixes and Handler instances.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public final class Prefix implements Comparable<Prefix> {
 
diff --git a/container-core/src/main/java/com/yahoo/container/handler/Timing.java b/container-core/src/main/java/com/yahoo/container/handler/Timing.java
index 48248863a88..e52928404be 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/Timing.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/Timing.java
@@ -13,7 +13,7 @@ package com.yahoo.container.handler;
  * <p>If you do not understand the fields, just avoid creating this object
  * in you handler.</p>
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class Timing {
 
diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
index 7332ce46836..bcd6e930ee3 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
@@ -10,7 +10,7 @@ import com.yahoo.container.QrSearchersConfig;
 /**
  * API for programmatically removing the container from VIP rotation.
  *
- * @author steinar
+ * @author Steinar Knutsen
  */
 public class VipStatus {
 
diff --git a/container-core/src/main/java/com/yahoo/container/http/AccessLogUtil.java b/container-core/src/main/java/com/yahoo/container/http/AccessLogUtil.java
index 3c688ab0c4d..da419837f63 100644
--- a/container-core/src/main/java/com/yahoo/container/http/AccessLogUtil.java
+++ b/container-core/src/main/java/com/yahoo/container/http/AccessLogUtil.java
@@ -11,6 +11,7 @@ import java.util.List;
  * @author bakksjo
  */
 public class AccessLogUtil {
+
     public static String getHttpMethod(final HttpRequest httpRequest) {
         return httpRequest.getMethod().toString();
     }
@@ -40,4 +41,5 @@ public class AccessLogUtil {
         final List<String> headerValues = httpRequest.headers().get(headerName);
         return (headerValues == null || headerValues.isEmpty()) ? "" : headerValues.get(0);
     }
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/http/BenchmarkingHeaders.java b/container-core/src/main/java/com/yahoo/container/http/BenchmarkingHeaders.java
index d6665e90416..da548c6adee 100644
--- a/container-core/src/main/java/com/yahoo/container/http/BenchmarkingHeaders.java
+++ b/container-core/src/main/java/com/yahoo/container/http/BenchmarkingHeaders.java
@@ -4,7 +4,7 @@ package com.yahoo.container.http;
 /**
  * Class containing the names of all benchmarking getHeaders in request and response
  *
- * @author <a href="mailto:mathiasm@yahoo-inc.com">Mathias Mølster Lidal</a>
+ * @author Mathias Mølster Lidal
  */
 public class BenchmarkingHeaders {
 
diff --git a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java
index fb07d025044..e4ec09e3948 100644
--- a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java
+++ b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java
@@ -33,7 +33,7 @@ import static java.util.stream.Collectors.toSet;
 /**
  * Creates JDisc request/response filter chains.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  * @author bjorncs
  */
 public class FilterChainRepository extends AbstractComponent {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java
index 4b915e59c23..592cbff8440 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/AsyncHttpResponse.java
@@ -12,7 +12,7 @@ import com.yahoo.jdisc.handler.ContentChannel;
  * HTTP response which supports async response rendering.
  *
  * @author bratseth
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public abstract class AsyncHttpResponse extends HttpResponse {
 
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java b/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java
index 582577164ff..dc3bd6fe8a8 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ContentChannelOutputStream.java
@@ -18,7 +18,7 @@ import java.util.logging.Logger;
 /**
  * A buffered stream wrapping a ContentChannel.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class ContentChannelOutputStream extends OutputStream implements WritableByteTransmitter {
 
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java
index 7725f09573a..88c6291fb26 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/EmptyResponse.java
@@ -8,7 +8,7 @@ import java.io.OutputStream;
  * Placeholder response when no content, only headers and status is to be
  * returned.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class EmptyResponse extends HttpResponse {
 
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java b/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java
index 71d8f82b47d..9b6837a9dcb 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ExtendedResponse.java
@@ -14,7 +14,7 @@ import com.yahoo.jdisc.handler.ContentChannel;
  * An HTTP response supporting async rendering and extended information for
  * logging.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public abstract class ExtendedResponse extends AsyncHttpResponse {
 
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java
index bc1fa134f5d..09824dca77c 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingCompletionHandler.java
@@ -7,14 +7,16 @@ import com.yahoo.jdisc.handler.CompletionHandler;
  * A completion handler which does access logging.
  *
  * @see ThreadedHttpRequestHandler#createLoggingCompletionHandler(long, long, HttpResponse, HttpRequest, ContentChannelOutputStream)
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public interface LoggingCompletionHandler extends CompletionHandler {
+
     /**
      * Set the commit start time to the current time. Commit start is only well
      * defined for synchronous renderers, it is the point in time when rendering
      * has finished, but there may still be I/O operations to transfer the data
      * to the client pending.
      */
-    public void markCommitStart();
+    void markCommitStart();
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java b/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
index 127d69a0ce3..50052bbf70c 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/MetricConsumerFactory.java
@@ -7,9 +7,10 @@ import com.yahoo.jdisc.application.MetricConsumer;
  * <p>This is the interface to implement if one wishes to configure a non-default <tt>MetricConsumer</tt>. Simply
  * add the implementing class as a component in your services.xml file.</p>
  *
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen Hult</a>
+ * @author Simon Thoresen Hult
  */
 public interface MetricConsumerFactory {
 
-    public MetricConsumer newInstance();
+    MetricConsumer newInstance();
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java
index 3070a617226..132b1153fc5 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java
@@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
  * A helper for making tests creating jDisc requests and checking their responses.
  *
  * @author bratseth
- * @since 5.21
  */
 @Beta
 public class RequestHandlerTestDriver implements AutoCloseable {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java b/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
index 7cd671d307c..ecb36ade5eb 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/VespaHeaders.java
@@ -29,9 +29,9 @@ import com.yahoo.processing.request.ErrorMessage;
  * Static helper methods which implement the mapping between the ErrorMessage
  * API and HTTP headers and return codes.
  *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Einar M R Rosenvinge
+ * @author Steinar Knutsen
+ * @author Simon Thoresen
  * @author bratseth
  */
 public final class VespaHeaders {
diff --git a/container-core/src/main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java b/container-core/src/main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java
index 507111ce29c..9486fe367f9 100644
--- a/container-core/src/main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java
+++ b/container-core/src/main/java/com/yahoo/container/osgi/AbstractRpcAdaptor.java
@@ -6,7 +6,7 @@ import com.yahoo.jrt.Supervisor;
 /**
  * Helper class for optional RPC adaptors in the Container.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public abstract class AbstractRpcAdaptor {
 
diff --git a/container-core/src/main/java/com/yahoo/container/protect/Error.java b/container-core/src/main/java/com/yahoo/container/protect/Error.java
index 14b955d9fbe..46b49b1623a 100644
--- a/container-core/src/main/java/com/yahoo/container/protect/Error.java
+++ b/container-core/src/main/java/com/yahoo/container/protect/Error.java
@@ -4,7 +4,7 @@ package com.yahoo.container.protect;
 /**
  * Error codes to use in ErrorMessage instances for container applications.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public enum Error {
 
diff --git a/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java b/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java
index 0afac635311..6a8a3239c17 100644
--- a/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java
+++ b/container-core/src/main/java/com/yahoo/container/protect/FreezeDetector.java
@@ -10,7 +10,7 @@ import com.yahoo.container.core.DiagnosticsConfig;
 /**
  * Runs and initializes a {@link Watchdog} instance.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  * @deprecated this is not in use and will be removed in the next major release
  */
 @Deprecated
diff --git a/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java b/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java
index e4f2415a733..add411051c2 100644
--- a/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java
+++ b/container-di/src/main/java/com/yahoo/container/bundle/BundleInstantiationSpecification.java
@@ -9,7 +9,7 @@ import net.jcip.annotations.Immutable;
 /**
  * Specifies how a component should be instantiated from a bundle.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @Immutable
 public final class BundleInstantiationSpecification {
diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java
index c9cbf3f4b29..a2d193654ea 100644
--- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java
+++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/Provider.java
@@ -14,7 +14,7 @@ package com.yahoo.container.di.componentgraph;
  *     does not provide a component instance.</li>
  * </ul>
  *
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 public interface Provider<T> {
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java b/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java
index 528b487d51c..c88f851909c 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java
+++ b/container-di/src/main/java/com/yahoo/container/di/config/ResolveDependencyException.java
@@ -3,10 +3,11 @@ package com.yahoo.container.di.config;
 
 /**
  * @author gjoranv
- * @since 5.17
  */
 public class ResolveDependencyException extends RuntimeException {
+
     public ResolveDependencyException(String message) {
         super(message);
     }
+
 }
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java b/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java
index a13aa62f487..7b5f85778c6 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java
+++ b/container-di/src/main/java/com/yahoo/container/di/config/RestApiContext.java
@@ -20,7 +20,6 @@ import java.util.Set;
  * Only for internal JDisc use.
  *
  * @author gjoranv
- * @since 5.11
  */
 public class RestApiContext {
 
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java b/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java
index c7592ea011e..9fd30f888b9 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java
+++ b/container-di/src/main/java/com/yahoo/container/di/config/Subscriber.java
@@ -7,10 +7,11 @@ import com.yahoo.vespa.config.ConfigKey;
 import java.util.Map;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 public interface Subscriber {
+
     long waitNextGeneration();
     long generation();
 
@@ -18,4 +19,5 @@ public interface Subscriber {
     Map<ConfigKey<ConfigInstance>, ConfigInstance> config();
 
     void close();
+
 }
diff --git a/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java b/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java
index 83845519372..c1c36a1b3de 100644
--- a/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java
+++ b/container-di/src/main/java/com/yahoo/container/di/config/SubscriberFactory.java
@@ -8,11 +8,13 @@ import com.yahoo.vespa.config.ConfigKey;
 import java.util.Set;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 @ProvidedBy(CloudSubscriberFactory.Provider.class)
 public interface SubscriberFactory {
+
     Subscriber getSubscriber(Set<? extends ConfigKey<?>> configKeys);
     void reloadActiveSubscribers(long generation);
+
 }
diff --git a/container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala b/container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala
index 9975a9fe0c2..5a28d9abe2a 100644
--- a/container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala
+++ b/container-di/src/main/scala/com/yahoo/container/bundle/MockBundle.scala
@@ -13,9 +13,7 @@ import MockBundle._
 import org.osgi.resource.{Capability, Wire, Requirement}
 
 /**
- *
  * @author gjoranv
- * @since 5.15
  */
 class MockBundle extends Bundle with BundleWiring {
 
diff --git a/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala b/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala
index cf047503d71..23ae21ae84e 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/CloudSubscriberFactory.scala
@@ -15,7 +15,7 @@ import scala.language.existentials
 
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 
 class CloudSubscriberFactory(configSource: ConfigSource) extends SubscriberFactory
diff --git a/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala b/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala
index ac5f9bb589f..994162695d3 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/ConfigRetriever.scala
@@ -14,7 +14,7 @@ import scala.collection.JavaConverters._
 import scala.language.postfixOps
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 final class ConfigRetriever(bootstrapKeys: Set[ConfigKeyT],
diff --git a/container-di/src/main/scala/com/yahoo/container/di/Container.scala b/container-di/src/main/scala/com/yahoo/container/di/Container.scala
index af73730afa2..c82625bae3b 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/Container.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/Container.scala
@@ -26,7 +26,7 @@ import scala.math.max
 /**
  *
  * @author gjoranv
- * @author tonytv
+ * @author Tony Vaagenes
  */
 class Container(
                  subscriberFactory: SubscriberFactory,
diff --git a/container-di/src/main/scala/com/yahoo/container/di/Osgi.scala b/container-di/src/main/scala/com/yahoo/container/di/Osgi.scala
index e159e67aabf..3407eceae3e 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/Osgi.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/Osgi.scala
@@ -10,7 +10,7 @@ import com.yahoo.component.ComponentSpecification
 /**
  *
  * @author gjoranv
- * @author tonytv
+ * @author Tony Vaagenes
  */
 trait Osgi {
 
diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala
index f27dfc54b75..92f489798c9 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentGraph.scala
@@ -28,7 +28,7 @@ import scala.Some
 import scala.language.existentials
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 @NotThreadSafe
diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala
index c41c3d13045..0dca08b020a 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentNode.scala
@@ -19,7 +19,7 @@ import scala.concurrent.{Await, Future, TimeoutException}
 import scala.language.postfixOps
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 class ComponentNode(componentId: ComponentId,
diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala
index a0e07e7433e..9c7e2ba322f 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.scala
@@ -9,7 +9,7 @@ import com.google.inject.util.Types
 import Node.syntheticComponentId
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 class ComponentRegistryNode(val componentClass : Class[AnyRef])
diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala
index c4cdb200e04..26fb0e0d3d8 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/GuiceNode.scala
@@ -7,7 +7,7 @@ import Node.syntheticComponentId
 import GuiceNode._
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 final class GuiceNode(myInstance: AnyRef,
diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala
index aeae227f4cb..68353c47124 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/JerseyNode.scala
@@ -18,8 +18,7 @@ import scala.collection.JavaConverters._
  * Represents an instance of RestApiContext
  *
  * @author gjoranv
- * @author tonytv
- * @since 5.15
+ * @author Tony Vaagenes
  */
 class JerseyNode(componentId: ComponentId,
                  override val configId: String,
diff --git a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala
index 6c58d857c86..9e6124cff2c 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/componentgraph/core/Node.scala
@@ -7,10 +7,8 @@ import com.yahoo.container.di.componentgraph.Provider
 import com.google.inject.Key
 import Node._
 
-
-
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  * @author gjoranv
  */
 abstract class Node(val componentId: ComponentId) {
diff --git a/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala b/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala
index 489760dcbc8..3769eed6d2d 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/osgi/OsgiUtil.scala
@@ -19,7 +19,7 @@ import scala.collection.JavaConverters._
 
 /**
  * Tested by com.yahoo.application.container.jersey.JerseyTest
- * @author tonytv
+ * @author Tony Vaagenes
  */
 object OsgiUtil {
   private val log = Logger.getLogger(getClass.getName)
diff --git a/container-di/src/main/scala/com/yahoo/container/di/package.scala b/container-di/src/main/scala/com/yahoo/container/di/package.scala
index e580d928ebb..cccb0242e8b 100644
--- a/container-di/src/main/scala/com/yahoo/container/di/package.scala
+++ b/container-di/src/main/scala/com/yahoo/container/di/package.scala
@@ -12,7 +12,7 @@ import scala.language.implicitConversions
 /**
  *
  * @author gjoranv
- * @author tonytv
+ * @author Tony Vaagenes
  */
 package object di {
   type ConfigKeyT = ConfigKey[_ <: ConfigInstance]
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index f77d9a6b06f..fa2ee8e89a9 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -48,7 +48,7 @@ import java.util.logging.Logger;
 import static com.yahoo.collections.CollectionUtil.first;
 
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public final class ConfiguredApplication implements Application {
 
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/Main.java b/container-disc/src/main/java/com/yahoo/container/jdisc/Main.java
index 16c617a8814..50d629ce34a 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/Main.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/Main.java
@@ -8,7 +8,7 @@ import org.apache.commons.daemon.Daemon;
 import org.apache.commons.daemon.DaemonContext;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class Main implements Daemon {