diff options
Diffstat (limited to 'searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule')
-rwxr-xr-x | searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java | 10 | ||||
-rw-r--r-- | searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java index 68134cc85b4..ffbeec37c78 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ConstantNode.java @@ -19,7 +19,8 @@ public final class ConstantNode extends ExpressionNode { private final Value value; public ConstantNode(Value value) { - this(value,null); + value.freeze(); + this.value = value; } /** @@ -28,19 +29,20 @@ public final class ConstantNode extends ExpressionNode { * @param value the value. Ownership of this value is transferred to this. * @param sourceImage the source string image producing this value */ + @Deprecated public ConstantNode(Value value, String sourceImage) { - value.freeze(); - this.value = value; + this(value); } public Value getValue() { return value; } @Override public StringBuilder toString(StringBuilder string, SerializationContext context, Deque<String> path, CompositeNode parent) { - return string.append(sourceString()); + return string.append(value.toString()); } /** Returns the string which created this, or the value.toString() if not known */ + @Deprecated public String sourceString() { return value.toString(); } diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java index 57b349fdc2e..9516f38a155 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/NegativeNode.java @@ -30,7 +30,7 @@ public class NegativeNode extends CompositeNode { @Override public List<ExpressionNode> children() { - return Collections.singletonList(value); + return List.of(value); } @Override |