POST with empty generates an error fix jooby-project#444

jknack · jknack · commit 80ec134c46c4 · 2016-08-05T16:36:55.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/issues/Issue444.java b/coverage-report/src/test/java/org/jooby/issues/Issue444.java
@@ -0,0 +1,35 @@
+package org.jooby.issues;
+
+import java.net.URISyntaxException;
+import java.nio.ByteBuffer;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue444 extends ServerFeature {
+
+  {
+
+    parser((type, ctxt) -> {
+      if (type.getRawType() == ByteBuffer.class) {
+        return ctxt.body(body -> {
+          return ByteBuffer.wrap(body.bytes());
+        });
+      }
+      return ctxt.next();
+    });
+
+    post("/444", req -> {
+      ByteBuffer buffer = req.body().to(ByteBuffer.class);
+      return buffer.remaining();
+    });
+  }
+
+  @Test
+  public void shouldAcceptPostWithoutContentType() throws URISyntaxException, Exception {
+    request()
+        .post("/444")
+        .body("abc", null)
+        .expect("3");
+  }
+}
diff --git a/jooby/src/main/java/org/jooby/internal/RequestImpl.java b/jooby/src/main/java/org/jooby/internal/RequestImpl.java
@@ -248,7 +248,8 @@ public List<Cookie> cookies() {
   public Mutant body() throws Exception {
     long length = length();
     if (length > 0) {
-      if (MediaType.form.matches(type()) || MediaType.multipart.matches(type())) {
+      MediaType type = type();
+      if (!type.isAny() && (MediaType.form.matches(type) || MediaType.multipart.matches(type))) {
         return params();
       }
       File fbody = new File(
diff --git a/jooby/src/test/java/org/jooby/test/Client.java b/jooby/src/test/java/org/jooby/test/Client.java
@@ -4,10 +4,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -27,6 +29,7 @@
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLContexts;
 import org.apache.http.entity.ContentType;
+import org.apache.http.entity.InputStreamEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -111,7 +114,13 @@ public void close() {
     }
 
     public Request body(final String body, final String type) {
-      req.bodyString(body, ContentType.parse(type));
+      if (type == null) {
+        byte[] bytes = body.getBytes(StandardCharsets.UTF_8);
+        HttpEntity entity = new InputStreamEntity(new ByteArrayInputStream(bytes), bytes.length);
+        req.body(entity);
+      } else {
+        req.bodyString(body, ContentType.parse(type));
+      }
       return this;
     }
 
@@ -253,9 +262,9 @@ public Response header(final String headerName, final Optional<Object> headerVal
 
     public Response header(final String headerName, final Callback callback) throws Exception {
       callback.execute(
-        Optional.ofNullable(rsp.getFirstHeader(headerName))
-          .map(Header::getValue)
-          .orElse(null));
+          Optional.ofNullable(rsp.getFirstHeader(headerName))
+              .map(Header::getValue)
+              .orElse(null));
       return this;
     }
 
