Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from-def-files

28 files changed, 52 insertions, 49 deletions

diff --git a/application/pom.xml b/application/pom.xml
index 2d9096e49f1..3fd9e8054e7 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -75,18 +75,6 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-
-    <!-- All dependencies that should be visible in test classpath, but not compile classpath,
-         for user projects must be added in compile scope here.
-         These dependencies are explicitly excluded (or set to non-compile scope) in the container-dev module. -->
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr-runtime</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.antlr</groupId>
-      <artifactId>antlr4-runtime</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java
index bb29ff05fb8..88140873b7b 100644
--- a/application/src/main/java/com/yahoo/application/Application.java
+++ b/application/src/main/java/com/yahoo/application/Application.java
@@ -35,10 +35,10 @@ import java.util.*;
 /**
  * Contains one or more containers built from services.xml.
  * Other services present in the services.xml file might be mocked in future versions.
- * <p>
+ *
  * Currently, only a single top level JDisc Container is allowed. Other clusters are ignored.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @Beta
 public final class Application implements AutoCloseable {
@@ -666,4 +666,5 @@ public final class Application implements AutoCloseable {
             }
         }
     }
+
 }
diff --git a/application/src/main/java/com/yahoo/application/ApplicationBuilder.java b/application/src/main/java/com/yahoo/application/ApplicationBuilder.java
index 1d288759d23..9d7cf2c8673 100644
--- a/application/src/main/java/com/yahoo/application/ApplicationBuilder.java
+++ b/application/src/main/java/com/yahoo/application/ApplicationBuilder.java
@@ -15,10 +15,11 @@ import static java.nio.file.Files.createTempDirectory;
 /**
  * Builds an application package on disk and returns a path to the result.
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 @Beta
 public class ApplicationBuilder {
+
     private Path applicationDir = createTempDirectory("application");
     private Networking networking = Networking.disable;
 
@@ -93,4 +94,5 @@ public class ApplicationBuilder {
     Path getPath() {
         return applicationDir;
     }
+
 }
diff --git a/application/src/main/java/com/yahoo/application/Networking.java b/application/src/main/java/com/yahoo/application/Networking.java
index b23d2e58456..8dd77c6b0f6 100644
--- a/application/src/main/java/com/yahoo/application/Networking.java
+++ b/application/src/main/java/com/yahoo/application/Networking.java
@@ -1,12 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.application;
 
-import com.google.common.annotations.Beta;
-
 /**
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public enum Networking {
+
     enable,
     disable
+
 }
diff --git a/application/src/main/java/com/yahoo/application/container/ApplicationException.java b/application/src/main/java/com/yahoo/application/container/ApplicationException.java
index d3e4100cfef..424c66313a7 100644
--- a/application/src/main/java/com/yahoo/application/container/ApplicationException.java
+++ b/application/src/main/java/com/yahoo/application/container/ApplicationException.java
@@ -5,10 +5,11 @@ package com.yahoo.application.container;
  * Wraps an Exception in a RuntimeException, for user convenience.
  *
  * @author gjoranv
- * @since 5.1.15
  */
 class ApplicationException extends RuntimeException {
+
     ApplicationException(Exception e) {
         super(e);
     }
+
 }
