Non-functional changes only

10 files changed, 38 insertions, 42 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/VespaModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/VespaModelBuilder.java
index 1c2ea4ecd41..d1062b9dfb5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/VespaModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/VespaModelBuilder.java
@@ -13,17 +13,17 @@ import java.util.List;
 /**
  * Base class for classes capable of building vespa model.
  *
- * @author vegardh
+ * @author Vegard Havdal
  */
 public abstract class VespaModelBuilder {
 
-
     public abstract ApplicationConfigProducerRoot getRoot(String name, DeployState deployState, AbstractConfigProducer parent);
     public abstract List<ServiceCluster> getClusters(DeployState pkg, AbstractConfigProducer parent);
 
     /**
      * Processing that requires access across plugins
-     * @param producerRoot The root producer.
+     *
+     * @param producerRoot the root producer.
      * @param configModelRepo a {@link com.yahoo.config.model.ConfigModelRepo instance}
      */
     public abstract void postProc(DeployLogger deployLogger, AbstractConfigProducer producerRoot, ConfigModelRepo configModelRepo);
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
index cd790a67742..045646cbc5c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/DistributorCluster.java
@@ -27,6 +27,7 @@ public class DistributorCluster extends AbstractConfigProducer<Distributor> impl
 
 
     private static class GcOptions {
+
         public final int interval;
         public final String selection;
 
@@ -42,6 +43,7 @@ public class DistributorCluster extends AbstractConfigProducer<Distributor> impl
     private final boolean hasIndexedDocumentType;
 
     public static class Builder extends VespaDomBuilder.DomConfigProducerBuilder<DistributorCluster> {
+
         ContentCluster parent;
 
         public Builder(ContentCluster parent) {
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java b/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
index 6800a80b78f..1e0153761c9 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/SearchPath.java
@@ -26,6 +26,7 @@ import java.util.stream.IntStream;
  * @author ollivir
  */
 public class SearchPath {
+
     /**
      * Parse the search path and select nodes from the given cluster based on it.
      *
@@ -193,7 +194,7 @@ public class SearchPath {
     private static Pair<String, String> halveAt(char divider, String string) {
         int pos = string.indexOf(divider);
         if (pos >= 0) {
-            return new Pair<>(string.substring(0, pos), string.substring(pos + 1, string.length()));
+            return new Pair<>(string.substring(0, pos), string.substring(pos + 1));
         }
         return new Pair<>(string, "");
     }
diff --git a/document/src/main/java/com/yahoo/document/DocumentCalculator.java b/document/src/main/java/com/yahoo/document/DocumentCalculator.java
index 8fcd3e1acd8..aba400bebf0 100644
--- a/document/src/main/java/com/yahoo/document/DocumentCalculator.java
+++ b/document/src/main/java/com/yahoo/document/DocumentCalculator.java
@@ -10,7 +10,7 @@ import com.yahoo.document.select.rule.ComparisonNode;
 import java.util.Map;
 
 /**
- * @author <a href="mailto:thomasg@yahoo-inc.com">Thomas Gundersen</a>
+ * @author Thomas Gundersen
  */
 public class DocumentCalculator {
 
@@ -36,4 +36,5 @@ public class DocumentCalculator {
             throw new IllegalArgumentException("Arithmetic exception " + e.getMessage(), e);
         }
     }
+
 }
diff --git a/document/src/main/java/com/yahoo/document/select/BucketSelector.java b/document/src/main/java/com/yahoo/document/select/BucketSelector.java
index 41a0d9fd87b..b98d9c59657 100644
--- a/document/src/main/java/com/yahoo/document/select/BucketSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/BucketSelector.java
@@ -39,7 +39,7 @@ public class BucketSelector {
      * when dealing with unknown bucket sets.
      *
      * @param selector The document selection string
-     * @return A list of buckets with arbitrary number of location bits set,
+     * @return a list of buckets with arbitrary number of location bits set,
      *         <i>or</i>, <code>null</code> if the document selection resulted
      *         in an unknown set
      * @throws ParseException if <code>selector</code> couldn't be parsed
diff --git a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
index 8b5178d21a8..afda4eec9a9 100644
--- a/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
+++ b/document/src/main/java/com/yahoo/document/select/DocumentSelector.java
@@ -24,8 +24,8 @@ public class DocumentSelector {
     /**
      * Creates a document selector from a Document Selection Language string
      *
-     * @param selector The string to parse as a selector.
-     * @throws ParseException Thrown if the string could not be parsed.
+     * @param selector the string to parse as a selector
+     * @throws ParseException Thrown if the string could not be parsed
      */
     public DocumentSelector(String selector) throws ParseException {
         SelectInput input = new SelectInput(selector);
@@ -45,8 +45,8 @@ public class DocumentSelector {
     /**
      * Returns true if the document referenced by this document operation is accepted by this selector
      *
-     * @param op A document operation
-     * @return True if the document is accepted.
+     * @param op a document operation
+     * @return true if the document is accepted
      * @throws RuntimeException if the evaluation enters an illegal state
      */
     public Result accepts(DocumentOperation op) {
@@ -56,8 +56,8 @@ public class DocumentSelector {
     /**
      * Returns true if the document referenced by this context is accepted by this selector
      *
-     * @param context The context to match in.
-     * @return True if the document is accepted.
+     * @param context the context to match in
+     * @return true if the document is accepted
      * @throws RuntimeException if the evaluation enters an illegal state
      */
     public Result accepts(Context context) {
@@ -65,11 +65,10 @@ public class DocumentSelector {
     }
 
     /**
-     * Returns the list of different variables resulting in a true state for this
-     * expression.
+     * Returns the list of different variables resulting in a true state for this expression
      *
-     * @param op The document to evaluate.
-     * @return True if the document is accepted.
+     * @param op the document to evaluate
+     * @return true if the document is accepted
      * @throws RuntimeException if the evaluation enters an illegal state
      */
     public ResultList getMatchingResultList(DocumentOperation op) {
@@ -77,32 +76,25 @@ public class DocumentSelector {
     }
 
     /**
-     * Returns the list of different variables resulting in a true state for this
-     * expression.
+     * Returns the list of different variables resulting in a true state for this expression
      *
-     * @param context The context to match in.
-     * @return True if the document is accepted.
+     * @param context the context to match in
+     * @return true if the document is accepted
      * @throws RuntimeException if the evaluation enters an illegal state
      */
     private ResultList getMatchingResultList(Context context) {
         return ResultList.toResultList(expression.evaluate(context));
     }
 
-    /**
-     * Returns this selector as a Document Selection Language string.
-     *
-     * @return The selection string.
-     */
+    /** Returns this selector as a Document Selection Language string */
+    @Override
     public String toString() {
         return expression.toString();
     }
 
-    /**
-     * Visits the expression tree.
-     *
-     * @param visitor The visitor to use.
-     */
+    /** Visits the expression tree */
     public void visit(Visitor visitor) {
         expression.accept(visitor);
     }
+
 }
diff --git a/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java b/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java
index 232262eb466..8b8144ce84a 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/ExpressionNode.java
@@ -17,22 +17,22 @@ public interface ExpressionNode {
     /**
      * Evaluate the content of this node based on document object, and return that value.
      *
-     * @param doc The document to evaluate over.
-     * @return The value of this.
+     * @param doc the document to evaluate over.
+     * @return the value of this.
      */
     Object evaluate(Context doc);
 
     /**
      * Returns the set of bucket ids covered by this node.
      *
-     * @param factory The factory used by the current application.
+     * @param factory the factory used by the current application.
      */
     BucketSet getBucketSet(BucketIdFactory factory);
 
     /**
      * Perform visitation of this node.
      *
-     * @param visitor The visitor that wishes to visit the node.
+     * @param visitor the visitor that wishes to visit the node.
      */
     void accept(Visitor visitor);
 
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/DocumentVisitor.java b/documentapi/src/main/java/com/yahoo/documentapi/DocumentVisitor.java
index f81d8bc6e84..a6c3b7f10b1 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/DocumentVisitor.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/DocumentVisitor.java
@@ -4,20 +4,19 @@ package com.yahoo.documentapi;
 /**
  * Visitor that simply returns documents found in storage.
  *
- * @author <a href="mailto:humbe@yahoo-inc.com">H&aring;kon Humberset</a>
+ * @author Håkon Humberset
  */
 public class DocumentVisitor extends VisitorParameters {
 
     /**
-     * Create a document visitor.
+     * Creates a document visitor.
      *
-     * @param documentSelection The document selection criteria.
+     * @param documentSelection the document selection criteria.
      */
     public DocumentVisitor(String documentSelection) {
         super(documentSelection);
     }
 
-    // Inherited docs from VisitorParameters
     public String getVisitorLibrary() { return "DumpVisitor"; }
 
 }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorIterator.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorIterator.java
index ebf80936e56..c26c986152c 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorIterator.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorIterator.java
@@ -22,9 +22,10 @@ import java.util.logging.Logger;
  * Concurrent access to a single VisitorIterator instance is not safe and must
  * be handled atomically by the caller.</p>
  *
- * @author <a href="mailto:vekterli@yahoo-inc.com">Tor Brede Vekterli</a>
+ * @author vekterli
  */
 public class VisitorIterator {
+
     private ProgressToken progressToken;
     private BucketSource bucketSource;
     private int distributionBitCount;
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java
index bdb65b28de0..cd181ac3c51 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentRouteSelectorPolicy.java
@@ -119,9 +119,9 @@ public class DocumentRouteSelectorPolicy
      * This method runs the selector associated with the given location on the content of the message. If the selector
      * validates the location, this method returns true.
      *
-     * @param context   The routing context that contains the necessary data.
-     * @param routeName The candidate route whose selector to run.
-     * @return Whether or not to send to the given recipient.
+     * @param context   the routing context that contains the necessary data.
+     * @param routeName the candidate route whose selector to run.
+     * @return whether or not to send to the given recipient.
      */
     private boolean select(RoutingContext context, String routeName) {
         if (config == null) {