#13 - Support priority of @primary and @secondary across modules

Author: rbygrave

src/main/java/io/dinject/BootContext.java

@@ -55,6 +55,8 @@ public class BootContext {
 
   private final Set<String> includeModules = new LinkedHashSet<>();
 
+  private boolean ignoreMissingModuleDependencies;
+
   /**
    * Create a BootContext to ultimately load and return a new BeanContext.
    *
@@ -115,6 +117,7 @@ public BootContext withNoShutdownHook() {
    *     try (BeanContext context = new BootContext()
    *       .withBeans(mockEmailService)
    *       .withModules("coffee")
+   *       .withIgnoreMissingModuleDependencies()
    *       .load()) {
    *
    *       // built with test doubles injected ...
@@ -127,7 +130,6 @@ public BootContext withNoShutdownHook() {
    *
    * }</pre>
    *
-   *
    * @param modules The names of modules that we want to include in dependency injection.
    * @return This BootContext
    */
@@ -136,6 +138,15 @@ public BootContext withModules(String... modules) {
     return this;
   }
 
+  /**
+   * Set this when building a BeanContext (typically for testing) and supplied beans replace module dependencies.
+   * This means we don't need the usual module dependencies as supplied beans are used instead.
+   */
+  public BootContext withIgnoreMissingModuleDependencies() {
+    this.ignoreMissingModuleDependencies = true;
+    return this;
+  }
+
   /**
    * Supply a bean to the context that will be used instead of any similar bean in the context.
    * <p>
@@ -180,7 +191,7 @@ public BootContext withBeans(Object... beans) {
   public BeanContext load() {
 
     // sort factories by dependsOn
-    FactoryOrder factoryOrder = new FactoryOrder(includeModules, !suppliedBeans.isEmpty());
+    FactoryOrder factoryOrder = new FactoryOrder(includeModules, !suppliedBeans.isEmpty(), ignoreMissingModuleDependencies);
     ServiceLoader.load(BeanContextFactory.class).forEach(factoryOrder::add);
 
     Set<String> moduleNames = factoryOrder.orderFactories();
@@ -308,16 +319,18 @@ static class FactoryOrder {
 
     private final Set<String> includeModules;
     private final boolean suppliedBeans;
+    private final boolean ignoreMissingModuleDependencies;
 
     private final Set<String> moduleNames = new LinkedHashSet<>();
     private final List<BeanContextFactory> factories = new ArrayList<>();
     private final List<FactoryState> queue = new ArrayList<>();
 
-    private final Map<String,FactoryList> providesMap = new HashMap<>();
+    private final Map<String, FactoryList> providesMap = new HashMap<>();
 
-    FactoryOrder(Set<String> includeModules, boolean suppliedBeans) {
+    FactoryOrder(Set<String> includeModules, boolean suppliedBeans, boolean ignoreMissingModuleDependencies) {
       this.includeModules = includeModules;
       this.suppliedBeans = suppliedBeans;
+      this.ignoreMissingModuleDependencies = ignoreMissingModuleDependencies;
     }
 
     void add(BeanContextFactory factory) {
@@ -384,25 +397,26 @@ private void processQueue() {
         count = processQueuedFactories();
       } while (count > 0);
 
-      if (suppliedBeans) {
+      if (suppliedBeans || ignoreMissingModuleDependencies) {
         // just push everything left assuming supplied beans
         // will satisfy the required dependencies
         for (FactoryState factoryState : queue) {
           push(factoryState);
         }
 
-      } else  if (!queue.isEmpty()) {
+      } else if (!queue.isEmpty()) {
         StringBuilder sb = new StringBuilder();
         for (FactoryState factory : queue) {
-          sb.append("module ").append(factory.getName()).append(" has unsatisfied dependencies - ");
+          sb.append("Module [").append(factory.getName()).append("] has unsatisfied dependencies on modules:");
           for (String depModuleName : factory.getDependsOn()) {
-            boolean ok = moduleNames.contains(depModuleName);
-            String result = (ok) ? "ok" : "UNSATISFIED";
-            sb.append(String.format("depends on %s - %s", depModuleName, result));
+            if (!moduleNames.contains(depModuleName)) {
+              sb.append(String.format(" [%s]", depModuleName));
+            }
           }
         }
 
-        sb.append("- Modules loaded ok ").append(moduleNames);
+        sb.append(". Modules that were loaded ok are:").append(moduleNames);
+        sb.append(". Consider using BootContext.withIgnoreMissingModuleDependencies() or BootContext.withSuppliedBeans(...)");
         throw new IllegalStateException(sb.toString());
       }
     }

src/test/java/io/dinject/BootContextTest.java

@@ -15,7 +15,7 @@ public class BootContextTest {
   @Test
   public void noDepends() {
 
-    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true);
+    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true, true);
     factoryOrder.add(bc("1", null, null));
     factoryOrder.add(bc("2", null, null));
     factoryOrder.add(bc("3", null, null));
@@ -27,7 +27,7 @@ public void noDepends() {
   @Test
   public void name_depends() {
 
-    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true);
+    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true, true);
     factoryOrder.add(bc("two", null, "one"));
     factoryOrder.add(bc("one", null, null));
     factoryOrder.orderFactories();
@@ -38,7 +38,7 @@ public void name_depends() {
   @Test
   public void name_depends4() {
 
-    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true);
+    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true, true);
     factoryOrder.add(bc("1", null, "3"));
     factoryOrder.add(bc("2", null, "4"));
     factoryOrder.add(bc("3", null, "4"));
@@ -52,7 +52,7 @@ public void name_depends4() {
   @Test
   public void nameFeature_depends() {
 
-    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true);
+    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true, true);
     factoryOrder.add(bc("1", "a", "3"));
     factoryOrder.add(bc("2", null, "4,a"));
     factoryOrder.add(bc("3", null, "4"));
@@ -66,7 +66,7 @@ public void nameFeature_depends() {
   @Test
   public void feature_depends() {
 
-    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true);
+    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true, true);
     factoryOrder.add(bc("two", null, "myfeature"));
     factoryOrder.add(bc("one", "myfeature", null));
     factoryOrder.orderFactories();
@@ -77,7 +77,7 @@ public void feature_depends() {
   @Test
   public void feature_depends2() {
 
-    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true);
+    BootContext.FactoryOrder factoryOrder = new BootContext.FactoryOrder(Collections.emptySet(), true, true);
     factoryOrder.add(bc("two", null, "myfeature"));
     factoryOrder.add(bc("one", "myfeature", null));
     factoryOrder.add(bc("three", "myfeature", null));