paulk-asert commented on a change in pull request #1171: GROOVY-9416: Avoid
unnecessary looking up non default import classes …
URL: https://github.com/apache/groovy/pull/1171#discussion_r383572967
##########
File path: src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
##########
@@ -81,15 +91,40 @@
result.putAll(doFindClasses(URI.create("jrt:/modules/java.base/"),
"java", javaPns));
try {
- URI gsLocation =
DefaultGroovyMethods.getLocation(GroovySystem.class).toURI();
- result.putAll(doFindClasses(gsLocation, "groovy", groovyPns));
+ List<URI> foundURIList = new LinkedList<>();
+ result.putAll(doFindGroovyClasses("groovy.lang.GroovySystem",
groovyPns, foundURIList));
+
+ // in user production environment, Groovy core classes, e.g.
`GroovySystem`(java class) and `GrapeIvy`(groovy class) are all packaged in the
groovy core jar file,
+ // but in Groovy development environment, Groovy core classes are
distributed in different directories
+ result.putAll(doFindGroovyClasses("groovy.grape.GrapeIvy",
groovyPns, foundURIList));
} catch (Exception e) {
- System.err.println("[WARNING] Failed to get default imported
groovy classes: " + e.getMessage());
+ throw new GroovyBugError("Failed to get default imported groovy
classes", e);
}
return result;
}
+ private Map<String, Set<String>> doFindGroovyClasses(String cn,
List<String> groovyPns, List<URI> foundURIList) throws URISyntaxException {
+ GroovyClassLoader groovyClassLoader = new GroovyClassLoader();
+ URI classpathEntryURI;
+ try {
+ Class<?> clazz = groovyClassLoader.loadClass(cn);
+ classpathEntryURI =
DefaultGroovyMethods.getLocation(clazz).toURI();
Review comment:
That's unfortunate. The Java one takes precedence and I suspect the Groovy
one is very rarely used. I am inclined to deprecate the Groovy one. We can copy
it some place else or rename to GroovyProxy (or both), or we could just delete
it. We would normally prefer @Delegate these days but I guess it is a dynamic
equivalent and we even have better dynamic alternatives like ProxyGenerator,
albeit with additional complexity. I'll create an issue.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
