Parameter type info missing depending on code style (ApiTool/Swagger) fix jooby-project#987

jknack · jknack · commit f9768993029a · 2018-02-04T22:36:22.000-03:00
diff --git a/modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/BytecodeRouteParser.java b/modules/jooby-apitool/src/main/java/org/jooby/internal/apitool/BytecodeRouteParser.java
@@ -985,13 +985,22 @@ private java.lang.reflect.Type parameterType(final ClassLoader loader, final Abs
       // mv.visitLdcInsn("req.param(\"p1\")");
       // mv.visitMethodInsn(INVOKESTATIC, "kotlin/jvm/internal/Intrinsics", "checkExpressionValueIsNotNull", "(Ljava/lang/Object;Ljava/lang/String;)V", false);
       // mv.visitMethodInsn(INVOKESTATIC, "org/jooby/JoobyKt", "getValue", "(Lorg/jooby/Mutant;)Ljava/lang/String;", false);
-      AbstractInsnNode methodInsnNode = new Insn<>(null, n)
+      AbstractInsnNode next = new Insn<>(null, n)
           .next()
           .filter(MethodInsnNode.class::isInstance)
           .skip(1)
           .findFirst()
           .orElse(null);
-      return parameterType(loader, methodInsnNode);
+      java.lang.reflect.Type result = parameterType(loader, next);
+      if (result == Object.class) {
+        next = new Insn<>(null, n)
+            .next()
+            .filter(TypeInsnNode.class::isInstance)
+            .findFirst()
+            .orElse(null);
+        result = parameterType(loader, next);
+      }
+      return result;
     }
     return Object.class;
   }
diff --git a/modules/jooby-apitool/src/test/java/issues/App987.kt b/modules/jooby-apitool/src/test/java/issues/App987.kt
@@ -0,0 +1,37 @@
+package issues
+
+import com.typesafe.config.Config
+import org.jooby.Err
+import org.jooby.Kooby
+
+data class LoginRequest(val username: String)
+
+class App987 : Kooby({
+    /**
+    Authenticates a user, generating an Authorization token.
+    @param body contains the user's credentials.
+    @return contains the apiToken
+     */
+    post("/api/login") { req ->
+        val params: LoginRequest
+        try {
+            params = req.body(LoginRequest::class.java)
+        } catch (e: Exception) {
+            throw Err(401, "Could not parse request: ${e.message}")
+        }
+        params.username
+    }
+
+    get("/use/config") {
+        val conf = require(Config::class.java)
+        val useName = conf.getBoolean("name")
+        val params: LoginRequest
+        try {
+            params = body(LoginRequest::class.java)
+        } catch (e: Exception) {
+            throw Err(401, "Could not parse request: ${e.message} ${useName}")
+        }
+        params.username
+    }
+
+})
diff --git a/modules/jooby-apitool/src/test/java/issues/Issue987.java b/modules/jooby-apitool/src/test/java/issues/Issue987.java
@@ -0,0 +1,47 @@
+package issues;
+
+import org.jooby.apitool.ApiParser;
+import org.jooby.apitool.RouteMethodAssert;
+import org.jooby.apitool.RouteParameter;
+import org.junit.Test;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class Issue987 {
+
+  @Test
+  public void shouldNotLostBodyParameterType() throws Exception {
+    new RouteMethodAssert(new ApiParser(dir()).parseFully(new App987()))
+        .next(r -> {
+          r.returnType(String.class);
+          r.pattern("/api/login");
+          r.description("Authenticates a user, generating an Authorization token.");
+          r.summary(null);
+          r.param(p -> {
+            p.name("body")
+                .type(LoginRequest.class)
+                .kind(RouteParameter.Kind.BODY);
+          });
+        })
+        .next(r -> {
+          r.returnType(String.class);
+          r.pattern("/use/config");
+          r.description(null);
+          r.summary(null);
+          r.param(p -> {
+            p.name("body")
+                .type(LoginRequest.class)
+                .kind(RouteParameter.Kind.BODY);
+          });
+        }).done();
+  }
+
+  private Path dir() {
+    Path userdir = Paths.get(System.getProperty("user.dir"));
+    if (!userdir.toString().endsWith("jooby-apitool")) {
+      userdir = userdir.resolve("modules").resolve("jooby-apitool");
+    }
+    return userdir;
+  }
+}
diff --git a/modules/jooby-apitool/src/test/java/org/jooby/apitool/RouteMethodAssert.java b/modules/jooby-apitool/src/test/java/org/jooby/apitool/RouteMethodAssert.java
@@ -11,7 +11,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-class RouteMethodAssert {
+public class RouteMethodAssert {
 
   public static class RouteParameterMatcher {
     private final Iterator<RouteParameter> parameters;
