Merge branch 'SentryMan-aspectRequires' into feature/aspect-requires

Author: rbygrave

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

@@ -21,9 +21,12 @@ void init() {
       for (final Class<?> provide : module.provides()) {
         providedTypes.add(provide.getCanonicalName());
       }
-      for (Class<?> provide : module.autoProvides()) {
+      for (final Class<?> provide : module.autoProvides()) {
         providedTypes.add(provide.getCanonicalName());
       }
+      for (final Class<?> provide : module.autoProvidesAspects()) {
+        providedTypes.add(Constants.ASPECT_PROVIDER + "<" + provide.getCanonicalName() + ">");
+      }
     }
   }
 

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

@@ -17,7 +17,9 @@ final class MetaDataOrdering {
   private final Map<String, ProviderList> providers = new HashMap<>();
   private final List<DependencyLink> circularDependencies = new ArrayList<>();
   private final Set<String> missingDependencyTypes = new LinkedHashSet<>();
-  private final Set<String> autoRequires = new TreeSet<>();
+  private final Set<String> autoRequires = new TreeSet<>();  
+  private final Set<String> autoRequiresAspects = new TreeSet<>();
+  
 
   MetaDataOrdering(Collection<MetaData> values, ProcessingContext context, ScopeInfo scopeInfo) {
     this.context = context;
@@ -190,17 +192,19 @@ private boolean allDependenciesWired(MetaData queuedMeta, boolean includeExterna
         if (providerList == null) {
           if (!scopeInfo.providedByOther(dependency)) {
             if (includeExternal && context.externallyProvided(dependency.name())) {
-              autoRequires.add(dependency.name());
+              if (Util.isAspectProvider(dependency.name())) {
+                autoRequiresAspects.add(Util.extractAspectType(dependency.name()));
+              } else {
+                autoRequires.add(dependency.name());
+              }
               queuedMeta.markWithExternalDependency();
             } else {
               return false;
             }
           }
-        } else {
-          if (!providerList.isAllWired()) {
-            return false;
-          }
-        }
+        } else if (!providerList.isAllWired()) {
+        return false;
+      }
       }
     }
     return true;
@@ -210,6 +214,10 @@ Set<String> autoRequires() {
     return autoRequires;
   }
 
+  Set<String> autoRequiresAspects() {
+    return autoRequiresAspects;
+  }
+
   List<MetaData> ordered() {
     return orderedList;
   }

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

@@ -414,6 +414,13 @@ void buildAutoRequires(Append writer, Set<String> autoRequires) {
     }
   }
 
+  void buildAutoRequiresAspects(Append writer, Set<String> autoRequires) {
+    autoRequires.removeAll(requires);
+    if (!autoRequires.isEmpty()) {
+      buildProvidesMethod(writer, "autoRequiresAspects", autoRequires);
+    }
+  }
+
   void readModuleMetaData(TypeElement moduleType) {
     InjectModule module = moduleType.getAnnotation(InjectModule.class);
     details(module.name(), moduleType);

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

@@ -114,6 +114,11 @@ private void writeProvides() {
     if (!autoRequires.isEmpty()) {
       scopeInfo.buildAutoRequires(writer, autoRequires);
     }
+
+    Set<String> autoRequiresAspects = ordering.autoRequiresAspects();
+    if (!autoRequires.isEmpty()) {
+      scopeInfo.buildAutoRequiresAspects(writer, autoRequiresAspects);
+    }
   }
 
   private void writeClassesMethod() {

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

@@ -338,13 +338,27 @@ private int processQueuedFactories() {
      */
     private boolean satisfiedDependencies(FactoryState factory) {
       return satisfiedDependencies(factory.requires())
-        && satisfiedDependencies(factory.requiresPackages())
-        && satisfiedDependencies(factory.autoRequires());
+          && satisfiedDependencies(factory.requiresPackages())
+          && satisfiedAspectDependencies(factory.autoRequiresAspects())
+          && satisfiedDependencies(factory.autoRequires());
     }
 
     private boolean satisfiedDependencies(Class<?>[] requires) {
-      for (Class<?> dependency : requires) {
-        if (notProvided(dependency.getTypeName())) {
+      for (final Class<?> dependency : requires) {
+          if (notProvided(dependency.getTypeName())) {
+              return false;
+            }
+      }
+      return true;
+    }
+
+    private boolean satisfiedAspectDependencies(Class<?>[] requiresAspects) {
+      for (final Class<?> dependency : requiresAspects) {
+
+        if (notProvided(
+            "interface io.avaje.inject.aop.AspectProvider<"
+                + dependency.getCanonicalName()
+                + ">")) {
           return false;
         }
       }
@@ -395,6 +409,10 @@ Class<?>[] autoRequires() {
       return factory.autoRequires();
     }
 
+    Class<?>[] autoRequiresAspects() {
+      return factory.autoRequiresAspects();
+    }
+
     @Override
     public String toString() {
       return factory.getClass().getTypeName();

inject/src/main/java/io/avaje/inject/spi/Module.java

@@ -10,7 +10,7 @@ public interface Module {
   /**
    * Empty array of classes.
    */
-  Class<?>[] EMPTY_CLASSES = new Class<?>[]{};
+  Class<?>[] EMPTY_CLASSES = {};
 
   /**
    * Return the set of types this module explicitly provides to other modules.
@@ -63,6 +63,14 @@ default Class<?>[] autoProvidesAspects() {
   default Class<?>[] autoRequires() {
     return EMPTY_CLASSES;
   }
+  /**
+   * These are the apects that this module requires whose implementations are provided by other external
+   * modules (that are in the classpath at compile time).
+   *
+   */
+  default Class<?>[] autoRequiresAspects() {
+    return EMPTY_CLASSES;
+  }
 
   /**
    * Return public classes of the beans that would be registered by this module.