Fixed Templates chained method bug so order does not matter

Author: danielbodart

src/com/googlecode/totallylazy/template/Templates.java

@@ -19,11 +19,13 @@
 
 public class Templates implements Renderers {
     private final Function2<? super String, ? super Renderers, ? extends Renderer<?>> missing;
-    private final ConcurrentMap<String, Renderer<Object>> renderers = new ConcurrentHashMap<>();
-    private volatile CompositeRenderer implicits = CompositeRenderer.compositeRenderer();
+    private final ConcurrentMap<String, Renderer<Object>> renderers;
+    private volatile CompositeRenderer implicits;
 
-    private Templates(Function2<? super String, ? super Renderers, ? extends Renderer<?>> missing) {
+    public Templates(Function2<? super String, ? super Renderers, ? extends Renderer<?>> missing, ConcurrentMap<String, Renderer<Object>> renderers, CompositeRenderer implicits) {
         this.missing = missing;
+        this.renderers = renderers;
+        this.implicits = implicits;
     }
 
     public static Templates templates() {
@@ -43,7 +45,7 @@ public static Templates templates(Renderers parent) {
     }
 
     public static Templates templates(Function2<? super String, ? super Renderers, ? extends Renderer<?>> missing) {
-        return new Templates(missing);
+        return new Templates(missing, new ConcurrentHashMap<>(), CompositeRenderer.compositeRenderer());
     }
 
     public Templates addDefault() {
@@ -82,7 +84,7 @@ public Renderer<Object> get(String name) {
     }
 
     public Templates extension(String value) {
-        return new Templates((s, r) -> missing.apply(s + "." + value, r));
+        return new Templates((s, r) -> missing.apply(s + "." + value, r), renderers, implicits);
     }
 
     public Templates logger(Appendable logger) {
@@ -93,6 +95,6 @@ public Templates logger(Appendable logger) {
                 logger.append(format("Unable to load template '%s' because: %s%n", s, e.getMessage()));
                 return (instance, appendable) -> appendable;
             }
-        });
+        }, renderers, implicits);
     }
 }

test/com/googlecode/totallylazy/template/TemplatesTest.java

@@ -61,11 +61,20 @@ public void canUseTemplatesFromClassPathAndDefaultTemplates() throws Exception {
     @Test
     public void doesNotThrowWhenASubTemplateIsNotFoundButReturnsEmptyStringAndLogs() throws Exception {
         StringBuilder builder = new StringBuilder();
-        Templates templates = templates(getClass()).logger(builder).extension("st").add("works", ignore -> "Other templates still work");
-        String result = templates.get("error").render(map());
+        Templates templates = templates(getClass()).add("works", ignore -> "Other templates still work").logger(builder);
+        String result = templates.get("error.st").render(map());
         assertThat(result, is("Other templates still work\nSub template returned ''"));
         String log = builder.toString();
-        assertThat(log, startsWith("Unable to load template 'foo.st' because: "));
+        assertThat(log, startsWith("Unable to load template 'foo' because: "));
         assertThat(log, not(contains("Unable to load template 'works' because: ")));
     }
+
+    @Test
+    public void orderOfChainedMethodsDoNotMatter() throws Exception {
+        Templates templates1 = templates(getClass()).add("works", ignore -> "Other templates still work").logger(new StringBuilder());
+        assertThat(templates1.get("error.st").render(map()), is("Other templates still work\nSub template returned ''"));
+
+        Templates templates2 = templates(getClass()).logger(new StringBuilder()).add("works", ignore -> "Other templates still work");
+        assertThat(templates2.get("error.st").render(map()), is("Other templates still work\nSub template returned ''"));
+    }
 }