Revert "Merge pull request #18515 from vespa-engine/revert-18507-jonmv/reapply-session-cache-with-injected-config"

This reverts commit fdea20ac7ba02313c94246e7cf77125320147d56, reversing
changes made to 7537c42fa661952916cf91eebbb75e6984505100.

6 files changed, 60 insertions, 53 deletions

diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java
index 111805d61b0..ea0ed7eadc8 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ClientTestDriver.java
@@ -33,7 +33,7 @@ public class ClientTestDriver {
         this.server = server;
 
         MessageBusParams mbusParams = new MessageBusParams().addProtocol(protocol);
-        RPCNetworkParams netParams = new RPCNetworkParams().setSlobrokConfigId(server.slobrokId());
+        RPCNetworkParams netParams = new RPCNetworkParams().setSlobroksConfig(server.slobroksConfig());
         SharedMessageBus mbus = SharedMessageBus.newInstance(mbusParams, netParams);
         session = mbus.newSourceSession(new SourceSessionParams());
         client = new MbusClient(session);
@@ -128,7 +128,4 @@ public class ClientTestDriver {
         return new ClientTestDriver(RemoteServer.newInstanceWithInternSlobrok(), protocol);
     }
 
-    public static ClientTestDriver newInstanceWithExternSlobrok(String slobrokId) {
-        return new ClientTestDriver(RemoteServer.newInstanceWithExternSlobrok(slobrokId), new SimpleProtocol());
-    }
 }
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
index 57d0abd980b..6cd8fb8f34d 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteClient.java
@@ -1,9 +1,17 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.messagebus.jdisc.test;
 
+import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageBus;
+import com.yahoo.messagebus.MessageBusParams;
+import com.yahoo.messagebus.Protocol;
+import com.yahoo.messagebus.Reply;
+import com.yahoo.messagebus.Result;
+import com.yahoo.messagebus.SourceSession;
+import com.yahoo.messagebus.SourceSessionParams;
 import com.yahoo.messagebus.network.local.LocalNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
