diff options
Diffstat (limited to 'container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/test')
4 files changed, 22 insertions, 49 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..6d0e6a37599 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,7 +1,9 @@ // 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.Spec; import com.yahoo.jrt.slobrok.server.Slobrok; import com.yahoo.messagebus.*; import com.yahoo.messagebus.network.local.LocalNetwork; @@ -17,16 +19,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 +40,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..0f896d1116e 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,6 +1,7 @@ // 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.*; @@ -17,16 +18,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 +47,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); |