Rename Router.render to Router.encoder

jknack · jknack · commit 516020e53152 · 2019-07-15T09:28:49.000-03:00
diff --git a/TODO b/TODO
@@ -1,5 +1,6 @@
 * tests and coverage
 * server options from application.conf MUST override hardcoded settings
 * make reset headers on error configurable
+* netty reports a leak in MVC body
 
 * websockets
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -54,6 +54,11 @@
       <artifactId>jooby-jdbi</artifactId>
       <version>${jooby.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.jooby</groupId>
+      <artifactId>jooby-freemarker</artifactId>
+      <version>${jooby.version}</version>
+    </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
diff --git a/examples/src/main/java/examples/FreemarkerApp.java b/examples/src/main/java/examples/FreemarkerApp.java
@@ -0,0 +1,25 @@
+/**
+ * Jooby https://jooby.io
+ * Apache License Version 2.0 https://jooby.io/LICENSE.txt
+ * Copyright 2014 Edgar Espina
+ */
+package examples;
+
+import io.jooby.Jooby;
+import io.jooby.ModelAndView;
+import io.jooby.freemarker.FreemarkerModule;
+
+public class FreemarkerApp extends Jooby {
+
+  {
+    install(new FreemarkerModule());
+
+    get("/", ctx -> {
+      return new ModelAndView("index.ftl").put("name", "Freemarker");
+    });
+  }
+
+  public static void main(String[] args) {
+    runApp(args, FreemarkerApp::new);
+  }
+}
diff --git a/examples/src/main/resources/views/index.ftl b/examples/src/main/resources/views/index.ftl
@@ -0,0 +1 @@
+Hello ${name}!
diff --git a/jooby/src/main/java/io/jooby/Jooby.java b/jooby/src/main/java/io/jooby/Jooby.java
@@ -298,8 +298,8 @@ public <T> Jooby mvc(@Nonnull Class<T> router, @Nonnull Provider<T> provider) {
     return this;
   }
 
-  @Nonnull @Override public Jooby renderer(@Nonnull MessageEncoder encoder) {
-    router.renderer(encoder);
+  @Nonnull @Override public Jooby encoder(@Nonnull MessageEncoder encoder) {
+    router.encoder(encoder);
     return this;
   }
 
@@ -310,8 +310,8 @@ public <T> Jooby mvc(@Nonnull Class<T> router, @Nonnull Provider<T> provider) {
   }
 
   @Nonnull @Override
-  public Jooby renderer(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder) {
-    router.renderer(contentType, encoder);
+  public Jooby encoder(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder) {
+    router.encoder(contentType, encoder);
     return this;
   }
 
diff --git a/jooby/src/main/java/io/jooby/Router.java b/jooby/src/main/java/io/jooby/Router.java
@@ -228,7 +228,7 @@ interface Match {
    * @param encoder MessageEncoder instance.
    * @return This router.
    */
-  @Nonnull Router renderer(@Nonnull MessageEncoder encoder);
+  @Nonnull Router encoder(@Nonnull MessageEncoder encoder);
 
   /**
    * Register a route response encoder.
@@ -237,7 +237,7 @@ interface Match {
    * @param encoder MessageEncoder instance.
    * @return This router.
    */
-  @Nonnull Router renderer(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder);
+  @Nonnull Router encoder(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder);
 
   /**
    * Application temporary directory.
diff --git a/jooby/src/main/java/io/jooby/internal/RouterImpl.java b/jooby/src/main/java/io/jooby/internal/RouterImpl.java
@@ -238,14 +238,14 @@ public <T> Router mvc(@Nonnull Class<T> router, @Nonnull Provider<T> provider) {
     return this;
   }
 
-  @Nonnull @Override public Router renderer(@Nonnull MessageEncoder encoder) {
+  @Nonnull @Override public Router encoder(@Nonnull MessageEncoder encoder) {
     this.renderer.add(encoder);
     return this;
   }
 
   @Nonnull @Override
-  public Router renderer(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder) {
-    return renderer(encoder.accept(contentType));
+  public Router encoder(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder) {
+    return encoder(encoder.accept(contentType));
   }
 
   @Nonnull @Override public Router parser(@Nonnull MediaType contentType, @Nonnull
diff --git a/modules/jooby-freemarker/src/main/java/io/jooby/freemarker/FreemarkerModule.java b/modules/jooby-freemarker/src/main/java/io/jooby/freemarker/FreemarkerModule.java
@@ -237,7 +237,7 @@ public FreemarkerModule() {
     if (freemarker == null) {
       freemarker = create().setTemplatesPath(templatesPath).build(application.getEnvironment());
     }
-    application.renderer(MediaType.html, new FreemarkerTemplateEngine(freemarker));
+    application.encoder(MediaType.html, new FreemarkerTemplateEngine(freemarker));
 
     ServiceRegistry services = application.getServices();
     services.put(Configuration.class, freemarker);
diff --git a/modules/jooby-handlebars/src/main/java/io/jooby/handlebars/HandlebarsModule.java b/modules/jooby-handlebars/src/main/java/io/jooby/handlebars/HandlebarsModule.java
@@ -200,7 +200,7 @@ public HandlebarsModule() {
     if (handlebars == null) {
       handlebars = create().setTemplatesPath(templatesPath).build(application.getEnvironment());
     }
-    application.renderer(MediaType.html, new HbsTemplateEngine(handlebars));
+    application.encoder(MediaType.html, new HbsTemplateEngine(handlebars));
 
     ServiceRegistry services = application.getServices();
     services.put(Handlebars.class, handlebars);
diff --git a/modules/jooby-jackson/src/main/java/io/jooby/json/JacksonModule.java b/modules/jooby-jackson/src/main/java/io/jooby/json/JacksonModule.java
@@ -105,7 +105,7 @@ public JacksonModule module(Class<? extends Module> module) {
 
   @Override public void install(@Nonnull Jooby application) {
     application.parser(MediaType.json, this);
-    application.renderer(MediaType.json, this);
+    application.encoder(MediaType.json, this);
 
     ServiceRegistry services = application.getServices();
     services.put(ObjectMapper.class, mapper);
diff --git a/modules/jooby-rocker/src/main/java/io/jooby/rocker/Rockerby.java b/modules/jooby-rocker/src/main/java/io/jooby/rocker/Rockerby.java
@@ -45,6 +45,6 @@ public class Rockerby implements Extension {
     // response handler
     application.responseHandler(new RockerResponseHandler());
     // renderer
-    application.renderer(MediaType.html, new RockerMessageEncoder());
+    application.encoder(MediaType.html, new RockerMessageEncoder());
   }
 }
diff --git a/tests/src/test/java/io/jooby/FeaturedTest.java b/tests/src/test/java/io/jooby/FeaturedTest.java
@@ -769,11 +769,11 @@ class Message {
     }
 
     new JoobyRunner(app -> {
-      app.renderer(io.jooby.MediaType.json, (@Nonnull Context ctx, @Nonnull Object value) ->
+      app.encoder(io.jooby.MediaType.json, (@Nonnull Context ctx, @Nonnull Object value) ->
           ("{" + value.toString() + "}").getBytes(StandardCharsets.UTF_8)
       );
 
-      app.renderer(io.jooby.MediaType.xml, (@Nonnull Context ctx, @Nonnull Object value) ->
+      app.encoder(io.jooby.MediaType.xml, (@Nonnull Context ctx, @Nonnull Object value) ->
           ("<" + value.toString() + ">").getBytes(StandardCharsets.UTF_8)
       );
 
diff --git a/tests/src/test/java/io/jooby/JoobyRunner.java b/tests/src/test/java/io/jooby/JoobyRunner.java
@@ -16,6 +16,7 @@ public class JoobyRunner {
 
   static {
     System.setProperty("io.netty.leakDetection.level", "PARANOID");
+    System.setProperty("io.netty.leakDetection.targetRecords", "20");
     System.setProperty("jooby.useShutdownHook", "false");
   }
 
diff --git a/tests/src/test/java/io/jooby/MvcTest.java b/tests/src/test/java/io/jooby/MvcTest.java
@@ -60,11 +60,11 @@ public void routerInstance() {
   public void producesAndConsumes() {
     new JoobyRunner(app -> {
 
-      app.renderer(io.jooby.MediaType.json, (@Nonnull Context ctx, @Nonnull Object value) ->
+      app.encoder(io.jooby.MediaType.json, (@Nonnull Context ctx, @Nonnull Object value) ->
           ("{" + value.toString() + "}").getBytes(StandardCharsets.UTF_8)
       );
 
-      app.renderer(io.jooby.MediaType.xml, (@Nonnull Context ctx, @Nonnull Object value) ->
+      app.encoder(io.jooby.MediaType.xml, (@Nonnull Context ctx, @Nonnull Object value) ->
           ("<" + value.toString() + ">").getBytes(StandardCharsets.UTF_8)
       );
 

Original file line number	Diff line number	Diff line change
`@@ -298,8 +298,8 @@ public <T> Jooby mvc(@Nonnull Class<T> router, @Nonnull Provider<T> provider) {`
`298`	`298`	`return this;`
`299`	`299`	`}`
`300`	`300`
`301`		`- @Nonnull @Override public Jooby renderer(@Nonnull MessageEncoder encoder) {`
`302`		`- router.renderer(encoder);`
	`301`	`+ @Nonnull @Override public Jooby encoder(@Nonnull MessageEncoder encoder) {`
	`302`	`+ router.encoder(encoder);`
`303`	`303`	`return this;`
`304`	`304`	`}`
`305`	`305`
`@@ -310,8 +310,8 @@ public <T> Jooby mvc(@Nonnull Class<T> router, @Nonnull Provider<T> provider) {`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`@Nonnull @Override`
`313`		`- public Jooby renderer(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder) {`
`314`		`- router.renderer(contentType, encoder);`
	`313`	`+ public Jooby encoder(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder) {`
	`314`	`+ router.encoder(contentType, encoder);`
`315`	`315`	`return this;`
`316`	`316`	`}`
`317`	`317`
Original file line number	Diff line number	Diff line change
`@@ -238,14 +238,14 @@ public <T> Router mvc(@Nonnull Class<T> router, @Nonnull Provider<T> provider) {`
`238`	`238`	`return this;`
`239`	`239`	`}`
`240`	`240`
`241`		`- @Nonnull @Override public Router renderer(@Nonnull MessageEncoder encoder) {`
	`241`	`+ @Nonnull @Override public Router encoder(@Nonnull MessageEncoder encoder) {`
`242`	`242`	`this.renderer.add(encoder);`
`243`	`243`	`return this;`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`@Nonnull @Override`
`247`		`- public Router renderer(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder) {`
`248`		`- return renderer(encoder.accept(contentType));`
	`247`	`+ public Router encoder(@Nonnull MediaType contentType, @Nonnull MessageEncoder encoder) {`
	`248`	`+ return encoder(encoder.accept(contentType));`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`@Nonnull @Override public Router parser(@Nonnull MediaType contentType, @Nonnull`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ public FreemarkerModule() {`
`237`	`237`	`if (freemarker == null) {`
`238`	`238`	`freemarker = create().setTemplatesPath(templatesPath).build(application.getEnvironment());`
`239`	`239`	`}`
`240`		`- application.renderer(MediaType.html, new FreemarkerTemplateEngine(freemarker));`
	`240`	`+ application.encoder(MediaType.html, new FreemarkerTemplateEngine(freemarker));`
`241`	`241`
`242`	`242`	`ServiceRegistry services = application.getServices();`
`243`	`243`	`services.put(Configuration.class, freemarker);`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public HandlebarsModule() {`
`200`	`200`	`if (handlebars == null) {`
`201`	`201`	`handlebars = create().setTemplatesPath(templatesPath).build(application.getEnvironment());`
`202`	`202`	`}`
`203`		`- application.renderer(MediaType.html, new HbsTemplateEngine(handlebars));`
	`203`	`+ application.encoder(MediaType.html, new HbsTemplateEngine(handlebars));`
`204`	`204`
`205`	`205`	`ServiceRegistry services = application.getServices();`
`206`	`206`	`services.put(Handlebars.class, handlebars);`