Browse Source

Array exception handling changed.

pull/183/merge
Kalle Stenflo 9 years ago
parent
commit
c5fb181273
  1. 50
      json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java
  2. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java
  3. 4
      json-path/src/test/java/com/jayway/jsonpath/DeepScanTest.java
  4. 14
      json-path/src/test/java/com/jayway/jsonpath/JsonOrgJsonProviderTest.java
  5. 4
      json-path/src/test/java/com/jayway/jsonpath/TestUtils.java
  6. 86
      json-path/src/test/java/com/jayway/jsonpath/old/IssuesTest.java

50
json-path/src/main/java/com/jayway/jsonpath/internal/PathCompiler.java

@ -111,20 +111,19 @@ public class PathCompiler {
readWildCardToken(appender) || readWildCardToken(appender) ||
readFilterToken(appender) || readFilterToken(appender) ||
readPlaceholderToken(appender) || readPlaceholderToken(appender) ||
fail("Could not parse bracket statement at position " + path.position()); fail("Could not parse token starting at position " + path.position() + ". Expected ?, ', 0-9, * ");
case PERIOD: case PERIOD:
return readDotSeparatorToken(appender) || return readDotToken(appender) ||
readScanToken(appender) || fail("Could not parse token starting at position " + path.position());
fail("Could not parse token at position " + path.position());
case WILDCARD: case WILDCARD:
return readWildCardToken(appender) || return readWildCardToken(appender) ||
fail("Could not parse token at position " + path.position()); fail("Could not parse token starting at position " + path.position());
case FUNCTION: case FUNCTION:
return readFunctionToken(appender) || return readFunctionToken(appender) ||
fail("Could not parse token at position " + path.position()); fail("Could not parse token starting at position " + path.position());
default: default:
return readPropertyToken(appender) || return readPropertyToken(appender) ||
fail("Could not parse token at position " + path.position()); fail("Could not parse token starting at position " + path.position());
} }
} }
@ -156,21 +155,20 @@ public class PathCompiler {
} }
// //
// . // . and ..
// //
private boolean readDotSeparatorToken(PathTokenAppender appender) { private boolean readDotToken(PathTokenAppender appender) {
if (!path.currentCharIs('.') || path.nextCharIs('.')) { if (path.currentCharIs('.') && path.nextCharIs('.')) {
return false; appender.appendPathToken(PathTokenFactory.crateScanToken());
} path.incrementPosition(2);
if (!path.hasMoreCharacters()) { } else if (!path.hasMoreCharacters()) {
throw new InvalidPathException("Path must not end with a '."); throw new InvalidPathException("Path must not end with a '.");
} } else {
// if (path.nextSignificantCharIs('[')) {
// throw new InvalidPathException("A bracket may not follow a '.");
// }
path.incrementPosition(1); path.incrementPosition(1);
}
if(path.currentCharIs('.')){
throw new InvalidPathException("Character '.' on position " + path.position() + " is not valid.");
}
return readNextToken(appender); return readNextToken(appender);
} }
@ -417,20 +415,6 @@ public class PathCompiler {
return path.currentIsTail() || readNextToken(appender); return path.currentIsTail() || readNextToken(appender);
} }
//
// ..
//
private boolean readScanToken(PathTokenAppender appender) {
if (!path.currentCharIs(PERIOD) || !path.nextCharIs(PERIOD)) {
return false;
}
appender.appendPathToken(PathTokenFactory.crateScanToken());
path.incrementPosition(2);
return readNextToken(appender);
}
public static boolean fail(String message) { public static boolean fail(String message) {
throw new InvalidPathException(message); throw new InvalidPathException(message);
} }

2
json-path/src/main/java/com/jayway/jsonpath/internal/token/ArrayPathToken.java

@ -181,7 +181,7 @@ public class ArrayPathToken extends PathToken {
if (! isUpstreamDefinite()) { if (! isUpstreamDefinite()) {
return false; return false;
} else { } else {
throw new InvalidPathException(format("Filter: %s can only be applied to arrays. Current context is: %s", toString(), model)); throw new PathNotFoundException(format("Filter: %s can only be applied to arrays. Current context is: %s", toString(), model));
} }
} }
return true; return true;

4
json-path/src/test/java/com/jayway/jsonpath/DeepScanTest.java

