Merge pull request #228 from kbss-cvut/bug#227-classpath-scanning-boo…

…t-3.2 [Bug #227] Support new Spring Boot JAR structure when scanning classpath
kbss-cvut · Jan 30, 2024 · 4150aec · 4150aec
2 parents 51f9bf9 + f424acd
commit 4150aec
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/jopa-impl/src/main/java/cz/cvut/kbss/jopa/loaders/DefaultClasspathScanner.java b/jopa-impl/src/main/java/cz/cvut/kbss/jopa/loaders/DefaultClasspathScanner.java
@@ -105,16 +105,17 @@ protected void processElements(Enumeration<URL> urls, String scanPath) throws IO
      * @throws UnsupportedEncodingException Should not happen, using standard UTF-8 encoding
      */
     protected static String sanitizePath(URL url) throws UnsupportedEncodingException {
-        return URLDecoder.decode(url.getFile(), StandardCharsets.UTF_8.toString());
+        return URLDecoder.decode(url.getFile(), StandardCharsets.UTF_8);
     }
 
     protected static boolean isJar(String filePath) {
         return filePath.startsWith("jar:") || filePath.endsWith(JAR_FILE_SUFFIX);
     }
 
     protected static JarFile createJarFile(URL elementUrl) throws IOException {
-        final String jarPath = sanitizePath(elementUrl).replaceFirst("[.]jar[!].*", JAR_FILE_SUFFIX)
-                                                       .replaceFirst("file:", "");
+        final String jarPath = sanitizePath(elementUrl).replaceFirst("[.]jar/?!.*", JAR_FILE_SUFFIX)
+                                                       .replaceFirst("file:", "")
+                                                       .replaceFirst("nested:", "");
         return new JarFile(jarPath);
     }