Cleanup - no functional chnges

48 files changed, 116 insertions, 171 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java
index 8c2608a34ab..58dfb33a017 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ClearStateExpression.java
@@ -11,6 +11,7 @@ public final class ClearStateExpression extends Expression {
     public ClearStateExpression() {
         super(null);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.clear();
@@ -40,4 +41,5 @@ public final class ClearStateExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java
index 9fe63258605..ff0a325b23f 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java
@@ -56,10 +56,9 @@ public abstract class ExpressionList<T extends Expression> extends CompositeExpr
     @Override
     @SuppressWarnings("rawtypes")
     public boolean equals(Object obj) {
-        if (!(obj instanceof ExpressionList)) {
+        if (!(obj instanceof ExpressionList rhs)) {
             return false;
         }
-        ExpressionList rhs = (ExpressionList)obj;
         if (!expressions.equals(rhs.expressions)) {
             return false;
         }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java
index 8b4fab3ea2f..95cbaf3150d 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/FlattenExpression.java
@@ -46,11 +46,7 @@ public final class FlattenExpression extends Expression {
                 str = input.getString().substring(span.getFrom(), span.getTo());
             }
             Integer pos = span.getTo();
-            List<String> entry = map.get(pos);
-            if (entry == null) {
-                entry = new LinkedList<>();
-                map.put(pos, entry);
-            }
+            List<String> entry = map.computeIfAbsent(pos, k -> new LinkedList<>());
             entry.add(str);
         }
         String inputVal = String.valueOf(input);
@@ -92,4 +88,5 @@ public final class FlattenExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
index ad5ecba8ff4..0f3a445bcb9 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachExpression.java
@@ -99,13 +99,8 @@ public final class ForEachExpression extends CompositeExpression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof ForEachExpression)) {
-            return false;
-        }
-        ForEachExpression rhs = (ForEachExpression)obj;
-        if (!exp.equals(rhs.exp)) {
-            return false;
-        }
+        if (!(obj instanceof ForEachExpression rhs)) return false;
+        if (!exp.equals(rhs.exp)) return false;
         return true;
     }
 
@@ -141,4 +136,5 @@ public final class ForEachExpression extends CompositeExpression {
     public void selectMembers(ObjectPredicate predicate, ObjectOperation operation) {
         select(exp, predicate, operation);
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java
index 0156e36628c..ecb6980f795 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetFieldExpression.java
@@ -26,10 +26,9 @@ public final class GetFieldExpression extends Expression {
     @Override
     protected void doExecute(ExecutionContext context) {
         FieldValue input = context.getValue();
-        if (!(input instanceof StructuredFieldValue)) {
+        if (!(input instanceof StructuredFieldValue struct)) {
             throw new IllegalArgumentException("Expected structured input, got " + input.getDataType().getName() + ".");
         }
-        StructuredFieldValue struct = (StructuredFieldValue)input;
         Field field = struct.getField(fieldName);
         if (field == null) {
             throw new IllegalArgumentException("Field '" + fieldName + "' not found in struct type '" +
@@ -64,13 +63,8 @@ public final class GetFieldExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof GetFieldExpression)) {
-            return false;
-        }
-        GetFieldExpression rhs = (GetFieldExpression)obj;
-        if (!fieldName.equals(rhs.fieldName)) {
-            return false;
-        }
+        if (!(obj instanceof GetFieldExpression rhs)) return false;
+        if (!fieldName.equals(rhs.fieldName)) return false;
         return true;
     }
 
@@ -78,4 +72,5 @@ public final class GetFieldExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode() + fieldName.hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java
index 1b44b43729d..4ebf5da2ff8 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GetVarExpression.java
@@ -45,13 +45,8 @@ public final class GetVarExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof GetVarExpression)) {
-            return false;
-        }
-        GetVarExpression rhs = (GetVarExpression)obj;
-        if (!varName.equals(rhs.varName)) {
-            return false;
-        }
+        if (!(obj instanceof GetVarExpression rhs)) return false;
+        if (!varName.equals(rhs.varName)) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java
index 2e32e7ee03e..da7cfcdcaee 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/GuardExpression.java
@@ -63,13 +63,8 @@ public final class GuardExpression extends CompositeExpression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof GuardExpression)) {
-            return false;
-        }
-        GuardExpression rhs = (GuardExpression)obj;
-        if (!exp.equals(rhs.exp)) {
-            return false;
-        }
+        if (!(obj instanceof GuardExpression rhs)) return false;
+        if (!exp.equals(rhs.exp)) return false;
         return true;
     }
 
