Accept LinguisticContextbratseth/linguistics-context-rebased

1 files changed, 2 insertions, 8 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 650e7ee06ff..4f4541ba5ee 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
@@ -11,6 +11,7 @@ import com.yahoo.language.detect.Detection;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author Simon Thoresen Hult
@@ -74,12 +75,6 @@ public class ExecutionContext implements FieldTypeAdapter, FieldValueAdapter, Cl
         return this;
     }
 
-    @Override
-    public DocumentType getDocumentType() {
-        if (adapter == null) return null; // Only happens in tests
-        return adapter.getDocumentType();
-    }
-
     public FieldValueAdapter getAdapter() {
         return adapter;
     }
@@ -98,8 +93,7 @@ public class ExecutionContext implements FieldTypeAdapter, FieldValueAdapter, Cl
     }
 
     public ExecutionContext setLanguage(Language language) {
-        language.getClass();
-        this.language = language;
+        this.language = Objects.requireNonNull(language);
         return this;
     }