gradle

Author: SentryMan

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

@@ -74,10 +74,10 @@ 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.provides()) {
-        provides.add(provide.getTypeName());
+      for (final var provide : plugin.providesBeans()) {
+        provides.add(provide);
       }
-      for (final var provide : plugin.providesAspects()) {
+      for (final var provide : plugin.providesAspectBeans()) {
         provides.add(wrapAspect(provide.getCanonicalName()));
       }
       pluginEntries.put(typeName, provides);
@@ -129,25 +129,24 @@ private void writeModuleCSV(ClassLoader classLoader, FileWriter moduleWriter) th
       System.out.println("Detected External Module: " + name);
 
       final var provides = new ArrayList<String>();
-      for (final var provide : module.provides()) {
-        var type = provide.getTypeName();
+      for (final var provide : module.providesBeans()) {
+        var type = provide;
         provides.add(type);
       }
-      for (final var provide : module.autoProvides()) {
-        var type = provide.getTypeName();
+      for (final var provide : module.autoProvidesBeans()) {
+        var type = provide;
         provides.add(type);
       }
-      for (final var provide : module.autoProvidesAspects()) {
-        var type = wrapAspect(provide.getTypeName());
+      for (final var provide : module.autoprovidesAspectBeans()) {
+        var type = wrapAspect(provide);
         provides.add(type);
       }
 
-      final var requires = Arrays.<Type>stream(module.requires()).map(Type::getTypeName).collect(toList());
+      final var requires = Arrays.stream(module.requiresBeans()).collect(toList());
 
-      Arrays.<Type>stream(module.autoRequires()).map(Type::getTypeName).forEach(requires::add);
-      Arrays.<Type>stream(module.requiresPackages()).map(Type::getTypeName).forEach(requires::add);
-      Arrays.<Type>stream(module.autoRequiresAspects())
-          .map(Type::getTypeName)
+      Arrays.stream(module.autoRequires()).forEach(requires::add);
+      Arrays.stream(module.requiresPackages()).forEach(requires::add);
+      Arrays.stream(module.autoRequiresAspects())
           .map(AvajeInjectPlugin::wrapAspect)
           .forEach(requires::add);
       modules.add(new ModuleData(name, provides, requires));

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

@@ -109,7 +109,7 @@ 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());
+      Collections.addAll(provides, plugin.providesBeans());
       for (final var provide : plugin.providesAspects()) {
         provides.add(wrapAspect(provide.getCanonicalName()));
       }
@@ -159,8 +159,8 @@ private void writeModuleCSV(ClassLoader newClassLoader, FileWriter moduleWriter)
 
       final var requires = Arrays.stream(module.requiresBeans()).collect(toList());
 
-      Arrays.stream(module.autoRequiresBeans()).forEach(requires::add);
-      Arrays.stream(module.requiresPackagesFromType()).forEach(requires::add);
+      Collections.addAll(requires, module.autoRequiresBeans());
+      Collections.addAll(requires, module.requiresPackagesFromType());
       Arrays.stream(module.autoRequiresAspectBeans())
           .map(AutoProvidesMojo::wrapAspect)
           .forEach(requires::add);