You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2023/12/30 14:52:57 UTC

(groovy) branch GROOVY-11262 created (now 7aca464611)

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

sunlan pushed a change to branch GROOVY-11262
in repository https://gitbox.apache.org/repos/asf/groovy.git


      at 7aca464611 GROOVY-11262: Avoid processing duplicated entries within META-INF

This branch includes the following new commits:

     new 7aca464611 GROOVY-11262: Avoid processing duplicated entries within META-INF

The 1 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.



(groovy) 01/01: GROOVY-11262: Avoid processing duplicated entries within META-INF

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

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

commit 7aca464611be51747f12b8b84c545213ad5615cb
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Dec 30 22:51:25 2023 +0800

    GROOVY-11262: Avoid processing duplicated entries within META-INF
---
 .../java/org/codehaus/groovy/control/SourceExtensionHandler.java    | 6 +++---
 .../org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java    | 6 ++----
 .../org/codehaus/groovy/transform/ASTTransformationVisitor.java     | 6 ++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/control/SourceExtensionHandler.java b/src/main/java/org/codehaus/groovy/control/SourceExtensionHandler.java
index 09d788afe2..6c512657e2 100644
--- a/src/main/java/org/codehaus/groovy/control/SourceExtensionHandler.java
+++ b/src/main/java/org/codehaus/groovy/control/SourceExtensionHandler.java
@@ -19,6 +19,7 @@
 package org.codehaus.groovy.control;
 
 import groovy.lang.GroovyRuntimeException;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.util.URLStreams;
 
 import java.io.BufferedReader;
@@ -42,13 +43,12 @@ public class SourceExtensionHandler {
             if (!globalServices.hasMoreElements()) {
                 globalServices = loader.getResources("META-INF/services/org.codehaus.groovy.source.Extensions");
             }
-            while (globalServices.hasMoreElements()) {
-                URL service = globalServices.nextElement();
+            for (URL service : DefaultGroovyMethods.toSet(globalServices)) {
                 try (BufferedReader svcIn = new BufferedReader(new InputStreamReader(URLStreams.openUncachedStream(service)))) {
                     String extension = svcIn.readLine();
                     while (extension != null) {
                         extension = extension.trim();
-                        if (!extension.startsWith("#") && extension.length() > 0) {
+                        if (!extension.startsWith("#") && !extension.isEmpty()) {
                             extensions.add(extension);
                         }
                         extension = svcIn.readLine();
diff --git a/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java b/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java
index 596c223989..d15bc6437c 100644
--- a/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java
+++ b/src/main/java/org/codehaus/groovy/runtime/m12n/ExtensionModuleScanner.java
@@ -19,12 +19,12 @@
 package org.codehaus.groovy.runtime.m12n;
 
 import groovy.lang.GroovyRuntimeException;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.util.URLStreams;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Enumeration;
 import java.util.Properties;
 
 import static org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport.closeQuietly;
@@ -57,9 +57,7 @@ public class ExtensionModuleScanner {
 
     private void scanClasspathModulesFrom(String moduleMetaInfFile) {
         try {
-            Enumeration<URL> resources = classLoader.getResources(moduleMetaInfFile);
-            while (resources.hasMoreElements()) {
-                URL url = resources.nextElement();
+            for (URL url : DefaultGroovyMethods.toSet(classLoader.getResources(moduleMetaInfFile))) {
                 scanExtensionModuleFromMetaInf(url);
             }
         } catch (IOException e) {
diff --git a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
index 336bab46c4..af21d9ee75 100644
--- a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
@@ -39,6 +39,7 @@ import org.codehaus.groovy.control.Phases;
 import org.codehaus.groovy.control.SourceUnit;
 import org.codehaus.groovy.control.messages.SimpleMessage;
 import org.codehaus.groovy.control.messages.WarningMessage;
+import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.util.URLStreams;
 
 import java.io.BufferedReader;
@@ -51,7 +52,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -279,9 +279,7 @@ public final class ASTTransformationVisitor extends ClassCodeVisitorSupport {
         GroovyClassLoader transformLoader = compilationUnit.getTransformLoader();
         Map<String, URL> transformNames = new LinkedHashMap<String, URL>();
         try {
-            Enumeration<URL> globalServices = transformLoader.getResources("META-INF/services/org.codehaus.groovy.transform.ASTTransformation");
-            while (globalServices.hasMoreElements()) {
-                URL service = globalServices.nextElement();
+            for (URL service : DefaultGroovyMethods.toSet(transformLoader.getResources("META-INF/services/org.codehaus.groovy.transform.ASTTransformation"))) {
                 try (BufferedReader svcIn = new BufferedReader(new InputStreamReader(URLStreams.openUncachedStream(service), StandardCharsets.UTF_8))) {
                     String className;
                     try {