Merge pull request #314 from HubSpot/fix-in

Use type converter when evaulting 'in'
HubSpot · Mar 25, 2019 · 1d475ba · 1d475ba
2 parents fb701de + aad3611
commit 1d475ba
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/el/ext/CollectionMembershipOperator.java b/src/main/java/com/hubspot/jinjava/el/ext/CollectionMembershipOperator.java
@@ -3,6 +3,8 @@
 import java.util.Collection;
 import java.util.Objects;
 
+import javax.el.ELException;
+
 import org.apache.commons.lang3.StringUtils;
 
 import de.odysseus.el.misc.TypeConverter;
@@ -26,7 +28,21 @@ protected Object apply(TypeConverter converter, Object o1, Object o2) {
     }
 
     if (Collection.class.isAssignableFrom(o2.getClass())) {
-      return ((Collection<?>) o2).contains(o1);
+      Collection<?> collection = (Collection<?>) o2;
+
+      for (Object value : collection) {
+        if (value == null) {
+          if (o1 == null) {
+            return Boolean.TRUE;
+          }
+        } else {
+          try {
+            return collection.contains(converter.convert(o1, value.getClass()));
+          } catch (ELException e) {
+            return Boolean.FALSE;
+          }
+        }
+      }
     }
 
     return Boolean.FALSE;

diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/IntFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/IntFilterTest.java
@@ -6,7 +6,6 @@
 import java.time.ZoneOffset;
 import java.util.Locale;
 
-import org.apache.commons.lang3.math.NumberUtils;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -113,4 +112,14 @@ public void itInterpretsFrenchCommasAndPeriodsWithFrenchLocale() {
     interpreter = new Jinjava(FRENCH_LOCALE_CONFIG).newInterpreter();
     assertThat(filter.filter("123\u00A0123,12", interpreter)).isEqualTo(123123);
   }
+
+  @Test
+  public void itConvertsProperlyInExpressionTest() {
+    assertThat(interpreter.render("{{ '3'|int in [null, 4, 5, 6, null, 3] }}")).isEqualTo("true");
+  }
+
+  @Test
+  public void itConvertsProperlyInExpressionTestWithWrongType() {
+    assertThat(interpreter.render("{{ 'test' in [null, 4, 5, 6, null, 3] }}")).isEqualTo("false");
+  }
 }