diff --git a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
index 2cf46c43d06..8e9180f00c7 100644
--- a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
+++ b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
@@ -20,10 +20,11 @@ import java.util.Map;
 /**
  * For doing document processing with {@link JDisc}.
  *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 @Beta
 public final class DocumentProcessing {
+
     private final DocumentProcessingHandler handler;
     private final Map<String, DocumentType> documentTypes;
 
diff --git a/application/src/main/java/com/yahoo/application/container/JDisc.java b/application/src/main/java/com/yahoo/application/container/JDisc.java
index 6cf98072232..ed0c29a3917 100644
--- a/application/src/main/java/com/yahoo/application/container/JDisc.java
+++ b/application/src/main/java/com/yahoo/application/container/JDisc.java
@@ -28,10 +28,9 @@ import java.nio.file.Path;
 /**
  * A JDisc Container configured from XML.
  *
- * @author tonytv
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Tony Vaagenes
+ * @author Einar M R Rosenvinge
  * @author gjoranv
- * @since 5.1.15
  */
 @Beta
 public final class JDisc implements AutoCloseable {
diff --git a/application/src/main/java/com/yahoo/application/container/Processing.java b/application/src/main/java/com/yahoo/application/container/Processing.java
index 5fc9abce8fe..f0ee3cdd1b9 100644
--- a/application/src/main/java/com/yahoo/application/container/Processing.java
+++ b/application/src/main/java/com/yahoo/application/container/Processing.java
@@ -17,7 +17,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  * @author gjoranv
 */
 @Beta
diff --git a/application/src/main/java/com/yahoo/application/container/ProcessingBase.java b/application/src/main/java/com/yahoo/application/container/ProcessingBase.java
index 14ba6eb394e..f1505e4429a 100644
--- a/application/src/main/java/com/yahoo/application/container/ProcessingBase.java
+++ b/application/src/main/java/com/yahoo/application/container/ProcessingBase.java
@@ -19,7 +19,6 @@ import java.util.concurrent.Executors;
 
 /**
  * @author gjoranv
- * @since 5.1.15
  */
 @Beta
 public abstract class ProcessingBase<
@@ -27,6 +26,7 @@ public abstract class ProcessingBase<
         RESPONSE extends Response,
         PROCESSOR extends Processor>
 {
+
     /**
      * Returns a registry of configured chains.
      *
diff --git a/application/src/main/java/com/yahoo/application/container/Search.java b/application/src/main/java/com/yahoo/application/container/Search.java
index ba241c70b5b..9503ce4fb50 100644
--- a/application/src/main/java/com/yahoo/application/container/Search.java
+++ b/application/src/main/java/com/yahoo/application/container/Search.java
@@ -18,7 +18,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  * @author gjoranv
 */
 @Beta
diff --git a/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java b/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java
index 1d64d2df2a9..c5ca67d4428 100644
--- a/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java
+++ b/application/src/main/java/com/yahoo/application/container/SynchronousRequestResponseHandler.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 @ThreadSafe
 @Beta
@@ -156,6 +156,7 @@ final class SynchronousRequestResponseHandler {
     }
 
     private static class BlockingCompletionHandler implements CompletionHandler {
+
         private volatile Throwable throwable;
         private CountDownLatch doneLatch = new CountDownLatch(1);
 
@@ -184,5 +185,7 @@ final class SynchronousRequestResponseHandler {
                 }
             }
         }
+
     }
+
 }
diff --git a/application/src/main/java/com/yahoo/application/container/handler/Headers.java b/application/src/main/java/com/yahoo/application/container/handler/Headers.java
index 8c49d36c078..cb4ebc3d8b9 100644
--- a/application/src/main/java/com/yahoo/application/container/handler/Headers.java
+++ b/application/src/main/java/com/yahoo/application/container/handler/Headers.java
@@ -15,8 +15,8 @@ import java.util.Set;
  *
  * @see Request
  * @see Response
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Einar M R Rosenvinge
+ * @author Simon Thoresen
  */
 @NotThreadSafe
 @Beta
@@ -99,10 +99,6 @@ public class Headers implements Map<String, List<String>> {
     }
 
 
