I'll do client later

Author: SentryMan

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

@@ -4,7 +4,6 @@
 
 import javax.lang.model.element.TypeElement;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Write code to register Web route for a given controller method.
@@ -23,15 +22,13 @@ class ClientMethodWriter {
   private final UType returnType;
   private MethodParam bodyHandlerParam;
   private String methodGenericParams = "";
-  private final boolean useJsonb;
 
-  ClientMethodWriter(MethodReader method, Append writer, ProcessingContext ctx, boolean useJsonb) {
+  ClientMethodWriter(MethodReader method, Append writer, ProcessingContext ctx) {
     this.method = method;
     this.writer = writer;
     this.webMethod = method.webMethod();
     this.ctx = ctx;
     this.returnType = Util.parseType(method.returnType());
-    this.useJsonb = useJsonb;
   }
 
   void addImportTypes(ControllerReader reader) {
@@ -114,55 +111,37 @@ private void writeEnd() {
 
   private void writeSyncResponse() {
     writer.append("      ");
-    writeResponse(returnType);
+    String type0 = returnType.mainType();
+    String type1 = returnType.param0();
+    writeResponse(type0, type1);
   }
 
   private void writeAsyncResponse() {
     writer.append("      .async()");
-    writeResponse(UType.parse(returnType.param0()));
+    String type0 = returnType.param0();
+    String type1 = returnType.param1();
+    writeResponse(type0, type1);
   }
 
   private void writeCallResponse() {
     writer.append("      .call()");
-    writeResponse(UType.parse(returnType.param0()));
+    String type0 = returnType.param0();
+    String type1 = returnType.param1();
+    writeResponse(type0, type1);
   }
 
-  private void writeResponse(UType type) {
-    final var mainType = type.mainType();
-    final var param1 = type.paramRaw();
-    if (isList(mainType)) {
-      writer.append(".list(");
-      writeGeneric(UType.parse(param1));
-    } else if (isStream(mainType)) {
-      writer.append(".stream(");
-      writeGeneric(UType.parse(param1));
-    } else if (isHttpResponse(mainType)) {
+  private void writeResponse(String type0, String type1) {
+    if (isList(type0)) {
+      writer.append(".list(%s.class);", Util.shortName(type1)).eol();
+    } else if (isStream(type0)) {
+      writer.append(".stream(%s.class);", Util.shortName(type1)).eol();
+    } else if (isHttpResponse(type0)){
       writeWithHandler();
     } else {
-      writer.append(".bean(", Util.shortName(mainType)).eol();
-      writeGeneric(type);
+      writer.append(".bean(%s.class);", Util.shortName(type0)).eol();
     }
   }
 
-  void writeGeneric(UType type) {
-    if (useJsonb && type.isGeneric()) {
-      final var params =
-          type.importTypes().stream()
-                  .skip(1)
-                  .map(Util::shortName)
-                  .collect(Collectors.joining(".class, "))
-              + ".class";
-
-      writer.append(
-          "Types.newParameterizedType(%s.class, %s)", Util.shortName(type.mainType()), params);
-    } else {
-      writer.append("%s.class", Util.shortName(type.mainType()));
-    }
-    writer.append(");");
-
-    writer.eol();
-  }
-
   private void writeWithHandler() {
     if (bodyHandlerParam != null) {
       writer.append(".handler(%s);", bodyHandlerParam.name()).eol();

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

@@ -27,21 +27,6 @@ public class ClientProcessor extends AbstractProcessor {
 
   protected ProcessingContext ctx;
 
-  private boolean useJsonB;
-
-  public ClientProcessor() {
-    try {
-      Class.forName("io.avaje.jsonb.Jsonb");
-      this.useJsonB = true;
-    } catch (final ClassNotFoundException e) {
-      this.useJsonB = false;
-    }
-  }
-
-  public ClientProcessor(boolean useJsonb) {
-    useJsonB = useJsonb;
-  }
-
   @Override
   public SourceVersion getSupportedSourceVersion() {
     return SourceVersion.latest();
@@ -122,7 +107,7 @@ private void writeClient(Element controller) {
   }
 
   protected String writeClientAdapter(ProcessingContext ctx, ControllerReader reader) throws IOException {
-    return new ClientWriter(reader, ctx,useJsonB).write();
+    return new ClientWriter(reader, ctx).write();
   }
 
 }

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

@@ -21,15 +21,12 @@ class ClientWriter extends BaseControllerWriter {
   private static final String SUFFIX = "HttpClient";
 
   private final List<ClientMethodWriter> methodList = new ArrayList<>();
-  private final boolean useJsonb;
 
-  ClientWriter(ControllerReader reader, ProcessingContext ctx, boolean useJsonB) throws IOException {
+  ClientWriter(ControllerReader reader, ProcessingContext ctx) throws IOException {
     super(reader, ctx, SUFFIX);
     reader.addImportType(HTTP_CLIENT_CONTEXT);
     reader.addImportType(HTTP_API_PROVIDER);
-    this.useJsonb = useJsonB;
     readMethods();
-    if (useJsonB) reader.addImportType("io.avaje.jsonb.Types");
   }
 
   @Override
@@ -41,7 +38,7 @@ protected String initPackageName(String originName) {
   private void readMethods() {
     for (MethodReader method : reader.methods()) {
       if (method.isWebMethod()) {
-        final var methodWriter = new ClientMethodWriter(method, writer, ctx, useJsonb);
+        ClientMethodWriter methodWriter = new ClientMethodWriter(method, writer, ctx);
         methodWriter.addImportTypes(reader);
         methodList.add(methodWriter);
       }