directly get utype

Author: SentryMan

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

@@ -45,15 +45,15 @@ public static void writeJsonbType(UType type, Append writer) {
     } else {
       switch (type.mainType()) {
         case "java.util.List":
-          writeType(UType.parse(type.paramRaw()), writer);
+          writeType(type.paramRaw(), writer);
           writer.append(".list()");
           break;
         case "java.util.Set":
-          writeType(UType.parse(type.paramRaw()), writer);
+          writeType(type.paramRaw(), writer);
           writer.append(".set()");
           break;
         case "java.util.Map":
-          writeType(UType.parse(type.paramRaw()), writer);
+          writeType(type.paramRaw(), writer);
           writer.append(".map()");
           break;
         default:

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

@@ -135,7 +135,7 @@ public String mainType() {
    */
   class Generic implements UType {
     final String rawType;
-    final String rawParamType;
+    final UType rawParamType;
     final List<String> allTypes;
     final String shortRawType;
     final String shortName;
@@ -145,15 +145,18 @@ class Generic implements UType {
       this.allTypes = Arrays.asList(rawType.split("[<|>|,]"));
       this.shortRawType = shortRawType(rawType, allTypes);
       this.shortName = Util.name(shortRawType);
-      this.rawParamType = extractCollectionParam();
+      final var paramTypeString = extractRawParam();
+      this.rawParamType = paramTypeString != null ? UType.parse(paramTypeString) : null;
     }
 
-    private String extractCollectionParam() {
+    private String extractRawParam() {
 
       switch (mainType()) {
         case "java.util.Set":
         case "java.util.Stream":
         case "java.util.List":
+        case "java.util.concurrent.CompletableFuture":
+        case "io.avaje.http.client.HttpCall":
           var first = rawType.indexOf("<") + 1;
           var end = rawType.lastIndexOf(">");
           return rawType.substring(first, end);
@@ -162,7 +165,7 @@ private String extractCollectionParam() {
           end = rawType.lastIndexOf(">");
           return rawType.substring(first, end);
         default:
-          return rawType;
+          return null;
       }
     }
 
@@ -237,7 +240,7 @@ public String param1() {
     }
 
     @Override
-    public String paramRaw() {
+    public UType paramRaw() {
       return rawParamType;
     }
   }

tests/test-client/pom.xml

@@ -30,7 +30,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.16</version>
+      <version>1.20</version>
     </dependency>
 
     <dependency>