Merge pull request #385 from avaje/feature/fix-external-optional

Fix for partial compile failing for external optional Dependency

Author: rbygrave

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

@@ -3,7 +3,7 @@
 final class Dependency {
 
   private final String name;
-  private final boolean softDependency;
+  private boolean softDependency;
   private final boolean conditionalDependency;
 
   Dependency(String name) {
@@ -58,4 +58,9 @@ public boolean isConditionalDependency() {
   String dependsOn() {
     return toString();
   }
+
+  /** External dependency */
+  void markExternal() {
+    softDependency = true;
+  }
 }

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

@@ -2,9 +2,7 @@
 
 import static io.avaje.inject.generator.ProcessingContext.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -39,7 +37,7 @@ final class MetaData {
 
   private boolean generateProxy;
   private boolean usesExternalDependency;
-  private String externalDependency;
+  private Set<String> externalDependencies = new HashSet<>();
   private boolean importedComponent;
 
   MetaData(DependencyMetaPrism meta) {
@@ -178,7 +176,7 @@ void buildMethod(Append append) {
       return;
     }
     if (usesExternalDependency) {
-      append.append("  // uses external dependency ").append(externalDependency).append(NEWLINE);
+      append.append("  // uses external dependency " + externalDependencies + NEWLINE);
     }
 
     final var hasName = name != null;
@@ -280,6 +278,11 @@ void setProvidesAspect(String providesAspect) {
    */
   void markWithExternalDependency(String name) {
     usesExternalDependency = true;
-    externalDependency = name;
+    externalDependencies.add(name);
+    for (Dependency dependency : dependsOn) {
+      if (name.equals(dependency.name())) {
+        dependency.markExternal();
+      }
+    }
   }
 }