plugin should remain unchanged

Author: SentryMan

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

@@ -124,11 +124,11 @@ static void registerPluginProvidedTypes(ScopeInfo defaultScope) {
         continue;
       }
       APContext.logNote("Loaded Plugin: %s", plugin.getClass().getTypeName());
-      for (final var provide : plugin.providesBeans()) {
-        defaultScope.pluginProvided(provide);
+      for (final var provide : plugin.provides()) {
+        defaultScope.pluginProvided(provide.getTypeName());
       }
-      for (final var provide : plugin.providesAspectBeans()) {
-        defaultScope.pluginProvided(Util.wrapAspect(provide));
+      for (final var provide : plugin.providesAspects()) {
+        defaultScope.pluginProvided(Util.wrapAspect(provide.getTypeName()));
       }
     }
   }

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

@@ -49,8 +49,8 @@ private void writeProvides(Project project) {
     try (var classLoader = classLoader(project);
         var pluginWriter = createFileWriter(outputDir.getPath(), "avaje-plugins.csv");
         var moduleCSV = createFileWriter(outputDir.getPath(), "avaje-module-dependencies.csv")) {
-        writeProvidedPlugins(classLoader, pluginWriter);
-        writeModuleCSV(classLoader, moduleCSV);
+      writeProvidedPlugins(classLoader, pluginWriter);
+      writeModuleCSV(classLoader, moduleCSV);
     } catch (IOException e) {
       throw new GradleException("Failed to write avaje-module-provides", e);
     }
@@ -74,11 +74,11 @@ private void writeProvidedPlugins(ClassLoader classLoader, FileWriter pluginWrit
       final List<String> provides = new ArrayList<>();
       final var typeName = plugin.getClass().getTypeName();
       System.out.println("Loaded Plugin: " + typeName);
-      for (final var provide : plugin.providesBeans()) {
-        provides.add(provide);
+      for (final var provide : plugin.provides()) {
+        provides.add(provide.getTypeName());
       }
-      for (final var provide : plugin.providesAspectBeans()) {
-        provides.add(wrapAspect(provide));
+      for (final var provide : plugin.providesAspects()) {
+        provides.add(wrapAspect(provide.getCanonicalName()));
       }
       pluginEntries.put(typeName, provides);
     }
@@ -104,7 +104,8 @@ private URLClassLoader classLoader(Project project) {
 
   private static URL[] createClassPath(Project project) {
     try {
-      Set<File> compileClasspath = project.getConfigurations().getByName("compileClasspath").resolve();
+      Set<File> compileClasspath =
+          project.getConfigurations().getByName("compileClasspath").resolve();
       final List<URL> urls = new ArrayList<>(compileClasspath.size());
       for (File file : compileClasspath) {
         urls.add(file.toURI().toURL());

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

@@ -109,7 +109,9 @@ private void writeProvidedPlugins(URLClassLoader newClassLoader, FileWriter plug
       final List<String> provides = new ArrayList<>();
       final var typeName = plugin.getClass();
       log.info("Loaded Plugin: " + typeName);
-      Collections.addAll(provides, plugin.providesBeans());
+      for (final var provide : plugin.provides()) {
+        provides.add(provide.getTypeName());
+      }
       for (final var provide : plugin.providesAspects()) {
         provides.add(wrapAspect(provide.getCanonicalName()));
       }

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

@@ -1,10 +1,9 @@
 package io.avaje.inject.spi;
 
-import java.lang.reflect.Type;
-import java.util.Arrays;
-
 import io.avaje.inject.BeanScopeBuilder;
 
+import java.lang.reflect.Type;
+
 /**
  * A Plugin that can be applied when creating a bean scope.
  *
@@ -13,32 +12,27 @@
  */
 public interface InjectPlugin extends InjectExtension {
 
-  /** Empty array of classes. */
+  /**
+   * Empty array of classes.
+   */
   Class<?>[] EMPTY_CLASSES = {};
 
-  /** Empty array of classes. */
-  String[] EMPTY_STRINGS = {};
-
-  /** Apply the plugin to the scope builder. */
+  /**
+   * Apply the plugin to the scope builder.
+   */
   void apply(BeanScopeBuilder builder);
 
-  /** Return the classes that the plugin provides. */
+  /**
+   * Return the classes that the plugin provides.
+   */
   default Type[] provides() {
     return EMPTY_CLASSES;
   }
 
-  /** Return the type names of types this module explicitly provides to other modules. */
-  default String[] providesBeans() {
-    return Arrays.stream(provides()).map(Type::getTypeName).toArray(String[]::new);
-  }
-
-  /** Return the aspect classes that the plugin provides. */
+  /**
+   * Return the aspect classes that the plugin provides.
+   */
   default Class<?>[] providesAspects() {
     return EMPTY_CLASSES;
   }
-
-  /** Return the type names of types this module explicitly provides to other modules. */
-  default String[] providesAspectBeans() {
-    return Arrays.stream(providesAspects()).map(Type::getTypeName).toArray(String[]::new);
-  }
 }