1 files changed, 7 insertions, 53 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCService.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCService.java
index fb3c4cf9971..889df32ce1e 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCService.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCService.java
@@ -2,10 +2,6 @@
 package com.yahoo.messagebus.network.rpc;
 
 import com.yahoo.jrt.slobrok.api.IMirror;
-import com.yahoo.jrt.slobrok.api.Mirror;
-
-import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * An RPCService represents a set of remote sessions matching a service pattern. The sessions are monitored using the
@@ -13,23 +9,13 @@ import java.util.concurrent.ThreadLocalRandom;
  *
  * @author havardpe
  */
-public class RPCService {
-
-    private final IMirror mirror;
-    private final String pattern;
-    private int addressIdx = ThreadLocalRandom.current().nextInt(Integer.MAX_VALUE);
-    private int addressGen = 0;
-    private List<Mirror.Entry> addressList = null;
+public interface RPCService {
 
-    /**
-     * Create a new RPCService backed by the given network and using the given service pattern.
-     *
-     * @param mirror  The naming server to send queries to.
-     * @param pattern The pattern to use when querying.
-     */
-    public RPCService(IMirror mirror, String pattern) {
-        this.mirror = mirror;
-        this.pattern = pattern;
+    static RPCService create(IMirror mirror, String pattern) {
+        if (pattern.startsWith("tcp/")) {
+            return new TcpRPCService(pattern);
+        }
+        return new NamedRPCService(mirror, pattern);
     }
 
     /**
@@ -38,38 +24,6 @@ public class RPCService {
      *
      * @return A concrete service address.
      */
-    public RPCServiceAddress resolve() {
-        if (pattern.startsWith("tcp/")) {
-            int pos = pattern.lastIndexOf('/');
-            if (pos > 0 && pos < pattern.length() - 1) {
-                RPCServiceAddress ret = new RPCServiceAddress(pattern, pattern.substring(0, pos));
-                if (!ret.isMalformed()) {
-                    return ret;
-                }
-            }
-        } else {
-            if (addressGen != mirror.updates()) {
-                addressGen = mirror.updates();
-                addressList = mirror.lookup(pattern);
-            }
-            if (addressList != null && !addressList.isEmpty()) {
-                ++addressIdx;
-                if (addressIdx >= addressList.size()) {
-                    addressIdx = 0;
-                }
-                Mirror.Entry entry = addressList.get(addressIdx);
-                return new RPCServiceAddress(entry.getName(), entry.getSpec());
-            }
-        }
-        return null;
-    }
+    RPCServiceAddress resolve();
 
-    /**
-     * Returns the pattern used when querying for the naming server for addresses. This is given at construtor time.
-     *
-     * @return The service pattern.
-     */
-    String getPattern() {
-        return pattern;
-    }
 }