Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions util/src/main/java/io/kubernetes/client/util/ModelMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
import java.net.JarURLConnection;
import java.net.URI;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Enumeration;
Expand Down Expand Up @@ -493,16 +491,23 @@ 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(), StandardCharsets.UTF_8);
String jarFileName = packageURL.getFile();
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);
int bangIndex = jarFileName.indexOf("!");
if (bangIndex < 0) {
logger.error("Loading classes from jar with error packageURL: {}", jarFileName);
return;
}
// Use URI.create to properly decode percent-encoded characters without converting + to space
// (URLDecoder.decode incorrectly converts + to space, breaking paths that contain literal +)
String filePart = jarFileName.substring(0, bangIndex);
jf = new JarFile(URI.create(filePart).getPath());
}
if (jf == null) {
logger.error("Loading classes from jar with error packageURL: {}", jarFileName);
Expand Down
Loading