merge requires/provides

there is no reason to split into three separate methods

Author: SentryMan

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

@@ -85,19 +85,18 @@ static void registerModuleProvidedTypes(Set<String> providedTypes) {
       final var name = module.getClass().getTypeName();
       final var provides = new TreeSet<String>();
       Collections.addAll(provides, module.providesBeans());
-      Collections.addAll(provides, module.autoProvidesBeans());
-      for (final var provide : module.autoProvidesAspectBeans()) {
-        final var aspectType = Util.wrapAspect(provide);
+      for (final var provide : module.autoProvidesAspects()) {
+        final var aspectType = Util.wrapAspect(provide.getTypeName());
         provides.add(aspectType);
       }
       registerExternalMetaData(name);
       readMetaDataProvides(provides);
       providedTypes.addAll(provides);
       final List<String> requires = new ArrayList<>();
       Collections.addAll(requires, module.requiresBeans());
-      Collections.addAll(requires, module.autoRequiresBeans());
       Collections.addAll(requires, module.requiresPackagesFromType());
-      Arrays.stream(module.autoRequiresAspectBeans())
+      Arrays.stream(module.autoRequiresAspects())
+          .map(Class::getTypeName)
           .map(Util::wrapAspect)
           .forEach(requires::add);
 

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

@@ -25,7 +25,6 @@ final class MetaDataOrdering {
   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> autoRequiresAspects = new TreeSet<>();
 
   MetaDataOrdering(Collection<MetaData> values, ScopeInfo scopeInfo) {
     this.scopeInfo = scopeInfo;
@@ -224,11 +223,7 @@ private boolean dependencySatisfied(Dependency dependency, boolean includeExtern
 
   private boolean isExternal(String dependencyName, boolean includeExternal, MetaData queuedMeta) {
     if (includeExternal && externallyProvided(dependencyName)) {
-      if (Util.isAspectProvider(dependencyName)) {
-        autoRequiresAspects.add(Util.extractAspectType(dependencyName));
-      } else {
-        autoRequires.add(dependencyName);
-      }
+      autoRequires.add(dependencyName);
       queuedMeta.markWithExternalDependency(dependencyName);
       return true;
     }
@@ -239,10 +234,6 @@ 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

@@ -475,7 +475,7 @@ private void attributeClasses(boolean leadingComma, Append writer, String prefix
     writer.append("}");
   }
 
-  void buildProvides(Append writer) {
+  void buildProvides(Append writer, Set<String> provides, Set<String> requires) {
     if (!provides.isEmpty()) {
       buildProvidesMethod(writer, "providesBeans", provides);
     }
@@ -502,34 +502,6 @@ private void buildProvidesMethod(Append writer, String fieldName, Set<String> ty
     writer.append("  }").eol().eol();
   }
 
-  void buildAutoProvides(Append writer, Set<String> autoProvides) {
-    autoProvides.removeAll(provides);
-    if (!autoProvides.isEmpty()) {
-      buildProvidesMethod(writer, "autoProvidesBeans", autoProvides);
-    }
-  }
-
-  void buildAutoProvidesAspects(Append writer, Set<String> autoProvidesAspects) {
-    autoProvidesAspects.removeAll(provides);
-    if (!autoProvidesAspects.isEmpty()) {
-      buildProvidesMethod(writer, "autoProvidesAspectBeans", autoProvidesAspects);
-    }
-  }
-
-  void buildAutoRequires(Append writer, Set<String> autoRequires) {
-    autoRequires.removeAll(requires);
-    if (!autoRequires.isEmpty()) {
-      buildProvidesMethod(writer, "autoRequiresBeans", autoRequires);
-    }
-  }
-
-  void buildAutoRequiresAspects(Append writer, Set<String> autoRequires) {
-    autoRequires.removeAll(requires);
-    if (!autoRequires.isEmpty()) {
-      buildProvidesMethod(writer, "autoRequiresAspectBeans", autoRequires);
-    }
-  }
-
   void readModuleMetaData(TypeElement moduleType) {
     final InjectModulePrism module = InjectModulePrism.getInstanceOn(moduleType);
     final String name = module == null ? null : module.name();

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

@@ -96,9 +96,9 @@ void write() throws IOException {
     } else {
       writeRequiredModules();
     }
+    writeBuildMethod();
     writeProvides();
     writeClassesMethod();
-    writeBuildMethod();
     writeBuildMethods();
     writeEndClass();
     writer.close();
@@ -188,45 +188,28 @@ private void writeServicesFile(ScopeInfo.Type scopeType) {
   }
 
   private void writeProvides() {
-    final Set<String> autoProvidesAspects = new TreeSet<>();
-    final Set<String> autoProvides = new TreeSet<>();
+    final Set<String> scopeProvides = new TreeSet<>(scopeInfo.provides());
 
     if (scopeType == ScopeInfo.Type.CUSTOM) {
-      autoProvides.add(scopeInfo.scopeAnnotationFQN());
-      autoProvides.add(shortName);
+      scopeProvides.add(scopeInfo.scopeAnnotationFQN());
+      scopeProvides.add(shortName);
     }
-
     for (MetaData metaData : ordering.ordered()) {
       final String aspect = metaData.providesAspect();
       if (aspect != null && !aspect.isEmpty()) {
-        autoProvidesAspects.add(aspect);
+        scopeProvides.add(Util.wrapAspect(aspect));
       }
       final var forExternal = metaData.autoProvides();
       if (forExternal != null && !forExternal.isEmpty()) {
-        autoProvides.addAll(forExternal);
+        scopeProvides.addAll(forExternal);
       }
     }
-    if (!autoProvides.isEmpty()) {
-      scopeInfo.buildAutoProvides(writer, autoProvides);
-    }
-    if (!autoProvidesAspects.isEmpty()) {
-      scopeInfo.buildAutoProvidesAspects(writer, autoProvidesAspects);
-    }
-    Set<String> autoRequires = ordering.autoRequires();
-    if (!autoRequires.isEmpty()) {
-      scopeInfo.buildAutoRequires(writer, autoRequires);
-    }
-    Set<String> autoRequiresAspects = ordering.autoRequiresAspects();
-    if (!autoRequiresAspects.isEmpty()) {
-      scopeInfo.buildAutoRequiresAspects(writer, autoRequiresAspects);
-    }
+    Set<String> scopeRequires = new TreeSet<>(scopeInfo.requires());
+    scopeRequires.addAll(ordering.autoRequires());
+    scopeInfo.buildProvides(writer, scopeProvides, scopeRequires);
 
-    var requires = new ArrayList<>(scopeInfo.requires());
-    var provides = new ArrayList<>(scopeInfo.provides());
-    requires.addAll(autoRequires);
-    autoRequiresAspects.stream().map(Util::wrapAspect).forEach(requires::add);
-    provides.addAll(autoProvides);
-    autoProvidesAspects.stream().map(Util::wrapAspect).forEach(provides::add);
+    var requires = new ArrayList<>(scopeRequires);
+    var provides = new ArrayList<>(scopeProvides);
 
     ProcessingContext.addModule(new ModuleData(fullName, provides, requires));
   }
@@ -320,7 +303,6 @@ private void writeStartClass() {
     if (scopeInfo.addModuleConstructor()) {
       writeConstructor();
     }
-    scopeInfo.buildProvides(writer);
   }
 
   private void writeWithBeans() {

inject-maven-plugin/src/main/java/io/avaje/inject/mojo/AutoProvidesMojo.java

@@ -147,21 +147,15 @@ private void writeModuleCSV(ClassLoader newClassLoader, FileWriter moduleWriter)
         provides.add(type);
       }
 
-      for (final var provide : module.autoProvidesBeans()) {
-        var type = provide;
-        provides.add(type);
-      }
-
-      for (final var provide : module.autoProvidesAspectBeans()) {
-        var type = wrapAspect(provide);
+      for (final var provide : module.autoProvidesAspects()) {
+        var type = wrapAspect(provide.getTypeName());
         provides.add(type);
       }
 
       final var requires = Arrays.stream(module.requiresBeans()).collect(toList());
-
-      Collections.addAll(requires, module.autoRequiresBeans());
       Collections.addAll(requires, module.requiresPackagesFromType());
-      Arrays.stream(module.autoRequiresAspectBeans())
+      Arrays.stream(module.autoRequiresAspects())
+          .map(Class::getTypeName)
           .map(AutoProvidesMojo::wrapAspect)
           .forEach(requires::add);
       modules.add(new ModuleData(name.getTypeName(), provides, requires));

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

@@ -327,8 +327,7 @@ public void add(AvajeModule module) {
         .add(factoryState);
 
       addFactoryProvides(factoryState, module.providesBeans());
-      addFactoryProvides(factoryState, module.autoProvidesBeans());
-      addFactoryProvides(factoryState, module.autoProvidesAspectBeans());
+      addAspectProvides(factoryState, module.autoProvidesAspects());
 
       if (factoryState.isRequiresEmpty()) {
         if (factoryState.explicitlyProvides()) {
@@ -344,6 +343,16 @@ public void add(AvajeModule module) {
       }
     }
 
+    private void addAspectProvides(FactoryState factoryState, Class<?>[] aspects) {
+      for (final var feature : aspects) {
+        providesMap
+            .computeIfAbsent(
+                "io.avaje.inject.aop.AspectProvider<" + feature.getTypeName() + ">",
+                s -> new FactoryList())
+            .add(factoryState);
+      }
+    }
+
     private void addFactoryProvides(FactoryState factoryState, String[] provides) {
       for (final var feature : provides) {
         providesMap.computeIfAbsent(feature, s -> new FactoryList()).add(factoryState);
@@ -392,7 +401,6 @@ private void processQueue() {
           sb.append("Module [").append(factory).append("] has unsatisfied");
           unsatisfiedRequires(sb, factory.requires(), "requires");
           unsatisfiedRequires(sb, factory.requiresPackages(), "requiresPackages");
-          unsatisfiedRequires(sb, factory.autoRequires(), "autoRequires");
         }
         sb.append(" - none of the loaded modules ").append(moduleNames).append(" have this in their @InjectModule( provides = ... ). ");
         if (parent != null) {
@@ -442,9 +450,7 @@ private int processQueuedFactories() {
     /** Return true if the (module) requires dependencies are satisfied for this factory. */
     private boolean satisfiedDependencies(FactoryState factory) {
       return satisfiedDependencies(factory.requires())
-        && satisfiedDependencies(factory.requiresPackages())
-        && satisfiedDependencies(factory.autoRequiresAspects())
-        && satisfiedDependencies(factory.autoRequires());
+          && satisfiedDependencies(factory.requiresPackages());
     }
 
     private boolean satisfiedDependencies(String[] requires) {
@@ -493,24 +499,13 @@ String[] requiresPackages() {
       return factory.requiresPackagesFromType();
     }
 
-    String[] autoRequires() {
-      return factory.autoRequiresBeans();
-    }
-
-    String[] autoRequiresAspects() {
-      return factory.autoRequiresAspectBeans();
-    }
-
     @Override
     public String toString() {
       return factory.getClass().getTypeName();
     }
 
     boolean isRequiresEmpty() {
-      return isEmpty(factory.requiresBeans())
-          && isEmpty(factory.requiresPackagesFromType())
-          && isEmpty(factory.autoRequiresBeans())
-          && isEmpty(factory.autoRequiresAspectBeans());
+      return isEmpty(factory.requiresBeans()) && isEmpty(factory.requiresPackagesFromType());
     }
 
     boolean explicitlyProvides() {

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

@@ -3,6 +3,7 @@
 import java.lang.reflect.Type;
 import java.util.Arrays;
 import java.util.Objects;
+import java.util.stream.Stream;
 
 /** A Module containing dependencies that will be included in BeanScope. */
 public interface AvajeModule extends InjectExtension {
@@ -37,7 +38,9 @@ default Type[] provides() {
 
   /** Return the type names of types this module explicitly provides to other modules. */
   default String[] providesBeans() {
-    return Arrays.stream(Objects.requireNonNullElse(provides(), EMPTY_CLASSES))
+    return Stream.concat(
+            Arrays.stream(Objects.requireNonNullElse(provides(), EMPTY_CLASSES)),
+            Arrays.stream(Objects.requireNonNullElse(autoProvides(), EMPTY_CLASSES)))
         .map(Type::getTypeName)
         .toArray(String[]::new);
   }
@@ -57,7 +60,9 @@ default Type[] requires() {
    * modules.
    */
   default String[] requiresBeans() {
-    return Arrays.stream(Objects.requireNonNullElse(requires(), EMPTY_CLASSES))
+    return Stream.concat(
+            Arrays.stream(Objects.requireNonNullElse(requires(), EMPTY_CLASSES)),
+            Arrays.stream(Objects.requireNonNullElse(autoRequires(), EMPTY_CLASSES)))
         .map(Type::getTypeName)
         .toArray(String[]::new);
   }
@@ -85,23 +90,13 @@ default String[] requiresPackagesFromType() {
    * <p>This is a convenience when using multiple modules that is otherwise controlled manually by
    * explicitly using {@link AvajeModule#provides()}.
    *
-   * @deprecated use {@link #autoProvidesBeans()}
+   * @deprecated use {@link #providesBeans()}
    */
   @Deprecated(forRemoval = true)
   default Type[] autoProvides() {
     return EMPTY_CLASSES;
   }
 
-  /**
-   * Return the type names of classes that this module provides that we allow other modules to auto
-   * depend on.
-   */
-  default String[] autoProvidesBeans() {
-    return Arrays.stream(Objects.requireNonNullElse(autoProvides(), EMPTY_CLASSES))
-        .map(Type::getTypeName)
-        .toArray(String[]::new);
-  }
-
   /**
    * Return the aspects that this module provides.
    *
@@ -113,13 +108,6 @@ default Class<?>[] autoProvidesAspects() {
     return EMPTY_CLASSES;
   }
 
-  /** Return the type names of aspects that this module provides. */
-  default String[] autoProvidesAspectBeans() {
-    return Arrays.stream(Objects.requireNonNullElse(autoProvidesAspects(), EMPTY_CLASSES))
-        .map(Class::getTypeName)
-        .toArray(String[]::new);
-  }
-
   /**
    * These are the classes that this module requires for wiring that are provided by other external
    * modules (that are in the classpath at compile time).
@@ -132,16 +120,6 @@ default Type[] autoRequires() {
     return EMPTY_CLASSES;
   }
 
-  /**
-   * Return the type names of classes that this module requires for wiring that are provided by
-   * other external modules.
-   */
-  default String[] autoRequiresBeans() {
-    return Arrays.stream(Objects.requireNonNullElse(autoRequires(), EMPTY_CLASSES))
-        .map(Type::getTypeName)
-        .toArray(String[]::new);
-  }
-
   /**
    * These are the aspects that this module requires whose implementations are provided by other
    * external modules (that are in the classpath at compile time).
@@ -151,16 +129,6 @@ default Class<?>[] autoRequiresAspects() {
     return EMPTY_CLASSES;
   }
 
-  /**
-   * Return the type names of aspects that this module requires whose implementations are provided
-   * by other external modules.
-   */
-  default String[] autoRequiresAspectBeans() {
-    return Arrays.stream(Objects.requireNonNullElse(autoRequiresAspects(), EMPTY_CLASSES))
-        .map(Class::getTypeName)
-        .toArray(String[]::new);
-  }
-
   /** Marker for custom scoped modules. */
   interface Custom extends AvajeModule {}
 }