Remove deprecated filter request/response APIs

6 files changed, 25 insertions, 99 deletions

diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index a8c22ccdc6b..2230246950c 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -2167,8 +2167,6 @@
       "public java.lang.String getMethod()",
       "public com.yahoo.jdisc.http.HttpRequest$Version getVersion()",
       "public java.net.URI getUri()",
-      "public void setUri(java.net.URI)",
-      "public com.yahoo.jdisc.http.HttpRequest getParentRequest()",
       "public java.lang.String getRemoteAddr()",
       "public void setRemoteAddr(java.lang.String)",
       "public java.lang.String getLocalAddr()",
@@ -2210,7 +2208,6 @@
       "public java.lang.String getRequestURI()",
       "public java.lang.String getRequestedSessionId()",
       "public java.lang.String getScheme()",
-      "public void setScheme(java.lang.String, boolean)",
       "public java.lang.String getServerName()",
       "public int getServerPort()",
       "public java.security.Principal getUserPrincipal()",
@@ -2262,7 +2259,6 @@
       "public void setCookies(java.util.List)",
       "public int getStatus()",
       "public void setStatus(int)",
-      "public com.yahoo.jdisc.http.HttpResponse getParentResponse()",
       "public void addCookie(com.yahoo.jdisc.http.filter.JDiscCookieWrapper)",
       "public void sendError(int)",
       "public void setCookie(java.lang.String, java.lang.String)"
@@ -2310,17 +2306,6 @@
     ],
     "fields": []
   },
-  "com.yahoo.jdisc.http.filter.JdiscFilterRequest": {
-    "superClass": "com.yahoo.jdisc.http.filter.DiscFilterRequest",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>(com.yahoo.jdisc.http.HttpRequest)"
-    ],
-    "fields": []
-  },
   "com.yahoo.jdisc.http.filter.RequestFilter": {
     "superClass": "java.lang.Object",
     "interfaces": [
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 a5d133b9eb4..cace3854973 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,17 +65,6 @@ public class DiscFilterRequest {
         return parent.getUri();
     }
 
-    @Deprecated
-    public void setUri(URI uri) { parent.setUri(uri); }
-
-    /**
-     * @deprecated Use methods on {@link DiscFilterRequest} instead to inspect request
-     */
-    @Deprecated(forRemoval = true, since = "7.511")
-    public HttpRequest getParentRequest() {
-        return parent;
-    }
-
     /**
      * Returns the Internet Protocol (IP) address of the client
      * or last proxy that sent the request.
@@ -341,14 +330,6 @@ public class DiscFilterRequest {
         return getUri().getScheme();
     }
 
-    @Deprecated
-    public void setScheme(String scheme, boolean isSecure) {
-        String uri = getUri().toString();
-        String arr [] = uri.split("://");
-        URI newUri = URI.create(scheme + "://" + arr[1]);
-        setUri(newUri);
-    }
-
     public String getServerName() {
         return getUri().getHost();
     }
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
index af768a98d2d..e67677c4e7d 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/DiscFilterResponse.java
@@ -133,14 +133,6 @@ public class DiscFilterResponse {
 		parent.setStatus(status);
 	}
 
-	/**
-	 * Return the parent HttpResponse
-	 *
-	 * @deprecated Use methods on {@link DiscFilterResponse} instead
-     */
-	@Deprecated(forRemoval = true, since = "7.511")
-	public HttpResponse getParentResponse() { return (HttpResponse) parent; }
-
     public void addCookie(JDiscCookieWrapper cookie) {
         if(cookie != null) {
             List<Cookie> cookies = new ArrayList<>();
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
deleted file mode 100644
index 74c3b8adc7d..00000000000
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/JdiscFilterRequest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.filter;
-
-import com.yahoo.jdisc.http.HttpRequest;
-
-/**
- * JDisc implementation of a filter request.
- *
- */
-@Deprecated(forRemoval = true, since = "7.511")
-public class JdiscFilterRequest extends DiscFilterRequest {
-
-    public JdiscFilterRequest(HttpRequest parent) {
-        super(parent);
-    }
-
-}
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 25efe4ac5f6..294e19aa2a1 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
@@ -262,41 +262,36 @@ public class DiscFilterRequestTest {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
-	public void testSetScheme() {
-		URI uri = URI.create("https://example.yahoo.com:8080/test");
-		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
-		DiscFilterRequest request = new DiscFilterRequest(httpReq);
-
-		request.setScheme("http", true);
-		System.out.println(request.getUri().toString());
-		Assert.assertEquals(request.getUri().toString(), "http://example.yahoo.com:8080/test");
-	}
-
-	@Test
-	@SuppressWarnings("deprecation")
 	public void testGetServerPort() {
-		URI uri = URI.create("http://example.yahoo.com/test");
-		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
-		DiscFilterRequest request = new DiscFilterRequest(httpReq);
-		Assert.assertEquals(request.getServerPort(), 80);
-
-		request.setUri(URI.create("https://example.yahoo.com/test"));
-		Assert.assertEquals(request.getServerPort(), 443);
-
+		{
+			URI uri = URI.create("http://example.yahoo.com/test");
+			HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+			DiscFilterRequest request = new DiscFilterRequest(httpReq);
+			Assert.assertEquals(request.getServerPort(), 80);
+
+		}
+		{
+			URI uri = URI.create("https://example.yahoo.com/test");
+			HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+			DiscFilterRequest request = new DiscFilterRequest(httpReq);
+			Assert.assertEquals(request.getServerPort(), 443);
+		}
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	public void testIsSecure() {
-		URI uri = URI.create("http://example.yahoo.com/test");
-		HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
-		DiscFilterRequest request = new DiscFilterRequest(httpReq);
-		Assert.assertFalse(request.isSecure());
-
-		request.setUri(URI.create("https://example.yahoo.com/test"));
-		Assert.assertTrue(request.isSecure());
-
+		{
+			URI uri = URI.create("http://example.yahoo.com/test");
+			HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+			DiscFilterRequest request = new DiscFilterRequest(httpReq);
+			Assert.assertFalse(request.isSecure());
+		}
+		{
+			URI uri = URI.create("https://example.yahoo.com/test");
+			HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
+			DiscFilterRequest request = new DiscFilterRequest(httpReq);
+			Assert.assertTrue(request.isSecure());
+		}
 	}
 
     @Test
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
index bbb81ae3308..ace41473eb4 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/filter/DiscFilterResponseTest.java
@@ -101,14 +101,4 @@ public class DiscFilterResponseTest {
         Assert.assertEquals(response.getHeader("name"), "value");
     }
 
-    @Test
-    @SuppressWarnings("removal")
-    public void testGetParentResponse() {
-        URI uri = URI.create("http://example.com/test");
-        HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1);
-        HttpResponse httpResp = newResponse(httpReq, 200);
-        DiscFilterResponse response = new DiscFilterResponse(httpResp);
-        Assert.assertSame(response.getParentResponse(), httpResp);
-    }
-
 }