implemented naive eval function to remove java ScriptEngine dependency (support for java 5)

json-path/src/main/java/com/jayway/jsonpath/PathUtil.java

@@ -53,7 +53,9 @@ public class PathUtil {
 
         jsonPath = jsonPath.replace("..", ".~.")
                 .replace("[", ".[")
-                .replace("@.", "@");
+                .replace("@.", "@")
+                .replace("['", "")
+                .replace("']", "");
 
         String[] split = jsonPath.split("\\.");
 

json-path/src/main/java/com/jayway/jsonpath/eval/Expression.java

@@ -0,0 +1,88 @@
+package com.jayway.jsonpath.eval;
+
+/**
+ * User: kalle stenflo
+ * Date: 2/4/11
+ * Time: 9:21 PM
+ */
+public class Expression {
+
+
+    public static <T> boolean eval(T actual, String comparator, String expected) {
+
+        comparator = comparator.trim();
+
+        if (actual instanceof Long) {
+
+            Long a = (Long) actual;
+            Long e = Long.parseLong(expected.trim());
+
+            if ("=".equals(comparator)) {
+                return a.longValue() == e.longValue();
+            } else if ("!=".equals(comparator) || "<>".equals(comparator)) {
+                return a.longValue() != e.longValue();
+            } else if (">".equals(comparator)) {
+                return a.longValue() > e.longValue();
+            } else if (">=".equals(comparator)) {
+                return a.longValue() >= e.longValue();
+            } else if ("<".equals(comparator)) {
+                return a.longValue() < e.longValue();
+            } else if ("<=".equals(comparator)) {
+                return a.longValue() <= e.longValue();
+            }
+        } else if (actual instanceof Integer) {
+            Integer a = (Integer) actual;
+            Integer e = Integer.parseInt(expected.trim());
+
+            if ("=".equals(comparator)) {
+                return a.longValue() == e.longValue();
+            } else if ("!=".equals(comparator) || "<>".equals(comparator)) {
+                return a.longValue() != e.longValue();
+            } else if (">".equals(comparator)) {
+                return a.longValue() > e.longValue();
+            } else if (">=".equals(comparator)) {
+                return a.longValue() >= e.longValue();
+            } else if ("<".equals(comparator)) {
+                return a.longValue() < e.longValue();
+            } else if ("<=".equals(comparator)) {
+                return a.longValue() <= e.longValue();
+            }
+        } else if (actual instanceof Double) {
+
+            Double a = (Double) actual;
+            Double e = Double.parseDouble(expected.trim());
+
+            if ("=".equals(comparator)) {
+                return a.longValue() == e.longValue();
+            } else if ("!=".equals(comparator) || "<>".equals(comparator)) {
+                return a.longValue() != e.longValue();
+            } else if (">".equals(comparator)) {
+                return a.longValue() > e.longValue();
+            } else if (">=".equals(comparator)) {
+                return a.longValue() >= e.longValue();
+            } else if ("<".equals(comparator)) {
+                return a.longValue() < e.longValue();
+            } else if ("<=".equals(comparator)) {
+                return a.longValue() <= e.longValue();
+            }
+        } else if (actual instanceof String) {
+
+            String a = (String)actual;
+            expected = expected.trim();
+            if(expected.startsWith("'")) {
+                expected = expected.substring(1);
+            }
+            if(expected.endsWith("'")){
+                expected = expected.substring(0, expected.length()-1);
+            }
+
+            if ("=".equals(comparator)) {
+                return a.equals(expected);
+            } else if ("!=".equals(comparator) || "<>".equals(comparator)) {
+                return !a.equals(expected);
+            }
+        }
+
+        return false;
+    }
+}

json-path/src/main/java/com/jayway/jsonpath/filter/JsonPathFilterFactory.java

@@ -10,7 +10,8 @@ import java.util.regex.Pattern;
 public class JsonPathFilterFactory {
 
     private final static Pattern ROOT_FILTER_PATTERN = Pattern.compile("\\$");
-    private final static Pattern PROPERTY_FILTER_PATTERN = Pattern.compile("\\w+");
+    private final static Pattern PROPERTY_FILTER_PATTERN = Pattern.compile("(\\w+)|\\['(\\w+)'\\]");
+    //private final static Pattern PROPERTY_FILTER_PATTERN = Pattern.compile("\\w+");
     private final static Pattern WILDCARD_PROPERTY_FILTER_PATTERN = Pattern.compile("\\*");
     private final static Pattern LIST_FILTER_PATTERN = Pattern.compile("\\[.*?\\]");
     private final static Pattern TRAVERSE_FILTER_PATTERN = Pattern.compile("\\.\\.");

json-path/src/main/java/com/jayway/jsonpath/filter/ListFilter.java

@@ -1,11 +1,11 @@
 package com.jayway.jsonpath.filter;
 
 import com.jayway.jsonpath.JsonUtil;
+import com.jayway.jsonpath.eval.Expression;
 import org.json.simple.JSONArray;
 
-import javax.script.ScriptEngine;
+//import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
+//import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -20,7 +20,7 @@ import java.util.regex.Pattern;
  */
 public class ListFilter extends JsonPathFilterBase {
 
-    private static ScriptEngine SCRIPT_ENGINE = new ScriptEngineManager().getEngineByName("js");
+    //private static ScriptEngine SCRIPT_ENGINE = new ScriptEngineManager().getEngineByName("js");
 
     private static final Pattern LIST_INDEX_PATTERN = Pattern.compile("\\[(\\s?\\d+\\s?,?)+\\]"); //[1] OR [1,2,3]
     private static final Pattern LIST_PULL_PATTERN = Pattern.compile("\\[\\s?:(\\d+)\\s?\\]");   //[ :2 ]
@@ -51,8 +51,7 @@ public class ListFilter extends JsonPathFilterBase {
             return filterByPullIndex(items);
         } else if (LIST_ITEM_HAS_PROPERTY_PATTERN.matcher(pathFragment).matches()) {
             return filterByItemProperty(items);
-        }
+        } else if (LIST_ITEM_MATCHES_EVAL.matcher(pathFragment).matches()) {
-        else if (LIST_ITEM_MATCHES_EVAL.matcher(pathFragment).matches()) {
             return filterByItemEvalMatch(items);
         }
 
@@ -161,24 +160,12 @@ public class ListFilter extends JsonPathFilterBase {
                 return false;
             }
 
-
-            if(propertyValue instanceof String){
-                propertyValue = "'" + propertyValue + "'";
-            }
-
-            if(operator.trim().equals("=")){
-                operator = "===";
-            }
-
-
             String expression = propertyValue + " " + operator + " " + expected;
             System.out.println("EVAL" + expression);
 
-            try {
+
-                return (Boolean) SCRIPT_ENGINE.eval(expression);
+            return Expression.eval(propertyValue, operator, expected);
-            } catch (ScriptException e) {
+
-                return false;
-            }
         }
         return false;
     }

json-path/src/test/java/com/jayway/jsonpath/ExpressionEvalTest.java

@@ -0,0 +1,65 @@
+package com.jayway.jsonpath;
+
+import com.jayway.jsonpath.eval.Expression;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: kallestenflo
+ * Date: 2/4/11
+ * Time: 9:32 PM
+ */
+public class ExpressionEvalTest {
+
+
+    @Test
+    public void long_eval() throws Exception {
+
+        assertTrue(Expression.eval(1L, "=", "1"));
+        assertTrue(Expression.eval(2L, "!=", "1"));
+        assertTrue(Expression.eval(2L, ">", "1"));
+        assertTrue(Expression.eval(2L, ">=", "1"));
+        assertTrue(Expression.eval(2L, ">=", "2"));
+        assertTrue(Expression.eval(1L, "<", "2"));
+        assertTrue(Expression.eval(2L, "<=", "2"));
+
+        assertFalse(Expression.eval(1, ">", "2"));
+        assertFalse(Expression.eval(1, ">=", "2"));
+        assertFalse(Expression.eval(2, "<", "1"));
+        assertFalse(Expression.eval(2, "<=", "1"));
+        assertFalse(Expression.eval(1, "=", "2"));
+        assertFalse(Expression.eval(1, "!=", "1"));
+    }
+
+    @Test
+    public void double_eval() throws Exception {
+
+        assertTrue(Expression.eval(1D, "=", "1"));
+        assertTrue(Expression.eval(2D, "!=", "1"));
+        assertTrue(Expression.eval(2D, ">", "1"));
+        assertTrue(Expression.eval(2D, ">=", "1"));
+        assertTrue(Expression.eval(2D, ">=", "2"));
+        assertTrue(Expression.eval(1D, "<", "2"));
+        assertTrue(Expression.eval(2D, "<=", "2"));
+
+        assertFalse(Expression.eval(1D, ">", "2"));
+        assertFalse(Expression.eval(1D, ">=", "2"));
+        assertFalse(Expression.eval(2D, "<", "1"));
+        assertFalse(Expression.eval(2D, "<=", "1"));
+        assertFalse(Expression.eval(1D, "=", "2"));
+        assertFalse(Expression.eval(1D, "!=", "1"));
+    }
+
+    @Test
+    public void string_eval() throws Exception {
+
+        assertTrue(Expression.eval("A", "=", "A"));
+        assertTrue(Expression.eval("B", "!=", "A"));
+
+    }
+
+
+}

json-path/src/test/java/com/jayway/jsonpath/JsonPathTest.java

@@ -86,6 +86,7 @@ public class JsonPathTest {
     @Test
     public void read_store_book_author() throws Exception {
         assertThat(JsonPath.<String>read(DOCUMENT, "$.store.book[*].author"), hasItems("Nigel Rees", "Evelyn Waugh", "Herman Melville", "J. R. R. Tolkien"));
+        assertThat(JsonPath.<String>read(DOCUMENT, "$.['store'].['book'][*].['author']"), hasItems("Nigel Rees", "Evelyn Waugh", "Herman Melville", "J. R. R. Tolkien"));
     }