add jsonb types to imports

Author: SentryMan

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

@@ -1,6 +1,5 @@
 package io.avaje.http.generator.core;
 
-import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Consumer;
@@ -56,14 +55,10 @@ public static void writeJsonbType(UType type, Append writer) {
           break;
         default:
           {
-            try {
-              if (Collection.class.isAssignableFrom(Class.forName(type.mainType())))
-                throw new UnsupportedOperationException(
-                    "Only java.util Map, Set and List are supported JsonB Controller Collection Types");
-            } catch (final ClassNotFoundException e) {
+            if (type.mainType().contains("java.util"))
               throw new UnsupportedOperationException(
                   "Only java.util Map, Set and List are supported JsonB Controller Collection Types");
-            }
+
             final var params =
                 type.allTypes().stream().skip(1).collect(Collectors.joining(".class, ")) + ".class";
 

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

@@ -44,7 +44,7 @@ default String param0() {
    * Return all types associated with this Utype.
    */
   default List<String> allTypes() {
-    return null;
+    return List.of();
   }
 
   /**

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

@@ -1,6 +1,7 @@
 package io.avaje.http.generator.javalin;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 import io.avaje.http.generator.core.BaseControllerWriter;
@@ -30,6 +31,11 @@ class ControllerWriter extends BaseControllerWriter {
       reader.addImportType("io.avaje.jsonb.JsonType");
       reader.addImportType("io.avaje.jsonb.Types");
       this.jsonTypes = JsonBUtil.jsonTypes(reader);
+      jsonTypes.values().stream()
+          .map(UType::allTypes)
+          .flatMap(List::stream)
+          .filter(s -> !s.contains("java.lang"))
+          .forEach(reader::addImportType);
     } else {
       this.jsonTypes = Map.of();
     }
@@ -85,7 +91,9 @@ private void writeClassStart() {
     }
 
     for (final UType type : jsonTypes.values()) {
-      writer.append("  private final JsonType<%s> %sJsonType;", PrimitiveUtil.wrap(type.full()), type.shortName()).eol();
+      final var typeString = PrimitiveUtil.wrap(type.shortType()).replace(",", ", ");
+
+      writer.append("  private final JsonType<%s> %sJsonType;", typeString, type.shortName()).eol();
     }
     writer.eol();
 

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

@@ -21,7 +21,13 @@ class ControllerWriter extends BaseControllerWriter {
     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::allTypes)
+          .flatMap(List::stream)
+          .filter(s -> !s.contains("java.lang"))
+          .forEach(reader::addImportType);
     } else {
       this.jsonTypes = Map.of();
     }
@@ -87,7 +93,9 @@ private void writeClassStart() {
       writer.append("  private final Validator validator;").eol();
     }
     for (final UType type : jsonTypes.values()) {
-      writer.append("  private final JsonType<%s> %sJsonType;", PrimitiveUtil.wrap(type.full()), type.shortName()).eol();
+      final var typeString = PrimitiveUtil.wrap(type.shortType()).replace(",", ", ");
+
+      writer.append("  private final JsonType<%s> %sJsonType;", typeString, type.shortName()).eol();
     }
     writer.eol();