remove jsonb generation if no jsontypes available

Author: SentryMan

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

@@ -21,24 +21,12 @@ class ControllerWriter extends BaseControllerWriter {
   private static final String JSON_JsonOutput = "io.avaje.json.stream.JsonOutput";
   private static final String JSONB_JsonOutput = "io.avaje.jsonb.stream.JsonOutput";
 
-  private final boolean useJsonB;
+  private boolean useJsonB;
   private final Map<String, UType> jsonTypes;
 
   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");
-      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");
     reader.addImportType("io.helidon.webserver.http.HttpRouting");
@@ -70,6 +58,20 @@ class ControllerWriter extends BaseControllerWriter {
         reader.addImportType("io.avaje.htmx.nima.TemplateContentCache");
       }
     }
+    if (useJsonB) {
+      this.jsonTypes = JsonBUtil.jsonTypes(reader);
+      if (this.jsonTypes.isEmpty()) {
+        useJsonB = false;
+        return;
+      }
+      reader.addImportType("io.avaje.jsonb.Jsonb");
+      reader.addImportType("io.avaje.jsonb.JsonType");
+      reader.addImportType("io.avaje.jsonb.Types");
+      reader.addImportType(jsonOutputType());
+      jsonTypes.values().stream().map(UType::importTypes).forEach(reader::addImportTypes);
+    } else {
+      this.jsonTypes = Map.of();
+    }
   }
 
   private static String jsonOutputType() {

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

@@ -20,22 +20,14 @@
 class ControllerWriter extends BaseControllerWriter {
 
   private static final String AT_GENERATED = "@Generated(\"avaje-javalin-generator\")";
-  private final boolean useJsonB;
+  private boolean useJsonB;
   private final Map<String, UType> jsonTypes;
   private final boolean javalin6 = ProcessingContext.javalin6();
 
   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();
-    }
+
     reader.addImportType("io.javalin.plugin.Plugin");
     if (javalin6) {
       reader.addImportType("io.javalin.config.JavalinConfig");
@@ -44,6 +36,19 @@ class ControllerWriter extends BaseControllerWriter {
     } else {
       reader.addImportType("io.javalin.Javalin");
     }
+    if (useJsonB) {
+      this.jsonTypes = JsonBUtil.jsonTypes(reader);
+      if (this.jsonTypes.isEmpty()) {
+        useJsonB = false;
+        return;
+      }
+      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);
+    } else {
+      this.jsonTypes = Map.of();
+    }
   }
 
   void write() {

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

@@ -15,7 +15,7 @@ class ControllerWriter extends BaseControllerWriter {
   private static final String AT_GENERATED = "@Generated(\"avaje-jex-generator\")";
   private static final String API_CONTEXT = "io.avaje.jex.http.Context";
   private static final String API_ROUTING = "io.avaje.jex.Routing";
-  private final boolean useJsonB;
+  private boolean useJsonB;
   private final Map<String, UType> jsonTypes;
 
   ControllerWriter(ControllerReader reader, boolean jsonb) throws IOException {
@@ -41,10 +41,14 @@ class ControllerWriter extends BaseControllerWriter {
       }
     }
     if (useJsonB) {
+      this.jsonTypes = JsonBUtil.jsonTypes(reader);
+      if (this.jsonTypes.isEmpty()) {
+        useJsonB = false;
+        return;
+      }
       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();