(felix-dev) branch master updated: FELIX-6762 : Support Jakarta Servlet 6.1

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new fffe1fab1f FELIX-6762 : Support Jakarta Servlet 6.1
fffe1fab1f is described below

commit fffe1fab1f7da2d63a7d1f80cf98c7e59716b71e
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Apr 3 07:20:46 2025 +0200

    FELIX-6762 : Support Jakarta Servlet 6.1
---
 .../felix/http/jakartawrappers/ServletRequestWrapper.java   | 13 +++++++++++++
 .../felix/http/javaxwrappers/ServletRequestWrapper.java     | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git 
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
 
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
index 2882c231c1..799108a144 100644
--- 
a/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
+++ 
b/http/wrappers/src/main/java/org/apache/felix/http/jakartawrappers/ServletRequestWrapper.java
@@ -40,6 +40,8 @@ import static 
jakarta.servlet.RequestDispatcher.INCLUDE_PATH_INFO;
 import static jakarta.servlet.RequestDispatcher.INCLUDE_QUERY_STRING;
 import static jakarta.servlet.RequestDispatcher.INCLUDE_REQUEST_URI;
 import static jakarta.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH;
+import static jakarta.servlet.RequestDispatcher.ERROR_QUERY_STRING;
+import static jakarta.servlet.RequestDispatcher.ERROR_METHOD;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -67,6 +69,9 @@ import jakarta.servlet.ServletResponse;
  */
 public class ServletRequestWrapper implements ServletRequest {
 
+    private static final String JAVAX_ERROR_METHOD = 
ERROR_METHOD.replace("jakarta", "javax");
+    private static final String JAVAX_ERROR_QUERY_STRING = 
ERROR_QUERY_STRING.replace("jakarta", "javax");
+
     private final javax.servlet.ServletRequest request;
 
     /**
@@ -166,6 +171,14 @@ public class ServletRequestWrapper implements 
ServletRequest {
         } else if ( ERROR_STATUS_CODE.equals(name) ) {
             return javax.servlet.RequestDispatcher.ERROR_STATUS_CODE;
 
+        // new in 6.1
+        } else if ( ERROR_METHOD.equals(name) ) {
+            return JAVAX_ERROR_METHOD;
+
+        // new in 6.1
+        } else if ( ERROR_QUERY_STRING.equals(name) ) {
+            return JAVAX_ERROR_QUERY_STRING;
+
         } else if ( ASYNC_CONTEXT_PATH.equals(name) ) {
             return javax.servlet.AsyncContext.ASYNC_CONTEXT_PATH;
 
diff --git 
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
 
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
index 7214ecf4fe..32e4f0ffe0 100644
--- 
a/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
+++ 
b/http/wrappers/src/main/java/org/apache/felix/http/javaxwrappers/ServletRequestWrapper.java
@@ -40,6 +40,8 @@ import static 
jakarta.servlet.RequestDispatcher.INCLUDE_PATH_INFO;
 import static jakarta.servlet.RequestDispatcher.INCLUDE_QUERY_STRING;
 import static jakarta.servlet.RequestDispatcher.INCLUDE_REQUEST_URI;
 import static jakarta.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH;
+import static jakarta.servlet.RequestDispatcher.ERROR_QUERY_STRING;
+import static jakarta.servlet.RequestDispatcher.ERROR_METHOD;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -64,6 +66,9 @@ import jakarta.servlet.http.HttpServletRequest;
  */
 public class ServletRequestWrapper implements javax.servlet.ServletRequest {
 
+    private static final String JAVAX_ERROR_METHOD = 
ERROR_METHOD.replace("jakarta", "javax");
+    private static final String JAVAX_ERROR_QUERY_STRING = 
ERROR_QUERY_STRING.replace("jakarta", "javax");
+
     private final ServletRequest request;
 
     /**
@@ -162,6 +167,14 @@ public class ServletRequestWrapper implements 
javax.servlet.ServletRequest {
         } else if ( 
javax.servlet.RequestDispatcher.ERROR_STATUS_CODE.equals(name) ) {
             return ERROR_STATUS_CODE;
 
+        // new in 6.1
+        } else if ( JAVAX_ERROR_METHOD.equals(name) ) {
+            return ERROR_METHOD;
+
+        // new in 6.1
+        } else if ( JAVAX_ERROR_QUERY_STRING.equals(name) ) {
+            return ERROR_QUERY_STRING;
+
         } else if ( javax.servlet.AsyncContext.ASYNC_CONTEXT_PATH.equals(name) 
) {
             return ASYNC_CONTEXT_PATH;