Added JDK 9 version for JarEntries.getRealName

smallrye · Jul 16, 2020 · 8ef8d4c · 8ef8d4c
1 parent 40dab94
commit 8ef8d4c
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 2 deletions.
diff --git a/io/pom.xml b/io/pom.xml
@@ -26,6 +26,23 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.0.0-M5</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <profile>
             <id>coverage</id>

diff --git a/io/src/main/java9/io/smallrye/common/io/jar/JarEntries.java b/io/src/main/java9/io/smallrye/common/io/jar/JarEntries.java
@@ -0,0 +1,36 @@
+package io.smallrye.common.io.jar;
+
+import java.lang.reflect.Method;
+import java.util.jar.JarEntry;
+
+public class JarEntries {
+
+    private static final Method REAL_NAME_METHOD;
+
+    static {
+        Method method;
+        try {
+            method = Class.forName("java.util.jar.JarFile$JarFileEntry").getDeclaredMethod("realName");
+            method.setAccessible(true);
+        } catch (NoSuchMethodException | ClassNotFoundException e) {
+            method = null;
+        }
+        REAL_NAME_METHOD = method;
+    }
+
+    /**
+     * Returns the real name of this {@link JarEntry}. On Java 8, it returns the {@link JarEntry#getName()}
+     * On Java 10+, a getRealName() method was added
+     */
+    public static String getRealName(JarEntry jarEntry) {
+        if (REAL_NAME_METHOD != null) {
+            try {
+                return REAL_NAME_METHOD.invoke(jarEntry).toString();
+            } catch (Exception e) {
+                // This should never happen
+            }
+        }
+        // As a safe net, fallback to the original value
+        return jarEntry.getName();
+    }
+}
diff --git a/...mallrye/common/io/jar/JarEntriesTest.java → .../smallrye/common/io/jar/JarEntriesIT.java b/...mallrye/common/io/jar/JarEntriesTest.java → .../smallrye/common/io/jar/JarEntriesIT.java
@@ -9,14 +9,15 @@
 
 import org.junit.Test;
 
-public class JarEntriesTest {
+// This needs to be run as an integration-test
+public class JarEntriesIT {
 
     @Test
     public void shouldUseRealName() throws IOException {
         File tmpFile = MultiReleaseJarGenerator.generateMultiReleaseJar();
         JarFile jarFile = JarFiles.create(tmpFile);
         JarEntry jarEntry = jarFile.getJarEntry("foo.txt");
-        assertEquals(jarEntry.getRealName(), JarEntries.getRealName(jarEntry));
+        assertEquals("META-INF/versions/9/foo.txt", JarEntries.getRealName(jarEntry));
     }
 
 }