From 203c887fba0cd6fbd0cfc813742c45b37bbb8065 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Fri, 3 Dec 2021 11:07:37 +0100 Subject: Make DiscFilterRequest non-abstract and deprecate JdiscFilterRequest There is no need for having DiscFilterRequest as an abstract class after removing servlet support. --- container-core/abi-spec.json | 56 ++++------ .../yahoo/jdisc/http/filter/DiscFilterRequest.java | 73 +++++++++---- .../jdisc/http/filter/JdiscFilterRequest.java | 116 +-------------------- .../http/filter/SecurityRequestFilterChain.java | 2 +- .../jdisc/http/filter/DiscFilterRequestTest.java | 51 +++++---- 5 files changed, 101 insertions(+), 197 deletions(-) (limited to 'container-core') diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index 412a86b203f..6bee1f2b4fb 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -2164,15 +2164,14 @@ "superClass": "java.lang.Object", "interfaces": [], "attributes": [ - "public", - "abstract" + "public" ], "methods": [ "public void (com.yahoo.jdisc.http.HttpRequest)", - "public abstract java.lang.String getMethod()", + "public java.lang.String getMethod()", "public com.yahoo.jdisc.http.HttpRequest$Version getVersion()", "public java.net.URI getUri()", - "public abstract void setUri(java.net.URI)", + "public void setUri(java.net.URI)", "public com.yahoo.jdisc.http.HttpRequest getParentRequest()", "public java.lang.String getRemoteAddr()", "public void setRemoteAddr(java.lang.String)", @@ -2182,8 +2181,8 @@ "public void setAttribute(java.lang.String, java.lang.Object)", "public boolean containsAttribute(java.lang.String)", "public void removeAttribute(java.lang.String)", - "public abstract java.lang.String getParameter(java.lang.String)", - "public abstract java.util.Enumeration getParameterNames()", + "public java.lang.String getParameter(java.lang.String)", + "public java.util.Enumeration getParameterNames()", "public java.util.List getParameterNamesAsList()", "public java.util.Enumeration getParameterValues(java.lang.String)", "public java.util.List getParameterValuesAsList(java.lang.String)", @@ -2194,16 +2193,16 @@ "public java.util.Map getUntreatedParams()", "public com.yahoo.jdisc.HeaderFields getUntreatedHeaders()", "public java.util.List getUntreatedCookies()", - "public abstract void addHeader(java.lang.String, java.lang.String)", + "public void addHeader(java.lang.String, java.lang.String)", "public long getDateHeader(java.lang.String)", - "public abstract java.lang.String getHeader(java.lang.String)", - "public abstract java.util.Enumeration getHeaderNames()", - "public abstract java.util.List getHeaderNamesAsList()", - "public abstract java.util.Enumeration getHeaders(java.lang.String)", - "public abstract java.util.List getHeadersAsList(java.lang.String)", - "public abstract void removeHeaders(java.lang.String)", - "public abstract void setHeaders(java.lang.String, java.lang.String)", - "public abstract void setHeaders(java.lang.String, java.util.List)", + "public java.lang.String getHeader(java.lang.String)", + "public java.util.Enumeration getHeaderNames()", + "public java.util.List getHeaderNamesAsList()", + "public java.util.Enumeration getHeaders(java.lang.String)", + "public java.util.List getHeadersAsList(java.lang.String)", + "public void removeHeaders(java.lang.String)", + "public void setHeaders(java.lang.String, java.lang.String)", + "public void setHeaders(java.lang.String, java.util.List)", "public int getIntHeader(java.lang.String)", "public com.yahoo.container.jdisc.RequestView asRequestView()", "public java.util.List getCookies()", @@ -2218,20 +2217,20 @@ "public void setScheme(java.lang.String, boolean)", "public java.lang.String getServerName()", "public int getServerPort()", - "public abstract java.security.Principal getUserPrincipal()", + "public java.security.Principal getUserPrincipal()", "public boolean isSecure()", "public boolean isUserInRole(java.lang.String)", "public void setOverrideIsUserInRole(boolean)", "public void setRemoteHost(java.lang.String)", "public void setRemoteUser(java.lang.String)", - "public abstract void setUserPrincipal(java.security.Principal)", - "public abstract java.util.List getClientCertificateChain()", + "public void setUserPrincipal(java.security.Principal)", + "public java.util.List getClientCertificateChain()", "public void setUserRoles(java.lang.String[])", "public java.lang.String getContentType()", "public java.lang.String getCharacterEncoding()", "public void setCharacterEncoding(java.lang.String)", "public void addCookie(com.yahoo.jdisc.http.filter.JDiscCookieWrapper)", - "public abstract void clearCookies()", + "public void clearCookies()", "public com.yahoo.jdisc.http.filter.JDiscCookieWrapper[] getWrappedCookies()", "public static boolean isMultipart(com.yahoo.jdisc.http.filter.DiscFilterRequest)" ], @@ -2323,24 +2322,7 @@ ], "methods": [ "public void (com.yahoo.jdisc.http.HttpRequest)", - "public com.yahoo.jdisc.http.HttpRequest getParentRequest()", - "public void setUri(java.net.URI)", - "public java.lang.String getMethod()", - "public java.lang.String getParameter(java.lang.String)", - "public java.util.Enumeration getParameterNames()", - "public void addHeader(java.lang.String, java.lang.String)", - "public java.lang.String getHeader(java.lang.String)", - "public java.util.Enumeration getHeaderNames()", - "public java.util.List getHeaderNamesAsList()", - "public java.util.Enumeration getHeaders(java.lang.String)", - "public java.util.List getHeadersAsList(java.lang.String)", - "public void removeHeaders(java.lang.String)", - "public void setHeaders(java.lang.String, java.lang.String)", - "public void setHeaders(java.lang.String, java.util.List)", - "public java.security.Principal getUserPrincipal()", - "public void setUserPrincipal(java.security.Principal)", - "public java.util.List getClientCertificateChain()", - "public void clearCookies()" + "public com.yahoo.jdisc.http.HttpRequest getParentRequest()" ], "fields": [] }, 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 9b799e3a68f..8ac2305f5df 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 @@ -7,6 +7,7 @@ import com.yahoo.jdisc.http.Cookie; import com.yahoo.jdisc.http.HttpHeaders; import com.yahoo.jdisc.http.HttpRequest; import com.yahoo.jdisc.http.HttpRequest.Version; +import com.yahoo.jdisc.http.server.jetty.RequestUtils; import java.net.InetSocketAddress; import java.net.URI; @@ -15,6 +16,7 @@ import java.security.cert.X509Certificate; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.Enumeration; @@ -22,15 +24,14 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; /** * The Request class on which all filters will operate upon. - * Test cases that need a concrete - * instance should create a {@link JdiscFilterRequest}. */ -public abstract class DiscFilterRequest { +public class DiscFilterRequest { protected static final String HTTPS_PREFIX = "https"; protected static final int DEFAULT_HTTP_PORT = 80; @@ -54,7 +55,7 @@ public abstract class DiscFilterRequest { untreatedParams = new HashMap<>(parent.parameters()); } - public abstract String getMethod(); + public String getMethod() { return parent.getMethod().name(); } public Version getVersion() { return parent.getVersion(); @@ -65,8 +66,12 @@ public abstract class DiscFilterRequest { } @Deprecated - public abstract void setUri(URI uri); + 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() { throw new UnsupportedOperationException("getParentRequest is not supported for " + parent.getClass().getName()); } @@ -124,9 +129,18 @@ public abstract class DiscFilterRequest { parent.context().remove(name); } - public abstract String getParameter(String name); + public String getParameter(String name) { + if(parent.parameters().containsKey(name)) { + return parent.parameters().get(name).get(0); + } + else { + return null; + } + } - public abstract Enumeration getParameterNames(); + public Enumeration getParameterNames() { + return Collections.enumeration(parent.parameters().keySet()); + } public List getParameterNamesAsList() { return new ArrayList(parent.parameters().keySet()); @@ -199,7 +213,9 @@ public abstract class DiscFilterRequest { * Sets a header with the given name and value. * If the header had already been set, the new value overwrites the previous one. */ - public abstract void addHeader(String name, String value); + public void addHeader(String name, String value) { + parent.headers().add(name, value); + } public long getDateHeader(String name) { String value = getHeader(name); @@ -220,31 +236,43 @@ public abstract class DiscFilterRequest { return date.getTime(); } - public abstract String getHeader(String name); + public String getHeader(String name) { + List values = parent.headers().get(name); + if (values == null || values.isEmpty()) { + return null; + } + return values.get(values.size() - 1); + } - public abstract Enumeration getHeaderNames(); + public Enumeration getHeaderNames() { return Collections.enumeration(parent.headers().keySet()); } - public abstract List getHeaderNamesAsList(); + public List getHeaderNamesAsList() { return new ArrayList<>(parent.headers().keySet()); } - public abstract Enumeration getHeaders(String name); + public Enumeration getHeaders(String name) { return Collections.enumeration(getHeadersAsList(name)); } - public abstract List getHeadersAsList(String name); + public List getHeadersAsList(String name) { + List values = parent.headers().get(name); + if(values == null) { + return Collections.emptyList(); + } + return parent.headers().get(name); + } - public abstract void removeHeaders(String name); + public void removeHeaders(String name) { parent.headers().remove(name); } /** * Sets a header with the given name and value. * If the header had already been set, the new value overwrites the previous one. * */ - public abstract void setHeaders(String name, String value); + public void setHeaders(String name, String value) { parent.headers().put(name, value); } /** * Sets a header with the given name and value. * If the header had already been set, the new value overwrites the previous one. * */ - public abstract void setHeaders(String name, List values); + public void setHeaders(String name, List values) { parent.headers().put(name, values); } public int getIntHeader(String name) { String value = getHeader(name); @@ -339,7 +367,7 @@ public abstract class DiscFilterRequest { return port; } - public abstract Principal getUserPrincipal(); + public Principal getUserPrincipal() { return parent.getUserPrincipal(); } public boolean isSecure() { if(getScheme().equalsIgnoreCase(HTTPS_PREFIX)) { @@ -382,13 +410,18 @@ public abstract class DiscFilterRequest { this.remoteUser = remoteUser; } - public abstract void setUserPrincipal(Principal principal); + public void setUserPrincipal(Principal principal) { this.parent.setUserPrincipal(principal); } /** * @return The client certificate chain in ascending order of trust. The first certificate is the one sent from the client. * Returns an empty list if the client did not provide a certificate. */ - public abstract List getClientCertificateChain(); + public List getClientCertificateChain() { + return Optional.ofNullable(parent.context().get(RequestUtils.JDISC_REQUEST_X509CERT)) + .map(X509Certificate[].class::cast) + .map(Arrays::asList) + .orElse(Collections.emptyList()); + } public void setUserRoles(String[] roles) { this.roles = roles; @@ -436,7 +469,7 @@ public abstract class DiscFilterRequest { } } - public abstract void clearCookies(); + public void clearCookies() { parent.headers().remove(HttpHeaders.Names.COOKIE); } public JDiscCookieWrapper[] getWrappedCookies() { List cookies = getCookies(); 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 f78c03f7af7..aa4050dd963 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 @@ -1,25 +1,13 @@ // 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.HttpHeaders; import com.yahoo.jdisc.http.HttpRequest; -import com.yahoo.jdisc.http.server.jetty.RequestUtils; - -import java.net.URI; -import java.security.Principal; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.Optional; /** * JDisc implementation of a filter request. * - * @since 5.27 */ +@Deprecated(forRemoval = true, since = "7.511") public class JdiscFilterRequest extends DiscFilterRequest { private final HttpRequest parent; @@ -29,106 +17,8 @@ public class JdiscFilterRequest extends DiscFilterRequest { this.parent = parent; } - public HttpRequest getParentRequest() { - return parent; - } - - @Deprecated - public void setUri(URI uri) { - parent.setUri(uri); - } - - @Override - public String getMethod() { - return parent.getMethod().name(); - } - - @Override - public String getParameter(String name) { - if(parent.parameters().containsKey(name)) { - return parent.parameters().get(name).get(0); - } - else { - return null; - } - } - - @Override - public Enumeration getParameterNames() { - return Collections.enumeration(parent.parameters().keySet()); - } - - @Override - public void addHeader(String name, String value) { - parent.headers().add(name, value); - } - - @Override - public String getHeader(String name) { - List values = parent.headers().get(name); - if (values == null || values.isEmpty()) { - return null; - } - return values.get(values.size() - 1); - } - - public Enumeration getHeaderNames() { - return Collections.enumeration(parent.headers().keySet()); - } - - public List getHeaderNamesAsList() { - return new ArrayList(parent.headers().keySet()); - } - + @SuppressWarnings("removal") @Override - public Enumeration getHeaders(String name) { - return Collections.enumeration(getHeadersAsList(name)); - } - - public List getHeadersAsList(String name) { - List values = parent.headers().get(name); - if(values == null) { - return Collections.emptyList(); - } - return parent.headers().get(name); - } - - @Override - public void removeHeaders(String name) { - parent.headers().remove(name); - } - - @Override - public void setHeaders(String name, String value) { - parent.headers().put(name, value); - } - - @Override - public void setHeaders(String name, List values) { - parent.headers().put(name, values); - } - - @Override - public Principal getUserPrincipal() { - return parent.getUserPrincipal(); - } - - @Override - public void setUserPrincipal(Principal principal) { - this.parent.setUserPrincipal(principal); - } - - @Override - public List getClientCertificateChain() { - return Optional.ofNullable(parent.context().get(RequestUtils.JDISC_REQUEST_X509CERT)) - .map(X509Certificate[].class::cast) - .map(Arrays::asList) - .orElse(Collections.emptyList()); - } - - @Override - public void clearCookies() { - parent.headers().remove(HttpHeaders.Names.COOKIE); - } + public HttpRequest getParentRequest() { return parent; } } diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java index 0c81d919f0e..554a83a240f 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/SecurityRequestFilterChain.java @@ -30,7 +30,7 @@ public final class SecurityRequestFilterChain extends AbstractResource implement @Override public void filter(HttpRequest request, ResponseHandler responseHandler) { - DiscFilterRequest discFilterRequest = new JdiscFilterRequest(request); + DiscFilterRequest discFilterRequest = new DiscFilterRequest(request); filter(discFilterRequest, responseHandler); } 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 6c945520c1b..25efe4ac5f6 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 @@ -42,8 +42,7 @@ public class DiscFilterRequestTest { cookies.add(new Cookie("XYZ", "value")); cookies.add(new Cookie("ABC", "value")); httpReq.encodeCookieHeader(cookies); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); - Assert.assertSame(request.getParentRequest(), httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertEquals(request.getHeader("X-Custom-Header"),"custom_header"); Assert.assertEquals(request.getHeader(HttpHeaders.Names.CONTENT_TYPE),"text/html;charset=UTF-8"); @@ -63,7 +62,7 @@ public class DiscFilterRequestTest { URI uri = URI.create("http://localhost:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); httpReq.headers().add("some-header", "some-value"); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); request.addHeader("some-header", "some-value"); String value = request.getUntreatedHeaders().get("some-header").get(0); @@ -74,7 +73,7 @@ public class DiscFilterRequestTest { public void testRequestAttributes() { URI uri = URI.create("http://localhost:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); request.setAttribute("some_attr", "some_value"); Assert.assertTrue(request.containsAttribute("some_attr")); @@ -87,7 +86,7 @@ public class DiscFilterRequestTest { public void testGetAttributeNames() { URI uri = URI.create("http://localhost:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); request.setAttribute("some_attr_1", "some_value1"); request.setAttribute("some_attr_2", "some_value2"); @@ -103,7 +102,7 @@ public class DiscFilterRequestTest { public void testRemoveAttribute() { URI uri = URI.create("http://localhost:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); request.setAttribute("some_attr", "some_value"); Assert.assertTrue(request.containsAttribute("some_attr")); @@ -117,7 +116,7 @@ public class DiscFilterRequestTest { public void testGetIntHeader() { URI uri = URI.create("http://localhost:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertEquals(-1, request.getIntHeader("int_header")); @@ -130,7 +129,7 @@ public class DiscFilterRequestTest { public void testDateHeader() { URI uri = URI.create("http://localhost:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertEquals(-1, request.getDateHeader(HttpHeaders.Names.IF_MODIFIED_SINCE)); @@ -144,7 +143,7 @@ public class DiscFilterRequestTest { public void testParameterAPIsAsList() { URI uri = URI.create("http://example.yahoo.com:8080/test?param1=abc¶m2=xyz¶m2=pqr"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertEquals(request.getParameter("param1"),"abc"); List values = request.getParameterValuesAsList("param2"); @@ -160,7 +159,7 @@ public class DiscFilterRequestTest { public void testParameterAPI(){ URI uri = URI.create("http://example.yahoo.com:8080/test?param1=abc¶m2=xyz¶m2=pqr"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertEquals(request.getParameter("param1"),"abc"); Enumeration values = request.getParameterValues("param2"); @@ -180,7 +179,7 @@ public class DiscFilterRequestTest { httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "multipart/form-data"); httpReq.headers().add("header_1", "value1"); httpReq.headers().add("header_2", "value2"); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertNotNull(request.getHeaderNamesAsList()); Assert.assertEquals(request.getHeaderNamesAsList().size(), 3); @@ -190,7 +189,7 @@ public class DiscFilterRequestTest { public void testGetHeadersAsList() { URI uri = URI.create("http://localhost:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertNotNull(request.getHeaderNamesAsList()); Assert.assertEquals(request.getHeaderNamesAsList().size(), 0); @@ -207,13 +206,13 @@ public class DiscFilterRequestTest { URI uri = URI.create("http://localhost:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "multipart/form-data"); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertTrue(DiscFilterRequest.isMultipart(request)); httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); httpReq.headers().add(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8"); - request = new JdiscFilterRequest(httpReq); + request = new DiscFilterRequest(httpReq); Assert.assertFalse(DiscFilterRequest.isMultipart(request)); @@ -221,7 +220,7 @@ public class DiscFilterRequestTest { httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - request = new JdiscFilterRequest(httpReq); + request = new DiscFilterRequest(httpReq); Assert.assertFalse(DiscFilterRequest.isMultipart(request)); } @@ -230,7 +229,7 @@ public class DiscFilterRequestTest { URI uri = URI.create("http://example.yahoo.com:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertEquals(69, request.getRemotePort()); Assert.assertEquals(8080, request.getLocalPort()); @@ -247,13 +246,13 @@ public class DiscFilterRequestTest { public void testCharacterEncoding() { URI uri = URI.create("http://example.yahoo.com:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); request.setHeaders(HttpHeaders.Names.CONTENT_TYPE, "text/html;charset=UTF-8"); Assert.assertEquals(request.getCharacterEncoding(), "UTF-8"); httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - request = new JdiscFilterRequest(httpReq); + request = new DiscFilterRequest(httpReq); request.setHeaders(HttpHeaders.Names.CONTENT_TYPE, "text/html"); request.setCharacterEncoding("UTF-8"); @@ -267,7 +266,7 @@ public class DiscFilterRequestTest { 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 JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); request.setScheme("http", true); System.out.println(request.getUri().toString()); @@ -279,7 +278,7 @@ public class DiscFilterRequestTest { 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 JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertEquals(request.getServerPort(), 80); request.setUri(URI.create("https://example.yahoo.com/test")); @@ -292,7 +291,7 @@ public class DiscFilterRequestTest { 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 JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertFalse(request.isSecure()); request.setUri(URI.create("https://example.yahoo.com/test")); @@ -304,7 +303,7 @@ public class DiscFilterRequestTest { public void requireThatUnresolvableRemoteAddressesAreSupported() { URI uri = URI.create("http://doesnotresolve.zzz:8080/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); Assert.assertNull(request.getLocalAddr()); } @@ -315,7 +314,7 @@ public class DiscFilterRequestTest { httpReq.headers().add("key1", "value1"); httpReq.headers().add("key2", Arrays.asList("value1","value2")); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); HeaderFields headers = request.getUntreatedHeaders(); Assert.assertEquals(headers.keySet().size(), 2); Assert.assertEquals(headers.get("key1").get(0), "value1" ); @@ -328,7 +327,7 @@ public class DiscFilterRequestTest { URI uri = URI.create("http://example.yahoo.com/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); httpReq.headers().put(HttpHeaders.Names.COOKIE, "XYZ=value"); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); request.clearCookies(); Assert.assertNull(request.getHeader(HttpHeaders.Names.COOKIE)); } @@ -338,7 +337,7 @@ public class DiscFilterRequestTest { URI uri = URI.create("http://example.yahoo.com/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); httpReq.headers().put(HttpHeaders.Names.COOKIE, "XYZ=value"); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); JDiscCookieWrapper[] wrappers = request.getWrappedCookies(); Assert.assertEquals(wrappers.length ,1); Assert.assertEquals(wrappers[0].getName(), "XYZ"); @@ -349,7 +348,7 @@ public class DiscFilterRequestTest { public void testAddCookie() { URI uri = URI.create("http://example.yahoo.com/test"); HttpRequest httpReq = newRequest(uri, HttpRequest.Method.GET, HttpRequest.Version.HTTP_1_1); - DiscFilterRequest request = new JdiscFilterRequest(httpReq); + DiscFilterRequest request = new DiscFilterRequest(httpReq); request.addCookie(JDiscCookieWrapper.wrap(new Cookie("name", "value"))); List cookies = request.getCookies(); -- cgit v1.2.3