make renderer a function (yay!)

jknack · jknack · commit 603418c37def · 2019-01-20T19:12:10.000-03:00
diff --git a/jooby/src/main/java/io/jooby/Context.java b/jooby/src/main/java/io/jooby/Context.java
@@ -337,7 +337,8 @@ default boolean accept(MediaType contentType) {
 
   default @Nonnull Context render(@Nonnull Object result) {
     try {
-      route().renderer().render(this, result);
+      byte[] encode = route().renderer().encode(this, result);
+      sendBytes(encode);
       return this;
     } catch (Exception x) {
       throw Throwing.sneakyThrow(x);
diff --git a/jooby/src/main/java/io/jooby/Renderer.java b/jooby/src/main/java/io/jooby/Renderer.java
@@ -16,22 +16,20 @@
 package io.jooby;
 
 import javax.annotation.Nonnull;
+import java.nio.charset.StandardCharsets;
 
 public interface Renderer {
 
-  Renderer TO_STRING = (ctx, value) -> {
-    ctx.sendString(value.toString());
-    return true;
-  };
+  Renderer TO_STRING = (ctx, value) -> value.toString().getBytes(StandardCharsets.UTF_8);
 
-  boolean render(@Nonnull Context ctx, @Nonnull Object result) throws Exception;
+  byte[] encode(@Nonnull Context ctx, @Nonnull Object value) throws Exception;
 
   @Nonnull default Renderer accept(@Nonnull MediaType contentType) {
-    return (ctx, result) -> {
+    return (ctx, value) -> {
       if (ctx.accept(contentType)) {
-        return render(ctx, result);
+        return encode(ctx, value);
       }
-      return false;
+      return null;
     };
   }
 
diff --git a/jooby/src/main/java/io/jooby/TemplateEngine.java b/jooby/src/main/java/io/jooby/TemplateEngine.java
@@ -16,14 +16,14 @@
 package io.jooby;
 
 import javax.annotation.Nonnull;
+import java.nio.charset.StandardCharsets;
 
 public interface TemplateEngine extends Renderer {
 
   String apply(Context ctx, ModelAndView modelAndView) throws Exception;
 
-  @Override default boolean render(@Nonnull Context ctx, @Nonnull Object result) throws Exception {
-    String output = apply(ctx, (ModelAndView) result);
-    ctx.sendString(output);
-    return true;
+  @Override default byte[] encode(@Nonnull Context ctx, @Nonnull Object value) throws Exception {
+    String output = apply(ctx, (ModelAndView) value);
+    return output.getBytes(StandardCharsets.UTF_8);
   }
 }
diff --git a/jooby/src/main/java/io/jooby/internal/CompositeRenderer.java b/jooby/src/main/java/io/jooby/internal/CompositeRenderer.java
@@ -57,18 +57,18 @@ private Renderer computeRenderer(Renderer it, Renderer next) {
     }
   }
 
-  @Override public boolean render(@Nonnull Context ctx, @Nonnull Object result) throws Exception {
-    if (result instanceof ModelAndView) {
-      return templateEngine.render(ctx, result);
+  @Override public byte[] encode(@Nonnull Context ctx, @Nonnull Object value) throws Exception {
+    if (value instanceof ModelAndView) {
+      return templateEngine.encode(ctx, value);
     } else {
       Iterator<Renderer> iterator = list.iterator();
-      boolean done = false;
       /** NOTE: looks like an infinite loop but there is a default renderer at the end of iterator. */
-      while (!done) {
+      byte[] result = null;
+      while (result == null) {
         Renderer next = iterator.next();
-        done = next.render(ctx, result);
+        result = next.encode(ctx, value);
       }
-      return done;
+      return result;
     }
   }
 }
diff --git a/jooby/src/test/java/io/jooby/RendererTest.java b/jooby/src/test/java/io/jooby/RendererTest.java
diff --git a/modules/jooby-jackson/src/main/java/io/jooby/json/Jackson.java b/modules/jooby-jackson/src/main/java/io/jooby/json/Jackson.java
@@ -62,17 +62,15 @@ public static final ObjectMapper defaultObjectMapper() {
     application.renderer(MediaType.json, this);
   }
 
-  @Override public boolean render(@Nonnull Context ctx, @Nonnull Object value) throws Exception {
+  @Override public byte[] encode(@Nonnull Context ctx, @Nonnull Object value) throws Exception {
+    ctx.type(MediaType.json);
     if (value instanceof CharSequence) {
       // Ignore string/charsequence responses, those are going to be processed by the default
       // renderer and let route to return raw JSON
-      ctx.type(MediaType.json)
-          .sendBytes(value.toString().getBytes(StandardCharsets.UTF_8));
+      return value.toString().getBytes(StandardCharsets.UTF_8);
     } else {
-      ctx.type(MediaType.json)
-          .sendBytes(mapper.writeValueAsBytes(value));
+      return mapper.writeValueAsBytes(value);
     }
-    return true;
   }
 
   @Override public <T> T parse(Context ctx, Type type) throws Exception {
diff --git a/modules/jooby-jackson/src/test/java/io/jooby/json/JacksonTest.java b/modules/jooby-jackson/src/test/java/io/jooby/json/JacksonTest.java
@@ -15,11 +15,7 @@ public class JacksonTest {
   public void render() throws Exception {
     Jackson jackson = new Jackson();
     MockContext ctx = new MockContext();
-    boolean renderered = jackson.render(ctx, Map.of("k", "v"));
-    assertTrue(renderered);
-
-    /** Body: */
-    byte[] bytes = (byte[]) ctx.getResult();
+    byte [] bytes = jackson.encode(ctx, Map.of("k", "v"));
     assertEquals("{\"k\":\"v\"}", new String(bytes, StandardCharsets.UTF_8));
     /** Type: */
     assertEquals("application/json", ctx.getResponseContentType().value());
@@ -30,11 +26,7 @@ public void render() throws Exception {
   public void renderRawString() throws Exception {
     Jackson jackson = new Jackson();
     MockContext ctx = new MockContext();
-    boolean renderered = jackson.render(ctx, "{\"k\":\"v\"}");
-    assertTrue(renderered);
-
-    /** Body: */
-    byte[] bytes = (byte[]) ctx.getResult();
+    byte [] bytes = jackson.encode(ctx, "{\"k\":\"v\"}");
     assertEquals("{\"k\":\"v\"}", new String(bytes, StandardCharsets.UTF_8));
     /** Type: */
     assertEquals("application/json", ctx.getResponseContentType().value());

Original file line number	Diff line number	Diff line change
`@@ -57,18 +57,18 @@ private Renderer computeRenderer(Renderer it, Renderer next) {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- @Override public boolean render(@Nonnull Context ctx, @Nonnull Object result) throws Exception {`
`61`		`- if (result instanceof ModelAndView) {`
`62`		`- return templateEngine.render(ctx, result);`
	`60`	`+ @Override public byte[] encode(@Nonnull Context ctx, @Nonnull Object value) throws Exception {`
	`61`	`+ if (value instanceof ModelAndView) {`
	`62`	`+ return templateEngine.encode(ctx, value);`
`63`	`63`	`} else {`
`64`	`64`	`Iterator<Renderer> iterator = list.iterator();`
`65`		`- boolean done = false;`
`66`	`65`	`/** NOTE: looks like an infinite loop but there is a default renderer at the end of iterator. */`
`67`		`- while (!done) {`
	`66`	`+ byte[] result = null;`
	`67`	`+ while (result == null) {`
`68`	`68`	`Renderer next = iterator.next();`
`69`		`- done = next.render(ctx, result);`
	`69`	`+ result = next.encode(ctx, value);`
`70`	`70`	`}`
`71`		`- return done;`
	`71`	`+ return result;`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`