Merge pull request #115 from genman/patch

Support for JSON expressions parsing, fix escapes in strings.

json-path-assert/src/test/java/com/jayway/jsonassert/JsonAssertTest.java

@@ -38,6 +38,9 @@ public class JsonAssertTest {
                     "    \"bicycle\": {\n" +
                     "      \"color\": \"red\",\n" +
                     "      \"price\": 19.95\n," +
+                    "      \"gears\": [23, 50]\n," +
+                    "      \"extra\": {\"x\": 0}\n," +
+                    "      \"escape\" : \"Esc\\b\\f\\n\\r\\t\\u002A\",\n" +
                     "      \"nullValue\": null\n" +
                     "    }\n" +
                     "  }\n" +
@@ -55,6 +58,14 @@ public class JsonAssertTest {
         with(JSON).assertNotDefined("$.store.bicycle[?(@.color == 'red' )]");
     }
 
+    @Test
+    public void assert_gears() throws Exception {
+        with(JSON).assertThat("$.store.bicycle[?(@.gears == [23, 50])]", is(collectionWithSize(equalTo(1))));
+        with(JSON).assertThat("$.store.bicycle[?(@.gears == [23, 77])]", is(collectionWithSize(equalTo(0))));
+        with(JSON).assertThat("$.store.bicycle[?(@.extra == {\"x\":0})]", is(collectionWithSize(equalTo(1))));
+        with(JSON).assertThat("$.store.bicycle[?(@.escape == 'Esc\\b\\f\\n\\r\\t\\u002A')]", is(collectionWithSize(equalTo(1))));
+    }
+
     @Test(expected = AssertionError.class)
     public void failed_error_message() throws Exception {
 

json-path/src/main/java/com/jayway/jsonpath/Criteria.java

@@ -17,6 +17,7 @@ package com.jayway.jsonpath;
 import com.jayway.jsonpath.internal.Path;
 import com.jayway.jsonpath.internal.PathCompiler;
 import com.jayway.jsonpath.internal.token.PredicateContextImpl;
+import com.jayway.jsonpath.spi.json.JsonProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,6 +49,7 @@ public class Criteria implements Predicate {
             CriteriaType.GT.toString(),
             CriteriaType.REGEX.toString()
     };
+    private static final char BS = '\\';
 
     private Object left;
     private CriteriaType criteriaType;
@@ -59,7 +61,7 @@ public class Criteria implements Predicate {
         EQ {
             @Override
             boolean eval(Object expected, Object model, PredicateContext ctx) {
-                boolean res = (0 == safeCompare(expected, model));
+                boolean res = (0 == safeCompare(expected, model, ctx));
                 if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
@@ -72,7 +74,7 @@ public class Criteria implements Predicate {
         NE {
             @Override
             boolean eval(Object expected, Object model, PredicateContext ctx) {
-                boolean res = (0 != safeCompare(expected, model));
+                boolean res = (0 != safeCompare(expected, model, ctx));
                 if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
@@ -710,6 +712,14 @@ public class Criteria implements Predicate {
         return (string != null && !string.isEmpty() && string.charAt(0) == '\'' && string.charAt(string.length() - 1) == '\'');
     }
 
+    private static boolean isJson(String string) {
+        if (string == null || string.length() <= 1)
+            return false;
+        char c0 = string.charAt(0);
+        char c1 = string.charAt(string.length() - 1);
+        return (c0 == '[' && c1 == ']') || (c0 == '{' && c1 == '}');
+    }
+
     private static boolean isPattern(String string) {
         return (string != null
                 && !string.isEmpty()
@@ -727,7 +737,6 @@ public class Criteria implements Predicate {
         return Pattern.compile(regex, flags);
     }
 
-
     /**
      * Parse the provided criteria
      *
@@ -755,6 +764,28 @@ public class Criteria implements Predicate {
         return Criteria.create(left, operator, right);
     }
 
+    /**
+     * Wrapper for JSON to be parsed as a String.
+     */
+    private static class JsonValue {
+        final String value;
+        volatile Object jsonValue;
+        JsonValue(String value) { this.value = value; }
+
+        Object parsed(PredicateContext ctx) {
+            if (jsonValue == null) {
+                JsonProvider provider = ctx.configuration().jsonProvider();
+                jsonValue = provider.parse(value);
+            }
+            return jsonValue;
+        }
+
+        @Override
+        public String toString() {
+            return getClass().getSimpleName() + " " + value;
+        }
+    }
+
     /**
      * Creates a new criteria
      *
@@ -797,6 +828,8 @@ public class Criteria implements Predicate {
             rightPrepared = rightPath;
         } else if (isString(right)) {
             rightPrepared = right.substring(1, right.length() - 1);
+        } else if (isJson(right)) {
+            rightPrepared = new JsonValue(right);
         } else if (isPattern(right)) {
             rightPrepared = compilePattern(right);
         }
@@ -809,6 +842,42 @@ public class Criteria implements Predicate {
     }
 
     private static int safeCompare(Object left, Object right) throws ValueCompareException {
+        return safeCompare(left, right, null);
+    }
+
+    private static String unescape(String s) {
+        if (s.indexOf(BS) == - 1)
+            return s;
+        StringBuilder sb = new StringBuilder(s.length());
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            if (c == BS) {
+                char c2 = s.charAt(++i);
+                switch (c2) {
+                    case 'b': c2 = '\b'; break;
+                    case 'f': c2 = '\f'; break;
+                    case 'n': c2 = '\n'; break;
+                    case 'r': c2 = '\r'; break;
+                    case 't': c2 = '\t'; break;
+                    case 'u':
+                        try {
+                            String hex = s.substring(i + 1, i + 5);
+                            c2 = (char)Integer.parseInt(hex, 16);
+                            i += 4;
+                        } catch (Exception e) {
+                            throw new ValueCompareException("\\u parse failed", e);
+                        }
+                        break;
+                }
+                sb.append(c2);
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    private static int safeCompare(Object left, Object right, PredicateContext ctx) throws ValueCompareException {
 
         if (left == right) {
             return 0;
@@ -824,11 +893,8 @@ public class Criteria implements Predicate {
         } else if (leftNullish && rightNullish) {
             return 0;
         } else if (left instanceof String && right instanceof String) {
-            String exp = (String) left;
+            String expected = unescape((String) left);
-            if (exp.contains("\'")) {
+            return expected.compareTo((String) right);
-                exp = exp.replace("\\'", "'");
-            }
-            return exp.compareTo((String) right);
         } else if (left instanceof Number && right instanceof Number) {
             return new BigDecimal(left.toString()).compareTo(new BigDecimal(right.toString()));
         } else if (left instanceof String && right instanceof Number) {
@@ -841,6 +907,10 @@ public class Criteria implements Predicate {
             Boolean e = (Boolean) left;
             Boolean a = (Boolean) right;
             return e.compareTo(a);
+        } else if (left instanceof JsonValue) {
+            notNull(ctx, "ctx");
+            JsonValue json = (JsonValue) left;
+            return right.equals(json.parsed(ctx)) ? 0 : -1;
         } else {
             logger.debug("Can not compare a {} with a {}", left.getClass().getName(), right.getClass().getName());
             throw new ValueCompareException();

json-path/src/main/java/com/jayway/jsonpath/ValueCompareException.java

@@ -15,4 +15,16 @@
 package com.jayway.jsonpath;
 
 public class ValueCompareException extends JsonPathException {
+
+    public ValueCompareException() {
+    }
+
+    public ValueCompareException(String message) {
+        super(message);
+    }
+
+    public ValueCompareException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
 }

json-path/src/test/java/com/jayway/jsonpath/BaseTest.java

@@ -78,6 +78,7 @@ public class BaseTest {
             "      ],\n" +
             "      \"bicycle\" : {\n" +
             "         \"foo\" : \"baz\",\n" +
+            "         \"escape\" : \"Esc\\b\\f\\n\\r\\t\\n\\t\\u002A\",\n" +
             "         \"color\" : \"red\",\n" +
             "         \"display-price\" : 19.95,\n" +
             "         \"foo:bar\" : \"fooBar\",\n" +

json-path/src/test/java/com/jayway/jsonpath/FilterTest.java

@@ -240,6 +240,26 @@ public class FilterTest extends BaseTest {
         assertThat(filter(where("int-key").regex(Pattern.compile("^string$"))).apply(createPredicateContext(json))).isEqualTo(false);
     }
 
+    //----------------------------------------------------------------------------
+    //
+    // JSON equality
+    //
+    //----------------------------------------------------------------------------
+    @Test
+    public void json_evals() {
+        String nest = "{\"a\":true}";
+        String arr = "[1,2]";
+        String json = "{\"foo\":" + arr + ", \"bar\":" + nest + "}";
+        Object tree = Configuration.defaultConfiguration().jsonProvider().parse(json);
+        Predicate.PredicateContext context = createPredicateContext(tree);
+        Filter farr = Filter.parse("[?(@.foo == " + arr + ")]");
+        Filter fobjF = Filter.parse("[?(@.foo == " + nest + ")]");
+        Filter fobjT = Filter.parse("[?(@.bar == " + nest + ")]");
+        assertThat(farr.apply(context)).isEqualTo(true);
+        assertThat(fobjF.apply(context)).isEqualTo(false);
+        assertThat(fobjT.apply(context)).isEqualTo(true);
+    }
+
     //----------------------------------------------------------------------------
     //
     // IN

json-path/src/test/java/com/jayway/jsonpath/InlineFilterTest.java

@@ -11,6 +11,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class InlineFilterTest extends BaseTest {
 
     private static ReadContext reader = JsonPath.parse(JSON_DOCUMENT);
+    private static int bookCount = 4;
 
     @Test
     public void root_context_can_be_referred_in_predicate() {
@@ -23,13 +24,13 @@ public class InlineFilterTest extends BaseTest {
     public void multiple_context_object_can_be_refered() {
 
         List all = reader.read("store.book[ ?(@.category == @.category) ]", List.class);
-        assertThat(all.size()).isEqualTo(4);
+        assertThat(all.size()).isEqualTo(bookCount);
 
         List all2 = reader.read("store.book[ ?(@.category == @['category']) ]", List.class);
-        assertThat(all2.size()).isEqualTo(4);
+        assertThat(all2.size()).isEqualTo(bookCount);
 
         List all3 = reader.read("store.book[ ?(@ == @) ]", List.class);
-        assertThat(all3.size()).isEqualTo(4);
+        assertThat(all3.size()).isEqualTo(bookCount);
 
         List none = reader.read("store.book[ ?(@.category != @.category) ]", List.class);
         assertThat(none.size()).isEqualTo(0);