-    /*
-    CONVENIENCE METHODS:
-     */
-
     /**
      * <p>Convenience method for checking whether or not a named header contains a specific value. If the named header
      * is not set, or if the given value is not contained within that header's value list, this method returns
@@ -223,4 +219,5 @@ public class Headers implements Map<String, List<String>> {
     public List<Entry<String, String>> entries() {
         return h.entries();
     }
+
 }
diff --git a/application/src/main/java/com/yahoo/application/container/handler/Response.java b/application/src/main/java/com/yahoo/application/container/handler/Response.java
index 6502cfe6da2..35d42e3e147 100644
--- a/application/src/main/java/com/yahoo/application/container/handler/Response.java
+++ b/application/src/main/java/com/yahoo/application/container/handler/Response.java
@@ -17,13 +17,13 @@ import java.util.regex.Pattern;
 /**
  * A response for use with {@link com.yahoo.application.container.JDisc#handleRequest(Request)}.
  *
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.15
+ * @author Einar M R Rosenvinge
  * @see Request
  */
 @Immutable
 @Beta
 public class Response {
+
     private final static Pattern charsetPattern = Pattern.compile("charset=([^\\s\\;]+)", Pattern.CASE_INSENSITIVE);
     private final int status;
     private final Headers headers = new Headers();
@@ -122,4 +122,5 @@ public class Response {
         }
         return Utf8.getCharset();
     }
+
 }
diff --git a/application/src/main/java/com/yahoo/application/content/ContentCluster.java b/application/src/main/java/com/yahoo/application/content/ContentCluster.java
index f68e329c12f..93c83f3b323 100644
--- a/application/src/main/java/com/yahoo/application/content/ContentCluster.java
+++ b/application/src/main/java/com/yahoo/application/content/ContentCluster.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.application.content;
 
+import com.google.common.annotations.Beta;
+
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
@@ -8,6 +10,7 @@ import java.util.List;
 /**
  * @author bratseth
  */
+@Beta
 public class ContentCluster {
 
     /**
diff --git a/application/src/test/java/com/yahoo/application/ApplicationFacade.java b/application/src/test/java/com/yahoo/application/ApplicationFacade.java
index 65f36b0804f..744ebb138c9 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationFacade.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationFacade.java
@@ -158,4 +158,5 @@ public class ApplicationFacade implements AutoCloseable {
     public void close() {
         application.close();
     }
+
 }
diff --git a/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java b/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java
index 2ce11335894..2a363916fa3 100644
--- a/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java
+++ b/application/src/test/java/com/yahoo/application/container/JDiscContainerDocprocTest.java
@@ -150,4 +150,5 @@ public class JDiscContainerDocprocTest {
         }
 
     }
+
 }
diff --git a/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java b/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java
index 134d7d64f20..4c8c7f1ce06 100644
--- a/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java
+++ b/application/src/test/java/com/yahoo/application/container/JDiscContainerProcessingTest.java
@@ -17,7 +17,7 @@ import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class JDiscContainerProcessingTest {
 
diff --git a/application/src/test/java/com/yahoo/application/container/MockClient.java b/application/src/test/java/com/yahoo/application/container/MockClient.java
index 5479f4db58e..6909b1059ff 100644
--- a/application/src/test/java/com/yahoo/application/container/MockClient.java
+++ b/application/src/test/java/com/yahoo/application/container/MockClient.java
@@ -11,10 +11,10 @@ import com.yahoo.jdisc.service.AbstractClientProvider;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- *
  * @author Christian Andersen
  */
 public class MockClient extends AbstractClientProvider {
+
     private final AtomicInteger counter = new AtomicInteger();
 
     @Override
@@ -40,4 +40,5 @@ public class MockClient extends AbstractClientProvider {
             // Ignored
         }
     };
+
 }
