From 4194ac3e7ed258db9c4042dfa7492299882698e5 Mon Sep 17 00:00:00 2001
From: Kalle Stenflo <kalle.stenflo@gmail.com>
Date: Mon, 8 Sep 2014 09:09:23 +0200
Subject: [PATCH] Clean up.

---
 .../jsonassert/impl/JsonAsserterImpl.java     |  1 -
 .../com/jayway/jsonassert/JsonAssertTest.java |  1 -
 .../com/jayway/jsonpath/web/bench/Bench.java  |  7 ++-
 .../jsonpath/web/resource/ApiResource.java    |  3 +-
 .../src/main/resources/html/index.html        |  7 +++
 .../com/jayway/jsonpath/Configuration.java    | 32 +++++++++-
 .../java/com/jayway/jsonpath/Criteria.java    | 59 +++++++++++--------
 .../java/com/jayway/jsonpath/JsonPath.java    |  6 +-
 .../main/java/com/jayway/jsonpath/Option.java |  3 +-
 .../spi/compiler/EvaluationContextImpl.java   |  7 ++-
 .../internal/spi/compiler/PathToken.java      | 37 ++++++++----
 .../internal/spi/compiler/RootPathToken.java  | 16 -----
 .../spi/compiler/WildcardPathToken.java       |  6 +-
 .../spi/json/AbstractJsonProvider.java        |  3 +
 .../spi/json/JsonSmartJsonProvider.java       |  1 -
 .../spi/json/JsonProviderFactory.java         |  6 +-
 .../java/com/jayway/jsonpath/IssuesTest.java  | 29 ++++++---
 .../com/jayway/jsonpath/JsonPathTest.java     |  3 +-
 .../com/jayway/jsonpath/NullHandlingTest.java | 29 +++++----
 .../internal/PropertyPathTokenTest.java       |  5 +-
 .../reader/ReadConfigurationTest.java         |  4 +-
 pom.xml                                       |  9 +--
 22 files changed, 175 insertions(+), 99 deletions(-)

diff --git a/json-path-assert/src/main/java/com/jayway/jsonassert/impl/JsonAsserterImpl.java b/json-path-assert/src/main/java/com/jayway/jsonassert/impl/JsonAsserterImpl.java
index 2faa8aee..10859683 100644
--- a/json-path-assert/src/main/java/com/jayway/jsonassert/impl/JsonAsserterImpl.java
+++ b/json-path-assert/src/main/java/com/jayway/jsonassert/impl/JsonAsserterImpl.java
@@ -4,7 +4,6 @@ package com.jayway.jsonassert.impl;
 import com.jayway.jsonassert.JsonAsserter;
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.PathNotFoundException;
 import org.hamcrest.Matcher;
 
diff --git a/json-path-assert/src/test/java/com/jayway/jsonassert/JsonAssertTest.java b/json-path-assert/src/test/java/com/jayway/jsonassert/JsonAssertTest.java
index d6cd02a3..4d0d7d05 100644
--- a/json-path-assert/src/test/java/com/jayway/jsonassert/JsonAssertTest.java
+++ b/json-path-assert/src/test/java/com/jayway/jsonassert/JsonAssertTest.java
@@ -1,6 +1,5 @@
 package com.jayway.jsonassert;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.InputStream;
