use prisms to validate modules (#458)

Author: SentryMan

http-generator-core/src/main/java/io/avaje/http/generator/core/ProcessingContext.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -26,7 +27,6 @@
 import javax.tools.JavaFileObject;
 import javax.tools.StandardLocation;
 
-import io.avaje.http.generator.core.ModuleInfoReader.Provides;
 import io.avaje.http.generator.core.openapi.DocContext;
 
 public final class ProcessingContext {
@@ -49,8 +49,6 @@ private static final class Ctx {
     private final boolean instrumentAllMethods;
     private final boolean disableDirectWrites;
     private final boolean javalin6;
-    private final boolean spiPresent = APContext.typeElement("io.avaje.spi.internal.ServiceProcessor") != null;
-    private boolean validated;
     private String clientFQN;
 
     Ctx(ProcessingEnvironment env, PlatformAdapter adapter, boolean generateOpenAPI) {
@@ -143,12 +141,8 @@ public static JavaFileObject createWriter(String cls, Element origin) throws IOE
 
   /** Create a file writer for the META-INF services file. */
   public static FileObject createMetaInfWriter(String target) throws IOException {
-    var serviceFile =
-      CTX.get().spiPresent
-        ? target.replace("META-INF/services/", "META-INF/generated-services/")
-        : target;
 
-    return filer().createResource(StandardLocation.CLASS_OUTPUT, "", serviceFile);
+    return filer().createResource(StandardLocation.CLASS_OUTPUT, "", target);
   }
 
   public static JavaFileObject createWriter(String cls) throws IOException {
@@ -241,8 +235,7 @@ static Stream<String> superTypes(Element element) {
 
   public static void validateModule() {
     var module = APContext.getProjectModuleElement();
-    if (module != null && !CTX.get().validated && !module.isUnnamed()) {
-      CTX.get().validated = true;
+    if (module != null && !module.isUnnamed()) {
       try (var bufferedReader = APContext.getModuleInfoReader()) {
         var reader = new ModuleInfoReader(module, bufferedReader);
         reader.requires().forEach(r -> {
@@ -251,18 +244,9 @@ public static void validateModule() {
           }
         });
         var fqn = CTX.get().clientFQN;
-        if (CTX.get().spiPresent || fqn == null) {
-          return;
-        }
-        var noProvides = reader.provides().stream()
-          .filter(p -> "io.avaje.http.client.HttpClient.GeneratedComponent".equals(p.service()))
-          .map(Provides::implementations)
-          .flatMap(List::stream)
-          .noneMatch(s -> s.contains(fqn));
-
-        if (noProvides && !buildPluginAvailable()) {
-          logError(module, "Missing `provides io.avaje.http.client.HttpClient.GeneratedComponent with %s;`", fqn);
-        }
+
+        reader.validateServices("io.avaje.http.client.HttpClient.GeneratedComponent", Set.of(fqn));
+
       } catch (Exception e) {
         // can't read module
       }

pom.xml

@@ -21,7 +21,7 @@
     <nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
     <swagger.version>2.2.22</swagger.version>
     <jackson.version>2.14.2</jackson.version>
-    <avaje.prisms.version>1.26</avaje.prisms.version>
+    <avaje.prisms.version>1.27</avaje.prisms.version>
     <module-info.shade>${project.build.directory}${file.separator}module-info.shade</module-info.shade>
   </properties>