Merge pull request #1149 from HubSpot/json-resolved-expressions

Do not add broken JSON to resolved expressions.

Author: hs-lsong

src/main/java/com/hubspot/jinjava/el/ExpressionResolver.java

@@ -87,16 +87,24 @@ private Object resolveExpression(String expression, boolean addToResolvedExpress
     }
     expression = expression.trim();
     if (addToResolvedExpressions) {
+      if (WhitespaceUtils.isWrappedWith(expression, "[", "]")) {
+        String commaSeparatedExpress = expression
+          .substring(1, expression.length() - 1)
+          .trim();
+        // Over-simplified way to detect JSON format, avoid to break it for adding resolved expressions.
+        if (
+          !commaSeparatedExpress.startsWith("{") || !commaSeparatedExpress.endsWith("}")
+        ) {
+          Arrays
+            .stream(commaSeparatedExpress.split(","))
+            .forEach(substring ->
+              interpreter.getContext().addResolvedExpression(substring.trim())
+            );
+        }
+      }
       interpreter.getContext().addResolvedExpression(expression);
     }
 
-    if (WhitespaceUtils.isWrappedWith(expression, "[", "]")) {
-      Arrays
-        .stream(expression.substring(1, expression.length() - 1).split(","))
-        .forEach(substring ->
-          interpreter.getContext().addResolvedExpression(substring.trim())
-        );
-    }
     try {
       String elExpression = EXPRESSION_START_TOKEN + expression + EXPRESSION_END_TOKEN;
       ValueExpression valueExp = expressionFactory.createValueExpression(

src/test/java/com/hubspot/jinjava/util/EagerExpressionResolverTest.java

@@ -772,6 +772,21 @@ public void itSplitsResolvedExpression() {
       .containsExactlyInAnyOrder("['a', 'b']", "'a'", "'b'");
   }
 
+  @Test
+  public void itDoesNotSplitJsonResolvedExpression() {
+    eagerResolveExpression("{'a': 1, 'b': 2}");
+    assertThat(context.getResolvedExpressions())
+      .containsExactlyInAnyOrder("{'a': 1, 'b': 2}");
+  }
+
+  @Test
+  public void itDoesNotSplitJsonInArrayResolvedExpression() {
+    // It should not add the broke JSON `{'a': 1` to resolved expressions.
+    eagerResolveExpression("[{'a': 1, 'b': 2}]");
+    assertThat(context.getResolvedExpressions())
+      .containsExactlyInAnyOrder("[{'a': 1, 'b': 2}]");
+  }
+
   @Test
   public void itHandlesRandom() {
     assertThat(eagerResolveExpression("range(1)|random").toString())