Adjust multi-release jar support.

raphw · Sep 24, 2024 · c81f382 · c81f382
1 parent 73dbd13
commit c81f382
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/ClassFileLocator.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/ClassFileLocator.java
@@ -1149,31 +1149,41 @@ class ForFolder implements ClassFileLocator {
          * Contains the existing multi-release jar folders that are available for the
          * current JVM version in decreasing order.
          */
-        @HashCodeAndEqualsPlugin.ValueHandling(HashCodeAndEqualsPlugin.ValueHandling.Sort.IGNORE)
         private final int[] version;
 
 
         /**
          * Creates a new class file locator for a folder structure of class files.
          *
          * @param folder The base folder of the package structure.
-         * @throws IOException If an I/O exception occurs.
          */
-        public ForFolder(File folder) throws IOException {
-            this(folder, ClassFileVersion.JAVA_V8);
+        public ForFolder(File folder) {
+            this(folder, new int[0]);
         }
 
         /**
          * Creates a new class file locator for a folder structure of class files.
          *
+         * @param folder  The base folder of the package structure.
+         * @param version Contains the existing multi-release jar folders that are available for the
+         *                current JVM version in decreasing order.
+         */
+        protected ForFolder(File folder, int[] version) {
+            this.folder = folder;
+            this.version = version;
+        }
+
+        /**
+         * Creates a new class file locator for a folder structure of class files. The created locator considers
+         * the provided class file version when resolving class files and if multiple versions are available
+         *
          * @param folder           The base folder of the package structure.
          * @param classFileVersion The class file version to consider for multi-release JAR files.
          * @throws IOException If an I/O exception occurs.
          */
-        public ForFolder(File folder, ClassFileVersion classFileVersion) throws IOException {
-            this.folder = folder;
+        public static ClassFileLocator of(File folder, ClassFileVersion classFileVersion) throws IOException {
             if (classFileVersion.getJavaVersion() < 9) {
-                version = new int[0];
+                return new ForFolder(folder, new int[0]);
             } else {
                 File manifest = new File(folder, "META-INF" + File.separatorChar + "MANIFEST.MF");
                 boolean multiRelease;
@@ -1187,15 +1197,16 @@ public ForFolder(File folder, ClassFileVersion classFileVersion) throws IOExcept
                 } else {
                     multiRelease = false;
                 }
+                int[] version;
                 if (multiRelease) {
                     File[] file = new File(folder, "META-INF" + File.separatorChar + "versions").listFiles();
                     if (file != null) {
                         SortedSet<Integer> versions = new TreeSet<Integer>();
                         for (int index = 0; index < file.length; index++) {
                             try {
-                                int version = Integer.parseInt(file[index].getName());
-                                if (version <= classFileVersion.getJavaVersion() && version > 7) {
-                                    versions.add(version);
+                                int candidate = Integer.parseInt(file[index].getName());
+                                if (candidate <= classFileVersion.getJavaVersion() && candidate > 7) {
+                                    versions.add(candidate);
                                 }
                             } catch (NumberFormatException ignored) {
                                 /* do nothing */
@@ -1212,6 +1223,7 @@ public ForFolder(File folder, ClassFileVersion classFileVersion) throws IOExcept
                 } else {
                     version = new int[0];
                 }
+                return new ForFolder(folder, version);
             }
         }
 

diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/dynamic/ClassFileLocatorForFolderTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/dynamic/ClassFileLocatorForFolderTest.java
@@ -89,7 +89,7 @@ public void testSuccessfulVersionLocation() throws Exception {
         } finally {
             outputStream.close();
         }
-        ClassFileLocator classFileLocator = new ClassFileLocator.ForFolder(folder, ClassFileVersion.JAVA_V9);
+        ClassFileLocator classFileLocator = ClassFileLocator.ForFolder.of(folder, ClassFileVersion.JAVA_V9);
         ClassFileLocator.Resolution resolution = classFileLocator.locate(FOO + "." + BAR);
         assertThat(resolution.isResolved(), is(true));
         assertThat(resolution.resolve(), is(new byte[]{VALUE, VALUE * 2}));