Avoid using deprecated methods

5 files changed, 6 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
index faf3c8085d8..6d9f4cdec92 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/OnnxModelTransformer.java
@@ -135,7 +135,7 @@ public class OnnxModelTransformer extends ExpressionTransformer<RankProfileTrans
     public static String asString(ExpressionNode node) {
         if ( ! (node instanceof ConstantNode))
             throw new IllegalArgumentException("Expected a constant string as argument, but got '" + node);
-        return stripQuotes(((ConstantNode)node).sourceString());
+        return stripQuotes(node.toString());
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelConfigGenerator.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelConfigGenerator.java
index c7c1db3b862..fdbde08d926 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelConfigGenerator.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/OnnxModelConfigGenerator.java
@@ -74,7 +74,7 @@ public class OnnxModelConfigGenerator extends Processor {
             if (feature.getArguments().size() > 0) {
                 if (feature.getArguments().expressions().get(0) instanceof ConstantNode) {
                     ConstantNode node = (ConstantNode) feature.getArguments().expressions().get(0);
-                    String path = OnnxModelTransformer.stripQuotes(node.sourceString());
+                    String path = OnnxModelTransformer.stripQuotes(node.toString());
                     String modelConfigName = OnnxModelTransformer.asValidIdentifier(path);
 
                     // Only add the configuration if the model can actually be found.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java
index 372b355b2d3..b52fd060a1c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/FeatureArguments.java
@@ -57,7 +57,7 @@ public class FeatureArguments {
     private static String asString(ExpressionNode node) {
         if ( ! (node instanceof ConstantNode))
             throw new IllegalArgumentException("Expected a constant string as argument, but got '" + node);
-        return stripQuotes(((ConstantNode)node).sourceString());
+        return stripQuotes(node.toString());
     }
 
     private static String stripQuotes(String s) {
diff --git a/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java b/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java
index 40a0a1be5fc..d97235d11d2 100644
--- a/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java
+++ b/model-evaluation/src/main/java/ai/vespa/models/evaluation/LazyArrayContext.java
@@ -293,8 +293,8 @@ public final class LazyArrayContext extends Context implements ContextIndex {
                 ReferenceNode reference = (ReferenceNode) node;
                 if (reference.getArguments().size() > 0) {
                     if (reference.getArguments().expressions().get(0) instanceof ConstantNode) {
-                        ConstantNode constantNode = (ConstantNode) reference.getArguments().expressions().get(0);
-                        return Optional.of(stripQuotes(constantNode.sourceString()));
+                        ExpressionNode constantNode = reference.getArguments().expressions().get(0);
+                        return Optional.of(stripQuotes(constantNode.toString()));
                     }
                     if (reference.getArguments().expressions().get(0) instanceof ReferenceNode) {
                         ReferenceNode referenceNode = (ReferenceNode) reference.getArguments().expressions().get(0);
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
index 13e19ff4d35..efa98fba2eb 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
@@ -815,7 +815,7 @@ public class EvaluationTestCase {
             try {
                 ExpressionNode e = arguments.expressions().get(index);
                 if (e instanceof ConstantNode) {
-                    return new DoubleValue(new RankingExpression(UnicodeUtilities.unquote(((ConstantNode)e).sourceString())).evaluate(this).asDouble());
+                    return new DoubleValue(new RankingExpression(UnicodeUtilities.unquote(e.toString())).evaluate(this).asDouble());
                 }
                 return e.evaluate(this);
             }