Fixed mandatory constructor injection (1.8.3)

Author: Michal-python

client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.8.2</version>
+        <version>1.8.3</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.2</version>
+        <version>1.8.3</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.2</version>
+        <version>1.8.3</version>
     </parent>
 
     <groupId>cat.michal.catbase.injector</groupId>

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

@@ -169,16 +169,12 @@ public void registerInjectables() {
                 // filter only dependencies that are needed for the dependency tree
                 .filter(dependency -> dependency.getProvideMethod() == null && dependency.getInstance() == null)
                 .forEach(dependency -> {
-                    Constructor<?> validConstructor = getConstructor(dependency);
-                    Arrays.stream(validConstructor.getParameterTypes())
-                                    .forEach(type -> {
-                                        dependencies.stream()
-                                                .filter(dep -> type.isAssignableFrom(dep.getClazz()))
-                                                .findFirst()
-                                                .ifPresent(dependency::addDependency);
-                                    });
-
-
+                    Optional<? extends Constructor<?>> validConstructor = getConstructor(dependency);
+                    validConstructor.ifPresent(constructor -> Arrays.stream(constructor.getParameterTypes())
+                            .forEach(type -> dependencies.stream()
+                                    .filter(dep -> type.isAssignableFrom(dep.getClazz()))
+                                    .findFirst()
+                                    .ifPresent(dependency::addDependency)));
 
                     Arrays.stream(dependency.getClazz().getDeclaredFields())
                             .filter(field -> field.isAnnotationPresent(Inject.class))
@@ -231,16 +227,16 @@ public void registerInjectables() {
     }
 
     @SuppressWarnings("unchecked")
-    private <T> Constructor<T> getConstructor(Dependency<T> dependency) {
-        return (Constructor<T>) Arrays.stream(dependency.getClazz().getConstructors())
+    private <T> Optional<Constructor<T>> getConstructor(Dependency<T> dependency) {
+        return Arrays.stream(dependency.getClazz().getConstructors())
                 .filter(constructorElement -> constructorElement.getParameterTypes().length == 0
                         || Arrays.stream(constructorElement.getParameterTypes())
                         .allMatch(element ->
                                 containsByClass(element) || (element.isInterface() && element.isAnnotationPresent(Component.class))
                         )
                 )
-                .findAny()
-                .orElseThrow(() -> new InjectorException("No constructors with valid parameters found for " + dependency.getClazz().getName()));
+                .map(constructor -> (Constructor<T>) constructor)
+                .findAny();
     }
 
     private void initializeDependency(Dependency<?> dependency, List<Dependency<?>> sortedDependencies) {
@@ -345,7 +341,8 @@ public void clearInjectables() {
     }
 
     private <T> T instantiate(Dependency<T> dependency) {
-        Constructor<T> constructor = getConstructor(dependency);
+        Constructor<T> constructor = getConstructor(dependency)
+                .orElseThrow(() -> new InjectorException("Could not find valid constructor for " + dependency.getClazz()));
 
         try {
             if(constructor.getParameterCount() == 0) {

integrationTests/pom.xml

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

pom.xml

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