jooby-apt: generate kotlin source code ref #3449

- fix void routes on kotlin generator
jooby-project · Jun 18, 2024 · 48d4930 · 48d4930
1 parent 8b3062b
commit 48d4930
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/modules/jooby-apt/src/main/java/io/jooby/internal/apt/MvcRoute.java b/modules/jooby-apt/src/main/java/io/jooby/internal/apt/MvcRoute.java
@@ -166,7 +166,6 @@ public List<String> generateHandlerCall(boolean kt) {
     }
     var throwsException = !method.getThrownTypes().isEmpty();
     var returnTypeString = type(kt, getReturnType().toString());
-    var ctx = "ctx";
     if (kt) {
       if (throwsException) {
         buffer.add(statement("@Throws(Exception::class)"));
@@ -197,45 +196,46 @@ public List<String> generateHandlerCall(boolean kt) {
               throwsException ? "throws Exception {" : "{"));
     }
     if (returnType.isVoid()) {
+      if (kt) {
+        buffer.add(
+            statement(
+                indent(2),
+                "ctx.setResponseCode(if (ctx.getRoute().getMethod().equals(",
+                string("DELETE"),
+                ")) io.jooby.StatusCode.NO_CONTENT else io.jooby.StatusCode.OK)"));
+      } else {
+        buffer.add(
+            statement(
+                indent(2),
+                "ctx.setResponseCode(ctx.getRoute().getMethod().equals(",
+                string("DELETE"),
+                ") ? io.jooby.StatusCode.NO_CONTENT: io.jooby.StatusCode.OK)",
+                semicolon(false)));
+      }
       buffer.add(
           statement(
               indent(2),
-              "ctx.setResponseCode(",
-              ctx,
-              ".getRoute().getMethod().equals(",
-              string("DELETE"),
-              ") ?" + " io.jooby.StatusCode.NO_CONTENT: io.jooby.StatusCode.OK)",
-              semicolon(kt)));
-      buffer.add(
-          statement(
-              indent(2),
-              "this.factory.apply(",
-              ctx,
-              ").",
+              "this.factory.apply(ctx).",
               this.method.getSimpleName(),
               paramList.toString(),
               semicolon(kt)));
-      buffer.add(statement("return ", ctx, ".getResponseCode()", semicolon(kt)));
+      buffer.add(statement(indent(2), "return ctx.getResponseCode()", semicolon(kt)));
     } else if (returnType.is("io.jooby.StatusCode")) {
       buffer.add(
           statement(
               indent(2),
               isSuspendFun() ? "val" : "var",
-              " statusCode = this.factory.apply(",
-              ctx,
-              ").",
+              " statusCode = this.factory.apply(ctx).",
               this.method.getSimpleName(),
               paramList.toString(),
               semicolon(kt)));
-      buffer.add(statement(indent(2), ctx, ".setResponseCode(statusCode)", semicolon(kt)));
+      buffer.add(statement(indent(2), "ctx.setResponseCode(statusCode)", semicolon(kt)));
       buffer.add(statement(indent(2), "return statusCode", semicolon(kt)));
     } else {
       buffer.add(
           statement(
               indent(2),
-              "return this.factory.apply(",
-              ctx,
-              ").",
+              "return this.factory.apply(ctx).",
               this.method.getSimpleName(),
               paramList.toString(),
               semicolon(kt)));

diff --git a/modules/jooby-apt/src/test/java/tests/CustomRouterName.java b/modules/jooby-apt/src/test/java/tests/CustomRouterName.java
@@ -5,15 +5,11 @@
  */
 package tests;
 
-import java.util.concurrent.CompletableFuture;
-
 import io.jooby.annotation.GET;
 import io.jooby.annotation.QueryParam;
 
 public class CustomRouterName {
 
   @GET("/hello")
-  public CompletableFuture<String> hello(@QueryParam String name) {
-    return null;
-  }
+  public void hello(@QueryParam String name) {}
 }