Merge pull request #578 from SentryMan/jex-bodyStream

[jex-generator] use body stream methods

Author: SentryMan

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

@@ -311,7 +311,7 @@ private void readSuper(TypeElement beanType) {
     if (superclass.getKind() != TypeKind.NONE) {
       final DeclaredType declaredType = (DeclaredType) superclass;
       final TypeElement superElement = asElement(superclass);
-      if (!"java.lang.Object".equals(superElement.toString())) {
+      if (!"java.lang.Object".equals(superElement.getQualifiedName().toString())) {
         for (final Element element : superElement.getEnclosedElements()) {
           if (element.getKind() == ElementKind.METHOD) {
             readMethod((ExecutableElement) element, declaredType);

http-generator-jex/src/main/java/io/avaje/http/generator/jex/JexAdapter.java

@@ -1,6 +1,7 @@
 package io.avaje.http.generator.jex;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import io.avaje.http.generator.core.Append;
 import io.avaje.http.generator.core.Constants;
@@ -9,6 +10,7 @@
 import io.avaje.http.generator.core.PlatformAdapter;
 import io.avaje.http.generator.core.ProcessingContext;
 import io.avaje.http.generator.core.UType;
+import io.avaje.http.generator.core.Util;
 
 class JexAdapter implements PlatformAdapter {
 
@@ -31,19 +33,59 @@ public boolean isBodyMethodParam() {
 
   @Override
   public String bodyAsClass(UType type) {
-
     if ("java.io.InputStream".equals(type.full())) {
       return "ctx.bodyAsInputStream()";
     } else if ("java.lang.String".equals(type.full())) {
       return "ctx.body()";
     } else if ("byte[]".equals(type.full())) {
       return "ctx.bodyAsBytes()";
+    } else if (type.isGeneric() && ProcessingContext.useJsonb()) {
+      return "ctx.<%s>bodyAsType(%s)".formatted(type.shortType(), writeJsonbType(type));
     } else if (ProcessingContext.useJsonb()) {
-      return type.shortName() + "JsonType.fromJson(ctx.bodyAsInputStream())";
+      return "ctx.bodyAsClass(%s.class)".formatted(type.shortType());
     }
     return "ctx.bodyAsClass(" + type.mainType() + ".class)";
   }
 
+  public static String writeJsonbType(UType type) {
+    var writer = new StringBuilder();
+
+    switch (type.mainType()) {
+      case "java.util.List":
+        writeType(type.paramRaw(), writer);
+        writer.append(".list()");
+        break;
+      case "java.util.Set":
+        writeType(type.paramRaw(), writer);
+        writer.append(".set()");
+        break;
+      case "java.util.Map":
+        writeType(type.paramRaw(), writer);
+        writer.append(".map()");
+        break;
+      default: {
+        if (type.mainType().contains("java.util")) {
+          throw new UnsupportedOperationException(
+            "Only java.util Map, Set and List are supported JsonB Controller Collection Types");
+        }
+        writeType(type, writer);
+      }
+    }
+    return writer.toString();
+  }
+
+  static void writeType(UType type, StringBuilder writer) {
+    final var params =
+      type.params().stream()
+        .map(Util::shortName)
+        .map(s -> "?".equals(s) ? "Object" : s)
+        .collect(Collectors.joining(".class, "));
+
+    writer.append(
+      "Types.newParameterizedType(%s.class, %s.class)"
+        .formatted(Util.shortName(type.mainType()), params));
+  }
+
   @Override
   public String indent() {
     return "  ";