Non-functional-changes-only

17 files changed, 90 insertions, 108 deletions

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 592cbff8440..6ed467a465c 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
@@ -32,13 +32,9 @@ public abstract class AsyncHttpResponse extends HttpResponse {
      * output (using the provided channel and completion handler) when (async)
      * rendering is completed.
      *
-     * @param output
-     *            the stream to which content should be rendered
-     * @param networkChannel
-     *            the channel which must be closed on completion
-     * @param handler
-     *            the completion handler to submit when closing the channel, may
-     *            be null
+     * @param output the stream to which content should be rendered
+     * @param networkChannel the channel which must be closed on completion
+     * @param handler the completion handler to submit when closing the channel, may be null
      */
     public abstract void render(OutputStream output, ContentChannel networkChannel, CompletionHandler handler)
             throws IOException;
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 329889e70c0..1d4c20efe5e 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
@@ -29,7 +29,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable
     private boolean failed = false;
     private final Object failLock = new Object();
 
-    public ContentChannelOutputStream(final ContentChannel endpoint) {
+    public ContentChannelOutputStream(ContentChannel endpoint) {
         this.endpoint = endpoint;
         buffer = new BufferChain(this);
     }
@@ -38,7 +38,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable
      * Buffered write of a single byte.
      */
     @Override
-    public void write(final int b) throws IOException {
+    public void write(int b) throws IOException {
         try {
             buffer.append((byte) b);
         } catch (RuntimeException e) {
@@ -74,8 +74,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable
      * It is in other words safe to recycle the array {@code b}.
      */
     @Override
-    public void write(final byte[] b, final int off, final int len)
-            throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         nonCopyingWrite(Arrays.copyOfRange(b, off, off + len));
     }
 
@@ -85,7 +84,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable
      * It is in other words safe to recycle the array {@code b}.
      */
     @Override
-    public void write(final byte[] b) throws IOException {
+    public void write(byte[] b) throws IOException {
             nonCopyingWrite(Arrays.copyOf(b, b.length));
     }
 
@@ -94,8 +93,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable
      * <i>transferring</i> ownership of that array to this stream. It is in
      * other words <i>not</i> safe to recycle the array {@code b}.
      */
-    public void nonCopyingWrite(final byte[] b, final int off, final int len)
-            throws IOException {
+    public void nonCopyingWrite(byte[] b, int off, int len) throws IOException {
         try {
             buffer.append(b, off, len);
         } catch (RuntimeException e) {
@@ -108,7 +106,7 @@ public class ContentChannelOutputStream extends OutputStream implements Writable
      * <i>transferring</i> ownership of that array to this stream. It is in
      * other words <i>not</i> safe to recycle the array {@code b}.
      */
-    public void nonCopyingWrite(final byte[] b) throws IOException {
+    public void nonCopyingWrite(byte[] b) throws IOException {
         try {
             buffer.append(b);
         } catch (RuntimeException e) {
@@ -125,27 +123,23 @@ public class ContentChannelOutputStream extends OutputStream implements Writable
      * the ByteBuffer to this stream.
      */
     @Override
-    public void send(final ByteBuffer src) throws IOException {
-        // Don't do a buffer.flush() from here, this method is used by the
-        // buffer itself
+    public void send(ByteBuffer src) throws IOException {
+        // Don't do a buffer.flush() from here, this method is used by the buffer itself
         try {
-            byteBufferData += (long) src.remaining();
+            byteBufferData += src.remaining();
             endpoint.write(src, new LoggingCompletionHandler());
         } catch (RuntimeException e) {
             throw new IOException(Exceptions.toMessageString(e), e);
         }
     }
 
-    /**
-     * Give the number of bytes written.
-     *
-     * @return the number of bytes written to this stream
-     */
+    /** Returns the number of bytes written to this stream */
     public long written() {
         return buffer.appended() + byteBufferData;
     }
 
     class LoggingCompletionHandler implements CompletionHandler {
+
         @Override
         public void completed() {
         }
@@ -166,4 +160,5 @@ public class ContentChannelOutputStream extends OutputStream implements Writable
             }
         }
     }
+
 }
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 88c6291fb26..737017b7957 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
@@ -5,8 +5,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 /**
- * Placeholder response when no content, only headers and status is to be
- * returned.
+ * Placeholder response when no content, only headers and status is to be returned.
  *
  * @author Steinar Knutsen
  */
@@ -19,4 +18,5 @@ public class EmptyResponse extends HttpResponse {
     public void render(OutputStream outputStream) throws IOException {
         // NOP
     }
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
index edd24fed515..e202442479f 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/HttpRequest.java
@@ -55,7 +55,7 @@ public class HttpRequest {
         InputStream requestData = null;
         URI uri = null;
         CurrentContainer container = null;
-        private String nag = " must be set before the attempted operation.";
+        private final String nag = " must be set before the attempted operation.";
         SocketAddress remoteAddress;
 
         private void boom(Object ref, String what) {
@@ -99,9 +99,7 @@ public class HttpRequest {
          * {@link #jdiscRequest(com.yahoo.jdisc.http.HttpRequest)} before
          * instantiating any HTTP request.
          *
-         * @param request
-         *            source for defaults and parent JDisc request, may be null
-         *
+         * @param request source for defaults and parent JDisc request, may be null
          * @see HttpRequest#createTestRequest(String, com.yahoo.jdisc.http.HttpRequest.Method)
          */
         public Builder(HttpRequest request) {
@@ -111,9 +109,7 @@ public class HttpRequest {
         /**
          * Instantiate a request builder with defaults from an existing request.
          *
-         * @param request
-         *            parent JDisc request
-         *
+         * @param request parent JDisc request
          * @see HttpRequest#createTestRequest(String, com.yahoo.jdisc.http.HttpRequest.Method)
          */
         public Builder(com.yahoo.jdisc.http.HttpRequest request) {
@@ -216,8 +212,7 @@ public class HttpRequest {
         }
 
         /**
-         * Start of API for synchronous HTTP request dispatch. Not yet ready for
-         * use.
+         * Start of API for synchronous HTTP request dispatch. Not yet ready for use.
          *
          * @return a new client request
          */
@@ -244,8 +239,7 @@ public class HttpRequest {
         }
 
         /**
-         * Start of API for synchronous HTTP request dispatch. Not yet ready for
-         * use.
+         * Start of API for synchronous HTTP request dispatch. Not yet ready for use.
          *
          * @return a new server request
          */
@@ -277,8 +271,7 @@ public class HttpRequest {
             return new HttpRequest(serverRequest, requestData, properties);
         }
 
-        private void setParameters(
-                com.yahoo.jdisc.http.HttpRequest request) {
+        private void setParameters(com.yahoo.jdisc.http.HttpRequest request) {
             for (Map.Entry<String, String> entry : properties.entrySet()) {
                 request.parameters().put(entry.getKey(), wrap(entry.getValue()));
             }
@@ -290,10 +283,8 @@ public class HttpRequest {
      * Wrap a JDisc HTTP request in a synchronous API. The properties from the
      * JDisc request will be copied into the HTTP request.
      *
-     * @param jdiscHttpRequest
-     *            the JDisc request
-     * @param requestData
-     *            the associated input stream, e.g. with POST request
+     * @param jdiscHttpRequest the JDisc request
+     * @param requestData the associated input stream, e.g. with POST request
      */
     public HttpRequest(com.yahoo.jdisc.http.HttpRequest jdiscHttpRequest, InputStream requestData) {
         this(jdiscHttpRequest, requestData, null);
@@ -308,13 +299,10 @@ public class HttpRequest {
      * will obviously not be reflected by the request. The same applies for
      * JDisc parameters.
      *
-     * @param jdiscHttpRequest
-     *            the JDisc request
-     * @param requestData
-     *            the associated input stream, e.g. with POST request
-     * @param propertyOverrides
-     *            properties which should not have the same settings as in the
-     *            parent JDisc request, may be null
+     * @param jdiscHttpRequest the JDisc request
+     * @param requestData the associated input stream, e.g. with POST request
+     * @param propertyOverrides properties which should not have the same settings as in the
+     *                          parent JDisc request, may be null
      */
     public HttpRequest(com.yahoo.jdisc.http.HttpRequest jdiscHttpRequest,
                        InputStream requestData, Map<String, String> propertyOverrides) {
@@ -495,8 +483,7 @@ public class HttpRequest {
      * Helper method to parse boolean request flags, using
      * Boolean.parseBoolean(String). Unset values are regarded as false.
      *
-     * @param name
-     *            the name of a request property
+     * @param name the name of a request property
      * @return whether the property has been explicitly set to true
      */
     public boolean getBooleanProperty(String name) {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
index 19460053469..064b6cf6279 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java
@@ -37,24 +37,30 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
     }
 
     public static class Context {
+
         final Executor executor;
         final AccessLog accessLog;
         final Metric metric;
+
         @Inject
         public Context(Executor executor, AccessLog accessLog, Metric metric) {
             this.executor = executor;
             this.accessLog = accessLog;
             this.metric = metric;
         }
+
         public Context(Context other) {
             this.executor = other.executor;
             this.accessLog = other.accessLog;
             this.metric = other.metric;
         }
+
         public Executor getExecutor() { return executor; }
         public AccessLog getAccessLog() { return accessLog; }
         public Metric getMetric() { return metric; }
+
     }
+
     public static Context testOnlyContext() {
         return new Context(new Executor() {
                 @Override
@@ -254,15 +260,14 @@ public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler {
             } else {
                 // Not running on JDisc http layer (Jetty), e.g unit tests
                 AccessLogEntry accessLogEntry = new AccessLogEntry();
-                populateAccessLogEntryNotCreatedByHttpServer(
-                        accessLogEntry,
-                        jdiscRequest,
-                        extendedResponse.getTiming(),
-                        httpRequest.getUri().toString(),
-                        commitStartTime,
-                        startTime,
-                        rendererWiring.written(),
-                        httpResponse.getStatus());
+                populateAccessLogEntryNotCreatedByHttpServer(accessLogEntry,
+                                                             jdiscRequest,
+                                                             extendedResponse.getTiming(),
+                                                             httpRequest.getUri().toString(),
+                                                             commitStartTime,
+                                                             startTime,
+                                                             rendererWiring.written(),
+                                                             httpResponse.getStatus());
                 accessLog.log(accessLogEntry);
                 entry = accessLogEntry;
             }
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 a3e264c16ee..faa30bd109d 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
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 @Beta
 public class RequestHandlerTestDriver implements AutoCloseable {
 
-    private TestDriver driver;
+    private final TestDriver driver;
 
     private MockResponseHandler responseHandler = null;
 
@@ -152,7 +152,7 @@ public class RequestHandlerTestDriver implements AutoCloseable {
             StringBuilder b = new StringBuilder();
             while (content.available()>0) {
                 ByteBuffer nextBuffer = content.read();
-                b.append(Charset.forName("utf-8").decode(nextBuffer).toString());
+                b.append(Charset.forName("utf-8").decode(nextBuffer));
             }
             return b.toString();
         }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
index c46488694de..9687697d6f6 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
@@ -69,9 +69,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
 
     @Override
     public final void handleRequest(Request request, BufferedContentChannel requestContent, ResponseHandler responseHandler) {
-        if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, "In " + this.getClass() + ".handleRequest()");
-        }
+        log.log(Level.FINE, () -> "In " + this.getClass() + ".handleRequest()");
         com.yahoo.jdisc.http.HttpRequest jdiscRequest = asHttpRequest(request);
         HttpRequest httpRequest = new HttpRequest(jdiscRequest, new UnsafeContentInputStream(requestContent.toReadable()));
         LazyContentChannel channel = null;
@@ -95,8 +93,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
     }
 
     /** Render and return whether the channel was closed */
-    private void render(HttpRequest request, HttpResponse httpResponse,
-                        LazyContentChannel channel, long startTime) {
+    private void render(HttpRequest request, HttpResponse httpResponse, LazyContentChannel channel, long startTime) {
         LoggingCompletionHandler logOnCompletion = null;
         ContentChannelOutputStream output = null;
         try {
@@ -139,7 +136,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
         private boolean closed = false;
 
         // Fields needed to lazily create or close the channel */
-        private HttpRequest httpRequest;
+        private final HttpRequest httpRequest;
         private HttpResponse httpResponse;
         private final ResponseHandler responseHandler;
         private final Metric metric;
@@ -227,29 +224,27 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
     /**
      * Override this to implement custom access logging.
      *
-     * @param startTime
-     *            execution start
-     * @param renderStartTime
-     *            start of output rendering
-     * @param response
-     *            the response which the log entry regards
-     * @param httpRequest
-     *            the incoming HTTP request
-     * @param rendererWiring
-     *            the stream the rendered response is written to, used for
-     *            fetching length of rendered response
+     * @param startTime execution start
+     * @param renderStartTime start of output rendering
+     * @param response the response which the log entry regards
+     * @param httpRequest the incoming HTTP request
+     * @param rendererWiring the stream the rendered response is written to, used for
+     *                       fetching length of rendered response
      */
-    protected LoggingCompletionHandler createLoggingCompletionHandler(
-            long startTime, long renderStartTime, HttpResponse response,
-            HttpRequest httpRequest, ContentChannelOutputStream rendererWiring) {
+    protected LoggingCompletionHandler createLoggingCompletionHandler(long startTime,
+                                                                      long renderStartTime,
+                                                                      HttpResponse response,
+                                                                      HttpRequest httpRequest,
+                                                                      ContentChannelOutputStream rendererWiring) {
         return null;
     }
 
     protected com.yahoo.jdisc.http.HttpRequest asHttpRequest(Request request) {
         if (!(request instanceof com.yahoo.jdisc.http.HttpRequest)) {
-            throw new IllegalArgumentException("Expected "
-                    + com.yahoo.jdisc.http.HttpRequest.class.getName() + ", got " + request.getClass().getName());
+            throw new IllegalArgumentException("Expected " + com.yahoo.jdisc.http.HttpRequest.class.getName() +
+                                               ", got " + request.getClass().getName());
         }
         return (com.yahoo.jdisc.http.HttpRequest) request;
     }
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
index 4c93613603b..446ee90c205 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java
@@ -269,6 +269,7 @@ public abstract class ThreadedRequestHandler extends AbstractRequestHandler {
         private static class NullFeedContext implements Context {
             private static final NullFeedContext INSTANCE = new NullFeedContext();
         }
+
     }
 
 }
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 f6a089d6fd2..3236f7d2407 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
@@ -47,11 +47,7 @@ public final class VespaHeaders {
     private static final Tuple2<Boolean, Integer> NO_MATCH = new Tuple2<>(false, Response.Status.OK);
 
     public static boolean benchmarkCoverage(boolean benchmarkOutput, HeaderFields headers) {
-        if (benchmarkOutput && headers.get(BenchmarkingHeaders.REQUEST_COVERAGE) != null) {
-            return true;
-        } else {
-            return false;
-        }
+        return benchmarkOutput && headers.get(BenchmarkingHeaders.REQUEST_COVERAGE) != null;
     }
 
     /** Returns true if this is a benchmarking request, according to headers */
@@ -60,14 +56,14 @@ public final class VespaHeaders {
     }
 
     /**
-     * Add search benchmark output to the HTTP getHeaders
+     * Add search benchmark output to the HTTP getHeaders.
      *
-     * @param responseHeaders   The response to write the headers to.
-     * @param benchmarkCoverage True to include coverage headers.
-     * @param t                 The Timing to read data from.
-     * @param c                 The Counts to read data from.
-     * @param errorCount        The error count.
-     * @param coverage          The Coverage to read data from.
+     * @param responseHeaders   the response to write the headers to
+     * @param benchmarkCoverage true to include coverage headers
+     * @param t                 the Timing to read data from
+     * @param c                 the Counts to read data from
+     * @param errorCount        the error count
+     * @param coverage          the Coverage to read data from
      */
     public static void benchmarkOutput(HeaderFields responseHeaders, boolean benchmarkCoverage,
                                        Timing t, HitCounts c, int errorCount, Coverage coverage) {
@@ -106,10 +102,10 @@ public final class VespaHeaders {
     /**
      * (during normal execution) return 200 unless this is not a success or a 4xx error is requested.
      *
-     * @param isSuccess Whether or not the response represents a success.
-     * @param mainError The main error of the response, if any.
-     * @param allErrors All the errors of the response, if any.
-     * @return The status code of the given response.
+     * @param isSuccess whether or not the response represents a success
+     * @param mainError the main error of the response, if any
+     * @param allErrors all the errors of the response, if any
+     * @return the status code of the given response
      */
     public static int getStatus(boolean isSuccess, ErrorMessage mainError, Iterator<? extends ErrorMessage> allErrors) {
         // Do note, SearchResponse has its own implementation of isSuccess()
@@ -129,7 +125,7 @@ public final class VespaHeaders {
 
         Iterator<? extends ErrorMessage> errorIterator = allErrors;
         if (errorIterator != null && errorIterator.hasNext()) {
-            for (; errorIterator.hasNext();) {
+            while (errorIterator.hasNext()) {
                 ErrorMessage error = errorIterator.next();
                 Tuple2<Boolean, Integer> status = chooseWebServiceStatus(error);
                 if (status.first) {
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/FileWrapper.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/FileWrapper.java
index 6e22e02eb5b..3e127b87017 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/FileWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/FileWrapper.java
@@ -24,4 +24,5 @@ public class FileWrapper {
     boolean isRegularFile(Path path) {
         return Files.isRegularFile(path);
     }
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/GaugeMetric.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/GaugeMetric.java
index 9b89b8abe52..9a195710c8f 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/GaugeMetric.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/GaugeMetric.java
@@ -20,7 +20,7 @@ public final class GaugeMetric extends MetricValue {
     private double min;
     private double sum;
     private long count;
-    private Optional<List<Tuple2<String, Double>>> percentiles;
+    private final Optional<List<Tuple2<String, Double>>> percentiles;
 
     private GaugeMetric(double last, double max, double min, double sum, long count, Optional<List<Tuple2<String, Double>>> percentiles) {
         this.last = last;
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java
index 080a5a8dc32..730f7bc13cd 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/HostLifeGatherer.java
@@ -44,4 +44,5 @@ public class HostLifeGatherer {
 
         return jsonObject;
     }
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/JSONObjectWithLegibleException.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/JSONObjectWithLegibleException.java
index dc1bfb89197..d22dd9d6f4b 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/JSONObjectWithLegibleException.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/JSONObjectWithLegibleException.java
@@ -13,6 +13,7 @@ import java.util.Map;
  * @author gjoranv
  */
 class JSONObjectWithLegibleException extends JSONObject {
+
     @Override
     public JSONObject put(String s, boolean b) {
         try {
@@ -80,7 +81,7 @@ class JSONObjectWithLegibleException extends JSONObject {
 
     private String getErrorMessage(String key, Object value, JSONException e) {
         return "Trying to add invalid JSON object with key '" + key +
-                "' and value '" + value +
-                "' - " + e.getMessage();
+                "' and value '" + value + "' - " + e.getMessage();
     }
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java
index 061ce7138ad..6a06a6362f5 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricGatherer.java
@@ -7,8 +7,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * Gathers metrics regarding currently processing coredumps and host life.
+ *
  * @author olaa
- * Gathers metrics regarding currently processing coredumps and host life
  */
 public class MetricGatherer {
 
@@ -17,7 +18,8 @@ public class MetricGatherer {
         List<JSONObject> packetList = new ArrayList<>();
         packetList.add(CoredumpGatherer.gatherCoredumpMetrics(fileWrapper));
         if (System.getProperty("os.name").contains("nux"))
-                packetList.add(HostLifeGatherer.getHostLifePacket(fileWrapper));
+            packetList.add(HostLifeGatherer.getHostLifePacket(fileWrapper));
         return packetList;
     }
+
 }
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
index d1036db5c6f..c1a6f650a9c 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/MetricsPacketsHandler.java
@@ -43,6 +43,7 @@ import static com.yahoo.container.jdisc.state.StateHandler.getSnapshotPreprocess
  * @author gjoranv
  */
 public class MetricsPacketsHandler extends AbstractRequestHandler {
+
     static final String APPLICATION_KEY = "application";
     static final String TIMESTAMP_KEY   = "timestamp";
     static final String STATUS_CODE_KEY = "status_code";
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/SnapshotProvider.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/SnapshotProvider.java
index 4967fd1f162..d693bf97bd8 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/SnapshotProvider.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/SnapshotProvider.java
@@ -7,7 +7,7 @@ import java.io.PrintStream;
  * An interface for components supplying a state snapshot where persistence and
  * other pre-processing has been done.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public interface SnapshotProvider {
 
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
index ccd0864b3ab..40a0ef10fbc 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/state/StateMonitor.java
@@ -136,4 +136,5 @@ public class StateMonitor extends AbstractComponent {
             }
         });
     }
+
 }