Remove deprecated APIs exposing Guava types

3 files changed, 0 insertions, 27 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/FunctionReferenceContext.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/FunctionReferenceContext.java
index 287bc2655f5..96f0fa033d6 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/FunctionReferenceContext.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/FunctionReferenceContext.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchlib.rankingexpression.rule;
 
-import com.google.common.collect.ImmutableMap;
 import com.yahoo.searchlib.rankingexpression.ExpressionFunction;
 
 import java.util.Collection;
@@ -48,12 +47,6 @@ public class FunctionReferenceContext {
             this.bindings.putAll(bindings);
     }
 
-    /** @deprecated Use {@link #FunctionReferenceContext(Map, Map)} instead */
-    @Deprecated(forRemoval = true, since = "7")
-    protected FunctionReferenceContext(ImmutableMap<String, ExpressionFunction> functions, Map<String, String> bindings) {
-        this((Map<String, ExpressionFunction>)functions, bindings);
-    }
-
     private static Map<String, ExpressionFunction> toMap(Collection<ExpressionFunction> list) {
         Map<String, ExpressionFunction> mapBuilder = new HashMap<>();
         for (ExpressionFunction function : list)
@@ -64,10 +57,6 @@ public class FunctionReferenceContext {
     /** Returns a function or null if it isn't defined in this context */
     public ExpressionFunction getFunction(String name) { return functions.get(name); }
 
-    /** @deprecated Use {@link #getFunctions()} instead */
-    @Deprecated(forRemoval = true, since = "7")
-    protected ImmutableMap<String, ExpressionFunction> functions() { return ImmutableMap.copyOf(functions); }
-
     protected Map<String, ExpressionFunction> getFunctions() { return functions; }
 
     /** Returns the resolution of an identifier, or null if it isn't defined in this context */
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 d0a8e812091..5e5f7be7001 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
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchlib.rankingexpression.rule;
 
-import com.google.common.collect.ImmutableMap;
 import com.yahoo.searchlib.rankingexpression.ExpressionFunction;
 import com.yahoo.searchlib.rankingexpression.RankingExpression;
 import com.yahoo.searchlib.rankingexpression.Reference;
@@ -90,13 +89,6 @@ public class SerializationContext extends FunctionReferenceContext {
         this.serializedFunctions = serializedFunctions;
     }
 
-    /** @deprecated Use {@link #SerializationContext(Map, Map, Optional, Map) instead}*/
-    @Deprecated(forRemoval = true, since = "7")
-    public SerializationContext(ImmutableMap<String,ExpressionFunction> functions, Map<String, String> bindings,
-                                Map<String, String> serializedFunctions) {
-        this((Map<String, ExpressionFunction>)functions, bindings, serializedFunctions);
-    }
-
     /** Returns the type context of this, if it is able to resolve types. */
     public Optional<TypeContext<Reference>> typeContext() { return typeContext; }
 
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java
index 7b68ad7e2af..1b72213d5ff 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java
@@ -2,7 +2,6 @@
 package com.yahoo.searchlib.rankingexpression.rule;
 
 import com.yahoo.api.annotations.Beta;
-import com.google.common.collect.ImmutableMap;
 import com.yahoo.searchlib.rankingexpression.ExpressionFunction;
 import com.yahoo.searchlib.rankingexpression.Reference;
 import com.yahoo.searchlib.rankingexpression.evaluation.Context;
@@ -342,13 +341,6 @@ public class TensorFunctionNode extends CompositeNode {
             return wrappedSerializationContext.typeContext();
         }
 
-        /** @deprecated Use {@link #getFunctions()} instead */
-        @SuppressWarnings("removal")
-        @Deprecated(forRemoval = true, since = "7")
-        protected ImmutableMap<String, ExpressionFunction> functions() {
-            return ImmutableMap.copyOf(wrappedSerializationContext.getFunctions());
-        }
-
         @Override
         protected Map<String, ExpressionFunction> getFunctions() { return wrappedSerializationContext.getFunctions(); }