Add test for BodyPart or Body param

jknack · jknack · commit 464d8c23d49b · 2014-10-15T12:01:14.000-03:00
diff --git a/jooby-core/src/main/java/jooby/Jooby.java b/jooby-core/src/main/java/jooby/Jooby.java
@@ -10,6 +10,7 @@
 import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
@@ -396,10 +397,17 @@ public abstract void configure(@Nonnull Mode mode, @Nonnull Config config,
 
   private Err.Handler err;
 
+  private List<BodyConverter> converters = new LinkedList<>();
+
   {
     use(new Jetty());
   }
 
+  public Jooby use(final BodyConverter converter) {
+    this.converters.add(requireNonNull(converter, "A body converter is required."));
+    return this;
+  }
+
   public Route.Definition use(final Filter filter) {
     return use("*", filter);
   }
@@ -765,7 +773,7 @@ public void configure(final Binder binder) {
         binder.bind(DecimalFormat.class).toInstance(numberFormat);
 
         // bind readers & writers
-        Multibinder<BodyConverter> converters = Multibinder
+        Multibinder<BodyConverter> converterBinder = Multibinder
             .newSetBinder(binder, BodyConverter.class);
 
         // Routes
@@ -788,6 +796,9 @@ public void configure(final Binder binder) {
         binder.bind(File.class).annotatedWith(Names.named("java.io.tmpdir"))
             .toInstance(new File(config.getString("java.io.tmpdir")));
 
+        // converters
+        converters.forEach(it -> converterBinder.addBinding().toInstance(it));
+
         // modules, routes and websockets
         bag.forEach(candidate -> {
           if (candidate instanceof Jooby.Module) {
@@ -806,10 +817,10 @@ public void configure(final Binder binder) {
         // Singleton routes
         singletonRoutes.forEach(routeClass -> binder.bind(routeClass).in(Scopes.SINGLETON));
 
-        converters.addBinding().toInstance(FallbackBodyConverter.COPY_TEXT);
-        converters.addBinding().toInstance(FallbackBodyConverter.COPY_BYTES);
-        converters.addBinding().toInstance(FallbackBodyConverter.READ_TEXT);
-        converters.addBinding().toInstance(FallbackBodyConverter.TO_HTML);
+        converterBinder.addBinding().toInstance(FallbackBodyConverter.COPY_TEXT);
+        converterBinder.addBinding().toInstance(FallbackBodyConverter.COPY_BYTES);
+        converterBinder.addBinding().toInstance(FallbackBodyConverter.READ_TEXT);
+        converterBinder.addBinding().toInstance(FallbackBodyConverter.TO_HTML);
 
         // err
         if (err == null) {
diff --git a/jooby-tests/src/test/java/jooby/BodyParamFeature.java b/jooby-tests/src/test/java/jooby/BodyParamFeature.java
@@ -0,0 +1,104 @@
+package jooby;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+
+import jooby.mvc.POST;
+import jooby.mvc.Path;
+
+import org.apache.http.client.fluent.Request;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.CharSink;
+import com.google.common.io.CharStreams;
+import com.google.inject.TypeLiteral;
+
+public class BodyParamFeature extends ServerFeature {
+
+  private static class Bean {
+
+  }
+
+  @Path("/r")
+  public static class Resource {
+
+    @Path("/body")
+    @POST
+    public Bean body(final Bean param) throws IOException {
+      return param;
+    }
+
+  }
+
+  {
+
+    use(new BodyConverter() {
+
+      @Override
+      public void write(final Object body, final BodyWriter writer) throws Exception {
+        writer.text(out -> new CharSink() {
+          @Override
+          public Writer openStream() throws IOException {
+            return out;
+          }
+        }.write("{}"));
+      }
+
+      @Override
+      public List<MediaType> types() {
+        return ImmutableList.of(MediaType.json);
+      }
+
+      @SuppressWarnings("unchecked")
+      @Override
+      public <T> T read(final TypeLiteral<T> type, final BodyReader reader) throws Exception {
+        String body = reader.text(in ->CharStreams.toString(in));
+        assertEquals("{}", body);
+        return (T) new Bean();
+      }
+
+      @Override
+      public boolean canWrite(final Class<?> type) {
+        return type == Bean.class;
+      }
+
+      @Override
+      public boolean canRead(final TypeLiteral<?> type) {
+        return type.getRawType() == Bean.class;
+      }
+    });
+
+    post("/body", (req, resp) -> {
+      Bean bean = req.param("param").to(Bean.class);
+      resp.send(bean);
+    });
+
+    use(Resource.class);
+  }
+
+  @Test
+  public void multipart() throws Exception {
+    assertEquals("{}",
+        Request
+            .Post(uri("body").build())
+            .body(
+                MultipartEntityBuilder
+                    .create()
+                    .addTextBody("param", "{}", ContentType.APPLICATION_JSON)
+                    .build()).execute().returnContent().asString());
+
+    assertEquals("{}",
+        Request.Post(uri("r", "body").build())
+            .body(MultipartEntityBuilder.create()
+                .addTextBody("param", "{}", ContentType.APPLICATION_JSON)
+                .build()).execute().returnContent().asString());
+
+  }
+
+}
