Merge pull request #99 from SentryMan/javalinJsonB

(Javalin) Avaje JsonB support

Author: rbygrave

.gitignore

@@ -9,3 +9,5 @@ build/
 *.project
 *.processors
 */bin/
+*.editorconfig
+*.Module

README.md

@@ -57,7 +57,6 @@ Javalin.create()
         .start();
 ```
 
-
 ## Usage with Helidon SE
 
 The annotation processor will generate controller classes implementing the Helidon Service interface, which we can use

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

@@ -1,11 +1,12 @@
 package io.avaje.http.generator.client;
 
+import java.util.List;
+
 import io.avaje.http.generator.core.Append;
 import io.avaje.http.generator.core.ControllerReader;
 import io.avaje.http.generator.core.ParamType;
 import io.avaje.http.generator.core.PlatformAdapter;
-
-import java.util.List;
+import io.avaje.http.generator.core.UType;
 
 class ClientPlatformAdapter implements PlatformAdapter {
 
@@ -20,7 +21,7 @@ public String platformVariable(String rawType) {
   }
 
   @Override
-  public String bodyAsClass(String shortType) {
+  public String bodyAsClass(UType uType) {
     return null;
   }
 

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

@@ -206,7 +206,7 @@ void writeCtxGet(Append writer, PathSegments segments) {
       return;
     }
     String shortType = shortType();
-    writer.append("%s  %s %s = ", ctx.platform().indent(), shortType, varName);
+    writer.append("%s  var %s = ", ctx.platform().indent(), varName);
     if (setValue(writer, segments, shortType)) {
       writer.append(";").eol();
     }
@@ -259,7 +259,7 @@ private boolean setValue(Append writer, PathSegments segments, String shortType)
 
     if (typeHandler == null) {
       // this is a body (POST, PATCH)
-      writer.append(ctx.platform().bodyAsClass(shortType));
+      writer.append(ctx.platform().bodyAsClass(type));
 
     } else {
       if (hasParamDefault()) {

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

@@ -0,0 +1,63 @@
+package io.avaje.http.generator.core;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public class JsonBUtil {
+  private JsonBUtil() {}
+
+  public static Map<String, UType> getJsonTypes(ControllerReader reader) {
+
+    final Map<String, UType> jsonTypes = new LinkedHashMap<>();
+
+    final Consumer<UType> addToMap = uType -> jsonTypes.put(uType.full(), uType);
+
+    reader.getMethods().stream()
+        .filter(MethodReader::isWebMethod)
+        .filter(m -> !"byte[]".equals(m.getReturnType().toString()))
+        .filter(m -> m.getProduces() == null || m.getProduces().toLowerCase().contains("json"))
+        .forEach(
+            methodReader -> {
+              addJsonBodyType(methodReader, addToMap);
+              if (!methodReader.isVoid()) {
+                addToMap.accept(UType.parse(methodReader.getReturnType()));
+              }
+            });
+
+    return Map.copyOf(jsonTypes);
+  }
+
+  private static void addJsonBodyType(MethodReader methodReader, Consumer<UType> addToMap) {
+    if (methodReader.getBodyType() != null) {
+      methodReader.getParams().stream()
+          .filter(MethodParam::isBody)
+          .map(MethodParam::getUType)
+          .forEach(addToMap);
+    }
+  }
+
+  public static void writeJsonbType(UType type, Append writer) {
+
+    writer.append("    this.%sJsonType = jsonB.type(", type.shortName());
+    if (!type.isGeneric()) {
+      writer.append("%s.class)", PrimitiveUtil.wrap(type.full()));
+    } else {
+      switch (type.mainType()) {
+        case "java.util.List":
+          writer.append("%s.class).list()", type.param0());
+          break;
+        case "java.util.Set":
+          writer.append("%s.class).set()", type.param0());
+          break;
+        case "java.util.Map":
+          writer.append("%s.class).map()", type.param1());
+          break;
+        default:
+          throw new UnsupportedOperationException(
+              "Only java.util Map, Set and List are supported JsonB Controller Collection Types");
+      }
+    }
+    writer.append(";").eol();
+  }
+}

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

@@ -21,7 +21,7 @@ public interface PlatformAdapter {
   /**
    * Return platform specific code to return the body content.
    */
-  String bodyAsClass(String shortType);
+  String bodyAsClass(UType type);
 
   /**
    * Return true if body is passed as a method parameter.

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

@@ -0,0 +1,24 @@
+package io.avaje.http.generator.core;
+
+import java.util.Map;
+
+public final class PrimitiveUtil {
+
+  private PrimitiveUtil() {}
+
+  static final Map<String, String> wrapperMap =
+      Map.of(
+          "char", "Character",
+          "byte", "Byte",
+          "int", "Integer",
+          "long", "Long",
+          "short", "Short",
+          "double", "Double",
+          "float", "Float",
+          "boolean", "Boolean");
+
+  public static String wrap(String shortName) {
+    final var wrapped = wrapperMap.get(shortName);
+    return wrapped != null ? wrapped : shortName;
+  }
+}

http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/HelidonPlatformAdapter.java

@@ -1,11 +1,12 @@
 package io.avaje.http.generator.helidon;
 
+import java.util.List;
+
 import io.avaje.http.generator.core.Append;
 import io.avaje.http.generator.core.ControllerReader;
 import io.avaje.http.generator.core.ParamType;
 import io.avaje.http.generator.core.PlatformAdapter;
-
-import java.util.List;
+import io.avaje.http.generator.core.UType;
 
 class HelidonPlatformAdapter implements PlatformAdapter {
 
@@ -38,7 +39,7 @@ public boolean isBodyMethodParam() {
   }
 
   @Override
-  public String bodyAsClass(String shortType) {
+  public String bodyAsClass(UType uType) {
     return "body";
   }
 

http-generator-javalin/src/main/java/io/avaje/http/generator/javalin/ControllerMethodWriter.java

@@ -6,53 +6,56 @@
 import io.avaje.http.generator.core.MethodReader;
 import io.avaje.http.generator.core.PathSegments;
 import io.avaje.http.generator.core.ProcessingContext;
+import io.avaje.http.generator.core.UType;
 import io.avaje.http.generator.core.Util;
 import io.avaje.http.generator.core.WebMethod;
 
-import java.util.List;
-
-/**
- * Write code to register Web route for a given controller method.
- */
+/** Write code to register Web route for a given controller method. */
 class ControllerMethodWriter {
 
   private final MethodReader method;
   private final Append writer;
   private final WebMethod webMethod;
   private final ProcessingContext ctx;
+  private final boolean useJsonB;
 
-  ControllerMethodWriter(MethodReader method, Append writer, ProcessingContext ctx) {
+  ControllerMethodWriter(
+      MethodReader method, Append writer, ProcessingContext ctx, boolean useJsonB) {
     this.method = method;
     this.writer = writer;
     this.webMethod = method.getWebMethod();
     this.ctx = ctx;
+    this.useJsonB = useJsonB;
   }
 
   void write(boolean requestScoped) {
 
-    final PathSegments segments = method.getPathSegments();
-    final String fullPath = segments.fullPath();
+    final var segments = method.getPathSegments();
+    final var fullPath = segments.fullPath();
 
-    writer.append("    ApiBuilder.%s(\"%s\", ctx -> {", webMethod.name().toLowerCase(), fullPath).eol();
+    writer
+        .append("    ApiBuilder.%s(\"%s\", ctx -> {", webMethod.name().toLowerCase(), fullPath)
+        .eol();
     writer.append("      ctx.status(%s);", method.getStatusCode()).eol();
 
-    List<PathSegments.Segment> matrixSegments = segments.matrixSegments();
-    for (PathSegments.Segment matrixSegment : matrixSegments) {
+    final var matrixSegments = segments.matrixSegments();
+    for (final PathSegments.Segment matrixSegment : matrixSegments) {
       matrixSegment.writeCreateSegment(writer, ctx.platform());
     }
 
-    final List<MethodParam> params = method.getParams();
-    for (MethodParam param : params) {
+    final var params = method.getParams();
+    for (final MethodParam param : params) {
       param.writeCtxGet(writer, segments);
     }
     writer.append("      ");
     if (method.includeValidate()) {
-      for (MethodParam param : params) {
+      for (final MethodParam param : params) {
         param.writeValidate(writer);
       }
     }
+
     if (!method.isVoid()) {
-      writeContextReturn();
+      writer.append("var result = ");
     }
 
     if (requestScoped) {
@@ -61,23 +64,25 @@ void write(boolean requestScoped) {
       writer.append("controller.");
     }
     writer.append(method.simpleName()).append("(");
-    for (int i = 0; i < params.size(); i++) {
+    for (var i = 0; i < params.size(); i++) {
       if (i > 0) {
         writer.append(", ");
       }
       params.get(i).buildParamName(writer);
     }
-    writer.append(")");
+
+    writer.append(");").eol();
     if (!method.isVoid()) {
-      writer.append(")");
+      writeContextReturn();
+      writer.eol();
     }
-    writer.append(";").eol();
+
     writer.append("    }");
 
-    List<String> roles = method.roles();
+    final var roles = method.roles();
     if (!roles.isEmpty()) {
       writer.append(", ");
-      for (int i = 0; i < roles.size(); i++) {
+      for (var i = 0; i < roles.size(); i++) {
         if (i > 0) {
           writer.append(", ");
         }
@@ -88,15 +93,23 @@ void write(boolean requestScoped) {
   }
 
   private void writeContextReturn() {
-    final String produces = method.getProduces();
-    if (produces == null || produces.equalsIgnoreCase(MediaType.APPLICATION_JSON)) {
-      writer.append("ctx.json(");
-    } else if (produces.equalsIgnoreCase(MediaType.TEXT_HTML)) {
-      writer.append("ctx.html(");
-    } else if (produces.equalsIgnoreCase(MediaType.TEXT_PLAIN)) {
-      writer.append("ctx.contentType(\"text/plain\").result(");
+    final var produces = method.getProduces();
+    if (produces == null || MediaType.APPLICATION_JSON.equalsIgnoreCase(produces)) {
+      if (useJsonB) {
+        final var uType = UType.parse(method.getReturnType());
+        writer.append(
+            "      %sJsonType.toJson(result, ctx.contentType(\"application/json\").outputStream());",
+            uType.shortName());
+
+      } else {
+        writer.append("      ctx.json(result);");
+      }
+    } else if (MediaType.TEXT_HTML.equalsIgnoreCase(produces)) {
+      writer.append("      ctx.html(result);");
+    } else if (MediaType.TEXT_PLAIN.equalsIgnoreCase(produces)) {
+      writer.append("      ctx.contentType(\"text/plain\").result(result);");
     } else {
-      writer.append("ctx.contentType(\"%s\").result(", produces);
+      writer.append("      ctx.contentType(\"%s\").result(result);", produces);
     }
   }
 }