Fixed circular dependency issue with some external dependencies (1.8.1-fix)

Author: Michal-python

client/pom.xml

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

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

@@ -157,7 +157,8 @@ public void registerInjectables() {
 
         //check for nested dependencies
         dependencies.stream()
-                .filter(dependency -> dependency.getProvideMethod() == null)
+                // filter only dependencies that are needed for the dependency tree
+                .filter(dependency -> dependency.getProvideMethod() == null && dependency.getInstance() == null)
                 .forEach(dependency -> Arrays.stream(dependency.getClazz().getDeclaredFields())
                 .filter(field -> !field.isAnnotationPresent(Exclude.class))
                 .forEach(field -> {

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

@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.TestInstance;
 
 import java.util.List;
+import java.util.logging.Logger;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class ProvideTest {
@@ -17,7 +18,7 @@ void setup() {
         this.injector = new CatBaseInjector(List.of(CatBaseInjector.createExternalDependency(
                 new cat.michal.catbase.injector.provideMock.TestInstance("!"),
                 cat.michal.catbase.injector.provideMock.TestInstance.class
-        )), "cat.michal.catbase.injector.provideMock");
+        ), CatBaseInjector.createExternalDependency(Logger.getLogger("Logger"), Logger.class)), "cat.michal.catbase.injector.provideMock");
     }
 
     @Test

integrationTests/pom.xml

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

pom.xml

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