No functional changes

4 files changed, 16 insertions, 26 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java b/config-model/src/main/java/com/yahoo/searchdefinition/Index.java
index 577639ead7a..212b985f7f1 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Index.java
@@ -53,9 +53,6 @@ public class Index implements Cloneable, Serializable {
      */
     private Stemming stemming = null;
 
-    /** Whether the content of this index is normalized */
-    private boolean normalized = true;
-
     private Type type = Type.VESPA;
 
     /** The boolean index definition, if set */
@@ -126,20 +123,19 @@ public class Index implements Cloneable, Serializable {
         if (o == null || getClass() != o.getClass()) return false;
         Index index = (Index) o;
         return prefix == index.prefix &&
-                normalized == index.normalized &&
-                interleavedFeatures == index.interleavedFeatures &&
-                Objects.equals(name, index.name) &&
-                rankType == index.rankType &&
-                Objects.equals(aliases, index.aliases) &&
-                stemming == index.stemming &&
-                type == index.type &&
-                Objects.equals(boolIndex, index.boolIndex) &&
-                Objects.equals(hnswIndexParams, index.hnswIndexParams);
+               interleavedFeatures == index.interleavedFeatures &&
+               Objects.equals(name, index.name) &&
+               rankType == index.rankType &&
+               Objects.equals(aliases, index.aliases) &&
+               stemming == index.stemming &&
+               type == index.type &&
+               Objects.equals(boolIndex, index.boolIndex) &&
+               Objects.equals(hnswIndexParams, index.hnswIndexParams);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name, rankType, prefix, aliases, stemming, normalized, type, boolIndex, hnswIndexParams, interleavedFeatures);
+        return Objects.hash(name, rankType, prefix, aliases, stemming, type, boolIndex, hnswIndexParams, interleavedFeatures);
     }
 
     public String toString() {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
index 9ce1b8bb330..c89f6f09b77 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java
@@ -23,7 +23,6 @@ import com.yahoo.vespa.model.AbstractService;
 
 import java.io.Reader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -48,7 +47,7 @@ import java.util.stream.Stream;
 public class Search implements ImmutableSearch {
 
     private static final String SD_DOC_FIELD_NAME = "sddocname";
-    private static final List<String> RESERVED_NAMES = Arrays.asList(
+    private static final List<String> RESERVED_NAMES = List.of(
             "index", "index_url", "summary", "attribute", "select_input", "host", SummaryClass.DOCUMENT_ID_FIELD,
             "position", "split_foreach", "tokenize", "if", "else", "switch", "case", SD_DOC_FIELD_NAME, "relevancy");
 
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
index cf7bef654b0..ac92207820c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
@@ -482,7 +482,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
     public void setDataType(DataType type) {
         if (type.equals(DataType.URI)) { // Different defaults, naturally
             normalizing.inferLowercase();
-            stemming=Stemming.NONE;
+            stemming = Stemming.NONE;
         }
         this.dataType = type;
         if ( ! idOverride) {
@@ -672,7 +672,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
      */
     @Override
     public Stemming getStemming(Search search) {
-        if (stemming!=null)
+        if (stemming != null)
             return stemming;
         else
             return search.getStemming();
@@ -687,7 +687,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
      * Sets how this field should be stemmed, or set to null to use the default.
      */
     public void setStemming(Stemming stemming) {
-        this.stemming=stemming;
+        this.stemming = stemming;
     }
 
     /** Returns an unmodifiable map of the summary fields defined in this */
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java
index 8a7ee78ea91..cefad472df7 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java
@@ -3,12 +3,10 @@ package com.yahoo.searchdefinition.document;
 
 import com.yahoo.language.process.StemMode;
 
-import java.util.logging.Logger;
-
 /**
- * <p>The stemming setting of a field. This describes how the search engine
+ * The stemming setting of a field. This describes how the search engine
  * should transform content of this field into base forms (stems) to increase
- * recall (find "car" when you search for "cars" etc.).</p>
+ * recall (find "car" when you search for "cars" etc.).
  *
  * @author bratseth
  */
@@ -26,8 +24,6 @@ public enum Stemming {
     /** index multiple stems */
     MULTIPLE("multiple");
 
-    private static Logger log=Logger.getLogger(Stemming.class.getName());
-
     private final String name;
 
     /**
@@ -36,7 +32,6 @@ public enum Stemming {
      *
      * @throws IllegalArgumentException if there is no stemming type with the given name
      */
-    @SuppressWarnings("deprecation")
     public static Stemming get(String stemmingName) {
         try {
             return Stemming.valueOf(stemmingName.toUpperCase());
@@ -51,11 +46,11 @@ public enum Stemming {
 
     public String getName() { return name; }
 
+    @Override
     public String toString() {
         return "stemming " + name;
     }
 
-    @SuppressWarnings("deprecation")
     public StemMode toStemMode() {
         switch(this) {
             case SHORTEST: return StemMode.SHORTEST;