Merge pull request #32 from kbss-cvut/31-fix-loading-from-jars

[#31] fix loading from jars

src/main/java/cz/cvut/kbss/jsonld/deserialization/util/ClasspathScanner.java

@@ -99,7 +99,7 @@ private static URI getUrlAsUri(URL url) {
         }
     }
 
-    private void processJarFile(URL jarResource, String packageName) {
+    protected void processJarFile(URL jarResource, String packageName) {
         final String relPath = packageName.replace('.', '/');
         final String jarPath = jarResource.getPath().replaceFirst("[.]jar[!].*", JAR_FILE_SUFFIX)
                                           .replaceFirst("file:", "");
@@ -114,9 +114,11 @@ private void processJarFile(URL jarResource, String packageName) {
                 if (shouldSkipEntry(entryName)) {
                     continue;
                 }
-                if (entryName.endsWith(CLASS_FILE_SUFFIX) && entryName.startsWith(relPath)) {
+                if (entryName.endsWith(CLASS_FILE_SUFFIX) && entryName.contains(relPath)) {
                     // Remove prefix from multi-release JAR class names
                     className = entryName.replaceFirst("META-INF/versions/[1-9][0-9]*/", "");
+                    className = className.replaceFirst("WEB-INF/classes/", "");
+                    className = className.replaceFirst("BOOT-INF/classes/", "");
                     className = className.replace('/', '.').replace('\\', '.');
                     className = className.substring(0, className.length() - CLASS_FILE_SUFFIX.length());
                 }

src/test/java/cz/cvut/kbss/jsonld/deserialization/util/ClasspathScannerTest.java

@@ -1,19 +1,25 @@
 /**
  * Copyright (C) 2020 Czech Technical University in Prague
  *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any
- * later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details. You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details. You should have received a copy of the GNU General
+ * Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 package cz.cvut.kbss.jsonld.deserialization.util;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.Test;
 
 class ClasspathScannerTest {
@@ -28,4 +34,31 @@ void processClassesSupportsMultiReleaseJarFiles() {
         });
         sut.processClasses(null);
     }
+
+    @Test
+    void processClassesSupportsWarFiles() throws IOException {
+        processClassesSupportsJarFiles("testjar.war", "cz.cvut.kbss.testjar.model");
+    }
+
+    @Test
+    void processClassesSupportsSpringBootJarFiles() throws IOException, ClassNotFoundException {
+        processClassesSupportsJarFiles("testjar.jar", "cz.cvut.kbss.testjar.model");
+    }
+
+    void processClassesSupportsJarFiles(String jarFile, String pkg)
+        throws IOException {
+        // Empty consumer
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        URL url = loader.getResources("./bug-31/" + jarFile).nextElement();
+        ClassLoader classLoader = new URLClassLoader(new URL[] {url});
+        Thread.currentThread().setContextClassLoader(classLoader);
+        AtomicBoolean a = new AtomicBoolean(false);
+        final ClasspathScanner sut = new ClasspathScanner(cls -> {
+            a.set(true);
+        });
+        sut.processJarFile(url, pkg);
+        if (!a.get()) {
+            fail();
+        }
+    }
 }

src/test/java/cz/cvut/kbss/testjar/model/TestClass.java

@@ -0,0 +1,11 @@
+package cz.cvut.kbss.testjar.model;
+
+/**
+ * This serves for {@link cz.cvut.kbss.jsonld.deserialization.util.ClasspathScannerTest} to catch
+ * Class.forName call in ClasspathScanner.
+ *
+ * Tried https://maven.apache.org/surefire/maven-surefire-plugin/examples/configuring-classpath.html
+ * but wasn't working.
+ */
+public class TestClass {
+}