jooby-apt: add more tests to #3476 and #3477

Author: jknack

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

@@ -167,7 +167,7 @@ private String methodReference(boolean kt, String thisRef, String methodName) {
       var returnType = getReturnType();
       var generics = returnType.getArgumentsString(kt, true, Set.of(TypeKind.TYPEVAR));
       if (!generics.isEmpty()) {
-        return CodeBlock.of(") { ", methodName, generics, "(ctx) }");
+        return CodeBlock.of(") { ctx -> ", methodName, generics, "(ctx) }");
       }
     }
     return thisRef + methodName + ")";

modules/jooby-kotlin/src/test/kotlin/io/jooby/kt/Idioms.kt

@@ -5,9 +5,7 @@
  */
 package io.jooby.kt
 
-import io.jooby.Context
 import io.jooby.Jooby
-import io.jooby.Reified
 import io.jooby.RouterOption.IGNORE_CASE
 import io.jooby.RouterOption.IGNORE_TRAILING_SLASH
 import io.jooby.ServiceKey
@@ -110,8 +108,6 @@ class Idioms :
       get("/ctx-access") { ctx.getRequestPath() }
     }
 
-    get("/") { foo<Any>(ctx) }.setReturnType(Reified.list<Any>(Any::class.java).type)
-
     install(::SubApp)
 
     install("/with-path", ::SubApp)
@@ -129,7 +125,3 @@ class Idioms :
 class IdiomsController {}
 
 class IdiomsPojo {}
-
-fun <E> foo(ctx: Context): List<E> {
-  return listOf()
-}

tests/src/test/kotlin/i3476/C3476.kt

@@ -0,0 +1,13 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package i3476
+
+import io.jooby.annotation.GET
+import io.jooby.annotation.QueryParam
+
+class C3476 {
+  @GET("/3476") fun <E> shouldGenerateGenerics(@QueryParam bean: List<E>): List<E> = listOf()
+}

tests/src/test/kotlin/i3476/Issue3476.kt

@@ -0,0 +1,25 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package i3476
+
+import io.jooby.jackson.JacksonModule
+import io.jooby.junit.ServerTest
+import io.jooby.junit.ServerTestRunner
+import io.jooby.kt.Kooby
+import org.junit.jupiter.api.Assertions.assertEquals
+
+class Issue3476 {
+  @ServerTest
+  fun shouldGenerateGoodKotlinRouteMetadata(runner: ServerTestRunner) =
+    runner
+      .use {
+        Kooby {
+          install(JacksonModule())
+          mvc(C3476_())
+        }
+      }
+      .ready { client -> client.get("/3476") { rsp -> assertEquals("[]", rsp.body!!.string()) } }
+}

tests/src/test/kotlin/i3477/C3477.kt

@@ -0,0 +1,14 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package i3477
+
+import io.jooby.Context
+import io.jooby.annotation.GET
+import io.jooby.annotation.Transactional
+
+class C3477 {
+  @GET("/3477") @Transactional(false) fun generateToken(ctx: Context) = ctx.route.attributes
+}

tests/src/test/kotlin/i3477/Issue3477.kt

@@ -0,0 +1,29 @@
+/*
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package i3477
+
+import io.jooby.jackson.JacksonModule
+import io.jooby.junit.ServerTest
+import io.jooby.junit.ServerTestRunner
+import io.jooby.kt.Kooby
+import org.junit.jupiter.api.Assertions.assertEquals
+
+class Issue3477 {
+  @ServerTest
+  fun shouldGenerateGoodKotlinRouteMetadata(runner: ServerTestRunner) =
+    runner
+      .use {
+        Kooby {
+          install(JacksonModule())
+          mvc(C3477_())
+        }
+      }
+      .ready { client ->
+        client.get("/3477") { rsp ->
+          assertEquals("{\"Transactional\":false}", rsp.body!!.string())
+        }
+      }
+}