Removed deprecated classes and some minor fixes.

changelog.md

@@ -1,11 +1,16 @@
-In The Pipe
+In the Pipe
 ===========
+
+2.0.0 (2015-03-)
+================
 * Upgraded dependency versions
 * Moved JsonProvider and MappingProvider implementations out of the interal package **OSGi**
-* Deprecated HTTP provider and methods
+* Removed HTTP provider and methods
 * Add an unwrap(Object) method to JsonProvider, use it when extracting values for Criteria evaluation **breaks JsonProvider SPI**
 * Fixed issue #71 - esacpe character in inline predicates 
   `JsonPath.read(json, "$.logs[?(@.message == 'it\\'s here')].message");`
+* New method `jsonString()` added to `ReadContext` and `WriteContext` to extract json model as a string  
+* Path does not have to be definite in filter API `filter(where("authors[*].lastName").contains("Waugh"))`
 
 1.2.0 (2014-11-11)
 ==================

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

@@ -58,9 +58,9 @@ public class Criteria implements Predicate {
     private static enum CriteriaType {
         EQ {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                boolean res = (0 == safeCompare(left, right));
+                boolean res = (0 == safeCompare(expected, model));
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right, name(), left, res);
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
 
@@ -71,9 +71,9 @@ public class Criteria implements Predicate {
         },
         NE {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                boolean res = (0 != safeCompare(left, right));
+                boolean res = (0 != safeCompare(expected, model));
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right, name(), left, res);
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
 
@@ -84,14 +84,15 @@ public class Criteria implements Predicate {
         },
         GT {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                if ((left == null) ^ (right == null)) {
+                if ((expected == null) ^ (model == null)) {
                     return false;
                 }
-                boolean res = (0 > safeCompare(left, right));
+                boolean res = (0 > safeCompare(expected, model));
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right, name(), left, res);
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
+
             @Override
             public String toString() {
                 return ">";
@@ -99,14 +100,15 @@ public class Criteria implements Predicate {
         },
         GTE {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                if ((left == null) ^ (right == null)) {
+                if ((expected == null) ^ (model == null)) {
                     return false;
                 }
-                boolean res = (0 >= safeCompare(left, right));
+                boolean res = (0 >= safeCompare(expected, model));
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right, name(), left, res);
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
+
             @Override
             public String toString() {
                 return ">=";
@@ -114,14 +116,15 @@ public class Criteria implements Predicate {
         },
         LT {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                if ((left == null) ^ (right == null)) {
+                if ((expected == null) ^ (model == null)) {
                     return false;
                 }
-                boolean res = (0 < safeCompare(left, right));
+                boolean res = (0 < safeCompare(expected, model));
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right, name(), left, res);
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
+
             @Override
             public String toString() {
                 return "<";
@@ -129,14 +132,15 @@ public class Criteria implements Predicate {
         },
         LTE {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                if ((left == null) ^ (right == null)) {
+                if ((expected == null) ^ (model == null)) {
                     return false;
                 }
-                boolean res = (0 <= safeCompare(left, right));
+                boolean res = (0 <= safeCompare(expected, model));
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right, name(), left, res);
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
+
             @Override
             public String toString() {
                 return "<=";
@@ -144,37 +148,59 @@ public class Criteria implements Predicate {
         },
         IN {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
                 boolean res = false;
-                Collection exps = (Collection) left;
+                Collection exps = (Collection) expected;
                 for (Object exp : exps) {
-                    if (0 == safeCompare(exp, right)) {
+                    if (0 == safeCompare(exp, model)) {
                         res = true;
                         break;
                     }
                 }
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right, name(), join(", ", exps), res);
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), join(", ", exps), res);
                 return res;
             }
         },
         NIN {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                Collection nexps = (Collection) left;
+                Collection nexps = (Collection) expected;
-                boolean res = !nexps.contains(right);
+                boolean res = !nexps.contains(model);
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right, name(), join(", ", nexps), res);
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), join(", ", nexps), res);
+                return res;
+            }
+        },
+        CONTAINS {
+            @Override
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
+                boolean res = false;
+                if (ctx.configuration().jsonProvider().isArray(model)) {
+                    for (Object o : ctx.configuration().jsonProvider().toIterable(model)) {
+                        if (expected.equals(o)) {
+                            res = true;
+                            break;
+                        }
+                    }
+                } else if(model instanceof String){
+                    if(isNullish(expected) || !(expected instanceof String)){
+                        res = false;
+                    } else {
+                        res = ((String) model).contains((String)expected);
+                    }
+                }
+                if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", model, name(), expected, res);
                 return res;
             }
         },
         ALL {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
                 boolean res = true;
-                Collection exps = (Collection) left;
+                Collection exps = (Collection) expected;
-                if (ctx.configuration().jsonProvider().isArray(right)) {
+                if (ctx.configuration().jsonProvider().isArray(model)) {
                     for (Object exp : exps) {
                         boolean found = false;
-                        for (Object check : ctx.configuration().jsonProvider().toIterable(right)) {
+                        for (Object check : ctx.configuration().jsonProvider().toIterable(model)) {
                             if (0 == safeCompare(exp, check)) {
                                 found = true;
                                 break;
@@ -185,7 +211,8 @@ public class Criteria implements Predicate {
                             break;
                         }
                     }
-                    if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", join(", ", ctx.configuration().jsonProvider().toIterable(right)), name(), join(", ", exps), res);
+                    if (logger.isDebugEnabled())
+                        logger.debug("[{}] {} [{}] => {}", join(", ", ctx.configuration().jsonProvider().toIterable(model)), name(), join(", ", exps), res);
                 } else {
                     res = false;
                     if (logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", "<NOT AN ARRAY>", name(), join(", ", exps), res);
@@ -195,61 +222,64 @@ public class Criteria implements Predicate {
         },
         SIZE {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                int size = (Integer) left;
+                int size = (Integer) expected;
                 boolean res;
-                if (ctx.configuration().jsonProvider().isArray(right)) {
+                if (ctx.configuration().jsonProvider().isArray(model)) {
-                    int length = ctx.configuration().jsonProvider().length(right);
+                    int length = ctx.configuration().jsonProvider().length(model);
                     res = (length == size);
                     if (logger.isDebugEnabled()) logger.debug("Array with size {} {} {} => {}", length, name(), size, res);
-                } else if (right instanceof String) {
+                } else if (model instanceof String) {
-                    int length = ((String) right).length();
+                    int length = ((String) model).length();
                     res = length == size;
                     if (logger.isDebugEnabled()) logger.debug("String with length {} {} {} => {}", length, name(), size, res);
                 } else {
                     res = false;
-                    if(logger.isDebugEnabled()) logger.debug("{} {} {} => {}", right == null ? "null" : right.getClass().getName(), name(), size, res);
+                    if (logger.isDebugEnabled())
+                        logger.debug("{} {} {} => {}", model == null ? "null" : model.getClass().getName(), name(), size, res);
                 }
                 return res;
             }
         },
         EXISTS {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
                 //This must be handled outside
                 throw new UnsupportedOperationException();
             }
         },
         TYPE {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
-                final Class<?> expType = (Class<?>) left;
+                final Class<?> expType = (Class<?>) expected;
-                final Class<?> actType = right == null ? null : right.getClass();
+                final Class<?> actType = model == null ? null : model.getClass();
 
                 return actType != null && expType.isAssignableFrom(actType);
             }
         },
         REGEX {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
                 boolean res = false;
                 Pattern pattern;
                 Object target;
 
-                if(right instanceof Pattern){
+                if (model instanceof Pattern) {
-                    pattern = (Pattern) right;
+                    pattern = (Pattern) model;
-                    target  = left;
+                    target = expected;
                 } else {
-                    pattern = (Pattern) left;
+                    pattern = (Pattern) expected;
-                    target = right;
+                    target = model;
                 }
 
                 if (target != null) {
                     res = pattern.matcher(target.toString()).matches();
                 }
-                if(logger.isDebugEnabled()) logger.debug("[{}] {} [{}] => {}", right == null?"null":right.toString(), name(), left==null?"null":left.toString(), res);
+                if (logger.isDebugEnabled())
+                    logger.debug("[{}] {} [{}] => {}", model == null ? "null" : model.toString(), name(), expected == null ? "null" : expected.toString(), res);
                 return res;
             }
+
             @Override
             public String toString() {
                 return "=~";
@@ -257,23 +287,23 @@ public class Criteria implements Predicate {
         },
         MATCHES {
             @Override
-            boolean eval(Object left, final Object right, final PredicateContext ctx) {
+            boolean eval(Object expected, final Object model, final PredicateContext ctx) {
                 PredicateContextImpl pci = (PredicateContextImpl) ctx;
-                Predicate exp = (Predicate) left;
+                Predicate exp = (Predicate) expected;
-                return exp.apply(new PredicateContextImpl(right, ctx.root(), ctx.configuration(), pci.documentPathCache()));
+                return exp.apply(new PredicateContextImpl(model, ctx.root(), ctx.configuration(), pci.documentPathCache()));
             }
         },
         NOT_EMPTY {
             @Override
-            boolean eval(Object left, Object right, PredicateContext ctx) {
+            boolean eval(Object expected, Object model, PredicateContext ctx) {
                 boolean res = false;
-                if (right != null) {
+                if (model != null) {
-                    if (ctx.configuration().jsonProvider().isArray(right)) {
+                    if (ctx.configuration().jsonProvider().isArray(model)) {
-                        int len = ctx.configuration().jsonProvider().length(right);
+                        int len = ctx.configuration().jsonProvider().length(model);
                         res = (0 != len);
                         if (logger.isDebugEnabled()) logger.debug("array length = {} {} => {}", len, name(), res);
-                    } else if (right instanceof String) {
+                    } else if (model instanceof String) {
-                        int len = ((String) right).length();
+                        int len = ((String) model).length();
                         res = (0 != len);
                         if (logger.isDebugEnabled()) logger.debug("string length = {} {} => {}", len, name(), res);
                     }
@@ -282,7 +312,7 @@ public class Criteria implements Predicate {
             }
         };
 
-        abstract boolean eval(Object left, Object right, PredicateContext ctx);
+        abstract boolean eval(Object expected, Object model, PredicateContext ctx);
 
         public static CriteriaType parse(String str) {
             if ("==".equals(str)) {
@@ -306,12 +336,12 @@ public class Criteria implements Predicate {
     }
 
     private Criteria(List<Criteria> criteriaChain, Object left) {
-
+        /*
         if(left instanceof Path) {
             if (!((Path)left).isDefinite()) {
                 throw new InvalidCriteriaException("A criteria path must be definite. The path " + left.toString() + " is not!");
             }
-        }
+        }*/
         this.left = left;
         this.criteriaChain = criteriaChain;
         this.criteriaChain.add(this);
@@ -542,6 +572,19 @@ public class Criteria implements Predicate {
         return this;
     }
 
+    /**
+     * The <code>contains</code> operator asserts that the provided object is contained
+     * in the result. The object that should contain the input can be either an object or a String.
+     *
+     * @param o that should exists in given collection or
+     * @return the criteria
+     */
+    public Criteria contains(Object o) {
+        this.criteriaType = CriteriaType.CONTAINS;
+        this.right = o;
+        return this;
+    }
+
     /**
      * The <code>nin</code> operator is similar to $in except that it selects objects for
      * which the specified field does not have any value in the specified array.
@@ -666,6 +709,7 @@ public class Criteria implements Predicate {
     private static boolean isString(String string) {
         return (string != null && !string.isEmpty() && string.charAt(0) == '\'' && string.charAt(string.length() - 1) == '\'');
     }
+
     private static boolean isPattern(String string) {
         return (string != null
                 && !string.isEmpty()
@@ -684,9 +728,9 @@ public class Criteria implements Predicate {
     }
 
 
-
     /**
      * Parse the provided criteria
+     *
      * @param criteria
      * @return a criteria
      */
@@ -713,6 +757,7 @@ public class Criteria implements Predicate {
 
     /**
      * Creates a new criteria
+     *
      * @param left     path to evaluate in criteria
      * @param operator operator
      * @param right    expected value
@@ -807,16 +852,12 @@ public class Criteria implements Predicate {
     }
 
 
-
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(left.toString())
-                //.append("|")
                 .append(criteriaType.toString())
-                //.append("|")
                 .append(wrapString(right));
-                //.append("|");
         return sb.toString();
     }
 
@@ -832,6 +873,4 @@ public class Criteria implements Predicate {
     }
 
 
-
-
 }

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

@@ -21,7 +21,6 @@ import com.jayway.jsonpath.internal.Path;
 import com.jayway.jsonpath.internal.PathCompiler;
 import com.jayway.jsonpath.internal.PathRef;
 import com.jayway.jsonpath.internal.Utils;
-import com.jayway.jsonpath.spi.http.HttpProviderFactory;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 
 import java.io.File;
@@ -318,29 +317,6 @@ public class JsonPath {
         return read(jsonURL, Configuration.defaultConfiguration());
     }
 
-    /**
-     * Applies this JsonPath to the provided json URL
-     *
-     * @param jsonURL       url to read from
-     * @param configuration configuration to use
-     * @param <T>           expected return type
-     * @return list of objects matched by the given path
-     * @throws IOException
-     */
-    @SuppressWarnings({"unchecked"})
-    public <T> T read(URL jsonURL, Configuration configuration) throws IOException {
-        notNull(jsonURL, "json URL can not be null");
-        notNull(configuration, "jsonProvider can not be null");
-
-        InputStream in = null;
-        try {
-            in = HttpProviderFactory.getProvider().get(jsonURL);
-            return read(in, "UTF-8", configuration);
-        } finally {
-            Utils.closeQuietly(in);
-        }
-    }
-
     /**
      * Applies this JsonPath to the provided json file
      *

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

@@ -30,7 +30,4 @@ public interface ParseContext {
     DocumentContext parse(InputStream json, String charset);
 
     DocumentContext parse(File json) throws IOException;
-
-    @Deprecated
-    DocumentContext parse(URL json) throws IOException;
 }

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

@@ -30,6 +30,13 @@ public interface ReadContext {
      */
     <T> T json();
 
+    /**
+     * Returns the JSON model that this context is operating on as a JSON string
+     *
+     * @return json model as string
+     */
+    String jsonString();
+
     /**
      * Reads the given path from this context
      *

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

@@ -30,6 +30,13 @@ public interface WriteContext {
      */
     <T> T json();
 
+    /**
+     * Returns the JSON model that this context is operating on as a JSON string
+     *
+     * @return json model as string
+     */
+    String jsonString();
+
     /**
      * Set the value a the given path
      *

json-path/src/main/java/com/jayway/jsonpath/internal/JsonReader.java

@@ -23,7 +23,6 @@ import com.jayway.jsonpath.ParseContext;
 import com.jayway.jsonpath.Predicate;
 import com.jayway.jsonpath.ReadContext;
 import com.jayway.jsonpath.TypeRef;
-import com.jayway.jsonpath.spi.http.HttpProviderFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +30,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.List;
 
 import static com.jayway.jsonpath.JsonPath.compile;
@@ -111,13 +109,6 @@ public class JsonReader implements ParseContext, DocumentContext {
         return this;
     }
 
-    @Override
-    public DocumentContext parse(URL json) throws IOException {
-        notNull(json, "json url can not be null");
-        InputStream is = HttpProviderFactory.getProvider().get(json);
-        return parse(is);
-    }
-
     @Override
     public Configuration configuration() {
         return configuration;
@@ -133,6 +124,11 @@ public class JsonReader implements ParseContext, DocumentContext {
         return json;
     }
 
+    @Override
+    public String jsonString() {
+        return configuration.jsonProvider().toJson(json);
+    }
+
     @Override
     public <T> T read(String path, Predicate... filters) {
         notEmpty(path, "path can not be null or empty");

json-path/src/main/java/com/jayway/jsonpath/spi/http/HttpProvider.java

@@ -1,26 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.jayway.jsonpath.spi.http;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-@Deprecated
-public interface HttpProvider {
-
-    InputStream get(URL url) throws IOException;
-
-}

json-path/src/main/java/com/jayway/jsonpath/spi/http/HttpProviderFactory.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.jayway.jsonpath.spi.http;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-
-@Deprecated
-public abstract class HttpProviderFactory {
-
-    public static HttpProviderFactory factory = new HttpProviderFactory() {
-        @Override
-        protected HttpProvider create() {
-            return new HttpProvider() {
-                @Override
-                public InputStream get(URL url) throws IOException {
-                    URLConnection connection = url.openConnection();
-                    connection.setRequestProperty("Accept", "application/json");
-                    return connection.getInputStream();
-                }
-            };
-        }
-    };
-
-    public static HttpProvider getProvider() {
-        return factory.create();
-    }
-
-
-    protected abstract HttpProvider create();
-}

json-path/src/main/java/com/jayway/jsonpath/spi/json/JacksonJsonNodeJsonProvider.java

@@ -71,7 +71,7 @@ public class JacksonJsonNodeJsonProvider extends AbstractJsonProvider {
         if (!(obj instanceof JsonNode)) {
             throw new JsonPathException("Not a JSON Node");
         }
-        return toString();
+        return obj.toString();
     }
 
     @Override

json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonSmartJsonProvider.java

@@ -49,11 +49,6 @@ public class JsonSmartJsonProvider extends AbstractJsonProvider {
         this.mapper = mapper;
     }
 
-    @Deprecated
-    public JsonSmartJsonProvider(Mode mode) {
-        this(mode.intValue(), JSONValue.defaultReader.DEFAULT_ORDERED);
-    }
-
     public Object createArray() {
         return mapper.createArray();
     }

json-path/src/main/java/com/jayway/jsonpath/spi/json/Mode.java

@@ -1,44 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.jayway.jsonpath.spi.json;
-
-@Deprecated
-public enum Mode {
-
-    SLACK(-1),
-    STRICT(1);
-
-    private final int mode;
-
-    Mode(int mode) {
-        this.mode = mode;
-    }
-
-    public int intValue() {
-        return mode;
-    }
-
-    public Mode parse(int mode) {
-        if (mode == -1) {
-            return SLACK;
-        } else if (mode == 1) {
-            return STRICT;
-        } else {
-            throw new IllegalArgumentException("Mode " + mode + " not supported");
-        }
-    }
-
-
-}

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

@@ -32,6 +32,13 @@ public class BaseTest {
 
     public static final Configuration JSON_SMART_CONFIGURATION = Configuration.defaultConfiguration();
 
+    public static final String JSON_BOOK_DOCUMENT =
+            "{ " +
+            "   \"category\" : \"reference\",\n" +
+            "   \"author\" : \"Nigel Rees\",\n" +
+            "   \"title\" : \"Sayings of the Century\",\n" +
+            "   \"display-price\" : 8.95\n" +
+            "}";
     public static final String JSON_DOCUMENT = "{\n" +
             "   \"string-property\" : \"string-value\", \n" +
             "   \"int-max-property\" : " + Integer.MAX_VALUE + ", \n" +

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

@@ -0,0 +1,26 @@
+package com.jayway.jsonpath;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import static com.jayway.jsonpath.JsonPath.using;
+
+public class ReadContextTest extends BaseTest {
+
+    @Test
+    public void json_can_be_fetched_as_string() {
+
+        String expected = "{\"category\":\"reference\",\"author\":\"Nigel Rees\",\"title\":\"Sayings of the Century\",\"display-price\":8.95}";
+
+        String jsonString1 = using(JSON_SMART_CONFIGURATION).parse(JSON_BOOK_DOCUMENT).jsonString();
+        String jsonString2 = using(JACKSON_CONFIGURATION).parse(JSON_BOOK_DOCUMENT).jsonString();
+        String jsonString3 = using(JACKSON_JSON_NODE_CONFIGURATION).parse(JSON_BOOK_DOCUMENT).jsonString();
+        String jsonString4 = using(GSON_CONFIGURATION).parse(JSON_BOOK_DOCUMENT).jsonString();
+
+        Assertions.assertThat(jsonString1).isEqualTo(expected);
+        Assertions.assertThat(jsonString2).isEqualTo(expected);
+        Assertions.assertThat(jsonString3).isEqualTo(expected);
+        Assertions.assertThat(jsonString4).isEqualTo(expected);
+    }
+
+}

json-path/src/test/java/com/jayway/jsonpath/old/ComplianceTest.java

@@ -107,10 +107,10 @@ public class ComplianceTest {
                 "               }\n" +
                 "             }";
 
-        //assertThat(JsonPath.<List<String>>read(json, "$.menu.items[?(@)]"), Matchers.is(notNullValue()));
+        assertThat(JsonPath.<List<String>>read(json, "$.menu.items[?(@)]"), Matchers.is(notNullValue()));
         assertThat(JsonPath.<List<String>>read(json, "$.menu.items[?(@ && @.id == 'ViewSVG')].id"), hasItems("ViewSVG"));
 
-        //assertThat(JsonPath.<List<String>>read(json, "$.menu.items[?(@ && @.id && !@.label)].id"), hasItems("?")); //low
+        assertThat(JsonPath.<List<String>>read(json, "$.menu.items[?(@ && @.id && !@.label)].id"), hasItems("Open", "Quality", "Pause", "Mute", "Copy", "Help")); //low
         //assertThat(JsonPath.<List<String>>read(json, "$.menu.items[?(@ && @.label && /SVG/.test(@.label))].id"), hasItems("?")); //low
         //assertThat(JsonPath.<List<String>>read(json, "$.menu.items[?(!@)]"), hasItems("?")); //low
         //assertThat(JsonPath.<List<String>>read(json, "$..[0]"), hasItems("?")); //low

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

@@ -2,11 +2,13 @@ package com.jayway.jsonpath.old;
 
 import com.jayway.jsonpath.BaseTest;
 import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.Criteria;
 import com.jayway.jsonpath.Filter;
 import com.jayway.jsonpath.InvalidCriteriaException;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Predicate;
 import com.jayway.jsonpath.spi.json.JsonProvider;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -412,10 +414,78 @@ public class FilterTest extends BaseTest {
         assertEquals(2, result2.size());
     }
 
-    @Test(expected = InvalidCriteriaException.class)
+    @Test
-    public void filter_path_must_be_absolute() {
+    public void contains_filter_evaluates_on_array() {
+
+
+        String json = "{\n" +
+                "\"store\": {\n" +
+                "    \"book\": [\n" +
+                "        {\n" +
+                "            \"category\": \"reference\",\n" +
+                "            \"authors\" : [\n" +
+                "                 {\n" +
+                "                     \"firstName\" : \"Nigel\",\n" +
+                "                     \"lastName\" :  \"Rees\"\n" +
+                "                  }\n" +
+                "            ],\n" +
+                "            \"title\": \"Sayings of the Century\",\n" +
+                "            \"price\": 8.95\n" +
+                "        },\n" +
+                "        {\n" +
+                "            \"category\": \"fiction\",\n" +
+                "            \"authors\": [\n" +
+                "                 {\n" +
+                "                     \"firstName\" : \"Evelyn\",\n" +
+                "                     \"lastName\" :  \"Waugh\"\n" +
+                "                  },\n" +
+                "                 {\n" +
+                "                     \"firstName\" : \"Another\",\n" +
+                "                     \"lastName\" :  \"Author\"\n" +
+                "                  }\n" +
+                "            ],\n" +
+                "            \"title\": \"Sword of Honour\",\n" +
+                "            \"price\": 12.99\n" +
+                "        }\n" +
+                "    ]\n" +
+                "  }\n" +
+                "}";
+
 
-        where("$.store.*").size(4);
+        Filter filter = filter(where("authors[*].lastName").contains("Waugh"));
+
+        List<String> result = JsonPath.parse(json).read("$.store.book[?].title", filter);
+
+        Assertions.assertThat(result).containsExactly("Sword of Honour");
     }
 
+
+    @Test
+    public void contains_filter_evaluates_on_string() {
+
+
+        String json = "{\n" +
+                "\"store\": {\n" +
+                "    \"book\": [\n" +
+                "        {\n" +
+                "            \"category\": \"reference\",\n" +
+                "            \"title\": \"Sayings of the Century\",\n" +
+                "            \"price\": 8.95\n" +
+                "        },\n" +
+                "        {\n" +
+                "            \"category\": \"fiction\",\n" +
+                "            \"title\": \"Sword of Honour\",\n" +
+                "            \"price\": 12.99\n" +
+                "        }\n" +
+                "    ]\n" +
+                "  }\n" +
+                "}";
+
+
+        Filter filter = filter(where("category").contains("fic"));
+
+        List<String> result = JsonPath.parse(json).read("$.store.book[?].title", filter);
+
+        Assertions.assertThat(result).containsExactly("Sword of Honour");
+    }
 }

json-path/src/test/java/com/jayway/jsonpath/old/IssuesTest.java

@@ -6,6 +6,7 @@ import com.jayway.jsonpath.Filter;
 import com.jayway.jsonpath.JsonPath;
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
+import com.jayway.jsonpath.Predicate;
 import com.jayway.jsonpath.internal.Utils;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import org.assertj.core.api.Assertions;
@@ -21,6 +22,7 @@ import static com.jayway.jsonpath.JsonPath.read;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+import static org.assertj.core.api.Assertions.filter;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -233,6 +235,7 @@ public class IssuesTest {
         String json = "{\"a\":{\"b\":1,\"c\":2}}";
         JsonPath.parse(json, configuration).read("a.d");
     }
+
     @Test
     public void issue_22c() throws Exception {
         //Configuration configuration = Configuration.builder().build();
@@ -243,7 +246,6 @@ public class IssuesTest {
     }
 
 
-
     @Test
     public void issue_22b() throws Exception {
         String json = "{\"a\":[{\"b\":1,\"c\":2},{\"b\":5,\"c\":2}]}";
@@ -280,6 +282,7 @@ public class IssuesTest {
 
         assertTrue(result.size() == 1);
     }
+
     @Test
     public void issue_30() throws Exception {
         String json = "{\"foo\" : {\"@id\" : \"123\", \"$\" : \"hello\"}}";
@@ -411,8 +414,6 @@ public class IssuesTest {
     public void issue_46() {
 
 
-
-
         String json = "{\"a\": {}}";
 
         Configuration configuration = Configuration.defaultConfiguration().setOptions(Option.SUPPRESS_EXCEPTIONS);
@@ -498,6 +499,52 @@ public class IssuesTest {
         Assertions.assertThat(problems).containsExactly("Chain does not have a discovery event. Possible it was cut by the date that was picked", "No start transcoding events found");
     }
 
+    //http://stackoverflow.com/questions/28596324/jsonpath-filtering-api
+    @Test
+    public void stack_overflow_question_1() {
+
+
+        String json = "{\n" +
+                "\"store\": {\n" +
+                "    \"book\": [\n" +
+                "        {\n" +
+                "            \"category\": \"reference\",\n" +
+                "            \"authors\" : [\n" +
+                "                 {\n" +
+                "                     \"firstName\" : \"Nigel\",\n" +
+                "                     \"lastName\" :  \"Rees\"\n" +
+                "                  }\n" +
+                "            ],\n" +
+                "            \"title\": \"Sayings of the Century\",\n" +
+                "            \"price\": 8.95\n" +
+                "        },\n" +
+                "        {\n" +
+                "            \"category\": \"fiction\",\n" +
+                "            \"authors\": [\n" +
+                "                 {\n" +
+                "                     \"firstName\" : \"Evelyn\",\n" +
+                "                     \"lastName\" :  \"Waugh\"\n" +
+                "                  },\n" +
+                "                 {\n" +
+                "                     \"firstName\" : \"Another\",\n" +
+                "                     \"lastName\" :  \"Author\"\n" +
+                "                  }\n" +
+                "            ],\n" +
+                "            \"title\": \"Sword of Honour\",\n" +
+                "            \"price\": 12.99\n" +
+                "        }\n" +
+                "    ]\n" +
+                "  }\n" +
+                "}";
+
+
+        Filter filter = Filter.filter(Criteria.where("authors[*].lastName").contains("Waugh"));
+
+        Object read = JsonPath.parse(json).read("$.store.book[?]", filter);
+
+        System.out.println(read);
+    }
+
     @Test
     public void issue_71() {
         String json = "{\n"

json-path/src/test/resources/simplelogger.properties

@@ -1,2 +1,3 @@
 org.slf4j.simpleLogger.log.com.jayway=debug
 
+