handle array

Author: SentryMan

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

@@ -34,12 +34,7 @@ class ClientMethodWriter {
   void addImportTypes(ControllerReader reader) {
     reader.addImportTypes(returnType.importTypes());
     for (final MethodParam param : method.params()) {
-      final var type = param.utype();
-      final var type0 = type.param0();
-      final var type1 = type.param1();
-      reader.addImportType(type.mainType().replace("[]", ""));
-      if (type0 != null) reader.addImportType(type0.replace("[]", ""));
-      if (type1 != null) reader.addImportType(type1.replace("[]", ""));
+      reader.addImportTypes(param.utype().importTypes());
     }
   }
 

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

@@ -60,7 +60,7 @@ public static void writeJsonbType(UType type, Append writer) {
                   "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";
+                type.importTypes().stream().skip(1).collect(Collectors.joining(".class, ")) + ".class";
 
             writer.append("Types.newParameterizedType(%s.class, %s))", type.mainType(), params);
           }

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

@@ -106,7 +106,9 @@ public String full() {
 
     @Override
     public Set<String> importTypes() {
-      return rawType.startsWith("java.lang.") ? Set.of() : Collections.singleton(rawType);
+      return rawType.startsWith("java.lang.") && rawType.indexOf('.') > -1
+          ? Set.of()
+          : Collections.singleton(rawType.replace("[]", ""));
     }
 
     @Override
@@ -164,7 +166,7 @@ public Set<String> importTypes() {
       Set<String> set = new LinkedHashSet<>();
       for (String type : allTypes) {
         if (!type.startsWith("java.lang.") && type.indexOf('.') > -1) {
-          set.add(type);
+          set.add(type.replace("[]", ""));
         }
       }
       return set;

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

@@ -33,8 +33,7 @@ class ControllerWriter extends BaseControllerWriter {
       this.jsonTypes = JsonBUtil.jsonTypes(reader);
       jsonTypes.values().stream()
           .map(UType::importTypes)
-          .flatMap(Set::stream)
-          .forEach(reader::addImportType);
+          .forEach(reader::addImportTypes);
     } else {
       this.jsonTypes = Map.of();
     }

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

@@ -26,8 +26,7 @@ class ControllerWriter extends BaseControllerWriter {
       this.jsonTypes = JsonBUtil.jsonTypes(reader);
       jsonTypes.values().stream()
           .map(UType::importTypes)
-          .flatMap(Set::stream)
-          .forEach(reader::addImportType);
+          .forEach(reader::addImportTypes);
     } else {
       this.jsonTypes = Map.of();
     }