diff --git a/application/src/test/java/com/yahoo/application/container/MockServer.java b/application/src/test/java/com/yahoo/application/container/MockServer.java
index d8d7d927f7d..cdb320fd69e 100644
--- a/application/src/test/java/com/yahoo/application/container/MockServer.java
+++ b/application/src/test/java/com/yahoo/application/container/MockServer.java
@@ -5,10 +5,10 @@ import com.yahoo.jdisc.service.AbstractServerProvider;
 import com.yahoo.jdisc.service.CurrentContainer;
 
 /**
- *
  * @author Christian Andersen
  */
 public class MockServer extends AbstractServerProvider {
+
     private boolean started = false;
 
     public MockServer(CurrentContainer container) {
@@ -28,4 +28,5 @@ public class MockServer extends AbstractServerProvider {
     public boolean isStarted() {
         return started;
     }
+
 }
diff --git a/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java b/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java
index 57e69e4d1b4..ca221fa5199 100644
--- a/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java
+++ b/application/src/test/java/com/yahoo/application/container/docprocs/Rot13DocumentProcessor.java
@@ -11,7 +11,7 @@ import com.yahoo.document.datatypes.StringFieldValue;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class Rot13DocumentProcessor extends DocumentProcessor {
     private static final String FIELD_NAME = "title";
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java
index 2638bcfdfef..d99fc0c2b9a 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/DelayedThrowingInWriteRequestHandler.java
@@ -13,8 +13,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
-* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
-*/
+ * @author Einar M R Rosenvinge
+ */
 public class DelayedThrowingInWriteRequestHandler extends AbstractRequestHandler {
     private ExecutorService responseExecutor = Executors.newSingleThreadExecutor();
 
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java b/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java
index 01cebc3a3e9..054a63fef66 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/DelayedWriteException.java
@@ -2,7 +2,7 @@
 package com.yahoo.application.container.handlers;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class DelayedWriteException extends RuntimeException {
 }
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java
index 7749902f25a..c47d0afdd02 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/HeaderEchoRequestHandler.java
@@ -12,8 +12,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
-* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
-*/
+ * @author Einar M R Rosenvinge
+ */
 public class HeaderEchoRequestHandler extends AbstractRequestHandler {
     private ExecutorService responseExecutor = Executors.newSingleThreadExecutor();
 
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java
index 3e2d5eab559..643205e9c57 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/MockHttpHandler.java
@@ -11,10 +11,10 @@ import java.io.PrintStream;
 import java.util.concurrent.Executor;
 
 /**
- *
  * @author Christian Andersen
  */
 public class MockHttpHandler extends ThreadedHttpRequestHandler {
+
     public MockHttpHandler(Executor executor) {
         super(executor);
     }
@@ -30,4 +30,5 @@ public class MockHttpHandler extends ThreadedHttpRequestHandler {
             }
         };
     }
+
 }
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java b/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java
index 535dcca16dc..b1f0480adc7 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/ThrowingInWriteRequestHandler.java
@@ -11,9 +11,10 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
-* @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+* @author Einar M R Rosenvinge
 */
 public class ThrowingInWriteRequestHandler extends AbstractRequestHandler {
+
     private ExecutorService responseExecutor = Executors.newSingleThreadExecutor();
 
     @Override
@@ -50,4 +51,5 @@ public class ThrowingInWriteRequestHandler extends AbstractRequestHandler {
             handler.completed();
         }
     }
+
 }
diff --git a/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java b/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java
index 3ec0eb63a48..22ce6652c87 100644
--- a/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java
+++ b/application/src/test/java/com/yahoo/application/container/handlers/WriteException.java
@@ -2,7 +2,7 @@
 package com.yahoo.application.container.handlers;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class WriteException extends RuntimeException {
 }
diff --git a/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java b/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java
index 8191fe4a2ee..99bb6c7b067 100644
--- a/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java
+++ b/application/src/test/java/com/yahoo/application/container/renderers/MockRenderer.java
@@ -8,10 +8,10 @@ import java.io.IOException;
 import java.io.Writer;
 
 /**
- *
  * @author Christian Andersen
  */
 public class MockRenderer extends Renderer {
+
     public MockRenderer() {
     }
 
@@ -29,4 +29,5 @@ public class MockRenderer extends Renderer {
     protected void render(Writer writer, Result result) throws IOException {
         writer.write("<mock hits=\"" + result.hits().size() + "\" />");
     }
+
 }
diff --git a/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java b/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
index 867f3e52015..34913a1beb5 100644
--- a/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
+++ b/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
@@ -9,7 +9,6 @@ import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.searchchain.Execution;
 
 /**
- *
  * @author Christian Andersen
  */
 public class MockSearcher extends Searcher {