@@ -95,4 +90,5 @@ public final class GuardExpression extends CompositeExpression {
             }
         }
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java
index 4596d3997c9..93f101a422e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexDecodeExpression.java
@@ -16,6 +16,7 @@ public final class HexDecodeExpression extends Expression {
     public HexDecodeExpression() {
         super(DataType.STRING);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         String input = String.valueOf(context.getValue());
@@ -62,4 +63,5 @@ public final class HexDecodeExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java
index ca2be7c3400..3854598ddec 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HexEncodeExpression.java
@@ -47,4 +47,5 @@ public final class HexEncodeExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
index f249dc26864..922cf8be434 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/HostNameExpression.java
@@ -51,4 +51,5 @@ public final class HostNameExpression extends Expression {
         int pos = hostName.indexOf('.');
         return pos < 0 ? hostName : hostName.substring(0, pos);
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java
index 7f6be0a9f9a..72cd65e43ed 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenExpression.java
@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 public final class IfThenExpression extends CompositeExpression {
 
-    public static enum Comparator {
+    public enum Comparator {
         EQ("=="),
         NE("!="),
         LT("<"),
@@ -34,6 +34,7 @@ public final class IfThenExpression extends CompositeExpression {
         public String toString() {
             return img;
         }
+
     }
 
     private final Expression lhs;
@@ -151,10 +152,9 @@ public final class IfThenExpression extends CompositeExpression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof IfThenExpression)) {
+        if (!(obj instanceof IfThenExpression exp)) {
             return false;
         }
-        IfThenExpression exp = (IfThenExpression)obj;
         if (!lhs.equals(exp.lhs)) {
             return false;
         }
@@ -205,21 +205,14 @@ public final class IfThenExpression extends CompositeExpression {
         } else {
             res = lhs.compareTo(rhs);
         }
-        switch (cmp) {
-        case EQ:
-            return res == 0;
-        case NE:
-            return res != 0;
-        case GT:
-            return res > 0;
-        case GE:
-            return res >= 0;
-        case LT:
-            return res < 0;
-        case LE:
-            return res <= 0;
-        default:
-            throw new UnsupportedOperationException(cmp.toString());
-        }
+        return switch (cmp) {
+            case EQ -> res == 0;
+            case NE -> res != 0;
+            case GT -> res > 0;
+            case GE -> res >= 0;
+            case LT -> res < 0;
+            case LE -> res <= 0;
+        };
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IndexExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IndexExpression.java
index 3e52843764a..891d37be23d 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IndexExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/IndexExpression.java
@@ -14,4 +14,5 @@ public final class IndexExpression extends OutputExpression {
     public boolean equals(Object obj) {
         return super.equals(obj) && obj instanceof IndexExpression;
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java
index cf11196d870..1c3582ea695 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/JoinExpression.java
@@ -35,7 +35,7 @@ public final class JoinExpression extends Expression {
         }
         StringBuilder output = new StringBuilder();
         for (Iterator<FieldValue> it = ((Array)input).fieldValueIterator(); it.hasNext(); ) {
-            output.append(String.valueOf(it.next()));
+            output.append(it.next());
             if (it.hasNext()) {
                 output.append(delimiter);
             }
@@ -64,13 +64,8 @@ public final class JoinExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof JoinExpression)) {
-            return false;
-        }
-        JoinExpression rhs = (JoinExpression)obj;
-        if (!delimiter.equals(rhs.delimiter)) {
-            return false;
-        }
+        if (!(obj instanceof JoinExpression rhs)) return false;
+        if (!delimiter.equals(rhs.delimiter)) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java
index a4a40bf988b..3a439127148 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/LowerCaseExpression.java
@@ -14,6 +14,7 @@ public final class LowerCaseExpression extends Expression {
     public LowerCaseExpression() {
         super(DataType.STRING);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.setValue(new StringFieldValue(toLowerCase(String.valueOf(context.getValue()))));
@@ -43,4 +44,5 @@ public final class LowerCaseExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
index 128087d3c12..4cf5b24941e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/MathResolver.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.indexinglanguage.expressions;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Stack;
 
 /**
@@ -13,10 +14,8 @@ public class MathResolver {
     private final List<Item> items = new LinkedList<>();
 
     public void push(ArithmeticExpression.Operator op, Expression exp) {
-        op.getClass(); // throws NullPointerException
-        if (items.isEmpty() && op != ArithmeticExpression.Operator.ADD) {
+        if (items.isEmpty() && op != ArithmeticExpression.Operator.ADD)
             throw new IllegalArgumentException("First item in an arithmetic operation must be an addition.");
-        }
         items.add(new Item(op, exp));
     }
 
@@ -48,8 +47,9 @@ public class MathResolver {
         Expression exp;
 
         Item(ArithmeticExpression.Operator op, Expression exp) {
-            this.op = op;
+            this.op = Objects.requireNonNull(op);
             this.exp = exp;
         }
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
index d0181ddbf9d..b60f5e5cbc2 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NGramExpression.java
@@ -100,9 +100,8 @@ public final class NGramExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof NGramExpression)) return false;
+        if (!(obj instanceof NGramExpression rhs)) return false;
 
-        NGramExpression rhs = (NGramExpression)obj;
         if (linguistics == null) {
             if (rhs.linguistics != null) return false;
         } else if (rhs.linguistics != null) {
@@ -118,4 +117,5 @@ public final class NGramExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode() + gramSize;
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java
index 0f43c0341f7..b94cfb03b2e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NormalizeExpression.java
@@ -25,7 +25,6 @@ public final class NormalizeExpression extends Expression {
     public Linguistics getLinguistics() {
         return linguistics;
     }
-
     
     private static String escape(String str) {
         StringBuilder buf = new StringBuilder();
@@ -79,8 +78,7 @@ public final class NormalizeExpression extends Expression {
 
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof NormalizeExpression)) return false;
-        NormalizeExpression other = (NormalizeExpression)o;
+        if (!(o instanceof NormalizeExpression other)) return false;
         if (linguistics.getClass() != other.linguistics.getClass()) return false;
         return true;
     }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java
index 5dc626ce841..abfa0267c69 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/NowExpression.java
@@ -46,13 +46,8 @@ public final class NowExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof NowExpression)) {
-            return false;
-        }
-        NowExpression rhs = (NowExpression)obj;
-        if (timer != rhs.timer) {
-            return false;
-        }
+        if (!(obj instanceof NowExpression rhs)) return false;
+        if (timer != rhs.timer) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java
index 25e65ad84ae..d4b6f2e0a0a 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OptimizePredicateExpression.java
@@ -96,4 +96,5 @@ public final class OptimizePredicateExpression extends Expression {
             return notNodeReorderer.process(processedPredicate, options);
         }
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java
index f2abefe8d5e..894f87a9fac 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/OutputExpression.java
@@ -48,13 +48,8 @@ public abstract class OutputExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof OutputExpression)) {
-            return false;
-        }
-        OutputExpression rhs = (OutputExpression)obj;
-        if (!equals(fieldName, rhs.fieldName)) {
-            return false;
-        }
+        if (!(obj instanceof OutputExpression rhs)) return false;
+        if (!equals(fieldName, rhs.fieldName)) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java
index 30cea57dafc..60b059f3ef1 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ParenthesisExpression.java
@@ -50,13 +50,8 @@ public class ParenthesisExpression extends CompositeExpression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof ParenthesisExpression)) {
-            return false;
-        }
-        ParenthesisExpression rhs = (ParenthesisExpression)obj;
-        if (!innerExp.equals(rhs.innerExp)) {
-            return false;
-        }
+        if (!(obj instanceof ParenthesisExpression rhs)) return false;
+        if (!innerExp.equals(rhs.innerExp)) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/PassthroughExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/PassthroughExpression.java
index 02c61c4a05b..d5ce22fd8d4 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/PassthroughExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/PassthroughExpression.java
@@ -18,4 +18,5 @@ public final class PassthroughExpression extends OutputExpression {
     public boolean equals(Object obj) {
         return super.equals(obj) && obj instanceof PassthroughExpression;
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java
index e70af07cf20..b74662a8c8b 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/RandomExpression.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.indexinglanguage.expressions;
 import com.yahoo.document.DataType;
 import com.yahoo.document.datatypes.IntegerFieldValue;
 
+import java.util.Objects;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -29,11 +30,7 @@ public final class RandomExpression extends Expression {
     @Override
     protected void doExecute(ExecutionContext context) {
         int max;
-        if (this.max != null) {
-            max = this.max;
-        } else {
-            max = Integer.parseInt(String.valueOf(context.getValue()));
-        }
+        max = Objects.requireNonNullElseGet(this.max, () -> Integer.parseInt(String.valueOf(context.getValue())));
         context.setValue(new IntegerFieldValue(ThreadLocalRandom.current().nextInt(max)));
     }
 
@@ -54,13 +51,8 @@ public final class RandomExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof RandomExpression)) {
-            return false;
-        }
-        RandomExpression rhs = (RandomExpression)obj;
-        if (!equals(max, rhs.max)) {
-            return false;
-        }
+        if (!(obj instanceof RandomExpression rhs)) return false;
+        if (!equals(max, rhs.max)) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java
index 29942998083..c905042882d 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ScriptExpression.java
@@ -102,4 +102,5 @@ public final class ScriptExpression extends ExpressionList<StatementExpression>
     public static ScriptExpression newInstance(ScriptParserContext config) throws ParseException {
         return ScriptParser.parseScript(config);
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java
index 9d4c69267da..212b60525f9 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SelectInputExpression.java
@@ -34,7 +34,7 @@ public final class SelectInputExpression extends CompositeExpression {
     @Override
     public void setStatementOutput(DocumentType documentType, Field field) {
         for (var casePair : cases)
-        casePair.getSecond().setStatementOutput(documentType, field);
+            casePair.getSecond().setStatementOutput(documentType, field);
     }
 
     @Override
@@ -94,13 +94,8 @@ public final class SelectInputExpression extends CompositeExpression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof SelectInputExpression)) {
-            return false;
-        }
-        SelectInputExpression rhs = (SelectInputExpression)obj;
-        if (!cases.equals(rhs.cases)) {
-            return false;
-        }
+        if (!(obj instanceof SelectInputExpression rhs)) return false;
+        if (!cases.equals(rhs.cases)) return false;
         return true;
     }
 
@@ -108,4 +103,5 @@ public final class SelectInputExpression extends CompositeExpression {
     public int hashCode() {
         return getClass().hashCode() + cases.hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
index 42442eebc13..537a1275037 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetLanguageExpression.java
@@ -36,9 +36,7 @@ public final class SetLanguageExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof SetLanguageExpression)) {
-            return false;
-        }
+        if (!(obj instanceof SetLanguageExpression)) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java
index eca5ace1610..f7348c24af5 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetValueExpression.java
@@ -45,20 +45,15 @@ public final class SetValueExpression extends Expression {
             return "\"" + StringUtilities.escape(value.toString(), '"') + "\"";
         }
         if (value instanceof LongFieldValue) {
-            return value.toString() + "L";
+            return value + "L";
         }
         return value.toString();
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof SetValueExpression)) {
-            return false;
-        }
-        SetValueExpression rhs = (SetValueExpression)obj;
-        if (!value.equals(rhs.value)) {
-            return false;
-        }
+        if (!(obj instanceof SetValueExpression rhs)) return false;
+        if (!value.equals(rhs.value)) return false;
         return true;
     }
 
@@ -66,4 +61,5 @@ public final class SetValueExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode() + value.hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java
index a3c7baf7bc4..a855ba86c9c 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarExpression.java
@@ -47,13 +47,8 @@ public final class SetVarExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof SetVarExpression)) {
-            return false;
-        }
-        SetVarExpression rhs = (SetVarExpression)obj;
-        if (!varName.equals(rhs.varName)) {
-            return false;
-        }
+        if (!(obj instanceof SetVarExpression rhs)) return false;
+        if (!varName.equals(rhs.varName)) return false;
         return true;
     }
 
@@ -61,4 +56,5 @@ public final class SetVarExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode() + varName.hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java
index 7755a77916b..34740f49d6b 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SplitExpression.java
@@ -54,13 +54,8 @@ public final class SplitExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof SplitExpression)) {
-            return false;
-        }
-        SplitExpression rhs = (SplitExpression)obj;
-        if (!splitPattern.toString().equals(rhs.splitPattern.toString())) {
-            return false;
-        }
+        if (!(obj instanceof SplitExpression rhs)) return false;
+        if (!splitPattern.toString().equals(rhs.splitPattern.toString())) return false;
         return true;
     }
 
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java
index 38157531ba2..1ea88d29444 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/StatementExpression.java
@@ -122,4 +122,5 @@ public final class StatementExpression extends ExpressionList<Expression> {
         }
         return ret;
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
index 10f6890fbec..6f96a215edb 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SubstringExpression.java
@@ -60,16 +60,9 @@ public final class SubstringExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof SubstringExpression)) {
-            return false;
-        }
-        SubstringExpression rhs = (SubstringExpression)obj;
-        if (from != rhs.from) {
-            return false;
-        }
-        if (to != rhs.to) {
-            return false;
-        }
+        if (!(obj instanceof SubstringExpression rhs)) return false;
+        if (from != rhs.from) return false;
+        if (to != rhs.to) return false;
         return true;
     }
 
@@ -79,4 +72,5 @@ public final class SubstringExpression extends Expression {
                Integer.valueOf(from).hashCode() +
                Integer.valueOf(to).hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SummaryExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SummaryExpression.java
index c4a2ac7fd88..6284fdba92d 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SummaryExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SummaryExpression.java
@@ -14,4 +14,5 @@ public final class SummaryExpression extends OutputExpression {
     public boolean equals(Object obj) {
         return super.equals(obj) && obj instanceof SummaryExpression;
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
index e46b721df90..86913d8c1ba 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/SwitchExpression.java
@@ -29,9 +29,7 @@ public final class SwitchExpression extends CompositeExpression {
     public <T extends Expression> SwitchExpression(Map<String, T> cases, Expression defaultExp) {
         super(null);
         this.defaultExp = defaultExp;
-        for (Map.Entry<String, T> entry : cases.entrySet()) {
-            this.cases.put(entry.getKey(), entry.getValue());
-        }
+        this.cases.putAll(cases);
     }
 
     public boolean isEmpty() {
@@ -121,16 +119,9 @@ public final class SwitchExpression extends CompositeExpression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof SwitchExpression)) {
-            return false;
-        }
-        SwitchExpression rhs = (SwitchExpression)obj;
-        if (!cases.equals(rhs.cases)) {
-            return false;
-        }
-        if (!equals(defaultExp, rhs.defaultExp)) {
-            return false;
-        }
+        if (!(obj instanceof SwitchExpression rhs)) return false;
+        if (!cases.equals(rhs.cases)) return false;
+        if (!equals(defaultExp, rhs.defaultExp)) return false;
         return true;
     }
 
@@ -138,4 +129,5 @@ public final class SwitchExpression extends CompositeExpression {
     public int hashCode() {
         return getClass().hashCode() + (defaultExp != null ? defaultExp.hashCode() : 0);
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java
index 7b4bb32bdb0..07782b6ac23 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ThisExpression.java
@@ -11,6 +11,7 @@ public final class ThisExpression extends Expression {
     public ThisExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         // empty
@@ -40,4 +41,5 @@ public final class ThisExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java
index df0277a23f4..165dce7c516 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java
@@ -14,6 +14,7 @@ public final class ToArrayExpression extends Expression {
     public ToArrayExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
     protected void doExecute(ExecutionContext context) {
@@ -51,4 +52,5 @@ public final class ToArrayExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java
index 4b398594e3e..7bde439aec0 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToByteExpression.java
@@ -12,6 +12,7 @@ public final class ToByteExpression extends Expression {
     public ToByteExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.setValue(new ByteFieldValue(Byte.valueOf(String.valueOf(context.getValue()))));
@@ -41,4 +42,5 @@ public final class ToByteExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java
index 05470d91bb3..c630999bbc3 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToDoubleExpression.java
@@ -12,6 +12,7 @@ public final class ToDoubleExpression extends Expression {
     public ToDoubleExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.setValue(new DoubleFieldValue(Double.valueOf(String.valueOf(context.getValue()))));
@@ -41,4 +42,5 @@ public final class ToDoubleExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java
index 1396583e788..2883b8ba0b7 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToFloatExpression.java
@@ -12,6 +12,7 @@ public final class ToFloatExpression extends Expression {
     public ToFloatExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.setValue(new FloatFieldValue(Float.valueOf(String.valueOf(context.getValue()))));
@@ -41,4 +42,5 @@ public final class ToFloatExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java
index 6c25b2dfa42..ba51fc47af6 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToIntegerExpression.java
@@ -12,6 +12,7 @@ public final class ToIntegerExpression extends Expression {
     public ToIntegerExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.setValue(new IntegerFieldValue(Integer.valueOf(String.valueOf(context.getValue()))));
@@ -41,4 +42,5 @@ public final class ToIntegerExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java
index 0a074316773..5278d9504b2 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToLongExpression.java
@@ -12,6 +12,7 @@ public final class ToLongExpression extends Expression {
     public ToLongExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.setValue(new LongFieldValue(Long.valueOf(String.valueOf(context.getValue()))));
@@ -41,4 +42,5 @@ public final class ToLongExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java
index 8f41a3329c6..30399407a7e 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToPositionExpression.java
@@ -12,6 +12,7 @@ public final class ToPositionExpression extends Expression {
     public ToPositionExpression() {
         super(DataType.STRING);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.setValue(PositionDataType.fromString(String.valueOf(context.getValue())));
@@ -42,3 +43,4 @@ public final class ToPositionExpression extends Expression {
         return getClass().hashCode();
     }
 }
+
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java
index 0ff127fdc03..e7360890f04 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToStringExpression.java
@@ -12,6 +12,7 @@ public final class ToStringExpression extends Expression {
     public ToStringExpression() {
         super(UnresolvedDataType.INSTANCE);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         context.setValue(new StringFieldValue(String.valueOf(context.getValue())));
@@ -41,4 +42,5 @@ public final class ToStringExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java
index bb1aa82c502..0bfe0312e50 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java
@@ -76,7 +76,8 @@ public final class ToWsetExpression extends Expression {
     @Override
     public int hashCode() {
         return getClass().hashCode() +
-               Boolean.valueOf(createIfNonExistent).hashCode() +
-               Boolean.valueOf(removeIfZero).hashCode();
+               createIfNonExistent.hashCode() +
+               removeIfZero.hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java
index 577bc1e8d28..baf36858f66 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TokenizeExpression.java
@@ -74,13 +74,8 @@ public final class TokenizeExpression extends Expression {
 
     @Override
     public boolean equals(Object obj) {
-        if (!(obj instanceof TokenizeExpression)) {
-            return false;
-        }
-        TokenizeExpression rhs = (TokenizeExpression)obj;
-        if (!config.equals(rhs.config)) {
-            return false;
-        }
+        if (!(obj instanceof TokenizeExpression rhs)) return false;
+        if (!config.equals(rhs.config)) return false;
         return true;
     }
 
@@ -88,4 +83,5 @@ public final class TokenizeExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode() + config.hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java
index 6f65dfb3ee4..62da064c35d 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/TrimExpression.java
@@ -45,4 +45,5 @@ public final class TrimExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/UnresolvedFieldValue.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/UnresolvedFieldValue.java
index 9dd69acf328..a2c134ff71f 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/UnresolvedFieldValue.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/UnresolvedFieldValue.java
@@ -13,11 +13,14 @@ import com.yahoo.document.serialization.XmlStream;
  * @author Simon Thoresen Hult
  */
 public class UnresolvedFieldValue extends FieldValue {
+
     private static class Factory extends PrimitiveDataType.Factory {
         @Override public FieldValue create() { return new UnresolvedFieldValue(); }
         @Override public FieldValue create(String value) { throw new UnsupportedOperationException(); }
     }
+
     public static PrimitiveDataType.Factory getFactory() { return new Factory(); }
+
     @Override
     public DataType getDataType() {
         return UnresolvedDataType.INSTANCE;
@@ -47,4 +50,5 @@ public class UnresolvedFieldValue extends FieldValue {
     public void deserialize(Field field, FieldReader reader) {
         throw new UnsupportedOperationException();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationException.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationException.java
index ec05b1317e5..98a816eb728 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationException.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationException.java
@@ -38,4 +38,5 @@ public class VerificationException extends RuntimeException {
     public String toString() {
         return getClass().getName() + ": For expression '" + exp + "': " + getMessage();
     }
+
 }
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java
index 58dea7cc207..673b6df6d23 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ZCurveExpression.java
@@ -16,6 +16,7 @@ public final class ZCurveExpression extends Expression {
     public ZCurveExpression() {
         super(PositionDataType.INSTANCE);
     }
+
     @Override
     protected void doExecute(ExecutionContext context) {
         Struct input = ((Struct) context.getValue());
@@ -60,4 +61,5 @@ public final class ZCurveExpression extends Expression {
     public int hashCode() {
         return getClass().hashCode();
     }
+
 }