diff --git a/json-path-assert/src/main/java/com/jayway/jsonassert/JsonAssert.java b/json-path-assert/src/main/java/com/jayway/jsonassert/JsonAssert.java index 921b0cf0..22277d2b 100644 --- a/json-path-assert/src/main/java/com/jayway/jsonassert/JsonAssert.java +++ b/json-path-assert/src/main/java/com/jayway/jsonassert/JsonAssert.java @@ -4,7 +4,6 @@ package com.jayway.jsonassert; import com.jayway.jsonassert.impl.JsonAsserterImpl; import com.jayway.jsonassert.impl.matcher.*; import com.jayway.jsonpath.spi.JsonProvider; -import com.jayway.jsonpath.spi.impl.DefaultJsonProvider; import org.hamcrest.Matcher; import java.io.*; @@ -19,12 +18,7 @@ import java.util.Map; */ public class JsonAssert { - private static JsonProvider jsonProvider = new DefaultJsonProvider(); - - public final static int STRICT_MODE = 0; - public final static int SLACK_MODE = -1; - - private static int mode = SLACK_MODE; + private static JsonProvider jsonProvider = JsonProvider.getInstance(); public static void setJsonProvider(JsonProvider jsonProvider) { JsonAssert.jsonProvider = jsonProvider; @@ -61,7 +55,7 @@ public class JsonAssert { * @return a JSON asserter initialized with the provided document * @throws ParseException when the given JSON could not be parsed */ - public static JsonAsserter with(InputStream is) throws ParseException, IOException { + public static JsonAsserter with(InputStream is) throws IOException { Reader reader = new InputStreamReader(is); return with(reader); } diff --git a/json-path/pom.xml b/json-path/pom.xml index 30dddb6b..93bdb756 100644 --- a/json-path/pom.xml +++ b/json-path/pom.xml @@ -14,7 +14,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 com.jayway.jsonpath @@ -28,6 +29,11 @@ json-path http://code.google.com/p/json-path/ + + + org.codehaus.jackson + jackson-mapper-asl + - + 4.0.0 org.sonatype.oss @@ -31,7 +32,7 @@ 2011 GitHub Issue Tracking - + @@ -164,7 +165,13 @@ net.minidev json-smart - 1.0.6.3 + 1.0.9 + + + + org.codehaus.jackson + jackson-mapper-asl + 1.7.1