external

Author: SentryMan

inject-generator/pom.xml

@@ -19,9 +19,9 @@
       <groupId>io.avaje</groupId>
       <artifactId>avaje-inject</artifactId>
       <version>8.12-RC4</version>
-     <optional>true</optional>
       <scope>provided</scope>
     </dependency>
+
 <dependency>
 	<groupId>com.jolira</groupId>
 	<artifactId>hickory</artifactId>
@@ -50,7 +50,7 @@
         <configuration>
           <source>11</source>
           <target>11</target>
-          <compilerArgument>-proc:none</compilerArgument>
+          <!-- <compilerArgument>-proc:none</compilerArgument> -->
         </configuration>
       </plugin>
 
@@ -65,7 +65,7 @@
       </plugin>
 
 
-			<plugin>
+			<!-- <plugin>
 				<groupId>org.bsc.maven</groupId>
 				<artifactId>maven-processor-plugin</artifactId>
          <version>4.0-rc1</version>
@@ -110,7 +110,7 @@
 						</configuration>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin> -->
     </plugins>
   </build>
 

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

@@ -0,0 +1,71 @@
+package io.avaje.inject.generator;
+
+import java.util.ServiceConfigurationError;
+import java.util.ServiceLoader;
+import java.util.Set;
+
+import io.avaje.inject.spi.Module;
+import io.avaje.inject.spi.Plugin;
+
+/**
+ * The types provided by other modules in the classpath at compile time.
+ *
+ * <p>When we depend on these types they add to the module autoRequires() classes.
+ */
+final class ExternalProvider {
+
+  private static final boolean moduleLoaded = moduleCP();
+
+  private ExternalProvider() {}
+
+  private static boolean moduleCP() {
+    try {
+      Class.forName(Constants.MODULE);
+      return true;
+    } catch (final ClassNotFoundException e) {
+
+      return false;
+    }
+  }
+
+  public static Set<String> registerModuleProvidedTypes(Set<String> providedTypes) {
+
+    if (!moduleLoaded) return Set.of();
+
+    final ServiceLoader<Module> load =
+        ServiceLoader.load(Module.class, ExternalProvider.class.getClassLoader());
+    for (final Module module : load) {
+      try {
+        for (final Class<?> provide : module.provides()) {
+          providedTypes.add(provide.getCanonicalName());
+        }
+        for (final Class<?> provide : module.autoProvides()) {
+          providedTypes.add(provide.getCanonicalName());
+        }
+        for (final Class<?> provide : module.autoProvidesAspects()) {
+          providedTypes.add(Util.wrapAspect(provide.getCanonicalName()));
+        }
+      } catch (final ServiceConfigurationError expected) {
+        // ignore expected error reading the module that we are also writing
+      }
+    }
+    return providedTypes;
+  }
+
+  /**
+   * Register types provided by the plugin so no compiler error when we have a dependency on these
+   * types and the only thing providing them is the plugin.
+   *
+   * @param defaultScope
+   */
+  public static void registerPluginProvidedTypes(ScopeInfo defaultScope) {
+
+    if (!moduleLoaded) return;
+
+    for (final Plugin plugin : ServiceLoader.load(Plugin.class, Processor.class.getClassLoader())) {
+      for (final Class<?> provide : plugin.provides()) {
+        defaultScope.pluginProvided(provide.getCanonicalName());
+      }
+    }
+  }
+}

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

@@ -3,7 +3,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.LineNumberReader;
-import java.io.Reader;
 import java.nio.file.NoSuchFileException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -41,6 +40,9 @@ final class ProcessingContext {
     this.filer = processingEnv.getFiler();
     this.elementUtils = processingEnv.getElementUtils();
     this.typeUtils = processingEnv.getTypeUtils();
+
+    ExternalProvider.registerModuleProvidedTypes(providedTypes);
+
     providedTypes.addAll(moduleFileProvided);
   }
 
@@ -64,7 +66,7 @@ void logDebug(String msg, Object... args) {
   }
 
   String loadMetaInfServices() {
-    final List<String> lines = loadMetaInf(Constants.META_INF_MODULE);
+    final var lines = loadMetaInf(Constants.META_INF_MODULE);
     return lines.isEmpty() ? null : lines.get(0);
   }
 
@@ -74,11 +76,11 @@ List<String> loadMetaInfCustom() {
 
   private List<String> loadMetaInf(String fullName) {
     try {
-      FileObject fileObject = processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, "", fullName);
+      final var fileObject = processingEnv.getFiler().getResource(StandardLocation.CLASS_OUTPUT, "", fullName);
       if (fileObject != null) {
-        List<String> lines = new ArrayList<>();
-        Reader reader = fileObject.openReader(true);
-        LineNumberReader lineReader = new LineNumberReader(reader);
+        final List<String> lines = new ArrayList<>();
+        final var reader = fileObject.openReader(true);
+        final var lineReader = new LineNumberReader(reader);
         String line;
         while ((line = lineReader.readLine()) != null) {
           line = line.trim();
@@ -92,10 +94,10 @@ private List<String> loadMetaInf(String fullName) {
     } catch (FileNotFoundException | NoSuchFileException e) {
       // logDebug("no services file yet");
 
-    } catch (FilerException e) {
+    } catch (final FilerException e) {
       logDebug("FilerException reading services file");
 
-    } catch (Exception e) {
+    } catch (final Exception e) {
       e.printStackTrace();
       logWarn("Error reading services file: " + e.getMessage());
     }
@@ -110,7 +112,7 @@ JavaFileObject createWriter(String cls) throws IOException {
   }
 
   FileObject createMetaInfWriter(ScopeInfo.Type scopeType) throws IOException {
-    String serviceName = scopeType == ScopeInfo.Type.DEFAULT ? Constants.META_INF_MODULE : Constants.META_INF_TESTMODULE;
+    final var serviceName = scopeType == ScopeInfo.Type.DEFAULT ? Constants.META_INF_MODULE : Constants.META_INF_TESTMODULE;
     return createMetaInfWriterFor(serviceName);
   }
 

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

@@ -56,6 +56,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
     this.elementUtils = processingEnv.getElementUtils();
     this.allScopes = new AllScopes(context);
     this.defaultScope = allScopes.defaultScope();
+    ExternalProvider.registerPluginProvidedTypes(defaultScope);
     pluginFileProvided.forEach(defaultScope::pluginProvided);
   }