Cleanup - no functional chnges

7 files changed, 27 insertions, 48 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateHelper.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateHelper.java
index 8050efd51f9..9500bd6a185 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateHelper.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateHelper.java
@@ -29,8 +29,7 @@ public abstract class FieldPathUpdateHelper {
     public static void applyUpdate(FieldPathUpdate update, Document doc) {
         if (update instanceof AddFieldPathUpdate) {
             update.applyTo(doc);
-        } else if (update instanceof AssignFieldPathUpdate) {
-            AssignFieldPathUpdate assign = (AssignFieldPathUpdate)update;
+        } else if (update instanceof AssignFieldPathUpdate assign) {
             boolean createMissingPath = assign.getCreateMissingPath();
             boolean removeIfZero = assign.getRemoveIfZero();
             assign.setCreateMissingPath(true);
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java
index 4182c133000..2601c5d0f71 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java
@@ -192,7 +192,6 @@ public class FieldUpdateAdapter implements UpdateAdapter {
             return ret;
         }
 
-        @SuppressWarnings({ "unchecked" })
         private List<ValueUpdate> createRemoveValueUpdateForEachElement(Iterator<FieldValue> it) {
             List<ValueUpdate> ret = new ArrayList<>();
             while (it.hasNext()) {
@@ -215,7 +214,6 @@ public class FieldUpdateAdapter implements UpdateAdapter {
             return ret;
         }
 
-        @SuppressWarnings({ "unchecked" })
         private List<ValueUpdate> createMapValueUpdatesForStruct(StructuredFieldValue struct, MapValueUpdate upd) {
             List<ValueUpdate> ret = new ArrayList<>();
             for (Iterator<Map.Entry<Field, FieldValue>> it = struct.iterator(); it.hasNext();) {
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java
index 4900574f549..4f96f2b7a31 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java
@@ -57,9 +57,7 @@ public abstract class FieldValueConverter {
             return null;
         }
         Array ret = DataType.getArray(nextType).createFieldValue();
-        for (FieldValue nextVal : next) {
-            ret.add(nextVal);
-        }
+        ret.addAll(next);
         return ret;
     }
 
@@ -96,9 +94,7 @@ public abstract class FieldValueConverter {
             return null;
         }
         MapFieldValue ret = DataType.getMap(nextKeyType, nextValType).createFieldValue();
-        for (Map.Entry<FieldValue, FieldValue> entry : next.entrySet()) {
-            ret.put(entry.getKey(), entry.getValue());
-        }
+        ret.putAll(next);
         return ret;
     }
 
@@ -128,9 +124,7 @@ public abstract class FieldValueConverter {
         WeightedSet ret = DataType.getWeightedSet(nextType, val.getDataType().createIfNonExistent(),
                                                   val.getDataType().removeIfZero()).createFieldValue();
 
-        for (Map.Entry<FieldValue, Integer> entry : next.entrySet()) {
-            ret.put(entry.getKey(), entry.getValue());
-        }
+        ret.putAll(next);
         return ret;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java
index 2b4e0db699b..ec9329c3c29 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/ScriptParser.java
@@ -16,36 +16,20 @@ import com.yahoo.vespa.indexinglanguage.parser.TokenMgrException;
 public final class ScriptParser {
 
     public static Expression parseExpression(ScriptParserContext config) throws ParseException {
-        return parse(config, new ParserMethod<Expression>() {
-
-            @Override
-            public Expression call(IndexingParser parser) throws ParseException {
-                return parser.root();
-            }
-        });
+        return parse(config, parser -> parser.root());
     }
 
     public static ScriptExpression parseScript(ScriptParserContext config) throws ParseException {
-        return parse(config, new ParserMethod<ScriptExpression>() {
-
-            @Override
-            public ScriptExpression call(IndexingParser parser) throws ParseException {
-                return parser.script();
-            }
-        });
+        return parse(config, parser -> parser.script());
     }
 
     public static StatementExpression parseStatement(ScriptParserContext config) throws ParseException {
-        return parse(config, new ParserMethod<StatementExpression>() {
-
-            @Override
-            public StatementExpression call(IndexingParser parser) throws ParseException {
-                try {
-                    return parser.statement();
-                }
-                catch (TokenMgrException e) {
-                    throw new ParseException(e.getMessage());
-                }
+        return parse(config, parser -> {
+            try {
+                return parser.statement();
+            }
+            catch (TokenMgrException e) {
+                throw new ParseException(e.getMessage());
             }
         });
     }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java
index f45fe7f97c3..3b7d09d0ea8 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java
@@ -60,21 +60,25 @@ public class SimpleAdapterFactory implements AdapterFactory {
                     ret.add(new IdentityFieldPathUpdateAdapter(fieldUpd, newDocumentAdapter(complete, true)));
                 }
             } catch (NullPointerException e) {
-                throw new IllegalArgumentException("Exception during handling of update '" + fieldUpd + "' to field '" + fieldUpd.getFieldPath() + "'", e);
+                throw new IllegalArgumentException("Exception during handling of update '" + fieldUpd +
+                                                   "' to field '" + fieldUpd.getFieldPath() + "'", e);
             }
         }
-        for (FieldUpdate fieldUpd : upd.fieldUpdates()) {
-            Field field = fieldUpd.getField();
-            for (ValueUpdate valueUpd : fieldUpd.getValueUpdates()) {
+        for (FieldUpdate fieldUpdate : upd.fieldUpdates()) {
+            Field field = fieldUpdate.getField();
+            for (ValueUpdate valueUpdate : fieldUpdate.getValueUpdates()) {
                 try {
-                    if (FieldUpdateHelper.isComplete(field, valueUpd)) {
-                        FieldUpdateHelper.applyUpdate(field, valueUpd, complete);
+                    if (FieldUpdateHelper.isComplete(field, valueUpdate)) {
+                        FieldUpdateHelper.applyUpdate(field, valueUpdate, complete);
                     } else {
-                        Document partial = FieldUpdateHelper.newPartialDocument(docType, docId, field, valueUpd);
-                        ret.add(FieldUpdateAdapter.fromPartialUpdate(expressionSelector.selectExpression(docType, field.getName()), newDocumentAdapter(partial, true), valueUpd));
+                        Document partial = FieldUpdateHelper.newPartialDocument(docType, docId, field, valueUpdate);
+                        ret.add(FieldUpdateAdapter.fromPartialUpdate(expressionSelector.selectExpression(docType, field.getName()),
+                                                                     newDocumentAdapter(partial, true),
+                                                                     valueUpdate));
                     }
                 } catch (NullPointerException e) {
-                    throw new IllegalArgumentException("Exception during handling of update '" + valueUpd + "' to field '" + field + "'", e);
+                    throw new IllegalArgumentException("Exception during handling of update '" + valueUpdate +
+                                                       "' to field '" + field + "'", e);
                 }
             }
         }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/linguistics/AnnotatorConfig.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/linguistics/AnnotatorConfig.java
index 441ac711cc3..e42ac6479f8 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/linguistics/AnnotatorConfig.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/linguistics/AnnotatorConfig.java
@@ -97,10 +97,9 @@ public class AnnotatorConfig implements Cloneable {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof AnnotatorConfig)) {
+        if (!(obj instanceof AnnotatorConfig rhs)) {
             return false;
         }
-        AnnotatorConfig rhs = (AnnotatorConfig)obj;
         if (!language.equals(rhs.language)) {
             return false;
         }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/parser/IndexingInput.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/parser/IndexingInput.java
index 3646a9f2681..78c6a4bbf03 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/parser/IndexingInput.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/parser/IndexingInput.java
@@ -11,4 +11,5 @@ public final class IndexingInput extends FastCharStream implements CharStream {
     public IndexingInput(String input) {
         super(input);
     }
+
 }