@ -47,8 +47,8 @@ public class DeepScanTest extends BaseTest {
assertEvaluationThrows("{\"foo\": {\"bar\": null}}", "$.foo.bar.[5]", PathNotFoundException.class); assertEvaluationThrows("{\"foo\": {\"bar\": null}}", "$.foo.bar.[5]", PathNotFoundException.class);
assertEvaluationThrows("{\"foo\": {\"bar\": null}}", "$.foo.bar.[5, 10]", PathNotFoundException.class); assertEvaluationThrows("{\"foo\": {\"bar\": null}}", "$.foo.bar.[5, 10]", PathNotFoundException.class);
assertEvaluationThrows("{\"foo\": {\"bar\": 4}}", "$.foo.bar.[5]", InvalidPathException.class); assertEvaluationThrows("{\"foo\": {\"bar\": 4}}", "$.foo.bar.[5]", PathNotFoundException.class);
assertEvaluationThrows("{\"foo\": {\"bar\": 4}}", "$.foo.bar.[5, 10]", InvalidPathException.class); assertEvaluationThrows("{\"foo\": {\"bar\": 4}}", "$.foo.bar.[5, 10]", PathNotFoundException.class);
assertEvaluationThrows("{\"foo\": {\"bar\": []}}", "$.foo.bar.[5]", PathNotFoundException.class); assertEvaluationThrows("{\"foo\": {\"bar\": []}}", "$.foo.bar.[5]", PathNotFoundException.class);
} }

14
json-path/src/test/java/com/jayway/jsonpath/JsonOrgJsonProviderTest.java

@ -4,7 +4,11 @@ import org.json.JSONArray;
import org.json.JSONObject; import org.json.JSONObject;
import org.junit.Test; import org.junit.Test;
import java.util.List;
import java.util.Map;
import static com.jayway.jsonpath.JsonPath.using; import static com.jayway.jsonpath.JsonPath.using;
import static org.assertj.core.api.Assertions.assertThat;
public class JsonOrgJsonProviderTest extends BaseTest { public class JsonOrgJsonProviderTest extends BaseTest {
@ -14,7 +18,7 @@ public class JsonOrgJsonProviderTest extends BaseTest {
JSONObject book = using(JSON_ORG_CONFIGURATION).parse(JSON_DOCUMENT).read("$.store.book[0]"); JSONObject book = using(JSON_ORG_CONFIGURATION).parse(JSON_DOCUMENT).read("$.store.book[0]");
System.out.println(book); assertThat(book.get("author").toString()).isEqualTo("Nigel Rees");
} }
@Test @Test
@ -22,7 +26,7 @@ public class JsonOrgJsonProviderTest extends BaseTest {
String category = using(JSON_ORG_CONFIGURATION).parse(JSON_DOCUMENT).read("$.store.book[0].category"); String category = using(JSON_ORG_CONFIGURATION).parse(JSON_DOCUMENT).read("$.store.book[0].category");
System.out.println(category); assertThat(category).isEqualTo("reference");
} }
@Test @Test
@ -30,14 +34,14 @@ public class JsonOrgJsonProviderTest extends BaseTest {
JSONArray fictionBooks = using(JSON_ORG_CONFIGURATION).parse(JSON_DOCUMENT).read("$.store.book[?(@.category == 'fiction')]"); JSONArray fictionBooks = using(JSON_ORG_CONFIGURATION).parse(JSON_DOCUMENT).read("$.store.book[?(@.category == 'fiction')]");
System.out.println(fictionBooks); assertThat(fictionBooks.length()).isEqualTo(3);
} }
@Test @Test
public void result_can_be_mapped_to_object() { public void result_can_be_mapped_to_object() {
Object result = using(JSON_ORG_CONFIGURATION).parse(JSON_DOCUMENT).read("$.store.book", Object.class); List<Map<String, Object>> books = using(JSON_ORG_CONFIGURATION).parse(JSON_DOCUMENT).read("$.store.book", List.class);
System.out.println(result); assertThat(books.size()).isEqualTo(4);
} }
} }

4
json-path/src/test/java/com/jayway/jsonpath/TestUtils.java

