Merge pull request #740 from SentryMan/module-validation

Fix Module Validation

Author: SentryMan

inject-generator/pom.xml

@@ -13,7 +13,7 @@
   <name>avaje inject generator</name>
   <description>annotation processor generating source code for avaje-inject dependency injection</description>
   <properties>
-    <avaje.prisms.version>1.35</avaje.prisms.version>
+    <avaje.prisms.version>1.36</avaje.prisms.version>
     <!-- VALHALLA-START ___
     <maven.compiler.enablePreview>false</maven.compiler.enablePreview>
     ____ VALHALLA-END -->
@@ -39,15 +39,15 @@
       <artifactId>avaje-spi-service</artifactId>
       <version>2.8</version>
     </dependency>
-    
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
       <version>2.8</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
-    
+
     <!-- test dependencies -->
     <dependency>
       <groupId>io.avaje</groupId>

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

@@ -32,6 +32,7 @@ static final class Ctx {
     private final List<ModuleData> modules = new ArrayList<>();
     private final List<TypeElement> delayQueue = new ArrayList<>();
     private final Set<String> spiServices = new TreeSet<>();
+    private final Set<String> externalSpi = new TreeSet<>();
     private boolean strictWiring;
     private final boolean mergeServices = APContext.getOption("mergeServices").map(Boolean::valueOf).orElse(true);
 
@@ -49,7 +50,7 @@ static void registerProvidedTypes(Set<String> moduleFileProvided) {
   private static void addEventSPI() {
     try {
       if (typeElement(EVENTS_SPI) != null || Class.forName(EVENTS_SPI) != null) {
-        addInjectSPI(EVENTS_SPI);
+        addExternalInjectSPI(EVENTS_SPI);
       }
     } catch (final ClassNotFoundException e) {
       // nothing
@@ -107,7 +108,7 @@ static void addInjectSPI(String type) {
 
   static void addExternalInjectSPI(String type) {
     if (CTX.get().mergeServices) {
-      CTX.get().spiServices.add(type);
+      CTX.get().externalSpi.add(type);
     }
   }
 
@@ -158,10 +159,11 @@ static void addImportedAspects(Map<String, AspectImportPrism> importedMap) {
   }
 
   static void validateModule() {
-    APContext.moduleInfoReader().ifPresent(reader -> {
-      CTX.get().spiServices.remove(EVENTS_SPI);
-      reader.validateServices("io.avaje.inject.spi.InjectExtension", CTX.get().spiServices);
-    });
+    APContext.moduleInfoReader()
+        .ifPresent(
+            reader ->
+                reader.validateServices(
+                    "io.avaje.inject.spi.InjectExtension", CTX.get().spiServices));
   }
 
   static Optional<AspectImportPrism> getImportedAspect(String type) {
@@ -220,7 +222,8 @@ static void writeSPIServicesFile() {
       FileObject jfo = createMetaInfWriterFor(Constants.META_INF_SPI);
       if (jfo != null) {
         var writer = new Append(jfo.openWriter());
-        for (var service : CTX.get().spiServices) {
+        CTX.get().externalSpi.addAll(CTX.get().spiServices);
+        for (var service : CTX.get().externalSpi) {
           writer.append(service).eol();
         }
         writer.close();
@@ -244,7 +247,7 @@ private static void readExistingMetaInfServices() {
         line.replaceAll("\\s", "")
           .replace(",", "\n")
           .lines()
-          .forEach(ProcessingContext::addInjectSPI);
+          .forEach(ProcessingContext::addExternalInjectSPI);
       }
     } catch (Exception e) {
       // not a critical error