You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2025/01/05 10:39:29 UTC
(sling-org-apache-sling-engine) branch jakarta-2 updated: Use wrappers from API
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch jakarta-2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
The following commit(s) were added to refs/heads/jakarta-2 by this push:
new b34298e Use wrappers from API
b34298e is described below
commit b34298e151274ade217f5e9b231e93d6319cad7c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 5 11:39:24 2025 +0100
Use wrappers from API
---
.../sling/engine/impl/SlingJakartaHttpServletRequestImpl.java | 4 ++--
.../org/apache/sling/engine/impl/filter/ServletFilterManager.java | 8 ++++----
.../apache/sling/engine/impl/helper/RequestListenerManager.java | 6 ++++--
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java b/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java
index cc1bbe2..f4a0a77 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java
@@ -41,7 +41,6 @@ import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.Part;
-import org.apache.felix.http.javaxwrappers.ServletWrapper;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
@@ -51,6 +50,7 @@ import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.wrappers.JakartaToJavaxServletWrapper;
import org.apache.sling.engine.impl.helper.NullResourceBundle;
import org.apache.sling.engine.impl.parameters.ParameterSupport;
import org.apache.sling.engine.impl.request.ContentData;
@@ -405,7 +405,7 @@ public class SlingJakartaHttpServletRequestImpl extends HttpServletRequestWrappe
if (SlingConstants.ATTR_REQUEST_CONTENT.equals(name)) {
return dispatchingInfo.getRequestContent();
} else if (SlingConstants.ATTR_REQUEST_SERVLET.equals(name)) {
- return new ServletWrapper(dispatchingInfo.getRequestServlet());
+ return JakartaToJavaxServletWrapper.toJavaxServlet(dispatchingInfo.getRequestServlet());
} else if (SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET.equals(name)) {
return dispatchingInfo.getRequestServlet();
} else if (SlingConstants.ATTR_REQUEST_PATH_INFO.equals(name)) {
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java b/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
index b93a2f5..df8d225 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/ServletFilterManager.java
@@ -27,7 +27,7 @@ import jakarta.servlet.Filter;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
-import org.apache.felix.http.jakartawrappers.FilterWrapper;
+import org.apache.sling.api.wrappers.JavaxToJakartaFilterWrapper;
import org.apache.sling.engine.EngineConstants;
import org.apache.sling.engine.impl.SlingHttpContext;
import org.apache.sling.engine.impl.helper.SlingFilterConfig;
@@ -161,7 +161,7 @@ public class ServletFilterManager {
final ServiceReference<javax.servlet.Filter> reference, final javax.servlet.Filter filter) {
@SuppressWarnings({"rawtypes", "unchecked"})
final ServiceReference<Filter> ref = (ServiceReference<Filter>) (ServiceReference) reference;
- final Filter s = new FilterWrapper(filter);
+ final Filter s = JavaxToJakartaFilterWrapper.toJakartaFilter(filter);
initFilter(ref, s);
}
@@ -169,7 +169,7 @@ public class ServletFilterManager {
final ServiceReference<javax.servlet.Filter> reference, final javax.servlet.Filter service) {
@SuppressWarnings({"rawtypes", "unchecked"})
final ServiceReference<Filter> ref = (ServiceReference<Filter>) (ServiceReference) reference;
- final Filter s = new FilterWrapper(service);
+ final Filter s = JavaxToJakartaFilterWrapper.toJakartaFilter(service);
// only if the filter name has changed, we need to do a service re-registration
final String newFilterName = SlingFilterConfig.getName(ref);
if (newFilterName.equals(getUsedFilterName(ref))) {
@@ -185,7 +185,7 @@ public class ServletFilterManager {
final ServiceReference<javax.servlet.Filter> reference, final javax.servlet.Filter service) {
@SuppressWarnings({"rawtypes", "unchecked"})
final ServiceReference<Filter> ref = (ServiceReference<Filter>) (ServiceReference) reference;
- final Filter s = new FilterWrapper(service);
+ final Filter s = JavaxToJakartaFilterWrapper.toJakartaFilter(service);
destroyFilter(ref, s);
}
diff --git a/src/main/java/org/apache/sling/engine/impl/helper/RequestListenerManager.java b/src/main/java/org/apache/sling/engine/impl/helper/RequestListenerManager.java
index aab8168..357fe2e 100644
--- a/src/main/java/org/apache/sling/engine/impl/helper/RequestListenerManager.java
+++ b/src/main/java/org/apache/sling/engine/impl/helper/RequestListenerManager.java
@@ -22,12 +22,12 @@ import java.util.List;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpServletRequest;
-import org.apache.felix.http.javaxwrappers.HttpServletRequestWrapper;
import org.apache.felix.http.javaxwrappers.ServletContextWrapper;
import org.apache.sling.api.request.SlingJakartaRequestEvent;
import org.apache.sling.api.request.SlingJakartaRequestListener;
import org.apache.sling.api.request.SlingRequestEvent;
import org.apache.sling.api.request.SlingRequestListener;
+import org.apache.sling.api.wrappers.JakartaToJavaxRequestWrapper;
import org.apache.sling.engine.impl.SlingHttpContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -86,7 +86,9 @@ public class RequestListenerManager {
? SlingRequestEvent.EventType.EVENT_INIT
: SlingRequestEvent.EventType.EVENT_DESTROY;
final SlingRequestEvent event = new SlingRequestEvent(
- new ServletContextWrapper(this.servletContext), new HttpServletRequestWrapper(request), eventType);
+ new ServletContextWrapper(this.servletContext),
+ JakartaToJavaxRequestWrapper.toJavaxRequest(request),
+ eventType);
for (final SlingRequestListener service : localDep) {
try {
service.onEvent(event);