Merge pull request #42951 from geoand/qcl-polish

Polish QuarkusClassLoader
quarkusio · Sep 4, 2024 · ac5e735 · ac5e735
2 parents 6e096fe + 7d9c959
commit ac5e735
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...ootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathResourceIndex.java b/...ootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/ClassPathResourceIndex.java
@@ -194,6 +194,7 @@ static String getResourceKey(String resource) {
     public static class Builder {
 
         private static final String CLASS_SUFFIX = ".class";
+        private static final ClassPathElement[] EMPTY_CLASSPATH_ELEMENT = new ClassPathElement[0];
 
         private final Map<String, ClassPathElement> transformedClassCandidates = new HashMap<>();
         private final Map<String, ClassPathElement> transformedClasses = new HashMap<>();
@@ -210,7 +211,7 @@ public void scanClassPathElement(ClassPathElement classPathElement,
             }
         }
 
-        public void addTranformedClassCandidate(ClassPathElement classPathElement, String resource) {
+        public void addTransformedClassCandidate(ClassPathElement classPathElement, String resource) {
             transformedClassCandidates.put(resource, classPathElement);
         }
 
@@ -239,19 +240,19 @@ public void addResourceMapping(ClassPathElement classPathElement, String resourc
             }
         }
 
-        public void addParentFirstResource(ClassPathElement classPathElement, String resource) {
+        public void addParentFirstResource(String resource) {
             parentFirstResources.add(resource);
         }
 
-        public void addBannedResource(ClassPathElement classPathElement, String resource) {
+        public void addBannedResource(String resource) {
             bannedResources.add(resource);
         }
 
         public ClassPathResourceIndex build() {
             Map<String, ClassPathElement[]> compactedResourceMapping = new HashMap<>(resourceMapping.size());
             for (Entry<String, List<ClassPathElement>> resourceMappingEntry : resourceMapping.entrySet()) {
                 compactedResourceMapping.put(resourceMappingEntry.getKey(),
-                        resourceMappingEntry.getValue().toArray(new ClassPathElement[resourceMappingEntry.getValue().size()]));
+                        resourceMappingEntry.getValue().toArray(EMPTY_CLASSPATH_ELEMENT));
             }
 
             return new ClassPathResourceIndex(compactedResourceMapping, transformedClasses,

diff --git a/...ts/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/...ts/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java
@@ -296,7 +296,7 @@ private ClassPathResourceIndex getClassPathResourceIndex() {
                     ClassPathResourceIndex.Builder classPathResourceIndexBuilder = ClassPathResourceIndex.builder();
 
                     classPathResourceIndexBuilder.scanClassPathElement(transformedClasses,
-                            classPathResourceIndexBuilder::addTranformedClassCandidate);
+                            classPathResourceIndexBuilder::addTransformedClassCandidate);
 
                     for (ClassPathElement element : normalPriorityElements) {
                         classPathResourceIndexBuilder.scanClassPathElement(element,
@@ -310,12 +310,14 @@ private ClassPathResourceIndex getClassPathResourceIndex() {
 
                     for (ClassPathElement bannedElement : bannedElements) {
                         classPathResourceIndexBuilder.scanClassPathElement(bannedElement,
-                                classPathResourceIndexBuilder::addBannedResource);
+                                (classPathElement, resource) -> classPathResourceIndexBuilder.addBannedResource(
+                                        resource));
                     }
 
                     for (ClassPathElement parentFirstElement : parentFirstElements) {
                         classPathResourceIndexBuilder.scanClassPathElement(parentFirstElement,
-                                classPathResourceIndexBuilder::addParentFirstResource);
+                                (classPathElement, resource) -> classPathResourceIndexBuilder.addParentFirstResource(
+                                        resource));
                     }
 
                     return this.classPathResourceIndex = classPathResourceIndexBuilder.build();