Support for iterating Maps with non-string keys fix jknack#502

jknack · jknack · commit 9809123b33cf · 2016-05-22T19:02:43.000-03:00
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/helper/EachHelper.java b/handlebars/src/main/java/com/github/jknack/handlebars/helper/EachHelper.java
@@ -79,14 +79,14 @@ public Object apply(final Object context, final Options options)
       }
       return buffer;
     } else if (context != null) {
-      Iterator<Entry<String, Object>> loop = options.propertySet(context).iterator();
+      Iterator loop = options.propertySet(context).iterator();
       Context parent = options.context;
       boolean first = true;
       Options.Buffer buffer = options.buffer();
       Template fn = options.fn;
       while (loop.hasNext()) {
-        Entry<String, Object> entry = loop.next();
-        String key = entry.getKey();
+        Entry entry = (Entry) loop.next();
+        Object key = entry.getKey();
         Object value = entry.getValue();
         Context itCtx = Context.newBuilder(parent, value)
             .combine("@key", key)
diff --git a/handlebars/src/main/java/com/github/jknack/handlebars/internal/Variable.java b/handlebars/src/main/java/com/github/jknack/handlebars/internal/Variable.java
@@ -163,6 +163,14 @@ protected void merge(final Context scope, final Writer writer)
     }
   }
 
+  /**
+   * Apply the template and return the raw value (not a CharSequence)
+   *
+   * @param scope Template scope.
+   * @param writer Writer.
+   * @return Resulting value.
+   * @throws IOException If something goes wrong.
+   */
   @SuppressWarnings("unchecked")
   public Object value(final Context scope, final Writer writer) throws IOException {
     boolean blockParam = scope.isBlockParams() && noArg;
diff --git a/handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue502.java b/handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue502.java
@@ -0,0 +1,44 @@
+package com.github.jknack.handlebars.issues;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.junit.Test;
+
+import com.github.jknack.handlebars.Handlebars;
+
+public class Issue502 {
+
+  @Test
+  public void supportForIteratingMapsWithNonStringKeys() throws IOException {
+    Map<Object, Collection<String>> data = new TreeMap<>();
+    Collection<String> d1 = new ArrayList<>();
+    d1.add("1");
+    d1.add("2");
+    d1.add("3");
+
+    Collection<String> d2 = new ArrayList<>();
+    d2.add("4");
+    d2.add("5");
+    d2.add("6");
+
+    data.put(123, d1);
+    data.put(456, d2);
+
+    Map<String, Object> params = new HashMap<>();
+    params.put("data", data);
+
+    String result = new Handlebars()
+        .compileInline("{{#each data}}{{ @key }} - {{#each . }}Val:{{.}}{{/each}}{{/each}}")
+        .apply(params);
+
+    assertEquals("123 - Val:1Val:2Val:3456 - Val:4Val:5Val:6", result);
+  }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,14 @@ protected void merge(final Context scope, final Writer writer)`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
	`166`	`+ /**`
	`167`	`+ * Apply the template and return the raw value (not a CharSequence)`
	`168`	`+ *`
	`169`	`+ * @param scope Template scope.`
	`170`	`+ * @param writer Writer.`
	`171`	`+ * @return Resulting value.`
	`172`	`+ * @throws IOException If something goes wrong.`
	`173`	`+ */`
`166`	`174`	`@SuppressWarnings("unchecked")`
`167`	`175`	`public Object value(final Context scope, final Writer writer) throws IOException {`
`168`	`176`	`boolean blockParam = scope.isBlockParams() && noArg;`