Update FormatterChain.java (#646)

* Update FormatterChain.java

Fix "index out of bounds" exception when calling `chain.format(o)` in Formatter implementation.

* Tried to make checkstyle happy...

* extended FormatterTest for FormatterChain change

* fixed FormatterTest for FormatterChain change

* added MultipleFormatterTest to achieve better test coverage

* fixed FormatterChain

* fixed FormatterChain

* fixed FormatterChain

Author: koebbingd

handlebars/src/main/java/com/github/jknack/handlebars/internal/FormatterChain.java

@@ -61,8 +61,12 @@ private FormatterChain(final List<Formatter> formatter, final int index) {
    * Gets the next formatter in the chain.
    * @return The formatter at the next index.
    */
-  private FormatterChain next() {
-    return new FormatterChain(chain, index + 1);
+  private Formatter.Chain next() {
+    if (index + 1 < chain.size()) {
+      return new FormatterChain(chain, index + 1);
+    } else {
+      return Formatter.NOOP;
+    }
   }
 
   @Override

handlebars/src/test/java/com/github/jknack/handlebars/FormatterTest.java

@@ -14,15 +14,13 @@ public class FormatterTest extends AbstractTest {
   @Override
   protected void configure(final Handlebars handlebars) {
     handlebars.with(new Formatter() {
-
       @Override
       public Object format(final Object value, final Chain chain) {
         if (value instanceof Date) {
           return ((Date) value).getTime();
         }
         return chain.format(value);
       }
-
     });
   }
 
@@ -33,6 +31,13 @@ public void useFormatterTwice() throws IOException {
     assertEquals("time is " + now + "/" + now, t.apply(new Date(now)));
   }
 
+  @Test
+  public void testFormatterWithoutMatch() throws IOException {
+    Template t = compile("string is {{this}}");
+
+    assertEquals("string is testvalue", t.apply("testvalue"));
+  }
+
   @Test
   public void useTemplateTwice() throws IOException {
     Template t = compile("time is {{this}}");

handlebars/src/test/java/com/github/jknack/handlebars/MultipleFormatterTest.java

@@ -0,0 +1,52 @@
+package com.github.jknack.handlebars;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Date;
+
+import static org.junit.Assert.assertEquals;
+
+public class MultipleFormatterTest extends AbstractTest {
+
+  static final long now = System.currentTimeMillis();
+
+  @Override
+  protected void configure(final Handlebars handlebars) {
+    handlebars.with(new Formatter() {
+
+      @Override
+      public Object format(final Object value, final Chain chain) {
+        if (value instanceof Date) {
+          return ((Date) value).getTime();
+        }
+        return chain.format(value);
+      }
+
+    }).with(new Formatter() {
+      @Override
+      public Object format(final Object value, final Chain chain) {
+
+        if (value instanceof Integer) {
+          return Integer.toHexString((Integer) value);
+        }
+        return chain.format(value);
+      }
+
+    });
+  }
+
+  @Test
+  public void testDateFormatter() throws IOException {
+    Template t = compile("time is {{this}}");
+
+    assertEquals("time is " + now, t.apply(new Date(now)));
+  }
+
+  @Test
+  public void testIntegerFormatter() throws IOException {
+    Template t = compile("Hex-Value is {{this}}");
+
+    assertEquals("Hex-Value is 10", t.apply(16));
+  }
+}