- Add deprecation warning for methods only used in tests to enable using final on members.

- assign the reference at the end of the constructor to avoid possibility for exceptions thrown leaving the reference hidden in the dark.
- Catch Throwable instead of RuntimException to avoid some exceptions to pass.

3 files changed, 12 insertions, 5 deletions

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 895ddb30a6d..c1431ff8ba8 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java
@@ -45,9 +45,9 @@ public class Request extends AbstractResource {
     private volatile boolean cancel = false;
     private BindingMatch<RequestHandler> bindingMatch;
     private TimeoutManager timeoutManager;
-    private boolean serverRequest;
+    private boolean serverRequest; // TODO could be final, only used in tests
     private Long timeout;
-    private URI uri;
+    private URI uri; // TODO Could be made final,
 
     public enum RequestType {
         READ, WRITE, MONITORING
@@ -79,12 +79,12 @@ public class Request extends AbstractResource {
      * @param uri     The identifier of this request.
      */
     public Request(CurrentContainer current, URI uri) {
-        container = current.newReference(uri);
         parent = null;
         parentReference = null;
-        creationTime = container.currentTimeMillis();
         serverRequest = true;
         setUri(uri);
+        container = current.newReference(uri);
+        creationTime = container.currentTimeMillis();
     }
 
     /**
@@ -113,11 +113,11 @@ public class Request extends AbstractResource {
      */
     public Request(Request parent, URI uri) {
         this.parent = parent;
-        this.parentReference = this.parent.refer();
         container = null;
         creationTime = parent.container().currentTimeMillis();
         serverRequest = false;
         setUri(uri);
+        parentReference = this.parent.refer();
     }
 
     /** Returns the {@link Container} for which this Request was created */
@@ -142,6 +142,7 @@ public class Request extends AbstractResource {
      * @return this, to allow chaining
      * @see #getUri()
      */
+    @Deprecated
     public Request setUri(URI uri) {
         this.uri = uri.normalize();
         return this;
@@ -166,6 +167,7 @@ public class Request extends AbstractResource {
      * @return this, to allow chaining
      * @see #isServerRequest()
      */
+    @Deprecated
     public Request setServerRequest(boolean serverRequest) {
         this.serverRequest = serverRequest;
         return this;
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/RequestTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/RequestTestCase.java
index ab92f5fdcca..e85d34b9982 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/RequestTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/RequestTestCase.java
@@ -34,6 +34,7 @@ import static org.junit.Assert.fail;
 public class RequestTestCase {
 
     @Test
+    @SuppressWarnings("deprecation")
     public void requireThatAccessorsWork() throws BindingSetNotFoundException {
         MyTimer timer = new MyTimer();
         timer.currentTime = 69;
@@ -249,6 +250,7 @@ public class RequestTestCase {
         assertTrue(driver.close());
     }
 
+    @SuppressWarnings("deprecation")
     private static void assertUri(CurrentContainer container, String requestUri, String expectedUri) {
         Request serverReq = new Request(container, URI.create(requestUri));
         assertEquals(expectedUri, serverReq.getUri().toString());
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 0ea1040306c..d8f8087bd46 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,6 +31,7 @@ import static org.junit.Assert.assertTrue;
 public class ContainerSnapshotTestCase {
 
     @Test
+    @SuppressWarnings("deprecation")
     public void requireThatServerHandlerCanBeResolved() {
         TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi();
         ContainerBuilder builder = driver.newContainerBuilder();
@@ -63,6 +64,7 @@ public class ContainerSnapshotTestCase {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void requireThatClientHandlerCanBeResolved() {
         TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi();
         ContainerBuilder builder = driver.newContainerBuilder();
@@ -95,6 +97,7 @@ public class ContainerSnapshotTestCase {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void requireThatClientBindingsAreUsed() {
         TestDriver driver = TestDriver.newSimpleApplicationInstanceWithoutOsgi();
         ContainerBuilder builder = driver.newContainerBuilder();