diff options
26 files changed, 169 insertions, 194 deletions
diff --git a/documentapi/src/tests/policyfactory/policyfactory.cpp b/documentapi/src/tests/policyfactory/policyfactory.cpp index ef8c461ad02..41905183928 100644 --- a/documentapi/src/tests/policyfactory/policyfactory.cpp +++ b/documentapi/src/tests/policyfactory/policyfactory.cpp @@ -54,13 +54,13 @@ public: mbus::IRoutingPolicy::UP MyFactory::createPolicy(const string ¶m) const { - return mbus::IRoutingPolicy::UP(new MyPolicy(param)); + return std::make_unique<MyPolicy>(param); } mbus::Message::UP createMessage() { - mbus::Message::UP ret(new RemoveDocumentMessage(document::DocumentId("doc:scheme:"))); + auto ret = std::make_unique<RemoveDocumentMessage>(document::DocumentId("doc:scheme:")); ret->getTrace().setLevel(9); return ret; } @@ -82,27 +82,27 @@ Test::Main() mbus::Slobrok slobrok; LoadTypeSet loadTypes; mbus::TestServer - srv(mbus::MessageBusParams().addProtocol(mbus::IProtocol::SP(new DocumentProtocol(loadTypes, repo))), - mbus::RPCNetworkParams().setSlobrokConfig(slobrok.config())); + srv(mbus::MessageBusParams().addProtocol(std::make_shared<DocumentProtocol>(loadTypes, repo)), + mbus::RPCNetworkParams(slobrok.config())); mbus::Receptor handler; mbus::SourceSession::UP src = srv.mb.createSourceSession(mbus::SourceSessionParams().setReplyHandler(handler)); mbus::Route route = mbus::Route::parse("[MyPolicy]"); ASSERT_TRUE(src->send(createMessage(), route).isAccepted()); mbus::Reply::UP reply = static_cast<mbus::Receptor&>(src->getReplyHandler()).getReply(600); - ASSERT_TRUE(reply.get() != NULL); + ASSERT_TRUE(reply); fprintf(stderr, "%s", reply->getTrace().toString().c_str()); EXPECT_EQUAL(1u, reply->getNumErrors()); EXPECT_EQUAL((uint32_t)mbus::ErrorCode::UNKNOWN_POLICY, reply->getError(0).getCode()); mbus::IProtocol * obj = srv.mb.getProtocol(DocumentProtocol::NAME); DocumentProtocol * protocol = dynamic_cast<DocumentProtocol*>(obj); - ASSERT_TRUE(protocol != NULL); - protocol->putRoutingPolicyFactory("MyPolicy", IRoutingPolicyFactory::SP(new MyFactory())); + ASSERT_TRUE(protocol != nullptr); + protocol->putRoutingPolicyFactory("MyPolicy", std::make_shared<MyFactory>()); ASSERT_TRUE(src->send(createMessage(), route).isAccepted()); reply = static_cast<mbus::Receptor&>(src->getReplyHandler()).getReply(600); - ASSERT_TRUE(reply.get() != NULL); + ASSERT_TRUE(reply); fprintf(stderr, "%s", reply->getTrace().toString().c_str()); EXPECT_EQUAL(1u, reply->getNumErrors()); EXPECT_EQUAL((uint32_t)DocumentProtocol::ERROR_POLICY_FAILURE, reply->getError(0).getCode()); diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp index 63d37de8c65..13ebd45fdc6 100644 --- a/documentapi/src/tests/routablefactory/routablefactory.cpp +++ b/documentapi/src/tests/routablefactory/routablefactory.cpp @@ -114,32 +114,32 @@ public: TEST_APPHOOK(Test); TestData::TestData() : - _repo(new DocumentTypeRepo), + _repo(std::make_shared<DocumentTypeRepo>()), _slobrok(), _loadTypes(), - _srcProtocol(new DocumentProtocol(_loadTypes, _repo)), + _srcProtocol(std::make_shared<DocumentProtocol>(_loadTypes, _repo)), _srcServer(mbus::MessageBusParams().addProtocol(_srcProtocol), - mbus::RPCNetworkParams().setSlobrokConfig(_slobrok.config())), + mbus::RPCNetworkParams(_slobrok.config())), _srcSession(), _srcHandler(), - _dstProtocol(new DocumentProtocol(_loadTypes, _repo)), + _dstProtocol(std::make_shared<DocumentProtocol>(_loadTypes, _repo)), _dstServer(mbus::MessageBusParams().addProtocol(_dstProtocol), - mbus::RPCNetworkParams().setIdentity(mbus::Identity("dst")).setSlobrokConfig(_slobrok.config())), + mbus::RPCNetworkParams(_slobrok.config()).setIdentity(mbus::Identity("dst"))), _dstSession(), _dstHandler() { } -TestData::~TestData() {} +TestData::~TestData() = default; bool TestData::start() { _srcSession = _srcServer.mb.createSourceSession(mbus::SourceSessionParams().setReplyHandler(_srcHandler)); - if (_srcSession.get() == NULL) { + if ( ! _srcSession) { return false; } _dstSession = _dstServer.mb.createDestinationSession(mbus::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/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. diff --git a/messagebus_test/src/tests/error/cpp-client.cpp b/messagebus_test/src/tests/error/cpp-client.cpp index 44580400e26..2a3376336ea 100644 --- a/messagebus_test/src/tests/error/cpp-client.cpp +++ b/messagebus_test/src/tests/error/cpp-client.cpp @@ -20,10 +20,9 @@ public: int App::Main() { - RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())), - RPCNetworkParams() - .setIdentity(Identity("server/cpp")) - .setSlobrokConfig("file:slobrok.cfg"), + RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()), + RPCNetworkParams("file:slobrok.cfg") + .setIdentity(Identity("server/cpp")), "file:routing.cfg"); Receptor src; diff --git a/messagebus_test/src/tests/error/cpp-server.cpp b/messagebus_test/src/tests/error/cpp-server.cpp index af0d6e30132..d5200ed20c1 100644 --- a/messagebus_test/src/tests/error/cpp-server.cpp +++ b/messagebus_test/src/tests/error/cpp-server.cpp @@ -49,10 +49,9 @@ public: int App::Main() { - RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())), - RPCNetworkParams() - .setIdentity(Identity("server/cpp")) - .setSlobrokConfig("file:slobrok.cfg"), + RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()), + RPCNetworkParams("file:slobrok.cfg") + .setIdentity(Identity("server/cpp")), "file:routing.cfg"); Server server(mb.getMessageBus()); while (true) { diff --git a/messagebus_test/src/tests/speed/cpp-client.cpp b/messagebus_test/src/tests/speed/cpp-client.cpp index 437cc3ce354..8f65e919e97 100644 --- a/messagebus_test/src/tests/speed/cpp-client.cpp +++ b/messagebus_test/src/tests/speed/cpp-client.cpp @@ -90,10 +90,10 @@ public: int App::Main() { - RetryTransientErrorsPolicy::SP retryPolicy(new RetryTransientErrorsPolicy()); + auto retryPolicy = std::make_shared<RetryTransientErrorsPolicy>(); retryPolicy->setBaseDelay(0.1); - RPCMessageBus mb(MessageBusParams().setRetryPolicy(retryPolicy).addProtocol(IProtocol::SP(new SimpleProtocol())), - RPCNetworkParams().setIdentity(Identity("server/cpp")).setSlobrokConfig("file:slobrok.cfg"), + RPCMessageBus mb(MessageBusParams().setRetryPolicy(retryPolicy).addProtocol(std::make_shared<SimpleProtocol>()), + RPCNetworkParams("file:slobrok.cfg").setIdentity(Identity("server/cpp")), "file:routing.cfg"); Client client(mb.getMessageBus(), SourceSessionParams().setTimeout(30)); diff --git a/messagebus_test/src/tests/speed/cpp-server.cpp b/messagebus_test/src/tests/speed/cpp-server.cpp index ddbeac62ce2..82b884c46f2 100644 --- a/messagebus_test/src/tests/speed/cpp-server.cpp +++ b/messagebus_test/src/tests/speed/cpp-server.cpp @@ -56,10 +56,9 @@ public: int App::Main() { - RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())), - RPCNetworkParams() - .setIdentity(Identity("server/cpp")) - .setSlobrokConfig("file:slobrok.cfg"), + RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()), + RPCNetworkParams("file:slobrok.cfg") + .setIdentity(Identity("server/cpp")), "file:routing.cfg"); Server server(mb.getMessageBus()); while (true) { diff --git a/messagebus_test/src/tests/trace/cpp-server.cpp b/messagebus_test/src/tests/trace/cpp-server.cpp index c9086ff1758..d6db86070b1 100644 --- a/messagebus_test/src/tests/trace/cpp-server.cpp +++ b/messagebus_test/src/tests/trace/cpp-server.cpp @@ -67,10 +67,9 @@ App::Main() fprintf(stderr, "usage: %s <service-prefix>\n", _argv[0]); return 1; } - RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())), - RPCNetworkParams() - .setIdentity(Identity(_argv[1])) - .setSlobrokConfig("file:slobrok.cfg"), + RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()), + RPCNetworkParams("file:slobrok.cfg") + .setIdentity(Identity(_argv[1])), "file:routing.cfg"); Server server(mb.getMessageBus(), _argv[1]); while (true) { diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp index a653c4934b3..a804bef6785 100644 --- a/messagebus_test/src/tests/trace/trace.cpp +++ b/messagebus_test/src/tests/trace/trace.cpp @@ -59,8 +59,8 @@ Test::Main() } EXPECT_TRUE(system((ctl_script + " start all").c_str()) == 0); - RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())), - RPCNetworkParams().setSlobrokConfig("file:slobrok.cfg"), + RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()), + RPCNetworkParams("file:slobrok.cfg"), "file:routing.cfg"); EXPECT_TRUE(waitSlobrok(mb, "server/cpp/1/A/session")); EXPECT_TRUE(waitSlobrok(mb, "server/cpp/2/A/session")); diff --git a/storage/src/vespa/storage/storageserver/communicationmanager.cpp b/storage/src/vespa/storage/storageserver/communicationmanager.cpp index 65523b62c59..783bde40981 100644 --- a/storage/src/vespa/storage/storageserver/communicationmanager.cpp +++ b/storage/src/vespa/storage/storageserver/communicationmanager.cpp @@ -109,7 +109,7 @@ CommunicationManager::handleMessage(std::unique_ptr<mbus::Message> msg) if (_closed.load(std::memory_order_relaxed)) { LOG(debug, "Not handling command of type %d as we have closed down", msg->getType()); MBUS_TRACE(msg->getTrace(), 6, "Communication manager: Failing message as we are closed"); - std::unique_ptr<mbus::Reply> reply(new mbus::EmptyReply()); + auto reply = std::make_unique<mbus::EmptyReply>(); reply->addError(mbus::Error(documentapi::DocumentProtocol::ERROR_ABORTED, "Node shutting down")); msg->swapState(*reply); _messageBusSession->reply(std::move(reply)); @@ -138,7 +138,7 @@ CommunicationManager::handleMessage(std::unique_ptr<mbus::Message> msg) } cmd->setTrace(docMsgPtr->getTrace()); - cmd->setTransportContext(std::unique_ptr<api::TransportContext>(new StorageTransportContext(std::move(docMsgPtr)))); + cmd->setTransportContext(std::make_unique<StorageTransportContext>(std::move(docMsgPtr))); enqueue(std::move(cmd)); } else if (protocolName == mbusprot::StorageProtocol::NAME) { @@ -150,7 +150,7 @@ CommunicationManager::handleMessage(std::unique_ptr<mbus::Message> msg) std::shared_ptr<api::StorageCommand> cmd = storMsgPtr->getCommand(); cmd->setTimeout(storMsgPtr->getTimeRemaining()); cmd->setTrace(storMsgPtr->getTrace()); - cmd->setTransportContext(std::unique_ptr<api::TransportContext>(new StorageTransportContext(std::move(storMsgPtr)))); + cmd->setTransportContext(std::make_unique<StorageTransportContext>(std::move(storMsgPtr))); enqueue(std::move(cmd)); } else { @@ -182,9 +182,8 @@ CommunicationManager::handleReply(std::unique_ptr<mbus::Reply> reply) if (protocolName == documentapi::DocumentProtocol::NAME) { convertedReply = static_cast<documentapi::DocumentMessage &>(*message).createReply(); } else if (protocolName == mbusprot::StorageProtocol::NAME) { - std::shared_ptr<api::StorageReply> repl( - static_cast<mbusprot::StorageCommand &>(*message).getCommand()->makeReply()); - mbusprot::StorageReply::UP sreply(new mbusprot::StorageReply(repl)); + std::shared_ptr<api::StorageReply> repl(static_cast<mbusprot::StorageCommand &>(*message).getCommand()->makeReply()); + auto sreply = std::make_unique<mbusprot::StorageReply>(repl); if (reply->hasErrors()) { // Convert only the first error since storageapi only @@ -311,7 +310,7 @@ CommunicationManager::CommunicationManager(StorageComponentRegister& compReg, co void CommunicationManager::onOpen() { - _configFetcher.reset(new config::ConfigFetcher(_configUri.getContext())); + _configFetcher = std::make_unique<config::ConfigFetcher>(_configUri.getContext()); _configFetcher->subscribe<vespa::config::content::core::StorCommunicationmanagerConfig>(_configUri.getConfigId(), this); _configFetcher->start(); framework::MilliSecTime maxProcessingTime(60 * 1000); @@ -418,10 +417,8 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig> }; if (!_configUri.empty()) { - mbus::RPCNetworkParams params; LOG(debug, "setting up slobrok config from id: '%s", _configUri.getConfigId().c_str()); - - params.setSlobrokConfig(_configUri); + mbus::RPCNetworkParams params(_configUri); params.setConnectionExpireSecs(config->mbus.rpctargetcache.ttl); params.setNumThreads(std::max(1, config->mbus.numThreads)); params.setDispatchOnDecode(config->mbus.dispatchOnDecode); @@ -450,7 +447,7 @@ void CommunicationManager::configure(std::unique_ptr<CommunicationManagerConfig> configureMessageBusLimits(*config); } - _listener.reset(new FNetListener(*this, _configUri, config->rpcport)); + _listener = std::make_unique<FNetListener>(*this, _configUri, config->rpcport); if (_mbus) { mbus::DestinationSessionParams dstParams; @@ -578,7 +575,7 @@ CommunicationManager::sendCommand( { LOG(spam, "Send to %s: %s", address.toString().c_str(), msg->toString().c_str()); - std::unique_ptr<mbus::Message> cmd(new mbusprot::StorageCommand(msg)); + auto cmd = std::make_unique<mbusprot::StorageCommand>(msg); cmd->setContext(mbus::Context(msg->getMsgId())); cmd->setRetryEnabled(address.retryEnabled()); @@ -681,7 +678,7 @@ CommunicationManager::sendMessageBusReply( // state. if (context._docAPIMsg.get()) { if (reply->getResult().getResult() == api::ReturnCode::WRONG_DISTRIBUTION) { - replyUP.reset(new documentapi::WrongDistributionReply(reply->getResult().getMessage())); + replyUP = std::make_unique<documentapi::WrongDistributionReply>(reply->getResult().getMessage()); replyUP->swapState(*context._docAPIMsg); replyUP->setTrace(reply->getTrace()); replyUP->addError(mbus::Error(documentapi::DocumentProtocol::ERROR_WRONG_DISTRIBUTION, @@ -694,7 +691,7 @@ CommunicationManager::sendMessageBusReply( _docApiConverter.transferReplyState(*reply, *replyUP); } } else if (context._storageProtocolMsg.get()) { - replyUP.reset(new mbusprot::StorageReply(reply)); + replyUP = std::make_unique<mbusprot::StorageReply>(reply); if (reply->getResult().getResult() != api::ReturnCode::OK) { replyUP->addError(mbus::Error(reply->getResult().getResult(), reply->getResult().getMessage())); } @@ -787,7 +784,7 @@ void CommunicationManager::updateMessagebusProtocol( auto newDocumentProtocol = std::make_shared<documentapi::DocumentProtocol>(*_component.getLoadTypes(), repo); std::lock_guard<std::mutex> guard(_earlierGenerationsLock); _earlierGenerations.push_back(std::make_pair(now, _mbus->getMessageBus().putProtocol(newDocumentProtocol))); - mbus::IProtocol::SP newStorageProtocol(new mbusprot::StorageProtocol(repo, *_component.getLoadTypes(), _component.enableMultipleBucketSpaces())); + auto newStorageProtocol = std::make_shared<mbusprot::StorageProtocol>(repo, *_component.getLoadTypes(), _component.enableMultipleBucketSpaces()); _earlierGenerations.push_back(std::make_pair(now, _mbus->getMessageBus().putProtocol(newStorageProtocol))); } } diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp index f6ed1a7d270..3ec2b92d6f2 100644 --- a/storageserver/src/tests/storageservertest.cpp +++ b/storageserver/src/tests/storageservertest.cpp @@ -268,31 +268,26 @@ namespace { } void init() { - documentapi::DocumentProtocol::SP protocol( - new documentapi::DocumentProtocol(_loadTypes, _repo)); - storage::mbusprot::StorageProtocol::SP storageProtocol( - new storage::mbusprot::StorageProtocol(_repo, _loadTypes)); + auto protocol = std::make_shared<documentapi::DocumentProtocol>(_loadTypes, _repo); + auto storageProtocol = std::make_shared<storage::mbusprot::StorageProtocol>(_repo, _loadTypes); mbus::ProtocolSet protocols; protocols.add(protocol); protocols.add(storageProtocol); - mbus::RPCNetworkParams networkParams; - networkParams.setSlobrokConfig(config::ConfigUri(_config.getConfigId())); - _mbus.reset(new mbus::RPCMessageBus(protocols, networkParams, - _config.getConfigId())); + mbus::RPCNetworkParams networkParams(config::ConfigUri(_config.getConfigId())); + _mbus = std::make_unique<mbus::RPCMessageBus>(protocols, networkParams, _config.getConfigId()); mbus::SourceSessionParams sourceParams; sourceParams.setTimeout(5000); - mbus::StaticThrottlePolicy::SP policy(new mbus::StaticThrottlePolicy()); + auto policy = std::make_shared<mbus::StaticThrottlePolicy>(); policy->setMaxPendingCount(_maxPending); sourceParams.setThrottlePolicy(policy); - _sourceSession = _mbus->getMessageBus().createSourceSession( - *this, sourceParams); + _sourceSession = _mbus->getMessageBus().createSourceSession(*this, sourceParams); } virtual void notifyStartingShutdown() { _startedShutdown = true; } - virtual void handleReply(mbus::Reply::UP reply) override { + void handleReply(mbus::Reply::UP reply) override { using documentapi::DocumentProtocol; --_currentPending; if (!reply->hasErrors()) { diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp index 1f35d348e28..5f2bbe8e11a 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp +++ b/vespaclient/src/vespa/vespaclient/vesparoute/application.cpp @@ -45,33 +45,29 @@ Application::Main() return EXIT_SUCCESS; } - std::shared_ptr<const DocumentTypeRepo> repo( - new DocumentTypeRepo( - *ConfigGetter<DocumenttypesConfig>::getConfig(_params.getDocumentTypesConfigId()))); - _net.reset(new MyNetwork(_params.getRPCNetworkParams())); - _mbus.reset( - new mbus::MessageBus( + auto repo = std::make_shared<DocumentTypeRepo>( + *ConfigGetter<DocumenttypesConfig>::getConfig(_params.getDocumentTypesConfigId())); + _net = std::make_unique<MyNetwork>(mbus::RPCNetworkParams(_params.getSlobrokConfigId()) + .setIdentity(_params.getRPCNetworkParams().getIdentity()) + .setListenPort(_params.getRPCNetworkParams().getListenPort())); + _mbus = std::make_unique<mbus::MessageBus>( *_net, mbus::MessageBusParams() .setRetryPolicy(mbus::IRetryPolicy::SP()) - .addProtocol(mbus::IProtocol::SP( - new documentapi::DocumentProtocol( - _loadTypes, repo))))); + .addProtocol(std::make_shared<documentapi::DocumentProtocol>(_loadTypes, repo))); mbus::ConfigAgent cfg(*_mbus); cfg.configure(ConfigGetter<MessagebusConfig>::getConfig(_params.getRoutingConfigId())); // _P_A_R_A_N_O_I_A_ mbus::RoutingTable::SP table = _mbus->getRoutingTable(_params.getProtocol()); - if (table.get() == NULL) { + if ( ! table) { throw config::InvalidConfigException(vespalib::make_string("There is no routing table for protocol '%s'.", _params.getProtocol().c_str())); } - for (std::vector<std::string>::iterator it = _params.getHops().begin(); - it != _params.getHops().end(); ++it) - { - if (table->getHop(*it) == NULL) { + for (const std::string & hop : _params.getHops()) { + if (table->getHop(hop) == NULL) { throw config::InvalidConfigException(vespalib::make_string("There is no hop named '%s' for protocol '%s'.", - it->c_str(), _params.getProtocol().c_str())); + hop.c_str(), _params.getProtocol().c_str())); } } @@ -166,7 +162,7 @@ Application::parseArgs() _params.setListServices(true); } else if (strcasecmp(_argv[arg], "--slobrokconfigid") == 0) { if (++arg < _argc) { - _params.getRPCNetworkParams().setSlobrokConfig(_argv[arg]); + _params.setSlobrokId(_argv[arg]); } else { throw config::InvalidConfigException("Missing value for parameter 'slobrokconfigid'."); } diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/params.cpp b/vespaclient/src/vespa/vespaclient/vesparoute/params.cpp index 45a14691648..ded7013ccc9 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/params.cpp +++ b/vespaclient/src/vespa/vespaclient/vesparoute/params.cpp @@ -11,6 +11,7 @@ Params::Params() : _documentTypesConfigId("client"), _routingConfigId("client"), _protocol("document"), + _slobrokConfigId(""), _lstHops(false), _lstRoutes(false), _lstServices(false), diff --git a/vespaclient/src/vespa/vespaclient/vesparoute/params.h b/vespaclient/src/vespa/vespaclient/vesparoute/params.h index a4b09e66a61..b16ac40212b 100644 --- a/vespaclient/src/vespa/vespaclient/vesparoute/params.h +++ b/vespaclient/src/vespa/vespaclient/vesparoute/params.h @@ -92,6 +92,9 @@ public: /** Returns wether or not to verify service names. */ bool getVerify() const { return _verify; } + const std::string & getSlobrokConfigId() const { return _slobrokConfigId; } + void setSlobrokId(const std::string & id) { _slobrokConfigId = id; } + private: mbus::RPCNetworkParams _rpcParams; std::vector<std::string> _hops; @@ -99,6 +102,7 @@ private: std::string _documentTypesConfigId; std::string _routingConfigId; std::string _protocol; + std::string _slobrokConfigId; bool _lstHops; bool _lstRoutes; bool _lstServices; |