Multi-Scope Wiring

blackbox-multi-scope/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.avaje</groupId>
@@ -31,7 +31,11 @@
       <version>1.5</version>
       <scope>test</scope>
     </dependency>
-
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>blackbox-other</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

blackbox-multi-scope/src/main/java/org/multi/crosscut/BeanCross.java

@@ -5,8 +5,6 @@
 import org.multi.scope.CrossCutScope;
 
 @CrossCutScope
-public class BeanCross{
-  public BeanCross(final BeanInModA beanInModA, final BeanInModB beanInModB) {
-
-  }
+public class BeanCross {
+  public BeanCross(final BeanInModA beanInModA, final BeanInModB beanInModB) {}
 }

blackbox-multi-scope/src/main/java/org/multi/crosscut/BeanCross2.java

@@ -1,13 +1,10 @@
 package org.multi.crosscut;
 
 import org.multi.moda.BeanInModA;
-import org.multi.modb.BeanInModB;
-import org.multi.modc.modb.BeanInModC;
+import org.multi.modc.BeanInModC;
 import org.multi.scope.CrossCutScope;
 
 @CrossCutScope
 public class BeanCross2 {
-  public BeanCross2(final BeanInModA beanInModA, final BeanInModC beanInModC) {
-
-  }
+  public BeanCross2(final BeanInModA beanInModA, final BeanInModC beanInModC) {}
 }

blackbox-multi-scope/src/main/java/org/multi/crosscut/BeanCross3.java

@@ -1,11 +1,9 @@
 package org.multi.crosscut;
 
-import org.multi.modc.modb.COther;
+import org.multi.modc.COther;
 import org.multi.scope.CrossCutScope;
 
 @CrossCutScope
 public class BeanCross3 {
-  public BeanCross3(final COther other) {
-
-  }
+  public BeanCross3(final COther other) {}
 }

blackbox-multi-scope/src/main/java/org/multi/main/CrossCutMain.java

@@ -1,15 +1,13 @@
 package org.multi.main;
 
-import io.avaje.inject.BeanScope;
 import org.multi.crosscut.BeanCross;
 import org.multi.crosscut.BeanCross2;
 import org.multi.crosscut.BeanCross3;
 import org.multi.crosscut.CrossCutModule;
 import org.multi.moda.BeanInModA;
-import org.multi.moda.ModAModule;
 import org.multi.modb.BeanInModB;
-import org.multi.modb.ModBModule;
-import org.multi.modc.modb.ModCModule;
+
+import io.avaje.inject.BeanScope;
 
 public class CrossCutMain {
 
@@ -24,8 +22,6 @@ public static void main(String[] args) {
   }
 
   public static BeanScope buildScope() {
-    return BeanScope.builder()
-      .modules(new ModAModule(), new ModCModule(), new ModBModule(),  new CrossCutModule())
-      .build();
+    return BeanScope.builder().modules(CrossCutModule.allRequiredModules()).build();
   }
 }

blackbox-multi-scope/src/main/java/org/multi/many/BeanInMany.java

@@ -0,0 +1,19 @@
+package org.multi.many;
+
+import org.multi.moda.BeanInModA;
+import org.multi.modc.COther;
+import org.multi.mode.BeanInModE;
+import org.multi.scope.ManyScope;
+import org.other.one.custom.OtherCustomComponent;
+
+import io.avaje.inject.External;
+
+@ManyScope
+public class BeanInMany {
+
+  public BeanInMany(
+      BeanInModE beanInModE,
+      COther cOther,
+      BeanInModA modA,
+      @External OtherCustomComponent external) {}
+}

blackbox-multi-scope/src/main/java/org/multi/moda/BeanInModA.java

@@ -3,5 +3,4 @@
 import org.multi.scope.ModAScope;
 
 @ModAScope
-public class BeanInModA {
-}
+public class BeanInModA {}

blackbox-multi-scope/src/main/java/org/multi/modb/BOther.java

@@ -1,6 +1,6 @@
 package org.multi.modb;
 
-import org.multi.modc.modb.COther;
+import org.multi.modc.COther;
 import org.multi.scope.ModBScope;
 
 @ModBScope

blackbox-multi-scope/src/main/java/org/multi/modb/BeanInModB.java

@@ -3,5 +3,4 @@
 import org.multi.scope.ModBScope;
 
 @ModBScope
-public class BeanInModB {
-}
+public class BeanInModB {}

blackbox-multi-scope/src/main/java/org/multi/modc/BeanInModC.java

@@ -0,0 +1,6 @@
+package org.multi.modc;
+
+import org.multi.scope.ModCScope;
+
+@ModCScope
+public class BeanInModC {}

blackbox-multi-scope/src/main/java/org/multi/modc/COther.java

@@ -0,0 +1,6 @@
+package org.multi.modc;
+
+import org.multi.scope.ModCScope;
+
+@ModCScope
+public class COther {}

blackbox-multi-scope/src/main/java/org/multi/modd/BeanInModD.java

@@ -0,0 +1,14 @@
+package org.multi.modd;
+
+import org.multi.moda.BeanInModA;
+import org.multi.scope.ModDScope;
+
+@ModDScope
+public class BeanInModD {
+
+  private final BeanInModA beanA;
+
+  public BeanInModD(final BeanInModA beanInModA) {
+    this.beanA = beanInModA;
+  }
+}

blackbox-multi-scope/src/main/java/org/multi/mode/BeanInModE.java

@@ -0,0 +1,6 @@
+package org.multi.mode;
+
+import org.multi.scope.ModEScope;
+
+@ModEScope
+public class BeanInModE {}

blackbox-multi-scope/src/main/java/org/multi/scope/CrossCutScope.java

@@ -2,9 +2,7 @@
 
 import io.avaje.inject.InjectModule;
 import jakarta.inject.Scope;
-import org.multi.modb.BeanInModB;
 
 @Scope
-@InjectModule(requires = {ModAScope.class, ModBScope.class}, strictWiring = true)
-public @interface CrossCutScope {
-}
+@InjectModule(requires = {ModAScope.class, ModBScope.class})
+public @interface CrossCutScope {}

blackbox-multi-scope/src/main/java/org/multi/scope/ManyScope.java

@@ -0,0 +1,11 @@
+package org.multi.scope;
+
+import org.other.one.custom.ExternalScope;
+
+import io.avaje.inject.InjectModule;
+import jakarta.inject.Scope;
+
+@Scope
+@InjectModule(
+    requires = {ExternalScope.class, ModDScope.class, CrossCutScope.class, ModEScope.class})
+public @interface ManyScope {}

blackbox-multi-scope/src/main/java/org/multi/scope/ModAScope.java

@@ -4,6 +4,5 @@
 import jakarta.inject.Scope;
 
 @Scope
-@InjectModule(strictWiring = true)
-public @interface ModAScope {
-}
+@InjectModule
+public @interface ModAScope {}

blackbox-multi-scope/src/main/java/org/multi/scope/ModBScope.java

@@ -4,6 +4,5 @@
 import jakarta.inject.Scope;
 
 @Scope
-@InjectModule(requires = ModCScope.class, strictWiring = true)
-public @interface ModBScope {
-}
+@InjectModule(requires = ModCScope.class)
+public @interface ModBScope {}

blackbox-multi-scope/src/main/java/org/multi/scope/ModCScope.java

@@ -4,6 +4,5 @@
 import jakarta.inject.Scope;
 
 @Scope
-@InjectModule(strictWiring = true)
-public @interface ModCScope {
-}
+@InjectModule
+public @interface ModCScope {}

blackbox-multi-scope/src/main/java/org/multi/scope/ModDScope.java

@@ -0,0 +1,8 @@
+package org.multi.scope;
+
+import io.avaje.inject.InjectModule;
+import jakarta.inject.Scope;
+
+@Scope
+@InjectModule(requires = {ModAScope.class})
+public @interface ModDScope {}

blackbox-multi-scope/src/main/java/org/multi/scope/ModEScope.java

@@ -0,0 +1,8 @@
+package org.multi.scope;
+
+import io.avaje.inject.InjectModule;
+import jakarta.inject.Scope;
+
+@Scope
+@InjectModule
+public @interface ModEScope {}

blackbox-multi-scope/src/test/java/org/multi/crosscut/BeanCrossTest.java

@@ -1,24 +1,64 @@
 package org.multi.crosscut;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import io.avaje.inject.BeanScope;
 import org.junit.jupiter.api.Test;
+import org.multi.many.BeanInMany;
+import org.multi.many.ManyModule;
+import org.multi.moda.BeanInModA;
+import org.multi.moda.ModAModule;
+import org.multi.modb.BOther;
 import org.multi.modb.BeanInModB;
+import org.multi.modb.ModBModule;
+import org.multi.modc.BeanInModC;
+import org.multi.modc.COther;
+import org.multi.modc.ModCModule;
+import org.multi.modd.BeanInModD;
+import org.multi.modd.ModDModule;
+import org.multi.mode.BeanInModE;
+import org.multi.mode.ModEModule;
+import org.other.one.custom.ExternalModule;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import io.avaje.inject.BeanScope;
 
 class BeanCrossTest {
 
-  @Test
-  void bootstrap() {
+  private static final Class<?>[] CHECKABLE = {
+    BeanCross.class,
+    BeanCross2.class,
+    BeanCross3.class,
+    BeanInMany.class,
+    BeanInModA.class,
+    BeanInModB.class,
+    BOther.class,
+    BeanInModC.class,
+    COther.class,
+    BeanInModD.class,
+    BeanInModE.class
+  };
 
-    try (BeanScope beanScope = BeanScope.builder()
-//      .modules(new CrossCutModule())
-      .build()) {
+  @Test
+  void testCustomOrdering() {
 
-//      var beanInModB = beanScope.get(BeanInModB.class);
-//      assertThat(beanInModB).isNotNull();
+    try (BeanScope beanScope =
+        assertDoesNotThrow(
+            () ->
+                BeanScope.builder()
+                    .modules(
+                        new ModEModule(),
+                        new ModBModule(),
+                        new ModDModule(),
+                        new ManyModule(),
+                        new ModCModule(),
+                        new ModAModule(),
+                        new CrossCutModule(),
+                        new ExternalModule())
+                    .build())) {
+      for (final Class<?> clazz : CHECKABLE) {
+        assertTrue(
+            beanScope.getOptional(clazz).isPresent(), "Bean not found: " + clazz.getSimpleName());
+      }
     }
-
   }
 }

blackbox-other/src/main/java/org/other/one/custom/ExternalScope.java

@@ -0,0 +1,8 @@
+package org.other.one.custom;
+
+import io.avaje.inject.InjectModule;
+import jakarta.inject.Scope;
+
+@Scope
+@InjectModule
+public @interface ExternalScope {}

blackbox-other/src/main/java/org/other/one/custom/OtherCustomComponent.java

@@ -0,0 +1,4 @@
+package org.other.one.custom;
+
+@ExternalScope
+public class OtherCustomComponent {}

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

@@ -71,7 +71,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
     ProcessingContext.registerProvidedTypes(moduleFileProvided);
     moduleData.forEach(ProcessingContext::addModule);
     this.elementUtils = processingEnv.getElementUtils();
-    this.allScopes = new AllScopes();
+    this.allScopes = ProcessingContext.allScopes();
     this.defaultScope = allScopes.defaultScope();
     ExternalProvider.registerPluginProvidedTypes(defaultScope);
     pluginFileProvided.forEach(defaultScope::pluginProvided);