Avoid deprecated method

2 files changed, 14 insertions, 7 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
index bb1101fdbfc..d0a8e812091 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
@@ -32,12 +32,16 @@ public class SerializationContext extends FunctionReferenceContext {
         this(Collections.emptyList());
     }
 
-    /** @deprecated Use {@link #SerializationContext(Map, Map, Optional, Map) instead}*/
+    /** @deprecated Use {@link #SerializationContext(Collection, Optional) instead}*/
     @Deprecated(forRemoval = true, since = "7")
     public SerializationContext(Collection<ExpressionFunction> functions) {
         this(functions, Collections.emptyMap(), Optional.empty(), new LinkedHashMap<>());
     }
 
+    public SerializationContext(Collection<ExpressionFunction> functions, Optional<TypeContext<Reference>> typeContext) {
+        this(functions, Collections.emptyMap(), typeContext, new LinkedHashMap<>());
+    }
+
     /** @deprecated Use {@link #SerializationContext(Map, Map, Optional, Map) instead}*/
     @Deprecated(forRemoval = true, since = "7")
     public SerializationContext(Map<String, ExpressionFunction> functions) {
@@ -66,8 +70,8 @@ public class SerializationContext extends FunctionReferenceContext {
      *        is <b>transferred</b> to this and will be modified in it
      */
     private SerializationContext(Collection<ExpressionFunction> functions, Map<String, String> bindings,
-                                Optional<TypeContext<Reference>> typeContext,
-                                Map<String, String> serializedFunctions) {
+                                 Optional<TypeContext<Reference>> typeContext,
+                                 Map<String, String> serializedFunctions) {
         this(toMap(functions), bindings, typeContext, serializedFunctions);
     }
 
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java
index 24b7b98b74e..1ab9ee11252 100755
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -97,7 +98,7 @@ public class RankingExpressionTestCase {
 
         RankingExpression exp = new RankingExpression("foo");
         try {
-            exp.getRankProperties(new SerializationContext(functions));
+            exp.getRankProperties(new SerializationContext(functions, Optional.empty()));
         } catch (RuntimeException e) {
             assertEquals("Cycle in ranking expression function: [foo[]]", e.getMessage());
         }
@@ -111,7 +112,7 @@ public class RankingExpressionTestCase {
 
         RankingExpression exp = new RankingExpression("foo");
         try {
-            exp.getRankProperties(new SerializationContext(functions));
+            exp.getRankProperties(new SerializationContext(functions, Optional.empty()));
         } catch (RuntimeException e) {
             assertEquals("Cycle in ranking expression function: [foo[], bar[]]", e.getMessage());
         }
@@ -391,14 +392,16 @@ public class RankingExpressionTestCase {
                                      List<ExpressionFunction> functions) {
         assertSerialization(expectedSerialization, expressionString, functions, false);
     }
-    private void assertSerialization(List<String> expectedSerialization, String expressionString, 
+
+    private void assertSerialization(List<String> expectedSerialization, String expressionString,
                                      List<ExpressionFunction> functions, boolean print) {
         try {
             if (print)
                 System.out.println("Parsing expression '" + expressionString + "':");
 
             RankingExpression expression = new RankingExpression(expressionString);
-            Map<String, String> rankProperties = expression.getRankProperties(new SerializationContext(functions));
+            Map<String, String> rankProperties = expression.getRankProperties(new SerializationContext(functions,
+                                                                                                       Optional.empty()));
             if (print) {
                 for (String key : rankProperties.keySet())
                     System.out.println(key + ": " + rankProperties.get(key));