From 92c0504d474e4cdb536d9c60c8adcb8a2716dddc Mon Sep 17 00:00:00 2001 From: gregw Date: Fri, 10 Mar 2023 21:20:18 +0100 Subject: [PATCH] Fully decode #9444 updates from review. --- .../src/main/java/org/eclipse/jetty/server/Context.java | 1 - .../java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java | 2 +- .../org/eclipse/jetty/ee10/servlet/ServletContextRequest.java | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java index d02244e12bca..05321644783e 100644 --- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java +++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Context.java @@ -100,7 +100,6 @@ public interface Context extends Attributes, Decorator, Executor * per {@link org.eclipse.jetty.util.URIUtil#canonicalPath(String)} * @return the URI path scoped to this Context, or {@code null} if the full path does not match this Context. * The empty string is returned if the full path is exactly the context path. - * */ default String getPathInContext(String canonicallyEncodedPath) { diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java index 182954bf0974..af5b77796f13 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletApiRequest.java @@ -1248,7 +1248,7 @@ public Map getTrailerFields() return trailersMap; } - public static class AmbiguousURI extends ServletApiRequest + static class AmbiguousURI extends ServletApiRequest { protected AmbiguousURI(ServletContextRequest servletContextRequest) { diff --git a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java index 6cdbf08ba1a8..fd25ca3e639d 100644 --- a/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java +++ b/jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java @@ -40,13 +40,10 @@ import org.eclipse.jetty.session.ManagedSession; import org.eclipse.jetty.session.SessionManager; import org.eclipse.jetty.util.Fields; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ServletContextRequest extends ContextRequest { public static final String MULTIPART_CONFIG_ELEMENT = "org.eclipse.jetty.multipartConfig"; - private static final Logger LOG = LoggerFactory.getLogger(ServletContextRequest.class); static final int INPUT_NONE = 0; static final int INPUT_STREAM = 1; static final int INPUT_READER = 2;