ApiTool to interpret path parameters correctly in POSTs without Body annotation fix jooby-project#1056 (jooby-project#1058)

haggish · jknack · commit bcbd615dba11 · 2018-04-16T09:46:42.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
@@ -1209,11 +1209,14 @@ private static RouteParameter toRouteParameter(String pattern, final Parameter p
               .isPresent())
           .findFirst()
           .isPresent();
+      if (isPathParam(pattern, pname)) {
+        return RouteParameter.Kind.PATH;
+      }
       boolean formLike = !hasBody && p.getDeclaringExecutable().getAnnotation(POST.class) != null;
       if (formLike) {
         return RouteParameter.Kind.FORM;
       }
-      return isPathParam(pattern, pname) ? RouteParameter.Kind.PATH : RouteParameter.Kind.QUERY;
+      return RouteParameter.Kind.QUERY;
     };
     return new RouteParameter(pname, kind.get(), p.getParameterizedType(), null);
   }
diff --git a/modules/jooby-apitool/src/test/java/apps/App1056.java b/modules/jooby-apitool/src/test/java/apps/App1056.java
@@ -0,0 +1,27 @@
+package apps;
+
+import org.jooby.Jooby;
+import org.jooby.Upload;
+import org.jooby.mvc.POST;
+import org.jooby.mvc.Path;
+
+public class App1056 extends Jooby {
+
+    {
+        use(CatResource.class);
+    }
+
+    @Path("/api/inner/cat")
+    public static class CatResource {
+
+        @Path("/:name/pat")
+        @POST
+        public void pat(final String name) {
+        }
+
+        @Path("/:name/feed")
+        @POST
+        public void feed(final String name, final Upload food) {
+        }
+    }
+}
diff --git a/modules/jooby-apitool/src/test/java/org/jooby/apitool/Issue1056.java b/modules/jooby-apitool/src/test/java/org/jooby/apitool/Issue1056.java
@@ -0,0 +1,50 @@
+package org.jooby.apitool;
+
+import apps.App1056;
+import org.junit.Test;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.jooby.Upload;
+
+
+public class Issue1056 {
+
+  @Test
+  public void shouldWorkWithBodilessAndMultiformPosts() throws Exception {
+    new RouteMethodAssert(new ApiParser(dir()).parseFully(new App1056()))
+        .next(r -> {
+          r.returnType(void.class);
+          r.pattern("/api/inner/cat/{name}/pat");
+          r.method("POST");
+          r.param(p -> {
+            p.name("name")
+                .type(String.class)
+                .kind(RouteParameter.Kind.PATH);
+          });
+        })
+        .next(r -> {
+          r.returnType(void.class);
+          r.pattern("/api/inner/cat/{name}/feed");
+          r.method("POST");
+          r.param(p -> {
+            p.name("name")
+                .type(String.class)
+                .kind(RouteParameter.Kind.PATH);
+          }).param(p -> {
+            p.name("food")
+                .type(Upload.class)
+                .kind(RouteParameter.Kind.FILE);
+          });
+        })
+        .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;
+  }
+}
