mvc: kotlin: generate controller don't support Nested generics return type #3488

- fix #3488
- fix generate kotlin nested generics

Author: jknack

modules/jooby-apt/src/main/java/io/jooby/internal/apt/CodeBlock.java

@@ -61,14 +61,14 @@ public static String type(boolean kt, CharSequence value) {
             // java.util.List => List
             from = "java.util.".length();
           }
-          yield result.substring(from, end) + generics(true, result, arg);
+          yield result.substring(from, end) + ktGenerics(result, arg);
         }
       };
     }
     return result;
   }
 
-  private static String generics(boolean kt, String type, int i) {
+  private static String ktGenerics(String type, int i) {
     if (i == -1) {
       return "";
     }
@@ -78,7 +78,7 @@ private static String generics(boolean kt, String type, int i) {
     for (int j = i + 1; j < type.length(); j++) {
       char ch = type.charAt(j);
       if (ch == '>' || ch == ',') {
-        buffer.append(type(kt, arg));
+        buffer.append(type(true, arg));
         buffer.append(ch);
         if (ch == ',') {
           buffer.append(' ');
@@ -88,6 +88,9 @@ private static String generics(boolean kt, String type, int i) {
         arg.append(ch);
       }
     }
+    if (!arg.isEmpty()) {
+      buffer.append(type(true, arg));
+    }
     return buffer.toString();
   }
 }

modules/jooby-apt/src/test/java/tests/i3488/Issue3488.java

@@ -0,0 +1,22 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package tests.i3488;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+import io.jooby.internal.apt.CodeBlock;
+
+public class Issue3488 {
+
+  @Test
+  public void shouldGenerateKtGenerics() {
+    assertEquals(
+        "pgk.Results<List<pgk.UserInfo>>",
+        CodeBlock.type(true, "pgk.Results<java.util.List<pgk.UserInfo>>"));
+  }
+}