Skip to content

Commit d77e302

Browse files
author
kalle
committed
improvements
1 parent 759ecf3 commit d77e302

File tree

8 files changed

+107
-63
lines changed

8 files changed

+107
-63
lines changed

‎README

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
Java DSL for reading and testing JSON documents.
1+
Java DSL for reading and testing JSON documents.
2+
3+
4+
5+
Santa Fe LET 50

‎json-path/src/main/java/com/jayway/jsonpath/JsonPath.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public static <T> T readOne(Object json, String jsonPath) {
168168

169169
if (log.isLoggable(Level.WARNING)) {
170170
if (!PathUtil.isPathDefinite(jsonPath)) {
171-
log.warning("Using readOne(...) on a not definite json path may give incorrect results.");
171+
log.warning("Using readOne() on a not definite json path may give incorrect results. Path : " + jsonPath);
172172
}
173173
}
174174

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

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Date: 2/4/11
66
* Time: 9:21 PM
77
*/
8-
public class Expression {
8+
public class ExpressionEvaluator {
99

1010

1111
public static <T> boolean eval(T actual, String comparator, String expected) {
@@ -35,35 +35,35 @@ public static <T> boolean eval(T actual, String comparator, String expected) {
3535
Integer e = Integer.parseInt(expected.trim());
3636

3737
if ("=".equals(comparator)) {
38-
return a.longValue() == e.longValue();
38+
return a.intValue() == e.intValue();
3939
} else if ("!=".equals(comparator) || "<>".equals(comparator)) {
40-
return a.longValue() != e.longValue();
40+
return a.intValue() != e.intValue();
4141
} else if (">".equals(comparator)) {
42-
return a.longValue() > e.longValue();
42+
return a.intValue() > e.intValue();
4343
} else if (">=".equals(comparator)) {
44-
return a.longValue() >= e.longValue();
44+
return a.intValue() >= e.intValue();
4545
} else if ("<".equals(comparator)) {
46-
return a.longValue() < e.longValue();
46+
return a.intValue() < e.intValue();
4747
} else if ("<=".equals(comparator)) {
48-
return a.longValue() <= e.longValue();
48+
return a.intValue() <= e.intValue();
4949
}
5050
} else if (actual instanceof Double) {
5151

5252
Double a = (Double) actual;
5353
Double e = Double.parseDouble(expected.trim());
5454

5555
if ("=".equals(comparator)) {
56-
return a.longValue() == e.longValue();
56+
return a.doubleValue() == e.doubleValue();
5757
} else if ("!=".equals(comparator) || "<>".equals(comparator)) {
58-
return a.longValue() != e.longValue();
58+
return a.doubleValue() != e.doubleValue();
5959
} else if (">".equals(comparator)) {
60-
return a.longValue() > e.longValue();
60+
return a.doubleValue() > e.doubleValue();
6161
} else if (">=".equals(comparator)) {
62-
return a.longValue() >= e.longValue();
62+
return a.doubleValue() >= e.doubleValue();
6363
} else if ("<".equals(comparator)) {
64-
return a.longValue() < e.longValue();
64+
return a.doubleValue() < e.doubleValue();
6565
} else if ("<=".equals(comparator)) {
66-
return a.longValue() <= e.longValue();
66+
return a.doubleValue() <= e.doubleValue();
6767
}
6868
} else if (actual instanceof String) {
6969

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.jayway.jsonpath.filter;
22

3+
import com.jayway.jsonpath.InvalidPathException;
34
import org.json.simple.JSONArray;
45

5-
import java.util.Collections;
66
import java.util.LinkedList;
77
import java.util.List;
88

@@ -37,6 +37,9 @@ public List<Object> filter(Object root) {
3737
List<Object> result = rootList;
3838

3939
for (JsonPathFilterBase filter : filters) {
40+
if (filter == null) {
41+
throw new InvalidPathException();
42+
}
4043
result = filter.apply(result);
4144
}
4245

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

+28-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.jayway.jsonpath.filter;
22

33
import com.jayway.jsonpath.JsonUtil;
4-
import com.jayway.jsonpath.eval.Expression;
4+
import com.jayway.jsonpath.eval.ExpressionEvaluator;
55
import org.json.simple.JSONArray;
66

77
//import javax.script.ScriptEngine;
@@ -13,23 +13,22 @@
1313
import java.util.regex.Pattern;
1414

1515
/**
16-
* Created by IntelliJ IDEA.
17-
* User: kallestenflo
16+
* User: kalle stenflo
1817
* Date: 2/2/11
1918
* Time: 2:32 PM
2019
*/
2120
public class ListFilter extends JsonPathFilterBase {
2221

2322
//private static ScriptEngine SCRIPT_ENGINE = new ScriptEngineManager().getEngineByName("js");
2423

25-
private static final Pattern LIST_INDEX_PATTERN = Pattern.compile("\\[(\\s?\\d+\\s?,?)+\\]"); //[1] OR [1,2,3]
26-
private static final Pattern LIST_PULL_PATTERN = Pattern.compile("\\[\\s?:(\\d+)\\s?\\]"); //[ :2 ]
27-
private static final Pattern LIST_WILDCARD_PATTERN = Pattern.compile("\\[\\*\\]");
24+
private static final Pattern LIST_INDEX_PATTERN = Pattern.compile("\\[(\\s?\\d+\\s?,?)+\\]"); //[1] OR [1,2,3]
25+
private static final Pattern LIST_PULL_PATTERN = Pattern.compile("\\[\\s?:(\\d+)\\s?\\]"); //[ :2 ]
26+
private static final Pattern LIST_WILDCARD_PATTERN = Pattern.compile("\\[\\*\\]"); //[*]
2827
private static final Pattern LIST_TAIL_PATTERN_SHORT = Pattern.compile("\\[\\s*-\\s*(\\d+):\\s*\\]"); // [(@.length - 12)] OR [-13:]
29-
private static final Pattern LIST_TAIL_PATTERN_LONG = Pattern.compile("\\[\\s*\\(\\s*@\\.length\\s*-\\s*(\\d+)\\s*\\)\\s*\\]");
28+
private static final Pattern LIST_TAIL_PATTERN_LONG = Pattern.compile("\\[\\s*\\(\\s*@\\.length\\s*-\\s*(\\d+)\\s*\\)\\s*\\]"); //[(@.length-1)]
3029
private static final Pattern LIST_TAIL_PATTERN = Pattern.compile("(" + LIST_TAIL_PATTERN_SHORT.pattern() + "|" + LIST_TAIL_PATTERN_LONG.pattern() + ")");
31-
private static final Pattern LIST_ITEM_HAS_PROPERTY_PATTERN = Pattern.compile("\\[\\s?\\?\\s?\\(\\s?@\\.(\\w+)\\s?\\)\\s?\\]");
32-
private static final Pattern LIST_ITEM_MATCHES_EVAL = Pattern.compile("\\[\\s?\\?\\s?\\(\\s?@.(\\w+)\\s?([=<>]+)\\s?(.*)\\s?\\)\\s?\\]"); //[ ?( @.title< 'ko' ) ]
30+
private static final Pattern LIST_ITEM_HAS_PROPERTY_PATTERN = Pattern.compile("\\[\\s?\\?\\s?\\(\\s?@\\.(\\w+)\\s?\\)\\s?\\]"); //[?(@.title)]
31+
private static final Pattern LIST_ITEM_MATCHES_EVAL = Pattern.compile("\\[\\s?\\?\\s?\\(\\s?@.(\\w+)\\s?([=<>]+)\\s?(.*)\\s?\\)\\s?\\]"); //[?( @.title< 'ko')]
3332

3433
private final String pathFragment;
3534

@@ -106,6 +105,7 @@ private List<Object> filterByListTailIndex(List<Object> items) {
106105

107106
for (Object current : items) {
108107
List array = JsonUtil.toList(current);
108+
109109
result.add(array.get(getTailIndex(array.size())));
110110
}
111111
return result;
@@ -115,10 +115,12 @@ private List<Object> filterByListIndex(List<Object> items) {
115115
List<Object> result = new JSONArray();
116116

117117
for (Object current : items) {
118+
List target = JsonUtil.toList(current);
118119
Integer[] index = getArrayIndex();
119120
for (int i : index) {
120-
121-
result.add(JsonUtil.toList(current).get(i));
121+
if(indexIsInRange(target, i)){
122+
result.add(target.get(i));
123+
}
122124
}
123125
}
124126
return result;
@@ -128,10 +130,12 @@ private List<Object> filterByPullIndex(List<Object> items) {
128130
List<Object> result = new JSONArray();
129131

130132
for (Object current : items) {
133+
List target = JsonUtil.toList(current);
131134
Integer[] index = getListPullIndex();
132135
for (int i : index) {
133-
134-
result.add(JsonUtil.toList(current).get(i));
136+
if(indexIsInRange(target, i)){
137+
result.add(target.get(i));
138+
}
135139
}
136140
}
137141
return result;
@@ -164,7 +168,7 @@ private boolean isEvalMatch(Object check) {
164168
System.out.println("EVAL" + expression);
165169

166170

167-
return Expression.eval(propertyValue, operator, expected);
171+
return ExpressionEvaluator.eval(propertyValue, operator, expected);
168172

169173
}
170174
return false;
@@ -230,4 +234,14 @@ private Integer[] getArrayIndex() {
230234
return index.toArray(new Integer[0]);
231235
}
232236

237+
private boolean indexIsInRange(List list, int index){
238+
if(index < 0){
239+
return false;
240+
}else if(index > list.size() -1){
241+
return false;
242+
}else {
243+
return true;
244+
}
245+
}
246+
233247
}

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

+29-29
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.jayway.jsonpath;
22

3-
import com.jayway.jsonpath.eval.Expression;
3+
import com.jayway.jsonpath.eval.ExpressionEvaluator;
44
import org.junit.Test;
55

66
import static org.junit.Assert.assertFalse;
@@ -18,46 +18,46 @@ public class ExpressionEvalTest {
1818
@Test
1919
public void long_eval() throws Exception {
2020

21-
assertTrue(Expression.eval(1L, "=", "1"));
22-
assertTrue(Expression.eval(2L, "!=", "1"));
23-
assertTrue(Expression.eval(2L, ">", "1"));
24-
assertTrue(Expression.eval(2L, ">=", "1"));
25-
assertTrue(Expression.eval(2L, ">=", "2"));
26-
assertTrue(Expression.eval(1L, "<", "2"));
27-
assertTrue(Expression.eval(2L, "<=", "2"));
21+
assertTrue(ExpressionEvaluator.eval(1L, "=", "1"));
22+
assertTrue(ExpressionEvaluator.eval(2L, "!=", "1"));
23+
assertTrue(ExpressionEvaluator.eval(2L, ">", "1"));
24+
assertTrue(ExpressionEvaluator.eval(2L, ">=", "1"));
25+
assertTrue(ExpressionEvaluator.eval(2L, ">=", "2"));
26+
assertTrue(ExpressionEvaluator.eval(1L, "<", "2"));
27+
assertTrue(ExpressionEvaluator.eval(2L, "<=", "2"));
2828

29-
assertFalse(Expression.eval(1, ">", "2"));
30-
assertFalse(Expression.eval(1, ">=", "2"));
31-
assertFalse(Expression.eval(2, "<", "1"));
32-
assertFalse(Expression.eval(2, "<=", "1"));
33-
assertFalse(Expression.eval(1, "=", "2"));
34-
assertFalse(Expression.eval(1, "!=", "1"));
29+
assertFalse(ExpressionEvaluator.eval(1, ">", "2"));
30+
assertFalse(ExpressionEvaluator.eval(1, ">=", "2"));
31+
assertFalse(ExpressionEvaluator.eval(2, "<", "1"));
32+
assertFalse(ExpressionEvaluator.eval(2, "<=", "1"));
33+
assertFalse(ExpressionEvaluator.eval(1, "=", "2"));
34+
assertFalse(ExpressionEvaluator.eval(1, "!=", "1"));
3535
}
3636

3737
@Test
3838
public void double_eval() throws Exception {
3939

40-
assertTrue(Expression.eval(1D, "=", "1"));
41-
assertTrue(Expression.eval(2D, "!=", "1"));
42-
assertTrue(Expression.eval(2D, ">", "1"));
43-
assertTrue(Expression.eval(2D, ">=", "1"));
44-
assertTrue(Expression.eval(2D, ">=", "2"));
45-
assertTrue(Expression.eval(1D, "<", "2"));
46-
assertTrue(Expression.eval(2D, "<=", "2"));
40+
assertTrue(ExpressionEvaluator.eval(1D, "=", "1"));
41+
assertTrue(ExpressionEvaluator.eval(2D, "!=", "1"));
42+
assertTrue(ExpressionEvaluator.eval(2D, ">", "1"));
43+
assertTrue(ExpressionEvaluator.eval(2D, ">=", "1"));
44+
assertTrue(ExpressionEvaluator.eval(2D, ">=", "2"));
45+
assertTrue(ExpressionEvaluator.eval(1D, "<", "2"));
46+
assertTrue(ExpressionEvaluator.eval(2D, "<=", "2"));
4747

48-
assertFalse(Expression.eval(1D, ">", "2"));
49-
assertFalse(Expression.eval(1D, ">=", "2"));
50-
assertFalse(Expression.eval(2D, "<", "1"));
51-
assertFalse(Expression.eval(2D, "<=", "1"));
52-
assertFalse(Expression.eval(1D, "=", "2"));
53-
assertFalse(Expression.eval(1D, "!=", "1"));
48+
assertFalse(ExpressionEvaluator.eval(1D, ">", "2"));
49+
assertFalse(ExpressionEvaluator.eval(1D, ">=", "2"));
50+
assertFalse(ExpressionEvaluator.eval(2D, "<", "1"));
51+
assertFalse(ExpressionEvaluator.eval(2D, "<=", "1"));
52+
assertFalse(ExpressionEvaluator.eval(1D, "=", "2"));
53+
assertFalse(ExpressionEvaluator.eval(1D, "!=", "1"));
5454
}
5555

5656
@Test
5757
public void string_eval() throws Exception {
5858

59-
assertTrue(Expression.eval("A", "=", "A"));
60-
assertTrue(Expression.eval("B", "!=", "A"));
59+
assertTrue(ExpressionEvaluator.eval("A", "=", "A"));
60+
assertTrue(ExpressionEvaluator.eval("B", "!=", "A"));
6161

6262
}
6363

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

+27-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.util.Map;
88

99
import static org.hamcrest.Matchers.equalTo;
10-
import static org.hamcrest.Matchers.hasEntry;
1110
import static org.hamcrest.Matchers.hasItems;
1211
import static org.junit.Assert.*;
1312

@@ -57,7 +56,7 @@ public void read_document_from_root() throws Exception {
5756

5857
List<Object> list = JsonPath.read(DOCUMENT, "$.store");
5958

60-
assertEquals(2, ((Map)list.get(0)).values().size());
59+
assertEquals(2, ((Map) list.get(0)).values().size());
6160

6261

6362
}
@@ -68,7 +67,7 @@ public void read_store_book_1() throws Exception {
6867

6968
JsonPath path = JsonPath.compile("$.store.book[1]");
7069

71-
List<Object> list = path.read(DOCUMENT);
70+
List<Map> list = path.read(DOCUMENT);
7271

7372
System.out.println(list.toString());
7473

@@ -124,6 +123,7 @@ public void read_store_book_index_0_and_1() throws Exception {
124123
assertThat(JsonPath.<String>read(DOCUMENT, "$.store.book[0,1].author"), hasItems("Nigel Rees", "Evelyn Waugh"));
125124
assertTrue(JsonPath.<String>read(DOCUMENT, "$.store.book[0,1].author").size() == 2);
126125
}
126+
127127
@Test
128128
public void read_store_book_pull_first_2() throws Exception {
129129

@@ -146,7 +146,7 @@ public void all_books_cheaper_than_10() throws Exception {
146146

147147
}
148148

149-
@Test
149+
@Test
150150
public void all_books_with_category_reference() throws Exception {
151151

152152
assertThat(JsonPath.<String>read(DOCUMENT, "$..book[?(@.category = 'reference')].title"), hasItems("Sayings of the Century"));
@@ -162,4 +162,27 @@ public void all_members_of_all_documents() throws Exception {
162162
System.out.println(all.toString());
163163

164164
}
165+
166+
@Test
167+
public void access_index_out_of_bounds_does_not_throw_exception() throws Exception {
168+
169+
List<Object> res = JsonPath.read(DOCUMENT, "$.store.book[100].author");
170+
171+
assertTrue(res.isEmpty());
172+
173+
res = JsonPath.read(DOCUMENT, "$.store.book[100, 200].author");
174+
175+
assertTrue(res.isEmpty());
176+
}
177+
178+
179+
@Test(expected = InvalidPathException.class)
180+
public void invalid_space_path_throws_exception() throws Exception {
181+
JsonPath.read(DOCUMENT, "space is not good");
182+
}
183+
184+
@Test(expected = InvalidPathException.class)
185+
public void invalid_new_path_throws_exception() throws Exception {
186+
JsonPath.read(DOCUMENT, "new ");
187+
}
165188
}

‎jsonpath.png

4.04 KB
Loading

0 commit comments

Comments
 (0)