IGNITE-22952 Fix lambda classname parsing in deployment for Java 21+ (#…

…11466)
apache · Aug 8, 2024 · e5a199f · e5a199f
1 parent 3b8e513
commit e5a199f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/...main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java b/...main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
@@ -209,15 +209,15 @@ private void processResourceRequest(UUID nodeId, GridDeploymentRequest req) {
             // In case the class loader is ours - skip the check
             // since it was already performed before (and was successful).
             if (!(ldr instanceof GridDeploymentClassLoader)) {
-                // First check for @GridNotPeerDeployable annotation.
-                String clsName = req.resourceName().replace('/', '.');
+                String clsName = clsNameFromResourceName(req.resourceName());
 
                 try {
                     if (clsName.endsWith(CLASS_FILE_EXTENSION))
                         clsName = clsName.substring(0, clsName.length() - CLASS_FILE_EXTENSION.length());
 
                     Class<?> cls = Class.forName(clsName, true, ldr);
 
+                    // First check for @GridNotPeerDeployable annotation.
                     if (U.getAnnotation(cls, IgniteNotPeerDeployable.class) != null) {
                         String errMsg = "Attempt to peer deploy class that has @IgniteNotPeerDeployable " +
                             "annotation: " + clsName;
@@ -294,6 +294,17 @@ private void processResourceRequest(UUID nodeId, GridDeploymentRequest req) {
         sendResponse(nodeId, req.responseTopic(), res);
     }
 
+    /** */
+    private static String clsNameFromResourceName(String reqResourceName) {
+        String clsName = reqResourceName.replace('/', '.');
+
+        // Java 21+ uses '/' in lambda class names, we must account for that.
+        if (!reqResourceName.contains("$$Lambda/"))
+            return clsName;
+
+        return clsName.replace("$$Lambda.", "$$Lambda/");
+    }
+
     /** */
     private String resourceRequestDetails(UUID nodeId, GridDeploymentRequest req) {
         return new SB()

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -10088,9 +10088,13 @@ public static IgniteCheckedException exceptionWithSuppressed(String msg, @Nullab
      *      {@code null} if passed in name is not related to lambda.
      */
     @Nullable public static String lambdaEnclosingClassName(String clsName) {
-        int idx = clsName.indexOf("$$Lambda$");
+        int idx0 = clsName.indexOf("$$Lambda$"); // Java 8+
+        int idx1 = clsName.indexOf("$$Lambda/"); // Java 21+
 
-        return idx != -1 ? clsName.substring(0, idx) : null;
+        if (idx0 == idx1)
+            return null;
+
+        return clsName.substring(0, idx0 >= 0 ? idx0 : idx1);
     }
 
     /**