@ -15,10 +15,10 @@ public final class TestUtils {
/** /**
* Shortcut for expected exception testing during path evaluation. * Shortcut for expected exception testing during path evaluation.
* *
* @param conf conf to use during evaluation
* @param json json to parse * @param json json to parse
* @param path jsonpath do evaluate * @param path jsonpath do evaluate
* @param expected expected exception class (reference comparison, not an instanceof) * @param expected expected exception class (reference comparison, not an instanceof)
* @param conf conf to use during evaluation
*/ */
public static void assertEvaluationThrows(final String json, final String path, public static void assertEvaluationThrows(final String json, final String path,
Class<? extends JsonPathException> expected, final Configuration conf) { Class<? extends JsonPathException> expected, final Configuration conf) {
@ -35,6 +35,7 @@ public final class TestUtils {
* Assertion which requires empty list as a result of indefinite path search. * Assertion which requires empty list as a result of indefinite path search.
* @param json json to be parsed * @param json json to be parsed
* @param path path to be evaluated * @param path path to be evaluated
* @param conf conf to use during evaluation
*/ */
public static void assertHasNoResults(final String json, final String path, Configuration conf) { public static void assertHasNoResults(final String json, final String path, Configuration conf) {
assertHasResults(json, path, 0, conf); assertHasResults(json, path, 0, conf);
@ -54,6 +55,7 @@ public final class TestUtils {
* @param json json to be parsed * @param json json to be parsed
* @param path path to be evaluated * @param path path to be evaluated
* @param expectedResultCount expected number of nodes to be found * @param expectedResultCount expected number of nodes to be found
* @param conf conf to use during evaluation
*/ */
public static void assertHasResults(final String json, final String path, final int expectedResultCount, Configuration conf) { public static void assertHasResults(final String json, final String path, final int expectedResultCount, Configuration conf) {
Object result = JsonPath.using(conf).parse(json).read(path); Object result = JsonPath.using(conf).parse(json).read(path);

86
json-path/src/test/java/com/jayway/jsonpath/old/IssuesTest.java

@ -5,6 +5,7 @@ import com.jayway.jsonpath.BaseTest;
import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.DocumentContext; import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.Filter; import com.jayway.jsonpath.Filter;
import com.jayway.jsonpath.InvalidPathException;
import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.Option; import com.jayway.jsonpath.Option;
import com.jayway.jsonpath.PathNotFoundException; import com.jayway.jsonpath.PathNotFoundException;
@ -42,6 +43,71 @@ public class IssuesTest extends BaseTest {
private static final JsonProvider jp = Configuration.defaultConfiguration().jsonProvider(); private static final JsonProvider jp = Configuration.defaultConfiguration().jsonProvider();
@Test
public void issue_114_a() {
String json = "{ \"p\":{\n" +
"\"s\": { \"u\": \"su\" }, \n" +
"\"t\": { \"u\": \"tu\" }\n" +
"}}";
List<String> result = read(json, "$.p.['s', 't'].u");
assertThat(result).containsExactly("su","tu");
}
@Test
public void issue_114_b() {
String json = "{ \"p\": [\"valp\", \"valq\", \"valr\"] }";
List<String> result = read(json, "$.p[?(@ == 'valp')]");
assertThat(result).containsExactly("valp");
}
@Test
public void issue_114_c() {
String json = "{ \"p\": [\"valp\", \"valq\", \"valr\"] }";
List<String> result = read(json, "$.p[?(@[0] == 'valp')]");
assertThat(result).isEmpty();
}
@Test(expected = InvalidPathException.class)
public void issue_114_d() {
read(JSON_BOOK_DOCUMENT, "$..book[(@.length-1)] ");
}
@Test
public void issue_151() {
String json = "{\n" +
"\"datas\": {\n" +
" \"selling\": {\n" +
" \"3\": [\n" +
" 26452067,\n" +
" 31625950\n" +
" ],\n" +
" \"206\": [\n" +
" 32381852,\n" +
" 32489262\n" +
" ],\n" +
" \"208\": [\n" +
" 458\n" +
" ],\n" +
" \"217\": [\n" +
" 27364892\n" +
" ],\n" +
" \"226\": [\n" +
" 30474109\n" +
" ]\n" +
" }\n" +
"},\n" +
"\"status\": 0\n" +
"}";
List<Integer> result = read(json, "$.datas.selling['3','206'].*");
assertThat(result).containsExactly(26452067,31625950,32381852,32489262);
}
@Test @Test
public void full_ones_can_be_filtered() { public void full_ones_can_be_filtered() {
String json = "[\n" + String json = "[\n" +
@ -447,7 +513,7 @@ public class IssuesTest extends BaseTest {
" ]\n" + " ]\n" +
"}\n"; "}\n";
List<String> result = JsonPath.read(json, "$.a.*.b.*.c"); List<String> result = read(json, "$.a.*.b.*.c");
assertThat(result).containsExactly("foo"); assertThat(result).containsExactly("foo");
@ -503,7 +569,7 @@ public class IssuesTest extends BaseTest {
" ]\n" + " ]\n" +
"}]"; "}]";
List<String> problems = JsonPath.read(json, "$..narratives[?(@.lastRule==true)].message"); List<String> problems = read(json, "$..narratives[?(@.lastRule==true)].message");
assertThat(problems).containsExactly("Chain does not have a discovery event. Possible it was cut by the date that was picked", "No start transcoding events found"); assertThat(problems).containsExactly("Chain does not have a discovery event. Possible it was cut by the date that was picked", "No start transcoding events found");
} }
@ -563,7 +629,7 @@ public class IssuesTest extends BaseTest {
+ " ]\n" + " ]\n"
+ "}"; + "}";
List<String> result = JsonPath.read(json, "$.logs[?(@.message == 'it\\'s here')].message"); List<String> result = read(json, "$.logs[?(@.message == 'it\\'s here')].message");
assertThat(result).containsExactly("it's here"); assertThat(result).containsExactly("it's here");
} }
@ -596,7 +662,7 @@ public class IssuesTest extends BaseTest {
" }\n" + " }\n" +
"}"; "}";
List<String> res = JsonPath.read(json, "$.c.*.url[2]"); List<String> res = read(json, "$.c.*.url[2]");
assertThat(res).containsExactly("url5"); assertThat(res).containsExactly("url5");
} }
@ -775,7 +841,7 @@ public class IssuesTest extends BaseTest {
" }\n" + " }\n" +
"]"; "]";
List<Map<String, String>> result = JsonPath.read(json, "$[?(@.foo)]"); List<Map<String, String>> result = read(json, "$[?(@.foo)]");
assertThat(result).extracting("foo").containsExactly("1", null); assertThat(result).extracting("foo").containsExactly("1", null);
} }
@ -796,12 +862,12 @@ public class IssuesTest extends BaseTest {
" }\n" + " }\n" +
"]"; "]";
List<String> result = JsonPath.read(json, "$[?(@.foo != null)].foo.bar"); List<String> result = read(json, "$[?(@.foo != null)].foo.bar");
assertThat(result).containsExactly("0"); assertThat(result).containsExactly("0");
result = JsonPath.read(json, "$[?(@.foo.bar)].foo.bar"); result = read(json, "$[?(@.foo.bar)].foo.bar");
assertThat(result).containsExactly("0"); assertThat(result).containsExactly("0");
} }
@ -821,7 +887,7 @@ public class IssuesTest extends BaseTest {
" }\n" + " }\n" +
"]"; "]";
List<Integer> result = JsonPath.read(json, "$[2]['d'][?(@.random)]['date']"); List<Integer> result = read(json, "$[2]['d'][?(@.random)]['date']");
assertThat(result).containsExactly(1234); assertThat(result).containsExactly(1234);
} }
@ -833,7 +899,7 @@ public class IssuesTest extends BaseTest {
String json = "{ \"valid key[@num = 2]\" : \"value\" }"; String json = "{ \"valid key[@num = 2]\" : \"value\" }";
String result = JsonPath.read(json, "$['valid key[@num = 2]']"); String result = read(json, "$['valid key[@num = 2]']");
Assertions.assertThat(result).isEqualTo("value"); Assertions.assertThat(result).isEqualTo("value");
} }
@ -864,7 +930,7 @@ public class IssuesTest extends BaseTest {
" \"expensive\": 10\n" + " \"expensive\": 10\n" +
"}"; "}";
List<Double> numbers = JsonPath.read(json, "$.store.book[?(@.price <= 90)].price"); List<Double> numbers = read(json, "$.store.book[?(@.price <= 90)].price");
assertThat(numbers).containsExactly(8.95D, 12.99D, 8.99D, 22.99D); assertThat(numbers).containsExactly(8.95D, 12.99D, 8.99D, 22.99D);
} }

Loading…
Cancel
Save