From b6b0b58a8fd5066a0b4eeedf072b274fd7b1dc87 Mon Sep 17 00:00:00 2001 From: linton Date: Sat, 28 Apr 2012 09:11:28 -0700 Subject: [PATCH 1/2] Use length==0 instead of "isEmpty" which crashes on Android 2.2 where the method is missing. --- json-path/src/main/java/com/jayway/jsonpath/JsonPath.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 099f25a7..39b5ac02 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java +++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java @@ -104,7 +104,7 @@ public class JsonPath { public JsonPath(String jsonPath, Filter[] filters) { if (jsonPath == null || - jsonPath.trim().isEmpty() || + jsonPath.trim().length()==0 || jsonPath.matches("[^\\?\\+\\=\\-\\*\\/\\!]\\(")) { throw new InvalidPathException("Invalid path"); From 8aadf1d5b87bbca2da3ff452de31aa5be584c2b8 Mon Sep 17 00:00:00 2001 From: linton Date: Sat, 28 Apr 2012 09:16:44 -0700 Subject: [PATCH 2/2] Adjusted formatting --- json-path/src/main/java/com/jayway/jsonpath/JsonPath.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 39b5ac02..5747575c 100644 --- a/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java +++ b/json-path/src/main/java/com/jayway/jsonpath/JsonPath.java @@ -104,7 +104,7 @@ public class JsonPath { public JsonPath(String jsonPath, Filter[] filters) { if (jsonPath == null || - jsonPath.trim().length()==0 || + jsonPath.trim().length() == 0 || jsonPath.matches("[^\\?\\+\\=\\-\\*\\/\\!]\\(")) { throw new InvalidPathException("Invalid path");