few minor changes

jknack · jknack · commit b50d838488ff · 2016-02-28T21:17:37.000-03:00
diff --git a/jooby-gson/src/test/java/org/jooby/json/GsonRendererTest.java b/jooby-gson/src/test/java/org/jooby/json/GsonRendererTest.java
@@ -58,7 +58,7 @@ public void renderSkip() throws Exception {
   public void toStr() throws Exception {
     new MockUnit(Gson.class)
         .run(unit -> {
-          assertEquals("gson", new GsonRenderer(MediaType.json, unit.get(Gson.class)).toString());
+          assertEquals("json", new GsonRenderer(MediaType.json, unit.get(Gson.class)).toString());
         });
   }
 }
diff --git a/jooby/src/main/java/org/jooby/internal/RouteImpl.java b/jooby/src/main/java/org/jooby/internal/RouteImpl.java
@@ -18,7 +18,6 @@
  */
 package org.jooby.internal;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +32,9 @@
 
 public class RouteImpl implements Route, Route.Filter {
 
-  private static Map<Object, String> NO_VARS = Collections.emptyMap();
+  private static Map<Object, String> NO_VARS = ImmutableMap.of();
+
+  private static ImmutableMap<String, String> NO_ATTRS = ImmutableMap.of();
 
   private String method;
 
@@ -51,7 +52,7 @@ public class RouteImpl implements Route, Route.Filter {
 
   private Filter filter;
 
-  private ImmutableMap<String, String> attributes;
+  private Map<String, String> attributes;
 
   public static RouteImpl notFound(final String method, final String path,
       final List<MediaType> produces) {
@@ -65,7 +66,7 @@ public static RouteImpl notFound(final String method, final String path,
   public static RouteImpl fromStatus(final Filter filter, final String method,
       final String path, final String name, final List<MediaType> produces) {
     return new RouteImpl(filter, method, path, path, name, NO_VARS, MediaType.ALL, produces,
-        Collections.emptyMap()) {
+        NO_ATTRS) {
       @Override
       public boolean apply(final String filter) {
         return true;
@@ -77,6 +78,14 @@ public RouteImpl(final Filter filter, final String method, final String path,
       final String pattern, final String name, final Map<Object, String> vars,
       final List<MediaType> consumes, final List<MediaType> produces,
       final Map<String, String> attributes) {
+    this(filter, method, path, pattern, name, vars, consumes, produces,
+        ImmutableMap.<String, String> copyOf(attributes));
+  }
+
+  public RouteImpl(final Filter filter, final String method, final String path,
+      final String pattern, final String name, final Map<Object, String> vars,
+      final List<MediaType> consumes, final List<MediaType> produces,
+      final ImmutableMap<String, String> attributes) {
     this.filter = filter;
     this.method = method;
     this.path = path;
@@ -85,7 +94,7 @@ public RouteImpl(final Filter filter, final String method, final String path,
     this.vars = vars;
     this.consumes = consumes;
     this.produces = produces;
-    this.attributes = ImmutableMap.copyOf(attributes);
+    this.attributes = attributes;
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public void renderSkip() throws Exception {`
`58`	`58`	`public void toStr() throws Exception {`
`59`	`59`	`new MockUnit(Gson.class)`
`60`	`60`	`.run(unit -> {`
`61`		`- assertEquals("gson", new GsonRenderer(MediaType.json, unit.get(Gson.class)).toString());`
	`61`	`+ assertEquals("json", new GsonRenderer(MediaType.json, unit.get(Gson.class)).toString());`
`62`	`62`	`});`
`63`	`63`	`}`
`64`	`64`	`}`