API tool fails to correctly detect parameter type fix jooby-project#1079

jknack · jknack · commit 743956a8656a · 2018-05-18T10:47:14.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
@@ -950,7 +950,7 @@ private java.lang.reflect.Type parameterType(final ClassLoader loader, final Abs
         /** to(String.class); toOptional; toList(); */
         String owner = Type.getReturnType(node.desc).getClassName();
         AbstractInsnNode prev = node.getPrevious();
-        if (prev instanceof FieldInsnNode) {
+        if (prev instanceof FieldInsnNode && ((MethodInsnNode) n).name.equals("toEnum")) {
           /** toEnum(Letter.A); */
           return loadType(loader, ((FieldInsnNode) prev).owner);
         }
@@ -961,6 +961,8 @@ private java.lang.reflect.Type parameterType(final ClassLoader loader, final Abs
           if (cst instanceof Type) {
             toType = loadType(loader, ((Type) cst).getClassName());
           }
+        } else if (prev instanceof FieldInsnNode) {
+          toType = loadType(loader, ((FieldInsnNode) prev).owner);
         }
         // JoobyKt.toOptional
         AbstractInsnNode next = node.getNext();
@@ -1022,6 +1024,15 @@ private java.lang.reflect.Type parameterType(final ClassLoader loader, final Abs
         result = parameterType(loader, next);
       }
       return result;
+    } else if (n instanceof FieldInsnNode) {
+      AbstractInsnNode next = n.getNext();
+      if (next instanceof MethodInsnNode) {
+        if (((MethodInsnNode) next).name.equals("toOptional")) {
+          return Types.newParameterizedType(Optional.class, loadType(loader, ((FieldInsnNode) n).owner));
+        } else if (((MethodInsnNode) next).name.equals("getOrCreateKotlinClass")) {
+          return loadType(loader, ((FieldInsnNode) n).owner);
+        }
+      }
     }
     return Object.class;
   }
diff --git a/modules/jooby-apitool/src/test/java/issues/Issue1079.java b/modules/jooby-apitool/src/test/java/issues/Issue1079.java
@@ -0,0 +1,52 @@
+package issues;
+
+import kt.App1079;
+import org.jooby.apitool.ApiParser;
+import org.jooby.apitool.RouteMethod;
+import org.jooby.apitool.RouteMethodAssert;
+import org.jooby.apitool.RouteParameter;
+import org.junit.Test;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+public class Issue1079 {
+
+  @Test
+  public void shouldDetectKotlinNativeType() throws Exception {
+    List<RouteMethod> routes = new ApiParser(dir()).parseFully(new App1079());
+
+    new RouteMethodAssert(routes)
+        .next(r -> {
+          r.returnType(String.class);
+          r.method("GET");
+          r.pattern("/");
+          r.description(null);
+          r.summary(null);
+          r.returns("java.lang.String");
+          r.param(p -> {
+            p.type("java.util.Optional<java.lang.Integer>");
+            p.name("p1");
+            p.kind(RouteParameter.Kind.QUERY);
+          }).param(p -> {
+            p.type("java.util.Optional<java.lang.Integer>");
+            p.name("p2");
+            p.kind(RouteParameter.Kind.QUERY);
+          }).param(p -> {
+            p.type("int");
+            p.name("p3");
+            p.kind(RouteParameter.Kind.QUERY);
+          });
+        })
+        .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/kt/App1079.kt b/modules/jooby-apitool/src/test/java/kt/App1079.kt
@@ -0,0 +1,12 @@
+package kt
+
+import org.jooby.*
+
+class App1079 : Kooby({
+    get {
+        val page = param("p1").toOptional(Int::class) // uses org.jooby.toOptional
+        val pageSize = param("p2").toOptional(Int::class.java)
+        val p3 = param("p3").to(Int::class)
+        "optional"
+    }
+})

Original file line number	Diff line number	Diff line change
`@@ -950,7 +950,7 @@ private java.lang.reflect.Type parameterType(final ClassLoader loader, final Abs`
`950`	`950`	`/** to(String.class); toOptional; toList(); */`
`951`	`951`	`String owner = Type.getReturnType(node.desc).getClassName();`
`952`	`952`	`AbstractInsnNode prev = node.getPrevious();`
`953`		`- if (prev instanceof FieldInsnNode) {`
	`953`	`+ if (prev instanceof FieldInsnNode && ((MethodInsnNode) n).name.equals("toEnum")) {`
`954`	`954`	`/** toEnum(Letter.A); */`
`955`	`955`	`return loadType(loader, ((FieldInsnNode) prev).owner);`
`956`	`956`	`}`
`@@ -961,6 +961,8 @@ private java.lang.reflect.Type parameterType(final ClassLoader loader, final Abs`
`961`	`961`	`if (cst instanceof Type) {`
`962`	`962`	`toType = loadType(loader, ((Type) cst).getClassName());`
`963`	`963`	`}`
	`964`	`+ } else if (prev instanceof FieldInsnNode) {`
	`965`	`+ toType = loadType(loader, ((FieldInsnNode) prev).owner);`
`964`	`966`	`}`
`965`	`967`	`// JoobyKt.toOptional`
`966`	`968`	`AbstractInsnNode next = node.getNext();`
`@@ -1022,6 +1024,15 @@ private java.lang.reflect.Type parameterType(final ClassLoader loader, final Abs`
`1022`	`1024`	`result = parameterType(loader, next);`
`1023`	`1025`	`}`
`1024`	`1026`	`return result;`
	`1027`	`+ } else if (n instanceof FieldInsnNode) {`
	`1028`	`+ AbstractInsnNode next = n.getNext();`
	`1029`	`+ if (next instanceof MethodInsnNode) {`
	`1030`	`+ if (((MethodInsnNode) next).name.equals("toOptional")) {`
	`1031`	`+ return Types.newParameterizedType(Optional.class, loadType(loader, ((FieldInsnNode) n).owner));`
	`1032`	`+ } else if (((MethodInsnNode) next).name.equals("getOrCreateKotlinClass")) {`
	`1033`	`+ return loadType(loader, ((FieldInsnNode) n).owner);`
	`1034`	`+ }`
	`1035`	`+ }`
`1025`	`1036`	`}`
`1026`	`1037`	`return Object.class;`
`1027`	`1038`	`}`