This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/expose-wrapped-object in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
commit eb1841f0e1ccffa8411468ae6a92c94912fff609 Author: Konrad Windszus <[email protected]> AuthorDate: Tue Feb 3 12:08:19 2026 +0100 SLING-13090 Expose wrapped object from Jakarta/Javax wrappers --- .../apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java | 9 +++++++++ .../apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java | 9 +++++++++ .../apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java | 9 +++++++++ .../apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java | 9 +++++++++ .../apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java | 8 ++++++++ .../apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java | 9 +++++++++ .../apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java | 9 +++++++++ .../apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java | 9 +++++++++ src/main/java/org/apache/sling/api/wrappers/package-info.java | 2 +- 9 files changed, 72 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java index 6587970..569f1a3 100644 --- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java +++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java @@ -84,6 +84,15 @@ public class JakartaToJavaxFilterWrapper implements Filter { this.filter.destroy(); } + /** + * Get the wrapped {@link jakarta.servlet.Filter} object. + * @return The wrapped filter + * @since 2.11.0 + */ + public jakarta.servlet.Filter getWrappedObject() { + return this.filter; + } + public static class FilterChainWrapper implements jakarta.servlet.FilterChain { private final FilterChain filterChain; diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java index 50b163e..349c3a5 100644 --- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java +++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java @@ -202,4 +202,13 @@ public class JakartaToJavaxRequestWrapper extends HttpServletRequestWrapper impl public <AdapterType> @Nullable AdapterType adaptTo(@NotNull final Class<AdapterType> type) { return this.wrappedRequest.adaptTo(type); } + + /** + * Get the wrapped {@link SlingJakartaHttpServletRequest} object. + * @return The wrapped request + * @since 2.11.0 + */ + public SlingJakartaHttpServletRequest getWrappedObject() { + return this.wrappedRequest; + } } diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java index 310897a..f488c5a 100644 --- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java +++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java @@ -86,4 +86,13 @@ public class JakartaToJavaxResponseWrapper extends HttpServletResponseWrapper im public <AdapterType> @Nullable AdapterType adaptTo(@NotNull Class<AdapterType> type) { return this.wrappedResponse.adaptTo(type); } + + /** + * Get the wrapped {@link SlingJakartaHttpServletResponse} object. + * @return The wrapped response + * @since 2.11.0 + */ + public SlingJakartaHttpServletResponse getWrappedObject() { + return this.wrappedResponse; + } } diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java index 7bb3c89..1e03ae4 100644 --- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java +++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java @@ -101,6 +101,15 @@ public class JakartaToJavaxServletWrapper implements Servlet { return servlet.getServletInfo(); } + /** + * Get the wrapped {@link jakarta.servlet.Servlet} object. + * @return The wrapped servlet + * @since 2.11.0 + */ + public jakarta.servlet.Servlet getWrappedObject() { + return this.servlet; + } + public static class JakartaToJavaxOptingServletWrapper extends JakartaToJavaxServletWrapper implements OptingServlet { diff --git a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java index 3ada19e..be84514 100644 --- a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java +++ b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java @@ -83,6 +83,14 @@ public class JavaxToJakartaFilterWrapper implements Filter { this.filter.destroy(); } + /** + * Get the wrapped {@link javax.servlet.Filter} object. + * @return The wrapped filter + */ + public javax.servlet.Filter getWrappedObject() { + return this.filter; + } + public static class FilterChainWrapper implements javax.servlet.FilterChain { private final FilterChain filterChain; diff --git a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java index 8d3c887..9ebcc43 100644 --- a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java +++ b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java @@ -200,4 +200,13 @@ public class JavaxToJakartaRequestWrapper extends HttpServletRequestWrapper impl public <AdapterType> @Nullable AdapterType adaptTo(@NotNull final Class<AdapterType> type) { return this.wrappedRequest.adaptTo(type); } + + /** + * Get the wrapped {@link SlingHttpServletRequest} object + * @return The wrapped request + * @since 2.11.0 + */ + public SlingHttpServletRequest getWrappedObject() { + return this.wrappedRequest; + } } diff --git a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java index b3af202..0d80fe3 100644 --- a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java +++ b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java @@ -87,4 +87,13 @@ public class JavaxToJakartaResponseWrapper extends HttpServletResponseWrapper public <AdapterType> @Nullable AdapterType adaptTo(@NotNull Class<AdapterType> type) { return this.wrappedResponse.adaptTo(type); } + + /** + * Get the wrapped {@link SlingHttpServletResponse} object + * @return The wrapped response + * @since 2.11.0 + */ + public SlingHttpServletResponse getWrappedObject() { + return this.wrappedResponse; + } } diff --git a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java index 2739aae..00f5467 100644 --- a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java +++ b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java @@ -100,6 +100,15 @@ public class JavaxToJakartaServletWrapper implements Servlet { return servlet.getServletInfo(); } + /** + * Get the wrapped {@link javax.servlet.Servlet} object. + * @return The wrapped servlet + * @since 2.11.0 + */ + public javax.servlet.Servlet getWrappedObject() { + return this.servlet; + } + public static class JavaxToJakartaOptingServletWrapper extends JavaxToJakartaServletWrapper implements JakartaOptingServlet { diff --git a/src/main/java/org/apache/sling/api/wrappers/package-info.java b/src/main/java/org/apache/sling/api/wrappers/package-info.java index 65cd9d1..80bf3e6 100644 --- a/src/main/java/org/apache/sling/api/wrappers/package-info.java +++ b/src/main/java/org/apache/sling/api/wrappers/package-info.java @@ -17,7 +17,7 @@ * under the License. */ -@Version("2.10.0") +@Version("2.11.0") package org.apache.sling.api.wrappers; import org.osgi.annotation.versioning.Version;
