Avoid use of deprecated Request.setServerRequest.

3 files changed, 11 insertions, 5 deletions

diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java
index a0bedd678eb..1adad51a052 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusRequest.java
@@ -15,7 +15,10 @@ public class MbusRequest extends Request {
     private final Message message;
 
     public MbusRequest(CurrentContainer current, URI uri, Message msg) {
-        super(current, uri);
+        this(current, uri, msg, true);
+    }
+    public MbusRequest(CurrentContainer current, URI uri, Message msg, boolean isServerRequest) {
+        super(current, uri, isServerRequest);
         this.message = validateMessage(msg);
     }
 
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 ea0ed7eadc8..34b4d47b0b4 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
@@ -7,7 +7,12 @@ import com.yahoo.jdisc.ResourceReference;
 import com.yahoo.jdisc.application.ContainerBuilder;
 import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.test.TestDriver;
-import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageBusParams;
+import com.yahoo.messagebus.Protocol;
+import com.yahoo.messagebus.Reply;
+import com.yahoo.messagebus.SourceSession;
+import com.yahoo.messagebus.SourceSessionParams;
 import com.yahoo.messagebus.jdisc.MbusClient;
 import com.yahoo.messagebus.jdisc.MbusRequest;
 import com.yahoo.messagebus.network.rpc.RPCNetworkParams;
diff --git a/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/ClientThreadingTestCase.java b/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/ClientThreadingTestCase.java
index 88a343f0754..1ccf0b43bf3 100644
--- a/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/ClientThreadingTestCase.java
+++ b/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/ClientThreadingTestCase.java
@@ -98,10 +98,8 @@ public class ClientThreadingTestCase {
             driver.activateContainer(builder);
             delegate.start();
         }
-        @SuppressWarnings("deprecation")
         void send(final Message msg, final ResponseHandler handler) {
-            final MbusRequest request = new MbusRequest(driver, URI.create("mbus://remote/"), msg);
-            request.setServerRequest(false);
+            final MbusRequest request = new MbusRequest(driver, URI.create("mbus://remote/"), msg, false);
             request.connect(handler).close(null);
             request.release();
         }