diff --git a/json-path/pom.xml b/json-path/pom.xml
index 25ad9a8b..3333e617 100644
--- a/json-path/pom.xml
+++ b/json-path/pom.xml
@@ -32,16 +32,12 @@
net.minidev
json-smart
+
commons-lang
commons-lang
-
- commons-io
- commons-io
-
-
org.codehaus.jackson
jackson-mapper-asl
diff --git a/json-path/src/main/java/com/jayway/jsonpath/Filter.java b/json-path/src/main/java/com/jayway/jsonpath/Filter.java
index 8e8f7968..8a3b8076 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Filter.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Filter.java
@@ -120,8 +120,5 @@ public abstract class Filter {
}
return true;
}
-
-
}
-
}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/InvalidModelPathException.java b/json-path/src/main/java/com/jayway/jsonpath/InvalidModelException.java
similarity index 74%
rename from json-path/src/main/java/com/jayway/jsonpath/InvalidModelPathException.java
rename to json-path/src/main/java/com/jayway/jsonpath/InvalidModelException.java
index 25c848d8..e2bad4d3 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/InvalidModelPathException.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/InvalidModelException.java
@@ -18,21 +18,21 @@ package com.jayway.jsonpath;
* @author Kalle Stenflo
*/
@SuppressWarnings("serial")
-public class InvalidModelPathException extends RuntimeException {
+public class InvalidModelException extends RuntimeException {
- public InvalidModelPathException() {
+ public InvalidModelException() {
super();
}
- public InvalidModelPathException(String message) {
+ public InvalidModelException(String message) {
super(message);
}
- public InvalidModelPathException(String message, Throwable cause) {
+ public InvalidModelException(String message, Throwable cause) {
super(message, cause);
}
- public InvalidModelPathException(Throwable cause) {
+ public InvalidModelException(Throwable cause) {
super(cause);
}
}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java b/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java
index 0ae4a2b2..f8891c73 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java
@@ -15,10 +15,10 @@
package com.jayway.jsonpath;
import com.jayway.jsonpath.internal.PathToken;
+import com.jayway.jsonpath.internal.Util;
import com.jayway.jsonpath.spi.JsonProvider;
import com.jayway.jsonpath.spi.JsonProviderFactory;
import com.jayway.jsonpath.spi.MappingProviderFactory;
-import org.apache.commons.io.IOUtils;
import java.io.IOException;
import java.io.InputStream;
@@ -57,13 +57,13 @@ public class JsonModel {
* Creates a new JsonModel based on a json document.
* Note that the jsonObject must either a {@link List} or a {@link Map}
*
- * @param jsonObject the json object
+ * @param jsonObject the json object
* @param jsonProvider
*/
private JsonModel(Object jsonObject, JsonProvider jsonProvider) {
notNull(jsonObject, "json can not be null");
- if (!(jsonObject instanceof Map) && !(jsonObject instanceof List)) {
+ if (!jsonProvider.isContainer(jsonObject)) {
throw new IllegalArgumentException("Invalid container object");
}
this.jsonProvider = jsonProvider;
@@ -85,7 +85,7 @@ public class JsonModel {
/**
* Creates a new JsonModel by fetching the content from the provided URL
*
- * @param jsonURL the URL to read
+ * @param jsonURL the URL to read
* @param jsonProvider
* @throws IOException failed to load URL
*/
@@ -98,10 +98,18 @@ public class JsonModel {
this.jsonObject = jsonProvider.parse(jsonInputStream);
this.jsonProvider = jsonProvider;
} finally {
- IOUtils.closeQuietly(jsonInputStream);
+ Util.closeQuietly(jsonInputStream);
}
}
+ public boolean isList(){
+ return jsonProvider.isList(jsonObject);
+ }
+
+ public boolean isMap(){
+ return jsonProvider.isMap(jsonObject);
+ }
+
// --------------------------------------------------------
//
// Getters
@@ -138,14 +146,22 @@ public class JsonModel {
return opsForArray(JsonPath.compile(jsonPath));
}
+ public ArrayOps opsForArray() {
+ return new DefaultArrayOps(this.jsonObject);
+ }
+
public ArrayOps opsForArray(JsonPath jsonPath) {
notNull(jsonPath, "jsonPath can not be null");
- List
-
- commons-io
- commons-io
- 2.1
-
org.slf4j