Merge pull request #67 from avaje/prisms-2

Prisms 2.0 Module Validation

Author: SentryMan

avaje-spi-core/pom.xml

@@ -13,7 +13,7 @@
 		<tag>HEAD</tag>
 	</scm>
   <properties>
-    <avaje.prisms.version>1.43</avaje.prisms.version>
+    <avaje.prisms.version>2.0-RC1</avaje.prisms.version>
   </properties>
 
   <dependencies>

avaje-spi-core/src/main/java/io/avaje/spi/internal/ModuleReader.java

@@ -17,11 +17,7 @@ final class ModuleReader {
   }
 
   private void add(String k, Set<String> v) {
-    missingServicesMap.put(replace$(k), v.stream().map(ModuleReader::replace$).collect(toSet()));
-  }
-
-  private static String replace$(String k) {
-    return k.replace('$', '.');
+    missingServicesMap.put(k, v.stream().collect(toSet()));
   }
 
   void read(ModuleInfoReader module) {
@@ -37,18 +33,23 @@ void read(ModuleInfoReader module) {
         break;
       }
     }
-    module.provides().forEach(p -> {
-
-      final var contract = replace$(p.service());
-
-      if (!missingServicesMap.containsKey(contract)) {
-        return;
-      }
-      var impls = p.implementations();
-      var missing = missingServicesMap.get(contract);
-
-      impls.stream().map(ModuleReader::replace$).forEach(missing::remove);
-    });
+    module
+        .provides()
+        .forEach(
+            p -> {
+              final var contract = p.getService().getQualifiedName().toString();
+              if (!missingServicesMap.containsKey(contract)) {
+                return;
+              }
+              var impls = p.getImplementations();
+              var missing = missingServicesMap.get(contract);
+              impls.stream()
+                  .forEach(
+                      x -> {
+                        missing.remove(x.getQualifiedName().toString());
+                        missing.remove(APContext.elements().getBinaryName(x).toString());
+                      });
+            });
   }
 
   boolean staticWarning() {

avaje-spi-core/src/main/java/io/avaje/spi/internal/ServiceProcessor.java

@@ -47,13 +47,11 @@
 import javax.tools.StandardLocation;
 
 import io.avaje.prism.GenerateAPContext;
-import io.avaje.prism.GenerateModuleInfoReader;
 import io.avaje.prism.GenerateUtils;
 
 @GenerateUtils
 @GenerateAPContext
 @SuppressWarnings("exports")
-@GenerateModuleInfoReader
 @SupportedOptions("buildPlugin")
 @SupportedAnnotationTypes({
   ServiceProviderPrism.PRISM_TYPE,
@@ -88,7 +86,9 @@ public SourceVersion getSupportedSourceVersion() {
           "avaje-validator-generator",
           "io.avaje.validation.spi.ValidationExtension",
           "avaje-jsonb-generator",
-          "io.avaje.jsonb.spi.JsonbExtension");
+          "io.avaje.jsonb.spi.JsonbExtension",
+          "avaje-http-client-generator",
+          "io.avaje.http.client.HttpClient.GeneratedComponent");
 
   private static final Map<String, String> VALID_AVAJE_SPI =
       Map.of(