Fixed imports of RequestFacade
diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java
index 96d882c..a8f69f0 100644
--- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java
+++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/RequestFacade.java
@@ -18,6 +18,25 @@
package org.apache.catalina.connector;
+import com.sun.enterprise.security.web.integration.WebPrincipal;
+
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletMapping;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
+import jakarta.servlet.http.PushBuilder;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.security.AccessControlException;
@@ -36,26 +55,6 @@
import org.apache.catalina.core.RequestFacadeHelper;
import org.apache.catalina.security.SecurityUtil;
-import com.sun.enterprise.security.web.integration.WebPrincipal;
-
-import jakarta.servlet.AsyncContext;
-import jakarta.servlet.DispatcherType;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletConnection;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletMapping;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpUpgradeHandler;
-import jakarta.servlet.http.Part;
-import jakarta.servlet.http.PushBuilder;
-
/**
* Facade class that wraps a Coyote request object.
@@ -77,6 +76,7 @@
private final class GetAttributePrivilegedAction
implements PrivilegedAction<Enumeration<String>> {
+ @Override
public Enumeration<String> run() {
return request.getAttributeNames();
}
@@ -86,6 +86,7 @@
private final class GetParameterMapPrivilegedAction
implements PrivilegedAction<Map<String, String[]>> {
+ @Override
public Map<String, String[]> run() {
return request.getParameterMap();
}
@@ -95,12 +96,13 @@
private final class GetRequestDispatcherPrivilegedAction
implements PrivilegedAction<RequestDispatcher> {
- private String path;
+ private final String path;
public GetRequestDispatcherPrivilegedAction(String path){
this.path = path;
}
+ @Override
public RequestDispatcher run() {
return request.getRequestDispatcher(path);
}
@@ -116,6 +118,7 @@
this.name = name;
}
+ @Override
public String run() {
return request.getParameter(name);
}
@@ -125,6 +128,7 @@
private final class GetParameterNamesPrivilegedAction
implements PrivilegedAction<Enumeration<String>> {
+ @Override
public Enumeration<String> run() {
return request.getParameterNames();
}
@@ -140,6 +144,7 @@
this.name = name;
}
+ @Override
public String[] run() {
return request.getParameterValues(name);
}
@@ -149,6 +154,7 @@
private final class GetCookiesPrivilegedAction
implements PrivilegedAction<Cookie[]> {
+ @Override
public Cookie[] run() {
return request.getCookies();
}
@@ -158,6 +164,7 @@
private final class GetCharacterEncodingPrivilegedAction
implements PrivilegedAction<String> {
+ @Override
public String run() {
return request.getCharacterEncoding();
}
@@ -167,12 +174,13 @@
private final class GetHeadersPrivilegedAction
implements PrivilegedAction<Enumeration<String>> {
- private String name;
+ private final String name;
public GetHeadersPrivilegedAction(String name){
this.name = name;
}
+ @Override
public Enumeration<String> run() {
return request.getHeaders(name);
}
@@ -182,6 +190,7 @@
private final class GetHeaderNamesPrivilegedAction
implements PrivilegedAction<Enumeration<String>> {
+ @Override
public Enumeration<String> run() {
return request.getHeaderNames();
}
@@ -191,6 +200,7 @@
private final class GetLocalePrivilegedAction
implements PrivilegedAction<Locale> {
+ @Override
public Locale run() {
return request.getLocale();
}
@@ -200,6 +210,7 @@
private final class GetLocalesPrivilegedAction
implements PrivilegedAction<Enumeration<Locale>> {
+ @Override
public Enumeration<Locale> run() {
return request.getLocales();
}
@@ -208,12 +219,13 @@
private final class GetSessionPrivilegedAction
implements PrivilegedAction<HttpSession> {
- private boolean create;
+ private final boolean create;
public GetSessionPrivilegedAction(boolean create){
this.create = create;
}
+ @Override
public HttpSession run() {
return request.getSession(create);
}
@@ -222,6 +234,7 @@
private final class ChangeSessionIdPrivilegedAction
implements PrivilegedAction<String> {
+ @Override
public String run() {
return request.changeSessionId();
}
@@ -293,6 +306,7 @@
/**
* Prevent cloning the facade.
*/
+ @Override
protected Object clone()
throws CloneNotSupportedException {
throw new CloneNotSupportedException();
@@ -409,6 +423,7 @@
return request.getInputStream();
}
+ @Override
public HttpServletMapping getHttpServletMapping() {
if (request == null) {
@@ -418,6 +433,7 @@
return request.getHttpServletMapping();
}
+ @Override
public String getParameter(String name) {
if (request == null) {
@@ -464,7 +480,7 @@
ret = AccessController.doPrivileged(
new GetParameterValuePrivilegedAction(name));
if (ret != null) {
- ret = (String[]) ret.clone();
+ ret = ret.clone();
}
} else {
ret = request.getParameterValues(name);
@@ -670,7 +686,7 @@
ret = AccessController.doPrivileged(
new GetCookiesPrivilegedAction());
if (ret != null) {
- ret = (Cookie[]) ret.clone();
+ ret = ret.clone();
}
} else {
ret = request.getCookies();
