From fb9cc8dfe2700c6f1067bd172fd091c1c9d1570f Mon Sep 17 00:00:00 2001 From: Kalle Stenflo Date: Wed, 11 Apr 2012 16:55:35 +0200 Subject: [PATCH] Fixed backward compatibility in JsonModel. --- json-path/pom.xml | 1 + .../src/main/java/com/jayway/jsonpath/JsonModel.java | 12 ++++++++++++ .../test/java/com/jayway/jsonpath/IssuesTest.java | 6 ++++++ pom.xml | 11 ++++++----- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/json-path/pom.xml b/json-path/pom.xml index 3333e617..fb9d83d9 100644 --- a/json-path/pom.xml +++ b/json-path/pom.xml @@ -69,6 +69,7 @@ org.apache.felix maven-bundle-plugin + 2.3.7 true 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 5df8d986..002e6f8e 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java +++ b/json-path/src/main/java/com/jayway/jsonpath/JsonModel.java @@ -488,6 +488,9 @@ public class JsonModel { return new JsonModel(json, JsonProviderFactory.createProvider()); } + public static JsonModel create(String json) { + return model(json); + } /** * Creates a JsonModel @@ -500,6 +503,9 @@ public class JsonModel { return new JsonModel(jsonObject, JsonProviderFactory.createProvider()); } + public static JsonModel create(Object jsonObject) { + return model(jsonObject); + } /** * Creates a JsonModel @@ -512,6 +518,9 @@ public class JsonModel { return new JsonModel(url, JsonProviderFactory.createProvider()); } + public static JsonModel create(URL url) throws IOException { + return model(url); + } /** * Creates a JsonModel @@ -524,6 +533,9 @@ public class JsonModel { return new JsonModel(jsonInputStream, JsonProviderFactory.createProvider()); } + public static JsonModel create(InputStream jsonInputStream) throws IOException { + return model(jsonInputStream); + } // -------------------------------------------------------- // 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 a2470acf..06b0ea49 100644 --- a/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java +++ b/json-path/src/test/java/com/jayway/jsonpath/IssuesTest.java @@ -23,5 +23,11 @@ public class IssuesTest { assertNull(JsonPath.read(json, "$.foo.id")); } + + @Test + public void issue_11() throws Exception { + //String json = "{ \"foo\" : [] }"; + //JsonPath.read(json, "$.foo[?(@.rel= 'item')][0].uri"); + } } diff --git a/pom.xml b/pom.xml index 493c5ad5..5150d64a 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,8 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 org.sonatype.oss @@ -31,7 +32,7 @@ 2011 GitHub Issue Tracking - + @@ -75,8 +76,8 @@ - - + + - +