Added option to specify classloader (1.8.1)

Author: Michal-python

client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.8</version>
+        <version>1.8.1</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.8</version>
+        <version>1.8.1</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.8</version>
+        <version>1.8.1</version>
     </parent>
 
     <groupId>cat.michal.catbase.injector</groupId>

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

@@ -14,21 +14,40 @@ public class CatBaseInjector implements Injector {
     private final List<Class<?>> classes;
 
     public CatBaseInjector(Collection<String> packagePaths) {
-        this(new ArrayList<>(), packagePaths);
+        this(new ArrayList<>(), packagePaths, null);
     }
 
     public CatBaseInjector(String packagePath) {
-        this(new ArrayList<>(), List.of(packagePath));
+        this(new ArrayList<>(), List.of(packagePath), null);
     }
 
     public CatBaseInjector(List<Dependency<?>> dependencies, String packagePath) {
-        this(dependencies, List.of(packagePath));
+        this(dependencies, List.of(packagePath), null);
     }
 
+    public CatBaseInjector(Collection<String> packagePaths, ClassLoader classLoader) {
+        this(new ArrayList<>(), packagePaths, classLoader);
+    }
+
+    public CatBaseInjector(String packagePath, ClassLoader classLoader) {
+        this(new ArrayList<>(), List.of(packagePath), classLoader);
+    }
+
+    public CatBaseInjector(List<Dependency<?>> dependencies, String packagePath, ClassLoader classLoader) {
+        this(dependencies, List.of(packagePath), classLoader);
+    }
+
+
     public CatBaseInjector(List<Dependency<?>> dependencies, Collection<String> packagePaths) {
+        this(dependencies, packagePaths, null);
+    }
+
+    public CatBaseInjector(List<Dependency<?>> dependencies, Collection<String> packagePaths, ClassLoader classLoader) {
         this.dependencies = new ArrayList<>(dependencies);
         this.classes = new ArrayList<>();
-        packagePaths.forEach(packagePath -> this.classes.addAll(ClassFinder.findAllClasses(packagePath)));
+        ClassFinder classFinder = classLoader == null ? new ClassFinder() : new ClassFinder(classLoader);
+
+        packagePaths.forEach(packagePath -> this.classes.addAll(classFinder.findAllClasses(packagePath)));
 
         this.registerInjectables();
     }

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

@@ -14,21 +14,31 @@
 import java.util.stream.Collectors;
 
 public class ClassFinder {
-    public static List<Class<?>> findAllClasses(String packageName) {
+    private final ClassLoader classLoader;
+    
+    ClassFinder(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
+
+    ClassFinder() {
+        this(ClassLoader.getSystemClassLoader());
+    }
+
+    public List<Class<?>> findAllClasses(String packageName) {
         return findAllClassesPaths(packageName).stream()
-                .map(ClassFinder::getClass)
+                .map(this::getClass)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 
-    public static List<String> findAllClassesPaths(String packageName) {
-        URL resource = ClassLoader.getSystemClassLoader().getResource(packageName.replace('.', '/'));
+    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.getSystemClassLoader()
+        InputStream stream = classLoader
                 .getResourceAsStream(packageName.replace('.', '/'));
 
         assert stream != null;
@@ -46,7 +56,7 @@ public static List<String> findAllClassesPaths(String packageName) {
         return classes;
     }
 
-    private static List<String> enumerateJar(String packageName, URL resource) {
+    private List<String> enumerateJar(String packageName, URL resource) {
         try {
             String[] parts = resource.toString().split("!/");
             String jarFilePath = parts[0].substring("jar:file:".length());
@@ -70,11 +80,11 @@ private static List<String> enumerateJar(String packageName, URL resource) {
         }
     }
 
-    private static Class<?> getClass(String className) {
+    private Class<?> getClass(String className) {
         try {
             return Class.forName(className.substring(0, className.lastIndexOf('.')));
         } catch (ClassNotFoundException ignored) {
         }
         return null;
     }
-}
+}

integrationTests/pom.xml

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

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cat.michal.catbase</groupId>
     <artifactId>CatBase</artifactId>
-    <version>1.8</version>
+    <version>1.8.1</version>
     <packaging>pom</packaging>
     <modules>
         <module>server</module>
@@ -17,7 +17,7 @@
     </modules>
 
     <properties>
-        <catbase.version>1.8</catbase.version>
+        <catbase.version>1.8.1</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.8</version>
+        <version>1.8.1</version>
     </parent>
 
     <groupId>cat.michal.catbase.server</groupId>