commit bbe4557ca32fd967e11a0ef5cc502f45513b06ac
author Paul King <paulk@asert.com.au> Fri May 03 11:52:17 2024 +1000
committer Paul King <paulk@asert.com.au> Fri May 03 11:52:59 2024 +1000
tree 00993614a11725374f497b68c0919a69c496c3ae
parent f5914b9e76a085248c0ef1ca79c8e1e79ab9df7a

avoid GrapeIvy as mentioned class (pre-work for replacing/making optional GrapeIvy)

src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java

diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
index 14d3734..76ac1af 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
@@ -103,17 +103,18 @@
             CompletableFuture<Map<String, Set<String>>> javaDefaultImportsFuture =
                     CompletableFuture.supplyAsync(() -> doFindClasses(URI.create("jrt:/modules/java.base/"), "java", javaPackages));
             try {
-                URI gsLocation = DefaultGroovyMethods.getLocation(gcl.loadClass("groovy.lang.GroovySystem")).toURI();
+                // groovy-core (Java source)
+                URI gcjLocation = DefaultGroovyMethods.getLocation(gcl.loadClass("groovy.lang.GroovySystem")).toURI();
                 CompletableFuture<Map<String, Set<String>>> groovyDefaultImportsFuture1 =
-                        CompletableFuture.supplyAsync(() -> doFindClasses(gsLocation, "groovy", groovyPackages));
+                        CompletableFuture.supplyAsync(() -> doFindClasses(gcjLocation, "groovy", groovyPackages));
 
-                // in production environment, groovy-core classes, e.g. `GroovySystem`(java class) and `GrapeIvy`(groovy class) are all packaged in the groovy-core jar file,
+                // in production environment, groovy-core classes, e.g. `GroovySystem`(java class) and `ListenerLister`(groovy class) are all packaged in the groovy-core jar file,
                 // but in Groovy development environment, groovy-core classes are distributed in different directories
-                URI giLocation = DefaultGroovyMethods.getLocation(gcl.loadClass("groovy.grape.GrapeIvy")).toURI();
+                URI gcgLocation = DefaultGroovyMethods.getLocation(gcl.loadClass("groovy.beans.ListenerList")).toURI();
                 CompletableFuture<Map<String, Set<String>>> groovyDefaultImportsFuture2 =
-                        gsLocation.equals(giLocation)
+                        gcjLocation.equals(gcgLocation)
                                 ? CompletableFuture.completedFuture(Collections.emptyMap())
-                                : CompletableFuture.supplyAsync(() -> doFindClasses(giLocation, "groovy", groovyPackages));
+                                : CompletableFuture.supplyAsync(() -> doFindClasses(gcgLocation, "groovy", groovyPackages));
 
                 result.putAll(groovyDefaultImportsFuture1.get());
                 result.putAll(groovyDefaultImportsFuture2.get());