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/13 06:18:47 UTC

(sling-org-apache-sling-servlets-get) branch jakarta-2 updated: Use Jakarta Servlet API

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

cziegeler pushed a commit to branch jakarta-2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git


The following commit(s) were added to refs/heads/jakarta-2 by this push:
     new 045f84c  Use Jakarta Servlet API
045f84c is described below

commit 045f84cdea356b04d92482ebcc622c557b98b8aa
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jan 13 07:18:40 2025 +0100

    Use Jakarta Servlet API
---
 pom.xml                                            |  23 ++--
 .../sling/servlets/get/impl/DefaultGetServlet.java |  32 ++---
 .../sling/servlets/get/impl/RedirectServlet.java   |  24 ++--
 .../sling/servlets/get/impl/SlingInfoServlet.java  |  22 ++--
 .../servlets/get/impl/VersionInfoServlet.java      |  44 +++----
 .../get/impl/helpers/HeadServletResponse.java      |  12 +-
 .../servlets/get/impl/helpers/HtmlRenderer.java    |  12 +-
 .../servlets/get/impl/helpers/JsonRenderer.java    |  18 +--
 .../get/impl/helpers/PlainTextRenderer.java        |  14 +--
 .../sling/servlets/get/impl/helpers/Renderer.java  |   6 +-
 .../servlets/get/impl/helpers/StreamRenderer.java  |  40 +++---
 .../servlets/get/impl/helpers/XMLRenderer.java     |  14 +--
 .../servlets/get/impl/DefaultGetServletTest.java   |   4 +-
 .../servlets/get/impl/JsonRendererServletTest.java |  58 ++++-----
 .../servlets/get/impl/RedirectServletTest.java     | 134 ++++++++++++++-------
 .../get/impl/helpers/HtmlRendererTest.java         |  14 +--
 .../get/impl/helpers/JsonRendererTest.java         | 133 ++++++++++++++++----
 .../get/impl/helpers/StreamRendererTest.java       |  63 +++++-----
 18 files changed, 398 insertions(+), 269 deletions(-)

diff --git a/pom.xml b/pom.xml
index a30ceeb..1f57d1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,9 @@
     to you under the Apache License, Version 2.0 (the
     "License"); you may not use this file except in compliance
     with the License.  You may obtain a copy of the License at
-    
+
     http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>org.apache.sling.servlets.get</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
 
     <name>Apache Sling Default GET Servlets</name>
     <description>
@@ -45,6 +45,7 @@
 
     <properties>
         <site.jira.version.id>12314473</site.jira.version.id>
+        <sling.java.version>17</sling.java.version>
     </properties>
 
     <build>
@@ -65,7 +66,7 @@
            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -103,6 +104,12 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.0.0</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>
@@ -123,7 +130,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.16.4</version>
+            <version>3.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -143,12 +150,6 @@
              <version>1.4</version>
              <scope>test</scope>
          </dependency>
-         <dependency>
-             <groupId>org.apache.sling</groupId>
-             <artifactId>org.apache.sling.commons.testing</artifactId>
-             <version>2.0.10</version>
-              <scope>test</scope>
-         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java b/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java
index 1f1ae27..ee14133 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/DefaultGetServlet.java
@@ -21,16 +21,16 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.SlingConstants;
-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.resource.ResourceNotFoundException;
 import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.apache.sling.api.servlets.SlingJakartaSafeMethodsServlet;
 import org.apache.sling.servlets.get.impl.helpers.HeadServletResponse;
 import org.apache.sling.servlets.get.impl.helpers.HtmlRenderer;
 import org.apache.sling.servlets.get.impl.helpers.JsonRenderer;
@@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory;
             "sling.servlet.methods=HEAD"
     })
 @Designate(ocd=DefaultGetServlet.Config.class)
-public class DefaultGetServlet extends SlingSafeMethodsServlet {
+public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
 
     private static final long serialVersionUID = -2714152339750885354L;
 
@@ -126,7 +126,7 @@ public class DefaultGetServlet extends SlingSafeMethodsServlet {
                   "this basically means the number of Objects to return. Default value is " +
                   "200.")
         int json_maximumresults() default 200;
-        
+
         @AttributeDefinition(name = "Legacy ECMA date format", description="Enable legacy Sling ECMA format for dates")
         boolean ecmaSuport() default true;
     }
