param/body API: shortcut methods fix jooby-project#433

jknack · jknack · commit ccea9ad57f69 · 2016-07-24T21:40:45.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue433.java b/coverage-report/src/test/java/org/jooby/issues/Issue433.java
@@ -0,0 +1,36 @@
+package org.jooby.issues;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue433 extends ServerFeature {
+
+  public static class Bean {
+    String q;
+  }
+
+  {
+    get("/433", req -> {
+      Bean bean = req.params(Bean.class);
+      return bean.q;
+    });
+
+    post("/433", req -> {
+      Bean bean = req.body(Bean.class);
+      return bean.q;
+    });
+  }
+
+  @Test
+  public void shortCutMethods() throws Exception {
+    request()
+        .get("/433?q=q1")
+        .expect("q1");
+
+    request()
+        .post("/433")
+        .form()
+        .add("q", "q2")
+        .expect("q2");
+  }
+}
diff --git a/jooby/src/main/java/org/jooby/Request.java b/jooby/src/main/java/org/jooby/Request.java
@@ -133,6 +133,11 @@ public Mutant params() {
       return req.params();
     }
 
+    @Override
+    public <T> T params(final Class<T> type) {
+      return req.params(type);
+    }
+
     @Override
     public Mutant param(final String name) {
       return req.param(name);
@@ -173,6 +178,11 @@ public Mutant body() throws Exception {
       return req.body();
     }
 
+    @Override
+    public <T> T body(final Class<T> type) throws Exception {
+      return req.body(type);
+    }
+
     @Override
     public <T> T require(final Class<T> type) {
       return req.require(type);
@@ -550,6 +560,16 @@ default Optional<MediaType> accepts(final MediaType... types) {
    */
   Mutant params();
 
+  /**
+   * Short version of <code>params().to(type)</code>.
+   *
+   * @param type Object type.
+   * @return Instance of object.
+   */
+  default <T> T params(final Class<T> type) {
+    return params().to(type);
+  }
+
   /**
    * Get a HTTP request parameter under the given name. A HTTP parameter can be provided in any of
    * these forms:
@@ -635,6 +655,17 @@ default List<Upload> files(final String name) {
    */
   Mutant body() throws Exception;
 
+  /**
+   * Short version of <code>body().to(type)</code>.
+   *
+   * @param type Object type.
+   * @return Instance of object.
+   * @throws Exception If body can't be converted or there is no HTTP body.
+   */
+  default <T> T body(final Class<T> type) throws Exception {
+    return body().to(type);
+  }
+
   /**
    * The charset defined in the request body. If the request doesn't specify a character
    * encoding, this method return the global charset: <code>application.charset</code>.
diff --git a/jooby/src/test/java/org/jooby/RequestForwardingTest.java b/jooby/src/test/java/org/jooby/RequestForwardingTest.java
@@ -739,4 +739,37 @@ public void form() throws Exception {
             });
   }
 
+  @Test
+  public void bodyWithType() throws Exception {
+    RequestForwardingTest v = new RequestForwardingTest();
+    new MockUnit(Request.class, Map.class)
+        .expect(unit -> {
+          Request req = unit.get(Request.class);
+
+          expect(req.body(RequestForwardingTest.class)).andReturn(v);
+        })
+        .run(unit -> {
+          assertEquals(
+              v,
+              new Request.Forwarding(unit.get(Request.class)).body(
+                  RequestForwardingTest.class));
+        });
+  }
+
+  @Test
+  public void paramsWithType() throws Exception {
+    RequestForwardingTest v = new RequestForwardingTest();
+    new MockUnit(Request.class, Map.class)
+        .expect(unit -> {
+          Request req = unit.get(Request.class);
+
+          expect(req.params(RequestForwardingTest.class)).andReturn(v);
+        })
+        .run(unit -> {
+          assertEquals(
+              v,
+              new Request.Forwarding(unit.get(Request.class)).params(
+                  RequestForwardingTest.class));
+        });
+  }
 }
