Catch ELException in TypeConvertingMapELResolver to support map metho…

…ds (#690) * Catch ELException in TypeConvertingMapELResolver * Add test
HubSpot · Jun 17, 2021 · 7a17c69 · 7a17c69
1 parent bbf37df
commit 7a17c69
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/el/TypeConvertingMapELResolver.java b/src/main/java/com/hubspot/jinjava/el/TypeConvertingMapELResolver.java
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 import javax.el.ELContext;
+import javax.el.ELException;
 import javax.el.MapELResolver;
 
 public class TypeConvertingMapELResolver extends MapELResolver {
@@ -21,9 +22,13 @@ public Object getValue(ELContext context, Object base, Object property) {
 
     if (base instanceof Map && !((Map) base).isEmpty()) {
       Class<?> keyClass = ((Map) base).keySet().iterator().next().getClass();
-      value = ((Map) base).get(TYPE_CONVERTER.convert(property, keyClass));
-      if (value != null) {
-        context.setPropertyResolved(true);
+      try {
+        value = ((Map) base).get(TYPE_CONVERTER.convert(property, keyClass));
+        if (value != null) {
+          context.setPropertyResolved(true);
+        }
+      } catch (ELException ex) {
+        value = null;
       }
     }
 

diff --git a/src/test/java/com/hubspot/jinjava/el/ext/AstDictTest.java b/src/test/java/com/hubspot/jinjava/el/ext/AstDictTest.java
@@ -7,6 +7,7 @@
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateError.ErrorType;
 import java.util.Map;
+import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -36,6 +37,13 @@ public void itGetsDictValuesWithEnumKeysUsingToString() {
     assertThat(interpreter.resolveELExpression("foo.barName", -1)).isEqualTo("test");
   }
 
+  @Test
+  public void itDoesItemsMethodCall() {
+    interpreter.getContext().put("foo", ImmutableMap.of(TestEnum.BAR, "test"));
+    assertThat(interpreter.resolveELExpression("foo.items()", -1))
+      .isInstanceOf(Set.class);
+  }
+
   @Test
   public void itHandlesEmptyMaps() {
     interpreter.getContext().put("foo", ImmutableMap.of());