order custom modules

Author: SentryMan

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

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

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

@@ -4,6 +4,7 @@
 import jakarta.inject.Scope;
 
 @Scope
-@InjectModule(requires = {ModDScope.class, CrossCutScope.class, ModEScope.class}, strictWiring = true)
-public @interface ManyScope {
-}
+@InjectModule(
+    requires = {ModDScope.class, CrossCutScope.class, ModEScope.class},
+    provides = ManyScope.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(provides = ModAScope.class)
+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, provides = ModBScope.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(provides = ModCScope.class)
+public @interface ModCScope {}

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

@@ -4,7 +4,7 @@
 import jakarta.inject.Scope;
 
 @Scope
-@InjectModule(requires = {ModAScope.class}, strictWiring = true)
-public @interface ModDScope {
-
-}
+@InjectModule(
+    requires = {ModAScope.class},
+    provides = ModDScope.class)
+public @interface ModDScope {}

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

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

inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java

@@ -251,12 +251,15 @@ public BeanScope build() {
 
     // sort factories by dependsOn
     ModuleOrdering factoryOrder = new FactoryOrder(parent, includeModules, !suppliedBeans.isEmpty());
-    var modules = serviceLoader.modules();
-    if (factoryOrder.isEmpty()) {
+
+    if (includeModules.isEmpty()) {
+      var modules = serviceLoader.modules();
       // prefer generated ModuleOrdering if provided
-      factoryOrder = serviceLoader.moduleOrdering()
-        .filter(o -> o.supportsExpected(modules))
-        .orElse(factoryOrder);
+      factoryOrder =
+          serviceLoader
+              .moduleOrdering()
+              .filter(o -> o.supportsExpected(modules))
+              .orElse(factoryOrder);
       modules.forEach(factoryOrder::add);
     }
 
@@ -313,10 +316,9 @@ static class FactoryOrder implements ModuleOrdering {
 
     FactoryOrder(BeanScope parent, Set<AvajeModule> includeModules, boolean suppliedBeans) {
       this.parent = parent;
-      this.factories.addAll(includeModules);
       this.suppliedBeans = suppliedBeans;
       for (final AvajeModule includeModule : includeModules) {
-        moduleNames.add(includeModule.getClass().getName());
+        add(includeModule);
       }
     }
 
@@ -417,7 +419,7 @@ private boolean notProvided(String dependency) {
         return false;
       }
       final var factoryList = providesMap.get(dependency);
-      return (factoryList == null || !factoryList.allPushed());
+      return factoryList == null || !factoryList.allPushed();
     }
 
     /**