Keep the spec final.

Create the address when needed in the async connect thread.
Implement hash/equal/compareTo for Spec to avoid toString.
Use Spec as key and avoid creating it every time.

4 files changed, 5 insertions, 5 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ExternPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ExternPolicy.java
index e81ac4ae05e..e000364e0d4 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ExternPolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ExternPolicy.java
@@ -105,7 +105,7 @@ public class ExternPolicy implements DocumentProtocolRoutingPolicy {
             recipients.clear();
             List<Mirror.Entry> arr = mirror.lookup(pattern);
             for (Mirror.Entry entry : arr) {
-                recipients.add(Hop.parse(entry.getSpec() + session));
+                recipients.add(Hop.parse(entry.getSpecString() + session));
             }
         }
     }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerPolicy.java
index 3d129684465..ae4606adaaf 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerPolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LoadBalancerPolicy.java
@@ -58,7 +58,7 @@ public class LoadBalancerPolicy extends SlobrokPolicy {
         if (node != null) {
             context.setContext(node);
             Route route = new Route(context.getRoute());
-            route.setHop(0, Hop.parse(node.entry.getSpec() + "/" + session));
+            route.setHop(0, Hop.parse(node.entry.getSpecString() + "/" + session));
             context.addChild(route);
         } else {
             context.setError(ErrorCode.NO_ADDRESS_FOR_SERVICE, "Could not resolve any nodes to send to in pattern " + pattern);
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java
index d4ebd4ecd81..2db45ed0472 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java
@@ -86,7 +86,7 @@ public class LocalServicePolicy implements DocumentProtocolRoutingPolicy {
             List<Mirror.Entry> arr = ctx.getMirror().lookup(ctx.getHopPrefix() + "*" + ctx.getHopSuffix());
             String self = localAddress != null ? localAddress : toAddress(ctx.getMessageBus().getConnectionSpec());
             for (Mirror.Entry item : arr) {
-                if (self.equals(toAddress(item.getSpec()))) {
+                if (self.equals(toAddress(item.getSpecString()))) {
                     entry.recipients.add(Hop.parse(item.getName()));
                 }
             }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
index 552f47ec5a6..adf9d5ee912 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
@@ -144,12 +144,12 @@ public class StoragePolicy extends SlobrokPolicy {
             if (arr.isEmpty()) return null;
             if (distributor != null) {
                 if (arr.size() == 1) {
-                    return convertSlobrokNameToSessionName(arr.get(0).getSpec());
+                    return convertSlobrokNameToSessionName(arr.get(0).getSpecString());
                 } else {
                     log.log(LogLevel.WARNING, "Got " + arr.size() + " matches for a distributor.");
                 }
             } else {
-                return convertSlobrokNameToSessionName(arr.get(randomizer.nextInt(arr.size())).getSpec());
+                return convertSlobrokNameToSessionName(arr.get(randomizer.nextInt(arr.size())).getSpecString());
             }
             return null;
         }