Merge branch 'sigma-jstache' of https://github.com/SentryMan/avaje-http into sigma-jstache

Author: SentryMan

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

@@ -7,14 +7,51 @@
 
 public final class JsonBUtil {
 
+  private static final JsonBDetect NO_JSONB = new JsonBDetect();
+  /**
+   * Detect JsonB use and handle imports as needed.
+   */
+  public static final class JsonBDetect {
+    private final Map<String, UType> jsonTypes;
+
+    private JsonBDetect() {
+      this.jsonTypes = Map.of();
+    }
+
+    private JsonBDetect(ControllerReader reader) {
+      this.jsonTypes = JsonBUtil.jsonTypes(reader);
+      addImports(reader);
+    }
+
+    private void addImports(ControllerReader reader) {
+      if (useJsonB()) {
+        reader.addImportType("io.avaje.jsonb.Jsonb");
+        reader.addImportType("io.avaje.jsonb.JsonType");
+        reader.addImportType("io.avaje.jsonb.Types");
+        jsonTypes.values().stream().map(UType::importTypes).forEach(reader::addImportTypes);
+      }
+    }
+
+    public boolean useJsonB() {
+      return !jsonTypes.isEmpty();
+    }
+
+    public Map<String, UType> jsonTypes() {
+      return jsonTypes;
+    }
+  }
+
   private JsonBUtil() {}
 
   public static boolean isJsonMimeType(String producesMimeType) {
     return producesMimeType == null || producesMimeType.toLowerCase().contains("application/json");
   }
 
-  public static Map<String, UType> jsonTypes(ControllerReader reader) {
+  public static JsonBDetect detect(boolean jsonb, ControllerReader reader) {
+    return !jsonb ? NO_JSONB : new JsonBDetect(reader);
+  }
 
+  public static Map<String, UType> jsonTypes(ControllerReader reader) {
     final Map<String, UType> jsonTypes = new LinkedHashMap<>();
     final Consumer<UType> addToMap = uType -> jsonTypes.put(uType.full(), uType);
 

http-generator-helidon/src/main/java/io/avaje/http/generator/helidon/nima/ControllerWriter.java

@@ -26,18 +26,11 @@ class ControllerWriter extends BaseControllerWriter {
 
   ControllerWriter(ControllerReader reader, boolean jsonb) throws IOException {
     super(reader);
-    this.useJsonB = jsonb;
+    final var detectJsonB = JsonBUtil.detect(jsonb, reader);
+    this.useJsonB = detectJsonB.useJsonB();
+    this.jsonTypes = detectJsonB.jsonTypes();
     if (useJsonB) {
-      reader.addImportType("io.avaje.jsonb.Jsonb");
-      reader.addImportType("io.avaje.jsonb.JsonType");
-      reader.addImportType("io.avaje.jsonb.Types");
       reader.addImportType(jsonOutputType());
-      this.jsonTypes = JsonBUtil.jsonTypes(reader);
-      jsonTypes.values().stream()
-          .map(UType::importTypes)
-          .forEach(reader::addImportTypes);
-    } else {
-      this.jsonTypes = Map.of();
     }
     reader.addImportType("io.helidon.common.media.type.MediaTypes");
     reader.addImportType("io.helidon.common.parameters.Parameters");

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

@@ -26,16 +26,10 @@ class ControllerWriter extends BaseControllerWriter {
 
   ControllerWriter(ControllerReader reader, boolean jsonb) throws IOException {
     super(reader);
-    this.useJsonB = jsonb;
-    if (useJsonB) {
-      reader.addImportType("io.avaje.jsonb.Jsonb");
-      reader.addImportType("io.avaje.jsonb.JsonType");
-      reader.addImportType("io.avaje.jsonb.Types");
-      this.jsonTypes = JsonBUtil.jsonTypes(reader);
-      jsonTypes.values().stream().map(UType::importTypes).forEach(reader::addImportTypes);
-    } else {
-      this.jsonTypes = Map.of();
-    }
+    final var detectJsonB = JsonBUtil.detect(jsonb, reader);
+    this.useJsonB = detectJsonB.useJsonB();
+    this.jsonTypes = detectJsonB.jsonTypes();
+
     reader.addImportType("io.javalin.plugin.Plugin");
     if (javalin6) {
       reader.addImportType("io.javalin.config.JavalinConfig");

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

@@ -20,7 +20,9 @@ class ControllerWriter extends BaseControllerWriter {
 
   ControllerWriter(ControllerReader reader, boolean jsonb) throws IOException {
     super(reader);
-    this.useJsonB = jsonb;
+    final var detectJsonB = JsonBUtil.detect(jsonb, reader);
+    this.useJsonB = detectJsonB.useJsonB();
+    this.jsonTypes = detectJsonB.jsonTypes();
     reader.addImportType(API_CONTEXT);
     reader.addImportType(API_ROUTING);
     reader.addImportType("java.io.IOException");
@@ -40,15 +42,6 @@ class ControllerWriter extends BaseControllerWriter {
         reader.addImportType("io.avaje.jex.htmx.TemplateContentCache");
       }
     }
-    if (useJsonB) {
-      reader.addImportType("io.avaje.jsonb.Jsonb");
-      reader.addImportType("io.avaje.jsonb.JsonType");
-      reader.addImportType("io.avaje.jsonb.Types");
-      this.jsonTypes = JsonBUtil.jsonTypes(reader);
-      jsonTypes.values().stream().map(UType::importTypes).forEach(reader::addImportTypes);
-    } else {
-      this.jsonTypes = Map.of();
-    }
   }
 
   void write() {