initial

Author: SentryMan

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

@@ -30,7 +30,10 @@ static void copyAnnotations(Append writer, Element element, String indent, boole
       final var type = annotationMirror.getAnnotationType().asElement().asType().toString();
       if (!type.contains("io.avaje.http.api.")
           || type.contains("Produces")
-          || type.contains("Consumes")) {
+          || type.contains("Consumes")
+          || type.contains("InstrumentServerContext")
+          || type.contains("Default")
+          || type.contains("OpenAPI")) {
         continue;
       }
 

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

@@ -4,7 +4,6 @@
 import static io.avaje.http.generator.core.ProcessingContext.elements;
 import static io.avaje.http.generator.core.ProcessingContext.isOpenApiAvailable;
 import static io.avaje.http.generator.core.ProcessingContext.logError;
-import static io.avaje.http.generator.core.ProcessingContext.logWarn;
 import static io.avaje.http.generator.core.ProcessingContext.typeElement;
 import static java.util.stream.Collectors.toMap;
 
@@ -129,16 +128,16 @@ private void writeAdapter(Element controller) {
       final var reader = new ControllerReader((TypeElement) controller, contextPath);
       reader.read(true);
       try {
+
         writeControllerAdapter(reader);
-      } catch (final Throwable e) {
-        logError(reader.beanType(), "Failed to write $Route class " + e);
-      }
-      try {
-        if (((TypeElement) controller).getInterfaces().isEmpty()) {
+        TypeElement typeElement = (TypeElement) controller;
+        if (typeElement.getInterfaces().isEmpty()
+            && "java.lang.Object".equals(typeElement.getSuperclass().toString())) {
           new TestClientWriter(reader).write();
         }
-      } catch (Exception e) {
-        logWarn(reader.beanType(), "Failed to write test class " + e);
+
+      } catch (final Throwable e) {
+        logError(reader.beanType(), "Failed to write $Route class " + e);
       }
     }
   }

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

@@ -1,13 +1,15 @@
 package io.avaje.http.generator.core;
 
+import static java.util.stream.Collectors.toList;
+
 import java.io.IOException;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeMirror;
 
-
 public class TestClientWriter {
 
   private static final String AT_GENERATED = "@Generated(\"avaje-http-generator\")";
@@ -18,6 +20,7 @@ public class TestClientWriter {
   private String packageName;
   private String fullName;
   private Append writer;
+  private List<MethodReader> methods;
 
   TestClientWriter(ControllerReader reader) throws IOException {
 
@@ -27,6 +30,17 @@ public class TestClientWriter {
     this.shortName = origin.getSimpleName().toString();
     this.packageName = initPackageName(originName);
     this.fullName = packageName + "." + shortName + "$TestAPI";
+    this.methods =
+        reader.methods().stream()
+            .filter(MethodReader::isWebMethod)
+            .filter(
+                m ->
+                    m.webMethod() instanceof CoreWebMethod
+                        && m.webMethod() != CoreWebMethod.ERROR
+                        && m.webMethod() != CoreWebMethod.FILTER
+                        && m.webMethod() != CoreWebMethod.OTHER)
+            .collect(toList());
+    if (methods.isEmpty()) return;
     writer = new Append(APContext.createSourceFile(fullName, reader.beanType()).openWriter());
   }
 
@@ -36,6 +50,7 @@ protected String initPackageName(String originName) {
   }
 
   void write() {
+    if (methods.isEmpty()) return;
     writePackage();
     writeImports();
     writeClassStart();
@@ -50,18 +65,14 @@ protected void writePackage() {
 
   protected void writeImports() {
     importTypes.add("java.net.http.HttpResponse");
+    importTypes.add("io.avaje.http.api.*");
 
-    reader
-        .methods()
-        .forEach(
-            m -> {
-              importTypes.addAll(UType.parse(m.returnType()).importTypes());
-              m.params()
-                  .forEach(
-                      p -> importTypes.addAll(UType.parse(p.element().asType()).importTypes()));
-            });
-
-    importTypes.addAll(reader.importTypes());
+    methods.forEach(
+        m -> {
+          importTypes.addAll(UType.parse(m.returnType()).importTypes());
+          m.params()
+              .forEach(p -> importTypes.addAll(UType.parse(p.element().asType()).importTypes()));
+        });
 
     importTypes.removeIf(
         i ->
@@ -82,15 +93,7 @@ private void writeClassStart() {
 
   private void writeAddRoutes() {
 
-    reader.methods().stream()
-        .filter(MethodReader::isWebMethod)
-        .filter(
-            m ->
-                m.webMethod() instanceof CoreWebMethod
-                    && m.webMethod() != CoreWebMethod.ERROR
-                    && m.webMethod() != CoreWebMethod.FILTER
-                    && m.webMethod() != CoreWebMethod.OTHER)
-        .forEach(this::writeRoute);
+    methods.forEach(this::writeRoute);
 
     writer.append("}").eol();
     writer.close();
@@ -102,6 +105,12 @@ private void writeRoute(MethodReader method) {
     AnnotationCopier.copyAnnotations(writer, method.element(), true);
 
     var returnTypeStr = PrimitiveUtil.wrap(UType.parse(returnType).shortType());
+
+    if (returnTypeStr.contains("CompletableFuture")) {
+      returnTypeStr =
+          returnTypeStr.substring(0, returnTypeStr.length() - 1).replace("CompletableFuture<", "");
+    }
+
     writer.append(
         "HttpResponse<%s> %s(", isJstache ? "String" : returnTypeStr, method.simpleName());
     boolean first = true;