Remove the costly and unnecessary setSlobrokId interface.

13 files changed, 100 insertions, 114 deletions

diff --git a/messagebus/src/tests/advancedrouting/advancedrouting.cpp b/messagebus/src/tests/advancedrouting/advancedrouting.cpp
index 8d6b8cd3875..61552f6cf40 100644
--- a/messagebus/src/tests/advancedrouting/advancedrouting.cpp
+++ b/messagebus/src/tests/advancedrouting/advancedrouting.cpp
@@ -49,13 +49,13 @@ TEST_APPHOOK(Test);
 TestData::~TestData() {}
 TestData::TestData() :
     _slobrok(),
-    _retryPolicy(new RetryTransientErrorsPolicy()),
-    _srcServer(MessageBusParams().setRetryPolicy(_retryPolicy).addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams().setSlobrokConfig(_slobrok.config())),
+    _retryPolicy(std::make_shared<RetryTransientErrorsPolicy>()),
+    _srcServer(MessageBusParams().setRetryPolicy(_retryPolicy).addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config())),
     _srcSession(),
     _srcHandler(),
-    _dstServer(MessageBusParams().addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams().setIdentity(Identity("dst")).setSlobrokConfig(_slobrok.config())),
+    _dstServer(MessageBusParams().addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config()).setIdentity(Identity("dst"))),
     _fooSession(),
     _fooHandler(),
     _barSession(),
@@ -70,19 +70,19 @@ bool
 TestData::start()
 {
     _srcSession = _srcServer.mb.createSourceSession(SourceSessionParams().setReplyHandler(_srcHandler));
-    if (_srcSession.get() == NULL) {
+    if ( ! _srcSession) {
         return false;
     }
     _fooSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("foo").setMessageHandler(_fooHandler));
-    if (_fooSession.get() == NULL) {
+    if ( ! _fooSession) {
         return false;
     }
     _barSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("bar").setMessageHandler(_barHandler));
-    if (_barSession.get() == NULL) {
+    if ( ! _barSession) {
         return false;
     }
     _bazSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("baz").setMessageHandler(_bazHandler));
-    if (_bazSession.get() == NULL) {
+    if ( ! _bazSession) {
         return false;
     }
     if (!_srcServer.waitSlobrok("dst/*", 3u)) {
@@ -94,7 +94,7 @@ TestData::start()
 Message::UP
 Test::createMessage(const string &msg)
 {
-    Message::UP ret(new SimpleMessage(msg));
+    auto ret = std::make_unique<SimpleMessage>(msg);
     ret->getTrace().setLevel(9);
     return ret;
 }
diff --git a/messagebus/src/tests/bucketsequence/bucketsequence.cpp b/messagebus/src/tests/bucketsequence/bucketsequence.cpp
index d98acc4f191..57d1f99e5c3 100644
--- a/messagebus/src/tests/bucketsequence/bucketsequence.cpp
+++ b/messagebus/src/tests/bucketsequence/bucketsequence.cpp
@@ -26,19 +26,18 @@ Test::Main()
 
     Slobrok slobrok;
     TestServer server(MessageBusParams()
-                      .addProtocol(IProtocol::SP(new SimpleProtocol()))
-                      .setRetryPolicy(IRetryPolicy::SP(new RetryTransientErrorsPolicy())),
-                      RPCNetworkParams()
-                      .setSlobrokConfig(slobrok.config()));
+                      .addProtocol(std::make_shared<SimpleProtocol>())
+                      .setRetryPolicy(std::make_shared<RetryTransientErrorsPolicy>()),
+                      RPCNetworkParams(slobrok.config()));
     Receptor receptor;
     SourceSession::UP session = server.mb.createSourceSession(
             SourceSessionParams()
             .setReplyHandler(receptor));
-    Message::UP msg(new MyMessage());
+    auto msg = std::make_unique<MyMessage>();
     msg->setRoute(Route::parse("foo"));
     ASSERT_TRUE(session->send(std::move(msg)).isAccepted());
     Reply::UP reply = receptor.getReply();
-    ASSERT_TRUE(reply.get() != NULL);
+    ASSERT_TRUE(reply.get() != nullptr);
     EXPECT_EQUAL(1u, reply->getNumErrors());
     EXPECT_EQUAL((uint32_t)ErrorCode::SEQUENCE_ERROR, reply->getError(0).getCode());
 
diff --git a/messagebus/src/tests/choke/choke.cpp b/messagebus/src/tests/choke/choke.cpp
index 91f91c84f45..105da2b3bd1 100644
--- a/messagebus/src/tests/choke/choke.cpp
+++ b/messagebus/src/tests/choke/choke.cpp
@@ -49,23 +49,21 @@ TestData::TestData() :
     _slobrok(),
     _srcServer(MessageBusParams()
                .setRetryPolicy(IRetryPolicy::SP())
-               .addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams()
-               .setSlobrokConfig(_slobrok.config())),
+               .addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config())),
     _srcSession(),
     _srcHandler(),
     _dstServer(MessageBusParams()
-               .addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams()
-               .setIdentity(Identity("dst"))
-               .setSlobrokConfig(_slobrok.config())),
+               .addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config())
+               .setIdentity(Identity("dst"))),
     _dstSession(),
     _dstHandler()
 {
     // empty
 }
 
