plugin aspects

Author: SentryMan

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

@@ -1,6 +1,5 @@
 package io.avaje.inject.generator;
 
-import java.util.Iterator;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.Set;
@@ -64,6 +63,9 @@ static void registerPluginProvidedTypes(ScopeInfo defaultScope) {
       for (final Class<?> provide : plugin.provides()) {
         defaultScope.pluginProvided(provide.getCanonicalName());
       }
+      for (final Class<?> provide : plugin.providesAspects()) {
+        defaultScope.pluginProvided(Util.wrapAspect(provide.getCanonicalName()));
+      }
     }
   }
 }

inject-gradle-plugin/build.gradle

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-  implementation 'io.avaje:avaje-inject:9.0'
+  implementation 'io.avaje:avaje-inject:9.4-SNAPSHOT'
   implementation gradleApi()
 
   testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'

inject-gradle-plugin/src/main/java/io/avaje/inject/plugin/AvajeInjectPlugin.java

@@ -2,6 +2,8 @@
 
 import org.gradle.api.*;
 
+import io.avaje.inject.spi.Plugin;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -54,13 +56,22 @@ private FileWriter createFileWriter(String dir, String file) throws IOException
   }
 
   private void writeProvidedPlugins(ClassLoader cl, FileWriter pluginWriter) throws IOException {
-    for (final io.avaje.inject.spi.Plugin plugin : ServiceLoader.load(io.avaje.inject.spi.Plugin.class, cl)) {
-      for (final Class<?> providedType : plugin.provides()) {
-        pluginWriter.write(providedType.getCanonicalName());
-        pluginWriter.write("\n");
-      }
-    }
-  }
+	    final Set<String> providedTypes = new HashSet<>();
+
+	    for (final var plugin : ServiceLoader.load(Plugin.class, newClassLoader)) {
+	      for (final Class<?> provide : plugin.provides()) {
+	        providedTypes.add(provide.getCanonicalName());
+	      }
+	      for (final Class<?> provide : plugin.providesAspects()) {
+	        providedTypes.add(wrapAspect(provide.getCanonicalName()));
+	      }
+	    }
+
+	    for (final var providedType : providedTypes) {
+	    	pluginWriter.write(providedType);
+	    	pluginWriter.write("\n");
+	    }
+	  }
 
   private void writeProvidedModules(ClassLoader classLoader, FileWriter moduleWriter) throws IOException {
     final Set<String> providedTypes = new HashSet<>();

inject-maven-plugin/pom.xml

@@ -29,7 +29,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
-      <version>8.12-RC4</version>
+      <version>9.4-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

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

@@ -84,19 +84,28 @@ private FileWriter createFileWriter(String string) throws IOException {
 
   private void writeProvidedPlugins(URLClassLoader newClassLoader, FileWriter pluginWriter)
       throws IOException {
-    for (final var plugin : ServiceLoader.load(Plugin.class, newClassLoader)) {
-      for (final Class<?> providedType : plugin.provides()) {
-        pluginWriter.write(providedType.getCanonicalName());
-        pluginWriter.write("\n");
-      }
-    }
-  }
+	    final Set<String> providedTypes = new HashSet<>();
+
+	    for (final var plugin : ServiceLoader.load(Plugin.class, newClassLoader)) {
+	      for (final Class<?> provide : plugin.provides()) {
+	        providedTypes.add(provide.getCanonicalName());
+	      }
+	      for (final Class<?> provide : plugin.providesAspects()) {
+	        providedTypes.add(wrapAspect(provide.getCanonicalName()));
+	      }
+	    }
+
+	    for (final var providedType : providedTypes) {
+	    	pluginWriter.write(providedType);
+	    	pluginWriter.write("\n");
+	    }
+	  }
 
   private void writeProvidedModules(URLClassLoader newClassLoader, FileWriter moduleWriter)
       throws IOException {
     final Set<String> providedTypes = new HashSet<>();
 
-    for (final Module module : ServiceLoader.load(Module.class, newClassLoader)) {
+    for (final var module : ServiceLoader.load(Module.class, newClassLoader)) {
       for (final Class<?> provide : module.provides()) {
         providedTypes.add(provide.getCanonicalName());
       }

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

@@ -6,20 +6,25 @@
 
 /**
  * A Plugin that can be applied when creating a bean scope.
- * <p>
- * Typically, a plugin might provide a default dependency via {@link BeanScopeBuilder#provideDefault(Type, java.util.function.Supplier)}.
+ *
+ * <p>Typically, a plugin might provide a default dependency via {@link
+ * BeanScopeBuilder#provideDefault(Type, java.util.function.Supplier)}.
  */
 public interface Plugin {
 
-  /**
-   * Return the classes that the plugin provides.
-   */
+  /** Apply the plugin to the scope builder. */
+  void apply(BeanScopeBuilder builder);
+
+  /** Empty array of classes. */
+  Class<?>[] EMPTY_CLASSES = {};
+
+  /** Return the classes that the plugin provides. */
   default Class<?>[] provides() {
-    return new Class<?>[]{};
+    return EMPTY_CLASSES;
   }
 
-  /**
-   * Apply the plugin to the scope builder.
-   */
-  void apply(BeanScopeBuilder builder);
+  /** Return the aspect classes that the plugin provides. */
+  default Class<?>[] providesAspects() {
+    return EMPTY_CLASSES;
+  }
 }