Merge pull request #9078 from vespa-engine/balder/avoid-map2list2map-conversion

Balder/avoid map2list2map conversion.

4 files changed, 3 insertions, 6 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java
index 6bd5d658509..0c40f527287 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java
@@ -2,7 +2,6 @@
 package com.yahoo.documentapi.messagebus.loadtypes;
 
 import com.yahoo.config.subscription.ConfigGetter;
-import com.yahoo.config.subscription.ConfigSubscriber;
 import com.yahoo.vespa.config.content.LoadTypeConfig;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import java.security.MessageDigest;
diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json
index b8c51f4e33d..0b9cb06d2a5 100644
--- a/searchlib/abi-spec.json
+++ b/searchlib/abi-spec.json
@@ -1382,7 +1382,7 @@
       "public void <init>(java.util.Map)",
       "public void <init>(java.util.Map, java.util.Map)",
       "public com.yahoo.searchlib.rankingexpression.ExpressionFunction getFunction(java.lang.String)",
-      "protected java.util.Map functions()",
+      "protected final com.google.common.collect.ImmutableMap functions()",
       "public java.lang.String getBinding(java.lang.String)",
       "public com.yahoo.searchlib.rankingexpression.rule.FunctionReferenceContext withBindings(java.util.Map)"
     ],
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 ed1e2838717..084bfe65e06 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
@@ -61,7 +61,7 @@ public class FunctionReferenceContext {
      */
     public ExpressionFunction getFunction(String name) { return functions.get(name); }
 
-    protected Map<String, ExpressionFunction> functions() { return functions; }
+    protected final ImmutableMap<String, ExpressionFunction> functions() { return functions; }
 
     /** Returns the resolution of an argument, or null if it isn't defined in this context */
     public String getBinding(String name) { return bindings.get(name); }
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 0b68e71c21a..4acc1a85490 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
@@ -3,12 +3,10 @@ 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.tensor.TensorType;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -95,7 +93,7 @@ public class SerializationContext extends FunctionReferenceContext {
 
     @Override
     public SerializationContext withBindings(Map<String, String> bindings) {
-        return new SerializationContext(functions().values(), bindings, this.serializedFunctions);
+        return new SerializationContext(functions(), bindings, this.serializedFunctions);
     }
 
     public Map<String, String> serializedFunctions() { return serializedFunctions; }