Cleanup only

2 files changed, 16 insertions, 23 deletions

diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContext.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContext.java
index b0478f8001c..39e8d10facd 100644
--- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContext.java
+++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExecutionContext.java
@@ -10,11 +10,12 @@ import com.yahoo.language.detect.Detection;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author Simon Thoresen Hult
  */
-public class ExecutionContext implements FieldTypeAdapter, FieldValueAdapter, Cloneable {
+public class ExecutionContext implements FieldTypeAdapter, FieldValueAdapter {
 
     private final Map<String, FieldValue> variables = new HashMap<>();
     private final FieldValueAdapter adapter;
@@ -40,7 +41,9 @@ public class ExecutionContext implements FieldTypeAdapter, FieldValueAdapter, Cl
      * Returns whether this is for a complete execution of all statements of a script,
      * or a partial execution of only the statements accessing the available data.
      */
-    public boolean isComplete() { return adapter == null ? false : adapter.isComplete(); }
+    public boolean isComplete() {
+        return adapter != null && adapter.isComplete();
+    }
 
     @Override
     public DataType getInputType(Expression exp, String fieldName) {
@@ -89,37 +92,26 @@ public class ExecutionContext implements FieldTypeAdapter, FieldValueAdapter, Cl
         return this;
     }
 
-    public Language getLanguage() {
-        return language;
-    }
+    public Language getLanguage() { return language; }
 
     public ExecutionContext setLanguage(Language language) {
-        language.getClass();
-        this.language = language;
+        this.language = Objects.requireNonNull(language);
         return this;
     }
 
     public Language resolveLanguage(Linguistics linguistics) {
-        if (language != null && language != Language.UNKNOWN) {
-            return language;
-        }
-        if (linguistics == null) {
-            return Language.ENGLISH;
-        }
+        if (language != null && language != Language.UNKNOWN) return language;
+        if (linguistics == null) return Language.ENGLISH;
+
         Detection detection = linguistics.getDetector().detect(String.valueOf(value), null);
-        if (detection == null) {
-            return Language.ENGLISH;
-        }
+        if (detection == null) return Language.ENGLISH;
+
         Language detected = detection.getLanguage();
-        if (detected == Language.UNKNOWN) {
-            return Language.ENGLISH;
-        }
+        if (detected == Language.UNKNOWN) return Language.ENGLISH;
         return detected;
     }
 
-    public FieldValue getValue() {
-        return value;
-    }
+    public FieldValue getValue() { return value; }
 
     public ExecutionContext setValue(FieldValue value) {
         this.value = value;
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 a88e56939ee..7d180b9fd7a 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
@@ -51,7 +51,8 @@ public final class ScriptExpression extends ExpressionList<StatementExpression>
         for (StatementExpression statement : this) {
             if (context.isComplete() ||
                 (statement.getInputFields().isEmpty() || containsAtLeastOneInputFrom(statement.getInputFields(), context))) {
-                context.setValue(input).execute(statement);
+                context.setValue(input);
+                context.execute(statement);
             }
         }
         context.setValue(input);