-TestData::~TestData() {}
+TestData::~TestData() = default;
 
 bool
 TestData::start()
diff --git a/messagebus/src/tests/resender/resender.cpp b/messagebus/src/tests/resender/resender.cpp
index 2a0d55b0196..fa740e929fa 100644
--- a/messagebus/src/tests/resender/resender.cpp
+++ b/messagebus/src/tests/resender/resender.cpp
@@ -78,27 +78,27 @@ TEST_APPHOOK(Test);
 TestData::TestData() :
     _slobrok(),
     _retryPolicy(new RetryTransientErrorsPolicy()),
-    _srcServer(MessageBusParams().setRetryPolicy(_retryPolicy).addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams().setSlobrokConfig(_slobrok.config())),
+    _srcServer(MessageBusParams().setRetryPolicy(_retryPolicy).addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config())),
     _srcSession(),
     _srcHandler(),
-    _dstServer(MessageBusParams().addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams().setIdentity(Identity("dst")).setSlobrokConfig(_slobrok.config())),
+    _dstServer(MessageBusParams().addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config()).setIdentity(Identity("dst"))),
     _dstSession(),
     _dstHandler()
 { }
 
-TestData::~TestData() {}
+TestData::~TestData() = default;
 
 bool
 TestData::start()
 {
     _srcSession = _srcServer.mb.createSourceSession(SourceSessionParams().setReplyHandler(_srcHandler));
-    if (_srcSession.get() == NULL) {
+    if ( ! _srcSession) {
         return false;
     }
     _dstSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("session").setMessageHandler(_dstHandler));
-    if (_dstSession.get() == NULL) {
+    if ( ! _dstSession) {
         return false;
     }
     if (!_srcServer.waitSlobrok("dst/session", 1u)) {
diff --git a/messagebus/src/tests/routing/routing.cpp b/messagebus/src/tests/routing/routing.cpp
index 515cbd99fde..cb9ad2eef47 100644
--- a/messagebus/src/tests/routing/routing.cpp
+++ b/messagebus/src/tests/routing/routing.cpp
@@ -546,26 +546,24 @@ TEST_APPHOOK(Test);
 
 TestData::TestData() :
     _slobrok(),
-    _retryPolicy(new RetryTransientErrorsPolicy()),
+    _retryPolicy(std::make_shared<RetryTransientErrorsPolicy>()),
     _srcServer(MessageBusParams()
                .setRetryPolicy(_retryPolicy)
-               .addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams()
-               .setSlobrokConfig(_slobrok.config())),
+               .addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config())),
     _srcSession(),
     _srcHandler(),
     _dstServer(MessageBusParams()
-               .addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams()
-               .setIdentity(Identity("dst"))
-               .setSlobrokConfig(_slobrok.config())),
+               .addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config())
+               .setIdentity(Identity("dst"))),
     _dstSession(),
     _dstHandler()
 {
     _retryPolicy->setBaseDelay(0);
 }
 
