(sling-org-apache-sling-api) branch jakarta-2 updated: Correct class name

[cz...@apache.org]

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

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


The following commit(s) were added to refs/heads/jakarta-2 by this push:
     new e28d079  Correct class name
e28d079 is described below

commit e28d079def34e46cdfae31f4299922f922dc9e89
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jan 6 06:48:38 2025 +0100

    Correct class name
---
 JAKARTA.md                                                       | 9 ++++++---
 .../apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java  | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/JAKARTA.md b/JAKARTA.md
index 52dc1b3..210c305 100644
--- a/JAKARTA.md
+++ b/JAKARTA.md
@@ -51,18 +51,21 @@ Comments/javadocs have not been adjusted!
 - New methods in ResourceResolver (resourceresolver)
 - New methods in ResourceMapper (resourceresolver)
 - New methods in Authenticator (Auth Core)
+- New API for Auth Core based on Jakarta Servlet (auth.core)
+- New API for Engine based on Jakarta Servlet (engine)
 - New methods in Servlet Resolver (servlets.resolver) (first version, based on javax.servlet)
 - Support for SlingConstants.ATTR_REQUEST_JAKARTA_SERVLET (next to ATTR_REQUEST_SERVLET) (engine)
 - Support for SlingJakartaRequestListener and SlingJakartaRequestEvent (next to existing ones) (engine)
 - Support for using Jakarta Servlet API for Sling Filters (engine)
+- Request attributes for include/forward (mapping should be handled by Apache Felix Http Wrappers)
+- Request attributes for error handling (mapping should be handled by Apache Felix Http Wrappers)
+- Support for JakartaErrorHandler (next to ErrorHandler) (Sling Engine)
 
 ### Open
 
-- Request attributes for include/forward (mapping should be handled by Apache Felix Http Wrappers)
-- Request attributes for error handling (mapping should be handled by Apache Felix Http Wrappers)
 - Support for SlingJakartaBindings (next to SlingBindings)
 - Support for SlingJakartaScript (next to SlingScript)
 - Support for SlingJakartaScriptHelper (next to SlingScriptHelper)
-- Support for JakartaErrorHandler (next to ErrorHandler) (Sling Engine)
 - Support for JakartaOptingServlet (next to OptingServlet)
 - Support for using Jakarta Servlet API for Sling Servlets
+- Method overloading might lead to compilation problems if null is allowed e.g. for request/response. See ResourceResolver#map/#resolve
diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java
index 80b0437..0eff81f 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java
@@ -40,7 +40,7 @@ public class JakartaToJavaxServletWrapper implements Servlet {
     public static @Nullable Servlet toJavaxServlet(final @Nullable jakarta.servlet.Servlet servlet) {
         if (servlet != null) {
             if (servlet instanceof JakartaOptingServlet) {
-                return new JavaxToJakartaOptingServletWrapper((JakartaOptingServlet) servlet);
+                return new JakartaToJavaxOptingServletWrapper((JakartaOptingServlet) servlet);
             }
             return new JakartaToJavaxServletWrapper(servlet);
         }
@@ -86,11 +86,11 @@ public class JakartaToJavaxServletWrapper implements Servlet {
         return servlet.getServletInfo();
     }
 
-    public static class JavaxToJakartaOptingServletWrapper extends JakartaToJavaxServletWrapper implements OptingServlet {
+    public static class JakartaToJavaxOptingServletWrapper extends JakartaToJavaxServletWrapper implements OptingServlet {
 
         private final JakartaOptingServlet servlet;
 
-        public JavaxToJakartaOptingServletWrapper(final JakartaOptingServlet servlet) {
+        public JakartaToJavaxOptingServletWrapper(final JakartaOptingServlet servlet) {
             super(servlet);
             this.servlet = servlet;
         }