ApiTool kotlin: expand query/form bean object as single parameters jooby-project#1096

jknack · jknack · commit 16aa37464ea2 · 2018-05-23T10:35:37.000-03:00
diff --git a/modules/jooby-apitool/src/test/java/issues/Issue1096.java b/modules/jooby-apitool/src/test/java/issues/Issue1096.java
@@ -7,6 +7,8 @@
 import apps.Form1096;
 import apps.Param1096;
 import io.swagger.util.Yaml;
+import kt.App1096e;
+import kt.Query1096;
 import org.jooby.apitool.ApiParser;
 import org.jooby.apitool.RouteMethod;
 import org.jooby.apitool.RouteMethodAssert;
@@ -311,6 +313,62 @@ public void shouldExpandQueryBeanFromMvc() throws Exception {
             .build(null, routes)));
   }
 
+  @Test
+  public void shouldExpandQueryBeanFromKotlin() throws Exception {
+    List<RouteMethod> routes = new ApiParser(dir()).parseFully(new App1096e());
+
+    new RouteMethodAssert(routes)
+        .next(r -> {
+          r.returnType(String.class);
+          r.method("GET");
+          r.pattern("/1096/kt");
+          r.description(null);
+          r.summary(null);
+          r.returns("java.lang.String");
+          r.param(p -> {
+            p.type(Query1096.class);
+            p.name("params");
+            p.kind(RouteParameter.Kind.QUERY);
+          });
+        })
+        .done();
+
+    assertEquals("---\n"
+        + "swagger: \"2.0\"\n"
+        + "tags:\n"
+        + "- name: \"kt\"\n"
+        + "consumes:\n"
+        + "- \"application/json\"\n"
+        + "produces:\n"
+        + "- \"application/json\"\n"
+        + "paths:\n"
+        + "  /1096/kt:\n"
+        + "    get:\n"
+        + "      tags:\n"
+        + "      - \"kt\"\n"
+        + "      operationId: \"getKt\"\n"
+        + "      parameters:\n"
+        + "      - name: \"name\"\n"
+        + "        in: \"query\"\n"
+        + "        required: true\n"
+        + "        type: \"string\"\n"
+        + "      - name: \"firstname\"\n"
+        + "        in: \"query\"\n"
+        + "        required: false\n"
+        + "        type: \"string\"\n"
+        + "      - name: \"picture.url\"\n"
+        + "        in: \"query\"\n"
+        + "        required: true\n"
+        + "        type: \"string\"\n"
+        + "      responses:\n"
+        + "        200:\n"
+        + "          description: \"java.lang.String\"\n"
+        + "          schema:\n"
+        + "            type: \"string\"\n", Yaml
+        .mapper().writer().withDefaultPrettyPrinter().writeValueAsString(new SwaggerBuilder()
+            .build(null, routes)));
+  }
+
   private Path dir() {
     Path userdir = Paths.get(System.getProperty("user.dir"));
     if (!userdir.toString().endsWith("jooby-apitool")) {
diff --git a/modules/jooby-apitool/src/test/java/kt/App1096e.kt b/modules/jooby-apitool/src/test/java/kt/App1096e.kt
@@ -0,0 +1,19 @@
+package kt
+
+import org.jooby.Kooby
+
+data class Picture1096(val url: String)
+
+data class Query1096(
+        val name: String,
+        val firstname: String?,
+        val picture: Picture1096)
+
+class App1096e : Kooby({
+    path("/1096/kt") {
+        get {
+            val q = params(Query1096::class.java)
+            q.toString()
+        }
+    }
+})
diff --git a/modules/jooby-lang-kotlin/src/main/kotlin/org/jooby/Jooby.kt b/modules/jooby-lang-kotlin/src/main/kotlin/org/jooby/Jooby.kt
@@ -1,9 +1,8 @@
 package org.jooby
 
-import kotlin.reflect.KClass
 import org.jooby.spi.Server
-import java.util.SortedSet
-import com.sun.xml.internal.bind.v2.schemagen.episode.Klass
+import java.util.*
+import kotlin.reflect.KClass
 
 @DslMarker
 annotation class DslJooby
@@ -466,3 +465,7 @@ inline fun <reified T> Request.header(name: String): T {
 inline fun <reified T> Request.body(): T {
   return body().to(T::class.java)
 }
+
+inline fun <reified T> Request.params(): T {
+  return params(T::class.java)
+}
