Merge pull request #2952 from wkclz/patch-1

#2241 fix bug: when running with a fat jar, need to read entries with openConnection

Author: k8s-ci-robot

util/src/main/java/io/kubernetes/client/util/ModelMapper.java

@@ -22,6 +22,7 @@
 import java.io.File;
 
 import java.io.IOException;
+import java.net.JarURLConnection;
 import java.net.URI;
 import java.net.URL;
 import java.net.URLDecoder;
@@ -485,14 +486,26 @@ private static List<String> getClassNamesFromPackage(ClassLoader classLoader, St
 
   private static void processJarPackage(URL packageURL, String packageName, String pkg, ArrayList<String> names) throws IOException {
     String jarFileName = URLDecoder.decode(packageURL.getFile(), "UTF-8");
-    jarFileName = jarFileName.substring(5, jarFileName.indexOf("!"));
+    JarFile jf = null;
+    // jar: client in repository; nested: client in a fat jar
+    if (jarFileName.startsWith("jar:") || jarFileName.startsWith("nested:")) {
+      jf = ((JarURLConnection) packageURL.openConnection()).getJarFile();
+    }
+    // file: client is a file in target (unit test)
+    if (jarFileName.startsWith("file:") ) {
+      jarFileName = jarFileName.substring(5, jarFileName.indexOf("!"));
+      jf = new JarFile(jarFileName);
+    }
+    if (jf == null) {
+      logger.error("Loading classes from jar with error packageURL: {}", jarFileName);
+      return;
+    }
     logger.info("Loading classes from jar {}", jarFileName);
-    try (JarFile jf = new JarFile(jarFileName)) {
-      Enumeration<JarEntry> jarEntries = jf.entries();
-      while (jarEntries.hasMoreElements()) {
-        processJarEntry(jarEntries.nextElement(), packageName, pkg, names);
-      }
+    Enumeration<JarEntry> jarEntries = jf.entries();
+    while (jarEntries.hasMoreElements()) {
+      processJarEntry(jarEntries.nextElement(), packageName, pkg, names);
     }
+    jf.close();
   }
 
   private static void processJarEntry(JarEntry jarEntry, String packageName, String pkg, ArrayList<String> names) {