You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2025/03/28 14:55:45 UTC

(sling-org-apache-sling-servlets-get) branch master updated (5386a08 -> b37e2fa)

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

sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git


    from 5386a08  SLING-12610 : Migrate Servlets Get to Jakarta Servlet API (#16)
     new 68ef03c  SLING-12726 Update to Parent 62
     new b37e2fa  SLING-12726 apply spotless formatting

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:
 .sling-module.json                                 |   5 +
 pom.xml                                            | 114 ++++++------
 .../sling/servlets/get/impl/DefaultGetServlet.java | 201 +++++++++++----------
 .../sling/servlets/get/impl/RedirectServlet.java   |  48 ++---
 .../sling/servlets/get/impl/SlingInfoServlet.java  |  15 +-
 .../servlets/get/impl/VersionInfoServlet.java      |  75 ++++----
 .../get/impl/helpers/HeadServletResponse.java      |  64 +++----
 .../servlets/get/impl/helpers/HtmlRenderer.java    |  54 +++---
 .../servlets/get/impl/helpers/JsonRenderer.java    |  45 +++--
 .../get/impl/helpers/PlainTextRenderer.java        |  53 +++---
 .../sling/servlets/get/impl/helpers/Renderer.java  |  31 ++--
 .../servlets/get/impl/helpers/StreamRenderer.java  | 200 +++++++++-----------
 .../servlets/get/impl/helpers/XMLRenderer.java     |  53 +++---
 .../servlets/get/impl/util/JsonObjectCreator.java  |  23 ++-
 .../sling/servlets/get/impl/util/JsonToText.java   |  49 +++--
 .../servlets/get/impl/util/ResourceTraversor.java  |  28 ++-
 .../servlets/get/impl/DefaultGetServletTest.java   |   9 +-
 .../servlets/get/impl/JsonRendererServletTest.java |  19 +-
 .../servlets/get/impl/RedirectServletTest.java     | 102 +++++++----
 .../get/impl/helpers/HtmlRendererTest.java         |   7 +-
 .../get/impl/helpers/JsonRendererTest.java         | 169 ++++++++---------
 .../get/impl/helpers/StreamRendererTest.java       | 105 ++++++-----
 .../get/impl/util/JsonObjectCreatorTest.java       |  24 +--
 23 files changed, 728 insertions(+), 765 deletions(-)
 create mode 100644 .sling-module.json


(sling-org-apache-sling-servlets-get) 02/02: SLING-12726 apply spotless formatting

Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit b37e2fa1088330a89ec2f37fe31307d3491e0a51
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri Mar 28 15:42:37 2025 +0100

    SLING-12726 apply spotless formatting
---
 pom.xml                                            | 112 ++++++------
 .../sling/servlets/get/impl/DefaultGetServlet.java | 201 +++++++++++----------
 .../sling/servlets/get/impl/RedirectServlet.java   |  48 ++---
 .../sling/servlets/get/impl/SlingInfoServlet.java  |  15 +-
 .../servlets/get/impl/VersionInfoServlet.java      |  75 ++++----
 .../get/impl/helpers/HeadServletResponse.java      |  64 +++----
 .../servlets/get/impl/helpers/HtmlRenderer.java    |  54 +++---
 .../servlets/get/impl/helpers/JsonRenderer.java    |  45 +++--
 .../get/impl/helpers/PlainTextRenderer.java        |  53 +++---
 .../sling/servlets/get/impl/helpers/Renderer.java  |  31 ++--
 .../servlets/get/impl/helpers/StreamRenderer.java  | 200 +++++++++-----------
 .../servlets/get/impl/helpers/XMLRenderer.java     |  53 +++---
 .../servlets/get/impl/util/JsonObjectCreator.java  |  23 ++-
 .../sling/servlets/get/impl/util/JsonToText.java   |  49 +++--
 .../servlets/get/impl/util/ResourceTraversor.java  |  28 ++-
 .../servlets/get/impl/DefaultGetServletTest.java   |   9 +-
 .../servlets/get/impl/JsonRendererServletTest.java |  19 +-
 .../servlets/get/impl/RedirectServletTest.java     | 102 +++++++----
 .../get/impl/helpers/HtmlRendererTest.java         |   7 +-
 .../get/impl/helpers/JsonRendererTest.java         | 169 ++++++++---------
 .../get/impl/helpers/StreamRendererTest.java       | 105 ++++++-----
 .../get/impl/util/JsonObjectCreatorTest.java       |  24 +--
 22 files changed, 722 insertions(+), 764 deletions(-)

diff --git a/pom.xml b/pom.xml
index bf928e8..09f3b27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -31,63 +31,20 @@
     <version>3.0.0-SNAPSHOT</version>
 
     <name>Apache Sling Default GET Servlets</name>
-    <description>
-        Provides default GET servlets for HTML, Text and JSON rendering
-        and streaming resources.
-    </description>
+    <description>Provides default GET servlets for HTML, Text and JSON rendering
+        and streaming resources.</description>
 
     <scm>
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlets-get.git</developerConnection>
-        <url>https://github.com/apache/sling-org-apache-sling-servlets-get.git</url>
         <tag>HEAD</tag>
+        <url>https://github.com/apache/sling-org-apache-sling-servlets-get.git</url>
     </scm>
 
     <properties>
         <site.jira.version.id>12314473</site.jira.version.id>
         <sling.java.version>17</sling.java.version>
     </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>biz.aQute.bnd</groupId>
-                <artifactId>bnd-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <excludePackageNames>
-                        org.apache.sling.servlets.get.impl
-                    </excludePackageNames>
-                </configuration>
-            </plugin>
-           <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createSourcesJar>true</createSourcesJar>
-                            <shadeSourcesContent>true</shadeSourcesContent>
-                            <relocations>
-                                <relocation>
-                                    <pattern>org.apache.jackrabbit.util</pattern>
-                                    <shadedPattern>org.apache.sling.servlets.get.impl.jackrabbit</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -144,12 +101,12 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-         <dependency>
-             <groupId>junit-addons</groupId>
-             <artifactId>junit-addons</artifactId>
-             <version>1.4</version>
-             <scope>test</scope>
-         </dependency>
+        <dependency>
+            <groupId>junit-addons</groupId>
+            <artifactId>junit-addons</artifactId>
+            <version>1.4</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -171,8 +128,8 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock-oak</artifactId>
-            <scope>test</scope>
             <version>3.1.10-1.44.0</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -199,10 +156,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-          <version>2.8.0</version>
-          <scope>test</scope>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.8.0</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -217,4 +174,43 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <excludePackageNames>org.apache.sling.servlets.get.impl</excludePackageNames>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                            <shadeSourcesContent>true</shadeSourcesContent>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.apache.jackrabbit.util</pattern>
+                                    <shadedPattern>org.apache.sling.servlets.get.impl.jackrabbit</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
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 ee14133..840dd1e 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
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ *   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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.servlets.get.impl;
 
@@ -24,7 +26,6 @@ import java.util.StringTokenizer;
 import jakarta.servlet.Servlet;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.apache.sling.api.SlingConstants;
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
@@ -50,9 +51,10 @@ import org.slf4j.LoggerFactory;
 /**
  * A SlingSafeMethodsServlet that renders the current Resource as simple HTML
  */
-@Component(service = Servlet.class,
-    name="org.apache.sling.servlets.get.DefaultGetServlet",
-    property = {
+@Component(
+        service = Servlet.class,
+        name = "org.apache.sling.servlets.get.DefaultGetServlet",
+        property = {
             "service.description=Default GET Servlet",
             "service.vendor=The Apache Software Foundation",
 
@@ -63,71 +65,86 @@ import org.slf4j.LoggerFactory;
             // Generic handler for all get requests
             "sling.servlet.methods=GET",
             "sling.servlet.methods=HEAD"
-    })
-@Designate(ocd=DefaultGetServlet.Config.class)
+        })
+@Designate(ocd = DefaultGetServlet.Config.class)
 public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
 
     private static final long serialVersionUID = -2714152339750885354L;
 
-    @ObjectClassDefinition(name="Apache Sling GET Servlet",
-            description="The Sling GET servlet is registered as the default servlet to handle GET requests.")
+    @ObjectClassDefinition(
+            name = "Apache Sling GET Servlet",
+            description = "The Sling GET servlet is registered as the default servlet to handle GET requests.")
     public @interface Config {
 
-        @AttributeDefinition(name = "Extension Aliases",
-                description="The aliases can be used to map several extensions to a " +
-                            "single servlet. This works irrespective if the renderer for the target extension is enabled or not. " +
-                            "For instance \"xml:pdf,rtf\" maps the extensions \".pdf\" and " +
-                            "\".rtf\" to the servlet helper handling the \".xml\" extension.")
+        @AttributeDefinition(
+                name = "Extension Aliases",
+                description = "The aliases can be used to map several extensions to a "
+                        + "single servlet. This works irrespective if the renderer for the target extension is enabled or not. "
+                        + "For instance \"xml:pdf,rtf\" maps the extensions \".pdf\" and "
+                        + "\".rtf\" to the servlet helper handling the \".xml\" extension.")
         String[] aliases();
 
-        @AttributeDefinition(name = "Auto Index",
-                description="Controls whether a simple directory index is rendered for " +
-                             "a directory request. A directory request is a request to a resource with a " +
-                             "trailing slash (/) character, for example http://host/apps/. If none of the " +
-                             "index resources exists, the default GET servlet may automatically render an " +
-                             "index listing of the child resources if this option is checked, which is the " +
-                             "default. If this option is not checked, the request to the resource is " +
-                             "forbidden and results in a status 403/FORBIDDEN. This configuration " +
-                             "corresponds to the \"Index\" option of the Options directive of Apache HTTP " +
-                             "Server (httpd).")
+        @AttributeDefinition(
+                name = "Auto Index",
+                description = "Controls whether a simple directory index is rendered for "
+                        + "a directory request. A directory request is a request to a resource with a "
+                        + "trailing slash (/) character, for example http://host/apps/. If none of the "
+                        + "index resources exists, the default GET servlet may automatically render an "
+                        + "index listing of the child resources if this option is checked, which is the "
+                        + "default. If this option is not checked, the request to the resource is "
+                        + "forbidden and results in a status 403/FORBIDDEN. This configuration "
+                        + "corresponds to the \"Index\" option of the Options directive of Apache HTTP "
+                        + "Server (httpd).")
         boolean index() default false;
 
-        @AttributeDefinition(name = "Index Resources",
-                description = "List of child resources to be considered for rendering  " +
-                             "the index of a \"directory\". The default value is [ \"index\", \"index.html\" ].  " +
-                             "Each entry in the list is checked and the first entry found is included to  " +
-                             "render the index. If an entry is selected, which has not extension (for  " +
-                             "example the \"index\" resource), the extension \".html\" is appended for the  " +
-                             "inclusion to indicate the desired text/html rendering. If the resource name  " +
-                             "has an extension (as in \"index.html\"), no additional extension is appended  " +
-                             "for the inclusion. This configuration corresponds to the <DirectoryIndex>  " +
-                             "directive of Apache HTTP Server (httpd).")
-        String[] index_files() default { "index","index.html" };
-
-        @AttributeDefinition(name = "Enable HTML",
-                description = "Whether the renderer for HTML of the default GET servlet is enabled for extension \"html\" or not.")
+        @AttributeDefinition(
+                name = "Index Resources",
+                description = "List of child resources to be considered for rendering  "
+                        + "the index of a \"directory\". The default value is [ \"index\", \"index.html\" ].  "
+                        + "Each entry in the list is checked and the first entry found is included to  "
+                        + "render the index. If an entry is selected, which has not extension (for  "
+                        + "example the \"index\" resource), the extension \".html\" is appended for the  "
+                        + "inclusion to indicate the desired text/html rendering. If the resource name  "
+                        + "has an extension (as in \"index.html\"), no additional extension is appended  "
+                        + "for the inclusion. This configuration corresponds to the <DirectoryIndex>  "
+                        + "directive of Apache HTTP Server (httpd).")
+        String[] index_files() default {"index", "index.html"};
+
+        @AttributeDefinition(
+                name = "Enable HTML",
+                description =
+                        "Whether the renderer for HTML of the default GET servlet is enabled for extension \"html\" or not.")
         boolean enable_html() default true;
 
-        @AttributeDefinition(name = "Enable JSON",
-                description = "Whether the renderer for JSON of the default GET servlet is enabled for extension \"json\" or not.")
+        @AttributeDefinition(
+                name = "Enable JSON",
+                description =
+                        "Whether the renderer for JSON of the default GET servlet is enabled for extension \"json\" or not.")
         boolean enable_json() default true;
 
-        @AttributeDefinition(name = "Enable Plain Text",
-                description = "Whether the renderer for plain text of the default GET servlet is enabled for extension \"txt\" or not.")
+        @AttributeDefinition(
+                name = "Enable Plain Text",
+                description =
+                        "Whether the renderer for plain text of the default GET servlet is enabled for extension \"txt\" or not.")
         boolean enable_txt() default true;
 
-        @AttributeDefinition(name = "Enable XML",
-                description = "Whether the renderer for XML of the default GET servlet is enabled for extension \"xml\" or not.")
+        @AttributeDefinition(
+                name = "Enable XML",
+                description =
+                        "Whether the renderer for XML of the default GET servlet is enabled for extension \"xml\" or not.")
         boolean enable_xml() default true;
 
-        @AttributeDefinition(name = "JSON Max results",
-                description = "The maximum number of resources that should " +
-                  "be returned when doing a node.5.json or node.infinity.json. In JSON terms " +
-                  "this basically means the number of Objects to return. Default value is " +
-                  "200.")
+        @AttributeDefinition(
+                name = "JSON Max results",
+                description = "The maximum number of resources that should "
+                        + "be returned when doing a node.5.json or node.infinity.json. In JSON terms "
+                        + "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")
+        @AttributeDefinition(
+                name = "Legacy ECMA date format",
+                description = "Enable legacy Sling ECMA format for dates")
         boolean ecmaSuport() default true;
     }
 
@@ -154,7 +171,7 @@ public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
 
     private boolean enableXml;
 
-	private boolean enableEcmaSupport;
+    private boolean enableEcmaSupport;
 
     public static final String EXT_HTML = "html";
 
@@ -171,7 +188,7 @@ public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
         this.aliases = cfg.aliases();
         this.index = cfg.index();
         this.indexFiles = cfg.index_files();
-        if ( this.indexFiles == null ) {
+        if (this.indexFiles == null) {
             this.indexFiles = new String[0];
         }
 
@@ -194,16 +211,16 @@ public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
     }
 
     private Renderer getDefaultRenderer(final String type) {
-    	Renderer renderer = null;
-        if ( EXT_RES.equals(type) ) {
+        Renderer renderer = null;
+        if (EXT_RES.equals(type)) {
             renderer = new StreamRenderer(index, indexFiles, getServletContext());
-        } else if ( EXT_HTML.equals(type) ) {
+        } else if (EXT_HTML.equals(type)) {
             renderer = HtmlRenderer.INSTANCE;
-        } else if ( EXT_TXT.equals(type) ) {
+        } else if (EXT_TXT.equals(type)) {
             renderer = new PlainTextRenderer();
-        } else if (EXT_JSON.equals(type) ) {
+        } else if (EXT_JSON.equals(type)) {
             renderer = new JsonRenderer(jsonMaximumResults, enableEcmaSupport);
-        } else if ( EXT_XML.equals(type) ) {
+        } else if (EXT_XML.equals(type)) {
             renderer = new XMLRenderer();
         }
         return renderer;
@@ -222,26 +239,21 @@ public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
         rendererMap.put(EXT_RES, streamRenderer);
 
         if (enableHtml) {
-            rendererMap.put(EXT_HTML,
-                    getDefaultRenderer(EXT_HTML));
+            rendererMap.put(EXT_HTML, getDefaultRenderer(EXT_HTML));
         }
 
         if (enableTxt) {
-            rendererMap.put(EXT_TXT,
-                    getDefaultRenderer(EXT_TXT));
+            rendererMap.put(EXT_TXT, getDefaultRenderer(EXT_TXT));
         }
 
         if (enableJson) {
-            rendererMap.put(EXT_JSON,
-                    getDefaultRenderer(EXT_JSON));
+            rendererMap.put(EXT_JSON, getDefaultRenderer(EXT_JSON));
         }
 
         if (enableXml) {
-            rendererMap.put(EXT_XML,
-                    getDefaultRenderer(EXT_XML));
+            rendererMap.put(EXT_XML, getDefaultRenderer(EXT_XML));
         }
 
-
         // check additional aliases
         if (this.aliases != null) {
             for (final String m : aliases) {
@@ -249,13 +261,12 @@ public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
                 if (pos != -1) {
                     final String type = m.substring(0, pos);
                     Renderer renderer = rendererMap.get(type);
-                    if ( renderer == null ) {
+                    if (renderer == null) {
                         renderer = getDefaultRenderer(type);
                     }
                     if (renderer != null) {
                         final String extensions = m.substring(pos + 1);
-                        final StringTokenizer st = new StringTokenizer(
-                            extensions, ",");
+                        final StringTokenizer st = new StringTokenizer(extensions, ",");
                         while (st.hasMoreTokens()) {
                             final String ext = st.nextToken();
                             rendererMap.put(ext, renderer);
@@ -273,14 +284,12 @@ public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
      *             existing resource.
      */
     @Override
-    protected void doGet(SlingJakartaHttpServletRequest request,
-            SlingJakartaHttpServletResponse response) throws ServletException,
-            IOException {
+    protected void doGet(SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
+            throws ServletException, IOException {
 
         // cannot handle the request for missing resources
         if (ResourceUtil.isNonExistingResource(request.getResource())) {
-            throw new ResourceNotFoundException(
-                request.getResource().getPath(), "No resource found");
+            throw new ResourceNotFoundException(request.getResource().getPath(), "No resource found");
         }
 
         Renderer renderer;
@@ -289,32 +298,26 @@ public class DefaultGetServlet extends SlingJakartaSafeMethodsServlet {
 
         // fail if we should not just stream or we cannot support the ext.
         if (renderer == null) {
-            request.getRequestProgressTracker().log(
-                "No renderer for extension " + ext);
+            request.getRequestProgressTracker().log("No renderer for extension " + ext);
             // if this is an included request, sendError() would fail
             // 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_JAKARTA_SERVLET) != null) {
-                logger.error(
-                    "No renderer for extension {}, cannot render resource {}",
-                    ext, request.getResource());
+            if (response.isCommitted() || request.getAttribute(SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET) != null) {
+                logger.error("No renderer for extension {}, cannot render resource {}", ext, request.getResource());
             } else {
                 response.sendError(HttpServletResponse.SC_NOT_FOUND);
             }
             return;
         }
 
-        request.getRequestProgressTracker().log(
-            "Using " + renderer.getClass().getName()
-                + " to render for extension=" + ext);
+        request.getRequestProgressTracker()
+                .log("Using " + renderer.getClass().getName() + " to render for extension=" + ext);
         renderer.render(request, response);
     }
 
     @Override
-    protected void doHead(SlingJakartaHttpServletRequest request,
-                          SlingJakartaHttpServletResponse response) throws ServletException,
-            IOException {
+    protected void doHead(SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
+            throws ServletException, IOException {
 
         response = new HeadServletResponse(response);
         doGet(request, 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 1cb9e90..05d8bcc 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
@@ -23,7 +23,6 @@ import java.io.IOException;
 import jakarta.servlet.Servlet;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.apache.sling.api.SlingConstants;
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
@@ -58,14 +57,15 @@ import org.slf4j.LoggerFactory;
  * Those requests are handed off to the DefaultGetServlet for handling
  */
 @SuppressWarnings("serial")
-@Component(service = Servlet.class,
-    property = {
+@Component(
+        service = Servlet.class,
+        property = {
             "service.description=Request Redirect Servlet",
             "service.vendor=The Apache Software Foundation",
             "sling.servlet.resourceTypes=sling:redirect",
             "sling.servlet.methods=GET",
             "sling.servlet.prefix:Integer=-1"
-    })
+        })
 public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
 
     /** The name of the target property */
@@ -77,13 +77,12 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
     /** default log */
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    @Reference(target="(component.name=org.apache.sling.servlets.get.DefaultGetServlet)")
+    @Reference(target = "(component.name=org.apache.sling.servlets.get.DefaultGetServlet)")
     private Servlet defaultRenderServlet;
 
     @Override
-    protected void doGet(SlingJakartaHttpServletRequest request,
-            SlingJakartaHttpServletResponse response) throws ServletException,
-            IOException {
+    protected void doGet(SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
+            throws ServletException, IOException {
 
         // handle json export of the redirect node
         if (DefaultGetServlet.EXT_JSON.equals(request.getRequestPathInfo().getExtension())) {
@@ -95,14 +94,12 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
         if (response.isCommitted()) {
             // committed response cannot be redirected
             log.warn("RedirectServlet: Response is already committed, not redirecting");
-            request.getRequestProgressTracker().log(
-                "RedirectServlet: Response is already committed, not redirecting");
+            request.getRequestProgressTracker().log("RedirectServlet: Response is already committed, not redirecting");
             return;
         } 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(
-                "RedirectServlet: Servlet is included, not redirecting");
+            request.getRequestProgressTracker().log("RedirectServlet: Servlet is included, not redirecting");
             return;
         }
 
@@ -116,11 +113,9 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
         }
         if (targetPath == null) {
             // old behaviour
-            final Resource targetResource = request.getResourceResolver().getResource(
-                rsrc, TARGET_PROP);
+            final Resource targetResource = request.getResourceResolver().getResource(rsrc, TARGET_PROP);
             if (targetResource == null) {
-                response.sendError(HttpServletResponse.SC_NOT_FOUND,
-                    "Missing target for redirection");
+                response.sendError(HttpServletResponse.SC_NOT_FOUND, "Missing target for redirection");
                 return;
             }
 
@@ -136,8 +131,8 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
                 targetPath = toRedirectPath(targetPath, request);
             } else {
                 // just append any selectors, extension, suffix and query string
-                targetPath = appendSelectorsExtensionSuffixQuery(request,
-                    new StringBuilder(targetPath)).toString();
+                targetPath = appendSelectorsExtensionSuffixQuery(request, new StringBuilder(targetPath))
+                        .toString();
             }
 
             final int status = getStatus(valueMap);
@@ -154,8 +149,7 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
         }
 
         // no way of finding the target, just fail
-        response.sendError(HttpServletResponse.SC_NOT_FOUND,
-            "Cannot redirect to target resource " + targetPath);
+        response.sendError(HttpServletResponse.SC_NOT_FOUND, "Cannot redirect to target resource " + targetPath);
     }
 
     /**
@@ -182,7 +176,6 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
 
         // fall back to default value
         return HttpServletResponse.SC_FOUND;
-
     }
 
     /**
@@ -190,8 +183,7 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
      * including any selectors, extension, suffix and query from the current
      * request.
      */
-    static String toRedirectPath(String targetPath,
-        SlingJakartaHttpServletRequest request) {
+    static String toRedirectPath(String targetPath, SlingJakartaHttpServletRequest request) {
 
         // make sure the target path is absolute
         final String rawAbsPath;
@@ -266,8 +258,7 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
      *            not be an absolute URI.
      * @return The absolute URI built from the components.
      */
-    static String toAbsoluteUri(final String scheme, final String host,
-            final int port, final String targetPath) {
+    static String toAbsoluteUri(final String scheme, final String host, final int port, final String targetPath) {
 
         // 1. scheme and host
         final StringBuilder absUriBuilder = new StringBuilder();
@@ -304,15 +295,10 @@ public class RedirectServlet extends SlingJakartaSafeMethodsServlet {
             }
             if (!((c >= 'a' && c <= 'z')
                     || (c >= 'A' && c <= 'Z')
-                    || (i > 0
-                            && ((c >= '0' && c <= '9')
-                                    || c == '.'
-                                    || c == '+'
-                                    || c == '-')))) {
+                    || (i > 0 && ((c >= '0' && c <= '9') || c == '.' || c == '+' || c == '-')))) {
                 break;
             }
         }
         return false;
     }
-
 }
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 edbc201..be546c0 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
@@ -28,7 +28,6 @@ import jakarta.json.Json;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.servlet.Servlet;
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
 import org.apache.sling.api.request.ResponseUtil;
@@ -40,8 +39,13 @@ import org.osgi.service.component.annotations.Component;
  * The <code>SlingInfoServlet</code>
  */
 @SuppressWarnings("serial")
-@Component(service = Servlet.class, property = { "service.description=Sling Info Servlet",
-        "service.vendor=The Apache Software Foundation", "sling.servlet.paths=/system/sling/info" })
+@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 SlingJakartaSafeMethodsServlet {
 
     private static final String CACHE_CONTROL_HEADER = "Cache-Control";
@@ -92,7 +96,6 @@ public class SlingInfoServlet extends SlingJakartaSafeMethodsServlet {
             } else { // default to html
                 renderHtml(response, data);
             }
-
         }
     }
 
@@ -103,7 +106,7 @@ public class SlingInfoServlet extends SlingJakartaSafeMethodsServlet {
         response.setCharacterEncoding("UTF-8");
 
         final Writer out = response.getWriter();
-        //deliberately not closing, as that closes the response out.
+        // deliberately not closing, as that closes the response out.
         final JsonGenerator w = Json.createGenerator(out);
         w.writeStartObject();
         for (final Map.Entry<String, String> e : data.entrySet()) {
@@ -156,4 +159,4 @@ public class SlingInfoServlet extends SlingJakartaSafeMethodsServlet {
 
         out.flush();
     }
-}
\ No newline at end of file
+}
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 faffe34..f6b5933 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
@@ -16,15 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.sling.servlets.get.impl;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.List;
-
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -32,13 +25,19 @@ import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
 import javax.jcr.version.VersionManager;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.List;
+
 import jakarta.json.Json;
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonObjectBuilder;
 import jakarta.servlet.Servlet;
 import jakarta.servlet.ServletException;
-
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.util.ISO8601;
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
@@ -60,28 +59,34 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
  *
  * At the moment only JCR nodes are supported.
  */
-@Component(name="org.apache.sling.servlets.get.impl.version.VersionInfoServlet",
-           configurationPolicy=ConfigurationPolicy.REQUIRE,
-           service = Servlet.class,
-           property = {
-                    "service.description=Version info servlet",
-                    "service.vendor=The Apache Software Foundation",
-                    "sling.servlet.resourceTypes=sling/servlet/default",
-                    "sling.servlet.methods=GET",
-                    "sling.servlet.selectors=V",
-                    "sling.servlet.extensions=json"
-           })
+@Component(
+        name = "org.apache.sling.servlets.get.impl.version.VersionInfoServlet",
+        configurationPolicy = ConfigurationPolicy.REQUIRE,
+        service = Servlet.class,
+        property = {
+            "service.description=Version info servlet",
+            "service.vendor=The Apache Software Foundation",
+            "sling.servlet.resourceTypes=sling/servlet/default",
+            "sling.servlet.methods=GET",
+            "sling.servlet.selectors=V",
+            "sling.servlet.extensions=json"
+        })
 @Designate(ocd = VersionInfoServlet.Config.class)
 public class VersionInfoServlet extends SlingJakartaSafeMethodsServlet {
 
-    @ObjectClassDefinition(name = "Apache Sling Version Info Servlet",
+    @ObjectClassDefinition(
+            name = "Apache Sling Version Info Servlet",
             description = "The Sling Version Info Servlet renders list of versions available for the current resource")
     public @interface Config {
 
-        @AttributeDefinition(name = "Selector", description="List of selectors this servlet handles to display the versions")
+        @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")
+        @AttributeDefinition(
+                name = "Legacy ECMA date format",
+                description = "Enable legacy Sling ECMA format for dates")
         boolean ecmaSuport() default true;
     }
 
@@ -105,22 +110,25 @@ public class VersionInfoServlet extends SlingJakartaSafeMethodsServlet {
 
     @Activate
     private void activate(Config config) {
-    	this.ecmaSupport = config.ecmaSuport();
+        this.ecmaSupport = config.ecmaSuport();
     }
 
     @Override
-    public void doGet(SlingJakartaHttpServletRequest req, SlingJakartaHttpServletResponse resp) throws ServletException,
-            IOException {
+    public void doGet(SlingJakartaHttpServletRequest req, SlingJakartaHttpServletResponse resp)
+            throws ServletException, IOException {
         resp.setContentType(req.getResponseContentType());
         resp.setCharacterEncoding("UTF-8");
         final boolean tidy = hasSelector(req, TIDY);
         final boolean harray = hasSelector(req, HARRAY);
 
-        final JsonToText.Options opt = renderer.options().withIndent(tidy ? INDENT_SPACES : 0)
-                    .withArraysForChildren(harray);
+        final JsonToText.Options opt =
+                renderer.options().withIndent(tidy ? INDENT_SPACES : 0).withArraysForChildren(harray);
 
         try {
-        	VersionManager vm = req.getResourceResolver().adaptTo(Session.class).getWorkspace().getVersionManager();
+            VersionManager vm = req.getResourceResolver()
+                    .adaptTo(Session.class)
+                    .getWorkspace()
+                    .getVersionManager();
             resp.getWriter().write(renderer.prettyPrint(getJsonObject(req.getResource(), vm), opt));
         } catch (Exception e) {
             throw new ServletException(e);
@@ -137,7 +145,7 @@ public class VersionInfoServlet extends SlingJakartaSafeMethodsServlet {
         final VersionHistory history = vm.getVersionHistory(absPath);
         final Version baseVersion = vm.getBaseVersion(absPath);
 
-        for (final VersionIterator it = history.getAllVersions(); it.hasNext();) {
+        for (final VersionIterator it = history.getAllVersions(); it.hasNext(); ) {
             final Version v = it.nextVersion();
             final JsonObjectBuilder obj = Json.createObjectBuilder();
             obj.add("created", createdDate(v));
@@ -191,11 +199,10 @@ public class VersionInfoServlet extends SlingJakartaSafeMethodsServlet {
     }
 
     private String createdDate(Node node) throws RepositoryException {
-    	Calendar cal = node.getProperty(JcrConstants.JCR_CREATED).getDate();
-    	if (ecmaSupport) {
+        Calendar cal = node.getProperty(JcrConstants.JCR_CREATED).getDate();
+        if (ecmaSupport) {
             return JsonObjectCreator.formatEcma(cal);
-    	}
-    	return ISO8601.format(cal);
+        }
+        return ISO8601.format(cal);
     }
-
 }
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 f456c89..b4b2d50 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
@@ -1,20 +1,21 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ *   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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.apache.sling.servlets.get.impl.helpers;
 
 import java.io.PrintWriter;
@@ -22,7 +23,6 @@ import java.io.Writer;
 
 import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.WriteListener;
-
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
 import org.apache.sling.api.wrappers.SlingJakartaHttpServletResponseWrapper;
 
@@ -31,7 +31,6 @@ import org.apache.sling.api.wrappers.SlingJakartaHttpServletResponseWrapper;
  * ensures that nothing will ever be written by return null writers or output
  * streams.
  */
-
 public class HeadServletResponse extends SlingJakartaHttpServletResponseWrapper {
 
     private ServletOutputStream stream;
@@ -76,16 +75,13 @@ public class HeadServletResponse extends SlingJakartaHttpServletResponseWrapper
      */
     private static class NullServletOutputStream extends ServletOutputStream {
         @Override
-        public void write(int b) {
-        }
+        public void write(int b) {}
 
         @Override
-        public void write(byte[] b) {
-        }
+        public void write(byte[] b) {}
 
         @Override
-        public void write(byte[] b, int off, int len) {
-        }
+        public void write(byte[] b, int off, int len) {}
 
         @Override
         public boolean isReady() {
@@ -93,8 +89,7 @@ public class HeadServletResponse extends SlingJakartaHttpServletResponseWrapper
         }
 
         @Override
-        public void setWriteListener(WriteListener writeListener) {
-        }
+        public void setWriteListener(WriteListener writeListener) {}
     }
 
     /**
@@ -105,31 +100,24 @@ public class HeadServletResponse extends SlingJakartaHttpServletResponseWrapper
      */
     private static class NullWriter extends Writer {
         @Override
-        public void write(char[] cbuf, int off, int len) {
-        }
+        public void write(char[] cbuf, int off, int len) {}
 
         @Override
-        public void write(char[] cbuf) {
-        }
+        public void write(char[] cbuf) {}
 
         @Override
-        public void write(int c) {
-        }
+        public void write(int c) {}
 
         @Override
-        public void write(String str) {
-        }
+        public void write(String str) {}
 
         @Override
-        public void write(String str, int off, int len) {
-        }
+        public void write(String str, int off, int len) {}
 
         @Override
-        public void flush() {
-        }
+        public void flush() {}
 
         @Override
-        public void close() {
-        }
+        public void close() {}
     }
-}
\ No newline at end of file
+}
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 a573e39..e0e3a81 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
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ *   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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
@@ -21,7 +23,6 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.apache.sling.api.SlingConstants;
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
@@ -34,12 +35,12 @@ import org.owasp.encoder.Encode;
  * The <code>HtmlRendererServlet</code> renders the current resource in HTML
  * on behalf of the {@link org.apache.sling.servlets.get.impl.DefaultGetServlet}.
  */
-public class HtmlRenderer implements Renderer  {
+public class HtmlRenderer implements Renderer {
 
     public static final HtmlRenderer INSTANCE = new HtmlRenderer();
 
-    public void render(final SlingJakartaHttpServletRequest req,
-            final SlingJakartaHttpServletResponse resp) throws IOException {
+    public void render(final SlingJakartaHttpServletRequest req, final SlingJakartaHttpServletResponse resp)
+            throws IOException {
         final Resource r = req.getResource();
 
         if (ResourceUtil.isNonExistingResource(r)) {
@@ -53,32 +54,32 @@ public class HtmlRenderer implements Renderer  {
 
         final boolean isIncluded = req.getAttribute(SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET) != null;
 
-        @SuppressWarnings({ "rawtypes" })
+        @SuppressWarnings({"rawtypes"})
         final Map map = r.adaptTo(Map.class);
-        if ( map != null ) {
+        if (map != null) {
             printProlog(pw, isIncluded);
             printResourceInfo(pw, r);
             render(pw, r, map);
             printEpilog(pw, isIncluded);
-        } else if ( r.adaptTo(String.class) != null ) {
+        } else if (r.adaptTo(String.class) != null) {
             printProlog(pw, isIncluded);
             printResourceInfo(pw, r);
             render(pw, r, r.adaptTo(String.class));
             printEpilog(pw, isIncluded);
-        } else if ( r.adaptTo(String[].class) != null ) {
+        } else if (r.adaptTo(String[].class) != null) {
             printProlog(pw, isIncluded);
             printResourceInfo(pw, r);
             render(pw, r, r.adaptTo(String[].class));
             printEpilog(pw, isIncluded);
         } else {
-            if ( !isIncluded ) {
+            if (!isIncluded) {
                 resp.setStatus(HttpServletResponse.SC_NO_CONTENT); // NO Content
             }
         }
     }
 
     private void printProlog(final PrintWriter pw, final boolean isIncluded) {
-        if ( !isIncluded ) {
+        if (!isIncluded) {
             pw.println("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
             pw.println("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"");
             pw.println("    \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">");
@@ -89,7 +90,7 @@ public class HtmlRenderer implements Renderer  {
     }
 
     private void printEpilog(final PrintWriter pw, final boolean isIncluded) {
-        if ( !isIncluded ) {
+        if (!isIncluded) {
             pw.println("</body></html>");
         }
     }
@@ -124,7 +125,7 @@ public class HtmlRenderer implements Renderer  {
     private void render(final PrintWriter pw, final Resource r, final Map<?, ?> map) {
         pw.println("<h2>Resource properties</h2>");
         pw.println("<p>");
-        for(final Map.Entry p : map.entrySet()) {
+        for (final Map.Entry p : map.entrySet()) {
             printPropertyValue(pw, p.getKey().toString(), p.getValue());
             pw.println();
         }
@@ -146,8 +147,8 @@ public class HtmlRenderer implements Renderer  {
         pw.print(Encode.forHtmlContent(name));
         pw.print(": <b>");
 
-        if ( value.getClass().isArray() ) {
-            Object[] values = (Object[])value;
+        if (value.getClass().isArray()) {
+            Object[] values = (Object[]) value;
             pw.print('[');
             for (int i = 0; i < values.length; i++) {
                 if (i > 0) {
@@ -162,5 +163,4 @@ public class HtmlRenderer implements Renderer  {
 
         pw.print("</b><br />");
     }
-
 }
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 067637d..d8c0e1e 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
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ *   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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
@@ -23,7 +25,6 @@ import java.math.BigInteger;
 import jakarta.json.Json;
 import jakarta.json.stream.JsonGenerator;
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.apache.sling.api.SlingException;
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
@@ -61,15 +62,14 @@ public class JsonRenderer implements Renderer {
 
     private final JsonToText renderer = new JsonToText();
 
-	private boolean ecmaSupport;
+    private boolean ecmaSupport;
 
     public JsonRenderer(long maximumResults, boolean ecmaSupport) {
         this.maximumResults = maximumResults;
         this.ecmaSupport = ecmaSupport;
     }
 
-    public void render(SlingJakartaHttpServletRequest req,
-            SlingJakartaHttpServletResponse 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)) {
@@ -79,7 +79,7 @@ public class JsonRenderer implements Renderer {
         int maxRecursionLevels = 0;
         try {
             maxRecursionLevels = getMaxRecursionLevel(req);
-        } catch(IllegalArgumentException iae) {
+        } catch (IllegalArgumentException iae) {
             resp.sendError(HttpServletResponse.SC_BAD_REQUEST, iae.getMessage());
             return;
         }
@@ -96,7 +96,7 @@ public class JsonRenderer implements Renderer {
         try {
             traversor = new ResourceTraversor(maxRecursionLevels, maximumResults, r, ecmaSupport);
             allowedLevel = traversor.collectResources();
-            if ( allowedLevel != -1 ) {
+            if (allowedLevel != -1) {
                 allowDump = false;
             }
         } catch (final Exception e) {
@@ -115,7 +115,7 @@ public class JsonRenderer implements Renderer {
                     // backwards compatibility. Output might be slightly different
                     // with prettyPrint and no options
                     StringWriter writer = new StringWriter();
-                    try (JsonGenerator json = Json.createGenerator(writer)){
+                    try (JsonGenerator json = Json.createGenerator(writer)) {
                         json.write(traversor.getJSONObject());
                     }
                     resp.getWriter().write(writer.toString());
@@ -155,7 +155,7 @@ public class JsonRenderer implements Renderer {
         final String[] selectors = req.getRequestPathInfo().getSelectors();
         if (selectors != null && selectors.length > 0) {
             final String level = selectors[selectors.length - 1];
-            if(!TIDY.equals(level) && !HARRAY.equals(level)) {
+            if (!TIDY.equals(level) && !HARRAY.equals(level)) {
                 if (INFINITY.equals(level)) {
                     maxRecursionLevels = -1;
                 } else {
@@ -200,8 +200,8 @@ public class JsonRenderer implements Renderer {
      * @return {@code true} if the selector is present, {@code false} otherwise
      */
     protected boolean hasSelector(SlingJakartaHttpServletRequest req, String selectorToCheck) {
-        for(String selector : req.getRequestPathInfo().getSelectors()) {
-            if(selectorToCheck.equals(selector)) {
+        for (String selector : req.getRequestPathInfo().getSelectors()) {
+            if (selectorToCheck.equals(selector)) {
                 return true;
             }
         }
@@ -226,4 +226,3 @@ public class JsonRenderer implements Renderer {
         throw new SlingException(e.toString(), e);
     }
 }
-
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 67fba4f..a245602 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
@@ -1,18 +1,20 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ *   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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
@@ -22,7 +24,6 @@ import java.util.Iterator;
 import java.util.Map;
 
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
 import org.apache.sling.api.resource.Resource;
@@ -36,9 +37,7 @@ import org.apache.sling.api.resource.ResourceUtil;
  */
 public class PlainTextRenderer implements Renderer {
 
-
-    public void render(SlingJakartaHttpServletRequest req,
-            SlingJakartaHttpServletResponse 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.");
@@ -54,12 +53,12 @@ public class PlainTextRenderer implements Renderer {
 
         final PrintWriter pw = resp.getWriter();
         @SuppressWarnings("unchecked")
-        final Map<String,Object> map = r.adaptTo(Map.class);
-        if ( map != null ) {
+        final Map<String, Object> map = r.adaptTo(Map.class);
+        if (map != null) {
             dump(pw, r, map);
-        } else if ( r.adaptTo(String.class) != null ) {
+        } else if (r.adaptTo(String.class) != null) {
             printPropertyValue(pw, r.getName(), r.adaptTo(String.class), false);
-        } else if ( r.adaptTo(String[].class) != null ) {
+        } else if (r.adaptTo(String[].class) != null) {
             printPropertyValue(pw, r.getName(), r.adaptTo(String[].class), false);
         } else {
             resp.sendError(HttpServletResponse.SC_NO_CONTENT);
@@ -93,24 +92,22 @@ public class PlainTextRenderer implements Renderer {
         pw.println("Resource super type: " + resourceSuperType);
 
         pw.println("\n** Resource properties **");
-        final Iterator<Map.Entry<String,Object>> pi = map.entrySet().iterator();
-        while ( pi.hasNext() ) {
-            final Map.Entry<String,Object> p = pi.next();
+        final Iterator<Map.Entry<String, Object>> pi = map.entrySet().iterator();
+        while (pi.hasNext()) {
+            final Map.Entry<String, Object> p = pi.next();
             printPropertyValue(pw, p.getKey(), p.getValue(), true);
             pw.println();
         }
     }
 
-    protected void printPropertyValue(PrintWriter pw, String name,
-            Object value,
-            boolean includeName) {
+    protected void printPropertyValue(PrintWriter pw, String name, Object value, boolean includeName) {
 
         if (includeName) {
             pw.print(name + ": ");
         }
 
-        if ( value.getClass().isArray() ) {
-            final Object[] values = (Object[])value;
+        if (value.getClass().isArray()) {
+            final Object[] values = (Object[]) value;
             pw.print('[');
             for (int i = 0; i < values.length; i++) {
                 if (i > 0) {
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 aed55fc..23b21a9 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
@@ -1,20 +1,21 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ *   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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.apache.sling.servlets.get.impl.helpers;
 
 import java.io.IOException;
@@ -24,6 +25,6 @@ import org.apache.sling.api.SlingJakartaHttpServletResponse;
 
 public interface Renderer {
 
-    void render(final SlingJakartaHttpServletRequest req, final SlingJakartaHttpServletResponse 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 e5807bc..d495df9 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
@@ -1,25 +1,23 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ *   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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
-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;
-
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,7 +34,6 @@ 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.SlingJakartaHttpServletRequest;
@@ -54,6 +51,10 @@ import org.apache.sling.servlets.get.impl.DefaultGetServlet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+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;
+
 /**
  * The <code>StreamRendererServlet</code> streams the current resource to the
  * client on behalf of the
@@ -91,16 +92,16 @@ public class StreamRenderer implements Renderer {
 
     private String[] indexFiles;
 
-	private ServletContext context;
+    private ServletContext context;
 
-    public StreamRenderer(boolean index, String[] indexFiles,ServletContext context) {
+    public StreamRenderer(boolean index, String[] indexFiles, ServletContext context) {
         this.index = index;
         this.indexFiles = indexFiles;
         this.context = context;
     }
 
-    public void render(SlingJakartaHttpServletRequest request,
-            SlingJakartaHttpServletResponse 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_JAKARTA_SERVLET) != null;
@@ -108,12 +109,9 @@ public class StreamRenderer implements Renderer {
         // ensure no extension or "res"
         String ext = request.getRequestPathInfo().getExtension();
         if (ext != null && !ext.equals(DefaultGetServlet.EXT_RES)) {
-            request.getRequestProgressTracker().log(
-                "StreamRendererServlet does not support for extension " + ext);
+            request.getRequestProgressTracker().log("StreamRendererServlet does not support for extension " + ext);
             if (included || response.isCommitted()) {
-                log.error(
-                    "StreamRendererServlet does not support extension {}",
-                    ext);
+                log.error("StreamRendererServlet does not support extension {}", ext);
             } else {
                 response.sendError(HttpServletResponse.SC_NOT_FOUND);
             }
@@ -148,15 +146,16 @@ public class StreamRenderer implements Renderer {
             final String actualResourcePath = vm.get(JcrConstants.JCR_CONTENT, String.class);
             resource = request.getResourceResolver().getResource(actualResourcePath);
             if (resource == null) {
-                log.warn("Path {} does not exist",actualResourcePath);
+                log.warn("Path {} does not exist", actualResourcePath);
                 return;
             }
         }
 
         try (InputStream stream = resource.adaptTo(InputStream.class)) {
             if (stream != null) {
-                if ( stream instanceof ExternalizableInputStream) {
-                    response.sendRedirect(((ExternalizableInputStream)stream).getURI().toString());
+                if (stream instanceof ExternalizableInputStream) {
+                    response.sendRedirect(
+                            ((ExternalizableInputStream) stream).getURI().toString());
                     return;
                 }
                 if (isHeadRequest(request)) {
@@ -173,29 +172,28 @@ public class StreamRenderer implements Renderer {
 
                     renderDirectory(request, response, included);
 
-                } else if (included || response.isCommitted() ) {
+                } else if (included || response.isCommitted()) {
 
                     // request is included or committed, not redirecting
-                    request.getRequestProgressTracker().log(
-                        "StreamRendererServlet: Not redirecting with trailing slash, response is committed or request included");
-                    log.warn("StreamRendererServlet: Not redirecting with trailing slash, response is committed or request included");
+                    request.getRequestProgressTracker()
+                            .log(
+                                    "StreamRendererServlet: Not redirecting with trailing slash, response is committed or request included");
+                    log.warn(
+                            "StreamRendererServlet: Not redirecting with trailing slash, response is committed or request included");
 
                 } else {
 
                     // redirect to this with trailing slash to render the index
-                    String url = request.getResourceResolver().map(request,
-                        resource.getPath())
-                        + "/";
+                    String url = request.getResourceResolver().map(request, resource.getPath()) + "/";
                     response.sendRedirect(url);
-
                 }
             }
         }
     }
 
     private boolean isRootResourceRequest(Resource resource) {
-        return ("/".equals(resource.getPath())) ||
-            ("/".equals(resource.getResourceResolver().map(resource.getPath())));
+        return ("/".equals(resource.getPath()))
+                || ("/".equals(resource.getResourceResolver().map(resource.getPath())));
     }
 
     private boolean isHeadRequest(HttpServletRequest request) {
@@ -224,10 +222,13 @@ public class StreamRenderer implements Renderer {
         return false;
     }
 
-    private void streamResource(final Resource resource,
-            final InputStream stream, final boolean included,
+    private void streamResource(
+            final Resource resource,
+            final InputStream stream,
+            final boolean included,
             final SlingJakartaHttpServletRequest request,
-            final SlingJakartaHttpServletResponse response) throws IOException {
+            final SlingJakartaHttpServletResponse response)
+            throws IOException {
         // finally stream the resource
 
         final ArrayList<Range> ranges;
@@ -237,8 +238,7 @@ public class StreamRenderer implements Renderer {
 
         } else {
             // parse optional ranges
-            ranges = parseRange(request, response,
-                    resource.getResourceMetadata());
+            ranges = parseRange(request, response, resource.getResourceMetadata());
             if (ranges == null) {
                 // there was something wrong, the parseRange has sent a
                 // response and we are done
@@ -253,8 +253,7 @@ public class StreamRenderer implements Renderer {
 
         if (ranges == FULL) {
             // return full resource
-            setContentLength(response,
-                    resource.getResourceMetadata().getContentLength());
+            setContentLength(response, resource.getResourceMetadata().getContentLength());
             byte[] buf = new byte[IO_BUFFER_SIZE];
             int rd;
             while ((rd = stream.read(buf)) >= 0) {
@@ -266,29 +265,28 @@ public class StreamRenderer implements Renderer {
 
             if (ranges.size() == 1) {
                 Range range = ranges.get(0);
-                response.addHeader("Content-Range", "bytes " + range.start
-                        + "-" + range.end + "/" + range.length);
+                response.addHeader("Content-Range", "bytes " + range.start + "-" + range.end + "/" + range.length);
                 setContentLength(response, range.end - range.start + 1);
                 copy(stream, out, range);
             } else {
 
-                response.setContentType("multipart/byteranges; boundary="
-                        + mimeSeparation);
+                response.setContentType("multipart/byteranges; boundary=" + mimeSeparation);
 
                 copy(resource, out, ranges.iterator());
             }
-
         }
     }
 
-    private void renderDirectory(final SlingJakartaHttpServletRequest request,
-            final SlingJakartaHttpServletResponse 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
         if (included || response.isCommitted()) {
-            request.getRequestProgressTracker().log(
-                "StreamRendererServlet: Not rendering index, response is committed or request included");
+            request.getRequestProgressTracker()
+                    .log("StreamRendererServlet: Not rendering index, response is committed or request included");
             log.warn("StreamRendererServlet: Not rendering index, response is committed or request included");
             return;
         }
@@ -321,10 +319,10 @@ public class StreamRenderer implements Renderer {
                 }
 
                 try {
-					dispatcher.include(request, response);
-				} catch (ServletException e) {
-					throw new IOException(e);
-				}
+                    dispatcher.include(request, response);
+                } catch (ServletException e) {
+                    throw new IOException(e);
+                }
                 return;
             }
         }
@@ -338,15 +336,13 @@ public class StreamRenderer implements Renderer {
         } else {
             response.sendError(HttpServletResponse.SC_FORBIDDEN);
         }
-
     }
 
     /**
      * @param resource
      * @param response
      */
-    private void setHeaders(Resource resource,
-            SlingJakartaHttpServletResponse response) {
+    private void setHeaders(Resource resource, SlingJakartaHttpServletResponse response) {
 
         final ResourceMetadata meta = resource.getResourceMetadata();
         final long modifTime = meta.getModificationTime();
@@ -361,8 +357,7 @@ public class StreamRenderer implements Renderer {
             // provides the
             // default one,
             // try to do better using our servlet context
-            final String ct = context.getMimeType(
-                resource.getPath());
+            final String ct = context.getMimeType(resource.getPath());
             if (ct != null) {
                 contentType = ct;
             }
@@ -406,8 +401,7 @@ public class StreamRenderer implements Renderer {
         }
     }
 
-    private void renderIndex(Resource resource,
-            SlingJakartaHttpServletResponse response) throws IOException {
+    private void renderIndex(Resource resource, SlingJakartaHttpServletResponse response) throws IOException {
 
         response.setContentType("text/html");
         response.setCharacterEncoding("UTF-8");
@@ -429,7 +423,8 @@ public class StreamRenderer implements Renderer {
         pw.println("<hr>");
 
         if (!"/".equals(path)) {
-            pw.println("<a href='../'>../</a>                                                                 -     Parent");
+            pw.println(
+                    "<a href='../'>../</a>                                                                 -     Parent");
         }
 
         // render the children
@@ -441,7 +436,6 @@ public class StreamRenderer implements Renderer {
         pw.println("</pre>");
         pw.println("</body>");
         pw.println("</html>");
-
     }
 
     private void renderChild(PrintWriter pw, Resource resource) {
@@ -462,8 +456,7 @@ public class StreamRenderer implements Renderer {
             displayName = displayName.substring(0, 29) + "...";
             suffix = "";
         } else {
-            suffix = "                                               ".substring(
-                0, 32 - displayName.length());
+            suffix = "                                               ".substring(0, 32 - displayName.length());
         }
         pw.printf("<a href='%s'>%s</a>%s", name, displayName, suffix);
 
@@ -481,7 +474,7 @@ public class StreamRenderer implements Renderer {
         pw.println();
     }
 
-    //---------- Range header support
+    // ---------- Range header support
     // The following code is copy-derived from the Tomcate DefaultServlet
     // http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?view=markup
 
@@ -496,8 +489,7 @@ public class StreamRenderer implements Renderer {
      * @param ranges Iterator of the ranges the client wanted to retrieve
      * @exception IOException if an input/output error occurs
      */
-    private void copy(Resource resource, ServletOutputStream ostream,
-            Iterator<Range> ranges) throws IOException {
+    private void copy(Resource resource, ServletOutputStream ostream, Iterator<Range> ranges) throws IOException {
 
         String contentType = resource.getResourceMetadata().getContentType();
         IOException exception = null;
@@ -506,8 +498,7 @@ public class StreamRenderer implements Renderer {
 
             InputStream resourceInputStream = resource.adaptTo(InputStream.class);
 
-            try (InputStream istream = new BufferedInputStream(resourceInputStream,
-                    IO_BUFFER_SIZE)) {
+            try (InputStream istream = new BufferedInputStream(resourceInputStream, IO_BUFFER_SIZE)) {
                 Range currentRange = ranges.next();
 
                 // Writing MIME header.
@@ -516,14 +507,14 @@ public class StreamRenderer implements Renderer {
                 if (contentType != null) {
                     ostream.println("Content-Type: " + contentType);
                 }
-                ostream.println("Content-Range: bytes " + currentRange.start + "-"
-                    + currentRange.end + "/" + currentRange.length);
+                ostream.println("Content-Range: bytes " + currentRange.start + "-" + currentRange.end + "/"
+                        + currentRange.length);
                 ostream.println();
 
                 // Copy content
                 try {
                     copy(istream, ostream, currentRange);
-                } catch(IOException e) {
+                } catch (IOException e) {
                     exception = e;
                 }
             }
@@ -532,22 +523,21 @@ public class StreamRenderer implements Renderer {
         ostream.println();
         ostream.print("--" + mimeSeparation + "--");
 
-        if(exception != null) {
+        if (exception != null) {
             throw exception;
         }
     }
 
     /**
-    * Copy the contents of the specified input stream to the specified
-    * output stream.
-    *
-    * @param istream The input stream to read from
-    * @param ostream The output stream to write to
-    * @param range Range the client wanted to retrieve
-    * @exception IOException if an input/output error occurs
-    */
-    private void copy(InputStream istream, OutputStream ostream,
-            Range range) throws IOException {
+     * Copy the contents of the specified input stream to the specified
+     * output stream.
+     *
+     * @param istream The input stream to read from
+     * @param ostream The output stream to write to
+     * @param range Range the client wanted to retrieve
+     * @exception IOException if an input/output error occurs
+     */
+    private void copy(InputStream istream, OutputStream ostream, Range range) throws IOException {
         // HTTP Range 0-9 means "byte 9 included"
         final long endIndex = range.end + 1;
         log.debug("copy: Serving bytes: {}-{}", range.start, endIndex);
@@ -555,8 +545,7 @@ public class StreamRenderer implements Renderer {
     }
 
     // static, package-private method to make unit testing easier
-    static void staticCopyRange(InputStream istream,
-            OutputStream ostream, long start, long end) throws IOException {
+    static void staticCopyRange(InputStream istream, OutputStream ostream, long start, long end) throws IOException {
         long position = 0;
         byte buffer[] = new byte[IO_BUFFER_SIZE];
 
@@ -569,8 +558,7 @@ public class StreamRenderer implements Renderer {
                 int len = (int) Math.min(start - position, buffer.length);
                 skipped = istream.read(buffer, 0, len);
                 if (skipped == -1) {
-                    throw new IOException("Failed to skip " + start
-                            + " bytes; only skipped " + position + " bytes");
+                    throw new IOException("Failed to skip " + start + " bytes; only skipped " + position + " bytes");
                 }
             }
             position += skipped;
@@ -598,9 +586,8 @@ public class StreamRenderer implements Renderer {
      *         an error occurred parsing the header and the request has been
      *         finished sending an error status.
      */
-    private ArrayList<Range> parseRange(HttpServletRequest request,
-            HttpServletResponse response, ResourceMetadata metadata)
-            throws IOException {
+    private ArrayList<Range> parseRange(
+            HttpServletRequest request, HttpServletResponse response, ResourceMetadata metadata) throws IOException {
 
         // Checking If-Range
         String headerValue = request.getHeader("If-Range");
@@ -626,9 +613,7 @@ public class StreamRenderer implements Renderer {
                 // the last modification date of the entity, the entire entity
                 // is returned.
                 return FULL;
-
             }
-
         }
 
         long fileLength = metadata.getContentLength();
@@ -684,18 +669,15 @@ public class StreamRenderer implements Renderer {
             } else {
 
                 try {
-                    currentRange.start = Long.parseLong(rangeDefinition.substring(
-                        0, dashPos));
+                    currentRange.start = Long.parseLong(rangeDefinition.substring(0, dashPos));
                     if (dashPos < rangeDefinition.length() - 1)
-                        currentRange.end = Long.parseLong(rangeDefinition.substring(
-                            dashPos + 1, rangeDefinition.length()));
-                    else
-                        currentRange.end = fileLength - 1;
+                        currentRange.end =
+                                Long.parseLong(rangeDefinition.substring(dashPos + 1, rangeDefinition.length()));
+                    else currentRange.end = fileLength - 1;
                 } catch (NumberFormatException e) {
                     failParseRange(response, fileLength, rangeHeader);
                     return null;
                 }
-
             }
 
             if (!currentRange.validate()) {
@@ -713,10 +695,9 @@ public class StreamRenderer implements Renderer {
      * Sends a 416 error response to the client if the Range header is
      * not acceptable
      */
-    private void failParseRange(final HttpServletResponse response,
-            final long fileLength, final String rangeHeader) throws IOException {
-        log.error("parseRange: Cannot support range {}; sending 416",
-            rangeHeader);
+    private void failParseRange(final HttpServletResponse response, final long fileLength, final String rangeHeader)
+            throws IOException {
+        log.error("parseRange: Cannot support range {}; sending 416", rangeHeader);
         response.addHeader("Content-Range", "bytes */" + fileLength);
         response.sendError(HttpServletResponse.SC_REQUESTED_RANGE_NOT_SATISFIABLE);
     }
@@ -740,6 +721,5 @@ public class StreamRenderer implements Renderer {
             if (end >= length) end = length - 1;
             return ((start >= 0) && (end >= 0) && (start <= end) && (length > 0));
         }
-
     }
 }
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 fbf71ce..62a22ac 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
@@ -1,27 +1,29 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file 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
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ *   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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
+import javax.jcr.Node;
+
 import java.io.IOException;
 
-import javax.jcr.Node;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.apache.sling.api.SlingConstants;
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
@@ -41,11 +43,8 @@ public class XMLRenderer implements Renderer {
     private static final String SYSVIEW = "sysview";
     private static final String DOCVIEW = "docview";
 
-
     @Override
-    public void render(SlingJakartaHttpServletRequest req,
-                         SlingJakartaHttpServletResponse resp)
-    throws IOException {
+    public void render(SlingJakartaHttpServletRequest req, SlingJakartaHttpServletResponse resp) throws IOException {
         final Resource r = req.getResource();
 
         if (ResourceUtil.isNonExistingResource(r)) {
@@ -60,21 +59,21 @@ public class XMLRenderer implements Renderer {
 
         try {
             final Node node = r.adaptTo(Node.class);
-            if ( node != null ) {
+            if (node != null) {
                 try {
-                    if ( req.getRequestPathInfo().getSelectorString() == null
-                         || req.getRequestPathInfo().getSelectorString().equals(DOCVIEW) ) {
+                    if (req.getRequestPathInfo().getSelectorString() == null
+                            || req.getRequestPathInfo().getSelectorString().equals(DOCVIEW)) {
                         // check if response is adaptable to a content handler
                         final ContentHandler ch = resp.adaptTo(ContentHandler.class);
-                        if ( ch == null ) {
+                        if (ch == null) {
                             node.getSession().exportDocumentView(node.getPath(), resp.getOutputStream(), false, false);
                         } else {
                             node.getSession().exportDocumentView(node.getPath(), ch, false, false);
                         }
-                    } else if ( req.getRequestPathInfo().getSelectorString().equals(SYSVIEW) ) {
+                    } else if (req.getRequestPathInfo().getSelectorString().equals(SYSVIEW)) {
                         // check if response is adaptable to a content handler
                         final ContentHandler ch = resp.adaptTo(ContentHandler.class);
-                        if ( ch == null ) {
+                        if (ch == null) {
                             node.getSession().exportSystemView(node.getPath(), resp.getOutputStream(), false, false);
                         } else {
                             node.getSession().exportSystemView(node.getPath(), ch, false, false);
@@ -86,13 +85,13 @@ public class XMLRenderer implements Renderer {
                     throw new ServletException("Unable to export resource as xml: " + r, e);
                 }
             } else {
-                if ( !isIncluded ) {
+                if (!isIncluded) {
                     resp.sendError(HttpServletResponse.SC_NO_CONTENT); // NO Content
                 }
             }
-        } catch ( final Throwable t) {
+        } catch (final Throwable t) {
             // if the JCR api is not available, we get here
-            if ( !isIncluded ) {
+            if (!isIncluded) {
                 resp.sendError(HttpServletResponse.SC_NO_CONTENT); // NO Content
             }
         }
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
index 7c08a2d..53003fc 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreator.java
@@ -34,7 +34,6 @@ import jakarta.json.Json;
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonObjectBuilder;
 import jakarta.json.JsonValue;
-
 import org.apache.jackrabbit.util.ISO8601;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
@@ -71,7 +70,7 @@ public class JsonObjectCreator {
     public JsonObjectBuilder create() {
         final JsonObjectBuilder obj = Json.createObjectBuilder();
 
-         if (valueMap.isEmpty()) {
+        if (valueMap.isEmpty()) {
             final String value = resource.adaptTo(String.class);
             if (value != null) {
                 obj.add(resource.getName(), value.toString());
@@ -110,10 +109,10 @@ public class JsonObjectCreator {
     }
 
     /** Dump only a value in the correct format */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @SuppressWarnings({"unchecked", "rawtypes"})
     private JsonValue getValue(Object value) {
-        if ( value instanceof Supplier ) {
-            return getValue(((Supplier)value).get());
+        if (value instanceof Supplier) {
+            return getValue(((Supplier) value).get());
         }
 
         if (value == null) {
@@ -131,7 +130,7 @@ public class JsonObjectCreator {
             }
 
         } else if (value instanceof Boolean) {
-            final Boolean bool = (Boolean)value;
+            final Boolean bool = (Boolean) value;
             return bool ? JsonValue.TRUE : JsonValue.FALSE;
 
         } else if (value instanceof Long) {
@@ -186,11 +185,11 @@ public class JsonObjectCreator {
      */
     @SuppressWarnings("rawtypes")
     private void createProperty(final JsonObjectBuilder obj, final String key, final Object value) {
-        if ( value == null ) {
+        if (value == null) {
             return;
         }
-        if ( value instanceof Supplier ) {
-            createProperty(obj, key, ((Supplier)value).get());
+        if (value instanceof Supplier) {
+            createProperty(obj, key, ((Supplier) value).get());
             return;
         }
 
@@ -205,8 +204,8 @@ public class JsonObjectCreator {
             values = new Object[Array.getLength(value)];
             for (int i = 0; i < length; i++) {
                 values[i] = Array.get(value, i);
-                while ( values[i] instanceof Supplier ) {
-                    values[i] = ((Supplier)values[i]).get();
+                while (values[i] instanceof Supplier) {
+                    values[i] = ((Supplier) values[i]).get();
                 }
             }
         }
@@ -229,7 +228,7 @@ public class JsonObjectCreator {
             return;
         }
 
-        if (values != null ) {
+        if (values != null) {
             obj.add(key, getValue(values));
         } else {
             obj.add(key, getValue(value));
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonToText.java b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonToText.java
index f180c7e..598ffa5 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/util/JsonToText.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/util/JsonToText.java
@@ -28,10 +28,9 @@ import jakarta.json.JsonObject;
 import jakarta.json.JsonObjectBuilder;
 import jakarta.json.JsonValue;
 
-public class JsonToText
-{
+public class JsonToText {
     /** Rendering options */
-    static public class Options {
+    public static class Options {
         int indent;
         private boolean indentIsPositive;
         int initialIndent;
@@ -44,8 +43,7 @@ public class JsonToText
         String childNameKey = DEFAULT_CHILD_NAME_KEY;
 
         /** Clients use JSONRenderer.options() to create objects */
-        private Options() {
-        }
+        private Options() {}
 
         Options(Options opt) {
             this.indent = opt.indent;
@@ -92,7 +90,7 @@ public class JsonToText
 
     /** Write N spaces to sb for indentation */
     private void indent(StringBuilder sb, int howMuch) {
-        for (int i=0; i < howMuch; i++) {
+        for (int i = 0; i < howMuch; i++) {
             sb.append(' ');
         }
     }
@@ -103,12 +101,12 @@ public class JsonToText
             return "\"\"";
         }
 
-        char          b;
-        char          c = 0;
-        int           i;
-        int           len = string.length();
+        char b;
+        char c = 0;
+        int i;
+        int len = string.length();
         StringBuilder sb = new StringBuilder(len + 2);
-        String        t;
+        String t;
 
         sb.append('"');
         for (i = 0; i < len; i += 1) {
@@ -142,8 +140,7 @@ public class JsonToText
                     sb.append("\\r");
                     break;
                 default:
-                    if (c < ' ' || (c >= '\u0080' && c < '\u00a0') ||
-                            (c >= '\u2000' && c < '\u2100')) {
+                    if (c < ' ' || (c >= '\u0080' && c < '\u00a0') || (c >= '\u2000' && c < '\u2100')) {
                         t = "000" + Integer.toHexString(c);
                         sb.append("\\u").append(t.substring(t.length() - 4));
                     } else {
@@ -155,22 +152,20 @@ public class JsonToText
         return sb.toString();
     }
 
-
-
     /** Make a JSON String of an Object value, with rendering options
      */
     private String valueToString(JsonValue value, Options opt) {
         if (value instanceof JsonObject) {
-            return prettyPrint((JsonObject)value, opt);
+            return prettyPrint((JsonObject) value, opt);
         } else if (value instanceof JsonArray) {
-            return prettyPrint((JsonArray)value, opt);
+            return prettyPrint((JsonArray) value, opt);
         }
         return value.toString();
     }
 
     /** Decide whether o must be skipped and added to a, when rendering a JSONObject */
-    private boolean skipChildObject(JsonArrayBuilder a, Options  opt, String key, Object value) {
-        if(opt.arraysForChildren && (value instanceof JsonObject)) {
+    private boolean skipChildObject(JsonArrayBuilder a, Options opt, String key, Object value) {
+        if (opt.arraysForChildren && (value instanceof JsonObject)) {
             JsonObjectBuilder builder = Json.createObjectBuilder();
             builder.add(opt.childNameKey, key);
             for (Map.Entry<String, JsonValue> entry : ((JsonObject) value).entrySet()) {
@@ -205,7 +200,7 @@ public class JsonToText
         if (n == 1) {
             o = keys.next();
             final JsonValue v = jo.get(o);
-            if(!skipChildObject(children, opt, o, v)) {
+            if (!skipChildObject(children, opt, o, v)) {
                 sb.append(quote(o));
                 sb.append(": ");
                 sb.append(valueToString(v, opt));
@@ -214,7 +209,7 @@ public class JsonToText
             while (keys.hasNext()) {
                 o = keys.next();
                 final JsonValue v = jo.get(o);
-                if(skipChildObject(children, opt, o, v)) {
+                if (skipChildObject(children, opt, o, v)) {
                     continue;
                 }
                 if (sb.length() > 1) {
@@ -225,8 +220,7 @@ public class JsonToText
                 indent(sb, newindent);
                 sb.append(quote(o.toString()));
                 sb.append(": ");
-                sb.append(valueToString(v,
-                        options().withIndent(opt.indent).withInitialIndent(newindent)));
+                sb.append(valueToString(v, options().withIndent(opt.indent).withInitialIndent(newindent)));
             }
             if (sb.length() > 1) {
                 sb.append('\n');
@@ -236,7 +230,7 @@ public class JsonToText
 
         /** Render children if any were skipped (in "children in arrays" mode) */
         JsonArray childrenArray = children.build();
-        if(childrenArray.size() > 0) {
+        if (childrenArray.size() > 0) {
             if (sb.length() > 1) {
                 sb.append(",\n");
             } else {
@@ -265,20 +259,20 @@ public class JsonToText
             sb.append(valueToString(ja.get(0), opt));
         } else {
             final int newindent = opt.initialIndent + opt.indent;
-            if(opt.hasIndent()) {
+            if (opt.hasIndent()) {
                 sb.append('\n');
             }
             for (i = 0; i < len; i += 1) {
                 if (i > 0) {
                     sb.append(',');
-                    if(opt.hasIndent()) {
+                    if (opt.hasIndent()) {
                         sb.append('\n');
                     }
                 }
                 indent(sb, newindent);
                 sb.append(valueToString(ja.get(i), opt));
             }
-            if(opt.hasIndent()) {
+            if (opt.hasIndent()) {
                 sb.append('\n');
             }
             indent(sb, opt.initialIndent);
@@ -286,5 +280,4 @@ public class JsonToText
         sb.append(']');
         return sb.toString();
     }
-
 }
diff --git a/src/main/java/org/apache/sling/servlets/get/impl/util/ResourceTraversor.java b/src/main/java/org/apache/sling/servlets/get/impl/util/ResourceTraversor.java
index 81f6012..349f8e1 100644
--- a/src/main/java/org/apache/sling/servlets/get/impl/util/ResourceTraversor.java
+++ b/src/main/java/org/apache/sling/servlets/get/impl/util/ResourceTraversor.java
@@ -27,12 +27,10 @@ import java.util.Map;
 
 import jakarta.json.JsonObject;
 import jakarta.json.JsonObjectBuilder;
-
 import org.apache.sling.api.request.RecursionTooDeepException;
 import org.apache.sling.api.resource.Resource;
 
-public class ResourceTraversor
-{
+public class ResourceTraversor {
     Map<Resource, List<Resource>> tree = new HashMap<>();
 
     private long count;
@@ -49,7 +47,7 @@ public class ResourceTraversor
 
     private final Resource startResource;
 
-	private boolean ecmaSupport;
+    private boolean ecmaSupport;
 
     /** Create a ResourceTraversor, optionally limiting recursion and total number of resources
      * @param levels recursion levels limit, -1 means no limit
@@ -90,12 +88,11 @@ public class ResourceTraversor
         if (maxRecursionLevels == -1 || currentLevel < maxRecursionLevels) {
             final Iterator<Resource> children = resource.listChildren();
             List<Resource> childTree = tree.get(resource);
-            if (childTree == null)
-            {
+            if (childTree == null) {
                 childTree = new ArrayList<>();
                 tree.put(resource, childTree);
             }
-            
+
             while (children.hasNext()) {
                 count++;
                 final Resource child = children.next();
@@ -121,7 +118,7 @@ public class ResourceTraversor
                 nextQueue = new LinkedList<>();
             }
             final int maxLevel = collectChildren(currentQueue.removeFirst(), currentLevel);
-            if ( maxLevel != -1 ) {
+            if (maxLevel != -1) {
                 return maxLevel;
             }
         }
@@ -136,19 +133,18 @@ public class ResourceTraversor
      * @throws JSONException
      */
     private JsonObjectBuilder adapt(final Resource resource) {
-        return new JsonObjectCreator(resource,ecmaSupport).create();
+        return new JsonObjectCreator(resource, ecmaSupport).create();
     }
 
     public JsonObject getJSONObject() {
-        return addChildren(startResource,startObject).build();
+        return addChildren(startResource, startObject).build();
     }
 
-    private JsonObjectBuilder addChildren(Resource resource,JsonObjectBuilder builder) {
-    	List<Resource> children = tree.get(resource);
-    	
-        if (children != null)
-        {
-        	for (Resource child:children) {
+    private JsonObjectBuilder addChildren(Resource resource, JsonObjectBuilder builder) {
+        List<Resource> children = tree.get(resource);
+
+        if (children != null) {
+            for (Resource child : children) {
                 builder.add(child.getName(), addChildren(child, adapt(child)));
             }
         }
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 fd751d4..265bd89 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
@@ -18,18 +18,17 @@
  */
 package org.apache.sling.servlets.get.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.lang.reflect.Field;
 import java.util.Map;
 
 import jakarta.servlet.Servlet;
 import jakarta.servlet.ServletContext;
-
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 public class DefaultGetServletTest {
 
     @Test
@@ -45,7 +44,7 @@ public class DefaultGetServletTest {
         Mockito.when(config.enable_json()).thenReturn(true);
         Mockito.when(config.enable_xml()).thenReturn(false);
         Mockito.when(config.enable_txt()).thenReturn(false);
-        Mockito.when(config.aliases()).thenReturn(new String[] { "xml:pdf" });
+        Mockito.when(config.aliases()).thenReturn(new String[] {"xml:pdf"});
         servlet.activate(config);
 
         servlet.init();
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 4907044..eebf2f4 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
@@ -18,8 +18,6 @@
  */
 package org.apache.sling.servlets.get.impl;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.request.builder.Builders;
 import org.apache.sling.api.request.builder.SlingJakartaHttpServletResponseResult;
@@ -28,6 +26,8 @@ import org.apache.sling.servlets.get.impl.helpers.JsonRenderer;
 import org.apache.sling.testing.mock.sling.junit.SlingContext;
 import org.junit.Rule;
 
+import static org.junit.Assert.assertEquals;
+
 public class JsonRendererServletTest {
 
     @Rule
@@ -74,14 +74,15 @@ public class JsonRendererServletTest {
     }
 
     private String getJSON(String path, String depth) throws Throwable {
-        SlingJakartaHttpServletRequest request = Builders
-            .newRequestBuilder(context.resourceResolver().getResource(path))
-            .withExtension("json")
-            .withSelectors(depth)
-            .withRequestMethod("GET")
-            .buildJakartaRequest();
+        SlingJakartaHttpServletRequest request = Builders.newRequestBuilder(
+                        context.resourceResolver().getResource(path))
+                .withExtension("json")
+                .withSelectors(depth)
+                .withRequestMethod("GET")
+                .buildJakartaRequest();
 
-        SlingJakartaHttpServletResponseResult response = Builders.newResponseBuilder().buildJakartaResponseResult();
+        SlingJakartaHttpServletResponseResult response =
+                Builders.newResponseBuilder().buildJakartaResponseResult();
         JsonRenderer renderer = new JsonRenderer(1000, true);
         renderer.render(request, response);
         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 a17cc01..7f292fc 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
@@ -23,7 +23,6 @@ import java.util.HashMap;
 
 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;
@@ -45,7 +44,8 @@ public class RedirectServletTest {
 
     static final String TEST_PREFIX = TEST_SCHEME + "://" + TEST_HOST;
 
-    @Test public void testToAbsoluteURI() {
+    @Test
+    public void testToAbsoluteURI() {
         final String http = "http";
         final String https = "https";
         final String scheme = "test";
@@ -57,26 +57,33 @@ public class RedirectServletTest {
         final String target = "/target";
 
         // regular building without default ports
-        Assert.assertEquals(http + "://" + host + ":" + portAny + target,
+        Assert.assertEquals(
+                http + "://" + host + ":" + portAny + target,
                 RedirectServlet.toAbsoluteUri(http, host, portAny, target));
-        Assert.assertEquals(https + "://" + host + ":" + portAny + target,
+        Assert.assertEquals(
+                https + "://" + host + ":" + portAny + target,
                 RedirectServlet.toAbsoluteUri(https, host, portAny, target));
-        Assert.assertEquals(scheme + "://" + host + ":" + portAny + target,
+        Assert.assertEquals(
+                scheme + "://" + host + ":" + portAny + target,
                 RedirectServlet.toAbsoluteUri(scheme, host, portAny, target));
 
         // building with default ports
         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,
+        Assert.assertEquals(
+                scheme + "://" + host + ":" + port80 + target,
                 RedirectServlet.toAbsoluteUri(scheme, host, port80, target));
 
         // building without ports
         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));
+        Assert.assertEquals(
+                https + "://" + host + target, RedirectServlet.toAbsoluteUri(https, host, portNone, target));
+        Assert.assertEquals(
+                scheme + "://" + host + target, RedirectServlet.toAbsoluteUri(scheme, host, portNone, target));
     }
 
-    @Test public void testGetStatus() {
+    @Test
+    public void testGetStatus() {
         final int found = HttpServletResponse.SC_FOUND;
         final int valid = 768;
         final int invalidLow = 77;
@@ -94,7 +101,8 @@ public class RedirectServletTest {
         assertStatus(max, max);
     }
 
-    @Test public void testSameParent() {
+    @Test
+    public void testSameParent() {
         String base = "/a";
         String target = "/b";
         assertEqualsUri("/b", toRedirect(base, target), false);
@@ -108,19 +116,22 @@ public class RedirectServletTest {
         assertEqualsUri("/a/b/d", toRedirect(base, target), false);
     }
 
-    @Test 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);
     }
 
-    @Test 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);
     }
 
-    @Test public void testChild() {
+    @Test
+    public void testChild() {
         String base = "/a.html";
         String target = "/a/b.html";
         assertEqualsUri("/a/b.html", toRedirect(base, target), false);
@@ -146,7 +157,8 @@ public class RedirectServletTest {
         assertEqualsUri("/a/b/c", toRedirect(base, target), false);
     }
 
-    @Test 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);
@@ -172,7 +184,8 @@ public class RedirectServletTest {
         assertEqualsUri("/x/a/b/c", toRedirect(base, target), false);
     }
 
-    @Test public void testChildRelative() {
+    @Test
+    public void testChildRelative() {
         String base = "/a";
         String target = "b.html";
         assertEqualsUri("/a/b.html", toRedirect(base, target), false);
@@ -190,7 +203,8 @@ public class RedirectServletTest {
         assertEqualsUri("/a/b/c", toRedirect(base, target), false);
     }
 
-    @Test public void testChildNonRootRelative() {
+    @Test
+    public void testChildNonRootRelative() {
         String base = "/x/a";
         String target = "b.html";
         assertEqualsUri("/x/a/b.html", toRedirect(base, target), false);
@@ -208,13 +222,15 @@ public class RedirectServletTest {
         assertEqualsUri("/x/a/b/c", toRedirect(base, target), false);
     }
 
-    @Test 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);
     }
 
-    @Test public void testSibbling() {
+    @Test
+    public void testSibbling() {
         String base = "/a/b";
         String target0 = "../y/z";
         assertEqualsUri("/a/y/z", toRedirect(base, target0), false);
@@ -226,7 +242,8 @@ public class RedirectServletTest {
         assertEqualsUri(base + "/" + target2, toRedirect(base, target2), false);
     }
 
-    @Test public void testSelectorsEtc() {
+    @Test
+    public void testSelectorsEtc() {
         assertEquals(null, null, null, null);
 
         assertEquals(null, "html", null, null);
@@ -244,16 +261,18 @@ public class RedirectServletTest {
         assertEquals("print.a4", "html", "/suffix.pdf", "xy=1");
     }
 
-    @Test public void testRootPath() {
+    @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(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();
@@ -262,16 +281,18 @@ public class RedirectServletTest {
         assertEqualsUri("/webapp/index.html", path, false);
     }
 
-    @Test public void testEmptyPath() {
+    @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(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();
@@ -320,8 +341,8 @@ public class RedirectServletTest {
         } else if (testStatus == -1) {
             valueMap = new ValueMapDecorator(new HashMap<String, Object>());
         } else {
-            valueMap = new ValueMapDecorator(
-                    Collections.singletonMap(RedirectServlet.STATUS_PROP, (Object) testStatus));
+            valueMap =
+                    new ValueMapDecorator(Collections.singletonMap(RedirectServlet.STATUS_PROP, (Object) testStatus));
         }
 
         final int actualStatus = RedirectServlet.getStatus(valueMap);
@@ -333,17 +354,18 @@ public class RedirectServletTest {
         return toRedirect(basePath, null, null, null, null, targetPath);
     }
 
-    private static String toRedirect(String basePath, String selectors, String extension, String suffix,
-            String queryString, String targetPath) {
+    private static String toRedirect(
+            String basePath, String selectors, String extension, String suffix, String queryString, String targetPath) {
         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(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) {
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 9f9c369..8cc2be3 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
@@ -18,8 +18,6 @@
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -27,7 +25,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import jakarta.servlet.ServletException;
-
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
 import org.apache.sling.api.resource.Resource;
@@ -36,6 +33,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.junit.Assert.assertTrue;
+
 public class HtmlRendererTest {
 
     private SlingJakartaHttpServletRequest request;
@@ -72,4 +71,4 @@ public class HtmlRendererTest {
         final String contents = this.writer.toString();
         assertTrue(contents.contains("&lt;script&gt;alert(1);&lt;/script&gt;"));
     }
-}
\ No newline at end of file
+}
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 4265a9c..f177eef 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
@@ -18,10 +18,6 @@
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Calendar;
@@ -30,7 +26,6 @@ import jakarta.json.Json;
 import jakarta.json.JsonObject;
 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;
@@ -43,6 +38,10 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class JsonRendererTest {
 
     @Rule
@@ -66,10 +65,9 @@ public class JsonRendererTest {
 
     @Test
     public void testRecursionLevelA() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"12"})
-            .build();
+        RequestPathInfo rpi = SlingUriBuilder.createFrom(context.currentResource())
+                .setSelectors(new String[] {"12"})
+                .build();
         Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
 
         assertEquals(12, jrs.getMaxRecursionLevel(request));
@@ -78,30 +76,27 @@ public class JsonRendererTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testRecursionLevelB() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"42", "more"})
-            .build();
+        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() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"more"})
-            .build();
+        RequestPathInfo rpi = SlingUriBuilder.createFrom(context.currentResource())
+                .setSelectors(new String[] {"more"})
+                .build();
         Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         jrs.getMaxRecursionLevel(request);
     }
 
     @Test
     public void testRecursionLevelD() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"tidy"})
-            .build();
+        RequestPathInfo rpi = SlingUriBuilder.createFrom(context.currentResource())
+                .setSelectors(new String[] {"tidy"})
+                .build();
         Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertEquals(0, jrs.getMaxRecursionLevel(request));
     }
@@ -111,20 +106,18 @@ public class JsonRendererTest {
         // Level must be the last selector but
         // if the last selector is "tidy" there's
         // no error. "for historical reasons"
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"46", "tidy"})
-            .build();
+        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() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"tidy", "45"})
-            .build();
+        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));
@@ -132,70 +125,63 @@ public class JsonRendererTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testRecursionLevelNumeric() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"᭙"})
-            .build();
+        RequestPathInfo rpi = SlingUriBuilder.createFrom(context.currentResource())
+                .setSelectors(new String[] {"᭙"})
+                .build();
         Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         jrs.getMaxRecursionLevel(request);
     }
 
     @Test
     public void testRecursionLevelOverflow() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {Long.toString(((long) Integer.MAX_VALUE)  + 1L)})
-            .build();
+        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() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {Long.toString(((long) Integer.MIN_VALUE)  - 1L)})
-            .build();
+        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() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {Long.toString( - 2L)})
-            .build();
+        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() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"infinity"})
-            .build();
+        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() {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"-1"})
-            .build();
+        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 {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"bad", "selectors"})
-            .build();
+        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);
@@ -203,10 +189,9 @@ public class JsonRendererTest {
 
     @Test
     public void testISO8601() throws IOException {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"1"})
-            .build();
+        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);
@@ -218,10 +203,9 @@ public class JsonRendererTest {
 
     @Test
     public void testECMA() throws IOException {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"1"})
-            .build();
+        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);
@@ -233,10 +217,9 @@ public class JsonRendererTest {
 
     @Test
     public void testBoolean() throws IOException {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"1"})
-            .build();
+        RequestPathInfo rpi = SlingUriBuilder.createFrom(context.currentResource())
+                .setSelectors(new String[] {"1"})
+                .build();
         Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertTrue(getJsonFromReader().getBoolean("active"));
     }
@@ -244,10 +227,9 @@ public class JsonRendererTest {
     @Test
     // JSON impl only support Integers, JCR only supports Long values.
     public void testNumber() throws IOException {
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"1"})
-            .build();
+        RequestPathInfo rpi = SlingUriBuilder.createFrom(context.currentResource())
+                .setSelectors(new String[] {"1"})
+                .build();
         Mockito.when(request.getRequestPathInfo()).thenReturn(rpi);
         assertTrue(getJsonFromReader().getInt("number") == 2);
     }
@@ -257,15 +239,14 @@ public class JsonRendererTest {
     public void testBooleansNoTidy() throws IOException {
         context.currentResource("/content/booleans");
         Mockito.when(request.getResource()).thenReturn(context.currentResource());
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .build();
+        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\"}";
+        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));
-            JsonReader jsonReader1 = Json.createReader(new StringReader(getJsonFromRequestResponse()));
-        ){
+        try (JsonReader jsonReader = Json.createReader(new StringReader(expected));
+                JsonReader jsonReader1 = Json.createReader(new StringReader(getJsonFromRequestResponse())); ) {
             JsonObject expectedObject = jsonReader.readObject();
             JsonObject targetObject = jsonReader1.readObject();
             diff = Json.createDiff(expectedObject, targetObject);
@@ -278,22 +259,19 @@ public class JsonRendererTest {
     public void testBooleansWithTidy() throws IOException {
         context.currentResource("/content/booleans");
         Mockito.when(request.getResource()).thenReturn(context.currentResource());
-        RequestPathInfo rpi = SlingUriBuilder
-            .createFrom(context.currentResource())
-            .setSelectors(new String[] {"tidy"})
-            .build();
+        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" +
-            "  \"s1\": \"true\",\n" +
-            "  \"b1\": true,\n" +
-            "  \"s2\": \"false\"\n" +
-            "  }";
+        final String expected = "{\n" + "  \"b2\": false,\n"
+                + "  \"jcr:primaryType\": \"nt:unstructured\",\n"
+                + "  \"s1\": \"true\",\n"
+                + "  \"b1\": true,\n"
+                + "  \"s2\": \"false\"\n"
+                + "  }";
         JsonPatch diff;
-        try(JsonReader jsonReader = Json.createReader(new StringReader(expected));
-            JsonReader jsonReader1 = Json.createReader(new StringReader(getJsonFromRequestResponse()));
-        ){
+        try (JsonReader jsonReader = Json.createReader(new StringReader(expected));
+                JsonReader jsonReader1 = Json.createReader(new StringReader(getJsonFromRequestResponse())); ) {
             JsonObject expectedObject = jsonReader.readObject();
             JsonObject targetObject = jsonReader1.readObject();
             diff = Json.createDiff(expectedObject, targetObject);
@@ -313,5 +291,4 @@ public class JsonRendererTest {
         renderer.render(request, response);
         return response.getOutputAsString();
     }
-
-}
\ No newline at end of file
+}
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 47af928..bf1f3cc 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
@@ -18,9 +18,6 @@
  */
 package org.apache.sling.servlets.get.impl.helpers;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -32,7 +29,7 @@ import jakarta.servlet.RequestDispatcher;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletResponse;
-
+import junitx.util.PrivateAccessor;
 import org.apache.sling.api.SlingJakartaHttpServletRequest;
 import org.apache.sling.api.SlingJakartaHttpServletResponse;
 import org.apache.sling.api.request.RequestDispatcherOptions;
@@ -47,17 +44,17 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import junitx.util.PrivateAccessor;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class StreamRendererTest {
 
     @Rule
     public SlingContext context = new SlingContext(ResourceResolverType.JCR_OAK);
 
-
     @Before
     public void setup() {
-        context.create().resource("/abc.txt","prop","value");
+        context.create().resource("/abc.txt", "prop", "value");
         context.build().file("file.txt", this.getClass().getResourceAsStream("/samplefile.json"));
     }
 
@@ -113,30 +110,42 @@ public class StreamRendererTest {
         // with BufferedInputStream
         assertCopyRange(expected, new BufferedInputStream(new ByteArrayInputStream(expected)), a, b);
         // without available()
-        assertCopyRange(expected, new ByteArrayInputStream(expected) {
-            @Override
-            public synchronized int available() {
-                return 0;
-            }
-        }, a, b);
+        assertCopyRange(
+                expected,
+                new ByteArrayInputStream(expected) {
+                    @Override
+                    public synchronized int available() {
+                        return 0;
+                    }
+                },
+                a,
+                b);
         // with BufferedInputStream and without available()
-        assertCopyRange(expected, new BufferedInputStream(new ByteArrayInputStream(expected) {
-            @Override
-            public synchronized int available() {
-                return 0;
-            }
-        }), a, b);
+        assertCopyRange(
+                expected,
+                new BufferedInputStream(new ByteArrayInputStream(expected) {
+                    @Override
+                    public synchronized int available() {
+                        return 0;
+                    }
+                }),
+                a,
+                b);
         // with an input stream that does not return everything in read()
-        assertCopyRange(expected, new ByteArrayInputStream(expected) {
-            @Override
-            public synchronized int read(byte[] b, int off, int len) {
-                // allow maximum of 10
-                if (len > 10) {
-                    len = 10;
-                }
-                return super.read(b, off, len);
-            }
-        }, a, b);
+        assertCopyRange(
+                expected,
+                new ByteArrayInputStream(expected) {
+                    @Override
+                    public synchronized int read(byte[] b, int off, int len) {
+                        // allow maximum of 10
+                        if (len > 10) {
+                            len = 10;
+                        }
+                        return super.read(b, off, len);
+                    }
+                },
+                a,
+                b);
     }
 
     private void assertCopyRange(byte[] expected, InputStream input, int a, int b) throws IOException {
@@ -159,26 +168,28 @@ public class StreamRendererTest {
         final ResourceMetadata meta = Mockito.mock(ResourceMetadata.class);
         final ServletContext sc = Mockito.mock(ServletContext.class);
 
-        StreamRenderer streamRendererServlet = new StreamRenderer(true, new String[] { "/" }, sc);
+        StreamRenderer streamRendererServlet = new StreamRenderer(true, new String[] {"/"}, sc);
 
         Mockito.when(resource.getResourceMetadata()).thenReturn(meta);
-        PrivateAccessor.invoke(streamRendererServlet, "setHeaders",
-                new Class[] { Resource.class, SlingJakartaHttpServletResponse.class }, new Object[] { resource, response });
+        PrivateAccessor.invoke(
+                streamRendererServlet,
+                "setHeaders",
+                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);
-        final SlingJakartaHttpServletRequest request = Builders.newRequestBuilder(context.resourceResolver().getResource("/file.txt"))
-            .buildJakartaRequest();
-        final SlingJakartaHttpServletResponseResult response = Builders.newResponseBuilder()
-            .buildJakartaResponseResult();
+        StreamRenderer renderer = new StreamRenderer(true, null, null);
+        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
@@ -186,19 +197,19 @@ public class StreamRendererTest {
         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);
+        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);
+                .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());
     }
-
-
 }
diff --git a/src/test/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreatorTest.java b/src/test/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreatorTest.java
index f28b8b4..4ca0184 100644
--- a/src/test/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreatorTest.java
+++ b/src/test/java/org/apache/sling/servlets/get/impl/util/JsonObjectCreatorTest.java
@@ -18,21 +18,20 @@
  */
 package org.apache.sling.servlets.get.impl.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import jakarta.json.JsonString;
 import jakarta.json.JsonValue;
 import jakarta.json.JsonValue.ValueType;
-
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.wrappers.ValueMapDecorator;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 public class JsonObjectCreatorTest {
 
     private JsonValue createJsonValue(final Object value) {
@@ -46,7 +45,8 @@ public class JsonObjectCreatorTest {
         return joc.create().build().get("v");
     }
 
-    @Test public void testBoolean() {
+    @Test
+    public void testBoolean() {
         final JsonValue t = createJsonValue(Boolean.TRUE);
         assertEquals(JsonValue.TRUE, t);
 
@@ -54,7 +54,8 @@ public class JsonObjectCreatorTest {
         assertEquals(JsonValue.FALSE, f);
     }
 
-    @Test public void testBooleanArray() {
+    @Test
+    public void testBooleanArray() {
         final JsonValue t = createJsonValue(new boolean[] {true, false, true});
         assertEquals(ValueType.ARRAY, t.getValueType());
         assertEquals(3, t.asJsonArray().size());
@@ -63,16 +64,17 @@ public class JsonObjectCreatorTest {
         assertEquals(JsonValue.TRUE, t.asJsonArray().get(2));
     }
 
-    @Test public void testNull() {
+    @Test
+    public void testNull() {
         final JsonValue t = createJsonValue(null);
         assertNull(t);
     }
 
-    @Test public void testNullInArray() {
+    @Test
+    public void testNullInArray() {
         final JsonValue t = createJsonValue(new String[] {null});
         assertEquals(ValueType.ARRAY, t.getValueType());
         assertEquals(1, t.asJsonArray().size());
-        assertEquals("", ((JsonString)t.asJsonArray().get(0)).getString());
+        assertEquals("", ((JsonString) t.asJsonArray().get(0)).getString());
     }
-
-}
\ No newline at end of file
+}


(sling-org-apache-sling-servlets-get) 01/02: SLING-12726 Update to Parent 62

Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 68ef03c19d8fa895664a640e29fcd6b3f23b994a
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri Mar 28 15:42:09 2025 +0100

    SLING-12726 Update to Parent 62
---
 .sling-module.json | 5 +++++
 pom.xml            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.sling-module.json b/.sling-module.json
new file mode 100644
index 0000000..cfad4d2
--- /dev/null
+++ b/.sling-module.json
@@ -0,0 +1,5 @@
+{
+  "jenkins": {
+    "jdks": [17, 21]
+  }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1f57d1c..bf928e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>52</version>
+        <version>62</version>
         <relativePath />
     </parent>