-TestData::~TestData() {}
+TestData::~TestData() = default;
 
 bool
 TestData::start()
@@ -573,13 +571,13 @@ TestData::start()
     _srcSession = _srcServer.mb.createSourceSession(SourceSessionParams()
                                                     .setThrottlePolicy(IThrottlePolicy::SP())
                                                     .setReplyHandler(_srcHandler));
-    if (_srcSession.get() == NULL) {
+    if ( ! _srcSession) {
         return false;
     }
     _dstSession = _dstServer.mb.createDestinationSession(DestinationSessionParams()
                                                          .setName("session")
                                                          .setMessageHandler(_dstHandler));
-    if (_dstSession.get() == NULL) {
+    if ( ! _dstSession) {
         return false;
     }
     if (!_srcServer.waitSlobrok("dst/session", 1u)) {
diff --git a/messagebus/src/tests/routingcontext/routingcontext.cpp b/messagebus/src/tests/routingcontext/routingcontext.cpp
index 12ed456b5a6..fa0d8ed6536 100644
--- a/messagebus/src/tests/routingcontext/routingcontext.cpp
+++ b/messagebus/src/tests/routingcontext/routingcontext.cpp
@@ -220,30 +220,30 @@ TEST_APPHOOK(Test);
 
 TestData::TestData() :
     _slobrok(),
-    _retryPolicy(new RetryTransientErrorsPolicy()),
-    _srcServer(MessageBusParams().setRetryPolicy(_retryPolicy).addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams().setSlobrokConfig(_slobrok.config())),
+    _retryPolicy(std::make_shared<RetryTransientErrorsPolicy>()),
+    _srcServer(MessageBusParams().setRetryPolicy(_retryPolicy).addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config())),
     _srcSession(),
     _srcHandler(),
-    _dstServer(MessageBusParams().addProtocol(IProtocol::SP(new SimpleProtocol())),
-               RPCNetworkParams().setIdentity(Identity("dst")).setSlobrokConfig(_slobrok.config())),
+    _dstServer(MessageBusParams().addProtocol(std::make_shared<SimpleProtocol>()),
+               RPCNetworkParams(_slobrok.config()).setIdentity(Identity("dst"))),
     _dstSession(),
     _dstHandler()
 {
     _retryPolicy->setBaseDelay(0);
 }
 
-TestData::~TestData() {}
+TestData::~TestData() = default;
 
 bool
 TestData::start()
 {
     _srcSession = _srcServer.mb.createSourceSession(SourceSessionParams().setReplyHandler(_srcHandler));
-    if (_srcSession.get() == NULL) {
+    if ( ! _srcSession) {
         return false;
     }
     _dstSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("session").setMessageHandler(_dstHandler));
-    if (_dstSession.get() == NULL) {
+    if ( ! _dstSession) {
         return false;
     }
     if (!_srcServer.waitSlobrok("dst/session", 1u)) {
diff --git a/messagebus/src/tests/sendadapter/sendadapter.cpp b/messagebus/src/tests/sendadapter/sendadapter.cpp
index 6860453cf54..c4fc0f908e0 100644
--- a/messagebus/src/tests/sendadapter/sendadapter.cpp
+++ b/messagebus/src/tests/sendadapter/sendadapter.cpp
@@ -65,36 +65,36 @@ TestData::TestData() :
     _slobrok(),
     _srcProtocol(new TestProtocol()),
     _srcServer(MessageBusParams().setRetryPolicy(IRetryPolicy::SP()).addProtocol(_srcProtocol),
-               RPCNetworkParams().setSlobrokConfig(_slobrok.config())),
+               RPCNetworkParams(_slobrok.config())),
     _srcSession(),
     _srcHandler(),
     _itrProtocol(new TestProtocol()),
     _itrServer(MessageBusParams().addProtocol(_itrProtocol),
-               RPCNetworkParams().setIdentity(Identity("itr")).setSlobrokConfig(_slobrok.config())),
+               RPCNetworkParams(_slobrok.config()).setIdentity(Identity("itr"))),
     _itrSession(),
     _itrHandler(),
     _dstProtocol(new TestProtocol()),
     _dstServer(MessageBusParams().addProtocol(_dstProtocol),
-               RPCNetworkParams().setIdentity(Identity("dst")).setSlobrokConfig(_slobrok.config())),
+               RPCNetworkParams(_slobrok.config()).setIdentity(Identity("dst"))),
     _dstSession(),
     _dstHandler()
 { }
 
-TestData::~TestData() {}
+TestData::~TestData() = default;
 
 bool
 TestData::start()
 {
     _srcSession = _srcServer.mb.createSourceSession(SourceSessionParams().setReplyHandler(_srcHandler));
-    if (_srcSession.get() == NULL) {
+    if ( ! _srcSession) {
         return false;
     }
     _itrSession = _itrServer.mb.createIntermediateSession(IntermediateSessionParams().setName("session").setMessageHandler(_itrHandler).setReplyHandler(_itrHandler));
-    if (_itrSession.get() == NULL) {
+    if ( ! _itrSession) {
         return false;
     }
     _dstSession = _dstServer.mb.createDestinationSession(DestinationSessionParams().setName("session").setMessageHandler(_dstHandler));
-    if (_dstSession.get() == NULL) {
+    if ( ! _dstSession) {
         return false;
     }
     if (!_srcServer.waitSlobrok("*/session", 2u)) {
diff --git a/messagebus/src/tests/serviceaddress/serviceaddress.cpp b/messagebus/src/tests/serviceaddress/serviceaddress.cpp
index 89edb981716..ac43cec3c02 100644
--- a/messagebus/src/tests/serviceaddress/serviceaddress.cpp
+++ b/messagebus/src/tests/serviceaddress/serviceaddress.cpp
@@ -37,9 +37,8 @@ void
 Test::testAddrServiceAddress()
 {
     Slobrok slobrok;
-    RPCNetwork network(RPCNetworkParams()
-                       .setIdentity(Identity("foo"))
-                       .setSlobrokConfig(slobrok.config()));
+    RPCNetwork network(RPCNetworkParams(slobrok.config())
+                       .setIdentity(Identity("foo")));
     ASSERT_TRUE(network.start());
 
     EXPECT_TRUE(testNullAddress(network, "tcp"));
@@ -60,9 +59,8 @@ void
 Test::testNameServiceAddress()
 {
     Slobrok slobrok;
-    RPCNetwork network(RPCNetworkParams()
-                       .setIdentity(Identity("foo"))
-                       .setSlobrokConfig(slobrok.config()));
+    RPCNetwork network(RPCNetworkParams(slobrok.config())
+                       .setIdentity(Identity("foo")));
     ASSERT_TRUE(network.start());
 
     network.unregisterSession("session");
diff --git a/messagebus/src/tests/servicepool/servicepool.cpp b/messagebus/src/tests/servicepool/servicepool.cpp
index 86a800b600a..1334831c30c 100644
--- a/messagebus/src/tests/servicepool/servicepool.cpp
+++ b/messagebus/src/tests/servicepool/servicepool.cpp
@@ -28,7 +28,7 @@ void
 Test::testMaxSize()
 {
     Slobrok slobrok;
-    RPCNetwork net(RPCNetworkParams().setSlobrokConfig(slobrok.config()));
+    RPCNetwork net(RPCNetworkParams(slobrok.config()));
     RPCServicePool pool(net, 2);
     net.start();
 
diff --git a/messagebus/src/tests/shutdown/shutdown.cpp b/messagebus/src/tests/shutdown/shutdown.cpp
index 070b51bbbc2..46a8a6518f0 100644
--- a/messagebus/src/tests/shutdown/shutdown.cpp
+++ b/messagebus/src/tests/shutdown/shutdown.cpp
@@ -44,9 +44,8 @@ Test::requireThatListenFailedIsExceptionSafe()
     Slobrok slobrok;
     try {
         TestServer bar(MessageBusParams(),
-                       RPCNetworkParams()
-                       .setListenPort(orb.GetListenPort())
-                       .setSlobrokConfig(slobrok.config()));
+                       RPCNetworkParams(slobrok.config())
+                       .setListenPort(orb.GetListenPort()));
         EXPECT_TRUE(false);
     } catch (vespalib::Exception &e) {
         EXPECT_EQUAL("Failed to start network.",
@@ -60,25 +59,23 @@ Test::requireThatShutdownOnSourceWithPendingIsSafe()
 {
     Slobrok slobrok;
     TestServer dstServer(MessageBusParams()
-                         .addProtocol(IProtocol::SP(new SimpleProtocol())),
-                         RPCNetworkParams()
-                         .setIdentity(Identity("dst"))
-                         .setSlobrokConfig(slobrok.config()));
+                         .addProtocol(std::make_shared<SimpleProtocol>()),
+                         RPCNetworkParams(slobrok.config())
+                         .setIdentity(Identity("dst")));
     Receptor dstHandler;
     DestinationSession::UP dstSession = dstServer.mb.createDestinationSession(
             DestinationSessionParams()
             .setName("session")
             .setMessageHandler(dstHandler));
-    ASSERT_TRUE(dstSession.get() != NULL);
+    ASSERT_TRUE(dstSession);
 
     for (uint32_t i = 0; i < 10; ++i) {
         Message::UP msg(new SimpleMessage("msg"));
         {
             TestServer srcServer(MessageBusParams()
-                    .setRetryPolicy(IRetryPolicy::SP(new RetryTransientErrorsPolicy()))
-                    .addProtocol(IProtocol::SP(new SimpleProtocol())),
-                    RPCNetworkParams()
-                    .setSlobrokConfig(slobrok.config()));
+                    .setRetryPolicy(std::make_shared<RetryTransientErrorsPolicy>())
+                    .addProtocol(std::make_shared<SimpleProtocol>()),
+                    RPCNetworkParams(slobrok.config()));
             Receptor srcHandler;
             SourceSession::UP srcSession = srcServer.mb.createSourceSession(SourceSessionParams()
                     .setThrottlePolicy(IThrottlePolicy::SP())
@@ -98,52 +95,49 @@ Test::requireThatShutdownOnIntermediateWithPendingIsSafe()
 {
     Slobrok slobrok;
     TestServer dstServer(MessageBusParams()
-                         .addProtocol(IProtocol::SP(new SimpleProtocol())),
-                         RPCNetworkParams()
-                         .setIdentity(Identity("dst"))
-                         .setSlobrokConfig(slobrok.config()));
+                         .addProtocol(std::make_shared<SimpleProtocol>()),
+                         RPCNetworkParams(slobrok.config())
+                         .setIdentity(Identity("dst")));
     Receptor dstHandler;
     DestinationSession::UP dstSession = dstServer.mb.createDestinationSession(
             DestinationSessionParams()
             .setName("session")
             .setMessageHandler(dstHandler));
-    ASSERT_TRUE(dstSession.get() != NULL);
+    ASSERT_TRUE(dstSession);
 
     TestServer srcServer(MessageBusParams()
                          .setRetryPolicy(IRetryPolicy::SP())
-                         .addProtocol(IProtocol::SP(new SimpleProtocol())),
-                         RPCNetworkParams()
-                         .setSlobrokConfig(slobrok.config()));
+                         .addProtocol(std::make_shared<SimpleProtocol>()),
+                         RPCNetworkParams(slobrok.config()));
     Receptor srcHandler;
     SourceSession::UP srcSession = srcServer.mb.createSourceSession(SourceSessionParams()
             .setThrottlePolicy(IThrottlePolicy::SP())
             .setReplyHandler(srcHandler));
-    ASSERT_TRUE(srcSession.get() != NULL);
+    ASSERT_TRUE(srcSession);
     ASSERT_TRUE(srcServer.waitSlobrok("dst/session", 1));
 
     for (uint32_t i = 0; i < 10; ++i) {
         Message::UP msg(new SimpleMessage("msg"));
         {
             TestServer itrServer(MessageBusParams()
-                    .setRetryPolicy(IRetryPolicy::SP(new RetryTransientErrorsPolicy()))
-                    .addProtocol(IProtocol::SP(new SimpleProtocol())),
-                    RPCNetworkParams()
-                    .setIdentity(Identity("itr"))
-                    .setSlobrokConfig(slobrok.config()));
+                    .setRetryPolicy(std::make_shared<RetryTransientErrorsPolicy>())
+                    .addProtocol(std::make_shared<SimpleProtocol>()),
+                    RPCNetworkParams(slobrok.config())
+                    .setIdentity(Identity("itr")));
             Receptor itrHandler;
             IntermediateSession::UP itrSession = itrServer.mb.createIntermediateSession(
                     IntermediateSessionParams()
                     .setName("session")
                     .setMessageHandler(itrHandler)
                     .setReplyHandler(itrHandler));
-            ASSERT_TRUE(itrSession.get() != NULL);
+            ASSERT_TRUE(itrSession);
             ASSERT_TRUE(srcServer.waitSlobrok("itr/session", 1));
             ASSERT_TRUE(srcSession->send(std::move(msg), "itr/session dst/session", true).isAccepted());
             msg = itrHandler.getMessage(TIMEOUT);
-            ASSERT_TRUE(msg.get() != NULL);
+            ASSERT_TRUE(msg);
             itrSession->forward(std::move(msg));
             msg = dstHandler.getMessage(TIMEOUT);
-            ASSERT_TRUE(msg.get() != NULL);
+            ASSERT_TRUE(msg);
         }
         ASSERT_TRUE(srcServer.waitSlobrok("itr/session", 0));
         dstSession->acknowledge(std::move(msg));
diff --git a/messagebus/src/tests/slobrok/slobrok.cpp b/messagebus/src/tests/slobrok/slobrok.cpp
index 6c389c25e70..7e0718283a6 100644
--- a/messagebus/src/tests/slobrok/slobrok.cpp
+++ b/messagebus/src/tests/slobrok/slobrok.cpp
@@ -63,15 +63,12 @@ Test::Main()
 {
     TEST_INIT("slobrok_test");
     Slobrok slobrok;
-    RPCNetwork net1(RPCNetworkParams()
-                    .setIdentity(Identity("net/a"))
-                    .setSlobrokConfig(slobrok.config()));
-    RPCNetwork net2(RPCNetworkParams()
-                    .setIdentity(Identity("net/b"))
-                    .setSlobrokConfig(slobrok.config()));
-    RPCNetwork net3(RPCNetworkParams()
-                    .setIdentity(Identity("net/c"))
-                    .setSlobrokConfig(slobrok.config()));
+    RPCNetwork net1(RPCNetworkParams(slobrok.config())
+                    .setIdentity(Identity("net/a")));
+    RPCNetwork net2(RPCNetworkParams(slobrok.config())
+                    .setIdentity(Identity("net/b")));
+    RPCNetwork net3(RPCNetworkParams(slobrok.config())
+                    .setIdentity(Identity("net/c")));
     ASSERT_TRUE(net1.start());
     ASSERT_TRUE(net2.start());
     ASSERT_TRUE(net3.start());
diff --git a/messagebus/src/tests/sourcesession/sourcesession.cpp b/messagebus/src/tests/sourcesession/sourcesession.cpp
index 0a1ccb082fe..5177cf0e799 100644
--- a/messagebus/src/tests/sourcesession/sourcesession.cpp
+++ b/messagebus/src/tests/sourcesession/sourcesession.cpp
@@ -115,10 +115,10 @@ void
 Test::testResendError()
 {
     Slobrok slobrok;
-    RetryTransientErrorsPolicy::SP retryPolicy(new RetryTransientErrorsPolicy());
+    auto retryPolicy = std::make_shared<RetryTransientErrorsPolicy>();
     retryPolicy->setBaseDelay(0);
-    TestServer src(MessageBusParams().addProtocol(IProtocol::SP(new SimpleProtocol())).setRetryPolicy(retryPolicy),
-                   RPCNetworkParams().setSlobrokConfig(slobrok.config()));
+    TestServer src(MessageBusParams().addProtocol(std::make_shared<SimpleProtocol>()).setRetryPolicy(retryPolicy),
+                   RPCNetworkParams(slobrok.config()));
     src.mb.setupRouting(getRouting());
     TestServer dst(Identity("dst"), getRouting(), slobrok);
 
@@ -176,10 +176,10 @@ void
 Test::testResendConnDown()
 {
     Slobrok slobrok;
-    RetryTransientErrorsPolicy::SP retryPolicy(new RetryTransientErrorsPolicy());
+    auto retryPolicy = std::make_shared<RetryTransientErrorsPolicy>();
     retryPolicy->setBaseDelay(0);
-    TestServer src(MessageBusParams().addProtocol(IProtocol::SP(new SimpleProtocol())).setRetryPolicy(retryPolicy),
-                   RPCNetworkParams().setSlobrokConfig(slobrok.config()));
+    TestServer src(MessageBusParams().addProtocol(std::make_shared<SimpleProtocol>()).setRetryPolicy(retryPolicy),
+                   RPCNetworkParams(slobrok.config()));
     src.mb.setupRouting(RoutingSpec().addTable(RoutingTableSpec(SimpleProtocol::NAME)
                                                .addHop(HopSpec("dst", "dst2/session"))
                                                .addHop(HopSpec("pxy", "[All]").addRecipient("dst"))
@@ -223,10 +223,9 @@ Test::testIllegalRoute()
 {
     Slobrok slobrok;
     TestServer src(MessageBusParams()
-                   .addProtocol(IProtocol::SP(new SimpleProtocol()))
+                   .addProtocol(std::make_shared<SimpleProtocol>())
                    .setRetryPolicy(IRetryPolicy::SP()),
-                   RPCNetworkParams()
-                   .setSlobrokConfig(slobrok.config()));
+                   RPCNetworkParams(slobrok.config()));
     src.mb.setupRouting(getRouting());
 
     RoutableQueue srcQ;
@@ -257,10 +256,9 @@ Test::testNoServices()
 {
     Slobrok slobrok;
     TestServer src(MessageBusParams()
-                   .addProtocol(IProtocol::SP(new SimpleProtocol()))
+                   .addProtocol(std::make_shared<SimpleProtocol>())
                    .setRetryPolicy(IRetryPolicy::SP()),
-                   RPCNetworkParams()
-                   .setSlobrokConfig(slobrok.config()));
+                   RPCNetworkParams(slobrok.config()));
     src.mb.setupRouting(getBadRouting());
 
     RoutableQueue srcQ;
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h
index d2529ea301d..ba530257030 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h
+++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h
@@ -70,6 +70,10 @@ public:
     }
 
     /**
+     *
+     */
+
+    /**
      * Returns the port to listen to.
      *
      * @return The port.