- 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.

11 files changed, 25 insertions, 8 deletions

diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
index 0b5e9ddde58..8fb711c34ed 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
@@ -52,7 +52,7 @@ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest {
 
         private final String str;
 
-        private Version(String str) {
+        Version(String str) {
             this.str = str;
         }
 
@@ -96,7 +96,7 @@ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest {
             } else {
                 this.connectedAt = creationTime(TimeUnit.MILLISECONDS);
             }
-        } catch (RuntimeException e) {
+        } catch (Throwable e) {
             release();
             throw e;
         }
@@ -110,7 +110,7 @@ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest {
             this.remoteAddress = null;
             this.parameters.putAll(getUriQueryParameters(uri));
             this.connectedAt = creationTime(TimeUnit.MILLISECONDS);
-        } catch (RuntimeException e) {
+        } catch (Throwable e) {
             release();
             throw e;
         }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java
index 72068bd2dd5..6ed82319544 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterRequest.java
@@ -65,6 +65,7 @@ public abstract class DiscFilterRequest {
         return parent.getUri();
     }
 
+    @Deprecated
     public abstract void setUri(URI uri);
 
     public HttpRequest getParentRequest() {
@@ -313,6 +314,7 @@ public abstract class DiscFilterRequest {
         return getUri().getScheme();
     }
 
+    @Deprecated
     public void setScheme(String scheme, boolean isSecure) {
         String uri = getUri().toString();
         String arr [] = uri.split("://");
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java
index f8d9e6b2642..d61644b65e7 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java
@@ -33,6 +33,7 @@ public class JdiscFilterRequest extends DiscFilterRequest {
         return parent;
     }
 
+    @Deprecated
     public void setUri(URI uri) {
         parent.setUri(uri);
     }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterRequest.java
index f06f9e256ff..4cf3cdde650 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/ServletFilterRequest.java
@@ -32,6 +32,7 @@ class ServletFilterRequest extends DiscFilterRequest {
         return parent;
     }
 
+    @Deprecated
     public void setUri(URI uri) {
         parent.setUri(uri);
     }
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
index a3cb31d5ecb..43fc67cfabe 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
@@ -73,6 +73,7 @@ public class HttpRequestTestCase {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void requireThatAccessorsWork() {
         URI uri = URI.create("http://localhost/path?foo=bar&foo=baz&cox=69");
         InetSocketAddress address = new InetSocketAddress("remotehost", 69);
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
index 1c05a3f3db2..606060bc6b4 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterRequestTest.java
@@ -263,6 +263,7 @@ public class DiscFilterRequestTest {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void testSetScheme() throws Exception {
 		URI uri = URI.create("https://example.yahoo.com:8080/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
@@ -274,6 +275,7 @@ public class DiscFilterRequestTest {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void testGetServerPort() throws Exception {
 		URI uri = URI.create("http://example.yahoo.com/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
@@ -286,6 +288,7 @@ public class DiscFilterRequestTest {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void testIsSecure() throws Exception {
 		URI uri = URI.create("http://example.yahoo.com/test");
 		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterRequestTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterRequestTest.java
index ed4c9b66068..896f441aa6f 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterRequestTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/ServletFilterRequestTest.java
@@ -86,6 +86,7 @@ public class ServletFilterRequestTest {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void uri_can_be_set() throws Exception {
         URI newUri = new URI("http", null, host, port + 1, path, paramName + "=" + paramValue, null);
         filterRequest.setUri(newUri);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java
index 7cc00f1ad52..df1590bd2ee 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ApplicationRequestToDiscFilterRequestWrapper.java
@@ -114,6 +114,7 @@ public class ApplicationRequestToDiscFilterRequestWrapper extends DiscFilterRequ
     }
 
     @Override
+    @Deprecated
     public void setUri(URI uri) {
         throw new UnsupportedOperationException();
     }
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();