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/03 13:47:43 UTC
(sling-org-apache-sling-engine) branch jakarta-2 updated (ccf4be6 -> afb58c1)
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a change to branch jakarta-2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
from ccf4be6 Update dependency to latest API with jakarta support
new 4228560 Use jakarta api, add support for filters
new afb58c1 Adjust tests
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 16 ++-
.../org/apache/sling/engine/EngineConstants.java | 2 +
.../apache/sling/engine/SlingRequestProcessor.java | 39 +++++--
.../sling/engine/impl/DefaultErrorHandler.java | 85 +++++++++++++--
.../apache/sling/engine/impl/SlingHttpContext.java | 11 +-
...ava => SlingJakartaHttpServletRequestImpl.java} | 48 +++++----
...va => SlingJakartaHttpServletResponseImpl.java} | 52 +++-------
.../apache/sling/engine/impl/SlingMainServlet.java | 25 +++--
.../engine/impl/SlingRequestProcessorImpl.java | 106 ++++++++++++-------
.../impl/adapter/SlingServletRequestAdapter.java | 37 +++----
.../impl/adapter/SlingServletResponseAdapter.java | 39 ++-----
.../engine/impl/debug/RequestInfoProviderImpl.java | 8 +-
.../debug/RequestProgressTrackerLogFilter.java | 21 ++--
.../impl/filter/AbstractSlingFilterChain.java | 31 +++---
.../sling/engine/impl/filter/ErrorFilterChain.java | 24 +++--
.../sling/engine/impl/filter/FilterHandle.java | 7 +-
.../sling/engine/impl/filter/FilterPredicate.java | 9 +-
.../impl/filter/RequestSlingFilterChain.java | 11 +-
.../engine/impl/filter/ServletFilterManager.java | 50 +++++++--
.../impl/filter/SlingComponentFilterChain.java | 11 +-
.../engine/impl/filter/SlingFilterChainHelper.java | 4 +-
.../impl/helper/ExternalServletContextWrapper.java | 109 +++++++++++---------
.../engine/impl/helper/RequestListenerManager.java | 38 +++++--
.../engine/impl/helper/SlingFilterConfig.java | 7 +-
.../engine/impl/helper/SlingServletContext.java | 114 ++++++++++++---------
.../sling/engine/impl/log/CustomLogFormat.java | 3 +-
.../sling/engine/impl/log/RequestLoggerFilter.java | 23 ++---
.../engine/impl/log/RequestLoggerPreprocessor.java | 13 ++-
.../engine/impl/log/RequestLoggerRequest.java | 9 +-
.../engine/impl/log/RequestLoggerResponse.java | 19 ++--
.../impl/parameters/MultipartRequestParameter.java | 12 +--
.../sling/engine/impl/parameters/ParameterMap.java | 3 +-
.../engine/impl/parameters/ParameterSupport.java | 38 +++----
.../ParameterSupportHttpServletRequestWrapper.java | 8 +-
.../RequestParameterSupportConfigurer.java | 23 ++---
.../impl/parameters/RequestPartsIterator.java | 28 ++---
.../sling/engine/impl/parameters/SlingPart.java | 10 +-
.../sling/engine/impl/request/ContentData.java | 3 +-
.../sling/engine/impl/request/DispatchingInfo.java | 5 +-
.../sling/engine/impl/request/RequestData.java | 103 +++++++++----------
.../impl/request/SlingRequestDispatcher.java | 23 ++---
.../java/org/apache/sling/engine/package-info.java | 2 +-
.../impl/SlingHttpServletRequestImplTest.java | 29 +++---
.../impl/SlingHttpServletResponseImplTest.java | 51 +++++----
.../impl/debug/RequestInfoProviderImplTest.java | 6 +-
.../engine/impl/filter/AbstractFilterTest.java | 19 ++--
.../impl/filter/AbstractSlingFilterChainTest.java | 29 +++---
.../engine/impl/filter/ErrorFilterChainTest.java | 25 +++--
.../impl/filter/ServletFilterManagerTest.java | 17 ++-
.../impl/filter/SlingFilterChainHelperTest.java | 3 +-
.../helper/ExternalServletContextWrapperTest.java | 33 +++---
.../impl/helper/SlingServletContextTest.java | 5 +-
.../engine/impl/log/ClientAbortExceptionTest.java | 7 +-
.../engine/impl/request/InitResourceTest.java | 5 +-
.../sling/engine/impl/request/RequestDataTest.java | 31 +++---
.../impl/request/SlingRequestDispatcherTest.java | 29 +++---
56 files changed, 820 insertions(+), 698 deletions(-)
rename src/main/java/org/apache/sling/engine/impl/{SlingHttpServletRequestImpl.java => SlingJakartaHttpServletRequestImpl.java} (90%)
rename src/main/java/org/apache/sling/engine/impl/{SlingHttpServletResponseImpl.java => SlingJakartaHttpServletResponseImpl.java} (95%)
(sling-org-apache-sling-engine) 02/02: Adjust tests
Posted by cz...@apache.org.
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
commit afb58c104e3b8f456506daa9bf79546caf8633d5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jan 3 14:47:36 2025 +0100
Adjust tests
---
pom.xml | 12 ++------
.../apache/sling/engine/SlingRequestProcessor.java | 1 +
.../impl/SlingJakartaHttpServletRequestImpl.java | 2 +-
.../engine/impl/filter/ServletFilterManager.java | 9 +++---
.../sling/engine/impl/log/CustomLogFormat.java | 3 +-
.../sling/engine/impl/log/RequestLoggerFilter.java | 23 ++++++++-------
.../engine/impl/log/RequestLoggerPreprocessor.java | 13 ++++-----
.../engine/impl/log/RequestLoggerRequest.java | 9 +++---
.../engine/impl/log/RequestLoggerResponse.java | 19 ++++---------
.../impl/parameters/MultipartRequestParameter.java | 12 ++++----
.../sling/engine/impl/parameters/ParameterMap.java | 3 +-
.../engine/impl/parameters/ParameterSupport.java | 33 ++++++++++++----------
.../impl/parameters/RequestPartsIterator.java | 28 ++++++++----------
.../sling/engine/impl/parameters/SlingPart.java | 10 +++++--
.../java/org/apache/sling/engine/package-info.java | 2 +-
.../impl/SlingHttpServletRequestImplTest.java | 7 ++---
.../impl/SlingHttpServletResponseImplTest.java | 31 +++++++++-----------
.../impl/debug/RequestInfoProviderImplTest.java | 6 ++--
.../engine/impl/filter/AbstractFilterTest.java | 19 ++++++-------
.../impl/filter/AbstractSlingFilterChainTest.java | 25 ++++++++--------
.../engine/impl/filter/ErrorFilterChainTest.java | 25 ++++++++--------
.../impl/filter/ServletFilterManagerTest.java | 17 ++++++-----
.../impl/filter/SlingFilterChainHelperTest.java | 3 +-
.../helper/ExternalServletContextWrapperTest.java | 21 +++++++-------
.../impl/helper/SlingServletContextTest.java | 5 ++--
.../engine/impl/log/ClientAbortExceptionTest.java | 7 ++---
.../engine/impl/request/InitResourceTest.java | 5 ++--
.../sling/engine/impl/request/RequestDataTest.java | 23 ++++++++-------
.../impl/request/SlingRequestDispatcherTest.java | 24 ++++++++--------
29 files changed, 184 insertions(+), 213 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2a08a9c..5aa6482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,12 +85,6 @@
<version>1.1.8</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
- <version>1.1.0</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.servlet</artifactId>
@@ -133,9 +127,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.5</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta-servlet5</artifactId>
+ <version>2.0.0-M2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java b/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
index f6ea5d4..aa87c21 100644
--- a/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
+++ b/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
@@ -59,6 +59,7 @@ public interface SlingRequestProcessor {
* <code>null</code>
* @throws IOException if an error occurrs reading from the request input or
* writing the response
+ * @since 2.7.0
*/
void processRequest(HttpServletRequest request, HttpServletResponse response, ResourceResolver resourceResolver)
throws IOException;
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 8e0901d..cc1bbe2 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java
@@ -57,7 +57,7 @@ import org.apache.sling.engine.impl.request.ContentData;
import org.apache.sling.engine.impl.request.DispatchingInfo;
import org.apache.sling.engine.impl.request.RequestData;
import org.apache.sling.engine.impl.request.SlingRequestDispatcher;
-import org.osgi.service.http.context.ServletContextHelper;
+import org.osgi.service.servlet.context.ServletContextHelper;
import org.osgi.service.useradmin.Authorization;
import static jakarta.servlet.RequestDispatcher.FORWARD_CONTEXT_PATH;
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 75967ec..b93a2f5 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
@@ -153,18 +153,19 @@ public class ServletFilterManager {
@Reference(
service = javax.servlet.Filter.class,
- updated = "updatedFilter",
+ updated = "updatedJavaxFilter",
policy = ReferencePolicy.DYNAMIC,
cardinality = ReferenceCardinality.MULTIPLE,
target = "(|(" + EngineConstants.SLING_FILTER_SCOPE + "=*)(" + EngineConstants.FILTER_SCOPE + "=*))")
- public void bindFilter(final ServiceReference<javax.servlet.Filter> reference, final javax.servlet.Filter filter) {
+ public void bindJavaxFilter(
+ 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);
initFilter(ref, s);
}
- public void updatedFilter(
+ public void updatedJavaxFilter(
final ServiceReference<javax.servlet.Filter> reference, final javax.servlet.Filter service) {
@SuppressWarnings({"rawtypes", "unchecked"})
final ServiceReference<Filter> ref = (ServiceReference<Filter>) (ServiceReference) reference;
@@ -180,7 +181,7 @@ public class ServletFilterManager {
}
}
- public void unbindFilter(
+ public void unbindJavaxFilter(
final ServiceReference<javax.servlet.Filter> reference, final javax.servlet.Filter service) {
@SuppressWarnings({"rawtypes", "unchecked"})
final ServiceReference<Filter> ref = (ServiceReference<Filter>) (ServiceReference) reference;
diff --git a/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java b/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java
index a3634b1..8d353b5 100644
--- a/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java
+++ b/src/main/java/org/apache/sling/engine/impl/log/CustomLogFormat.java
@@ -18,8 +18,6 @@
*/
package org.apache.sling.engine.impl.log;
-import javax.servlet.http.Cookie;
-
import java.text.CharacterIterator;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -31,6 +29,7 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
+import jakarta.servlet.http.Cookie;
import org.apache.sling.engine.impl.request.RequestData;
/**
diff --git a/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerFilter.java b/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerFilter.java
index bb2b2e8..aba341a 100644
--- a/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerFilter.java
+++ b/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerFilter.java
@@ -18,17 +18,16 @@
*/
package org.apache.sling.engine.impl.log;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.engine.impl.SlingHttpContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,9 +36,9 @@ import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.component.propertytypes.ServiceDescription;
import org.osgi.service.component.propertytypes.ServiceRanking;
import org.osgi.service.component.propertytypes.ServiceVendor;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardContextSelect;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardFilterPattern;
+import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardContextSelect;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardFilterPattern;
import org.slf4j.LoggerFactory;
@Component(service = Filter.class)
diff --git a/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerPreprocessor.java b/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerPreprocessor.java
index 243a322..602faf2 100644
--- a/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerPreprocessor.java
+++ b/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerPreprocessor.java
@@ -18,17 +18,16 @@
*/
package org.apache.sling.engine.impl.log;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
import java.io.IOException;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.propertytypes.ServiceRanking;
-import org.osgi.service.http.whiteboard.Preprocessor;
+import org.osgi.service.servlet.whiteboard.Preprocessor;
/**
* Record the starting time of the request and make it available to the request logger
diff --git a/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerRequest.java b/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerRequest.java
index 743e017..37fe514 100644
--- a/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerRequest.java
+++ b/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerRequest.java
@@ -18,11 +18,10 @@
*/
package org.apache.sling.engine.impl.log;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-import org.osgi.service.http.context.ServletContextHelper;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import org.osgi.service.servlet.context.ServletContextHelper;
class RequestLoggerRequest extends HttpServletRequestWrapper {
diff --git a/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java b/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java
index b769c9f..6ca610f 100644
--- a/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java
+++ b/src/main/java/org/apache/sling/engine/impl/log/RequestLoggerResponse.java
@@ -18,13 +18,6 @@
*/
package org.apache.sling.engine.impl.log;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.WriteListener;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
@@ -37,6 +30,12 @@ import java.util.Locale;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import org.apache.sling.engine.impl.helper.ClientAbortException;
class RequestLoggerResponse extends HttpServletResponseWrapper {
@@ -151,12 +150,6 @@ class RequestLoggerResponse extends HttpServletResponseWrapper {
this.status = status;
}
- @Override
- public void setStatus(int status, String message) {
- super.setStatus(status, message);
- this.status = status;
- }
-
@Override
public void setStatus(int status) {
super.setStatus(status);
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/MultipartRequestParameter.java b/src/main/java/org/apache/sling/engine/impl/parameters/MultipartRequestParameter.java
index 6ac5594..2177977 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/MultipartRequestParameter.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/MultipartRequestParameter.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload2.core.DiskFileItem;
/**
* The <code>MultipartRequestParameter</code> represents a request parameter
@@ -34,22 +34,22 @@ import org.apache.commons.fileupload.FileItem;
*/
public class MultipartRequestParameter extends AbstractRequestParameter {
- private final FileItem delegatee;
+ private final DiskFileItem delegatee;
private String encodedFileName;
private String cachedValue;
- public MultipartRequestParameter(FileItem delegatee) {
+ public MultipartRequestParameter(DiskFileItem delegatee) {
super(delegatee.getFieldName(), null);
this.delegatee = delegatee;
}
- void dispose() {
+ void dispose() throws IOException {
this.delegatee.delete();
}
- FileItem getFileItem() {
+ DiskFileItem getFileItem() {
return this.delegatee;
}
@@ -121,7 +121,7 @@ public class MultipartRequestParameter extends AbstractRequestParameter {
}
public String getString(String enc) throws UnsupportedEncodingException {
- return this.delegatee.getString(enc);
+ return new String(this.get(), enc);
}
public boolean isFormField() {
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
index 4863a8b..7f886c0 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterMap.java
@@ -18,8 +18,6 @@
*/
package org.apache.sling.engine.impl.parameters;
-import javax.servlet.http.Part;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -27,6 +25,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import jakarta.servlet.http.Part;
import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestParameterMap;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
index 6bcaa68..05e3daa 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
@@ -31,14 +31,17 @@ import java.util.Map;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.RequestContext;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.fileupload.servlet.ServletRequestContext;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.fileupload2.core.DiskFileItem;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.core.RequestContext;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletFileUpload;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletRequestContext;
import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestParameterMap;
+import org.apache.sling.api.resource.ResourceResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -300,7 +303,8 @@ public class ParameterSupport {
}
// Multipart POST
- if (ServletFileUpload.isMultipartContent(new ServletRequestContext(this.getServletRequest()))) {
+ if (JakartaServletFileUpload.isMultipartContent(
+ new JakartaServletRequestContext(this.getServletRequest()))) {
if (isStreamed(parameters, this.getServletRequest())) {
// special case, the request is Multipart and streamed processing has been requested
try {
@@ -313,9 +317,6 @@ public class ParameterSupport {
} catch (IOException e) {
this.log.error(
"getRequestParameterMapInternal: Error parsing multipart streamed request", e);
- } catch (FileUploadException e) {
- this.log.error(
- "getRequestParameterMapInternal: Error parsing multipart streamed request", e);
}
// The request data has been passed to the RequestPartsIterator, hence from a RequestParameter
// pov its been used, and must not be used again.
@@ -395,13 +396,15 @@ public class ParameterSupport {
private void parseMultiPartPost(ParameterMap parameters) {
// Create a new file upload handler
- ServletFileUpload upload = new ServletFileUpload();
+ JakartaServletDiskFileUpload upload = new JakartaServletDiskFileUpload();
upload.setSizeMax(ParameterSupport.maxRequestSize);
upload.setFileSizeMax(ParameterSupport.maxFileSize);
- upload.setFileItemFactory(
- new DiskFileItemFactory(ParameterSupport.fileSizeThreshold, ParameterSupport.location));
+ upload.setFileItemFactory(DiskFileItemFactory.builder()
+ .setBufferSize(ParameterSupport.fileSizeThreshold)
+ .setPath(ParameterSupport.location.toPath())
+ .get());
upload.setFileCountMax(ParameterSupport.maxFileCount);
- RequestContext rc = new ServletRequestContext(this.getServletRequest()) {
+ RequestContext rc = new JakartaServletRequestContext(this.getServletRequest()) {
@Override
public String getCharacterEncoding() {
String enc = super.getCharacterEncoding();
@@ -419,7 +422,7 @@ public class ParameterSupport {
if (items != null && items.size() > 0) {
for (Iterator<?> ii = items.iterator(); ii.hasNext(); ) {
- FileItem fileItem = (FileItem) ii.next();
+ DiskFileItem fileItem = (DiskFileItem) ii.next();
RequestParameter pp = new MultipartRequestParameter(fileItem);
parameters.addParameter(pp, false);
}
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/RequestPartsIterator.java b/src/main/java/org/apache/sling/engine/impl/parameters/RequestPartsIterator.java
index 88d9390..99d27e5 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/RequestPartsIterator.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/RequestPartsIterator.java
@@ -18,9 +18,6 @@
*/
package org.apache.sling.engine.impl.parameters;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -29,10 +26,11 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.fileupload.FileItemIterator;
-import org.apache.commons.fileupload.FileItemStream;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
+import org.apache.commons.fileupload2.core.FileItemInput;
+import org.apache.commons.fileupload2.core.FileItemInputIterator;
+import org.apache.commons.fileupload2.jakarta.servlet5.JakartaServletDiskFileUpload;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +41,7 @@ public class RequestPartsIterator implements Iterator<Part> {
private static final Logger LOG = LoggerFactory.getLogger(RequestPartsIterator.class);
/** The CommonsFile Upload streaming API iterator */
- private final FileItemIterator itemIterator;
+ private final FileItemInputIterator itemIterator;
/**
* Create and initialse the iterator using the request. The request must be fresh. Headers can have been read but the stream
@@ -52,8 +50,8 @@ public class RequestPartsIterator implements Iterator<Part> {
* @throws IOException when there is a problem reading the request.
* @throws FileUploadException when there is a problem parsing the request.
*/
- public RequestPartsIterator(HttpServletRequest servletRequest) throws IOException, FileUploadException {
- ServletFileUpload upload = new ServletFileUpload();
+ public RequestPartsIterator(HttpServletRequest servletRequest) throws IOException {
+ JakartaServletDiskFileUpload upload = new JakartaServletDiskFileUpload();
upload.setFileCountMax(50);
itemIterator = upload.getItemIterator(servletRequest);
}
@@ -62,8 +60,6 @@ public class RequestPartsIterator implements Iterator<Part> {
public boolean hasNext() {
try {
return itemIterator.hasNext();
- } catch (FileUploadException e) {
- LOG.error("hasNext Item failed cause:" + e.getMessage(), e);
} catch (IOException e) {
LOG.error("hasNext Item failed cause:" + e.getMessage(), e);
}
@@ -76,8 +72,6 @@ public class RequestPartsIterator implements Iterator<Part> {
return new StreamedRequestPart(itemIterator.next());
} catch (IOException e) {
LOG.error("next Item failed cause:" + e.getMessage(), e);
- } catch (FileUploadException e) {
- LOG.error("next Item failed cause:" + e.getMessage(), e);
}
return null;
}
@@ -91,12 +85,12 @@ public class RequestPartsIterator implements Iterator<Part> {
* Internal implementation of the Part API from Servlet 3 wrapping the Commons File Upload FIleItemStream object.
*/
private static class StreamedRequestPart implements Part {
- private final FileItemStream fileItem;
+ private final FileItemInput fileItem;
private final InputStream inputStream;
- public StreamedRequestPart(FileItemStream fileItem) throws IOException {
+ public StreamedRequestPart(FileItemInput fileItem) throws IOException {
this.fileItem = fileItem;
- inputStream = fileItem.openStream();
+ inputStream = fileItem.getInputStream();
}
@Override
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java b/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
index abe6809..5956243 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/SlingPart.java
@@ -18,14 +18,14 @@
*/
package org.apache.sling.engine.impl.parameters;
-import javax.servlet.http.Part;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import jakarta.servlet.http.Part;
+
public class SlingPart implements Part {
private final MultipartRequestParameter param;
@@ -61,7 +61,11 @@ public class SlingPart implements Part {
@Override
public void delete() {
- this.param.getFileItem().delete();
+ try {
+ this.param.getFileItem().delete();
+ } catch (final IOException e) {
+ // ignore, nothing we can do
+ }
}
@Override
diff --git a/src/main/java/org/apache/sling/engine/package-info.java b/src/main/java/org/apache/sling/engine/package-info.java
index cdd2b34..b3a72a4 100644
--- a/src/main/java/org/apache/sling/engine/package-info.java
+++ b/src/main/java/org/apache/sling/engine/package-info.java
@@ -17,5 +17,5 @@
* under the License.
*/
-@org.osgi.annotation.versioning.Version("2.6.0")
+@org.osgi.annotation.versioning.Version("2.7.0")
package org.apache.sling.engine;
diff --git a/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java b/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java
index d40f667..b810889 100644
--- a/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java
@@ -18,12 +18,11 @@
*/
package org.apache.sling.engine.impl;
-import javax.servlet.http.HttpServletRequest;
-
import java.security.Principal;
import java.util.Enumeration;
-import org.apache.sling.api.SlingHttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.engine.impl.request.ContentData;
@@ -285,7 +284,7 @@ public class SlingHttpServletRequestImplTest {
Mockito.when(processor.getMimeType(Mockito.anyString())).thenReturn(null);
Mockito.when(rpi.getExtension()).thenReturn(null);
- SlingHttpServletRequest request = new SlingJakartaHttpServletRequestImpl(rd, baseRequest);
+ SlingJakartaHttpServletRequest request = new SlingJakartaHttpServletRequestImpl(rd, baseRequest);
assertNull(request.getResponseContentType());
assertEmptyEnumerator(request.getResponseContentTypes());
diff --git a/src/test/java/org/apache/sling/engine/impl/SlingHttpServletResponseImplTest.java b/src/test/java/org/apache/sling/engine/impl/SlingHttpServletResponseImplTest.java
index e88894d..d9e47e1 100644
--- a/src/test/java/org/apache/sling/engine/impl/SlingHttpServletResponseImplTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/SlingHttpServletResponseImplTest.java
@@ -18,16 +18,15 @@
*/
package org.apache.sling.engine.impl;
-import javax.servlet.DispatcherType;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.stream.Collectors;
-import org.apache.sling.api.SlingHttpServletResponse;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.engine.impl.request.DispatchingInfo;
import org.apache.sling.engine.impl.request.RequestData;
@@ -87,7 +86,7 @@ public class SlingHttpServletResponseImplTest {
@Test
public void testReset() {
- final SlingHttpServletResponse orig = mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
when(requestData.getDispatchingInfo()).thenReturn(info);
@@ -109,7 +108,7 @@ public class SlingHttpServletResponseImplTest {
@Test
public void testContentMethods() {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
final RequestProgressTracker requestProgressTracker = mock(RequestProgressTracker.class);
@@ -148,7 +147,7 @@ public class SlingHttpServletResponseImplTest {
@Test
public void testContentMethodsOnForward() {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.FORWARD);
final RequestProgressTracker requestProgressTracker = mock(RequestProgressTracker.class);
@@ -175,7 +174,7 @@ public class SlingHttpServletResponseImplTest {
@Test
public void testContentTypeOverrideEnabled() {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
final RequestProgressTracker requestProgressTracker = mock(RequestProgressTracker.class);
@@ -222,7 +221,7 @@ public class SlingHttpServletResponseImplTest {
@Test
public void testContentTypeOverrideDisabled() {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
final RequestProgressTracker requestProgressTracker = mock(RequestProgressTracker.class);
@@ -253,7 +252,7 @@ public class SlingHttpServletResponseImplTest {
@Test
public void testNoOverrideProtectHeadersContentTypeOverride() {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
final RequestProgressTracker requestProgressTracker = mock(RequestProgressTracker.class);
@@ -272,7 +271,7 @@ public class SlingHttpServletResponseImplTest {
@Test
public void testCookies() {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
when(requestData.getDispatchingInfo()).thenReturn(info);
@@ -287,7 +286,7 @@ public class SlingHttpServletResponseImplTest {
@Test
public void testSendError() throws IOException {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
when(requestData.getDispatchingInfo()).thenReturn(info);
@@ -301,10 +300,9 @@ public class SlingHttpServletResponseImplTest {
Mockito.verifyNoInteractions(orig);
}
- @Deprecated
@Test
public void testSetStatus() {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
when(requestData.getDispatchingInfo()).thenReturn(info);
@@ -313,14 +311,13 @@ public class SlingHttpServletResponseImplTest {
final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
include.setStatus(500);
- include.setStatus(500, "Error");
Mockito.verifyNoInteractions(orig);
}
@Test
public void testHeaders() {
- final SlingHttpServletResponse orig = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletResponse orig = Mockito.mock(SlingJakartaHttpServletResponse.class);
final RequestData requestData = mock(RequestData.class);
final DispatchingInfo info = new DispatchingInfo(DispatcherType.INCLUDE);
when(requestData.getDispatchingInfo()).thenReturn(info);
diff --git a/src/test/java/org/apache/sling/engine/impl/debug/RequestInfoProviderImplTest.java b/src/test/java/org/apache/sling/engine/impl/debug/RequestInfoProviderImplTest.java
index a58b393..681bbe9 100644
--- a/src/test/java/org/apache/sling/engine/impl/debug/RequestInfoProviderImplTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/debug/RequestInfoProviderImplTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.sling.engine.impl.debug;
-import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.builder.Builders;
import org.apache.sling.engine.RequestInfo;
import org.apache.sling.engine.impl.Config;
@@ -37,7 +37,7 @@ public class RequestInfoProviderImplTest {
final Config config = Mockito.mock(Config.class);
Mockito.when(config.sling_max_record_requests()).thenReturn(0);
- final SlingHttpServletRequest request = Mockito.mock(SlingHttpServletRequest.class);
+ final SlingJakartaHttpServletRequest request = Mockito.mock(SlingJakartaHttpServletRequest.class);
Mockito.when(request.getPathInfo()).thenReturn("/content");
Mockito.when(request.getRemoteUser()).thenReturn("admin");
Mockito.when(request.getMethod()).thenReturn("GET");
@@ -55,7 +55,7 @@ public class RequestInfoProviderImplTest {
final Config config = Mockito.mock(Config.class);
Mockito.when(config.sling_max_record_requests()).thenReturn(5);
- final SlingHttpServletRequest request = Mockito.mock(SlingHttpServletRequest.class);
+ final SlingJakartaHttpServletRequest request = Mockito.mock(SlingJakartaHttpServletRequest.class);
Mockito.when(request.getPathInfo()).thenReturn("/content");
Mockito.when(request.getRemoteUser()).thenReturn("admin");
Mockito.when(request.getMethod()).thenReturn("GET");
diff --git a/src/test/java/org/apache/sling/engine/impl/filter/AbstractFilterTest.java b/src/test/java/org/apache/sling/engine/impl/filter/AbstractFilterTest.java
index 84034fa..abe0cef 100644
--- a/src/test/java/org/apache/sling/engine/impl/filter/AbstractFilterTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/filter/AbstractFilterTest.java
@@ -18,12 +18,11 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.Filter;
-
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.sling.api.SlingHttpServletRequest;
+import jakarta.servlet.Filter;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.request.builder.Builders;
import org.jmock.Expectations;
@@ -82,7 +81,7 @@ public abstract class AbstractFilterTest {
return ref;
}
- protected SlingHttpServletRequest mockRequest(
+ protected SlingJakartaHttpServletRequest mockRequest(
final String path,
final String extension,
final String[] selectors,
@@ -102,8 +101,8 @@ public abstract class AbstractFilterTest {
}
});
- final SlingHttpServletRequest req =
- context.mock(SlingHttpServletRequest.class, "req " + path + extension + method + suffix);
+ final SlingJakartaHttpServletRequest req =
+ context.mock(SlingJakartaHttpServletRequest.class, "req " + path + extension + method + suffix);
context.checking(new Expectations() {
{
allowing(req).getRequestProgressTracker();
@@ -123,7 +122,7 @@ public abstract class AbstractFilterTest {
return req;
}
- protected SlingHttpServletRequest mockRequest(
+ protected SlingJakartaHttpServletRequest mockRequest(
final String resourcePath, final String requestPath, final String extension) {
final RequestPathInfo info =
context.mock(RequestPathInfo.class, "info " + resourcePath + requestPath + extension);
@@ -140,8 +139,8 @@ public abstract class AbstractFilterTest {
}
});
- final SlingHttpServletRequest req =
- context.mock(SlingHttpServletRequest.class, "req " + resourcePath + requestPath + extension);
+ final SlingJakartaHttpServletRequest req =
+ context.mock(SlingJakartaHttpServletRequest.class, "req " + resourcePath + requestPath + extension);
context.checking(new Expectations() {
{
allowing(req).getRequestPathInfo();
@@ -160,7 +159,7 @@ public abstract class AbstractFilterTest {
return predicate;
}
- protected SlingHttpServletRequest whateverRequest() {
+ protected SlingJakartaHttpServletRequest whateverRequest() {
return mockRequest("/content/test/what/ever", "json", new String[] {"test"}, "GET", null);
}
}
diff --git a/src/test/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChainTest.java b/src/test/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChainTest.java
index 12f2312..fe64096 100644
--- a/src/test/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChainTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChainTest.java
@@ -18,19 +18,18 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
import org.apache.sling.engine.impl.request.RequestData;
@@ -61,7 +60,7 @@ public class AbstractSlingFilterChainTest extends AbstractFilterTest {
AbstractSlingFilterChain chain = new AbstractSlingFilterChain(new FilterHandle[] {handle}) {
@Override
- protected void render(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ protected void render(SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
throws IOException, ServletException {}
};
HttpServletRequest httpReq = whateverRequest();
@@ -70,7 +69,7 @@ public class AbstractSlingFilterChainTest extends AbstractFilterTest {
final SlingJakartaHttpServletRequestImpl req = new SlingJakartaHttpServletRequestImpl(requestData, httpReq);
boolean illegalStateCaught = false;
try {
- chain.doFilter(req, context.mock(SlingHttpServletResponse.class));
+ chain.doFilter(req, context.mock(SlingJakartaHttpServletResponse.class));
} catch (IllegalStateException e) {
illegalStateCaught = true;
}
diff --git a/src/test/java/org/apache/sling/engine/impl/filter/ErrorFilterChainTest.java b/src/test/java/org/apache/sling/engine/impl/filter/ErrorFilterChainTest.java
index f696dff..f4af713 100644
--- a/src/test/java/org/apache/sling/engine/impl/filter/ErrorFilterChainTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/filter/ErrorFilterChainTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.ServletException;
-
import java.io.IOException;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.api.servlets.ErrorHandler;
+import jakarta.servlet.ServletException;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
+import org.apache.sling.api.servlets.JakartaErrorHandler;
import org.apache.sling.engine.impl.DefaultErrorHandler;
import org.junit.Test;
import org.mockito.Mockito;
@@ -45,11 +44,11 @@ public class ErrorFilterChainTest {
@Test
public void testResponseCommitted() throws IOException, ServletException {
final DefaultErrorHandler handler = new DefaultErrorHandler();
- final ErrorHandler errorHandler = Mockito.mock(ErrorHandler.class);
- handler.setDelegate(errorHandler);
+ final JakartaErrorHandler errorHandler = Mockito.mock(JakartaErrorHandler.class);
+ handler.setDelegate(null, errorHandler);
- final SlingHttpServletRequest request = Mockito.mock(SlingHttpServletRequest.class);
- final SlingHttpServletResponse response = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletRequest request = Mockito.mock(SlingJakartaHttpServletRequest.class);
+ final SlingJakartaHttpServletResponse response = Mockito.mock(SlingJakartaHttpServletResponse.class);
Mockito.when(response.isCommitted()).thenReturn(true);
final ErrorFilterChain chain1 = new ErrorFilterChain(new FilterHandle[0], handler, new Exception());
@@ -65,11 +64,11 @@ public class ErrorFilterChainTest {
@Test
public void testResponseNotCommitted() throws IOException, ServletException {
final DefaultErrorHandler handler = new DefaultErrorHandler();
- final ErrorHandler errorHandler = Mockito.mock(ErrorHandler.class);
- handler.setDelegate(errorHandler);
+ final JakartaErrorHandler errorHandler = Mockito.mock(JakartaErrorHandler.class);
+ handler.setDelegate(null, errorHandler);
- final SlingHttpServletRequest request = Mockito.mock(SlingHttpServletRequest.class);
- final SlingHttpServletResponse response = Mockito.mock(SlingHttpServletResponse.class);
+ final SlingJakartaHttpServletRequest request = Mockito.mock(SlingJakartaHttpServletRequest.class);
+ final SlingJakartaHttpServletResponse response = Mockito.mock(SlingJakartaHttpServletResponse.class);
Mockito.when(response.isCommitted()).thenReturn(false);
final ErrorFilterChain chain1 = new ErrorFilterChain(new FilterHandle[0], handler, new Exception());
diff --git a/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java b/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
index 9b17423..7f6c0a2 100644
--- a/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/filter/ServletFilterManagerTest.java
@@ -18,18 +18,17 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
import java.io.IOException;
import java.util.Hashtable;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.sling.engine.EngineConstants;
import org.apache.sling.engine.impl.ProductInfoProvider;
diff --git a/src/test/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelperTest.java b/src/test/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelperTest.java
index 12c2e71..aca3e08 100644
--- a/src/test/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelperTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelperTest.java
@@ -18,8 +18,7 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.Filter;
-
+import jakarta.servlet.Filter;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java b/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java
index 3d52d74..3257339 100644
--- a/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java
@@ -18,19 +18,18 @@
*/
package org.apache.sling.engine.impl.helper;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletResponseWrapper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
import java.util.Collections;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestWrapper;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.ServletResponseWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
import org.apache.sling.engine.impl.SlingJakartaHttpServletResponseImpl;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
diff --git a/src/test/java/org/apache/sling/engine/impl/helper/SlingServletContextTest.java b/src/test/java/org/apache/sling/engine/impl/helper/SlingServletContextTest.java
index fb09947..eb5a34d 100644
--- a/src/test/java/org/apache/sling/engine/impl/helper/SlingServletContextTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/helper/SlingServletContextTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.sling.engine.impl.helper;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-
import java.util.Dictionary;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
import org.apache.sling.engine.impl.Config;
import org.apache.sling.engine.impl.ProductInfoProvider;
import org.junit.Test;
diff --git a/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java b/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java
index cc669fe..a6ac361 100644
--- a/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/log/ClientAbortExceptionTest.java
@@ -18,12 +18,11 @@
*/
package org.apache.sling.engine.impl.log;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.engine.impl.helper.ClientAbortException;
import org.jmock.Expectations;
import org.jmock.Mockery;
diff --git a/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java b/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java
index 215eaf7..795fa5b 100644
--- a/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/request/InitResourceTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.sling.engine.impl.request;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
diff --git a/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java b/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
index 39cd94f..ff76938 100644
--- a/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
@@ -18,19 +18,18 @@
*/
package org.apache.sling.engine.impl.request;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.util.Collections;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.request.TooManyCallsException;
import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
@@ -50,8 +49,8 @@ public class RequestDataTest {
private RequestData requestData;
private HttpServletRequest req;
private HttpServletResponse resp;
- private SlingHttpServletRequest slingRequest;
- private SlingHttpServletResponse slingResponse;
+ private SlingJakartaHttpServletRequest slingRequest;
+ private SlingJakartaHttpServletResponse slingResponse;
@Before
public void setup() throws ServletException, IOException {
diff --git a/src/test/java/org/apache/sling/engine/impl/request/SlingRequestDispatcherTest.java b/src/test/java/org/apache/sling/engine/impl/request/SlingRequestDispatcherTest.java
index e15bcf9..3a413fe 100644
--- a/src/test/java/org/apache/sling/engine/impl/request/SlingRequestDispatcherTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/request/SlingRequestDispatcherTest.java
@@ -18,19 +18,18 @@
*/
package org.apache.sling.engine.impl.request;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
@@ -117,14 +116,15 @@ public class SlingRequestDispatcherTest {
RequestData requestData =
new RequestData(slingRequestProcessor, httpServletRequest, httpServletResponse, false, false, false);
- SlingHttpServletRequest request = spy(new SlingJakartaHttpServletRequestImpl(requestData, httpServletRequest));
- SlingHttpServletResponse response =
+ SlingJakartaHttpServletRequest request =
+ spy(new SlingJakartaHttpServletRequestImpl(requestData, httpServletRequest));
+ SlingJakartaHttpServletResponse response =
spy(new SlingJakartaHttpServletResponseImpl(requestData, httpServletResponse));
Resource initialResource = getMockedResource("/initial");
when(request.getResource()).thenReturn(initialResource);
ServletResolver servletResolver = mock(ServletResolver.class);
- when(servletResolver.resolveServlet(any(SlingHttpServletRequest.class))).thenReturn(servlet);
+ when(servletResolver.resolve(any(SlingJakartaHttpServletRequest.class))).thenReturn(servlet);
Field servletResolverField = slingRequestProcessor.getClass().getDeclaredField("servletResolver");
servletResolverField.setAccessible(true);
servletResolverField.set(slingRequestProcessor, servletResolver);
(sling-org-apache-sling-engine) 01/02: Use jakarta api, add support for filters
Posted by cz...@apache.org.
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
commit 42285604e6e51e2215ed9dbb3583b3c97a982b3b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jan 3 14:09:41 2025 +0100
Use jakarta api, add support for filters
---
pom.xml | 12 +++
.../org/apache/sling/engine/EngineConstants.java | 2 +
.../apache/sling/engine/SlingRequestProcessor.java | 38 +++++--
.../sling/engine/impl/DefaultErrorHandler.java | 85 +++++++++++++--
.../apache/sling/engine/impl/SlingHttpContext.java | 11 +-
...ava => SlingJakartaHttpServletRequestImpl.java} | 46 +++++----
...va => SlingJakartaHttpServletResponseImpl.java} | 52 +++-------
.../apache/sling/engine/impl/SlingMainServlet.java | 25 +++--
.../engine/impl/SlingRequestProcessorImpl.java | 106 ++++++++++++-------
.../impl/adapter/SlingServletRequestAdapter.java | 37 +++----
.../impl/adapter/SlingServletResponseAdapter.java | 39 ++-----
.../engine/impl/debug/RequestInfoProviderImpl.java | 8 +-
.../debug/RequestProgressTrackerLogFilter.java | 21 ++--
.../impl/filter/AbstractSlingFilterChain.java | 31 +++---
.../sling/engine/impl/filter/ErrorFilterChain.java | 24 +++--
.../sling/engine/impl/filter/FilterHandle.java | 7 +-
.../sling/engine/impl/filter/FilterPredicate.java | 9 +-
.../impl/filter/RequestSlingFilterChain.java | 11 +-
.../engine/impl/filter/ServletFilterManager.java | 49 +++++++--
.../impl/filter/SlingComponentFilterChain.java | 11 +-
.../engine/impl/filter/SlingFilterChainHelper.java | 4 +-
.../impl/helper/ExternalServletContextWrapper.java | 109 +++++++++++---------
.../engine/impl/helper/RequestListenerManager.java | 38 +++++--
.../engine/impl/helper/SlingFilterConfig.java | 7 +-
.../engine/impl/helper/SlingServletContext.java | 114 ++++++++++++---------
.../engine/impl/parameters/ParameterSupport.java | 5 +-
.../ParameterSupportHttpServletRequestWrapper.java | 8 +-
.../RequestParameterSupportConfigurer.java | 23 ++---
.../sling/engine/impl/request/ContentData.java | 3 +-
.../sling/engine/impl/request/DispatchingInfo.java | 5 +-
.../sling/engine/impl/request/RequestData.java | 103 +++++++++----------
.../impl/request/SlingRequestDispatcher.java | 23 ++---
.../impl/SlingHttpServletRequestImplTest.java | 24 ++---
.../impl/SlingHttpServletResponseImplTest.java | 20 ++--
.../impl/filter/AbstractSlingFilterChainTest.java | 4 +-
.../helper/ExternalServletContextWrapperTest.java | 12 +--
.../sling/engine/impl/request/RequestDataTest.java | 8 +-
.../impl/request/SlingRequestDispatcherTest.java | 9 +-
38 files changed, 647 insertions(+), 496 deletions(-)
diff --git a/pom.xml b/pom.xml
index 67f6b98..2a08a9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,12 +79,24 @@
<version>6.0.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.wrappers</artifactId>
+ <version>1.1.8</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.servlet</artifactId>
+ <version>2.0.0</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.useradmin</artifactId>
diff --git a/src/main/java/org/apache/sling/engine/EngineConstants.java b/src/main/java/org/apache/sling/engine/EngineConstants.java
index 3d7149a..23fe0fc 100644
--- a/src/main/java/org/apache/sling/engine/EngineConstants.java
+++ b/src/main/java/org/apache/sling/engine/EngineConstants.java
@@ -106,7 +106,9 @@ public class EngineConstants {
* {@link SlingRequestProcessor}.
*
* @since 2.1, Sling Engine 2.2
+ * @deprecated Register the filter with their respective type
*/
+ @Deprecated
public static final String FILTER_NAME = "javax.servlet.Filter";
/**
diff --git a/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java b/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
index c5859f3..f6ea5d4 100644
--- a/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
+++ b/src/main/java/org/apache/sling/engine/SlingRequestProcessor.java
@@ -18,12 +18,11 @@
*/
package org.apache.sling.engine;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.resource.ResourceResolver;
import org.osgi.annotation.versioning.ProviderType;
@@ -60,8 +59,35 @@ public interface SlingRequestProcessor {
* <code>null</code>
* @throws IOException if an error occurrs reading from the request input or
* writing the response
- * @throws ServletException if another servlet related problem occurrs
*/
void processRequest(HttpServletRequest request, HttpServletResponse response, ResourceResolver resourceResolver)
- throws ServletException, IOException;
+ throws IOException;
+
+ /**
+ * Process an HTTP request through the Sling request processing engine.
+ * <p>
+ * This method does <b>not</b> close the provided resource resolver!
+ * <p>
+ * The org.apache.sling.servlet-helpers module provides synthetic
+ * request/response classes which can be useful when using this service.
+ *
+ * @param request Usually a "synthetic" request, i.e. not supplied by
+ * servlet container
+ * @param response Usually a "synthetic" response, i.e. not supplied by
+ * servlet container
+ * @param resourceResolver The <code>ResourceResolver</code> used for the
+ * Sling request processing.
+ * @throws NullPointerException if either of the parameters is
+ * <code>null</code>
+ * @throws IOException if an error occurrs reading from the request input or
+ * writing the response
+ * @throws ServletException if another servlet related problem occurrs
+ * @deprecated Use {@link #processRequest(HttpServletRequest, HttpServletResponse, ResourceResolver)}
+ */
+ @Deprecated
+ void processRequest(
+ javax.servlet.http.HttpServletRequest request,
+ javax.servlet.http.HttpServletResponse response,
+ ResourceResolver resourceResolver)
+ throws javax.servlet.ServletException, IOException;
}
diff --git a/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java b/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java
index 43dbb47..e8f43a4 100644
--- a/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java
+++ b/src/main/java/org/apache/sling/engine/impl/DefaultErrorHandler.java
@@ -18,17 +18,22 @@
*/
package org.apache.sling.engine.impl;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.io.PrintWriter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.request.ResponseUtil;
import org.apache.sling.api.servlets.ErrorHandler;
+import org.apache.sling.api.servlets.JakartaErrorHandler;
+import org.apache.sling.api.wrappers.JakartaToJavaxRequestWrapper;
+import org.apache.sling.api.wrappers.JakartaToJavaxResponseWrapper;
+import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +46,7 @@ import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
* in combination with the error filter chain. If a {@link ErrorHandler} service
* is registered, the actual response generated is delegated to that service.
*/
-public class DefaultErrorHandler implements ErrorHandler {
+public class DefaultErrorHandler implements JakartaErrorHandler {
/** default log */
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -49,14 +54,69 @@ public class DefaultErrorHandler implements ErrorHandler {
private volatile String serverInfo = ProductInfoProvider.PRODUCT_NAME;
/** Use this if not null, and if that fails output a report about that failure */
- private volatile ErrorHandler delegate;
+ private volatile JakartaErrorHandler delegate;
+
+ private volatile JakartaErrorHandler errorHandler;
+ private volatile JakartaErrorHandler jakartaErrorHandler;
+ private volatile ServiceReference<?> errorHandlerRef;
+ private volatile ServiceReference<?> jakartaErrorHandlerRef;
void setServerInfo(final String serverInfo) {
this.serverInfo = (serverInfo != null) ? serverInfo : ProductInfoProvider.PRODUCT_NAME;
}
- public void setDelegate(final ErrorHandler eh) {
- delegate = eh;
+ public synchronized void setDelegate(final ServiceReference<?> ref, final ErrorHandler eh) {
+ if (eh != null) {
+ this.errorHandler = new JakartaErrorHandler() {
+ @Override
+ public void handleError(
+ int status,
+ String message,
+ SlingJakartaHttpServletRequest request,
+ SlingJakartaHttpServletResponse response)
+ throws IOException {
+ eh.handleError(
+ status,
+ message,
+ (SlingHttpServletRequest) JakartaToJavaxRequestWrapper.toJavaxRequest(request),
+ (SlingHttpServletResponse) JakartaToJavaxResponseWrapper.toJavaxResponse(response));
+ }
+
+ @Override
+ public void handleError(
+ Throwable throwable,
+ SlingJakartaHttpServletRequest request,
+ SlingJakartaHttpServletResponse response)
+ throws IOException {
+ eh.handleError(
+ throwable,
+ (SlingHttpServletRequest) JakartaToJavaxRequestWrapper.toJavaxRequest(request),
+ (SlingHttpServletResponse) JakartaToJavaxResponseWrapper.toJavaxResponse(response));
+ }
+ };
+ this.errorHandlerRef = ref;
+ if (this.jakartaErrorHandlerRef == null || this.jakartaErrorHandlerRef.compareTo(ref) < 0) {
+ this.delegate = this.errorHandler;
+ }
+ } else {
+ this.errorHandler = null;
+ this.errorHandlerRef = null;
+ this.delegate = this.jakartaErrorHandler;
+ }
+ }
+
+ public synchronized void setDelegate(final ServiceReference<?> ref, final JakartaErrorHandler eh) {
+ if (eh != null) {
+ this.jakartaErrorHandler = eh;
+ this.jakartaErrorHandlerRef = ref;
+ if (this.errorHandlerRef == null || this.errorHandlerRef.compareTo(ref) < 0) {
+ this.delegate = this.jakartaErrorHandler;
+ }
+ } else {
+ this.jakartaErrorHandler = null;
+ this.jakartaErrorHandlerRef = null;
+ this.delegate = this.errorHandler;
+ }
}
private void delegateFailed(
@@ -98,8 +158,8 @@ public class DefaultErrorHandler implements ErrorHandler {
public void handleError(
final int status,
String message,
- final SlingHttpServletRequest request,
- final SlingHttpServletResponse response)
+ final SlingJakartaHttpServletRequest request,
+ final SlingJakartaHttpServletResponse response)
throws IOException {
// If we have a delegate let it handle the error
if (delegate != null) {
@@ -133,7 +193,9 @@ public class DefaultErrorHandler implements ErrorHandler {
*/
@Override
public void handleError(
- final Throwable throwable, final SlingHttpServletRequest request, final SlingHttpServletResponse response)
+ final Throwable throwable,
+ final SlingJakartaHttpServletRequest request,
+ final SlingJakartaHttpServletResponse response)
throws IOException {
final int status = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
// If we have a delegate let it handle the error
@@ -200,7 +262,8 @@ public class DefaultErrorHandler implements ErrorHandler {
escapingWriter.flush();
pw.println("</pre>");
- final RequestProgressTracker tracker = ((SlingHttpServletRequest) request).getRequestProgressTracker();
+ final RequestProgressTracker tracker =
+ ((SlingJakartaHttpServletRequest) request).getRequestProgressTracker();
pw.println("<h3>Request Progress:</h3>");
pw.println("<pre>");
pw.flush();
diff --git a/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java b/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
index 50b9d44..676ab14 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingHttpContext.java
@@ -18,12 +18,11 @@
*/
package org.apache.sling.engine.impl;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.net.URL;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.request.builder.Builders;
import org.apache.sling.api.resource.ResourceResolver;
@@ -35,9 +34,9 @@ import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.osgi.service.component.annotations.ReferencePolicy;
-import org.osgi.service.http.context.ServletContextHelper;
-import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardContext;
+import org.osgi.service.servlet.context.ServletContextHelper;
+import org.osgi.service.servlet.whiteboard.annotations.RequireHttpWhiteboard;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java b/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java
similarity index 91%
rename from src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
rename to src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java
index 3337890..8e0901d 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingHttpServletRequestImpl.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletRequestImpl.java
@@ -18,14 +18,6 @@
*/
package org.apache.sling.engine.impl;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.Part;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Serializable;
@@ -42,8 +34,16 @@ import java.util.Map;
import java.util.ResourceBundle;
import java.util.Set;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletInputStream;
+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.SlingHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestParameter;
import org.apache.sling.api.request.RequestParameterMap;
@@ -60,18 +60,19 @@ import org.apache.sling.engine.impl.request.SlingRequestDispatcher;
import org.osgi.service.http.context.ServletContextHelper;
import org.osgi.service.useradmin.Authorization;
-import static javax.servlet.RequestDispatcher.FORWARD_CONTEXT_PATH;
-import static javax.servlet.RequestDispatcher.FORWARD_PATH_INFO;
-import static javax.servlet.RequestDispatcher.FORWARD_QUERY_STRING;
-import static javax.servlet.RequestDispatcher.FORWARD_REQUEST_URI;
-import static javax.servlet.RequestDispatcher.FORWARD_SERVLET_PATH;
-import static javax.servlet.RequestDispatcher.INCLUDE_CONTEXT_PATH;
-import static javax.servlet.RequestDispatcher.INCLUDE_PATH_INFO;
-import static javax.servlet.RequestDispatcher.INCLUDE_QUERY_STRING;
-import static javax.servlet.RequestDispatcher.INCLUDE_REQUEST_URI;
-import static javax.servlet.RequestDispatcher.INCLUDE_SERVLET_PATH;
+import static jakarta.servlet.RequestDispatcher.FORWARD_CONTEXT_PATH;
+import static jakarta.servlet.RequestDispatcher.FORWARD_PATH_INFO;
+import static jakarta.servlet.RequestDispatcher.FORWARD_QUERY_STRING;
+import static jakarta.servlet.RequestDispatcher.FORWARD_REQUEST_URI;
+import static jakarta.servlet.RequestDispatcher.FORWARD_SERVLET_PATH;
+import static jakarta.servlet.RequestDispatcher.INCLUDE_CONTEXT_PATH;
+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;
-public class SlingHttpServletRequestImpl extends HttpServletRequestWrapper implements SlingHttpServletRequest {
+public class SlingJakartaHttpServletRequestImpl extends HttpServletRequestWrapper
+ implements SlingJakartaHttpServletRequest {
private static final List<String> FORWARD_ATTRIBUTES = Arrays.asList(
FORWARD_CONTEXT_PATH, FORWARD_PATH_INFO, FORWARD_QUERY_STRING, FORWARD_REQUEST_URI, FORWARD_SERVLET_PATH);
@@ -79,6 +80,7 @@ public class SlingHttpServletRequestImpl extends HttpServletRequestWrapper imple
private static final List<String> INCLUDE_ATTRIBUTES = Arrays.asList(
SlingConstants.ATTR_REQUEST_CONTENT,
SlingConstants.ATTR_REQUEST_SERVLET,
+ SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET,
SlingConstants.ATTR_REQUEST_PATH_INFO,
INCLUDE_CONTEXT_PATH,
INCLUDE_PATH_INFO,
@@ -90,7 +92,7 @@ public class SlingHttpServletRequestImpl extends HttpServletRequestWrapper imple
private final String pathInfo;
private String responseContentType;
- public SlingHttpServletRequestImpl(RequestData requestData, HttpServletRequest servletRequest) {
+ public SlingJakartaHttpServletRequestImpl(RequestData requestData, HttpServletRequest servletRequest) {
super(servletRequest);
this.requestData = requestData;
@@ -403,6 +405,8 @@ public class SlingHttpServletRequestImpl extends HttpServletRequestWrapper imple
if (SlingConstants.ATTR_REQUEST_CONTENT.equals(name)) {
return dispatchingInfo.getRequestContent();
} else if (SlingConstants.ATTR_REQUEST_SERVLET.equals(name)) {
+ return new ServletWrapper(dispatchingInfo.getRequestServlet());
+ } else if (SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET.equals(name)) {
return dispatchingInfo.getRequestServlet();
} else if (SlingConstants.ATTR_REQUEST_PATH_INFO.equals(name)) {
return dispatchingInfo.getRequestPathInfo();
diff --git a/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java b/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletResponseImpl.java
similarity index 95%
rename from src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
rename to src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletResponseImpl.java
index cb639c5..dc0241a 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingJakartaHttpServletResponseImpl.java
@@ -18,12 +18,6 @@
*/
package org.apache.sling.engine.impl;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayDeque;
@@ -40,16 +34,22 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import org.apache.sling.api.SlingException;
-import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.engine.impl.request.RequestData;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SlingHttpServletResponseImpl extends HttpServletResponseWrapper implements SlingHttpServletResponse {
+public class SlingJakartaHttpServletResponseImpl extends HttpServletResponseWrapper
+ implements SlingJakartaHttpServletResponse {
- private static final Logger LOG = LoggerFactory.getLogger(SlingHttpServletResponseImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SlingJakartaHttpServletResponseImpl.class);
// this regex matches TIMER_START{ followed by any characters except }, and then
// a closing }. The part inside the braces is captured for later use.
@@ -74,10 +74,10 @@ public class SlingHttpServletResponseImpl extends HttpServletResponseWrapper imp
private final boolean firstSlingResponse;
- public SlingHttpServletResponseImpl(RequestData requestData, HttpServletResponse response) {
+ public SlingJakartaHttpServletResponseImpl(RequestData requestData, HttpServletResponse response) {
super(response);
this.requestData = requestData;
- this.firstSlingResponse = !(response instanceof SlingHttpServletResponse);
+ this.firstSlingResponse = !(response instanceof SlingJakartaHttpServletResponse);
if (firstSlingResponse) {
for (final StaticResponseHeader mapping :
@@ -129,18 +129,6 @@ public class SlingHttpServletResponseImpl extends HttpServletResponseWrapper imp
return super.encodeRedirectURL(path);
}
- @Override
- @Deprecated
- public String encodeUrl(final String url) {
- return encodeURL(url);
- }
-
- @Override
- @Deprecated
- public String encodeRedirectUrl(final String url) {
- return encodeRedirectURL(url);
- }
-
@Override
public void flushBuffer() throws IOException {
initFlusherStacktrace();
@@ -160,7 +148,7 @@ public class SlingHttpServletResponseImpl extends HttpServletResponseWrapper imp
private boolean isInclude() {
return this.requestData.getDispatchingInfo() != null
- && this.requestData.getDispatchingInfo().getType() == javax.servlet.DispatcherType.INCLUDE;
+ && this.requestData.getDispatchingInfo().getType() == jakarta.servlet.DispatcherType.INCLUDE;
}
private boolean isProtectHeadersOnInclude() {
@@ -179,16 +167,6 @@ public class SlingHttpServletResponseImpl extends HttpServletResponseWrapper imp
// ignore
return;
}
- setStatus(sc, null);
- }
-
- @Override
- public void setStatus(final int sc, final String msg) {
- if (this.isProtectHeadersOnInclude()) {
- // ignore
- return;
- }
-
if (isCommitted()) {
if (flusherStacktrace != null && flusherStacktrace != FLUSHER_STACK_DUMMY) {
LOG.warn(
@@ -207,11 +185,7 @@ public class SlingHttpServletResponseImpl extends HttpServletResponseWrapper imp
explanation);
}
} else { // response is not yet committed, so the statuscode can be changed
- if (msg == null) {
- super.setStatus(sc);
- } else {
- super.setStatus(sc, msg);
- }
+ super.setStatus(sc);
}
}
diff --git a/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java b/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
index 2bb2fa1..5df00c9 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
@@ -18,20 +18,19 @@
*/
package org.apache.sling.engine.impl;
-import javax.servlet.GenericServlet;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Objects;
-import org.apache.sling.api.request.SlingRequestEvent;
+import jakarta.servlet.GenericServlet;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.request.SlingJakartaRequestEvent;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.auth.core.AuthenticationSupport;
import org.apache.sling.engine.impl.helper.ClientAbortException;
@@ -50,8 +49,8 @@ import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.component.annotations.ReferencePolicyOption;
import org.osgi.service.component.propertytypes.ServiceDescription;
import org.osgi.service.component.propertytypes.ServiceVendor;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -108,7 +107,7 @@ public class SlingMainServlet extends GenericServlet {
final RequestListenerManager localRLM = requestListenerManager;
if (localRLM != null) {
- localRLM.sendEvent(request, SlingRequestEvent.EventType.EVENT_INIT);
+ localRLM.sendEvent(request, SlingJakartaRequestEvent.EventType.EVENT_INIT);
}
ResourceResolver resolver = null;
@@ -151,7 +150,7 @@ public class SlingMainServlet extends GenericServlet {
}
if (localRLM != null) {
- localRLM.sendEvent(request, SlingRequestEvent.EventType.EVENT_DESTROY);
+ localRLM.sendEvent(request, SlingJakartaRequestEvent.EventType.EVENT_DESTROY);
}
// reset the thread name
diff --git a/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java b/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
index 144c529..a894330 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
@@ -18,16 +18,6 @@
*/
package org.apache.sling.engine.impl;
-import javax.servlet.DispatcherType;
-import javax.servlet.FilterChain;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.OutputStream;
@@ -39,9 +29,19 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.sling.api.SlingException;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.api.SlingServletException;
import org.apache.sling.api.adapter.AdapterManager;
import org.apache.sling.api.request.RequestPathInfo;
@@ -49,8 +49,11 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceNotFoundException;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.ErrorHandler;
+import org.apache.sling.api.servlets.JakartaErrorHandler;
import org.apache.sling.api.servlets.ServletResolver;
-import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
+import org.apache.sling.api.wrappers.JavaxToJakartaRequestWrapper;
+import org.apache.sling.api.wrappers.JavaxToJakartaResponseWrapper;
+import org.apache.sling.api.wrappers.SlingJakartaHttpServletResponseWrapper;
import org.apache.sling.commons.mime.MimeTypeService;
import org.apache.sling.engine.SlingRequestProcessor;
import org.apache.sling.engine.impl.debug.RequestInfoProviderImpl;
@@ -65,6 +68,7 @@ import org.apache.sling.engine.impl.parameters.ParameterSupport;
import org.apache.sling.engine.impl.request.ContentData;
import org.apache.sling.engine.impl.request.DispatchingInfo;
import org.apache.sling.engine.impl.request.RequestData;
+import org.osgi.framework.ServiceReference;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
@@ -75,8 +79,6 @@ import org.osgi.service.component.annotations.ReferencePolicyOption;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.sling.api.SlingConstants.ERROR_SERVLET_NAME;
-
@Component(
service = {SlingRequestProcessor.class, SlingRequestProcessorImpl.class},
configurationPid = Config.PID)
@@ -157,17 +159,30 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
// nothing to do here, but DS requires this method
}
+ @Reference(
+ name = "JakartaErrorHandler",
+ cardinality = ReferenceCardinality.OPTIONAL,
+ policy = ReferencePolicy.DYNAMIC,
+ policyOption = ReferencePolicyOption.GREEDY)
+ void setJakartaErrorHandler(final ServiceReference<?> ref, final JakartaErrorHandler handler) {
+ this.errorHandler.setDelegate(ref, handler);
+ }
+
+ void unsetJakartaErrorHandler(final ServiceReference<?> ref, final JakartaErrorHandler handler) {
+ this.errorHandler.setDelegate(ref, (JakartaErrorHandler) null);
+ }
+
@Reference(
name = "ErrorHandler",
cardinality = ReferenceCardinality.OPTIONAL,
policy = ReferencePolicy.DYNAMIC,
policyOption = ReferencePolicyOption.GREEDY)
- void setErrorHandler(final ErrorHandler handler) {
- this.errorHandler.setDelegate(handler);
+ void setErrorHandler(final ServiceReference<?> ref, final ErrorHandler handler) {
+ this.errorHandler.setDelegate(ref, handler);
}
- void unsetErrorHandler(final ErrorHandler handler) {
- this.errorHandler.setDelegate(null);
+ void unsetErrorHandler(final ServiceReference<?> ref, final ErrorHandler handler) {
+ this.errorHandler.setDelegate(ref, (ErrorHandler) null);
}
public int getMaxCallCounter() {
@@ -232,8 +247,8 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
protectHeadersOnInclude,
checkContentTypeOnInclude,
this.disableCheckCompliantGetUserPrincipal);
- final SlingHttpServletRequest request = requestData.getSlingRequest();
- final SlingHttpServletResponse response = requestData.getSlingResponse();
+ final SlingJakartaHttpServletRequest request = requestData.getSlingRequest();
+ final SlingJakartaHttpServletResponse response = requestData.getSlingResponse();
try {
// initialize the request data - resolve resource and servlet
@@ -248,7 +263,7 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
processor.doFilter(request, response);
- } catch (final SlingHttpServletResponseImpl.WriterAlreadyClosedException wace) {
+ } catch (final SlingJakartaHttpServletResponseImpl.WriterAlreadyClosedException wace) {
// this is an exception case, log as error
log.error("Writer has already been closed.", wace);
@@ -314,12 +329,12 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
final RequestData requestData,
final String identifier,
final Throwable throwable,
- final SlingHttpServletRequest request,
- final SlingHttpServletResponse response)
+ final SlingJakartaHttpServletRequest request,
+ final SlingJakartaHttpServletResponse response)
throws IOException {
// we assume, that this is the name of the causing servlet
if (requestData.getActiveServletName() != null) {
- request.setAttribute(ERROR_SERVLET_NAME, requestData.getActiveServletName());
+ request.setAttribute(RequestDispatcher.ERROR_SERVLET_NAME, requestData.getActiveServletName());
}
log.error("service: Uncaught {}", identifier, throwable);
@@ -327,9 +342,6 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
}
// ---------- SlingRequestProcessor interface
- /**
- * @see org.apache.sling.engine.SlingRequestProcessor#processRequest(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.apache.sling.api.resource.ResourceResolver)
- */
@Override
public void processRequest(
final HttpServletRequest servletRequest,
@@ -351,6 +363,18 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
}
}
+ @Override
+ public void processRequest(
+ final javax.servlet.http.HttpServletRequest servletRequest,
+ final javax.servlet.http.HttpServletResponse servletResponse,
+ final ResourceResolver resourceResolver)
+ throws IOException {
+ this.processRequest(
+ JavaxToJakartaRequestWrapper.toJakartaRequest(servletRequest),
+ JavaxToJakartaResponseWrapper.toJakartaResponse(servletResponse),
+ resourceResolver);
+ }
+
/**
* Renders the component defined by the RequestData's current ComponentData
* instance after calling all filters of the given
@@ -364,7 +388,9 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
* @throws ServletException
*/
public void processComponent(
- SlingHttpServletRequest request, SlingHttpServletResponse response, final FilterChainType filterChainType)
+ SlingJakartaHttpServletRequest request,
+ SlingJakartaHttpServletResponse response,
+ final FilterChainType filterChainType)
throws IOException, ServletException {
final FilterHandle filters[] = filterManager.getFilters(filterChainType);
@@ -394,8 +420,8 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
throws IOException, ServletException {
// we need a SlingHttpServletRequest/SlingHttpServletResponse tupel
// to continue
- final SlingHttpServletRequest cRequest = RequestData.toSlingHttpServletRequest(request);
- final SlingHttpServletResponse cResponse = RequestData.toSlingHttpServletResponse(response);
+ final SlingJakartaHttpServletRequest cRequest = RequestData.toSlingHttpServletRequest(request);
+ final SlingJakartaHttpServletResponse cResponse = RequestData.toSlingHttpServletResponse(response);
// check that we have all required services
final ServletResolver sr = this.servletResolver;
@@ -416,7 +442,7 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
requestData.setDispatchingInfo(dispatchingInfo);
try {
// resolve the servlet
- Servlet servlet = sr.resolveServlet(cRequest);
+ Servlet servlet = sr.resolve(cRequest);
contentData.setServlet(servlet);
final FilterChainType type = dispatchingInfo.getType() == DispatcherType.INCLUDE
@@ -433,8 +459,8 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
private void handleError(
final FilterChain errorFilterChain,
- final SlingHttpServletRequest request,
- final SlingHttpServletResponse response)
+ final SlingJakartaHttpServletRequest request,
+ final SlingJakartaHttpServletResponse response)
throws IOException {
request.getRequestProgressTracker().log("Applying " + FilterChainType.ERROR + " filters");
@@ -450,8 +476,8 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
void handleError(
final int status,
final String message,
- final SlingHttpServletRequest request,
- final SlingHttpServletResponse response)
+ final SlingJakartaHttpServletRequest request,
+ final SlingJakartaHttpServletResponse response)
throws IOException {
final FilterHandle[] filters = filterManager.getFilters(FilterChainType.ERROR);
final FilterChain processor = new ErrorFilterChain(filters, errorHandler, status, message);
@@ -459,18 +485,20 @@ public class SlingRequestProcessorImpl implements SlingRequestProcessor {
}
private void handleError(
- final Throwable throwable, final SlingHttpServletRequest request, final SlingHttpServletResponse response)
+ final Throwable throwable,
+ final SlingJakartaHttpServletRequest request,
+ final SlingJakartaHttpServletResponse response)
throws IOException {
final FilterHandle[] filters = filterManager.getFilters(FilterChainType.ERROR);
final FilterChain processor = new ErrorFilterChain(filters, errorHandler, throwable);
this.handleError(processor, request, response);
}
- private static class ErrorResponseWrapper extends SlingHttpServletResponseWrapper {
+ private static class ErrorResponseWrapper extends SlingJakartaHttpServletResponseWrapper {
private PrintWriter writer;
- public ErrorResponseWrapper(SlingHttpServletResponse wrappedResponse) {
+ public ErrorResponseWrapper(SlingJakartaHttpServletResponse wrappedResponse) {
super(wrappedResponse);
}
diff --git a/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java b/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java
index 79677ae..6f85e3a 100644
--- a/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java
+++ b/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletRequestAdapter.java
@@ -18,13 +18,6 @@
*/
package org.apache.sling.engine.impl.adapter;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -33,8 +26,14 @@ import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.wrappers.SlingJakartaHttpServletRequestWrapper;
/**
* The <code>SlingServletRequestAdapter</code> class is a
@@ -45,11 +44,11 @@ import org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
* <code>HttpServletRequestWrapper</code> instead of a
* <code>ComponentRequestWrapper</code>.
*/
-public class SlingServletRequestAdapter extends SlingHttpServletRequestWrapper {
+public class SlingServletRequestAdapter extends SlingJakartaHttpServletRequestWrapper {
private final HttpServletRequest request;
- public SlingServletRequestAdapter(SlingHttpServletRequest delegatee, HttpServletRequest request) {
+ public SlingServletRequestAdapter(SlingJakartaHttpServletRequest delegatee, HttpServletRequest request) {
super(delegatee);
this.request = request;
}
@@ -184,12 +183,6 @@ public class SlingServletRequestAdapter extends SlingHttpServletRequestWrapper {
return request.isRequestedSessionIdFromURL();
}
- @Override
- @Deprecated
- public boolean isRequestedSessionIdFromUrl() {
- return request.isRequestedSessionIdFromUrl();
- }
-
@Override
public boolean isRequestedSessionIdValid() {
return request.isRequestedSessionIdValid();
@@ -270,12 +263,6 @@ public class SlingServletRequestAdapter extends SlingHttpServletRequestWrapper {
return request.getReader();
}
- @Override
- @Deprecated
- public String getRealPath(String path) {
- return request.getRealPath(path);
- }
-
@Override
public String getRemoteAddr() {
return request.getRemoteAddr();
@@ -292,12 +279,12 @@ public class SlingServletRequestAdapter extends SlingHttpServletRequestWrapper {
}
@Override
- public SlingHttpServletRequest getSlingRequest() {
+ public SlingJakartaHttpServletRequest getSlingRequest() {
// overwrite base class getSlingRequest since that method
// calls getRequest which is overwritten here to return the
// HttpServletRequest - we have to get the actual underlying
// request object which is available from the base class
- return (SlingHttpServletRequest) super.getRequest();
+ return (SlingJakartaHttpServletRequest) super.getRequest();
}
@Override
diff --git a/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java b/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java
index 5c28e4c..b31f871 100644
--- a/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java
+++ b/src/main/java/org/apache/sling/engine/impl/adapter/SlingServletResponseAdapter.java
@@ -18,17 +18,16 @@
*/
package org.apache.sling.engine.impl.adapter;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
+import org.apache.sling.api.wrappers.SlingJakartaHttpServletResponseWrapper;
/**
* The <code>SlingServletResponseAdapter</code> class is a
@@ -40,11 +39,11 @@ import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
* <code>SlingHttpServletResponseWrapper</code>. One such case is the Jasper
* runtime which does this.
*/
-public class SlingServletResponseAdapter extends SlingHttpServletResponseWrapper {
+public class SlingServletResponseAdapter extends SlingJakartaHttpServletResponseWrapper {
private final HttpServletResponse response;
- public SlingServletResponseAdapter(SlingHttpServletResponse delegatee, HttpServletResponse response) {
+ public SlingServletResponseAdapter(SlingJakartaHttpServletResponse delegatee, HttpServletResponse response) {
super(delegatee);
this.response = response;
}
@@ -84,23 +83,11 @@ public class SlingServletResponseAdapter extends SlingHttpServletResponseWrapper
return response.containsHeader(name);
}
- @Override
- @Deprecated
- public String encodeRedirectUrl(String url) {
- return response.encodeRedirectUrl(url);
- }
-
@Override
public String encodeRedirectURL(String url) {
return response.encodeRedirectURL(url);
}
- @Override
- @Deprecated
- public String encodeUrl(String url) {
- return response.encodeUrl(url);
- }
-
@Override
public String encodeURL(String url) {
return response.encodeURL(url);
@@ -136,12 +123,6 @@ public class SlingServletResponseAdapter extends SlingHttpServletResponseWrapper
response.setIntHeader(name, value);
}
- @Override
- @Deprecated
- public void setStatus(int sc, String sm) {
- response.setStatus(sc, sm);
- }
-
@Override
public void setStatus(int sc) {
response.setStatus(sc);
@@ -178,12 +159,12 @@ public class SlingServletResponseAdapter extends SlingHttpServletResponseWrapper
}
@Override
- public SlingHttpServletResponse getSlingResponse() {
+ public SlingJakartaHttpServletResponse getSlingResponse() {
// overwrite base class getSlingResponse since that method
// calls getResponse which is overwritten here to return the
// HttpServletResponse - we have to get the actual underlying
// response object which is available from the base class
- return (SlingHttpServletResponse) super.getResponse();
+ return (SlingJakartaHttpServletResponse) super.getResponse();
}
@Override
diff --git a/src/main/java/org/apache/sling/engine/impl/debug/RequestInfoProviderImpl.java b/src/main/java/org/apache/sling/engine/impl/debug/RequestInfoProviderImpl.java
index e487c92..316bb14 100644
--- a/src/main/java/org/apache/sling/engine/impl/debug/RequestInfoProviderImpl.java
+++ b/src/main/java/org/apache/sling/engine/impl/debug/RequestInfoProviderImpl.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.atomic.AtomicLong;
import java.util.regex.Pattern;
-import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.engine.RequestInfo;
import org.apache.sling.engine.RequestInfoProvider;
import org.apache.sling.engine.impl.Config;
@@ -88,14 +88,14 @@ public class RequestInfoProviderImpl implements RequestInfoProvider {
this.patterns = Collections.emptyList();
}
- public static void recordRequest(final SlingHttpServletRequest r) {
+ public static void recordRequest(final SlingJakartaHttpServletRequest r) {
final RequestInfoProviderImpl local = INSTANCE;
if (local != null) {
local.addRequest(r);
}
}
- private void addRequest(final SlingHttpServletRequest r) {
+ private void addRequest(final SlingJakartaHttpServletRequest r) {
final ConcurrentNavigableMap<String, RequestInfo> local = requests;
if (local != null && isEnabledFor(r.getPathInfo())) {
final RequestInfo info = new RequestInfoImpl(r);
@@ -178,7 +178,7 @@ public class RequestInfoProviderImpl implements RequestInfoProvider {
private final String log;
- RequestInfoImpl(final SlingHttpServletRequest request) {
+ RequestInfoImpl(final SlingJakartaHttpServletRequest request) {
this.id = String.valueOf(System.currentTimeMillis())
.concat("-")
.concat(String.valueOf(requestCounter.incrementAndGet()));
diff --git a/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java b/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java
index 477429e..0fae220 100644
--- a/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java
+++ b/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java
@@ -18,18 +18,17 @@
*/
package org.apache.sling.engine.impl.debug;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
import java.io.IOException;
import java.util.Arrays;
import java.util.Iterator;
-import org.apache.sling.api.SlingHttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.engine.EngineConstants;
@@ -112,8 +111,8 @@ public class RequestProgressTrackerLogFilter implements Filter {
chain.doFilter(request, response);
- if (request instanceof SlingHttpServletRequest) {
- final SlingHttpServletRequest slingRequest = (SlingHttpServletRequest) request;
+ if (request instanceof SlingJakartaHttpServletRequest) {
+ final SlingJakartaHttpServletRequest slingRequest = (SlingJakartaHttpServletRequest) request;
final RequestProgressTracker rpt = slingRequest.getRequestProgressTracker();
rpt.done();
@@ -151,7 +150,7 @@ public class RequestProgressTrackerLogFilter implements Filter {
}
}
- private String extractExtension(SlingHttpServletRequest request) {
+ private String extractExtension(SlingJakartaHttpServletRequest request) {
final RequestPathInfo requestPathInfo = request.getRequestPathInfo();
String extension = requestPathInfo.getExtension();
if (extension == null) {
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java b/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java
index 0b1ba5a..4e1dc09 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChain.java
@@ -18,15 +18,14 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
import java.io.IOException;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.engine.impl.request.RequestData;
import org.slf4j.Logger;
@@ -62,8 +61,8 @@ public abstract class AbstractSlingFilterChain implements FilterChain {
// the previous filter may have wrapped non-Sling request and response
// wrappers (e.g. WebCastellum does this), so we have to make
// sure the request and response are Sling types again
- SlingHttpServletRequest slingRequest = toSlingRequest(request);
- SlingHttpServletResponse slingResponse = toSlingResponse(response);
+ SlingJakartaHttpServletRequest slingRequest = toSlingRequest(request);
+ SlingJakartaHttpServletResponse slingResponse = toSlingResponse(response);
try {
@@ -98,7 +97,7 @@ public abstract class AbstractSlingFilterChain implements FilterChain {
}
}
- protected abstract void render(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ protected abstract void render(SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
throws IOException, ServletException;
// ---------- internal helper
@@ -131,18 +130,18 @@ public abstract class AbstractSlingFilterChain implements FilterChain {
}
}
- private SlingHttpServletRequest toSlingRequest(ServletRequest request) {
- if (request instanceof SlingHttpServletRequest) {
- return (SlingHttpServletRequest) request;
+ private SlingJakartaHttpServletRequest toSlingRequest(ServletRequest request) {
+ if (request instanceof SlingJakartaHttpServletRequest) {
+ return (SlingJakartaHttpServletRequest) request;
}
// wrap
return RequestData.toSlingHttpServletRequest(request);
}
- private SlingHttpServletResponse toSlingResponse(ServletResponse response) {
- if (response instanceof SlingHttpServletResponse) {
- return (SlingHttpServletResponse) response;
+ private SlingJakartaHttpServletResponse toSlingResponse(ServletResponse response) {
+ if (response instanceof SlingJakartaHttpServletResponse) {
+ return (SlingJakartaHttpServletResponse) response;
}
// wrap
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/ErrorFilterChain.java b/src/main/java/org/apache/sling/engine/impl/filter/ErrorFilterChain.java
index d2d8e3f..cdf377f 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/ErrorFilterChain.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/ErrorFilterChain.java
@@ -18,15 +18,14 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
import java.io.IOException;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.api.servlets.ErrorHandler;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
+import org.apache.sling.api.servlets.JakartaErrorHandler;
public class ErrorFilterChain extends AbstractSlingFilterChain {
@@ -45,7 +44,7 @@ public class ErrorFilterChain extends AbstractSlingFilterChain {
private final String message;
- private final ErrorHandler errorHandler;
+ private final JakartaErrorHandler errorHandler;
private final Throwable throwable;
@@ -54,7 +53,10 @@ public class ErrorFilterChain extends AbstractSlingFilterChain {
private boolean firstCall = true;
public ErrorFilterChain(
- final FilterHandle[] filters, final ErrorHandler errorHandler, final int status, final String message) {
+ final FilterHandle[] filters,
+ final JakartaErrorHandler errorHandler,
+ final int status,
+ final String message) {
super(filters);
this.mode = Mode.STATUS;
this.status = status;
@@ -63,7 +65,7 @@ public class ErrorFilterChain extends AbstractSlingFilterChain {
this.throwable = null;
}
- public ErrorFilterChain(final FilterHandle[] filters, final ErrorHandler errorHandler, final Throwable t) {
+ public ErrorFilterChain(final FilterHandle[] filters, final JakartaErrorHandler errorHandler, final Throwable t) {
super(filters);
this.mode = Mode.THROWABLE;
this.status = 0;
@@ -123,7 +125,7 @@ public class ErrorFilterChain extends AbstractSlingFilterChain {
super.doFilter(request, response);
}
- protected void render(final SlingHttpServletRequest request, final SlingHttpServletResponse response)
+ protected void render(final SlingJakartaHttpServletRequest request, final SlingJakartaHttpServletResponse response)
throws IOException, ServletException {
if (this.mode == Mode.STATUS) {
this.errorHandler.handleError(this.status, this.message, request, response);
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/FilterHandle.java b/src/main/java/org/apache/sling/engine/impl/filter/FilterHandle.java
index 4db8a0f..3df0f0e 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/FilterHandle.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/FilterHandle.java
@@ -18,11 +18,10 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.Filter;
-
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.sling.api.SlingHttpServletRequest;
+import jakarta.servlet.Filter;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
public class FilterHandle implements Comparable<FilterHandle> {
@@ -75,7 +74,7 @@ public class FilterHandle implements Comparable<FilterHandle> {
return orderSource;
}
- boolean select(SlingHttpServletRequest slingHttpServletRequest) {
+ boolean select(SlingJakartaHttpServletRequest slingHttpServletRequest) {
if (predicate != null) {
return predicate.test(slingHttpServletRequest);
}
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/FilterPredicate.java b/src/main/java/org/apache/sling/engine/impl/filter/FilterPredicate.java
index 01d524a..12241c9 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/FilterPredicate.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/FilterPredicate.java
@@ -18,13 +18,12 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.Filter;
-
import java.util.Collection;
import java.util.Collections;
import java.util.regex.Pattern;
-import org.apache.sling.api.SlingHttpServletRequest;
+import jakarta.servlet.Filter;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
import org.osgi.framework.ServiceReference;
@@ -114,7 +113,7 @@ public class FilterPredicate {
* @return true if the request's resource is of one of the types, or if not or misconfigured
*/
private boolean anyResourceTypeMatches(
- final Collection<String> resourceTypes, final SlingHttpServletRequest request) {
+ final Collection<String> resourceTypes, final SlingJakartaHttpServletRequest request) {
if (resourceTypes == null) {
return true;
}
@@ -142,7 +141,7 @@ public class FilterPredicate {
* @param req request that is tested upon this predicate
* @return true if this predicate's configuration match the request
*/
- boolean test(final SlingHttpServletRequest req) {
+ boolean test(final SlingJakartaHttpServletRequest req) {
LOG.debug("starting filter test against {} request", req);
final RequestPathInfo requestPathInfo = req.getRequestPathInfo();
final String path = requestPathInfo.getResourcePath();
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java b/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
index 9ec3610..ba29644 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/RequestSlingFilterChain.java
@@ -18,19 +18,18 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.ServletException;
-
import java.io.IOException;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import jakarta.servlet.ServletException;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
import org.apache.sling.engine.impl.filter.ServletFilterManager.FilterChainType;
/**
* The <code>RequestSlingFilterChain</code> implements the filter chain for
* request scoped filters. It is used by the
- * {@link org.apache.sling.engine.impl.SlingMainServlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)}
+ * {@link org.apache.sling.engine.impl.SlingMainServlet#service(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse)}
* method to dispatch request processing.
*/
public class RequestSlingFilterChain extends AbstractSlingFilterChain {
@@ -43,7 +42,7 @@ public class RequestSlingFilterChain extends AbstractSlingFilterChain {
}
@Override
- protected void render(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ protected void render(SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
throws ServletException, IOException {
handler.processComponent(request, response, FilterChainType.COMPONENT);
}
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 f314137..75967ec 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
@@ -18,16 +18,16 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+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.engine.EngineConstants;
import org.apache.sling.engine.impl.SlingHttpContext;
import org.apache.sling.engine.impl.helper.SlingFilterConfig;
@@ -130,7 +130,7 @@ public class ServletFilterManager {
updated = "updatedFilter",
policy = ReferencePolicy.DYNAMIC,
cardinality = ReferenceCardinality.MULTIPLE,
- target = "(|(" + EngineConstants.SLING_FILTER_SCOPE + "=*)(" + EngineConstants.FILTER_SCOPE + "=*))")
+ target = "(" + EngineConstants.SLING_FILTER_SCOPE + "=*)")
public void bindFilter(final ServiceReference<Filter> reference, final Filter filter) {
initFilter(reference, filter);
}
@@ -151,6 +151,43 @@ public class ServletFilterManager {
destroyFilter(reference, service);
}
+ @Reference(
+ service = javax.servlet.Filter.class,
+ updated = "updatedFilter",
+ policy = ReferencePolicy.DYNAMIC,
+ cardinality = ReferenceCardinality.MULTIPLE,
+ target = "(|(" + EngineConstants.SLING_FILTER_SCOPE + "=*)(" + EngineConstants.FILTER_SCOPE + "=*))")
+ public void bindFilter(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);
+ initFilter(ref, s);
+ }
+
+ public void updatedFilter(
+ 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);
+ // 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))) {
+ removeFilterFromChains((Long) reference.getProperty(Constants.SERVICE_ID));
+ addFilterToChains(s, ref);
+ } else {
+ destroyFilter(ref, s);
+ initFilter(ref, s);
+ }
+ }
+
+ public void unbindFilter(
+ 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);
+ destroyFilter(ref, s);
+ }
+
private void initFilter(final ServiceReference<Filter> reference, final Filter filter) {
final String filterName = SlingFilterConfig.getName(reference);
final Long serviceId = (Long) reference.getProperty(Constants.SERVICE_ID);
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java b/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java
index 9866b6a..4516c6c 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/SlingComponentFilterChain.java
@@ -18,18 +18,17 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.ServletException;
-
import java.io.IOException;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import jakarta.servlet.ServletException;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.engine.impl.request.RequestData;
/**
* The <code>SlingComponentFilterChain</code> implements the filter chain for
* component scoped filters. It is used by the
- * {@link org.apache.sling.engine.impl.SlingMainServlet#service(javax.servlet.ServletRequest, javax.servlet.ServletResponse)}
+ * {@link org.apache.sling.engine.impl.SlingMainServlet#service(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse)}
*
* method to dispatch component processing.
*/
@@ -39,7 +38,7 @@ public class SlingComponentFilterChain extends AbstractSlingFilterChain {
super(filters);
}
- protected void render(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ protected void render(SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
throws IOException, ServletException {
RequestData.service(request, response);
}
diff --git a/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java b/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
index d191f5e..33c74ba 100644
--- a/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
+++ b/src/main/java/org/apache/sling/engine/impl/filter/SlingFilterChainHelper.java
@@ -18,12 +18,12 @@
*/
package org.apache.sling.engine.impl.filter;
-import javax.servlet.Filter;
-
import java.util.Iterator;
import java.util.SortedSet;
import java.util.TreeSet;
+import jakarta.servlet.Filter;
+
/**
* The <code>SlingFilterChainHelper</code> class is used by Sling to
* support building lists of <code>Filter</code>s. To ensure filter
diff --git a/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java b/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
index fd115f0..7ed87e7 100644
--- a/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
+++ b/src/main/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapper.java
@@ -18,22 +18,6 @@
*/
package org.apache.sling.engine.impl.helper;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRegistration.Dynamic;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletResponseWrapper;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
-
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -43,8 +27,23 @@ import java.util.EventListener;
import java.util.Map;
import java.util.Set;
-import org.apache.sling.engine.impl.SlingHttpServletRequestImpl;
-import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletRegistration.Dynamic;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestWrapper;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.ServletResponseWrapper;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletResponseImpl;
/**
* Wrapper around a ServletContext for an external servlet context, i.e. one
@@ -107,35 +106,11 @@ class ExternalServletContextWrapper implements ServletContext {
return new RequestDispatcherWrapper(getServletContext().getNamedDispatcher(s));
}
- @Deprecated
- @Override
- public Servlet getServlet(String s) throws ServletException {
- return getServletContext().getServlet(s);
- }
-
- @Deprecated
- @Override
- public Enumeration<Servlet> getServlets() {
- return getServletContext().getServlets();
- }
-
- @Deprecated
- @Override
- public Enumeration<String> getServletNames() {
- return getServletContext().getServletNames();
- }
-
@Override
public void log(String s) {
getServletContext().log(s);
}
- @Deprecated
- @Override
- public void log(Exception exception, String s) {
- getServletContext().log(exception, s);
- }
-
@Override
public void log(String s, Throwable throwable) {
getServletContext().log(s, throwable);
@@ -218,8 +193,8 @@ class ExternalServletContextWrapper implements ServletContext {
static ServletRequest unwrapServletRequest(ServletRequest request) {
ServletRequest lastRequest = request;
while (request != null) {
- if (request instanceof SlingHttpServletRequestImpl) {
- return ((SlingHttpServletRequestImpl) request).getRequest();
+ if (request instanceof SlingJakartaHttpServletRequestImpl) {
+ return ((SlingJakartaHttpServletRequestImpl) request).getRequest();
} else if (request instanceof ServletRequestWrapper) {
lastRequest = request;
request = ((ServletRequestWrapper) request).getRequest();
@@ -233,8 +208,8 @@ class ExternalServletContextWrapper implements ServletContext {
static ServletResponse unwrapServletResponse(ServletResponse response) {
ServletResponse lastResponse = response;
while (response != null) {
- if (response instanceof SlingHttpServletResponseImpl) {
- return ((SlingHttpServletResponseImpl) response).getResponse();
+ if (response instanceof SlingJakartaHttpServletResponseImpl) {
+ return ((SlingJakartaHttpServletResponseImpl) response).getResponse();
} else if (response instanceof ServletResponseWrapper) {
lastResponse = response;
response = ((ServletResponseWrapper) response).getResponse();
@@ -292,17 +267,18 @@ class ExternalServletContextWrapper implements ServletContext {
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
+ public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
return getServletContext().addFilter(filterName, className);
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
+ public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
return getServletContext().addFilter(filterName, filter);
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
+ public jakarta.servlet.FilterRegistration.Dynamic addFilter(
+ String filterName, Class<? extends Filter> filterClass) {
return getServletContext().addFilter(filterName, filterClass);
}
@@ -380,4 +356,39 @@ class ExternalServletContextWrapper implements ServletContext {
public String getVirtualServerName() {
return getServletContext().getVirtualServerName();
}
+
+ @Override
+ public Dynamic addJspFile(String servletName, String jspFile) {
+ return getServletContext().addJspFile(servletName, jspFile);
+ }
+
+ @Override
+ public String getRequestCharacterEncoding() {
+ return getServletContext().getRequestCharacterEncoding();
+ }
+
+ @Override
+ public String getResponseCharacterEncoding() {
+ return getServletContext().getResponseCharacterEncoding();
+ }
+
+ @Override
+ public int getSessionTimeout() {
+ return getServletContext().getSessionTimeout();
+ }
+
+ @Override
+ public void setRequestCharacterEncoding(String encoding) {
+ getServletContext().setRequestCharacterEncoding(encoding);
+ }
+
+ @Override
+ public void setResponseCharacterEncoding(String encoding) {
+ getServletContext().setResponseCharacterEncoding(encoding);
+ }
+
+ @Override
+ public void setSessionTimeout(int sessionTimeout) {
+ getServletContext().setSessionTimeout(sessionTimeout);
+ }
}
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 c8ba45d..aab8168 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
@@ -18,11 +18,14 @@
*/
package org.apache.sling.engine.impl.helper;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
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.engine.impl.SlingHttpContext;
@@ -52,6 +55,12 @@ public class RequestListenerManager {
fieldOption = FieldOption.REPLACE)
private volatile List<SlingRequestListener> listeners;
+ @Reference(
+ cardinality = ReferenceCardinality.MULTIPLE,
+ policy = ReferencePolicy.DYNAMIC,
+ fieldOption = FieldOption.REPLACE)
+ private volatile List<SlingJakartaRequestListener> jakartaListeners;
+
@Activate
public RequestListenerManager(
@Reference(target = "(name=" + SlingHttpContext.SERVLET_CONTEXT_NAME + ")")
@@ -59,11 +68,26 @@ public class RequestListenerManager {
this.servletContext = servletContext;
}
- public void sendEvent(final HttpServletRequest request, final SlingRequestEvent.EventType type) {
- final List<SlingRequestListener> local = listeners;
+ public void sendEvent(final HttpServletRequest request, final SlingJakartaRequestEvent.EventType type) {
+ final List<SlingJakartaRequestListener> local = jakartaListeners;
if (local != null && !local.isEmpty()) {
- final SlingRequestEvent event = new SlingRequestEvent(this.servletContext, request, type);
- for (final SlingRequestListener service : local) {
+ final SlingJakartaRequestEvent event = new SlingJakartaRequestEvent(this.servletContext, request, type);
+ for (final SlingJakartaRequestListener service : local) {
+ try {
+ service.onEvent(event);
+ } catch (final Throwable t) {
+ logger.error("Error invoking sling request listener " + service + " : " + t.getMessage(), t);
+ }
+ }
+ }
+ final List<SlingRequestListener> localDep = listeners;
+ if (localDep != null && !localDep.isEmpty()) {
+ final SlingRequestEvent.EventType eventType = type == SlingJakartaRequestEvent.EventType.EVENT_INIT
+ ? SlingRequestEvent.EventType.EVENT_INIT
+ : SlingRequestEvent.EventType.EVENT_DESTROY;
+ final SlingRequestEvent event = new SlingRequestEvent(
+ new ServletContextWrapper(this.servletContext), new HttpServletRequestWrapper(request), eventType);
+ for (final SlingRequestListener service : localDep) {
try {
service.onEvent(event);
} catch (final Throwable t) {
diff --git a/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java b/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java
index cba44b4..692ec9f 100644
--- a/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java
+++ b/src/main/java/org/apache/sling/engine/impl/helper/SlingFilterConfig.java
@@ -18,15 +18,14 @@
*/
package org.apache.sling.engine.impl.helper;
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
import org.osgi.framework.ServiceReference;
import static org.osgi.framework.Constants.SERVICE_ID;
diff --git a/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java b/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
index e59ffc5..3873683 100644
--- a/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
+++ b/src/main/java/org/apache/sling/engine/impl/helper/SlingServletContext.java
@@ -18,19 +18,6 @@
*/
package org.apache.sling.engine.impl.helper;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRegistration.Dynamic;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
-
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -42,6 +29,18 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.Set;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.ServletRegistration.Dynamic;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
import org.apache.sling.engine.impl.Config;
import org.apache.sling.engine.impl.ProductInfoProvider;
import org.apache.sling.engine.impl.SlingHttpContext;
@@ -53,9 +52,9 @@ import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardContextSelect;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardListener;
+import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardContextSelect;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -568,13 +567,6 @@ public class SlingServletContext implements ServletContext, ServletContextListen
log.info(message);
}
- /** Logs the message and optional exception at error level to the logger */
- @Override
- @Deprecated
- public void log(Exception exception, String message) {
- log(message, exception);
- }
-
// ---------- foreign Servlets ---------------------------------------------
/**
@@ -595,27 +587,6 @@ public class SlingServletContext implements ServletContext, ServletContextListen
return null;
}
- /** Returns <code>null</code> as defined in Servlet API 2.4 */
- @Override
- @Deprecated
- public Servlet getServlet(String name) {
- return null;
- }
-
- /** Returns an empty enumeration as defined in Servlet API 2.4 */
- @Override
- @Deprecated
- public Enumeration<String> getServletNames() {
- return Collections.enumeration(Collections.<String>emptyList());
- }
-
- /** Returns an empty enumeration as defined in Servlet API 2.4 */
- @Override
- @Deprecated
- public Enumeration<Servlet> getServlets() {
- return Collections.enumeration(Collections.<Servlet>emptyList());
- }
-
@Override
public int getEffectiveMajorVersion() {
ServletContext delegatee = getServletContext();
@@ -690,21 +661,21 @@ public class SlingServletContext implements ServletContext, ServletContextListen
// Servlet API 3.0, Section 4.4 Configuration methods
@Override
- public Dynamic addServlet(String servletName, String className) {
+ public ServletRegistration.Dynamic addServlet(String servletName, String className) {
// only supported in ServletContextListener.contextInitialized or
// ServletContainerInitializer.onStartuo
throw new IllegalStateException();
}
@Override
- public Dynamic addServlet(String servletName, Servlet servlet) {
+ public ServletRegistration.Dynamic addServlet(String servletName, Servlet servlet) {
// only supported in ServletContextListener.contextInitialized or
// ServletContainerInitializer.onStartuo
throw new IllegalStateException();
}
@Override
- public Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
+ public ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass) {
// only supported in ServletContextListener.contextInitialized or
// ServletContainerInitializer.onStartuo
throw new IllegalStateException();
@@ -732,21 +703,21 @@ public class SlingServletContext implements ServletContext, ServletContextListen
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) {
+ public FilterRegistration.Dynamic addFilter(String filterName, String className) {
// only supported in ServletContextListener.contextInitialized or
// ServletContainerInitializer.onStartuo
throw new IllegalStateException();
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
+ public FilterRegistration.Dynamic addFilter(String filterName, Filter filter) {
// only supported in ServletContextListener.contextInitialized or
// ServletContainerInitializer.onStartuo
throw new IllegalStateException();
}
@Override
- public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
+ public FilterRegistration.Dynamic addFilter(String filterName, Class<? extends Filter> filterClass) {
// only supported in ServletContextListener.contextInitialized or
// ServletContainerInitializer.onStartuo
throw new IllegalStateException();
@@ -806,6 +777,49 @@ public class SlingServletContext implements ServletContext, ServletContextListen
return getServletContext().getVirtualServerName();
}
+ @Override
+ public Dynamic addJspFile(String servletName, String jspFile) {
+ // only supported in ServletContextListener.contextInitialized or
+ // ServletContainerInitializer.onStartuo
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public String getRequestCharacterEncoding() {
+ return this.getServletContext().getRequestCharacterEncoding();
+ }
+
+ @Override
+ public String getResponseCharacterEncoding() {
+ return this.getServletContext().getResponseCharacterEncoding();
+ }
+
+ @Override
+ public int getSessionTimeout() {
+ return this.getServletContext().getSessionTimeout();
+ }
+
+ @Override
+ public void setRequestCharacterEncoding(String encoding) {
+ // only supported in ServletContextListener.contextInitialized or
+ // ServletContainerInitializer.onStartuo
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public void setResponseCharacterEncoding(String encoding) {
+ // only supported in ServletContextListener.contextInitialized or
+ // ServletContainerInitializer.onStartuo
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public void setSessionTimeout(int sessionTimeout) {
+ // only supported in ServletContextListener.contextInitialized or
+ // ServletContainerInitializer.onStartuo
+ throw new IllegalStateException();
+ }
+
// ---------- internal -----------------------------------------------------
/**
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
index e7e62c9..6bcaa68 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
@@ -18,9 +18,6 @@
*/
package org.apache.sling.engine.impl.parameters;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -32,6 +29,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.RequestContext;
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupportHttpServletRequestWrapper.java b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupportHttpServletRequestWrapper.java
index e1fce81..e66a12b 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupportHttpServletRequestWrapper.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupportHttpServletRequestWrapper.java
@@ -18,14 +18,14 @@
*/
package org.apache.sling.engine.impl.parameters;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.Part;
-
import java.util.Collection;
import java.util.Enumeration;
import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.Part;
+
public class ParameterSupportHttpServletRequestWrapper extends HttpServletRequestWrapper {
public ParameterSupportHttpServletRequestWrapper(HttpServletRequest request) {
super(request);
diff --git a/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportConfigurer.java b/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportConfigurer.java
index a9beeb8..78586a3 100644
--- a/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportConfigurer.java
+++ b/src/main/java/org/apache/sling/engine/impl/parameters/RequestParameterSupportConfigurer.java
@@ -18,18 +18,17 @@
*/
package org.apache.sling.engine.impl.parameters;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import java.io.File;
import java.io.IOException;
-import org.apache.sling.api.SlingHttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -37,11 +36,11 @@ import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.propertytypes.ServiceDescription;
import org.osgi.service.component.propertytypes.ServiceRanking;
import org.osgi.service.component.propertytypes.ServiceVendor;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardContextSelect;
-import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardFilterPattern;
import org.osgi.service.metatype.annotations.AttributeDefinition;
import org.osgi.service.metatype.annotations.Designate;
import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardContextSelect;
+import org.osgi.service.servlet.whiteboard.propertytypes.HttpWhiteboardFilterPattern;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,7 +61,7 @@ public class RequestParameterSupportConfigurer implements Filter {
throws IOException, ServletException {
if (request instanceof HttpServletRequest
&& !(request instanceof ParameterSupportHttpServletRequestWrapper)
- && !(request instanceof SlingHttpServletRequest)) {
+ && !(request instanceof SlingJakartaHttpServletRequest)) {
chain.doFilter(ParameterSupport.getParameterSupportRequestWrapper((HttpServletRequest) request), response);
} else {
chain.doFilter(request, response);
diff --git a/src/main/java/org/apache/sling/engine/impl/request/ContentData.java b/src/main/java/org/apache/sling/engine/impl/request/ContentData.java
index e86065a..2520daf 100644
--- a/src/main/java/org/apache/sling/engine/impl/request/ContentData.java
+++ b/src/main/java/org/apache/sling/engine/impl/request/ContentData.java
@@ -18,8 +18,7 @@
*/
package org.apache.sling.engine.impl.request;
-import javax.servlet.Servlet;
-
+import jakarta.servlet.Servlet;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
diff --git a/src/main/java/org/apache/sling/engine/impl/request/DispatchingInfo.java b/src/main/java/org/apache/sling/engine/impl/request/DispatchingInfo.java
index 6ea44d1..b5a3cc9 100644
--- a/src/main/java/org/apache/sling/engine/impl/request/DispatchingInfo.java
+++ b/src/main/java/org/apache/sling/engine/impl/request/DispatchingInfo.java
@@ -18,9 +18,8 @@
*/
package org.apache.sling.engine.impl.request;
-import javax.servlet.DispatcherType;
-import javax.servlet.Servlet;
-
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.Servlet;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.resource.Resource;
diff --git a/src/main/java/org/apache/sling/engine/impl/request/RequestData.java b/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
index 894ceab..049bfaf 100644
--- a/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
+++ b/src/main/java/org/apache/sling/engine/impl/request/RequestData.java
@@ -18,16 +18,6 @@
*/
package org.apache.sling.engine.impl.request;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletRequestWrapper;
-import javax.servlet.ServletResponse;
-import javax.servlet.ServletResponseWrapper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -37,8 +27,17 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletRequestWrapper;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.ServletResponseWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.api.request.RecursionTooDeepException;
import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.request.RequestProgressTracker;
@@ -48,10 +47,10 @@ import org.apache.sling.api.request.builder.Builders;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.ServletResolver;
-import org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
-import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
-import org.apache.sling.engine.impl.SlingHttpServletRequestImpl;
-import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
+import org.apache.sling.api.wrappers.SlingJakartaHttpServletRequestWrapper;
+import org.apache.sling.api.wrappers.SlingJakartaHttpServletResponseWrapper;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletResponseImpl;
import org.apache.sling.engine.impl.SlingMainServlet;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
import org.apache.sling.engine.impl.adapter.SlingServletRequestAdapter;
@@ -103,10 +102,10 @@ public class RequestData {
private final HttpServletResponse servletResponse;
/** The original servlet Servlet Request Object */
- private final SlingHttpServletRequest slingRequest;
+ private final SlingJakartaHttpServletRequest slingRequest;
/** The original servlet Servlet Response object */
- private final SlingHttpServletResponse slingResponse;
+ private final SlingJakartaHttpServletResponse slingResponse;
private final boolean protectHeadersOnInclude;
@@ -182,13 +181,13 @@ public class RequestData {
this.checkContentTypeOnInclude = checkContentTypeOnInclude;
this.disableCheckCompliantGetUserPrincipal = disableCheckCompliantGetUserPrincipal;
- this.slingRequest = new SlingHttpServletRequestImpl(this, this.servletRequest);
+ this.slingRequest = new SlingJakartaHttpServletRequestImpl(this, this.servletRequest);
- this.slingResponse = new SlingHttpServletResponseImpl(this, this.servletResponse);
+ this.slingResponse = new SlingJakartaHttpServletResponseImpl(this, this.servletResponse);
// Use tracker from SlingHttpServletRequest
- if (request instanceof SlingHttpServletRequest) {
- this.requestProgressTracker = ((SlingHttpServletRequest) request).getRequestProgressTracker();
+ if (request instanceof SlingJakartaHttpServletRequest) {
+ this.requestProgressTracker = ((SlingJakartaHttpServletRequest) request).getRequestProgressTracker();
} else {
// Getting the RequestProgressTracker from the request attributes like
// this should not be generally used, it's just a way to pass it from
@@ -211,7 +210,7 @@ public class RequestData {
// resolve the resource
requestProgressTracker.startTimer("ResourceResolution");
- final SlingHttpServletRequest request = getSlingRequest();
+ final SlingJakartaHttpServletRequest request = getSlingRequest();
StringBuffer requestURL = servletRequest.getRequestURL();
String path = request.getPathInfo();
@@ -246,7 +245,7 @@ public class RequestData {
// finally resolve the servlet for the resource
requestProgressTracker.startTimer("ServletResolution");
- Servlet servlet = sr.resolveServlet(slingRequest);
+ Servlet servlet = sr.resolve(slingRequest);
requestProgressTracker.logTimer(
"ServletResolution",
"URI={0} handled by Servlet={1}",
@@ -267,11 +266,11 @@ public class RequestData {
return servletResponse;
}
- public SlingHttpServletRequest getSlingRequest() {
+ public SlingJakartaHttpServletRequest getSlingRequest() {
return slingRequest;
}
- public SlingHttpServletResponse getSlingResponse() {
+ public SlingJakartaHttpServletResponse getSlingResponse() {
return slingResponse;
}
@@ -295,11 +294,11 @@ public class RequestData {
* <code>ServletRequestWrapper</code> wrapping a
* <code>SlingHttpServletRequest</code>.
*/
- public static SlingHttpServletRequest unwrap(ServletRequest request) {
+ public static SlingJakartaHttpServletRequest unwrap(ServletRequest request) {
// early check for most cases
- if (request instanceof SlingHttpServletRequest) {
- return (SlingHttpServletRequest) request;
+ if (request instanceof SlingJakartaHttpServletRequest) {
+ return (SlingJakartaHttpServletRequest) request;
}
// unwrap wrappers
@@ -307,8 +306,8 @@ public class RequestData {
request = ((ServletRequestWrapper) request).getRequest();
// immediate termination if we found one
- if (request instanceof SlingHttpServletRequest) {
- return (SlingHttpServletRequest) request;
+ if (request instanceof SlingJakartaHttpServletRequest) {
+ return (SlingJakartaHttpServletRequest) request;
}
}
@@ -327,13 +326,13 @@ public class RequestData {
* <code>SlingHttpServletRequestWrapper</code> wrapping a
* <code>SlingHttpServletRequestImpl</code>.
*/
- public static SlingHttpServletRequestImpl unwrap(SlingHttpServletRequest request) {
- while (request instanceof SlingHttpServletRequestWrapper) {
- request = ((SlingHttpServletRequestWrapper) request).getSlingRequest();
+ public static SlingJakartaHttpServletRequestImpl unwrap(SlingJakartaHttpServletRequest request) {
+ while (request instanceof SlingJakartaHttpServletRequestWrapper) {
+ request = ((SlingJakartaHttpServletRequestWrapper) request).getSlingRequest();
}
- if (request instanceof SlingHttpServletRequestImpl) {
- return (SlingHttpServletRequestImpl) request;
+ if (request instanceof SlingJakartaHttpServletRequestImpl) {
+ return (SlingJakartaHttpServletRequestImpl) request;
}
throw new IllegalArgumentException("SlingHttpServletRequest not of correct type");
@@ -349,11 +348,11 @@ public class RequestData {
* <code>ServletResponseWrapper</code> wrapping a
* <code>SlingHttpServletResponse</code>.
*/
- public static SlingHttpServletResponse unwrap(ServletResponse response) {
+ public static SlingJakartaHttpServletResponse unwrap(ServletResponse response) {
// early check for most cases
- if (response instanceof SlingHttpServletResponse) {
- return (SlingHttpServletResponse) response;
+ if (response instanceof SlingJakartaHttpServletResponse) {
+ return (SlingJakartaHttpServletResponse) response;
}
// unwrap wrappers
@@ -361,8 +360,8 @@ public class RequestData {
response = ((ServletResponseWrapper) response).getResponse();
// immediate termination if we found one
- if (response instanceof SlingHttpServletResponse) {
- return (SlingHttpServletResponse) response;
+ if (response instanceof SlingJakartaHttpServletResponse) {
+ return (SlingJakartaHttpServletResponse) response;
}
}
@@ -381,13 +380,13 @@ public class RequestData {
* <code>SlingHttpServletResponseWrapper</code> wrapping a
* <code>SlingHttpServletResponseImpl</code>.
*/
- public static SlingHttpServletResponseImpl unwrap(SlingHttpServletResponse response) {
- while (response instanceof SlingHttpServletResponseWrapper) {
- response = ((SlingHttpServletResponseWrapper) response).getSlingResponse();
+ public static SlingJakartaHttpServletResponseImpl unwrap(SlingJakartaHttpServletResponse response) {
+ while (response instanceof SlingJakartaHttpServletResponseWrapper) {
+ response = ((SlingJakartaHttpServletResponseWrapper) response).getSlingResponse();
}
- if (response instanceof SlingHttpServletResponseImpl) {
- return (SlingHttpServletResponseImpl) response;
+ if (response instanceof SlingJakartaHttpServletResponseImpl) {
+ return (SlingJakartaHttpServletResponseImpl) response;
}
throw new IllegalArgumentException("SlingHttpServletResponse not of correct type");
@@ -413,7 +412,7 @@ public class RequestData {
* <code>SlingHttpServletRequestWrapper</code> wrapping a
* <code>SlingHttpServletRequestImpl</code>.
*/
- public static RequestData getRequestData(SlingHttpServletRequest request) {
+ public static RequestData getRequestData(SlingJakartaHttpServletRequest request) {
return unwrap(request).getRequestData();
}
@@ -424,11 +423,11 @@ public class RequestData {
* <code>HttpServletRequest</code> of if <code>request</code>
* is not backed by <code>SlingHttpServletRequestImpl</code>.
*/
- public static SlingHttpServletRequest toSlingHttpServletRequest(ServletRequest request) {
+ public static SlingJakartaHttpServletRequest toSlingHttpServletRequest(ServletRequest request) {
// unwrap to SlingHttpServletRequest, may throw if no
// SlingHttpServletRequest is wrapped in request
- SlingHttpServletRequest cRequest = unwrap(request);
+ SlingJakartaHttpServletRequest cRequest = unwrap(request);
// ensure the SlingHttpServletRequest is backed by
// SlingHttpServletRequestImpl
@@ -457,10 +456,10 @@ public class RequestData {
* <code>response</code> is not backed by
* <code>SlingHttpServletResponseImpl</code>.
*/
- public static SlingHttpServletResponse toSlingHttpServletResponse(ServletResponse response) {
+ public static SlingJakartaHttpServletResponse toSlingHttpServletResponse(ServletResponse response) {
// unwrap to SlingHttpServletResponse
- SlingHttpServletResponse cResponse = unwrap(response);
+ SlingJakartaHttpServletResponse cResponse = unwrap(response);
// if the servlet response is actually the SlingHttpServletResponse, we
// are done
@@ -499,7 +498,7 @@ public class RequestData {
* @throws IOException May be thrown by the servlet's service method
* @throws ServletException May be thrown by the servlet's service method
*/
- public static void service(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ public static void service(SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
throws IOException, ServletException {
if (!isValidRequest(
diff --git a/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java b/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java
index 7601020..2ac7384 100644
--- a/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java
+++ b/src/main/java/org/apache/sling/engine/impl/request/SlingRequestDispatcher.java
@@ -18,17 +18,16 @@
*/
package org.apache.sling.engine.impl.request;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import java.io.IOException;
-import org.apache.sling.api.SlingHttpServletRequest;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.resource.Resource;
@@ -131,7 +130,7 @@ public class SlingRequestDispatcher implements RequestDispatcher {
}
}
- private String getAbsolutePath(SlingHttpServletRequest request, String path) {
+ private String getAbsolutePath(SlingJakartaHttpServletRequest request, String path) {
// path is already absolute
if (path.startsWith("/")) {
return path;
@@ -157,7 +156,7 @@ public class SlingRequestDispatcher implements RequestDispatcher {
private void dispatch(
final ServletRequest request, final ServletResponse response, final DispatchingInfo dispatchingInfo)
throws ServletException, IOException {
- SlingHttpServletRequest cRequest = RequestData.unwrap(request);
+ SlingJakartaHttpServletRequest cRequest = RequestData.unwrap(request);
RequestData rd = RequestData.getRequestData(cRequest);
String absPath = getAbsolutePath(cRequest, path);
RequestProgressTracker requestProgressTracker = cRequest.getRequestProgressTracker();
@@ -211,7 +210,7 @@ public class SlingRequestDispatcher implements RequestDispatcher {
* may be wrapped with a {@link TypeOverwritingResourceWrapper} as a result
* of calling this method.
*/
- private SlingRequestPathInfo getMergedRequestPathInfo(final SlingHttpServletRequest cRequest) {
+ private SlingRequestPathInfo getMergedRequestPathInfo(final SlingJakartaHttpServletRequest cRequest) {
SlingRequestPathInfo info = new SlingRequestPathInfo(resource);
info = info.merge(cRequest.getRequestPathInfo());
diff --git a/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java b/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java
index a7227f5..d40f667 100644
--- a/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/SlingHttpServletRequestImplTest.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue;
public class SlingHttpServletRequestImplTest {
- SlingHttpServletRequestImpl slingHttpServletRequestImpl;
+ SlingJakartaHttpServletRequestImpl slingHttpServletRequestImpl;
private Mockery context = new JUnit4Mockery() {
{
@@ -80,7 +80,7 @@ public class SlingHttpServletRequestImplTest {
}
});
- slingHttpServletRequestImpl = new SlingHttpServletRequestImpl(requestData, servletRequest);
+ slingHttpServletRequestImpl = new SlingJakartaHttpServletRequestImpl(requestData, servletRequest);
assertEquals(
"UserPrincipal: remoteUser",
slingHttpServletRequestImpl.getUserPrincipal().toString());
@@ -116,7 +116,7 @@ public class SlingHttpServletRequestImplTest {
}
});
- slingHttpServletRequestImpl = new SlingHttpServletRequestImpl(requestData, servletRequest);
+ slingHttpServletRequestImpl = new SlingJakartaHttpServletRequestImpl(requestData, servletRequest);
assertEquals(
"UserPrincipal: remoteUser",
slingHttpServletRequestImpl.getUserPrincipal().toString());
@@ -152,7 +152,7 @@ public class SlingHttpServletRequestImplTest {
}
});
- slingHttpServletRequestImpl = new SlingHttpServletRequestImpl(requestData, servletRequest);
+ slingHttpServletRequestImpl = new SlingJakartaHttpServletRequestImpl(requestData, servletRequest);
assertNull(slingHttpServletRequestImpl.getUserPrincipal());
}
@@ -187,7 +187,7 @@ public class SlingHttpServletRequestImplTest {
}
});
- slingHttpServletRequestImpl = new SlingHttpServletRequestImpl(requestData, servletRequest);
+ slingHttpServletRequestImpl = new SlingJakartaHttpServletRequestImpl(requestData, servletRequest);
assertSame(principal, slingHttpServletRequestImpl.getUserPrincipal());
}
@@ -221,7 +221,7 @@ public class SlingHttpServletRequestImplTest {
}
});
- slingHttpServletRequestImpl = new SlingHttpServletRequestImpl(requestData, servletRequest);
+ slingHttpServletRequestImpl = new SlingJakartaHttpServletRequestImpl(requestData, servletRequest);
assertEquals(principal, slingHttpServletRequestImpl.getUserPrincipal());
}
@@ -255,7 +255,7 @@ public class SlingHttpServletRequestImplTest {
}
});
- slingHttpServletRequestImpl = new SlingHttpServletRequestImpl(requestData, servletRequest);
+ slingHttpServletRequestImpl = new SlingJakartaHttpServletRequestImpl(requestData, servletRequest);
assertEquals(principal, slingHttpServletRequestImpl.getUserPrincipal());
}
@@ -285,29 +285,29 @@ public class SlingHttpServletRequestImplTest {
Mockito.when(processor.getMimeType(Mockito.anyString())).thenReturn(null);
Mockito.when(rpi.getExtension()).thenReturn(null);
- SlingHttpServletRequest request = new SlingHttpServletRequestImpl(rd, baseRequest);
+ SlingHttpServletRequest request = new SlingJakartaHttpServletRequestImpl(rd, baseRequest);
assertNull(request.getResponseContentType());
assertEmptyEnumerator(request.getResponseContentTypes());
Mockito.when(rpi.getExtension()).thenReturn("jpg");
- request = new SlingHttpServletRequestImpl(rd, baseRequest);
+ request = new SlingJakartaHttpServletRequestImpl(rd, baseRequest);
assertNull(request.getResponseContentType());
assertEmptyEnumerator(request.getResponseContentTypes());
// second tests - processor returning footype for jpg
Mockito.when(processor.getMimeType("dummy.jpg")).thenReturn("footype");
Mockito.when(rpi.getExtension()).thenReturn(null);
- request = new SlingHttpServletRequestImpl(rd, baseRequest);
+ request = new SlingJakartaHttpServletRequestImpl(rd, baseRequest);
assertNull(request.getResponseContentType());
assertEmptyEnumerator(request.getResponseContentTypes());
Mockito.when(rpi.getExtension()).thenReturn("jpg");
- request = new SlingHttpServletRequestImpl(rd, baseRequest);
+ request = new SlingJakartaHttpServletRequestImpl(rd, baseRequest);
assertEquals("footype", request.getResponseContentType());
assertSingletonEnumerator(request.getResponseContentTypes(), "footype");
Mockito.when(rpi.getExtension()).thenReturn("pdf");
- request = new SlingHttpServletRequestImpl(rd, baseRequest);
+ request = new SlingJakartaHttpServletRequestImpl(rd, baseRequest);
assertNull(request.getResponseContentType());
assertEmptyEnumerator(request.getResponseContentTypes());
}
diff --git a/src/test/java/org/apache/sling/engine/impl/SlingHttpServletResponseImplTest.java b/src/test/java/org/apache/sling/engine/impl/SlingHttpServletResponseImplTest.java
index b358cc1..e88894d 100644
--- a/src/test/java/org/apache/sling/engine/impl/SlingHttpServletResponseImplTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/SlingHttpServletResponseImplTest.java
@@ -93,7 +93,7 @@ public class SlingHttpServletResponseImplTest {
when(requestData.getDispatchingInfo()).thenReturn(info);
info.setProtectHeadersOnInclude(true);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
when(orig.isCommitted()).thenReturn(false);
include.reset();
@@ -121,7 +121,7 @@ public class SlingHttpServletResponseImplTest {
when(requestProgressTracker.getMessages()).thenAnswer(invocation -> logMessagesList.iterator());
info.setProtectHeadersOnInclude(true);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
include.setContentLength(54);
include.setContentLengthLong(33L);
@@ -156,7 +156,7 @@ public class SlingHttpServletResponseImplTest {
when(requestData.getRequestProgressTracker()).thenReturn(requestProgressTracker);
when(requestData.getActiveServletName()).thenReturn(ACTIVE_SERVLET_NAME);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
include.setContentLength(54);
include.setContentLengthLong(33L);
@@ -186,7 +186,7 @@ public class SlingHttpServletResponseImplTest {
when(requestProgressTracker.getMessages()).thenAnswer(invocation -> logMessagesList.iterator());
info.setCheckContentTypeOnInclude(true);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
when(requestData.getActiveServletName()).thenReturn(ACTIVE_SERVLET_NAME);
Throwable throwable = null;
@@ -232,7 +232,7 @@ public class SlingHttpServletResponseImplTest {
ArrayList<String> logMessagesList = new ArrayList<>(Arrays.asList(logMessages));
when(requestProgressTracker.getMessages()).thenAnswer(invocation -> logMessagesList.iterator());
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
when(requestData.getActiveServletName()).thenReturn(ACTIVE_SERVLET_NAME);
include.setContentType("application/json");
Mockito.verify(orig, times(1)).setContentType("application/json");
@@ -263,7 +263,7 @@ public class SlingHttpServletResponseImplTest {
when(orig.getContentType()).thenReturn("application/json");
when(requestData.getRequestProgressTracker()).thenReturn(requestProgressTracker);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
when(requestData.getActiveServletName()).thenReturn(ACTIVE_SERVLET_NAME);
include.setContentType("application/json");
Mockito.verify(orig, times(1)).setContentType("application/json");
@@ -278,7 +278,7 @@ public class SlingHttpServletResponseImplTest {
when(requestData.getDispatchingInfo()).thenReturn(info);
info.setProtectHeadersOnInclude(true);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
include.addCookie(new Cookie("foo", "bar"));
@@ -293,7 +293,7 @@ public class SlingHttpServletResponseImplTest {
when(requestData.getDispatchingInfo()).thenReturn(info);
info.setProtectHeadersOnInclude(true);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
include.sendError(500);
include.sendError(500, "Error");
@@ -310,7 +310,7 @@ public class SlingHttpServletResponseImplTest {
when(requestData.getDispatchingInfo()).thenReturn(info);
info.setProtectHeadersOnInclude(true);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
include.setStatus(500);
include.setStatus(500, "Error");
@@ -326,7 +326,7 @@ public class SlingHttpServletResponseImplTest {
when(requestData.getDispatchingInfo()).thenReturn(info);
info.setProtectHeadersOnInclude(true);
- final HttpServletResponse include = new SlingHttpServletResponseImpl(requestData, orig);
+ final HttpServletResponse include = new SlingJakartaHttpServletResponseImpl(requestData, orig);
include.setDateHeader("foo-d", 2000L);
include.addDateHeader("bar-d", 3000L);
diff --git a/src/test/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChainTest.java b/src/test/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChainTest.java
index 28d9ad2..12f2312 100644
--- a/src/test/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChainTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/filter/AbstractSlingFilterChainTest.java
@@ -31,7 +31,7 @@ import java.io.IOException;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.engine.impl.SlingHttpServletRequestImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
import org.apache.sling.engine.impl.request.RequestData;
import org.junit.Test;
@@ -67,7 +67,7 @@ public class AbstractSlingFilterChainTest extends AbstractFilterTest {
HttpServletRequest httpReq = whateverRequest();
final RequestData requestData = new RequestData(
new SlingRequestProcessorImpl(), httpReq, context.mock(HttpServletResponse.class), false, false, true);
- final SlingHttpServletRequestImpl req = new SlingHttpServletRequestImpl(requestData, httpReq);
+ final SlingJakartaHttpServletRequestImpl req = new SlingJakartaHttpServletRequestImpl(requestData, httpReq);
boolean illegalStateCaught = false;
try {
chain.doFilter(req, context.mock(SlingHttpServletResponse.class));
diff --git a/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java b/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java
index 67bfd5f..3d52d74 100644
--- a/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/helper/ExternalServletContextWrapperTest.java
@@ -31,8 +31,8 @@ import javax.servlet.http.HttpServletResponseWrapper;
import java.util.Collections;
-import org.apache.sling.engine.impl.SlingHttpServletRequestImpl;
-import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletResponseImpl;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
import org.apache.sling.engine.impl.helper.ExternalServletContextWrapper.RequestDispatcherWrapper;
import org.apache.sling.engine.impl.request.RequestData;
@@ -131,7 +131,7 @@ public class ExternalServletContextWrapperTest {
final HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(req);
final HttpServletRequestWrapper wrapper2 = new HttpServletRequestWrapper(wrapper);
- final SlingHttpServletRequestImpl slingRequest = new SlingHttpServletRequestImpl(null, wrapper2);
+ final SlingJakartaHttpServletRequestImpl slingRequest = new SlingJakartaHttpServletRequestImpl(null, wrapper2);
ServletRequest unwrapped =
ExternalServletContextWrapper.RequestDispatcherWrapper.unwrapServletRequest(slingRequest);
@@ -158,7 +158,7 @@ public class ExternalServletContextWrapperTest {
final HttpServletRequestWrapper wrapper = new HttpServletRequestWrapper(req);
final HttpServletRequestWrapper wrapper2 = new HttpServletRequestWrapper(wrapper);
- final SlingHttpServletRequestImpl slingRequest = new SlingHttpServletRequestImpl(null, wrapper2);
+ final SlingJakartaHttpServletRequestImpl slingRequest = new SlingJakartaHttpServletRequestImpl(null, wrapper2);
final HttpServletRequestWrapper slingWrapper = new HttpServletRequestWrapper(slingRequest);
ServletRequest unwrapped =
@@ -225,7 +225,7 @@ public class ExternalServletContextWrapperTest {
}
});
- final SlingHttpServletResponseImpl slingResponse = new SlingHttpServletResponseImpl(rd, wrapper2);
+ final SlingJakartaHttpServletResponseImpl slingResponse = new SlingJakartaHttpServletResponseImpl(rd, wrapper2);
ServletResponse unwrapped =
ExternalServletContextWrapper.RequestDispatcherWrapper.unwrapServletResponse(slingResponse);
@@ -253,7 +253,7 @@ public class ExternalServletContextWrapperTest {
}
});
- final SlingHttpServletResponseImpl slingResponse = new SlingHttpServletResponseImpl(rd, wrapper2);
+ final SlingJakartaHttpServletResponseImpl slingResponse = new SlingJakartaHttpServletResponseImpl(rd, wrapper2);
final HttpServletResponseWrapper slingWrapper = new HttpServletResponseWrapper(slingResponse);
ServletResponse unwrapped =
diff --git a/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java b/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
index fcd6113..39cd94f 100644
--- a/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/request/RequestDataTest.java
@@ -33,8 +33,8 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.request.TooManyCallsException;
-import org.apache.sling.engine.impl.SlingHttpServletRequestImpl;
-import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletResponseImpl;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
import org.jmock.Expectations;
import org.jmock.Mockery;
@@ -112,8 +112,8 @@ public class RequestDataTest {
}
};
- slingRequest = new SlingHttpServletRequestImpl(requestData, req);
- slingResponse = new SlingHttpServletResponseImpl(requestData, resp);
+ slingRequest = new SlingJakartaHttpServletRequestImpl(requestData, req);
+ slingResponse = new SlingJakartaHttpServletResponseImpl(requestData, resp);
}
private void assertTooManyCallsException(int failAtCall) throws Exception {
diff --git a/src/test/java/org/apache/sling/engine/impl/request/SlingRequestDispatcherTest.java b/src/test/java/org/apache/sling/engine/impl/request/SlingRequestDispatcherTest.java
index 9587353..e15bcf9 100644
--- a/src/test/java/org/apache/sling/engine/impl/request/SlingRequestDispatcherTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/request/SlingRequestDispatcherTest.java
@@ -35,8 +35,8 @@ import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.servlets.ServletResolver;
-import org.apache.sling.engine.impl.SlingHttpServletRequestImpl;
-import org.apache.sling.engine.impl.SlingHttpServletResponseImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletRequestImpl;
+import org.apache.sling.engine.impl.SlingJakartaHttpServletResponseImpl;
import org.apache.sling.engine.impl.SlingRequestProcessorImpl;
import org.apache.sling.engine.impl.filter.FilterHandle;
import org.apache.sling.engine.impl.filter.ServletFilterManager;
@@ -117,8 +117,9 @@ public class SlingRequestDispatcherTest {
RequestData requestData =
new RequestData(slingRequestProcessor, httpServletRequest, httpServletResponse, false, false, false);
- SlingHttpServletRequest request = spy(new SlingHttpServletRequestImpl(requestData, httpServletRequest));
- SlingHttpServletResponse response = spy(new SlingHttpServletResponseImpl(requestData, httpServletResponse));
+ SlingHttpServletRequest request = spy(new SlingJakartaHttpServletRequestImpl(requestData, httpServletRequest));
+ SlingHttpServletResponse response =
+ spy(new SlingJakartaHttpServletResponseImpl(requestData, httpServletResponse));
Resource initialResource = getMockedResource("/initial");
when(request.getResource()).thenReturn(initialResource);