Fix scanning the root package

Author: KsanStone

client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.11</version>
+        <version>1.12</version>
     </parent>
 
     <groupId>cat.michal.catbase.client</groupId>

common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.11</version>
+        <version>1.12</version>
     </parent>
 
     <groupId>cat.michal.catbase.common</groupId>

dependencyInjection/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.11</version>
+        <version>1.12</version>
     </parent>
 
     <groupId>cat.michal.catbase.injector</groupId>

dependencyInjection/src/main/java/cat/michal/catbase/injector/ClassFinder.java

@@ -1,9 +1,8 @@
 package cat.michal.catbase.injector;
 
-import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.net.JarURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -15,12 +14,12 @@
 
 public class ClassFinder {
     private final ClassLoader classLoader;
-    
-    ClassFinder(ClassLoader classLoader) {
+
+    public ClassFinder(ClassLoader classLoader) {
         this.classLoader = classLoader;
     }
 
-    ClassFinder() {
+    public ClassFinder() {
         this(ClassLoader.getSystemClassLoader());
     }
 
@@ -32,57 +31,53 @@ public List<Class<?>> findAllClasses(String packageName) {
     }
 
     public List<String> findAllClassesPaths(String packageName) {
-        URL resource = classLoader.getResource(packageName.replace('.', '/'));
-        assert resource != null;
-        if (resource.getProtocol().startsWith("jar")) {
-            return enumerateJar(packageName, resource);
-        }
-
-        InputStream stream = classLoader
-                .getResourceAsStream(packageName.replace('.', '/'));
-
-        assert stream != null;
-        BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+        String path = packageName.replace('.', '/');
+        URL resource = classLoader.getResource(path);
         List<String> classes = new ArrayList<>();
-        reader.lines()
-                .forEach(line -> {
-                    if(line.endsWith(".class")) {
-                        classes.add(packageName + "." + line);
-                    } else {
-                        classes.addAll(findAllClassesPaths(packageName + "." + line));
-                    }
-                });
 
-        return classes;
-    }
+        if (resource == null) {
+            return classes;
+        }
 
-    private List<String> enumerateJar(String packageName, URL resource) {
         try {
-            String[] parts = resource.toString().split("!/");
-            String jarFilePath = parts[0].substring("jar:file:".length());
-            String packagePath = packageName.replace('.', '/');
-
-            List<String> classes = new ArrayList<>();
-
-            try (JarFile jar = new JarFile(jarFilePath)) {
-                Enumeration<JarEntry> entries = jar.entries();
-                while (entries.hasMoreElements()) {
-                    JarEntry entry = entries.nextElement();
-                    if (entry.getName().startsWith(packagePath + "/") && entry.getName().endsWith(".class")) {
-                        classes.add(entry.getName().replace('/', '.'));
+            if ("jar".equals(resource.getProtocol())) {
+                JarURLConnection conn = (JarURLConnection) resource.openConnection();
+                try (JarFile jar = conn.getJarFile()) {
+                    Enumeration<JarEntry> entries = jar.entries();
+                    while (entries.hasMoreElements()) {
+                        JarEntry entry = entries.nextElement();
+                        if (entry.getName().startsWith(path + "/") && entry.getName().endsWith(".class")) {
+                            String className = entry.getName().replace('/', '.').replaceAll("\\.class$", "");
+                            classes.add(className);
+                        }
                     }
                 }
+            } else if ("file".equals(resource.getProtocol())) {
+                File dir = new File(resource.getFile());
+                scanDirectory(packageName, dir, classes);
             }
-
-            return classes;
         } catch (IOException e) {
-            return List.of();
+            e.printStackTrace();
+        }
+
+        return classes;
+    }
+
+    private void scanDirectory(String packageName, File dir, List<String> classes) {
+        if (!dir.exists()) return;
+        for (File file : Objects.requireNonNull(dir.listFiles())) {
+            if (file.isDirectory()) {
+                scanDirectory(packageName + (packageName.isEmpty() ? "" : ".") + file.getName(), file, classes);
+            } else if (file.getName().endsWith(".class")) {
+                String className = packageName + (packageName.isEmpty() ? "" : ".") + file.getName().replaceAll("\\.class$", "");
+                classes.add(className);
+            }
         }
     }
 
     private Class<?> getClass(String className) {
         try {
-            return Class.forName(className.substring(0, className.lastIndexOf('.')));
+            return Class.forName(className);
         } catch (ClassNotFoundException ignored) {
         }
         return null;

dependencyInjection/src/test/java/TestClass.java

@@ -0,0 +1,2 @@
+public class TestClass {
+}

dependencyInjection/src/test/java/WholePackageScanTest.java

@@ -0,0 +1,15 @@
+import cat.michal.catbase.injector.ClassFinder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class WholePackageScanTest {
+
+    @Test
+    void testScan() {
+        var finder = new ClassFinder();
+        var classes = finder.findAllClasses(TestClass.class.getPackageName());
+        assert !classes.isEmpty();
+    }
+
+}

integrationTests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.11</version>
+        <version>1.12</version>
     </parent>
 
     <artifactId>integrationTests</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cat.michal.catbase</groupId>
     <artifactId>CatBase</artifactId>
-    <version>1.11</version>
+    <version>1.12</version>
     <packaging>pom</packaging>
     <modules>
         <module>server</module>
@@ -17,7 +17,7 @@
     </modules>
 
     <properties>
-        <catbase.version>1.11</catbase.version>
+        <catbase.version>1.12</catbase.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
     </properties>

server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.11</version>
+        <version>1.12</version>
     </parent>
 
     <groupId>cat.michal.catbase.server</groupId>