(groovy) 01/02: jdk17 items

[emilles]

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

emilles pushed a commit to branch GROOVY-11743
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 6f73c1f3ae210e94d07b3b48626ef0b8caa6ecbf
Author: Eric Milles <eric.mil...@thomsonreuters.com>
AuthorDate: Tue Aug 26 11:05:07 2025 -0500

    jdk17 items
---
 .../src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy |  2 +-
 .../groovy/transform/ASTTransformationVisitor.java         | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/build-logic/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy 
b/build-logic/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
index 5487b9682e..b5a00bfd28 100644
--- a/build-logic/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
+++ b/build-logic/src/main/groovy/org/apache/groovy/gradle/DocGDK.groovy
@@ -78,7 +78,7 @@ class DocGDK extends DefaultTask {
                      '-link',
                      
'groovy,org.codehaus.groovy,org.apache.groovy=https://docs.groovy-lang.org/latest/html/gapi/',
                      '-link',
-                     
'java,org.xml,javax,org.w3c=https://docs.oracle.com/en/java/javase/11/docs/api/java.base/']
 + classes.get()
+                     
'java,org.xml,javax,org.w3c=https://docs.oracle.com/en/java/javase/17/docs/api/java.base/']
 + classes.get()
             )
         }
         fs.copy {
diff --git 
a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java 
b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
index c18a410e9a..7687a87a20 100644
--- a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
@@ -143,15 +143,15 @@ public final class ASTTransformationVisitor extends 
ClassCodeVisitorSupport {
 
             // second pass, call visit on all the collected nodes
             List<Tuple2<ASTTransformation, ASTNode[]>> tuples = new 
ArrayList<>();
-            for (ASTNode[] node : targetNodes) {
-                for (ASTTransformation snt : transforms.get(node[0])) {
-                    tuples.add(new Tuple2<>(snt, node));
+            for (ASTNode[] nodes : targetNodes) {
+                for (ASTTransformation xform : transforms.get(nodes[0])) {
+                    tuples.add(new Tuple2<>(xform, nodes));
                 }
             }
-            tuples.sort(priorityComparator);
+            if (tuples.size() > 1) tuples.sort(priorityComparator);
             for (Tuple2<ASTTransformation, ASTNode[]> tuple : tuples) {
-                if (tuple.getV1() instanceof CompilationUnitAware) {
-                    
((CompilationUnitAware)tuple.getV1()).setCompilationUnit(context.getCompilationUnit());
+                if (tuple.getV1() instanceof CompilationUnitAware unitAware) {
+                    unitAware.setCompilationUnit(context.getCompilationUnit());
                 }
                 tuple.getV1().visit(tuple.getV2(), source);
             }
@@ -237,8 +237,6 @@ public final class ASTTransformationVisitor extends 
ClassCodeVisitorSupport {
                         visitor.source = source;
                         visitor.visitClass(classNode);
                     }, phase.getPhaseNumber());
-                    break;
-
             }
         }
     }