diff --git a/json-path-web-test/src/main/java/com/jayway/jsonpath/web/bench/Bench.java b/json-path-web-test/src/main/java/com/jayway/jsonpath/web/bench/Bench.java
index ce69eb4d..5a80a48a 100644
--- a/json-path-web-test/src/main/java/com/jayway/jsonpath/web/bench/Bench.java
+++ b/json-path-web-test/src/main/java/com/jayway/jsonpath/web/bench/Bench.java
@@ -25,14 +25,16 @@ public class Bench {
     private final boolean flagWrap;
     private final boolean flagMerge;
     private final boolean flagSuppress;
+    private final boolean flagNullLeaf;
 
-    public Bench(String json, String path, boolean optionAsValues, boolean flagWrap, boolean flagMerge, boolean flagSuppress) {
+    public Bench(String json, String path, boolean optionAsValues, boolean flagWrap, boolean flagMerge, boolean flagSuppress, boolean flagNullLeaf) {
         this.json = json;
         this.path = path;
         this.optionAsValues = optionAsValues;
         this.flagWrap = flagWrap;
         this.flagMerge = flagMerge;
         this.flagSuppress = flagSuppress;
+        this.flagNullLeaf = flagNullLeaf;
     }
 
     public Result runJayway() {
@@ -55,6 +57,9 @@ public class Bench {
         if (!optionAsValues) {
             configuration = configuration.addOptions(Option.AS_PATH_LIST);
         }
+        if(flagNullLeaf){
+            configuration = configuration.addOptions(Option.DEFAULT_PATH_LEAF_TO_NULL);
+        }
 
         long now = System.currentTimeMillis();
         try {
diff --git a/json-path-web-test/src/main/java/com/jayway/jsonpath/web/resource/ApiResource.java b/json-path-web-test/src/main/java/com/jayway/jsonpath/web/resource/ApiResource.java
index b0d9465d..5fb10b2c 100644
--- a/json-path-web-test/src/main/java/com/jayway/jsonpath/web/resource/ApiResource.java
+++ b/json-path-web-test/src/main/java/com/jayway/jsonpath/web/resource/ApiResource.java
@@ -49,11 +49,12 @@ public class ApiResource {
                                 @FormParam("type") String type,
                                 @FormParam("flagWrap")  boolean flagWrap,
                                 @FormParam("flagMerge")  boolean flagMerge,
+                                @FormParam("flagNullLeaf")  boolean flagNullLeaf,
                                 @FormParam("flagSuppress")  boolean flagSuppress ){
 
         boolean value = "VALUE".equalsIgnoreCase(type);
 
-        Map<String, Result> resultMap = new Bench(json, path, value, flagWrap, flagMerge, flagSuppress).runAll();
+        Map<String, Result> resultMap = new Bench(json, path, value, flagWrap, flagMerge, flagSuppress, flagNullLeaf).runAll();
 
         return Response.ok(resultMap).build();
     }
diff --git a/json-path-web-test/src/main/resources/html/index.html b/json-path-web-test/src/main/resources/html/index.html
index 5937ec13..2da13077 100644
--- a/json-path-web-test/src/main/resources/html/index.html
+++ b/json-path-web-test/src/main/resources/html/index.html
@@ -82,6 +82,12 @@
                                     Merge multi props to new object
                                 </label>
                             </div>
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" name="flagNullLeaf" id="cbFlagNullLeaf" />
+                                    Return null for missing leaf
+                                </label>
+                            </div>
                         </fieldset>
                         </div>
                     </div>
@@ -222,6 +228,7 @@
                     type: $('input[name=rbType]:checked').val(),
                     flagWrap: $('#cbFlagWrap').prop('checked'),
                     flagMerge: $('#cbFlagMerge').prop('checked'),
+                    flagNullLeaf: $('#cbFlagNullLeaf').prop('checked'),
                     flagSuppress: $('#cbFlagSuppress').prop('checked')
                 }
                 console.log(data);
diff --git a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
index 379e9ced..d5aca573 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
@@ -26,6 +26,22 @@ import static java.util.Arrays.asList;
 
 public class Configuration {
 
+    private static Defaults DEFAULTS = new Defaults() {
+        @Override
+        public JsonProvider provider() {
+            return JsonProviderFactory.createProvider();
+        }
+
+        @Override
+        public Set<Option> options() {
+            return EnumSet.noneOf(Option.class);
+        }
+    };
+
+    public static synchronized void setDefaults(Defaults defaults){
+        DEFAULTS = defaults;
+    }
+
     private final JsonProvider provider;
     private final Set<Option> options;
 
@@ -64,7 +80,7 @@ public class Configuration {
 
 
     public static Configuration defaultConfiguration() {
-        return new Configuration(JsonProviderFactory.createProvider(), EnumSet.noneOf(Option.class));
+        return Configuration.builder().jsonProvider(DEFAULTS.provider()).options(DEFAULTS.options()).build();
     }
 
     public static ConfigurationBuilder builder() {
@@ -82,7 +98,9 @@ public class Configuration {
         }
 
         public ConfigurationBuilder options(Option... flags) {
-            this.options.addAll(asList(flags));
+            if(flags.length > 0) {
+                this.options.addAll(asList(flags));
+            }
             return this;
         }
 
@@ -93,9 +111,17 @@ public class Configuration {
 
         public Configuration build() {
             if (provider == null) {
-                provider = JsonProviderFactory.createProvider();
+                provider = DEFAULTS.provider();
             }
             return new Configuration(provider, options);
         }
     }
+
+    public interface Defaults {
+
+        JsonProvider provider();
+
+        Set<Option> options();
+
+    }
 }
diff --git a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
index c474f6fb..f7f309c9 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Criteria.java
@@ -19,6 +19,7 @@ import static com.jayway.jsonpath.internal.Utils.notNull;
 /**
  *
  */
+@SuppressWarnings("unchecked")
 public class Criteria implements Predicate {
 
     private static final Logger logger = LoggerFactory.getLogger(Criteria.class);
@@ -173,10 +174,8 @@ public class Criteria implements Predicate {
             boolean eval(Object expected, Object actual, Configuration configuration) {
                 final Class<?> expType = (Class<?>) expected;
                 final Class<?> actType = actual == null ? null : actual.getClass();
-                if (actType != null) {
-                    return expType.isAssignableFrom(actType);
-                }
-                return false;
+
+                return actType != null && expType.isAssignableFrom(actType);
             }
         },
         REGEX {
@@ -272,10 +271,17 @@ public class Criteria implements Predicate {
         if (CriteriaType.EXISTS == criteriaType) {
             boolean exists = ((Boolean) expected);
             try {
-                path.evaluate(model, configuration.options(Option.THROW_ON_MISSING_PROPERTY)).getValue();
-                return exists == true;
+                //path.evaluate(model, configuration.options(Option.THROW_ON_MISSING_PROPERTY)).getValue();
+
+                Configuration c = configuration;
+                if(c.containsOption(Option.ALWAYS_RETURN_LIST) || c.containsOption(Option.SUPPRESS_EXCEPTIONS)){
+                    c = c.options();
+                }
+
+                path.evaluate(model, c).getValue();
+                return exists;
             } catch (PathNotFoundException e) {
-                return exists == false;
+                return !exists;
             }
         } else {
 
@@ -326,7 +332,7 @@ public class Criteria implements Predicate {
      * Creates a criterion using equality
      *
      * @param o
-     * @return
+     * @return the criteria
      */
     public Criteria is(Object o) {
         this.criteriaType = CriteriaType.EQ;
@@ -338,7 +344,7 @@ public class Criteria implements Predicate {
      * Creates a criterion using equality
      *
      * @param o
-     * @return
+     * @return the criteria
      */
     public Criteria eq(Object o) {
         return is(o);
@@ -348,7 +354,7 @@ public class Criteria implements Predicate {
      * Creates a criterion using the <b>!=</b> operator
      *
      * @param o
-     * @return
+     * @return the criteria
      */
     public Criteria ne(Object o) {
         this.criteriaType = CriteriaType.NE;
@@ -360,7 +366,7 @@ public class Criteria implements Predicate {
      * Creates a criterion using the <b>&lt;</b> operator
      *
      * @param o
-     * @return
+     * @return the criteria
      */
     public Criteria lt(Object o) {
         this.criteriaType = CriteriaType.LT;
@@ -372,7 +378,7 @@ public class Criteria implements Predicate {
      * Creates a criterion using the <b>&lt;=</b> operator
      *
      * @param o
-     * @return
+     * @return the criteria
      */
     public Criteria lte(Object o) {
         this.criteriaType = CriteriaType.LTE;
@@ -384,7 +390,7 @@ public class Criteria implements Predicate {
      * Creates a criterion using the <b>&gt;</b> operator
      *
      * @param o
-     * @return
+     * @return the criteria
      */
     public Criteria gt(Object o) {
         this.criteriaType = CriteriaType.GT;
@@ -396,7 +402,7 @@ public class Criteria implements Predicate {
      * Creates a criterion using the <b>&gt;=</b> operator
      *
      * @param o
-     * @return
+     * @return the criteria
      */
     public Criteria gte(Object o) {
         this.criteriaType = CriteriaType.GTE;
@@ -408,7 +414,7 @@ public class Criteria implements Predicate {
      * Creates a criterion using a Regex
      *
      * @param pattern
-     * @return
+     * @return the criteria
      */
     public Criteria regex(Pattern pattern) {
         notNull(pattern, "pattern can not be null");
@@ -422,7 +428,7 @@ public class Criteria implements Predicate {
      * to specify an array of possible matches.
      *
      * @param o the values to match against
-     * @return
+     * @return the criteria
      */
     public Criteria in(Object... o) {
         return in(Arrays.asList(o));
@@ -433,7 +439,7 @@ public class Criteria implements Predicate {
      * to specify an array of possible matches.
      *
      * @param c the collection containing the values to match against
-     * @return
+     * @return the criteria
      */
     public Criteria in(Collection<?> c) {
         notNull(c, "collection can not be null");
@@ -447,7 +453,7 @@ public class Criteria implements Predicate {
      * which the specified field does not have any value in the specified array.
      *
      * @param o the values to match against
-     * @return
+     * @return the criteria
      */
     public Criteria nin(Object... o) {
         return nin(Arrays.asList(o));
@@ -458,7 +464,7 @@ public class Criteria implements Predicate {
      * which the specified field does not have any value in the specified array.
      *
      * @param c the values to match against
-     * @return
+     * @return the criteria
      */
     public Criteria nin(Collection<?> c) {
         notNull(c, "collection can not be null");
@@ -472,7 +478,7 @@ public class Criteria implements Predicate {
      * in the specified array all values in the array must be matched.
      *
      * @param o
-     * @return
+     * @return the criteria
      */
     public Criteria all(Object... o) {
         return all(Arrays.asList(o));
@@ -483,7 +489,7 @@ public class Criteria implements Predicate {
      * in the specified array all values in the array must be matched.
      *
      * @param c
-     * @return
+     * @return the criteria
      */
     public Criteria all(Collection<?> c) {
         notNull(c, "collection can not be null");
@@ -501,7 +507,7 @@ public class Criteria implements Predicate {
      * </ol>
      *
      * @param size
-     * @return
+     * @return the criteria
      */
     public Criteria size(int size) {
         this.criteriaType = CriteriaType.SIZE;
@@ -514,7 +520,7 @@ public class Criteria implements Predicate {
      * Check for existence (or lack thereof) of a field.
      *
      * @param b
-     * @return
+     * @return the criteria
      */
     public Criteria exists(boolean b) {
         this.criteriaType = CriteriaType.EXISTS;
@@ -526,7 +532,7 @@ public class Criteria implements Predicate {
      * The $type operator matches values based on their Java type.
      *
      * @param t
-     * @return
+     * @return the criteria
      */
     public Criteria type(Class<?> t) {
         notNull(t, "type can not be null");
@@ -538,7 +544,7 @@ public class Criteria implements Predicate {
     /**
      * The <code>notEmpty</code> operator checks that an array or String is not empty.
      *
-     * @return
+     * @return the criteria
      */
     public Criteria notEmpty() {
         this.criteriaType = CriteriaType.NOT_EMPTY;
@@ -549,7 +555,8 @@ public class Criteria implements Predicate {
     /**
      * The <code>matches</code> operator checks that an object matches the given predicate.
      *
-     * @return
+     * @param p
+     * @return the criteria
      */
     public Criteria matches(Predicate p) {
         this.criteriaType = CriteriaType.MATCHES;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
index 43ebda25..eb0f1567 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
@@ -165,11 +165,12 @@ public class JsonPath {
      * @param <T>           expected return type
      * @return object(s) matched by the given path
      */
+    @SuppressWarnings("unchecked")
     public <T> T read(Object jsonObject, Configuration configuration) {
         boolean optAsPathList = configuration.containsOption(Option.AS_PATH_LIST);
         boolean optAlwaysReturnList = configuration.containsOption(Option.ALWAYS_RETURN_LIST);
         boolean optSuppressExceptions = configuration.containsOption(Option.SUPPRESS_EXCEPTIONS);
-        boolean optThrowOnMissingProperty = configuration.containsOption(Option.THROW_ON_MISSING_PROPERTY);
+        //boolean optThrowOnMissingProperty = configuration.containsOption(Option.THROW_ON_MISSING_PROPERTY);
 
         try {
             if(optAsPathList){
@@ -185,7 +186,8 @@ public class JsonPath {
                 }
             }
         } catch (RuntimeException e){
-            if(optThrowOnMissingProperty || !optSuppressExceptions){
+            //if(optThrowOnMissingProperty || !optSuppressExceptions){
+            if(!optSuppressExceptions){
                 throw e;
             }
         }
diff --git a/json-path/src/main/java/com/jayway/jsonpath/Option.java b/json-path/src/main/java/com/jayway/jsonpath/Option.java
index cde719cd..3b1b3970 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Option.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Option.java
@@ -19,7 +19,8 @@ public enum Option {
     /**
      * Throw {@link PathNotFoundException} when JsonPath tries to read a property that does not exists.
      */
-    THROW_ON_MISSING_PROPERTY,
+    //THROW_ON_MISSING_PROPERTY,
+    DEFAULT_PATH_LEAF_TO_NULL,
 
     /**
      * Makes this implementation more compliant to the Goessner spec. All results are returned as Lists.
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/EvaluationContextImpl.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/EvaluationContextImpl.java
index 2faee4ff..b9208f78 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/EvaluationContextImpl.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/EvaluationContextImpl.java
@@ -8,10 +8,11 @@ import com.jayway.jsonpath.spi.compiler.Path;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import static com.jayway.jsonpath.internal.Utils.notNull;
+
 /**
  *
  */
@@ -24,6 +25,8 @@ class EvaluationContextImpl implements EvaluationContext {
     private int resultIndex = 0;
 
     EvaluationContextImpl(Path path, Configuration configuration) {
+        notNull(path, "path can not be null");
+        notNull(configuration, "configuration can not be null");
         this.path = path;
         this.configuration = configuration;
         this.valueResult = configuration.getProvider().createArray();
@@ -50,6 +53,7 @@ class EvaluationContextImpl implements EvaluationContext {
     }
 
 
+    @SuppressWarnings("unchecked")
     @Override
     public <T> T getValue() {
         if (path.isDefinite()) {
@@ -61,6 +65,7 @@ class EvaluationContextImpl implements EvaluationContext {
         return (T) valueResult;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public <T> T getPath() {
         if(resultIndex == 0){
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathToken.java
index b0906fb7..de964930 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/PathToken.java
@@ -25,7 +25,20 @@ abstract class PathToken {
             String evalPath = currentPath + "['" + property + "']";
             Object propertyVal = readObjectProperty(property, model, ctx);
             if(propertyVal == JsonProvider.UNDEFINED){
-                return;
+                if(isLeaf()) {
+                    if(ctx.options().contains(Option.DEFAULT_PATH_LEAF_TO_NULL)){
+                        propertyVal =  null;
+                    } else {
+                        if(ctx.options().contains(Option.SUPPRESS_EXCEPTIONS)){
+                            return;
+                        } else {
+                            throw new PathNotFoundException("No results for path: " + evalPath);
+                        }
+
+                    }
+                } else {
+                    return;
+                }
             }
             if (isLeaf()) {
                 ctx.addResult(evalPath, propertyVal);
@@ -44,7 +57,11 @@ abstract class PathToken {
                 for (String property : properties) {
                     Object propertyVal = readObjectProperty(property, model, ctx);
                     if(propertyVal == JsonProvider.UNDEFINED){
-                        continue;
+                        if(ctx.options().contains(Option.DEFAULT_PATH_LEAF_TO_NULL)){
+                            propertyVal = null;
+                        } else {
+                            continue;
+                        }
                     }
                     ctx.jsonProvider().setProperty(map, property, propertyVal);
                 }
@@ -56,7 +73,11 @@ abstract class PathToken {
                     if(hasProperty(property, model, ctx)) {
                         Object propertyVal = readObjectProperty(property, model, ctx);
                         if(propertyVal == JsonProvider.UNDEFINED){
-                            continue;
+                            if(ctx.options().contains(Option.DEFAULT_PATH_LEAF_TO_NULL)){
+                                propertyVal = null;
+                            } else {
+                                continue;
+                            }
                         }
                         ctx.addResult(evalPath, propertyVal);
                     }
@@ -70,13 +91,7 @@ abstract class PathToken {
     }
 
     private Object readObjectProperty(String property, Object model, EvaluationContextImpl ctx) {
-        Object val = ctx.jsonProvider().getMapValue(model, property, true);
-        if(val == JsonProvider.UNDEFINED){
-            if(ctx.options().contains(Option.THROW_ON_MISSING_PROPERTY)) {
-                throw new PathNotFoundException("Property ['" + property + "'] not found in the current context");
-            }
-        }
-        return val;
+        return ctx.jsonProvider().getMapValue(model, property, true);
     }
 
     void handleArrayIndex(int index, String currentPath, Object json, EvaluationContextImpl ctx) {
@@ -89,7 +104,7 @@ abstract class PathToken {
                 next().evaluate(evalPath, evalHit, ctx);
             }
         } catch (IndexOutOfBoundsException e) {
-            throw new PathNotFoundException("Index out of bounds when evaluating path " + currentPath + "[" + index + "]");
+            throw new PathNotFoundException("Index out of bounds when evaluating path " + evalPath);
         }
     }
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/RootPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/RootPathToken.java
index 4270e23d..b827a564 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/RootPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/RootPathToken.java
@@ -28,23 +28,7 @@ class RootPathToken extends PathToken /*implements Path*/ {
         this.tokenCount++;
         return this;
     }
-     /*
-    @Override
-    public EvaluationContextImpl evaluate(Object model, Configuration configuration) {
-        if(logger.isDebugEnabled()) {
-            logger.debug("Evaluating path: {}", toString());
-        }
-
-        EvaluationContextImpl ctx = new EvaluationContextImpl(configuration, isDefinite());
-        evaluate("", model, ctx);
 
-        if(logger.isDebugEnabled()) {
-            logger.debug("Found:\n{}", JsonFormatter.prettyPrint(ctx.configuration().getProvider().toJson(ctx.getPathList())));
-        }
-
-        return ctx;
-    }
-     */
     @Override
     void evaluate(String currentPath, Object model, EvaluationContextImpl ctx) {
         if (isLeaf()) {
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/WildcardPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/WildcardPathToken.java
index bead8105..a4c03372 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/WildcardPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/compiler/WildcardPathToken.java
@@ -1,5 +1,7 @@
 package com.jayway.jsonpath.internal.spi.compiler;
 
+import com.jayway.jsonpath.PathNotFoundException;
+
 import static java.util.Arrays.asList;
 
 /**
@@ -15,7 +17,9 @@ class WildcardPathToken extends PathToken {
             }
         } else if (ctx.jsonProvider().isArray(model)) {
             for (int idx = 0; idx < ctx.jsonProvider().length(model); idx++) {
-                handleArrayIndex(idx, currentPath, model, ctx);
+                try {
+                    handleArrayIndex(idx, currentPath, model, ctx);
+                } catch (PathNotFoundException p){}
             }
         }
     }
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/json/AbstractJsonProvider.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/json/AbstractJsonProvider.java
index 52a39996..372b9f3e 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/json/AbstractJsonProvider.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/json/AbstractJsonProvider.java
@@ -114,6 +114,7 @@ public abstract class AbstractJsonProvider implements JsonProvider {
      * @param key   a String key or a numerical index
      * @param value the value to set
      */
+    @SuppressWarnings("unchecked")
     public void setProperty(Object obj, Object key, Object value) {
         if (isMap(obj))
             ((Map) obj).put(key.toString(), value);
@@ -146,6 +147,7 @@ public abstract class AbstractJsonProvider implements JsonProvider {
      * @param obj an array or an object
      * @return the keys for an object or the indexes for an array
      */
+    @SuppressWarnings("unchecked")
     public Collection<String> getPropertyKeys(Object obj) {
         if (isArray(obj)) {
             List l = (List) obj;
@@ -178,6 +180,7 @@ public abstract class AbstractJsonProvider implements JsonProvider {
      * @param obj an array or an object
      * @return the entries for an array or the values for a map
      */
+    @SuppressWarnings("unchecked")
     public Iterable<Object> toIterable(Object obj) {
         if (isArray(obj))
             return ((Iterable) obj);
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/json/JsonSmartJsonProvider.java b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/json/JsonSmartJsonProvider.java
index 93610897..f754a764 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/spi/json/JsonSmartJsonProvider.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/spi/json/JsonSmartJsonProvider.java
@@ -16,7 +16,6 @@ package com.jayway.jsonpath.internal.spi.json;
 
 import com.jayway.jsonpath.InvalidJsonException;
 import com.jayway.jsonpath.spi.json.Mode;
-
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
 import net.minidev.json.mapper.AMapper;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonProviderFactory.java b/json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonProviderFactory.java
index 72b02660..5098269f 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonProviderFactory.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/spi/json/JsonProviderFactory.java
@@ -14,12 +14,12 @@
  */
 package com.jayway.jsonpath.spi.json;
 
-import com.jayway.jsonpath.internal.spi.json.JacksonProvider;
+import com.jayway.jsonpath.internal.spi.json.JsonSmartJsonProvider;
 
 public abstract class JsonProviderFactory {
 
-    //private static JsonProvider provider = new JsonSmartJsonProvider();
-    private static JsonProvider provider = new JacksonProvider();
+    private static JsonProvider provider = new JsonSmartJsonProvider();
+    //private static JsonProvider provider = new JacksonProvider();
 
     public static JsonProvider createProvider() {
         return provider;
diff --git a/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java b/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java
index cc94d347..53962df2 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java
@@ -4,7 +4,6 @@ import com.jayway.jsonpath.internal.Utils;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.json.JsonProviderFactory;
 import org.assertj.core.api.Assertions;
-import org.assertj.core.data.MapEntry;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 
@@ -13,15 +12,30 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 
 public class IssuesTest {
 
     private static final JsonProvider jp = JsonProviderFactory.createProvider();
 
+    @Test
+    public void full_ones_can_be_filtered() {
+        String json = "[\n" +
+                " {\"kind\" : \"full\"},\n" +
+                " {\"kind\" : \"empty\"}\n" +
+                "]";
+
+        List<Map<String, String>> fullOnes = JsonPath.read(json, "$[?(@.kind == full)]");
+
+        assertEquals(1, fullOnes.size());
+        assertEquals("full", fullOnes.get(0).get("kind"));
+    }
+
     @Test
     public void issue_36() {
         String json = "{\n" +
@@ -210,8 +224,8 @@ public class IssuesTest {
     @Test(expected = PathNotFoundException.class)
     public void issue_22() throws Exception {
 
-        Configuration configuration = Configuration.builder().options(Option.THROW_ON_MISSING_PROPERTY).build();
-        //Configuration configuration = Configuration.defaultConfiguration();
+        //Configuration configuration = Configuration.builder().options(Option.THROW_ON_MISSING_PROPERTY).build();
+        Configuration configuration = Configuration.defaultConfiguration();
 
         String json = "{\"a\":{\"b\":1,\"c\":2}}";
         System.out.println(JsonPath.parse(json, configuration).read("a.d"));
@@ -230,8 +244,8 @@ public class IssuesTest {
     @Test
     public void issue_22b() throws Exception {
         String json = "{\"a\":[{\"b\":1,\"c\":2},{\"b\":5,\"c\":2}]}";
-        System.out.println(JsonPath.read(json, "a[?(@.b==5)].d"));
-        System.out.println(JsonPath.read(json, "a[?(@.b==5)].d"));
+        List<Object> res = JsonPath.using(Configuration.defaultConfiguration().options(Option.DEFAULT_PATH_LEAF_TO_NULL)).parse(json).read("a[?(@.b==5)].d");
+        Assertions.assertThat(res).hasSize(1).containsNull();
     }
 
     @Test(expected = PathNotFoundException.class)
@@ -369,7 +383,7 @@ public class IssuesTest {
 
             failBecauseExceptionWasNotThrown(PathNotFoundException.class);
         } catch (PathNotFoundException e){
-            Assertions.assertThat(e).hasMessage("No results for path: $['nonExistingProperty']");
+
         }
 
 
@@ -378,7 +392,6 @@ public class IssuesTest {
 
             failBecauseExceptionWasNotThrown(PathNotFoundException.class);
         } catch (PathNotFoundException e){
-            Assertions.assertThat(e).hasMessage("No results for path: $['nonExisting']['property']");
         }
 
     }
diff --git a/json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java b/json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java
index 35611530..8b8f19d1 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java
@@ -80,7 +80,8 @@ public class JsonPathTest {
     @Test(expected = PathNotFoundException.class)
     public void missing_prop() {
 
-        Object read = JsonPath.using(Configuration.defaultConfiguration().options(Option.THROW_ON_MISSING_PROPERTY)).parse(DOCUMENT).read("$.store.book[*].fooBar");
+        //Object read = JsonPath.using(Configuration.defaultConfiguration().options(Option.THROW_ON_MISSING_PROPERTY)).parse(DOCUMENT).read("$.store.book[*].fooBar");
+        Object read = JsonPath.using(Configuration.defaultConfiguration()).parse(DOCUMENT).read("$.store.book[*].fooBar");
 
         System.out.println(read);
 
diff --git a/json-path/src/test/java/com/jayway/jsonpath/NullHandlingTest.java b/json-path/src/test/java/com/jayway/jsonpath/NullHandlingTest.java
index e0e8d2e3..0c0cf4ff 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/NullHandlingTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/NullHandlingTest.java
@@ -1,14 +1,12 @@
 package com.jayway.jsonpath;
 
-import org.hamcrest.Matchers;
-import org.junit.Ignore;
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import java.util.List;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNull;
-import static org.hamcrest.MatcherAssert.assertThat;
 
 public class NullHandlingTest {
 
@@ -41,18 +39,16 @@ public class NullHandlingTest {
 
 
     @Test
-    @Ignore
-
     public void last_token_defaults_to_null() {
 
         //FIXME
 
 
-        //Configuration configuration = Configuration.builder().options(Option.SUPPRESS_EXCEPTIONS).build();
+        Configuration configuration = Configuration.builder().options(Option.DEFAULT_PATH_LEAF_TO_NULL).build();
 
-        //assertNull(JsonPath.parse(DOCUMENT, configuration).read("$.children[2].age"));
+        assertNull(JsonPath.parse(DOCUMENT, configuration).read("$.children[2].age"));
 
-        assertNull(JsonPath.read(DOCUMENT, "$.children[2].age"));
+        //assertNull(JsonPath.read(DOCUMENT, "$.children[2].age"));
     }
 
 
@@ -64,18 +60,27 @@ public class NullHandlingTest {
 
     @Test
     public void the_age_of_all_with_age_defined() {
-        List<Integer> result = JsonPath.read(DOCUMENT, "$.children[*].age");
+        //List<Integer> result = JsonPath.read(DOCUMENT, "$.children[*].age");
+        List<Integer> result = JsonPath.using(Configuration.defaultConfiguration().options(Option.SUPPRESS_EXCEPTIONS)).parse(DOCUMENT).read("$.children[*].age");
+
+        Assertions.assertThat(result).containsSequence(0, null);
 
-        assertThat(result, Matchers.hasItems(0, null));
     }
 
     @Test
     public void path2() {
-        System.out.println(JsonPath.read("{\"a\":[{\"b\":1,\"c\":2},{\"b\":5,\"c\":2}]}", "a[?(@.b==4)].c"));
+        List<Object> result = JsonPath.read("{\"a\":[{\"b\":1,\"c\":2},{\"b\":5,\"c\":2}]}", "a[?(@.b==4)].c");
+        Assertions.assertThat(result).isEmpty();
     }
 
+    @Test
     public void path() {
-        System.out.println(JsonPath.read("{\"a\":[{\"b\":1,\"c\":2},{\"b\":5,\"c\":2}]}", "a[?(@.b==5)].d"));
+        String json = "{\"a\":[{\"b\":1,\"c\":2},{\"b\":5,\"c\":2}]}";
+
+        List<Object> result = JsonPath.using(Configuration.defaultConfiguration().options(Option.DEFAULT_PATH_LEAF_TO_NULL)).parse(json).read("a[?(@.b==5)].d");
+
+
+        System.out.println(result);
     }
 
 
diff --git a/json-path/src/test/java/com/jayway/jsonpath/internal/PropertyPathTokenTest.java b/json-path/src/test/java/com/jayway/jsonpath/internal/PropertyPathTokenTest.java
index 5c39ea92..c8449e62 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/internal/PropertyPathTokenTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/internal/PropertyPathTokenTest.java
@@ -8,9 +8,7 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static junit.framework.Assert.assertNull;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -65,7 +63,8 @@ public class PropertyPathTokenTest {
     @Test(expected = PathNotFoundException.class)
     public void property_not_found_option_throw() {
 
-        String result = JsonPath.using(Configuration.defaultConfiguration().options(Option.THROW_ON_MISSING_PROPERTY)).parse(SIMPLE_MAP).read("$.not-found");
+        //String result = JsonPath.using(Configuration.defaultConfiguration().options(Option.THROW_ON_MISSING_PROPERTY)).parse(SIMPLE_MAP).read("$.not-found");
+        String result = JsonPath.using(Configuration.defaultConfiguration()).parse(SIMPLE_MAP).read("$.not-found");
 
         assertThat(result).isNull();
     }
diff --git a/json-path/src/test/java/com/jayway/jsonpath/reader/ReadConfigurationTest.java b/json-path/src/test/java/com/jayway/jsonpath/reader/ReadConfigurationTest.java
index 6d40b9fc..2c116bb0 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/reader/ReadConfigurationTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/reader/ReadConfigurationTest.java
@@ -2,7 +2,6 @@ package com.jayway.jsonpath.reader;
 
 import com.jayway.jsonpath.Configuration;
 import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.json.JsonProviderFactory;
 import org.junit.Test;
@@ -19,7 +18,8 @@ public class ReadConfigurationTest {
 
         Configuration configuration2 = Configuration.builder()
                 .jsonProvider(JsonProviderFactory.createProvider())
-                .options(Option.THROW_ON_MISSING_PROPERTY).build();
+                .build();
+                //.options(Option.THROW_ON_MISSING_PROPERTY).build();
 
         JsonProvider jsonProvider = JsonProviderFactory.createProvider();
 
diff --git a/pom.xml b/pom.xml
index 613e14f9..d65ae4cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,12 +56,13 @@
         <scm.branch>master</scm.branch>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <slf4j.version>1.7.5</slf4j.version>
+        <slf4j.version>1.7.7</slf4j.version>
         <junit.version>4.10</junit.version>
         <commons-io.version>2.4</commons-io.version>
         <hamcrest.version>1.3</hamcrest.version>
-        <jackson.version>2.4.0</jackson.version>
+        <jackson.version>2.4.1.3</jackson.version>
         <json-smart.version>2.0</json-smart.version>
+        <assertj.version>1.6.1</assertj.version>
     </properties>
     <scm>
         <url>http://github.com/jayway/JsonPath/tree/${scm.branch}</url>
@@ -184,12 +185,12 @@
             <dependency>
                 <groupId>io.fastjson</groupId>
                 <artifactId>boon</artifactId>
-                <version>0.13</version>
+                <version>0.23</version>
             </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
-                <version>1.6.0</version>
+                <version>${assertj.version}</version>
                 <scope>test</scope>
             </dependency>