#171 - Module (custom scope) dependencies aren't fully transitive

inject-generator/src/main/java/io/avaje/inject/generator/AllScopes.java

@@ -36,7 +36,7 @@ ScopeInfo addScopeAnnotation(TypeElement type) {
   }
 
   boolean providedByDefaultModule(String dependency) {
-    return defaultScope.providesDependency(dependency);
+    return defaultScope.providesDependencyLocally(dependency);
   }
 
   void readBeans(RoundEnvironment roundEnv) {

inject-generator/src/main/java/io/avaje/inject/generator/ScopeInfo.java

@@ -407,11 +407,22 @@ boolean providedByOtherModule(String dependency) {
     if (scopes.providedByDefaultModule(dependency)) {
       return true;
     }
+    return providesDependencyRecursive(dependency);
+  }
+
+  /**
+   * Recursively search including 'parent' scopes.
+   */
+  private boolean providesDependencyRecursive(String dependency) {
+    if (providesDependencyLocally(dependency)) {
+      return true;
+    }
     // look for required scopes ...
     for (String require : requires) {
       final ScopeInfo requiredScope = scopes.get(require);
       if (requiredScope != null) {
-        if (requiredScope.providesDependency(dependency)) {
+        // recursively search parent scope
+        if (requiredScope.providesDependencyRecursive(dependency)) {
           // context.logWarn("dependency " + dependency + " provided by other scope " + requiredScope.name);
           return true;
         }
@@ -421,9 +432,9 @@ boolean providedByOtherModule(String dependency) {
   }
 
   /**
-   * Return true if this module provides the dependency.
+   * Return true if this module provides the dependency (non-recursive, local only).
    */
-  boolean providesDependency(String dependency) {
+  boolean providesDependencyLocally(String dependency) {
     if (requires.contains(dependency)) {
       return true;
     }

inject-test/src/test/java/org/example/custom4/Build.java

@@ -0,0 +1,4 @@
+package org.example.custom4;
+
+public class Build {
+}

inject-test/src/test/java/org/example/custom4/BuildOne.java

@@ -0,0 +1,11 @@
+package org.example.custom4;
+
+@BuildScope
+public class BuildOne {
+
+  private final Build build;
+
+  BuildOne(Build build) {
+    this.build = build;
+  }
+}

inject-test/src/test/java/org/example/custom4/BuildScope.java

@@ -0,0 +1,9 @@
+package org.example.custom4;
+
+import io.avaje.inject.InjectModule;
+import jakarta.inject.Scope;
+
+@Scope
+@InjectModule(requires = Build.class )
+public @interface BuildScope {
+}

inject-test/src/test/java/org/example/custom4/IntentionallyEmptyScope.java

@@ -0,0 +1,9 @@
+package org.example.custom4;
+
+import io.avaje.inject.InjectModule;
+import jakarta.inject.Scope;
+
+@Scope
+@InjectModule(requires = BuildScope.class )
+public @interface IntentionallyEmptyScope {
+}

inject-test/src/test/java/org/example/custom4/LinuxOne.java

@@ -0,0 +1,13 @@
+package org.example.custom4;
+
+@LinuxScope
+public class LinuxOne {
+
+  final Machine machine;
+  final Build build;
+
+  LinuxOne(Machine machine, Build build) {
+    this.machine = machine;
+    this.build = build;
+  }
+}

inject-test/src/test/java/org/example/custom4/LinuxScope.java

@@ -0,0 +1,9 @@
+package org.example.custom4;
+
+import io.avaje.inject.InjectModule;
+import jakarta.inject.Scope;
+
+@Scope
+@InjectModule(requires = {MachineScope.class})
+public @interface LinuxScope {
+}

inject-test/src/test/java/org/example/custom4/LinuxScopeTest.java

@@ -0,0 +1,82 @@
+package org.example.custom4;
+
+import io.avaje.inject.BeanScope;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class LinuxScopeTest {
+
+  @Test
+  void test_via_nested_scopes() {
+    Build buildExternal = new Build();
+    BuildModule buildModule = new BuildModule(buildExternal);
+
+    // our top scope
+    try (BeanScope buildScope = BeanScope.newBuilder()
+      .withModules(buildModule)
+      .build()) {
+
+      Build build = buildScope.get(Build.class);
+      assertThat(build).isSameAs(buildExternal);
+
+      Machine machineExternal = new Machine();
+      MachineModule machineModule = new MachineModule(machineExternal);
+
+      // our middle scope (depends on top scope)
+      try (BeanScope machineScope = BeanScope.newBuilder()
+        .withParent(buildScope)
+        .withModules(machineModule)
+        .build()) {
+
+        MachineOne machineOne = machineScope.get(MachineOne.class);
+        assertThat(machineOne.build).isSameAs(buildExternal);
+        assertThat(machineOne.machine).isSameAs(machineExternal);
+
+        //  bottom scope depends on middle scope and transitively depends on top scope
+        // this is our case for Issue 171 where LinuxOne depends on Build
+        // which is transitively supplied via MachineScope
+        try (BeanScope linuxScope = BeanScope.newBuilder()
+          .withParent(machineScope)
+          .withModules(new LinuxModule())
+          .build()) {
+
+          MachineOne machineOne2 = linuxScope.get(MachineOne.class);
+          assertThat(machineOne2).isSameAs(machineOne);
+          assertThat(machineOne2.build).isSameAs(buildExternal);
+          assertThat(machineOne2.machine).isSameAs(machineExternal);
+
+          LinuxOne linuxOne = linuxScope.get(LinuxOne.class);
+          assertThat(linuxOne.build).isSameAs(buildExternal);
+          assertThat(linuxOne.machine).isSameAs(machineExternal);
+        }
+      }
+    }
+  }
+
+
+  @Test
+  void test_via_flattened_module_structure() {
+    // external dependencies
+    Build buildExternal = new Build();
+    Machine machineExternal = new Machine();
+
+    // our 'flattened' bean scope
+    try (BeanScope flatScope = BeanScope.newBuilder()
+      // all our scope modules
+      .withModules(new BuildModule(buildExternal), new MachineModule(machineExternal), new LinuxModule())
+      .build()) {
+
+      Build build = flatScope.get(Build.class);
+      assertThat(build).isSameAs(buildExternal);
+
+      MachineOne machineOne = flatScope.get(MachineOne.class);
+      assertThat(machineOne.build).isSameAs(buildExternal);
+      assertThat(machineOne.machine).isSameAs(machineExternal);
+
+      LinuxOne linuxOne = flatScope.get(LinuxOne.class);
+      assertThat(linuxOne.build).isSameAs(buildExternal);
+      assertThat(linuxOne.machine).isSameAs(machineExternal);
+    }
+  }
+}

inject-test/src/test/java/org/example/custom4/Machine.java

@@ -0,0 +1,4 @@
+package org.example.custom4;
+
+public class Machine {
+}

inject-test/src/test/java/org/example/custom4/MachineOne.java

@@ -0,0 +1,13 @@
+package org.example.custom4;
+
+@MachineScope
+public class MachineOne {
+
+  final Build build;
+  final Machine machine;
+
+  MachineOne(Build build, Machine machine) {
+    this.build = build;
+    this.machine = machine;
+  }
+}

inject-test/src/test/java/org/example/custom4/MachineScope.java

@@ -0,0 +1,9 @@
+package org.example.custom4;
+
+import io.avaje.inject.InjectModule;
+import jakarta.inject.Scope;
+
+@Scope
+@InjectModule(requires = {Machine.class, IntentionallyEmptyScope.class})
+public @interface MachineScope {
+}