Merge pull request #1152 from ccutrer/fix-numeric-key

boulter · web-flow · commit 61452e455766 · 2024-03-22T14:58:25.000-04:00
add support for numeric keys in map literal
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/AstDict.java b/src/main/java/com/hubspot/jinjava/el/ext/AstDict.java
@@ -7,6 +7,7 @@
 import de.odysseus.el.tree.impl.ast.AstIdentifier;
 import de.odysseus.el.tree.impl.ast.AstLiteral;
 import de.odysseus.el.tree.impl.ast.AstNode;
+import de.odysseus.el.tree.impl.ast.AstNumber;
 import de.odysseus.el.tree.impl.ast.AstString;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -45,9 +46,14 @@ public Object eval(Bindings bindings, ELContext context) {
         } else {
           key = ((AstIdentifier) entryKey).getName();
         }
+      } else if (entryKey instanceof AstNumber) {
+        // This is a hack to treat numeric keys as string keys in the dictionary.
+        // In most cases this is adequate since the keys are typically treated as
+        // strings.
+        key = Objects.toString(entryKey.eval(bindings, context));
       } else {
         throw new TemplateStateException(
-          "Dict key must be a string or identifier, was: " + entryKey
+          "Dict key must be a string, or identifier, or a  number, was: " + entryKey
         );
       }
 
diff --git a/src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java b/src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java
@@ -213,6 +213,11 @@ public void complexMapLiteral() {
     assertThat((Map<String, Object>) map.get("Boston")).contains(entry("city", "Boston"));
   }
 
+  @Test
+  public void mapLiteralWithNumericKey() {
+    assertThat((Map<String, Object>) val("{0:'test'}")).contains(entry("0", "test"));
+  }
+
   @Test
   public void itParsesDictWithVariableRefs() {
     List<?> theList = Lists.newArrayList(1L, 2L, 3L);
