Make ConfigUri constructors explicit and use same context where possible in proton.

6 files changed, 15 insertions, 19 deletions

diff --git a/messagebus_test/src/tests/error/cpp-client.cpp b/messagebus_test/src/tests/error/cpp-client.cpp
index 5cf88c10d64..365032536cc 100644
--- a/messagebus_test/src/tests/error/cpp-client.cpp
+++ b/messagebus_test/src/tests/error/cpp-client.cpp
@@ -23,9 +23,9 @@ int
 App::Main()
 {
     RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
-                     RPCNetworkParams("file:slobrok.cfg")
+                     RPCNetworkParams(config::ConfigUri("file:slobrok.cfg"))
                      .setIdentity(Identity("server/cpp")),
-                     "file:routing.cfg");
+                     config::ConfigUri("file:routing.cfg"));
 
     Receptor src;
     Message::UP msg;
diff --git a/messagebus_test/src/tests/error/cpp-server.cpp b/messagebus_test/src/tests/error/cpp-server.cpp
index 2343eec7254..e6be163a366 100644
--- a/messagebus_test/src/tests/error/cpp-server.cpp
+++ b/messagebus_test/src/tests/error/cpp-server.cpp
@@ -52,9 +52,9 @@ int
 App::Main()
 {
     RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
-                     RPCNetworkParams("file:slobrok.cfg")
+                     RPCNetworkParams(config::ConfigUri("file:slobrok.cfg"))
                      .setIdentity(Identity("server/cpp")),
-                     "file:routing.cfg");
+                     config::ConfigUri("file:routing.cfg"));
     Server server(mb.getMessageBus());
     while (true) {
         std::this_thread::sleep_for(1s);
diff --git a/messagebus_test/src/tests/speed/cpp-client.cpp b/messagebus_test/src/tests/speed/cpp-client.cpp
index 385f983b7cb..d8ba5d85169 100644
--- a/messagebus_test/src/tests/speed/cpp-client.cpp
+++ b/messagebus_test/src/tests/speed/cpp-client.cpp
@@ -96,8 +96,8 @@ App::Main()
     auto retryPolicy = std::make_shared<RetryTransientErrorsPolicy>();
     retryPolicy->setBaseDelay(0.1);
     RPCMessageBus mb(MessageBusParams().setRetryPolicy(retryPolicy).addProtocol(std::make_shared<SimpleProtocol>()),
-                     RPCNetworkParams("file:slobrok.cfg").setIdentity(Identity("server/cpp")),
-                     "file:routing.cfg");
+                     RPCNetworkParams(config::ConfigUri("file:slobrok.cfg")).setIdentity(Identity("server/cpp")),
+                     config::ConfigUri("file:routing.cfg"));
     Client client(mb.getMessageBus(), SourceSessionParams().setTimeout(30s));
 
     // let the system 'warm up'
diff --git a/messagebus_test/src/tests/speed/cpp-server.cpp b/messagebus_test/src/tests/speed/cpp-server.cpp
index 8d6fa65f530..20a72596182 100644
--- a/messagebus_test/src/tests/speed/cpp-server.cpp
+++ b/messagebus_test/src/tests/speed/cpp-server.cpp
@@ -39,11 +39,11 @@ Server::handleMessage(Message::UP msg) {
         && (msg->getType() == SimpleProtocol::MESSAGE)
         && (static_cast<SimpleMessage&>(*msg).getValue() == "message"))
     {
-        Reply::UP reply(new SimpleReply("OK"));
+        auto reply = std::make_unique<SimpleReply>("OK");
         msg->swapState(*reply);
         _session->reply(std::move(reply));
     } else {
-        Reply::UP reply(new SimpleReply("FAIL"));
+        auto reply = std::make_unique<SimpleReply>("FAIL");
         msg->swapState(*reply);
         _session->reply(std::move(reply));
     }
@@ -59,9 +59,9 @@ int
 App::Main()
 {
     RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
-                     RPCNetworkParams("file:slobrok.cfg")
+                     RPCNetworkParams(config::ConfigUri("file:slobrok.cfg"))
                      .setIdentity(Identity("server/cpp")),
-                     "file:routing.cfg");
+                     config::ConfigUri("file:routing.cfg"));
     Server server(mb.getMessageBus());
     while (true) {
         std::this_thread::sleep_for(1s);
diff --git a/messagebus_test/src/tests/trace/cpp-server.cpp b/messagebus_test/src/tests/trace/cpp-server.cpp
index 454c8b784eb..6d8d7501c79 100644
--- a/messagebus_test/src/tests/trace/cpp-server.cpp
+++ b/messagebus_test/src/tests/trace/cpp-server.cpp
@@ -41,7 +41,7 @@ Server::handleMessage(Message::UP msg) {
     msg->getTrace().trace(1, _name + " (message)", false);
     if (!msg->getRoute().hasHops()) {
         fprintf(stderr, "**** Server '%s' replying.\n", _name.c_str());
-        Reply::UP reply(new EmptyReply());
+        auto reply = std::make_unique<EmptyReply>();
         msg->swapState(*reply);
         handleReply(std::move(reply));
     } else {
@@ -70,9 +70,9 @@ App::Main()
         return 1;
     }
     RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
-                     RPCNetworkParams("file:slobrok.cfg")
+                     RPCNetworkParams(config::ConfigUri("file:slobrok.cfg"))
                      .setIdentity(Identity(_argv[1])),
-                     "file:routing.cfg");
+    config::ConfigUri("file:routing.cfg"));
     Server server(mb.getMessageBus(), _argv[1]);
     while (true) {
         std::this_thread::sleep_for(1s);
diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp
index 28cda46f69e..5dfa702ca20 100644
--- a/messagebus_test/src/tests/trace/trace.cpp
+++ b/messagebus_test/src/tests/trace/trace.cpp
@@ -8,15 +8,11 @@
 #include <vespa/messagebus/messagebus.h>
 #include <vespa/messagebus/sourcesession.h>
 #include <vespa/messagebus/rpcmessagebus.h>
-#include <vespa/messagebus/intermediatesession.h>
-#include <vespa/messagebus/destinationsession.h>
-#include <vespa/messagebus/testlib/slobrok.h>
 #include <vespa/messagebus/testlib/testserver.h>
 #include <vespa/messagebus/routing/routingspec.h>
 #include <vespa/messagebus/testlib/receptor.h>
 #include <vespa/messagebus/sourcesessionparams.h>
 #include <vespa/messagebus/testlib/simplemessage.h>
-#include <vespa/messagebus/testlib/simplereply.h>
 #include <vespa/messagebus/testlib/simpleprotocol.h>
 #include <iostream>
 #include <thread>
@@ -61,8 +57,8 @@ Test::Main()
     
     EXPECT_TRUE(system((ctl_script + " start all").c_str()) == 0);
     RPCMessageBus mb(ProtocolSet().add(std::make_shared<SimpleProtocol>()),
-                     RPCNetworkParams("file:slobrok.cfg"),
-                     "file:routing.cfg");
+                     RPCNetworkParams(config::ConfigUri("file:slobrok.cfg")),
+                     config::ConfigUri("file:routing.cfg"));
     EXPECT_TRUE(waitSlobrok(mb, "server/cpp/1/A/session"));
     EXPECT_TRUE(waitSlobrok(mb, "server/cpp/2/A/session"));
     EXPECT_TRUE(waitSlobrok(mb, "server/cpp/2/B/session"));