Avoid use of deprecated Request.setServerRequest.

6 files changed, 22 insertions, 21 deletions

diff --git a/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java b/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
index d91522ee5ed..9e8e1a87c0a 100644
--- a/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
+++ b/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
@@ -54,7 +54,7 @@ public class MockDispatchDocproc extends DocumentProcessor {
         return new RequestDispatch() {
             @Override
             protected Request newRequest() {
-                return new MbusRequest(currentContainer, uri, message.setRoute(route)).setServerRequest(false);
+                return new MbusRequest(currentContainer, uri, message.setRoute(route), false);
             }
         };
     }
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();
         }
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java
index c1431ff8ba8..e2cde8e806c 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java
@@ -79,9 +79,13 @@ public class Request extends AbstractResource {
      * @param uri     The identifier of this request.
      */
     public Request(CurrentContainer current, URI uri) {
+        this(current, uri, true);
+    }
+
+    public Request(CurrentContainer current, URI uri, boolean isServerRequest) {
         parent = null;
         parentReference = null;
-        serverRequest = true;
+        serverRequest = isServerRequest;
         setUri(uri);
         container = current.newReference(uri);
         creationTime = container.currentTimeMillis();
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ContainerSnapshotTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ContainerSnapshotTestCase.java
index d8f8087bd46..ac2efafbba5 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/ContainerSnapshotTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/ContainerSnapshotTestCase.java
@@ -31,7 +31,6 @@ import static org.junit.Assert.assertTrue;
 public class ContainerSnapshotTestCase {
 
     @Test
-    @SuppressWarnings("deprecation")
     public void requireThatServerHandlerCanBeResolved() {
         TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi();
         ContainerBuilder builder = driver.newContainerBuilder();
@@ -43,8 +42,7 @@ public class ContainerSnapshotTestCase {
         assertNotNull(request.getBindingMatch());
         request.release();
 
-        request = new Request(driver, URI.create("http://foo/"));
-        request.setServerRequest(false);
+        request = new Request(driver, URI.create("http://foo/"), false);
         assertNull(request.container().resolveHandler(request));
         assertNull(request.getBindingMatch());
         request.release();
@@ -54,8 +52,7 @@ public class ContainerSnapshotTestCase {
         assertNull(request.getBindingMatch());
         request.release();
 
-        request = new Request(driver, URI.create("http://bar/"));
-        request.setServerRequest(false);
+        request = new Request(driver, URI.create("http://bar/"), false);
         assertNull(request.container().resolveHandler(request));
         assertNull(request.getBindingMatch());
         request.release();
@@ -64,7 +61,6 @@ public class ContainerSnapshotTestCase {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     public void requireThatClientHandlerCanBeResolved() {
         TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi();
         ContainerBuilder builder = driver.newContainerBuilder();
@@ -76,8 +72,7 @@ public class ContainerSnapshotTestCase {
         assertNull(request.getBindingMatch());
         request.release();
 
-        request = new Request(driver, URI.create("http://foo/"));
-        request.setServerRequest(false);
+        request = new Request(driver, URI.create("http://foo/"), false);
         assertNotNull(request.container().resolveHandler(request));
         assertNotNull(request.getBindingMatch());
         request.release();
@@ -87,8 +82,7 @@ public class ContainerSnapshotTestCase {
         assertNull(request.getBindingMatch());
         request.release();
 
-        request = new Request(driver, URI.create("http://bar/"));
-        request.setServerRequest(false);
+        request = new Request(driver, URI.create("http://bar/"), false);
         assertNull(request.container().resolveHandler(request));
         assertNull(request.getBindingMatch());
         request.release();
@@ -97,15 +91,12 @@ public class ContainerSnapshotTestCase {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     public void requireThatClientBindingsAreUsed() {
         TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi();
         ContainerBuilder builder = driver.newContainerBuilder();
         builder.clientBindings().bind("http://host/path", MyRequestHandler.newInstance());
         driver.activateContainer(builder);
-        Request request = new Request(driver, URI.create("http://host/path"));
-        assertNull(request.container().resolveHandler(request));
-        request.setServerRequest(false);
+        Request request = new Request(driver, URI.create("http://host/path"), false);
         assertNotNull(request.container().resolveHandler(request));
         request.release();
         assertTrue(driver.close());