(sling-org-apache-sling-servlets-resolver) branch master updated: SLING-12643 : Support Jakarta ServletAPI in Scripting (Initial support)

[cziegeler]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 504321f  SLING-12643 : Support Jakarta ServletAPI in Scripting 
(Initial support)
504321f is described below

commit 504321ffea506f3ae1e1cbdb14cc295b252b8e5a
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Apr 23 18:39:09 2025 +0200

    SLING-12643 : Support Jakarta ServletAPI in Scripting (Initial support)
---
 .../servlets/resolver/internal/ScriptResourceDecorator.java | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceDecorator.java
 
b/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceDecorator.java
index 940d161..2a0528a 100644
--- 
a/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceDecorator.java
+++ 
b/src/main/java/org/apache/sling/servlets/resolver/internal/ScriptResourceDecorator.java
@@ -18,8 +18,6 @@
  */
 package org.apache.sling.servlets.resolver.internal;
 
-import javax.servlet.http.HttpServletRequest;
-
 import java.util.Iterator;
 
 import org.apache.sling.api.resource.Resource;
@@ -34,7 +32,7 @@ import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
-@Component
+@Component(service = ResourceDecorator.class)
 public class ScriptResourceDecorator implements ResourceDecorator {
     private final MergingServletResourceProvider provider;
 
@@ -44,7 +42,7 @@ public class ScriptResourceDecorator implements 
ResourceDecorator {
     }
 
     @Override
-    public Resource decorate(Resource resource) {
+    public Resource decorate(final Resource resource) {
         String path = ResourceUtil.normalize(resource.getPath());
         if (this.provider.isRootOf(path)) {
             String resolutionPath = 
resource.getResourceMetadata().getResolutionPath();
@@ -68,12 +66,7 @@ public class ScriptResourceDecorator implements 
ResourceDecorator {
         }
     }
 
-    @Override
-    public Resource decorate(Resource resource, HttpServletRequest request) {
-        return decorate(resource);
-    }
-
-    private Resource getResource(Resource resource, String path) {
+    private Resource getResource(final Resource resource, final String path) {
         return provider.getResource(
                 new ResolveContext<Void>() {
                     @Override