#419 throw exception including path in ClasspathRuleSource if an inva…

…lid resource is referenced (#474)
jQAssistant · Jul 12, 2024 · 6ff1b14 · 6ff1b14
1 parent 8987da7
commit 6ff1b14
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/...ule/src/main/java/com/buschmais/jqassistant/core/rule/api/source/ClasspathRuleSource.java b/...ule/src/main/java/com/buschmais/jqassistant/core/rule/api/source/ClasspathRuleSource.java
@@ -17,24 +17,27 @@ public class ClasspathRuleSource extends RuleSource {
     public static final String RULE_RESOURCE_PATH = "META-INF/jqassistant-rules";
 
     private final ClassLoader classLoader;
-    private final String resource;
     private final String relativePath;
+    private final URL resource;
 
     public ClasspathRuleSource(ClassLoader classLoader, String relativePath) {
         this.classLoader = classLoader;
         this.relativePath = relativePath;
-        this.resource = RULE_RESOURCE_PATH + "/" + relativePath;
-
+        String classpathResource = RULE_RESOURCE_PATH + "/" + relativePath;
+        this.resource = getClassLoader().getResource(classpathResource);
+        if (this.resource == null) {
+            throw new IllegalArgumentException("Cannot find rule resource in classpath: " + classpathResource);
+        }
     }
 
     @Override
     public String getId() {
-        return resource;
+        return resource.toString();
     }
 
     @Override
     public URL getURL() {
-        return getClassLoader().getResource(resource);
+        return resource;
     }
 
     @Override
@@ -49,12 +52,7 @@ public String getRelativePath() {
 
     @Override
     public InputStream getInputStream() throws IOException {
-        ClassLoader currentClassloader = getClassLoader();
-        InputStream stream = currentClassloader.getResourceAsStream(resource);
-        if (stream == null) {
-            throw new IOException("Cannot load resource from " + resource);
-        }
-        return stream;
+        return resource.openStream();
     }
 
     private ClassLoader getClassLoader() {

diff --git a/...src/test/java/com/buschmais/jqassistant/core/rule/api/source/ClasspathRuleSourceTest.java b/...src/test/java/com/buschmais/jqassistant/core/rule/api/source/ClasspathRuleSourceTest.java
@@ -3,14 +3,24 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import org.junit.jupiter.api.Test;
+
 import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 class ClasspathRuleSourceTest extends AbstractRuleSourceTest {
 
     @Override
     protected List<RuleSource> getRuleSources() {
         return Stream.of("rules.xml", "index.adoc", "readme.md", "subdirectory/rules.xml")
-                .map(relativePath -> new ClasspathRuleSource(ClasspathRuleSourceTest.class.getClassLoader(), relativePath)).collect(toList());
+            .map(relativePath -> new ClasspathRuleSource(ClasspathRuleSourceTest.class.getClassLoader(), relativePath))
+            .collect(toList());
+    }
+
+    @Test
+    void nonExistingResource() {
+        assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new ClasspathRuleSource(this.getClass()
+            .getClassLoader(), "non-existing.xml"));
     }
 
 }