Merge pull request #175 from SentryMan/fix-client-static

fix client processor overriding OpenAPI

Author: rbygrave

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientProcessor.java

@@ -48,11 +48,20 @@ public SourceVersion getSupportedSourceVersion() {
   public synchronized void init(ProcessingEnvironment processingEnv) {
     super.init(processingEnv);
     this.processingEnv = processingEnv;
-    ProcessingContext.init(processingEnv, new ClientPlatformAdapter());
+    ProcessingContext.init(processingEnv, new ClientPlatformAdapter(), false);
   }
 
   @Override
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment round) {
+
+    final var platform = platform();
+
+    if (platform instanceof ClientPlatformAdapter) {
+
+    } else {
+      setPlatform(new ClientPlatformAdapter());
+    }
+
     for (final Element controller :
         round.getElementsAnnotatedWith(typeElement(ClientPrism.PRISM_TYPE))) {
       writeClient(controller);
@@ -64,6 +73,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     if (round.processingOver()) {
       writeServicesFile();
     }
+    setPlatform(platform);
     return false;
   }
 

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

@@ -37,13 +37,20 @@ public class ProcessingContext {
   private static String diAnnotation;
 
   public static void init(ProcessingEnvironment env, PlatformAdapter adapter) {
+    init(env, adapter, true);
+  }
+
+  public static void init(ProcessingEnvironment env, PlatformAdapter adapter, boolean generateOpenAPI) {
     readAdapter = adapter;
     messager = env.getMessager();
     filer = env.getFiler();
     elements = env.getElementUtils();
     types = env.getTypeUtils();
-    openApiAvailable = isTypeAvailable(Constants.OPENAPIDEFINITION);
-    docContext = new DocContext(env, openApiAvailable);
+
+    if (generateOpenAPI) {
+      openApiAvailable = isTypeAvailable(Constants.OPENAPIDEFINITION);
+      docContext = new DocContext(env, openApiAvailable);
+    }
 
     final var options = env.getOptions();
     final var singletonOverride = options.get("useSingleton");
@@ -139,6 +146,10 @@ public static PlatformAdapter platform() {
     return readAdapter;
   }
 
+  public static void setPlatform(PlatformAdapter platform) {
+    readAdapter = platform;
+  }
+
   public static String diAnnotation() {
     return diAnnotation;
   }