@@ -155,7 +155,7 @@ public class DefaultGetServlet extends SlingSafeMethodsServlet {
     private boolean enableXml;
 
 	private boolean enableEcmaSupport;
-    
+
     public static final String EXT_HTML = "html";
 
     public static final String EXT_TXT = "txt";
@@ -218,9 +218,9 @@ public class DefaultGetServlet extends SlingSafeMethodsServlet {
         Renderer streamRenderer = getDefaultRenderer(EXT_RES);
 
         rendererMap.put(null, streamRenderer);
-        
+
         rendererMap.put(EXT_RES, streamRenderer);
-        
+
         if (enableHtml) {
             rendererMap.put(EXT_HTML,
                     getDefaultRenderer(EXT_HTML));
@@ -273,8 +273,8 @@ public class DefaultGetServlet extends SlingSafeMethodsServlet {
      *             existing resource.
      */
     @Override
-    protected void doGet(SlingHttpServletRequest request,
-            SlingHttpServletResponse response) throws ServletException,
+    protected void doGet(SlingJakartaHttpServletRequest request,
+            SlingJakartaHttpServletResponse response) throws ServletException,
             IOException {
 
         // cannot handle the request for missing resources
@@ -295,7 +295,7 @@ public class DefaultGetServlet extends SlingSafeMethodsServlet {
             // as the response is already committed, in this case we just
             // do nothing (but log an error message)
             if (response.isCommitted()
-                || request.getAttribute(SlingConstants.ATTR_REQUEST_SERVLET) != null) {
+                || request.getAttribute(SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET) != null) {
                 logger.error(
                     "No renderer for extension {}, cannot render resource {}",
                     ext, request.getResource());
@@ -312,8 +312,8 @@ public class DefaultGetServlet extends SlingSafeMethodsServlet {
     }
 
     @Override
-    protected void doHead(SlingHttpServletRequest request,
-                          SlingHttpServletResponse response) throws ServletException,
+    protected void doHead(SlingJakartaHttpServletRequest request,
+                          SlingJakartaHttpServletResponse response) throws ServletException,
             IOException {
 
         response = new HeadServletResponse(response);
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java b/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
index bec72dc..1cb9e90 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/RedirectServlet.java
@@ -20,18 +20,18 @@ package org.apache.sling.servlets.get.impl;
 
 import java.io.IOException;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.SlingConstants;
-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.RequestPathInfo;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.apache.sling.api.servlets.SlingJakartaSafeMethodsServlet;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
             "sling.servlet.methods=GET",
             "sling.servlet.prefix:Integer=-1"
     })
-public class RedirectServlet extends SlingSafeMethodsServlet {
+public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
 
     /** The name of the target property */
     public static final String TARGET_PROP = "sling:target";
@@ -81,8 +81,8 @@ public class RedirectServlet extends SlingSafeMethodsServlet {
     private Servlet defaultRenderServlet;
 
     @Override
-    protected void doGet(SlingHttpServletRequest request,
-            SlingHttpServletResponse response) throws ServletException,
+    protected void doGet(SlingJakartaHttpServletRequest request,
+            SlingJakartaHttpServletResponse response) throws ServletException,
             IOException {
 
         // handle json export of the redirect node
@@ -98,7 +98,7 @@ public class RedirectServlet extends SlingSafeMethodsServlet {
             request.getRequestProgressTracker().log(
                 "RedirectServlet: Response is already committed, not redirecting");
             return;
-        } else if (request.getAttribute(SlingConstants.ATTR_REQUEST_SERVLET) != null) {
+        } else if (request.getAttribute(SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET) != null) {
             // included request will not redirect
             log.warn("RedirectServlet: Servlet is included, not redirecting");
             request.getRequestProgressTracker().log(
@@ -191,7 +191,7 @@ public class RedirectServlet extends SlingSafeMethodsServlet {
      * request.
      */
     static String toRedirectPath(String targetPath,
-            SlingHttpServletRequest request) {
+        SlingJakartaHttpServletRequest request) {
 
         // make sure the target path is absolute
         final String rawAbsPath;
@@ -230,7 +230,7 @@ public class RedirectServlet extends SlingSafeMethodsServlet {
      * @throws NullPointerException if request or target is <code>null</code>.
      */
     private static StringBuilder appendSelectorsExtensionSuffixQuery(
-            SlingHttpServletRequest request, StringBuilder target) {
+            SlingJakartaHttpServletRequest request, StringBuilder target) {
         // append current selectors, extension and suffix
         final RequestPathInfo rpi = request.getRequestPathInfo();
         if (rpi.getExtension() != null) {
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/SlingInfoServlet.java b/src/main/java/org/apache/sling/servlets/get/impl/SlingInfoServlet.java
index 90c53fe..edbc201 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/SlingInfoServlet.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/SlingInfoServlet.java
@@ -26,14 +26,14 @@ import java.util.Map;
 
 import jakarta.json.Json;
 import jakarta.json.stream.JsonGenerator;
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Servlet;
+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.ResponseUtil;
 import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.apache.sling.api.servlets.SlingJakartaSafeMethodsServlet;
 import org.osgi.service.component.annotations.Component;
 
 /**
@@ -42,7 +42,7 @@ import org.osgi.service.component.annotations.Component;
 @SuppressWarnings("serial")
 @Component(service = Servlet.class, property = { "service.description=Sling Info Servlet",
         "service.vendor=The Apache Software Foundation", "sling.servlet.paths=/system/sling/info" })
-public class SlingInfoServlet extends SlingSafeMethodsServlet {
+public class SlingInfoServlet extends SlingJakartaSafeMethodsServlet {
 
     private static final String CACHE_CONTROL_HEADER = "Cache-Control";
 
@@ -50,7 +50,7 @@ public class SlingInfoServlet extends SlingSafeMethodsServlet {
 
     static final String PROVIDER_LABEL = "sessionInfo";
 
-    private Map<String, String> getInfo(final SlingHttpServletRequest request) {
+    private Map<String, String> getInfo(final SlingJakartaHttpServletRequest request) {
         final Map<String, String> result = new HashMap<>();
 
         final ResourceResolver resolver = request.getResourceResolver();
@@ -65,7 +65,7 @@ public class SlingInfoServlet extends SlingSafeMethodsServlet {
     }
 
     @Override
-    protected void doGet(final SlingHttpServletRequest request, final SlingHttpServletResponse response)
+    protected void doGet(final SlingJakartaHttpServletRequest request, final SlingJakartaHttpServletResponse response)
             throws IOException {
 
         Map<String, String> data = null;
@@ -96,7 +96,7 @@ public class SlingInfoServlet extends SlingSafeMethodsServlet {
         }
     }
 
-    private void renderJson(final SlingHttpServletResponse response, final Map<String, String> data)
+    private void renderJson(final SlingJakartaHttpServletResponse response, final Map<String, String> data)
             throws IOException {
         // render data in JSON format
         response.setContentType("application/json");
@@ -113,7 +113,7 @@ public class SlingInfoServlet extends SlingSafeMethodsServlet {
         w.flush();
     }
 
-    private void renderHtml(final SlingHttpServletResponse response, final Map<String, String> data)
+    private void renderHtml(final SlingJakartaHttpServletResponse response, final Map<String, String> data)
             throws IOException {
         // render data in JSON format
         response.setContentType("text/html");
@@ -139,7 +139,7 @@ public class SlingInfoServlet extends SlingSafeMethodsServlet {
         out.flush();
     }
 
-    private void renderPlainText(final SlingHttpServletResponse response, final Map<String, String> data)
+    private void renderPlainText(final SlingJakartaHttpServletResponse response, final Map<String, String> data)
             throws IOException {
 
         // render data in JSON format
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/VersionInfoServlet.java b/src/main/java/org/apache/sling/servlets/get/impl/VersionInfoServlet.java
index 18f6da4..faffe34 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/VersionInfoServlet.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/VersionInfoServlet.java
@@ -36,15 +36,15 @@ import jakarta.json.Json;
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonObjectBuilder;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
 
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.util.ISO8601;
-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.resource.Resource;
-import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
+import org.apache.sling.api.servlets.SlingJakartaSafeMethodsServlet;
 import org.apache.sling.servlets.get.impl.util.JsonObjectCreator;
 import org.apache.sling.servlets.get.impl.util.JsonToText;
 import org.osgi.service.component.annotations.Activate;
@@ -72,7 +72,7 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
                     "sling.servlet.extensions=json"
            })
 @Designate(ocd = VersionInfoServlet.Config.class)
-public class VersionInfoServlet extends SlingSafeMethodsServlet {
+public class VersionInfoServlet extends SlingJakartaSafeMethodsServlet {
 
     @ObjectClassDefinition(name = "Apache Sling Version Info Servlet",
             description = "The Sling Version Info Servlet renders list of versions available for the current resource")
@@ -80,13 +80,13 @@ public class VersionInfoServlet extends SlingSafeMethodsServlet {
 
         @AttributeDefinition(name = "Selector", description="List of selectors this servlet handles to display the versions")
         String[] sling_servlet_selectors() default "V";
-        
+
         @AttributeDefinition(name = "Legacy ECMA date format", description="Enable legacy Sling ECMA format for dates")
         boolean ecmaSuport() default true;
     }
-    
+
     private static final long serialVersionUID = 1656887064561951302L;
-    
+
     private boolean ecmaSupport;
 
     /** Selector that means "pretty-print the output */
@@ -100,16 +100,16 @@ public class VersionInfoServlet extends SlingSafeMethodsServlet {
 
     /** How much to indent in tidy mode */
     public static final int INDENT_SPACES = 2;
-    
+
     private final JsonToText renderer = new JsonToText();
-    
+
     @Activate
     private void activate(Config config) {
     	this.ecmaSupport = config.ecmaSuport();
     }
 
     @Override
-    public void doGet(SlingHttpServletRequest req, SlingHttpServletResponse resp) throws ServletException,
+    public void doGet(SlingJakartaHttpServletRequest req, SlingJakartaHttpServletResponse resp) throws ServletException,
             IOException {
         resp.setContentType(req.getResponseContentType());
         resp.setCharacterEncoding("UTF-8");
@@ -118,7 +118,7 @@ public class VersionInfoServlet extends SlingSafeMethodsServlet {
 
         final JsonToText.Options opt = renderer.options().withIndent(tidy ? INDENT_SPACES : 0)
                     .withArraysForChildren(harray);
-        
+
         try {
         	VersionManager vm = req.getResourceResolver().adaptTo(Session.class).getWorkspace().getVersionManager();
             resp.getWriter().write(renderer.prettyPrint(getJsonObject(req.getResource(), vm), opt));
@@ -136,14 +136,14 @@ public class VersionInfoServlet extends SlingSafeMethodsServlet {
         final String absPath = resource.getPath();
         final VersionHistory history = vm.getVersionHistory(absPath);
         final Version baseVersion = vm.getBaseVersion(absPath);
-        
+
         for (final VersionIterator it = history.getAllVersions(); it.hasNext();) {
             final Version v = it.nextVersion();
             final JsonObjectBuilder obj = Json.createObjectBuilder();
             obj.add("created", createdDate(v));
             obj.add("successors", getArrayBuilder(getNames(v.getSuccessors())));
             obj.add("predecessors", getArrayBuilder(getNames(v.getPredecessors())));
-            
+
             obj.add("labels", getArrayBuilder(history.getVersionLabels(v)));
             obj.add("baseVersion", baseVersion.isSame(v));
             result.add(v.getName(), obj);
@@ -151,24 +151,24 @@ public class VersionInfoServlet extends SlingSafeMethodsServlet {
 
         return Json.createObjectBuilder().add("versions", result).build();
     }
-    
+
     private JsonArrayBuilder getArrayBuilder(String[] values) {
         JsonArrayBuilder builder = Json.createArrayBuilder();
-        
+
         for (String value : values) {
             builder.add(value);
         }
-        
+
         return builder;
     }
-    
+
     private JsonArrayBuilder getArrayBuilder(Collection<String> values) {
         JsonArrayBuilder builder = Json.createArrayBuilder();
-        
+
         for (String value : values) {
             builder.add(value);
         }
-        
+
         return builder;
     }
 
@@ -181,7 +181,7 @@ public class VersionInfoServlet extends SlingSafeMethodsServlet {
     }
 
     /** True if our request has the given selector */
-    private boolean hasSelector(SlingHttpServletRequest req, String selectorToCheck) {
+    private boolean hasSelector(SlingJakartaHttpServletRequest req, String selectorToCheck) {
         for (String selector : req.getRequestPathInfo().getSelectors()) {
             if (selectorToCheck.equals(selector)) {
                 return true;
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java
index cb5c646..f456c89 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/HeadServletResponse.java
@@ -20,11 +20,11 @@ package org.apache.sling.servlets.get.impl.helpers;
 import java.io.PrintWriter;
 import java.io.Writer;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
 
-import org.apache.sling.api.SlingHttpServletResponse;
-import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
+import org.apache.sling.api.wrappers.SlingJakartaHttpServletResponseWrapper;
 
 /**
  * The <code>HeadServletResponse</code> is a Sling response wrapper which
@@ -32,13 +32,13 @@ import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
  * streams.
  */
 
-public class HeadServletResponse extends SlingHttpServletResponseWrapper {
+public class HeadServletResponse extends SlingJakartaHttpServletResponseWrapper {
 
     private ServletOutputStream stream;
 
     private PrintWriter writer;
 
-    public HeadServletResponse(SlingHttpServletResponse wrappedResponse) {
+    public HeadServletResponse(SlingJakartaHttpServletResponse wrappedResponse) {
         super(wrappedResponse);
     }
 
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRenderer.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRenderer.java
index 33cbe7e..a573e39 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRenderer.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRenderer.java
@@ -20,11 +20,11 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.SlingConstants;
-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.resource.Resource;
 import org.apache.sling.api.resource.ResourceNotFoundException;
 import org.apache.sling.api.resource.ResourceUtil;
@@ -38,8 +38,8 @@ public class HtmlRenderer implements Renderer  {
 
     public static final HtmlRenderer INSTANCE = new HtmlRenderer();
 
-    public void render(final SlingHttpServletRequest req,
-            final SlingHttpServletResponse resp) throws IOException {
+    public void render(final SlingJakartaHttpServletRequest req,
+            final SlingJakartaHttpServletResponse resp) throws IOException {
         final Resource r = req.getResource();
 
         if (ResourceUtil.isNonExistingResource(r)) {
@@ -51,7 +51,7 @@ public class HtmlRenderer implements Renderer  {
 
         final PrintWriter pw = resp.getWriter();
 
-        final boolean isIncluded = req.getAttribute(SlingConstants.ATTR_REQUEST_SERVLET) != null;
+        final boolean isIncluded = req.getAttribute(SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET) != null;
 
         @SuppressWarnings({ "rawtypes" })
         final Map map = r.adaptTo(Map.class);
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRenderer.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRenderer.java
index cca3eee..067637d 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRenderer.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/JsonRenderer.java
@@ -22,11 +22,11 @@ import java.math.BigInteger;
 
 import jakarta.json.Json;
 import jakarta.json.stream.JsonGenerator;
-import javax.servlet.http.HttpServletResponse;
+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.resource.Resource;
 import org.apache.sling.api.resource.ResourceNotFoundException;
 import org.apache.sling.api.resource.ResourceUtil;
@@ -68,8 +68,8 @@ public class JsonRenderer implements Renderer {
         this.ecmaSupport = ecmaSupport;
     }
 
-    public void render(SlingHttpServletRequest req,
-            SlingHttpServletResponse resp) throws IOException {
+    public void render(SlingJakartaHttpServletRequest req,
+            SlingJakartaHttpServletResponse resp) throws IOException {
         // Access and check our data
         final Resource r = req.getResource();
         if (ResourceUtil.isNonExistingResource(r)) {
@@ -123,7 +123,7 @@ public class JsonRenderer implements Renderer {
 
             } else {
                 // We are not allowed to do the dump.
-                // Send a 300 
+                // Send a 300
                 String tidyUrl = (tidy) ? "tidy." : "";
                 resp.setStatus(HttpServletResponse.SC_MULTIPLE_CHOICES);
                 StringWriter writer = new StringWriter();
@@ -150,7 +150,7 @@ public class JsonRenderer implements Renderer {
      * @return the recursion level
      * @throws IllegalArgumentException if the detected selector is not a number
      */
-    protected int getMaxRecursionLevel(SlingHttpServletRequest req) throws IllegalArgumentException {
+    protected int getMaxRecursionLevel(SlingJakartaHttpServletRequest req) throws IllegalArgumentException {
         int maxRecursionLevels = 0;
         final String[] selectors = req.getRequestPathInfo().getSelectors();
         if (selectors != null && selectors.length > 0) {
@@ -199,7 +199,7 @@ public class JsonRenderer implements Renderer {
      * @param selectorToCheck the selector
      * @return {@code true} if the selector is present, {@code false} otherwise
      */
-    protected boolean hasSelector(SlingHttpServletRequest req, String selectorToCheck) {
+    protected boolean hasSelector(SlingJakartaHttpServletRequest req, String selectorToCheck) {
         for(String selector : req.getRequestPathInfo().getSelectors()) {
             if(selectorToCheck.equals(selector)) {
                 return true;
@@ -213,7 +213,7 @@ public class JsonRenderer implements Renderer {
      * @param req the request
      * @return {@code true} if the request contains the {@link #TIDY} selector, {@code false} otherwise
      */
-    protected boolean isTidy(SlingHttpServletRequest req) {
+    protected boolean isTidy(SlingJakartaHttpServletRequest req) {
         return hasSelector(req, TIDY);
     }
 
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRenderer.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRenderer.java
index 6bbc6bc..67fba4f 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRenderer.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRenderer.java
@@ -21,10 +21,10 @@ import java.io.PrintWriter;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
+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.resource.Resource;
 import org.apache.sling.api.resource.ResourceNotFoundException;
 import org.apache.sling.api.resource.ResourceUtil;
@@ -37,8 +37,8 @@ import org.apache.sling.api.resource.ResourceUtil;
 public class PlainTextRenderer implements Renderer {
 
 
-    public void render(SlingHttpServletRequest req,
-            SlingHttpServletResponse resp) throws IOException {
+    public void render(SlingJakartaHttpServletRequest req,
+            SlingJakartaHttpServletResponse resp) throws IOException {
         final Resource r = req.getResource();
         if (ResourceUtil.isNonExistingResource(r)) {
             throw new ResourceNotFoundException("No data to render.");
@@ -68,8 +68,8 @@ public class PlainTextRenderer implements Renderer {
 
     /** Render synthetic resource */
     /*
-     * TODO private void renderSyntheticResource(SlingHttpServletRequest
-     * req,SlingHttpServletResponse resp,SyntheticResourceData data) throws
+     * TODO private void renderSyntheticResource(SlingJakartaHttpServlet
+     * req,SlingJakartaHttpServletResponse resp,SyntheticResourceData data) throws
      * IOException { resp.setContentType(responseContentType);
      * resp.getOutputStream().write(data.toString().getBytes()); }
      */
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/Renderer.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/Renderer.java
index 83b0a29..aed55fc 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/Renderer.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/Renderer.java
@@ -19,11 +19,11 @@ package org.apache.sling.servlets.get.impl.helpers;
 
 import java.io.IOException;
 
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
 
 public interface Renderer {
 
-    void render(final SlingHttpServletRequest req, final SlingHttpServletResponse resp) throws IOException;
+    void render(final SlingJakartaHttpServletRequest req, final SlingJakartaHttpServletResponse resp) throws IOException;
 
 }
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRenderer.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRenderer.java
index 45e216d..e5807bc 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRenderer.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/StreamRenderer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
-import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED;
+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_MODIFIED;
 import static org.apache.sling.api.servlets.HttpConstants.HEADER_IF_MODIFIED_SINCE;
 import static org.apache.sling.api.servlets.HttpConstants.HEADER_LAST_MODIFIED;
 
@@ -30,17 +30,17 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.sling.api.SlingConstants;
-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.RequestDispatcherOptions;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceMetadata;
@@ -99,11 +99,11 @@ public class StreamRenderer implements Renderer {
         this.context = context;
     }
 
-    public void render(SlingHttpServletRequest request,
-            SlingHttpServletResponse response) throws IOException {
-    	
+    public void render(SlingJakartaHttpServletRequest request,
+            SlingJakartaHttpServletResponse response) throws IOException {
+
         // whether this servlet is called as of a request include
-        final boolean included = request.getAttribute(SlingConstants.ATTR_REQUEST_SERVLET) != null;
+        final boolean included = request.getAttribute(SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET) != null;
 
         // ensure no extension or "res"
         String ext = request.getRequestPathInfo().getExtension();
@@ -226,8 +226,8 @@ public class StreamRenderer implements Renderer {
 
     private void streamResource(final Resource resource,
             final InputStream stream, final boolean included,
-            final SlingHttpServletRequest request,
-            final SlingHttpServletResponse response) throws IOException {
+            final SlingJakartaHttpServletRequest request,
+            final SlingJakartaHttpServletResponse response) throws IOException {
         // finally stream the resource
 
         final ArrayList<Range> ranges;
@@ -281,8 +281,8 @@ public class StreamRenderer implements Renderer {
         }
     }
 
-    private void renderDirectory(final SlingHttpServletRequest request,
-            final SlingHttpServletResponse response, final boolean included)
+    private void renderDirectory(final SlingJakartaHttpServletRequest request,
+            final SlingJakartaHttpServletResponse response, final boolean included)
             throws IOException {
 
         // request is included or committed, not rendering index
@@ -346,7 +346,7 @@ public class StreamRenderer implements Renderer {
      * @param response
      */
     private void setHeaders(Resource resource,
-            SlingHttpServletResponse response) {
+            SlingJakartaHttpServletResponse response) {
 
         final ResourceMetadata meta = resource.getResourceMetadata();
         final long modifTime = meta.getModificationTime();
@@ -407,7 +407,7 @@ public class StreamRenderer implements Renderer {
     }
 
     private void renderIndex(Resource resource,
-            SlingHttpServletResponse response) throws IOException {
+            SlingJakartaHttpServletResponse response) throws IOException {
 
         response.setContentType("text/html");
         response.setCharacterEncoding("UTF-8");
@@ -526,7 +526,7 @@ public class StreamRenderer implements Renderer {
                 } catch(IOException e) {
                     exception = e;
                 }
-            } 
+            }
         }
 
         ostream.println();
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRenderer.java b/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRenderer.java
index f22f330..fbf71ce 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRenderer.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/helpers/XMLRenderer.java
@@ -19,12 +19,12 @@ package org.apache.sling.servlets.get.impl.helpers;
 import java.io.IOException;
 
 import javax.jcr.Node;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.sling.api.SlingConstants;
-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.resource.Resource;
 import org.apache.sling.api.resource.ResourceNotFoundException;
 import org.apache.sling.api.resource.ResourceUtil;
@@ -43,8 +43,8 @@ public class XMLRenderer implements Renderer {
 
 
     @Override
-    public void render(SlingHttpServletRequest req,
-                         SlingHttpServletResponse resp)
+    public void render(SlingJakartaHttpServletRequest req,
+                         SlingJakartaHttpServletResponse resp)
     throws IOException {
         final Resource r = req.getResource();
 
@@ -56,7 +56,7 @@ public class XMLRenderer implements Renderer {
         resp.setCharacterEncoding("UTF-8");
 
         // are we included?
-        final boolean isIncluded = req.getAttribute(SlingConstants.ATTR_REQUEST_SERVLET) != null;
+        final boolean isIncluded = req.getAttribute(SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET) != null;
 
         try {
             final Node node = r.adaptTo(Node.class);
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/DefaultGetServletTest.java b/src/test/java/org/apache/sling/servlets/get/impl/DefaultGetServletTest.java
index a8056c5..fd751d4 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/DefaultGetServletTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/DefaultGetServletTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertNotNull;
 import java.lang.reflect.Field;
 import java.util.Map;
 
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
 
 import org.junit.Test;
 import org.mockito.Mockito;
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/JsonRendererServletTest.java b/src/test/java/org/apache/sling/servlets/get/impl/JsonRendererServletTest.java
index d7011ab..4907044 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/JsonRendererServletTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/JsonRendererServletTest.java
@@ -20,70 +20,70 @@ package org.apache.sling.servlets.get.impl;
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.sling.commons.testing.sling.MockResource;
-import org.apache.sling.commons.testing.sling.MockResourceResolver;
-import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
-import org.apache.sling.commons.testing.sling.MockSlingHttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.request.builder.Builders;
+import org.apache.sling.api.request.builder.SlingJakartaHttpServletResponseResult;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.servlets.get.impl.helpers.JsonRenderer;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.junit.Rule;
 
 public class JsonRendererServletTest {
 
-    private static MockResourceResolver resolver;
+    @Rule
+    public SlingContext context = new SlingContext();
 
-    @org.junit.BeforeClass
-    public static void setup() {
-        resolver = new MockResourceResolver();
-        resolver.addResource(new MockResource(resolver, "/content/page", "page"));
-        resolver.addResource(new MockResource(resolver, "/content/page/one", "one"));
-        resolver.addResource(new MockResource(resolver, "/content/page/two", "two"));
+    @org.junit.Before
+    public void setup() {
+        context.create().resource("/content/page", ResourceResolver.PROPERTY_RESOURCE_TYPE, "page");
+        context.create().resource("/content/page/one", ResourceResolver.PROPERTY_RESOURCE_TYPE, "one");
+        context.create().resource("/content/page/two", ResourceResolver.PROPERTY_RESOURCE_TYPE, "two");
+        context.create().resource("/etc", ResourceResolver.PROPERTY_RESOURCE_TYPE, "etc");
+        context.create().resource("/etc/tags", ResourceResolver.PROPERTY_RESOURCE_TYPE, "tags");
 
-        resolver.addResource(new MockResource(resolver, "/etc", "etc"));
-        resolver.addResource(new MockResource(resolver, "/etc/tags", "tags"));
         for (int i = 0; i < 1085; i++) {
-            resolver.addResource(new MockResource(resolver, "/etc/tags/" + i, "" + i));
+            context.create().resource("/etc/tags/" + i, ResourceResolver.PROPERTY_RESOURCE_TYPE, "" + i);
         }
     }
 
-    @org.junit.AfterClass
-    public static void teardown() {
-    }
-
     @org.junit.Test
     public void test() throws Throwable {
         String response = getJSON("/content/page", "0");
-        assertEquals("{\"resourceType\":\"page\"}", response);
+        assertEquals("{\"sling:resourceType\":\"page\"}", response);
 
         response = getJSON("/content/page", "1");
         assertEquals(
-                "{\"resourceType\":\"page\",\"one\":{\"resourceType\":\"one\"},\"two\":{\"resourceType\":\"two\"}}",
+                "{\"sling:resourceType\":\"page\",\"one\":{\"sling:resourceType\":\"one\"},\"two\":{\"sling:resourceType\":\"two\"}}",
                 response);
 
         response = getJSON("/content/page", "infinity");
         assertEquals(
-                "{\"resourceType\":\"page\",\"one\":{\"resourceType\":\"one\"},\"two\":{\"resourceType\":\"two\"}}",
+                "{\"sling:resourceType\":\"page\",\"one\":{\"sling:resourceType\":\"one\"},\"two\":{\"sling:resourceType\":\"two\"}}",
                 response);
 
         response = getJSON("/content/page/one", "infinity");
-        assertEquals("{\"resourceType\":\"one\"}", response);
+        assertEquals("{\"sling:resourceType\":\"one\"}", response);
 
         response = getJSON("/etc", "infinity");
         assertEquals("[\"/etc.1.json\",\"/etc.0.json\"]", response);
 
         response = getJSON("/etc/tags", "1");
         assertEquals(
-                "{\"resourceType\":\"tags\",\"0\":{\"resourceType\":\"0\"},\"1\":{\"resourceType\":\"1\"},\"2\":{\"resourceType\":\"2\"},\"3\":{\"resourceType\":\"3\"},\"4\":{\"resourceType\":\"4\"},\"5\":{\"resourceType\":\"5\"},\"6\":{\"resourceType\":\"6\"},\"7\":{\"resourceType\":\"7\"},\"8\":{\"resourceType\":\"8\"},\"9\":{\"resourceType\":\"9\"},\"10\":{\"resourceType\":\"10\"},\"11\":{\"resourceType\":\"11\"},\"12\":{\"resourceType\":\"12\"},\"13\":{\"resourceType\":\"13\"},\"14\" [...]
+                "{\"sling:resourceType\":\"tags\",\"0\":{\"sling:resourceType\":\"0\"},\"1\":{\"sling:resourceType\":\"1\"},\"2\":{\"sling:resourceType\":\"2\"},\"3\":{\"sling:resourceType\":\"3\"},\"4\":{\"sling:resourceType\":\"4\"},\"5\":{\"sling:resourceType\":\"5\"},\"6\":{\"sling:resourceType\":\"6\"},\"7\":{\"sling:resourceType\":\"7\"},\"8\":{\"sling:resourceType\":\"8\"},\"9\":{\"sling:resourceType\":\"9\"},\"10\":{\"sling:resourceType\":\"10\"},\"11\":{\"sling:resourceType\":\" [...]
                 response);
     }
 
     private String getJSON(String path, String depth) throws Throwable {
-        MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(path, depth, ".json", null, null);
-        request.setMethod("GET");
-        request.setResourceResolver(resolver);
-        request.setResource(resolver.getResource(path));
+        SlingJakartaHttpServletRequest request = Builders
+            .newRequestBuilder(context.resourceResolver().getResource(path))
+            .withExtension("json")
+            .withSelectors(depth)
+            .withRequestMethod("GET")
+            .buildJakartaRequest();
 
-        MockSlingHttpServletResponse response = new MockSlingHttpServletResponse();
+        SlingJakartaHttpServletResponseResult response = Builders.newResponseBuilder().buildJakartaResponseResult();
         JsonRenderer renderer = new JsonRenderer(1000, true);
         renderer.render(request, response);
-        return response.getOutput().toString();
+        return response.getOutputAsString();
     }
 }
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java b/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
index ae0b83c..a17cc01 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/RedirectServletTest.java
@@ -21,16 +21,21 @@ package org.apache.sling.servlets.get.impl;
 import java.util.Collections;
 import java.util.HashMap;
 
-import javax.servlet.http.HttpServletResponse;
-
-import junit.framework.TestCase;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.request.builder.Builders;
+import org.apache.sling.api.request.builder.SlingHttpServletRequestBuilder;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.api.wrappers.ValueMapDecorator;
-import org.apache.sling.commons.testing.sling.MockResourceResolver;
-import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
 
-public class RedirectServletTest extends TestCase {
+public class RedirectServletTest {
 
     static final String TEST_SCHEME = "http";
 
@@ -40,7 +45,7 @@ public class RedirectServletTest extends TestCase {
 
     static final String TEST_PREFIX = TEST_SCHEME + "://" + TEST_HOST;
 
-    public void testToAbsoluteURI() {
+    @Test public void testToAbsoluteURI() {
         final String http = "http";
         final String https = "https";
         final String scheme = "test";
@@ -52,26 +57,26 @@ public class RedirectServletTest extends TestCase {
         final String target = "/target";
 
         // regular building without default ports
-        assertEquals(http + "://" + host + ":" + portAny + target,
+        Assert.assertEquals(http + "://" + host + ":" + portAny + target,
                 RedirectServlet.toAbsoluteUri(http, host, portAny, target));
-        assertEquals(https + "://" + host + ":" + portAny + target,
+        Assert.assertEquals(https + "://" + host + ":" + portAny + target,
                 RedirectServlet.toAbsoluteUri(https, host, portAny, target));
-        assertEquals(scheme + "://" + host + ":" + portAny + target,
+        Assert.assertEquals(scheme + "://" + host + ":" + portAny + target,
                 RedirectServlet.toAbsoluteUri(scheme, host, portAny, target));
 
         // building with default ports
-        assertEquals(http + "://" + host + target, RedirectServlet.toAbsoluteUri(http, host, port80, target));
-        assertEquals(https + "://" + host + target, RedirectServlet.toAbsoluteUri(https, host, port443, target));
-        assertEquals(scheme + "://" + host + ":" + port80 + target,
+        Assert.assertEquals(http + "://" + host + target, RedirectServlet.toAbsoluteUri(http, host, port80, target));
+        Assert.assertEquals(https + "://" + host + target, RedirectServlet.toAbsoluteUri(https, host, port443, target));
+        Assert.assertEquals(scheme + "://" + host + ":" + port80 + target,
                 RedirectServlet.toAbsoluteUri(scheme, host, port80, target));
 
         // building without ports
-        assertEquals(http + "://" + host + target, RedirectServlet.toAbsoluteUri(http, host, portNone, target));
-        assertEquals(https + "://" + host + target, RedirectServlet.toAbsoluteUri(https, host, portNone, target));
-        assertEquals(scheme + "://" + host + target, RedirectServlet.toAbsoluteUri(scheme, host, portNone, target));
+        Assert.assertEquals(http + "://" + host + target, RedirectServlet.toAbsoluteUri(http, host, portNone, target));
+        Assert.assertEquals(https + "://" + host + target, RedirectServlet.toAbsoluteUri(https, host, portNone, target));
+        Assert.assertEquals(scheme + "://" + host + target, RedirectServlet.toAbsoluteUri(scheme, host, portNone, target));
     }
 
-    public void testGetStatus() {
+    @Test public void testGetStatus() {
         final int found = HttpServletResponse.SC_FOUND;
         final int valid = 768;
         final int invalidLow = 77;
@@ -89,7 +94,7 @@ public class RedirectServletTest extends TestCase {
         assertStatus(max, max);
     }
 
-    public void testSameParent() {
+    @Test public void testSameParent() {
         String base = "/a";
         String target = "/b";
         assertEqualsUri("/b", toRedirect(base, target), false);
@@ -103,19 +108,19 @@ public class RedirectServletTest extends TestCase {
         assertEqualsUri("/a/b/d", toRedirect(base, target), false);
     }
 
-    public void testTrailingSlash() {
+    @Test public void testTrailingSlash() {
         String base = "/a/b/c/";
         String target = "/a/b/c.html";
         assertEqualsUri("/a/b/c.html", toRedirect(base, target), false);
     }
 
-    public void testCommonAncestor() {
+    @Test public void testCommonAncestor() {
         String base = "/a/b/c/d";
         String target = "/a/b/x/y";
         assertEqualsUri("/a/b/x/y", toRedirect(base, target), false);
     }
 
-    public void testChild() {
+    @Test public void testChild() {
         String base = "/a.html";
         String target = "/a/b.html";
         assertEqualsUri("/a/b.html", toRedirect(base, target), false);
@@ -141,7 +146,7 @@ public class RedirectServletTest extends TestCase {
         assertEqualsUri("/a/b/c", toRedirect(base, target), false);
     }
 
-    public void testChildNonRoot() {
+    @Test public void testChildNonRoot() {
         String base = "/x/a.html";
         String target = "/x/a/b.html";
         assertEqualsUri("/x/a/b.html", toRedirect(base, target), false);
@@ -167,7 +172,7 @@ public class RedirectServletTest extends TestCase {
         assertEqualsUri("/x/a/b/c", toRedirect(base, target), false);
     }
 
-    public void testChildRelative() {
+    @Test public void testChildRelative() {
         String base = "/a";
         String target = "b.html";
         assertEqualsUri("/a/b.html", toRedirect(base, target), false);
@@ -185,7 +190,7 @@ public class RedirectServletTest extends TestCase {
         assertEqualsUri("/a/b/c", toRedirect(base, target), false);
     }
 
-    public void testChildNonRootRelative() {
+    @Test public void testChildNonRootRelative() {
         String base = "/x/a";
         String target = "b.html";
         assertEqualsUri("/x/a/b.html", toRedirect(base, target), false);
@@ -203,13 +208,13 @@ public class RedirectServletTest extends TestCase {
         assertEqualsUri("/x/a/b/c", toRedirect(base, target), false);
     }
 
-    public void testUnCommon() {
+    @Test public void testUnCommon() {
         String base = "/a/b/c/d";
         String target = "/w/x/y/z";
         assertEqualsUri("/w/x/y/z", toRedirect(base, target), false);
     }
 
-    public void testSibbling() {
+    @Test public void testSibbling() {
         String base = "/a/b";
         String target0 = "../y/z";
         assertEqualsUri("/a/y/z", toRedirect(base, target0), false);
@@ -221,7 +226,7 @@ public class RedirectServletTest extends TestCase {
         assertEqualsUri(base + "/" + target2, toRedirect(base, target2), false);
     }
 
-    public void testSelectorsEtc() {
+    @Test public void testSelectorsEtc() {
         assertEquals(null, null, null, null);
 
         assertEquals(null, "html", null, null);
@@ -239,17 +244,39 @@ public class RedirectServletTest extends TestCase {
         assertEquals("print.a4", "html", "/suffix.pdf", "xy=1");
     }
 
-    public void testEmptyPath() {
-        MockSlingHttpServletRequest request = new MockSlingHttpServletRequest("/", null, null, null, null, "",
-                TEST_SCHEME, TEST_HOST, TEST_PORT, "/webapp");
-        request.setResourceResolver(new MockResourceResolver());
+    @Test public void testRootPath() {
+        final Resource resource = Mockito.mock(Resource.class);
+        Mockito.when(resource.getPath()).thenReturn("/");
+        final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
+
+        Mockito.when(resolver.map(Mockito.any(HttpServletRequest.class), Mockito.anyString())).thenAnswer(invocation -> {
+            Object[] args = invocation.getArguments();
+            String path = (String) args[1];
+            return "/webapp" + path;
+        });
+        Mockito.when(resource.getResourceResolver()).thenReturn(resolver);
+        final SlingHttpServletRequestBuilder requestBuilder = Builders.newRequestBuilder(resource);
+        final SlingJakartaHttpServletRequest request = requestBuilder.buildJakartaRequest();
+
         String path = RedirectServlet.toRedirectPath("/index.html", request);
         assertEqualsUri("/webapp/index.html", path, false);
+    }
 
-        request = new MockSlingHttpServletRequest("/", null, null, null, null, "/", TEST_SCHEME, TEST_HOST, TEST_PORT,
-                "/webapp");
-        request.setResourceResolver(new MockResourceResolver());
-        path = RedirectServlet.toRedirectPath("/index.html", request);
+    @Test public void testEmptyPath() {
+        final Resource resource = Mockito.mock(Resource.class);
+        Mockito.when(resource.getPath()).thenReturn("");
+        final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
+
+        Mockito.when(resolver.map(Mockito.any(HttpServletRequest.class), Mockito.anyString())).thenAnswer(invocation -> {
+            Object[] args = invocation.getArguments();
+            String path = (String) args[1];
+            return "/webapp" + path;
+        });
+        Mockito.when(resource.getResourceResolver()).thenReturn(resolver);
+        final SlingHttpServletRequestBuilder requestBuilder = Builders.newRequestBuilder(resource);
+        final SlingJakartaHttpServletRequest request = requestBuilder.buildJakartaRequest();
+
+        String path = RedirectServlet.toRedirectPath("/index.html", request);
         assertEqualsUri("/webapp/index.html", path, false);
     }
 
@@ -280,9 +307,9 @@ public class RedirectServletTest extends TestCase {
 
     private static void assertEqualsUri(String expected, String actual, boolean isAbsolute) {
         if (isAbsolute) {
-            assertEquals(expected, actual);
+            Assert.assertEquals(expected, actual);
         } else {
-            assertEquals(expected, actual);
+            Assert.assertEquals(expected, actual);
         }
     }
 
@@ -299,7 +326,7 @@ public class RedirectServletTest extends TestCase {
 
         final int actualStatus = RedirectServlet.getStatus(valueMap);
 
-        assertEquals(expectedStatus, actualStatus);
+        Assert.assertEquals(expectedStatus, actualStatus);
     }
 
     private static String toRedirect(String basePath, String targetPath) {
@@ -308,10 +335,31 @@ public class RedirectServletTest extends TestCase {
 
     private static String toRedirect(String basePath, String selectors, String extension, String suffix,
             String queryString, String targetPath) {
-        MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(basePath, selectors, extension, suffix,
-                queryString, basePath, TEST_SCHEME, TEST_HOST, TEST_PORT, "");
-        request.setResourceResolver(new MockResourceResolver());
+        final Resource resource = Mockito.mock(Resource.class);
+        Mockito.when(resource.getPath()).thenReturn(basePath);
+        final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
+
+        Mockito.when(resolver.map(Mockito.any(HttpServletRequest.class), Mockito.anyString())).thenAnswer(invocation -> {
+            Object[] args = invocation.getArguments();
+            String path = (String) args[1];
+            return path;
+        });
+        Mockito.when(resource.getResourceResolver()).thenReturn(resolver);
+        final SlingHttpServletRequestBuilder requestBuilder = Builders.newRequestBuilder(resource);
+        if (selectors != null) {
+            requestBuilder.withSelectors(selectors);
+        }
+        if (extension != null) {
+            requestBuilder.withExtension(extension);
+        }
+        if (suffix != null) {
+            requestBuilder.withSuffix(suffix);
+        }
+        if (queryString != null) {
+            String[] parts = queryString.split("=");
+            requestBuilder.withParameter(parts[0], parts[1]);
+        }
+        final SlingJakartaHttpServletRequest request = requestBuilder.buildJakartaRequest();
         return RedirectServlet.toRedirectPath(targetPath, request);
     }
-
 }
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererTest.java b/src/test/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererTest.java
index fff4003..9f9c369 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererTest.java
@@ -26,10 +26,10 @@ import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
 
-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.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.junit.Before;
@@ -38,14 +38,14 @@ import org.mockito.Mockito;
 
 public class HtmlRendererTest {
 
-    private SlingHttpServletRequest request;
-    private SlingHttpServletResponse response;
+    private SlingJakartaHttpServletRequest request;
+    private SlingJakartaHttpServletResponse response;
 
     private StringWriter writer;
 
     @Before
     public void setup() throws IOException {
-        request = Mockito.mock(SlingHttpServletRequest.class);
+        request = Mockito.mock(SlingJakartaHttpServletRequest.class);
 
         final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
         Mockito.when(request.getResourceResolver()).thenReturn(resolver);
@@ -58,7 +58,7 @@ public class HtmlRendererTest {
         props.put("key", "<script>alert(1);</script>");
         Mockito.when(resource.adaptTo(Map.class)).thenReturn(props);
 
-        response = Mockito.mock(SlingHttpServletResponse.class);
+        response = Mockito.mock(SlingJakartaHttpServletResponse.class);
 
         this.writer = new StringWriter();
         Mockito.when(response.getWriter()).thenReturn(new PrintWriter(this.writer));
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java b/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
index 350d580..4265a9c 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/helpers/JsonRendererTest.java
@@ -32,56 +32,77 @@ import jakarta.json.JsonPatch;
 import jakarta.json.JsonReader;
 
 import org.apache.jackrabbit.util.ISO8601;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.request.RequestPathInfo;
+import org.apache.sling.api.request.builder.Builders;
+import org.apache.sling.api.request.builder.SlingJakartaHttpServletResponseResult;
+import org.apache.sling.api.uri.SlingUriBuilder;
 import org.apache.sling.testing.mock.sling.junit.SlingContext;
-import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 public class JsonRendererTest {
 
     @Rule
     public final SlingContext context = new SlingContext();
 
-    private MockSlingHttpServletRequest request;
-    private MockSlingHttpServletResponse response;
+    private SlingJakartaHttpServletRequest request;
+    private SlingJakartaHttpServletResponseResult response;
 
     private JsonRenderer jrs;
 
     @Before
     public void setup() {
         context.load().json("/data.json", "/content");
-        request = context.request();
-        response = context.response();
+        request = Mockito.mock(SlingJakartaHttpServletRequest.class);
+        response = Builders.newResponseBuilder().buildJakartaResponseResult();
 
         context.currentResource("/content");
-
+        Mockito.when(request.getResource()).thenReturn(context.currentResource());
         jrs = new JsonRenderer(42, false);
     }
 
     @Test
     public void testRecursionLevelA() {
-        context.requestPathInfo().setSelectorString("12");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"12"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
+
         assertEquals(12, jrs.getMaxRecursionLevel(request));
         assertFalse(jrs.isTidy(request));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRecursionLevelB() {
-        context.requestPathInfo().setSelectorString("42.more");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"42", "more"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         jrs.getMaxRecursionLevel(request);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRecursionLevelC() {
-        context.requestPathInfo().setSelectorString("more");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"more"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         jrs.getMaxRecursionLevel(request);
     }
 
     @Test
     public void testRecursionLevelD() {
-        context.requestPathInfo().setSelectorString("tidy");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"tidy"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertEquals(0, jrs.getMaxRecursionLevel(request));
     }
 
@@ -90,63 +111,103 @@ public class JsonRendererTest {
         // Level must be the last selector but
         // if the last selector is "tidy" there's
         // no error. "for historical reasons"
-        context.requestPathInfo().setSelectorString("46.tidy");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"46", "tidy"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertEquals(0, jrs.getMaxRecursionLevel(request));
     }
 
     @Test
     public void testRecursionLevelF() {
-        context.requestPathInfo().setSelectorString("tidy.45");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"tidy", "45"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertEquals(45, jrs.getMaxRecursionLevel(request));
         assertTrue(jrs.isTidy(request));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRecursionLevelNumeric() {
-        context.requestPathInfo().setSelectorString("᭙");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"᭙"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         jrs.getMaxRecursionLevel(request);
     }
 
     @Test
     public void testRecursionLevelOverflow() {
-        context.requestPathInfo().setSelectorString(Long.toString(((long) Integer.MAX_VALUE)  + 1L));
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {Long.toString(((long) Integer.MAX_VALUE)  + 1L)})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertEquals(-1, jrs.getMaxRecursionLevel(request));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRecursionLevelUnderflow() {
-        context.requestPathInfo().setSelectorString(Long.toString(((long) Integer.MIN_VALUE)  - 1L));
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {Long.toString(((long) Integer.MIN_VALUE)  - 1L)})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         jrs.getMaxRecursionLevel(request);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testRecursionLevelNegativ() {
-        context.requestPathInfo().setSelectorString(Long.toString( - 2L));
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {Long.toString( - 2L)})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         jrs.getMaxRecursionLevel(request);
     }
 
     @Test
     public void testRecursionLevelInfinity() {
-        context.requestPathInfo().setSelectorString("infinity");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"infinity"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertEquals(-1, jrs.getMaxRecursionLevel(request));
     }
 
     @Test
     public void testRecursionLevelInfinityNumeric() {
-        context.requestPathInfo().setSelectorString("-1");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"-1"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertEquals(-1, jrs.getMaxRecursionLevel(request));
     }
 
     @Test
     public void testBadRequest() throws IOException {
-        context.requestPathInfo().setSelectorString("bad.selectors");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"bad", "selectors"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         jrs.render(request, response);
         assertTrue(response.getStatus() == 400);
     }
 
     @Test
     public void testISO8601() throws IOException {
-        context.requestPathInfo().setSelectorString("1");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"1"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         String created = getJsonFromReader().getString("created");
         Calendar cal = ISO8601.parse(created);
         // at the time of the test the offset it not preserved
@@ -157,7 +218,11 @@ public class JsonRendererTest {
 
     @Test
     public void testECMA() throws IOException {
-        context.requestPathInfo().setSelectorString("1");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"1"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         JsonRenderer ecmajrs = new JsonRenderer(42, true);
         ecmajrs.render(request, response);
         String out = response.getOutputAsString();
@@ -168,14 +233,22 @@ public class JsonRendererTest {
 
     @Test
     public void testBoolean() throws IOException {
-        context.requestPathInfo().setSelectorString("1");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"1"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertTrue(getJsonFromReader().getBoolean("active"));
     }
 
     @Test
     // JSON impl only support Integers, JCR only supports Long values.
     public void testNumber() throws IOException {
-        context.requestPathInfo().setSelectorString("1");
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"1"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertTrue(getJsonFromReader().getInt("number") == 2);
     }
 
@@ -183,6 +256,11 @@ public class JsonRendererTest {
     // TODO investigating SLING-7890 - needs cleanup once we find out exactly what's going on
     public void testBooleansNoTidy() throws IOException {
         context.currentResource("/content/booleans");
+        Mockito.when(request.getResource()).thenReturn(context.currentResource());
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         final String expected = "{\"b2\":false,\"jcr:primaryType\":\"nt:unstructured\",\"s1\":\"true\",\"b1\":true,\"s2\":\"false\"}";
         JsonPatch diff;
         try(JsonReader jsonReader = Json.createReader(new StringReader(expected));
@@ -199,7 +277,12 @@ public class JsonRendererTest {
     // TODO investigating SLING-7890 - needs cleanup once we find out exactly what's going on
     public void testBooleansWithTidy() throws IOException {
         context.currentResource("/content/booleans");
-        context.requestPathInfo().setSelectorString(".tidy");
+        Mockito.when(request.getResource()).thenReturn(context.currentResource());
+        RequestPathInfo rpi = SlingUriBuilder
+            .createFrom(context.currentResource())
+            .setSelectors(new String[] {"tidy"})
+            .build();
+        Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         final String expected = "{\n" +
             "  \"b2\": false,\n" +
             "  \"jcr:primaryType\": \"nt:unstructured\",\n" +
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererTest.java b/src/test/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererTest.java
index 767bd10..47af928 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/helpers/StreamRendererTest.java
@@ -28,16 +28,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Random;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
 
-import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
 import org.apache.sling.api.request.RequestDispatcherOptions;
+import org.apache.sling.api.request.builder.Builders;
+import org.apache.sling.api.request.builder.SlingJakartaHttpServletResponseResult;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceMetadata;
-import org.apache.sling.servlethelpers.MockRequestDispatcherFactory;
 import org.apache.sling.testing.mock.sling.ResourceResolverType;
 import org.apache.sling.testing.mock.sling.junit.SlingContext;
 import org.junit.Before;
@@ -52,25 +54,11 @@ public class StreamRendererTest {
     @Rule
     public SlingContext context = new SlingContext(ResourceResolverType.JCR_OAK);
 
-    RequestDispatcher requestDispatcher;
-
 
     @Before
     public void setup() {
         context.create().resource("/abc.txt","prop","value");
         context.build().file("file.txt", this.getClass().getResourceAsStream("/samplefile.json"));
-        requestDispatcher = Mockito.mock(RequestDispatcher.class);
-        context.request().setRequestDispatcherFactory(new MockRequestDispatcherFactory() {
-            @Override
-            public RequestDispatcher getRequestDispatcher(String path, RequestDispatcherOptions options) {
-                return requestDispatcher;
-            }
-
-            @Override
-            public RequestDispatcher getRequestDispatcher(Resource resource, RequestDispatcherOptions options) {
-                return requestDispatcher;
-            }
-        });
     }
 
     @Test
@@ -167,7 +155,7 @@ public class StreamRendererTest {
     public void test_setHeaders() throws Throwable {
 
         final Resource resource = Mockito.mock(Resource.class);
-        final SlingHttpServletResponse response = Mockito.mock(SlingHttpServletResponse.class);
+        final SlingJakartaHttpServletResponse response = Mockito.mock(SlingJakartaHttpServletResponse.class);
         final ResourceMetadata meta = Mockito.mock(ResourceMetadata.class);
         final ServletContext sc = Mockito.mock(ServletContext.class);
 
@@ -175,32 +163,41 @@ public class StreamRendererTest {
 
         Mockito.when(resource.getResourceMetadata()).thenReturn(meta);
         PrivateAccessor.invoke(streamRendererServlet, "setHeaders",
-                new Class[] { Resource.class, SlingHttpServletResponse.class }, new Object[] { resource, response });
+                new Class[] { Resource.class, SlingJakartaHttpServletResponse.class }, new Object[] { resource, response });
         Mockito.verify(response, Mockito.times(1)).setContentType("application/octet-stream");
     }
 
 
     @Test
     public void test_render_file() throws IOException {
-
         StreamRenderer renderer = new StreamRenderer(true,null,null);
-        context.request().setResource(context.resourceResolver().getResource("/file.txt"));
-        renderer.render(context.request(), context.response());
-        assertTrue(context.response().getOutputAsString().equals("not json"));
+        final SlingJakartaHttpServletRequest request = Builders.newRequestBuilder(context.resourceResolver().getResource("/file.txt"))
+            .buildJakartaRequest();
+        final SlingJakartaHttpServletResponseResult response = Builders.newResponseBuilder()
+            .buildJakartaResponseResult();
+        renderer.render(request, response);
+        assertTrue(response.getOutputAsString().equals("not json"));
         assertEquals(HttpServletResponse.SC_OK, context.response().getStatus());
 
     }
 
     @Test
     public void test_render_file_directoryListing() throws IOException, ServletException {
-        ServletContext sc = Mockito.mock(ServletContext.class);
-        StreamRenderer renderer = new StreamRenderer(true,new String[] {"/"},sc);
-        Resource root = context.resourceResolver().getResource("/");
-        context.request().setResource(root);
-        renderer.render(context.request(), context.response());
-        assertEquals(HttpServletResponse.SC_OK, context.response().getStatus());
-        Mockito.verify(requestDispatcher).include(Mockito.any(), Mockito.any());
+        final ServletContext sc = Mockito.mock(ServletContext.class);
+        final RequestDispatcher dispatcher = Mockito.mock(RequestDispatcher.class);
+        final SlingJakartaHttpServletRequest internalRequest = Mockito.mock(SlingJakartaHttpServletRequest.class);
+        Mockito.when(internalRequest.getRequestDispatcher(Mockito.anyString(), Mockito.any(RequestDispatcherOptions.class))).thenReturn(dispatcher);
 
+        Resource root = context.resourceResolver().getResource("/");
+        final SlingJakartaHttpServletRequest request = Builders.newRequestBuilder(root)
+            .useRequestDispatcherFrom(internalRequest)
+            .buildJakartaRequest();
+        final SlingJakartaHttpServletResponseResult response = Builders.newResponseBuilder()
+            .buildJakartaResponseResult();
+        StreamRenderer renderer = new StreamRenderer(true,new String[] {"/"}, sc);
+        renderer.render(request, response);
+        assertEquals(HttpServletResponse.SC_OK, response.getStatus());
+        Mockito.verify(dispatcher).include(Mockito.any(), Mockito.any());
     }