From cb6a2e805a6deab41287220b1aff5f785e36ee7f Mon Sep 17 00:00:00 2001
From: Kalle Stenflo <kalle.stenflo@gmail.com>
Date: Thu, 11 Sep 2014 15:08:25 +0200
Subject: [PATCH] Removed MERGE_MULTI_PROP option (not part of spec).

---
 Procfile                                      |  1 +
 .../com/jayway/jsonpath/web/bench/Bench.java  |  7 +-
 .../jsonpath/web/resource/ApiResource.java    |  3 +-
 .../src/main/resources/webapp/index.html      |  7 --
 .../java/com/jayway/jsonpath/JsonPath.java    |  3 +-
 .../main/java/com/jayway/jsonpath/Option.java | 30 +++++---
 .../jsonpath/internal/compiler/PathToken.java | 26 ++-----
 .../internal/compiler/PropertyPathToken.java  |  2 +-
 .../java/com/jayway/jsonpath/OptionsTest.java | 70 ++++++++++++++++++-
 system.properties                             |  1 +
 10 files changed, 100 insertions(+), 50 deletions(-)
 create mode 100644 Procfile
 create mode 100644 system.properties

diff --git a/Procfile b/Procfile
new file mode 100644
index 00000000..a9a06c29
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web: java $JAVA_OPTS -Dserver.http.port=$PORT -jar web/build/distributions/trumpet-server-1.0.0-shadow.jar
\ No newline at end of file
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 5a80a48a..42a76f63 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
@@ -23,16 +23,14 @@ public class Bench {
     protected final String path;
     private final boolean optionAsValues;
     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, boolean flagNullLeaf) {
+    public Bench(String json, String path, boolean optionAsValues, boolean flagWrap, 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;
     }
@@ -48,9 +46,6 @@ public class Bench {
         if(flagWrap){
             configuration = configuration.addOptions(Option.ALWAYS_RETURN_LIST);
         }
-        if(flagMerge){
-            configuration = configuration.addOptions(Option.MERGE_MULTI_PROPS);
-        }
         if(flagSuppress){
             configuration = configuration.addOptions(Option.SUPPRESS_EXCEPTIONS);
         }
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 ec8619a8..fae35b96 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
@@ -48,13 +48,12 @@ public class ApiResource {
                                 @FormParam("path") String path,
                                 @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, flagNullLeaf).runAll();
+        Map<String, Result> resultMap = new Bench(json, path, value, flagWrap, flagSuppress, flagNullLeaf).runAll();
 
         return Response.ok(resultMap).build();
     }
diff --git a/json-path-web-test/src/main/resources/webapp/index.html b/json-path-web-test/src/main/resources/webapp/index.html
index addfbc4c..b0363665 100644
--- a/json-path-web-test/src/main/resources/webapp/index.html
+++ b/json-path-web-test/src/main/resources/webapp/index.html
@@ -77,12 +77,6 @@
                                     Always return result list
                                 </label>
                             </div>
-                            <div class="checkbox">
-                                <label>
-                                    <input type="checkbox" name="flagMerge" id="cbFlagMerge" />
-                                    Merge multi props to new object
-                                </label>
-                            </div>
                             <div class="checkbox">
                                 <label>
                                     <input type="checkbox" name="flagNullLeaf" id="cbFlagNullLeaf" />
@@ -232,7 +226,6 @@
                     path: path,
                     type: $('input[name=rbType]:checked').val(),
                     flagWrap: $('#cbFlagWrap').prop('checked'),
-                    flagMerge: $('#cbFlagMerge').prop('checked'),
                     flagNullLeaf: $('#cbFlagNullLeaf').prop('checked'),
                     flagSuppress: $('#cbFlagSuppress').prop('checked')
                 }
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 7eea2688..8cc400f8 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java
@@ -383,8 +383,7 @@ public class JsonPath {
      */
     @SuppressWarnings({"unchecked"})
     public static <T> T read(Object json, String jsonPath, Predicate... filters) {
-        //return compile(jsonPath, filters).read(json);
-        return new JsonReader().parse(json).read(jsonPath, filters);
+        return parse(json).read(jsonPath, filters);
     }
 
     /**
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 3b1b3970..3235fea9 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Option.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Option.java
@@ -17,9 +17,29 @@ package com.jayway.jsonpath;
 public enum Option {
 
     /**
-     * Throw {@link PathNotFoundException} when JsonPath tries to read a property that does not exists.
+     * returns <code>null</code> for missing leaf.
+     *
+     * <pre>
+     * [
+     *      {
+     *         "foo" : "foo1",
+     *         "bar" : "bar1"
+     *      }
+     *      {
+     *         "foo" : "foo2"
+     *      }
+     * ]
+     *</pre>
+     *
+     * the path :
+     *
+     * "$[*].bar"
+     *
+     * Without flag ["bar1"] is returned
+     * With flag ["bar1", null] is returned
+     *
+     *
      */
-    //THROW_ON_MISSING_PROPERTY,
     DEFAULT_PATH_LEAF_TO_NULL,
 
     /**
@@ -32,17 +52,11 @@ public enum Option {
      */
     AS_PATH_LIST,
 
-    /**
-     * When multiple properties are queried eg @..['foo', 'bar'] these properties are extracted and put in a new Map.
-     */
-    MERGE_MULTI_PROPS,
-
     /**
      * Suppress all exceptions when evaluating path.
      * <br/>
      * If an exception is thrown and the option {@link Option#ALWAYS_RETURN_LIST} an empty list is returned.
      * If an exception is thrown and the option {@link Option#ALWAYS_RETURN_LIST} is not present null is returned.
-     * The option {@link Option#THROW_ON_MISSING_PROPERTY} has precedence over this option.
      */
     SUPPRESS_EXCEPTIONS
 
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/compiler/PathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/compiler/PathToken.java
index 66c61a10..79b7e081 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/compiler/PathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/compiler/PathToken.java
@@ -52,10 +52,9 @@ public abstract class PathToken {
             if (!isLeaf()) {
                 throw new InvalidPathException("Multi properties can only be used as path leafs: " + evalPath);
             }
-
-            if(ctx.configuration().containsOption(Option.MERGE_MULTI_PROPS)) {
-                Object map = ctx.jsonProvider().createMap();
-                for (String property : properties) {
+            for (String property : properties) {
+                evalPath = currentPath + "['" + property + "']";
+                if(hasProperty(property, model, ctx)) {
                     Object propertyVal = readObjectProperty(property, model, ctx);
                     if(propertyVal == JsonProvider.UNDEFINED){
                         if(ctx.options().contains(Option.DEFAULT_PATH_LEAF_TO_NULL)){
@@ -64,24 +63,7 @@ public abstract class PathToken {
                             continue;
                         }
                     }
-                    ctx.jsonProvider().setProperty(map, property, propertyVal);
-                }
-                ctx.addResult(evalPath, map);
-
-            } else {
-                for (String property : properties) {
-                    evalPath = currentPath + "['" + property + "']";
-                    if(hasProperty(property, model, ctx)) {
-                        Object propertyVal = readObjectProperty(property, model, ctx);
-                        if(propertyVal == JsonProvider.UNDEFINED){
-                            if(ctx.options().contains(Option.DEFAULT_PATH_LEAF_TO_NULL)){
-                                propertyVal = null;
-                            } else {
-                                continue;
-                            }
-                        }
-                        ctx.addResult(evalPath, propertyVal);
-                    }
+                    ctx.addResult(evalPath, propertyVal);
                 }
             }
         }
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/compiler/PropertyPathToken.java b/json-path/src/main/java/com/jayway/jsonpath/internal/compiler/PropertyPathToken.java
index 64a5ae08..744d17ce 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/compiler/PropertyPathToken.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/compiler/PropertyPathToken.java
@@ -31,7 +31,7 @@ public class PropertyPathToken extends PathToken {
 
     @Override
     boolean isTokenDefinite() {
-        return true;
+        return properties.size() == 1;
     }
 
     @Override
diff --git a/json-path/src/test/java/com/jayway/jsonpath/OptionsTest.java b/json-path/src/test/java/com/jayway/jsonpath/OptionsTest.java
index 672f33b6..8f8f28f7 100644
--- a/json-path/src/test/java/com/jayway/jsonpath/OptionsTest.java
+++ b/json-path/src/test/java/com/jayway/jsonpath/OptionsTest.java
@@ -2,15 +2,81 @@ package com.jayway.jsonpath;
 
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.jayway.jsonpath.JsonPath.using;
+import static com.jayway.jsonpath.Option.ALWAYS_RETURN_LIST;
+import static com.jayway.jsonpath.Option.AS_PATH_LIST;
+import static com.jayway.jsonpath.Option.DEFAULT_PATH_LEAF_TO_NULL;
+import static java.util.Collections.singletonMap;
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class OptionsTest extends BaseTest {
 
+    @Test(expected = PathNotFoundException.class)
+    public void a_leafs_is_not_defaulted_to_null() {
+
+        Configuration conf = Configuration.defaultConfiguration();
+
+        assertThat(using(conf).parse(singletonMap("foo", "bar")).read("$.baz")).isNull();
+    }
+
+    @Test
+    public void a_leafs_can_be_defaulted_to_null() {
+
+        Configuration conf = Configuration.builder().options(DEFAULT_PATH_LEAF_TO_NULL).build();
+
+        assertThat(using(conf).parse(singletonMap("foo", "bar")).read("$.baz")).isNull();
+    }
+
+    @Test
+    public void a_definite_path_is_not_returned_as_list_by_default() {
+
+        Configuration conf = Configuration.defaultConfiguration();
+
+        assertThat(using(conf).parse(singletonMap("foo", "bar")).read("$.foo")).isInstanceOf(String.class);
+    }
+
+    @Test
+    public void a_definite_path_can_be_returned_as_list() {
+
+        Configuration conf = Configuration.builder().options(ALWAYS_RETURN_LIST).build();
+
+        assertThat(using(conf).parse(singletonMap("foo", "bar")).read("$.foo")).isInstanceOf(List.class);
+    }
 
     @Test
-    public void leafs_can_be_defaulted_to_null() {
+    public void a_path_evaluation_is_returned_as_VALUE_by_default() {
+        Configuration conf = Configuration.defaultConfiguration();
+
+        assertThat(using(conf).parse(singletonMap("foo", "bar")).read("$.foo")).isEqualTo("bar");
+    }
 
-        //assertThat(parse(singletonMap("foo", "bar"))).
+    @Test
+    public void a_path_evaluation_can_be_returned_as_PATH_LIST() {
+        Configuration conf = Configuration.builder().options(AS_PATH_LIST).build();
 
+        List<String> pathList = using(conf).parse(singletonMap("foo", "bar")).read("$.foo");
+
+        assertThat(pathList).containsOnly("$['foo']");
     }
 
+    @Test
+    public void multi_properties_are_not_merged_by_default() {
+
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("a", "a");
+        model.put("b", "b");
+        model.put("c", "c");
+
+        Configuration conf = Configuration.defaultConfiguration();
+
+        Object result = using(conf).parse(model).read("$.['a', 'b']");
+
+        assertThat(result).isInstanceOf(List.class);
+        assertThat((List)result).containsOnly("a", "b");
+    }
 
 }
diff --git a/system.properties b/system.properties
new file mode 100644
index 00000000..3e06d15e
--- /dev/null
+++ b/system.properties
@@ -0,0 +1 @@
+java.runtime.version=1.6
\ No newline at end of file