- build: more fixes on refactor/generator split

Author: jknack

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

@@ -213,15 +213,14 @@ public List<String> generateHandlerCall(boolean kt) {
       handlerTypeString = Types.PROJECTED + "<" + returnTypeString + ">";
     }
 
-    boolean nullable =
-        methodCallHeader(
-            kt,
-            "ctx",
-            methodName,
-            buffer,
-            handlerTypeGenerics,
-            handlerTypeString,
-            !method.getThrownTypes().isEmpty());
+    methodCallHeader(
+        kt,
+        "ctx",
+        methodName,
+        buffer,
+        handlerTypeGenerics,
+        handlerTypeString,
+        !method.getThrownTypes().isEmpty());
 
     int controllerIndent = 2;
 
@@ -248,49 +247,27 @@ public List<String> generateHandlerCall(boolean kt) {
               statusCode,
               ")",
               semicolon(kt)));
-      buffer.add(
-          statement(
-              indent(controllerIndent),
-              "c.",
-              this.method.getSimpleName(),
-              paramList.toString(),
-              semicolon(kt)));
+
+      String call = buildMethodCall(kt, paramList.toString(), false, false);
+
+      buffer.add(statement(indent(controllerIndent), call, semicolon(kt)));
       buffer.add(
           statement(indent(controllerIndent), "return ctx.getResponseCode()", semicolon(kt)));
     } else if (returnType.is("io.jooby.StatusCode")) {
+      String call = buildMethodCall(kt, paramList.toString(), false, false);
+
       buffer.add(
           statement(
-              indent(controllerIndent),
-              kt ? "val" : "var",
-              " statusCode = c.",
-              this.method.getSimpleName(),
-              paramList.toString(),
-              semicolon(kt)));
+              indent(controllerIndent), kt ? "val" : "var", " statusCode = ", call, semicolon(kt)));
       buffer.add(
           statement(indent(controllerIndent), "ctx.setResponseCode(statusCode)", semicolon(kt)));
       buffer.add(statement(indent(controllerIndent), "return statusCode", semicolon(kt)));
     } else {
-      var castStr =
-          isProjectedReturnType
-              ? ""
-              : customReturnType.getArgumentsString(kt, false, Set.of(TypeKind.TYPEVAR));
-
-      // Force cast only if the return type contains Type Variables (like <E>)
-      var needsCast = !castStr.isEmpty();
-      var kotlinNotEnoughTypeInformation = !castStr.isEmpty() && kt ? "<Any>" : "";
-
-      var call =
-          of(
-              "c.",
-              this.method.getSimpleName(),
-              kotlinNotEnoughTypeInformation,
-              paramList.toString());
-
-      if (needsCast) {
-        setUncheckedCast(true);
-        // Use the RAW return type string for the cast, not the modified handler type
-        call = kt ? call + " as " + returnTypeString : "(" + returnTypeString + ") " + call;
-      }
+
+      // Leverage shared WebRoute logic for casting and type erasure!
+      String call =
+          buildMethodCall(kt, paramList.toString(), isProjectedReturnType, isProjectedReturnType);
+      boolean nullable = kt && isNullableKotlinReturn();
 
       // 3. ONLY wrap the call if it's a NON-projected type with a projection string
       if (projection != null && !isProjectedReturnType) {
@@ -300,16 +277,12 @@ public List<String> generateHandlerCall(boolean kt) {
                 indent(controllerIndent),
                 "return ",
                 projected,
-                kt && nullable ? "!!" : "",
+                nullable ? "!!" : "",
                 semicolon(kt)));
       } else {
         buffer.add(
             statement(
-                indent(controllerIndent),
-                "return ",
-                call,
-                kt && nullable ? "!!" : "",
-                semicolon(kt)));
+                indent(controllerIndent), "return ", call, nullable ? "!!" : "", semicolon(kt)));
       }
     }
 

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