@@ -17,16 +25,14 @@ import java.util.concurrent.TimeUnit;
 public class RemoteClient {
 
     private final Slobrok slobrok;
-    private final String slobrokId;
     private final MessageBus mbus;
     private final ReplyQueue queue = new ReplyQueue();
     private final SourceSession session;
 
-    private RemoteClient(Slobrok slobrok, String slobrokId, Protocol protocol, boolean network) {
-        this.slobrok = slobrok;
-        this.slobrokId = slobrok != null ? slobrok.configId() : slobrokId;
+    private RemoteClient(Protocol protocol, boolean network) {
+        this.slobrok = newSlobrok();
         mbus = network
-               ? new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobrokConfigId(this.slobrokId)),
+               ? new MessageBus(new RPCNetwork(new RPCNetworkParams().setSlobroksConfig(slobroksConfig())),
                                 new MessageBusParams().addProtocol(protocol))
                : new MessageBus(new LocalNetwork(), new MessageBusParams().addProtocol(protocol));
         session = mbus.createSourceSession(new SourceSessionParams().setThrottlePolicy(null).setReplyHandler(queue));
@@ -40,28 +46,22 @@ public class RemoteClient {
         return queue.awaitReply(timeout, unit);
     }
 
-    public String slobrokId() {
-        return slobrokId;
+    public SlobroksConfig slobroksConfig() {
+        return TestUtils.configFor(slobrok);
     }
 
     public void close() {
         session.destroy();
         mbus.destroy();
-        if (slobrok != null) {
-            slobrok.stop();
-        }
+        slobrok.stop();
     }
 
     public static RemoteClient newInstanceWithInternSlobrok(boolean network) {
-        return new RemoteClient(newSlobrok(), null, new SimpleProtocol(), network);
-    }
-
-    public static RemoteClient newInstanceWithExternSlobrok(String slobrokId, boolean network) {
-        return new RemoteClient(null, slobrokId, new SimpleProtocol(), network);
+        return new RemoteClient(new SimpleProtocol(), network);
     }
 
     public static RemoteClient newInstanceWithProtocolAndInternSlobrok(Protocol protocol, boolean network) {
-        return new RemoteClient(newSlobrok(), null, protocol, network);
+        return new RemoteClient(protocol, network);
     }
 
     private static Slobrok newSlobrok() {
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java
index 1f0f82c4903..0fb23e33709 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/RemoteServer.java
@@ -1,9 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.messagebus.jdisc.test;
 
+import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.jrt.slobrok.server.Slobrok;
-import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.DestinationSession;
+import com.yahoo.messagebus.DestinationSessionParams;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageBus;
+import com.yahoo.messagebus.MessageBusParams;
+import com.yahoo.messagebus.Protocol;
+import com.yahoo.messagebus.Reply;
 import com.yahoo.messagebus.network.Identity;
 import com.yahoo.messagebus.network.rpc.RPCNetwork;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
@@ -17,16 +24,14 @@ import java.util.concurrent.TimeUnit;
 public class RemoteServer {
 
     private final Slobrok slobrok;
-    private final String slobrokId;
     private final MessageBus mbus;
     private final MessageQueue queue = new MessageQueue();
     private final DestinationSession session;
 
-    private RemoteServer(Slobrok slobrok, String slobrokId, Protocol protocol, String identity) {
-        this.slobrok = slobrok;
-        this.slobrokId = slobrok != null ? slobrok.configId() : slobrokId;
+    private RemoteServer(Protocol protocol, String identity) {
+        this.slobrok = newSlobrok();
         mbus = new MessageBus(new RPCNetwork(new RPCNetworkParams()
-                                                     .setSlobrokConfigId(this.slobrokId)
+                                                     .setSlobroksConfig(slobroksConfig())
                                                      .setIdentity(new Identity(identity))),
                               new MessageBusParams().addProtocol(protocol));
         session = mbus.createDestinationSession(new DestinationSessionParams().setMessageHandler(queue));
@@ -48,32 +53,22 @@ public class RemoteServer {
         session.reply(reply);
     }
 
-    public String slobrokId() {
-        return slobrokId;
+    public SlobroksConfig slobroksConfig() {
+        return TestUtils.configFor(slobrok);
     }
 
     public void close() {
         session.destroy();
         mbus.destroy();
-        if (slobrok != null) {
-            slobrok.stop();
-        }
+        slobrok.stop();
     }
 
     public static RemoteServer newInstanceWithInternSlobrok() {
-        return new RemoteServer(newSlobrok(), null, new SimpleProtocol(), "remote");
-    }
-
-    public static RemoteServer newInstanceWithExternSlobrok(String slobrokId) {
-        return new RemoteServer(null, slobrokId, new SimpleProtocol(), "remote");
-    }
-
-    public static RemoteServer newInstance(String slobrokId, String identity, Protocol protocol) {
-        return new RemoteServer(null, slobrokId, protocol, identity);
+        return new RemoteServer(new SimpleProtocol(), "remote");
     }
 
-    public static RemoteServer newInstanceWithProtocol(Protocol protocol) {
-        return new RemoteServer(newSlobrok(), null, protocol, "remote");
+    public static RemoteServer newInstance(String identity, Protocol protocol) {
+        return new RemoteServer(protocol, identity);
     }
 
     private static Slobrok newSlobrok() {
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
index e59db28e886..fa0dd37ed13 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/ServerTestDriver.java
@@ -42,7 +42,7 @@ public class ServerTestDriver {
         }
 
         MessageBusParams mbusParams = new MessageBusParams().addProtocol(protocol);
-        RPCNetworkParams netParams = new RPCNetworkParams().setSlobrokConfigId(client.slobrokId());
+        RPCNetworkParams netParams = new RPCNetworkParams().setSlobroksConfig(client.slobroksConfig());
         SharedMessageBus mbus = SharedMessageBus.newInstance(mbusParams, netParams);
         ServerSession session = mbus.newDestinationSession(new DestinationSessionParams());
         server = new MbusServer(driver, session);
@@ -130,13 +130,6 @@ public class ServerTestDriver {
                                     guiceModules);
     }
 
-    public static ServerTestDriver newInstanceWithExternSlobrok(String slobrokId, RequestHandler requestHandler,
-                                                                boolean network, Module... guiceModules)
-    {
-        return new ServerTestDriver(RemoteClient.newInstanceWithExternSlobrok(slobrokId, network),
-                                    true, requestHandler, new SimpleProtocol(), guiceModules);
-    }
-
     public static ServerTestDriver newInactiveInstance(boolean network, Module... guiceModules) {
         return new ServerTestDriver(RemoteClient.newInstanceWithInternSlobrok(network), false, null,
                                     new SimpleProtocol(), guiceModules);
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/TestUtils.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/TestUtils.java
new file mode 100644
index 00000000000..85ad241259f
--- /dev/null
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test/TestUtils.java
@@ -0,0 +1,21 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.messagebus.jdisc.test;
+
+import com.yahoo.cloud.config.SlobroksConfig;
+import com.yahoo.jrt.Spec;
+import com.yahoo.jrt.slobrok.server.Slobrok;
+
+/**
+ * @author jonmv
+ */
+public class TestUtils {
+
+    private TestUtils() { }
+
+    public static SlobroksConfig configFor(Slobrok slobrok) {
+        return new SlobroksConfig.Builder().slobrok(new SlobroksConfig.Slobrok.Builder()
+                                                            .connectionspec(new Spec("localhost", slobrok.port()).toString()))
+                                           .build();
+    }
+
+}
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedMessageBus.java b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedMessageBus.java
index dd135a51378..259dd788244 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedMessageBus.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedMessageBus.java
@@ -3,6 +3,8 @@ package com.yahoo.messagebus.shared;
 
 import com.yahoo.config.subscription.ConfigGetter;
 import com.yahoo.jdisc.AbstractResource;
+
+import java.util.Objects;
 import java.util.logging.Level;
 import com.yahoo.messagebus.DestinationSessionParams;
 import com.yahoo.messagebus.IntermediateSessionParams;
@@ -25,8 +27,7 @@ public class SharedMessageBus extends AbstractResource {
     private final MessageBus mbus;
 
     public SharedMessageBus(MessageBus mbus) {
-        mbus.getClass(); // throws NullPointerException
-        this.mbus = mbus;
+        this.mbus = Objects.requireNonNull(mbus);
     }
 
     public MessageBus messageBus() {