Merge pull request #16612 from vespa-engine/bratseth/non-functional-changes-37

Non-functional changes only

18 files changed, 58 insertions, 31 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java
index b09f85726e5..10385e826f2 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/IndexStructureValidator.java
@@ -10,7 +10,7 @@ import com.yahoo.vespa.indexinglanguage.expressions.Expression;
 import com.yahoo.vespa.indexinglanguage.expressions.OutputExpression;
 
 /**
- * @author <a href="mailto:mlidal@yahoo-inc.com">Mathias M Lidal</a>
+ * @author Mathias M Lidal
  */
 public class IndexStructureValidator extends Validator {
 
@@ -37,15 +37,14 @@ public class IndexStructureValidator extends Validator {
 
         @Override
         protected void doVisit(Expression exp) {
-            if (!(exp instanceof OutputExpression)) {
-                return;
-            }
+            if (!(exp instanceof OutputExpression)) return;
+
             String fieldName = ((OutputExpression)exp).getFieldName();
-            if (docType.getField(fieldName) != null) {
-                return;
-            }
+            if (docType.getField(fieldName) != null) return;
+
             throw new IllegalArgumentException("Indexing expression '" + this.exp + "' refers to field '" +
                                                fieldName + "' which does not exist in the index structure.");
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java
index fb1e9ae2f3b..35f782d4334 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Ranking.java
@@ -6,7 +6,7 @@ import java.io.Serializable;
 /**
  * The rank settings given in a rank clause in the search definition.
  *
- * @author  <a href="mailto:vehardh@yahoo-inc.com">Vegard Havdal</a>
+ * @author Vegard Havdal
  */
 public class Ranking implements Cloneable, Serializable {
 
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/SDAnnotationType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/SDAnnotationType.java
index cec5af7998f..adf58ee6838 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/SDAnnotationType.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/SDAnnotationType.java
@@ -5,9 +5,10 @@ import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.document.annotation.AnnotationType;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class SDAnnotationType extends AnnotationType {
+
     private SDDocumentType sdDocType;
     private String inherits;
 
@@ -32,4 +33,5 @@ public class SDAnnotationType extends AnnotationType {
     public void inherit(String inherits) {
         this.inherits = inherits;
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/TemporaryAnnotationReferenceDataType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/TemporaryAnnotationReferenceDataType.java
index c41359db9ab..8ffe0fde535 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/TemporaryAnnotationReferenceDataType.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/annotation/TemporaryAnnotationReferenceDataType.java
@@ -5,9 +5,10 @@ import com.yahoo.document.annotation.AnnotationReferenceDataType;
 import com.yahoo.document.annotation.AnnotationType;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class TemporaryAnnotationReferenceDataType extends AnnotationReferenceDataType {
+
     private final String target;
 
     public TemporaryAnnotationReferenceDataType(String target) {
@@ -23,4 +24,5 @@ public class TemporaryAnnotationReferenceDataType extends AnnotationReferenceDat
         super.setName("annotationreference<" + type.getName() + ">");
         super.setAnnotationType(type);
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BoldingOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BoldingOperation.java
index 3b4a1704f63..021276a9fa4 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BoldingOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/BoldingOperation.java
@@ -5,7 +5,7 @@ import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.vespa.documentmodel.SummaryField;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class BoldingOperation implements FieldOperation {
 
@@ -21,4 +21,5 @@ public class BoldingOperation implements FieldOperation {
         summaryField.addDestination("default");
         summaryField.setTransform(bold ? summaryField.getTransform().bold() : summaryField.getTransform().unbold());
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IdOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IdOperation.java
index 16c187a9ed0..53d44a59f5a 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IdOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/IdOperation.java
@@ -5,9 +5,10 @@ import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.searchdefinition.document.SDField;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class IdOperation implements FieldOperation {
+
     private SDDocumentType document;
     private int fieldId;
 
@@ -30,4 +31,5 @@ public class IdOperation implements FieldOperation {
     public void apply(SDField field) {
          document.setFieldId(field, fieldId);
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/MatchOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/MatchOperation.java
index fdb55e7bd91..5bfd2c38586 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/MatchOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/MatchOperation.java
@@ -5,9 +5,10 @@ import com.yahoo.searchdefinition.document.Matching;
 import com.yahoo.searchdefinition.document.SDField;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class MatchOperation implements FieldOperation {
+
     private Matching.Type matchingType;
     private Integer gramSize;
     private Integer maxLength;
@@ -50,4 +51,5 @@ public class MatchOperation implements FieldOperation {
             field.getMatching().setExactMatchTerminator(exactMatchTerminator);
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/NormalizingOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/NormalizingOperation.java
index 8fabf246712..a5a1466d1be 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/NormalizingOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/NormalizingOperation.java
@@ -5,10 +5,11 @@ import com.yahoo.searchdefinition.document.NormalizeLevel;
 import com.yahoo.searchdefinition.document.SDField;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class NormalizingOperation implements FieldOperation {
-    private NormalizeLevel.Level level;
+
+    private final NormalizeLevel.Level level;
 
     public NormalizingOperation(String setting) {
         if ("none".equals(setting)) {
@@ -22,11 +23,12 @@ public class NormalizingOperation implements FieldOperation {
         } else if ("all".equals(setting)) {
             this.level = NormalizeLevel.Level.ACCENT;
         } else {
-            throw new IllegalArgumentException("invalid normalizing setting: "+setting);
+            throw new IllegalArgumentException("invalid normalizing setting: " + setting);
         }
     }
 
     public void apply(SDField field) {
         field.setNormalizing(new NormalizeLevel(level, true));
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/QueryCommandOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/QueryCommandOperation.java
index 83cb48ad395..f3b8f4a16f0 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/QueryCommandOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/QueryCommandOperation.java
@@ -6,10 +6,11 @@ import com.yahoo.searchdefinition.document.SDField;
 import java.util.List;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class QueryCommandOperation implements FieldOperation {
-    private List<String> queryCommands = new java.util.ArrayList<>(0);
+
+    private final List<String> queryCommands = new java.util.ArrayList<>(0);
 
     public void addQueryCommand(String name) {
        queryCommands.add(name);
@@ -20,4 +21,5 @@ public class QueryCommandOperation implements FieldOperation {
             field.addQueryCommand(command);
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankOperation.java
index d3be075a3f5..4f109d27a96 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankOperation.java
@@ -4,7 +4,7 @@ package com.yahoo.searchdefinition.fieldoperation;
 import com.yahoo.searchdefinition.document.SDField;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class RankOperation implements FieldOperation {
 
@@ -32,4 +32,5 @@ public class RankOperation implements FieldOperation {
             field.getRanking().setNormal(normal);
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankTypeOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankTypeOperation.java
index 219fd869758..7f0ee984415 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankTypeOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/RankTypeOperation.java
@@ -6,9 +6,10 @@ import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.searchdefinition.Index;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class RankTypeOperation implements FieldOperation {
+
     private String indexName;
     private RankType type;
 
@@ -38,4 +39,5 @@ public class RankTypeOperation implements FieldOperation {
             index.setRankType(type);
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SortingOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SortingOperation.java
index 2a7b1b376a6..c556ddea99d 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SortingOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SortingOperation.java
@@ -6,10 +6,11 @@ import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.searchdefinition.document.Sorting;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class SortingOperation implements FieldOperation {
-    private String attributeName;
+
+    private final String attributeName;
     private Boolean ascending;
     private Boolean descending;
     private Sorting.Function function;
@@ -88,4 +89,5 @@ public class SortingOperation implements FieldOperation {
             sorting.setLocale(locale);
         }
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StemmingOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StemmingOperation.java
index 75a8410327b..e3cee4ece3d 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StemmingOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/StemmingOperation.java
@@ -5,9 +5,10 @@ import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.searchdefinition.document.Stemming;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class StemmingOperation implements FieldOperation {
+
     private String setting;
 
     public String getSetting() {
@@ -21,4 +22,5 @@ public class StemmingOperation implements FieldOperation {
     public void apply(SDField field) {
         field.setStemming(Stemming.get(setting));
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldShortOperation.java b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldShortOperation.java
index a59252ab8a8..c1a5adb2ae7 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldShortOperation.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/fieldoperation/SummaryInFieldShortOperation.java
@@ -5,9 +5,10 @@ import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.vespa.documentmodel.SummaryField;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class SummaryInFieldShortOperation extends SummaryInFieldOperation {
+
     public SummaryInFieldShortOperation(String name) {
         super(name);
     }
@@ -27,4 +28,5 @@ public class SummaryInFieldShortOperation extends SummaryInFieldOperation {
         }
         field.addSummaryField(ret);
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DocumentProcessorModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DocumentProcessorModelBuilder.java
index 326494ee240..6f84afa2c6e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DocumentProcessorModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/docproc/DocumentProcessorModelBuilder.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 public class DocumentProcessorModelBuilder extends ChainedComponentModelBuilder {
 
@@ -35,7 +35,7 @@ public class DocumentProcessorModelBuilder extends ChainedComponentModelBuilder
      * Parses a schemamapping element and generates a map of field mappings
      *
      * @param e a schemamapping element
-     * @return doctype,in-document → in-processor
+     * @return doctype, in-document → in-processor
      */
     public static Map<Pair<String,String>, String> parseFieldNameSchemaMap(Element e) {
         Map<Pair<String, String>, String> ret = new HashMap<>();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/TimeParser.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/TimeParser.java
index e22cd0c72ea..33fb7db41ab 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/TimeParser.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/TimeParser.java
@@ -8,9 +8,10 @@ import java.util.regex.Pattern;
  * Utility class for parsing timeout fields.
  *
  * @author Tony Vaagenes
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class TimeParser {
+
     private static final Pattern timeoutPattern = Pattern.compile("(\\d+(\\.\\d*)?)\\s*(m)?s");
     private static final double milliSecondsPerSecond = 1000.0d;
 
@@ -24,7 +25,7 @@ public class TimeParser {
         if (matcher.group(3) != null) {
             value /= milliSecondsPerSecond;
         }
-        return Double.valueOf(value);
+        return value;
     }
 
     public static int asMilliSeconds(String timeout) {
@@ -40,4 +41,5 @@ public class TimeParser {
 
         return (int) value;
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/model/DocumentProcessorModel.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/model/DocumentProcessorModel.java
index 4798b942e5a..2825be32eb5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/model/DocumentProcessorModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/model/DocumentProcessorModel.java
@@ -11,11 +11,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
 @Immutable
 public class DocumentProcessorModel extends ChainedComponentModel {
-    private Map<Pair<String, String>, String> fieldNameSchemaMap = new HashMap<>();
+
+    private final Map<Pair<String, String>, String> fieldNameSchemaMap = new HashMap<>();
 
     public DocumentProcessorModel(BundleInstantiationSpecification bundleInstantiationSpec, Dependencies dependencies, Map<Pair<String, String>, String> fieldNameSchemaMap) {
         super(bundleInstantiationSpec, dependencies);
@@ -29,4 +30,5 @@ public class DocumentProcessorModel extends ChainedComponentModel {
     public Map<Pair<String,String>,String> fieldNameSchemaMap() {
         return fieldNameSchemaMap;
     }
+
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QrsCache.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QrsCache.java
index 78a1b01bacc..f47103b859e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QrsCache.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QrsCache.java
@@ -4,12 +4,14 @@ package com.yahoo.vespa.model.container.search;
 /**
  * A helper class to wrap a set of QRS cache settings.
  *
- * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class QrsCache {
+
     public final Integer size;
 
     public QrsCache(Integer size) {
         this.size = size;
     }
+
 }