@@ -517,7 +517,10 @@ public List<String> generateHandlerCall(boolean kt) {
 
     buffer.add(
         statement(indent(controllerIndent), var(kt), "c = this.factory.apply(ctx)", semicolon(kt)));
-    var call = CodeBlock.of("c.", this.method.getSimpleName(), paramList.toString());
+
+    // Leverage shared WebRoute logic for casting and type erasure!
+    String call = buildMethodCall(kt, paramList.toString(), false, true);
+    boolean nullable = kt && isNullableKotlinReturn();
 
     if (returnType.isVoid()) {
       buffer.add(statement(indent(controllerIndent), call, semicolon(kt)));
@@ -532,26 +535,20 @@ public List<String> generateHandlerCall(boolean kt) {
               indent(controllerIndent),
               "return io.jooby.rpc.trpc.TrpcResponse.of(",
               call,
+              nullable ? "!!" : "", // Shared nullability check
               ")",
               semicolon(kt)));
     }
 
     if (!parameters.isEmpty()) buffer.add(statement(indent(2), "}"));
     buffer.add(statement("}", System.lineSeparator()));
-    return buffer;
-  }
 
-  private String box(String type) {
-    return switch (type) {
-      case "int" -> "Integer";
-      case "long" -> "Long";
-      case "double" -> "Double";
-      case "float" -> "Float";
-      case "boolean" -> "Boolean";
-      case "byte" -> "Byte";
-      case "short" -> "Short";
-      case "char" -> "Character";
-      default -> type;
-    };
+    // Shared Unchecked Cast suppression
+    if (isUncheckedCast()) {
+      if (kt) buffer.addFirst(statement("@Suppress(\"UNCHECKED_CAST\")"));
+      else buffer.addFirst(statement("@SuppressWarnings(\"unchecked\")"));
+    }
+
+    return buffer;
   }
 }

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

@@ -10,9 +10,11 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.WildcardType;
 
@@ -136,4 +138,49 @@ public List<String> getJavaMethodSignature(boolean kt) {
         .map(it -> it + clazz(kt))
         .toList();
   }
+
+  public boolean isNullableKotlinReturn() {
+    return method.getAnnotationMirrors().stream()
+        .map(javax.lang.model.element.AnnotationMirror::getAnnotationType)
+        .map(java.util.Objects::toString)
+        .anyMatch(AnnotationSupport.NULLABLE);
+  }
+
+  protected String buildMethodCall(
+      boolean kt, String paramList, boolean preventCast, boolean isRpcWrapper) {
+    var customReturnType = getReturnType();
+    var castStr =
+        preventCast ? "" : customReturnType.getArgumentsString(kt, false, Set.of(TypeKind.TYPEVAR));
+
+    // Force cast ONLY if there's a Type Variable (<E> -> <Any>)
+    // OR if it's an RPC wrapper where strict Java generics conflict with Kotlin's nullable generics
+    var needsCast =
+        !castStr.isEmpty()
+            || (kt && !preventCast && isRpcWrapper && !customReturnType.getArguments().isEmpty());
+
+    var kotlinNotEnoughTypeInformation = !castStr.isEmpty() && kt ? "<Any>" : "";
+
+    var call = "c." + this.method.getSimpleName() + kotlinNotEnoughTypeInformation + paramList;
+
+    if (needsCast) {
+      setUncheckedCast(true);
+      var returnTypeString = CodeBlock.type(kt, customReturnType.toString());
+      call = kt ? call + " as " + returnTypeString : "(" + returnTypeString + ") " + call;
+    }
+    return call;
+  }
+
+  protected String box(String type) {
+    return switch (type) {
+      case "int" -> "Integer";
+      case "long" -> "Long";
+      case "double" -> "Double";
+      case "float" -> "Float";
+      case "boolean" -> "Boolean";
+      case "byte" -> "Byte";
+      case "short" -> "Short";
+      case "char" -> "Character";
+      default -> type;
+    };
+  }
 }