From f1eb8a85d1e825dc0828c104d3d5474f0e87406d Mon Sep 17 00:00:00 2001
From: Jochen Berger <fooberger@gmail.com>
Date: Mon, 18 Aug 2014 10:54:40 +0200
Subject: [PATCH] update json-smart to 2.0

---
 .../spi/json/JsonSmartJsonProvider.java       | 23 ++++++++++---------
 pom.xml                                       |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

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 1a354ec3..93610897 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,9 +16,11 @@ 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.parser.ContainerFactory;
+import net.minidev.json.mapper.AMapper;
+import net.minidev.json.mapper.DefaultMapperOrdered;
 import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
 
@@ -30,10 +32,9 @@ import java.util.Map;
 
 public class JsonSmartJsonProvider extends AbstractJsonProvider {
 
-    private Mode mode;
+    private final Mode mode;
 
-    private ContainerFactory containerFactory = ContainerFactory.FACTORY_ORDERED;
-    //private ContainerFactory containerFactory = ContainerFactory.FACTORY_SIMPLE;
+    private final static AMapper<?> orderedMapper = DefaultMapperOrdered.DEFAULT;
 
     public JsonSmartJsonProvider() {
         this(Mode.SLACK);
@@ -43,17 +44,17 @@ public class JsonSmartJsonProvider extends AbstractJsonProvider {
         this.mode = mode;
     }
 
-    public Map<String, Object> createMap() {
-        return containerFactory.createObjectContainer();
+    public Object createMap() {
+        return orderedMapper.createObject();
     }
 
-    public List<Object> createArray() {
-        return containerFactory.createArrayContainer();
+    public Object createArray() {
+        return orderedMapper.createArray();
     }
 
     public Object parse(String json) {
         try {
-            return createParser().parse(json, containerFactory);
+            return createParser().parse(json, orderedMapper);
         } catch (ParseException e) {
             throw new InvalidJsonException(e);
         }
@@ -62,7 +63,7 @@ public class JsonSmartJsonProvider extends AbstractJsonProvider {
     @Override
     public Object parse(Reader jsonReader) throws InvalidJsonException {
         try {
-            return createParser().parse(jsonReader, containerFactory);
+            return createParser().parse(jsonReader, orderedMapper);
         } catch (ParseException e) {
             throw new InvalidJsonException(e);
         }
@@ -71,7 +72,7 @@ public class JsonSmartJsonProvider extends AbstractJsonProvider {
     @Override
     public Object parse(InputStream jsonStream) throws InvalidJsonException {
         try {
-            return createParser().parse(new InputStreamReader(jsonStream), containerFactory);
+            return createParser().parse(new InputStreamReader(jsonStream), orderedMapper);
         } catch (ParseException e) {
             throw new InvalidJsonException(e);
         }
diff --git a/pom.xml b/pom.xml
index ede80c1b..613e14f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <commons-io.version>2.4</commons-io.version>
         <hamcrest.version>1.3</hamcrest.version>
         <jackson.version>2.4.0</jackson.version>
-        <json-smart.version>1.2</json-smart.version>
+        <json-smart.version>2.0</json-smart.version>
     </properties>
     <scm>
         <url>http://github.com/jayway/JsonPath/tree/${scm.branch}</url>
@@ -287,4 +287,4 @@
         </dependency>
 
     </dependencies>
-</project>
\ No newline at end of file
+</project>