Make inputDataType final to ensure complete at construction time.

11 files changed, 34 insertions, 35 deletions

diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
index f3cd40d71c5..58e80b5eb2b 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ScriptTestCase.java
@@ -53,7 +53,7 @@ public class ScriptTestCase {
             exp.verify(input);
             fail();
         } catch (VerificationException e) {
-            assertTrue(e.getExpression() instanceof ScriptExpression);
+            assertTrue(e.getExpressionType().equals(ScriptExpression.class));
             assertEquals("Expected any input, got null.", e.getMessage());
         }
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticTestCase.java
index c930f4e4d38..8b7ea5a141b 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticTestCase.java
@@ -82,7 +82,7 @@ public class ArithmeticTestCase {
     @Test
     public void requireThatOperandInputCanBeNull() {
         SimpleExpression reqNull = new SimpleExpression();
-        SimpleExpression reqInt = new SimpleExpression().setRequiredInput(DataType.INT);
+        SimpleExpression reqInt = new SimpleExpression(DataType.INT);
         assertNull(newArithmetic(reqNull, Operator.ADD, reqNull).requiredInputType());
         assertEquals(DataType.INT, newArithmetic(reqInt, Operator.ADD, reqNull).requiredInputType());
         assertEquals(DataType.INT, newArithmetic(reqInt, Operator.ADD, reqInt).requiredInputType());
@@ -91,10 +91,10 @@ public class ArithmeticTestCase {
 
     @Test
     public void requireThatOperandsAreInputCompatible() {
-        assertVerify(new SimpleExpression().setRequiredInput(DataType.INT), Operator.ADD,
-                     new SimpleExpression().setRequiredInput(DataType.INT), DataType.INT);
-        assertVerifyThrows(new SimpleExpression().setRequiredInput(DataType.INT), Operator.ADD,
-                           new SimpleExpression().setRequiredInput(DataType.STRING), null,
+        assertVerify(new SimpleExpression(DataType.INT), Operator.ADD,
+                     new SimpleExpression(DataType.INT), DataType.INT);
+        assertVerifyThrows(new SimpleExpression(DataType.INT), Operator.ADD,
+                           new SimpleExpression(DataType.STRING), null,
                            "Operands require conflicting input types, int vs string.");
     }
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
index e83c18786bc..1b9c546fa19 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java
@@ -46,19 +46,19 @@ public class CatTestCase {
     public void requireThatExpressionCanBeVerified() {
         assertVerify(new SetValueExpression(new StringFieldValue("foo")),
                      new SetValueExpression(new StringFieldValue("bar")), null);
-        assertVerify(new SimpleExpression().setRequiredInput(DataType.STRING),
-                     new SimpleExpression().setRequiredInput(DataType.STRING), DataType.STRING);
+        assertVerify(new SimpleExpression(DataType.STRING),
+                     new SimpleExpression(DataType.STRING), DataType.STRING);
         assertVerifyThrows(new SimpleExpression().setCreatedOutput(null),
                            new SimpleExpression().setCreatedOutput(DataType.STRING), null,
                            "Attempting to concatenate a null value ");
-        assertVerifyThrows(new SimpleExpression().setRequiredInput(DataType.STRING),
-                           new SimpleExpression().setRequiredInput(DataType.INT), null,
+        assertVerifyThrows(new SimpleExpression(DataType.STRING),
+                           new SimpleExpression(DataType.INT), null,
                            "Operands require conflicting input types, string vs int.");
-        assertVerifyThrows(new SimpleExpression().setRequiredInput(DataType.STRING),
-                           new SimpleExpression().setRequiredInput(DataType.STRING), null,
+        assertVerifyThrows(new SimpleExpression(DataType.STRING),
+                           new SimpleExpression(DataType.STRING), null,
                            "Expected string input, got null.");
-        assertVerifyThrows(new SimpleExpression().setRequiredInput(DataType.STRING),
-                           new SimpleExpression().setRequiredInput(DataType.STRING), DataType.INT,
+        assertVerifyThrows(new SimpleExpression(DataType.STRING),
+                           new SimpleExpression(DataType.STRING), DataType.INT,
                            "Expected string input, got int.");
     }
 
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionTestCase.java
index c5ae67d1d47..902e091d17c 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionTestCase.java
@@ -62,7 +62,7 @@ public class ExpressionTestCase {
     }
 
     private static Expression newRequiredInput(DataType requiredInput) {
-        return new SimpleExpression().setRequiredInput(requiredInput);
+        return new SimpleExpression(requiredInput);
     }
 
     private static Expression newCreatedOutput(DataType createdOutput, FieldValue actualOutput) {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
index 4d7f1cb02d1..95366111176 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/IfThenTestCase.java
@@ -263,10 +263,10 @@ public class IfThenTestCase {
     }
 
     private static Expression newRequiredInput(DataType lhs, Comparator cmp, DataType rhs, DataType ifTrue, DataType ifFalse) {
-        return new IfThenExpression(new SimpleExpression().setRequiredInput(lhs), cmp,
-                                    new SimpleExpression().setRequiredInput(rhs),
-                                    new SimpleExpression().setRequiredInput(ifTrue),
-                                    ifFalse != null ? new SimpleExpression().setRequiredInput(ifFalse) : null);
+        return new IfThenExpression(new SimpleExpression(lhs), cmp,
+                                    new SimpleExpression(rhs),
+                                    new SimpleExpression(ifTrue),
+                                    ifFalse != null ? new SimpleExpression(ifFalse) : null);
     }
 
     private static class MyFieldValue extends FieldValue {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java
index 7c0b2aa98a4..810863478ec 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/OutputAssert.java
@@ -28,7 +28,7 @@ class OutputAssert {
         assertVerify(new MyAdapter(null), DataType.INT, exp);
         assertVerify(new MyAdapter(null), DataType.STRING, exp);
         assertVerifyThrows(new MyAdapter(null), null, exp, "Expected any input, got null.");
-        assertVerifyThrows(new MyAdapter(new VerificationException(null, "foo")), DataType.INT, exp, "foo");
+        assertVerifyThrows(new MyAdapter(new VerificationException((Expression) null, "foo")), DataType.INT, exp, "foo");
     }
 
     public static void assertVerify(FieldTypeAdapter adapter, DataType value, Expression exp) {
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java
index 66eb29796ad..85039260cb0 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SetVarTestCase.java
@@ -68,7 +68,7 @@ public class SetVarTestCase {
             new SetVarExpression("out").verify(ctx);
             fail();
         } catch (VerificationException e) {
-            assertTrue(e.getExpression() instanceof SetVarExpression);
+            assertTrue(e.getExpressionType().equals(SetVarExpression.class));
             assertEquals("Attempting to assign conflicting types to variable 'out', int vs string.", e.getMessage());
         }
     }
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java
index c771389ac1b..462189384c6 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpression.java
@@ -18,6 +18,10 @@ final class SimpleExpression extends Expression {
     public SimpleExpression() {
         super(null);
     }
+    public SimpleExpression(DataType requiredInput) {
+        super(requiredInput);
+    }
+
     public SimpleExpression setExecuteValue(FieldValue executeValue) {
         this.hasExecuteValue = true;
         this.executeValue = executeValue;
@@ -30,11 +34,6 @@ final class SimpleExpression extends Expression {
         return this;
     }
 
-    public SimpleExpression setRequiredInput(DataType requiredInput) {
-        setInputType(requiredInput);
-        return this;
-    }
-
     public SimpleExpression setCreatedOutput(DataType createdOutput) {
         this.createdOutput = createdOutput;
         return this;
@@ -92,16 +91,16 @@ final class SimpleExpression extends Expression {
     }
 
     public static SimpleExpression newOutput(DataType createdOutput) {
-        return new SimpleExpression().setCreatedOutput(createdOutput)
+        return new SimpleExpression(null).setCreatedOutput(createdOutput)
                                      .setVerifyValue(createdOutput);
     }
 
     public static SimpleExpression newRequired(DataType requiredInput) {
-        return new SimpleExpression().setRequiredInput(requiredInput);
+        return new SimpleExpression(requiredInput);
     }
 
     public static SimpleExpression newConversion(DataType requiredInput, DataType createdOutput) {
-        return new SimpleExpression().setRequiredInput(requiredInput)
+        return new SimpleExpression(requiredInput)
                                      .setCreatedOutput(createdOutput)
                                      .setExecuteValue(createdOutput.createFieldValue())
                                      .setVerifyValue(createdOutput);
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpressionTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpressionTestCase.java
index 2644ed5af7a..27e96c63702 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpressionTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SimpleExpressionTestCase.java
@@ -20,7 +20,7 @@ public class SimpleExpressionTestCase {
         assertNull(exp.execute());
         assertNull(exp.verify());
 
-        assertEquals(DataType.INT, new SimpleExpression().setRequiredInput(DataType.INT).requiredInputType());
+        assertEquals(DataType.INT, new SimpleExpression(DataType.INT).requiredInputType());
         assertEquals(DataType.INT, new SimpleExpression().setCreatedOutput(DataType.INT).createdOutputType());
         assertEquals(DataType.INT, new SimpleExpression().setVerifyValue(DataType.INT).verify());
         assertEquals(new IntegerFieldValue(69),
@@ -50,9 +50,9 @@ public class SimpleExpressionTestCase {
         assertFalse(exp.equals(new SimpleExpression().setVerifyValue(DataType.STRING)));
         assertEquals(exp, new SimpleExpression().setVerifyValue(DataType.INT));
 
-        exp = new SimpleExpression().setRequiredInput(DataType.INT);
-        assertFalse(exp.equals(new SimpleExpression().setRequiredInput(DataType.STRING)));
-        assertEquals(exp, new SimpleExpression().setRequiredInput(DataType.INT));
+        exp = new SimpleExpression(DataType.INT);
+        assertFalse(exp.equals(new SimpleExpression(DataType.STRING)));
+        assertEquals(exp, new SimpleExpression(DataType.INT));
 
         exp = new SimpleExpression().setCreatedOutput(DataType.INT);
         assertFalse(exp.equals(new SimpleExpression().setCreatedOutput(DataType.STRING)));
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
index 27466313fc6..bcec637e5e3 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/StatementTestCase.java
@@ -76,7 +76,7 @@ public class StatementTestCase {
     @Test
     public void requireThatRequiredInputIsNullIfAnyOutputIsCreatedFirst() {
         assertNull(newStatement(new SimpleExpression().setCreatedOutput(DataType.INT),
-                                new SimpleExpression().setRequiredInput(DataType.INT)).requiredInputType());
+                                new SimpleExpression(DataType.INT)).requiredInputType());
     }
 
     @Test
diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationExceptionTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationExceptionTestCase.java
index a22cc64e115..001f2408576 100644
--- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationExceptionTestCase.java
+++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/VerificationExceptionTestCase.java
@@ -14,7 +14,7 @@ public class VerificationExceptionTestCase {
     public void requireThatAccessorsWork() {
         Expression exp = new SimpleExpression();
         VerificationException e = new VerificationException(exp, "foo");
-        assertSame(exp, e.getExpression());
+        assertEquals(exp.toString(), e.getExpression());
         assertEquals("foo", e.getMessage());
         assertTrue(e.toString().contains(exp.toString()));
         assertTrue(e.toString().contains(e.getMessage()));