diff options
author | gjoranv <gv@verizonmedia.com> | 2022-06-09 14:11:36 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-09 14:11:36 +0200 |
commit | fefef038e9e4616659dbedd32e55b2d6768291e4 (patch) | |
tree | 6b5a58d1cbfdc11b37615f5ef40db4a83dfc6555 | |
parent | 66d68781f9d8f3fee557514559f329a9070c10b3 (diff) |
Remove deprecated ctors in SerializationContext
-rw-r--r-- | searchlib/abi-spec.json | 4 | ||||
-rw-r--r-- | searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java | 53 |
2 files changed, 22 insertions, 35 deletions
diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json index 1896337b419..7caf5a06032 100644 --- a/searchlib/abi-spec.json +++ b/searchlib/abi-spec.json @@ -1615,12 +1615,8 @@ ], "methods": [ "public void <init>()", - "public void <init>(java.util.Collection)", "public void <init>(java.util.Collection, java.util.Optional)", - "public void <init>(java.util.Map)", - "public void <init>(java.util.Collection, java.util.Map)", "public void <init>(java.util.Collection, java.util.Map, com.yahoo.tensor.evaluation.TypeContext)", - "public void <init>(java.util.Map, java.util.Map, java.util.Map)", "public void <init>(java.util.Map, java.util.Map, java.util.Optional, java.util.Map)", "public java.util.Optional typeContext()", "public void addFunctionSerialization(java.lang.String, java.lang.String)", 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 5e5f7be7001..7d0c0b98910 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 @@ -28,33 +28,29 @@ public class SerializationContext extends FunctionReferenceContext { /** Create a context for a single serialization task */ public SerializationContext() { - this(Collections.emptyList()); + this(Collections.emptyList(), Collections.emptyMap(), Optional.empty(), new LinkedHashMap<>()); } - /** @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) { + /** + * Create a context for a single serialization task + * + * @param functions the functions of this + * @param typeContext the type context of this: Serialization may depend on type resolution + */ + 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) { - this(functions.values()); - } - - /** @deprecated Use {@link #SerializationContext(Collection, Map, TypeContext) instead}*/ - @Deprecated(forRemoval = true, since = "7") - public SerializationContext(Collection<ExpressionFunction> functions, Map<String, String> bindings) { - this(functions, bindings, Optional.empty(), new LinkedHashMap<>()); - } - - /** Create a context for a single serialization task */ - public SerializationContext(Collection<ExpressionFunction> functions, Map<String, String> bindings, + /** + * Create a context for a single serialization task + * + * @param functions the functions of this + * @param bindings the arguments of this + * @param typeContext the type context of this: Serialization may depend on type resolution + */ + public SerializationContext(Collection<ExpressionFunction> functions, + Map<String, String> bindings, TypeContext<Reference> typeContext) { this(functions, bindings, Optional.of(typeContext), new LinkedHashMap<>()); } @@ -68,20 +64,15 @@ public class SerializationContext extends FunctionReferenceContext { * @param serializedFunctions a cache of serializedFunctions - the ownership of this map * is <b>transferred</b> to this and will be modified in it */ - private SerializationContext(Collection<ExpressionFunction> functions, Map<String, String> bindings, + private SerializationContext(Collection<ExpressionFunction> functions, + Map<String, String> bindings, Optional<TypeContext<Reference>> typeContext, Map<String, String> serializedFunctions) { this(toMap(functions), bindings, typeContext, serializedFunctions); } - /** @deprecated Use {@link #SerializationContext(Map, Map, Optional, Map) instead}*/ - @Deprecated(forRemoval = true, since = "7") - public SerializationContext(Map<String, ExpressionFunction> functions, Map<String, String> bindings, - Map<String, String> serializedFunctions) { - this(functions, bindings, Optional.empty(), serializedFunctions); - } - - public SerializationContext(Map<String, ExpressionFunction> functions, Map<String, String> bindings, + public SerializationContext(Map<String, ExpressionFunction> functions, + Map<String, String> bindings, Optional<TypeContext<Reference>> typeContext, Map<String, String> serializedFunctions) { super(functions, bindings); |