Fixed the necessity to specify primary dependency when constructor injecting (1.10)

Author: Michal-python

client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.9-fix</version>
+        <version>1.10</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.9-fix</version>
+        <version>1.10</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.9-fix</version>
+        <version>1.10</version>
     </parent>
 
     <groupId>cat.michal.catbase.injector</groupId>

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

@@ -211,11 +211,16 @@ <T> Optional<Constructor<T>> getConstructor(Dependency<T> dependency) {
     private boolean isValidInjectableType(Type type) {
         if(type instanceof ParameterizedType parameterType && Collection.class.isAssignableFrom(((Class<?>) parameterType.getRawType()))) {
             Type[] actualTypeArguments = parameterType.getActualTypeArguments();
-            if (actualTypeArguments.length != 1 || !(actualTypeArguments[0] instanceof Class)) {
+            if (actualTypeArguments.length != 1 || !(actualTypeArguments[0] instanceof Class<?> actualClass)) {
                 return false;
             }
+            //  if class is an abstraction layer which usually should be, we need to check if there are any implementations present, if not, the type is not an injectable type
+            if(actualClass.isInterface() || Modifier.isAbstract(actualClass.getModifiers())) {
+                return this.dependencies.stream()
+                        .anyMatch(dependency -> actualClass.isAssignableFrom(dependency.getClazz()));
+            }
 
-            return this.isValidInjectable((Class<?>) actualTypeArguments[0]);
+            return this.isValidInjectable(actualClass);
         }
         if (!(type instanceof Class<?> clazz)) {
             return false;

dependencyInjection/src/test/java/cat/michal/catbase/injector/ListInjectionTest.java

@@ -26,4 +26,11 @@ void testListInjection() {
         Assertions.assertInstanceOf(SecondImpl.class, instance.getSecondLayer());
     }
 
+    @Test
+    void testInjectTest() {
+        InjectTo instance = this.injector.getInstance(InjectTo.class);
+
+        Assertions.assertEquals(2, instance.getAbstractions().size());
+    }
+
 }

dependencyInjection/src/test/java/cat/michal/catbase/injector/listInjection/InjectTo.java

@@ -14,8 +14,15 @@ public class InjectTo {
 
     private final AbstractionLayer secondLayer;
 
-    public InjectTo(@Inject("second") AbstractionLayer secondLayer) {
+    private List<SecondAbstraction> abstractions;
+
+    public InjectTo(@Inject("second") AbstractionLayer secondLayer, List<SecondAbstraction> abstractions) {
         this.secondLayer = secondLayer;
+        this.abstractions = abstractions;
+    }
+
+    public List<SecondAbstraction> getAbstractions() {
+        return abstractions;
     }
 
     public AbstractionLayer getSecondLayer() {

dependencyInjection/src/test/java/cat/michal/catbase/injector/listInjection/SecondAbstraction.java

@@ -0,0 +1,4 @@
+package cat.michal.catbase.injector.listInjection;
+
+public interface SecondAbstraction {
+}

dependencyInjection/src/test/java/cat/michal/catbase/injector/listInjection/SecondFirstImpl.java

@@ -0,0 +1,7 @@
+package cat.michal.catbase.injector.listInjection;
+
+import cat.michal.catbase.injector.annotations.Component;
+
+@Component
+public class SecondFirstImpl implements SecondAbstraction {
+}

dependencyInjection/src/test/java/cat/michal/catbase/injector/listInjection/SecondSecondImpl.java

@@ -0,0 +1,7 @@
+package cat.michal.catbase.injector.listInjection;
+
+import cat.michal.catbase.injector.annotations.Component;
+
+@Component
+public class SecondSecondImpl implements SecondAbstraction {
+}

integrationTests/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cat.michal.catbase</groupId>
         <artifactId>CatBase</artifactId>
-        <version>1.9-fix</version>
+        <version>1.10</version>
     </parent>
 
     <artifactId>integrationTests</artifactId>