fanruan
/
JsonPath
mirror of https://github.com/json-path/JsonPath.git
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

fix issue273 (#715)

heroku
zengmmm00 3 years ago committed by GitHub
parent
ae253ab049
commit
72fed27217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 114 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      json-path/src/main/java/com/jayway/jsonpath/internal/path/EvaluationContextImpl.java
  2. 11
      json-path/src/main/java/com/jayway/jsonpath/internal/path/PathToken.java
  3. 4
      json-path/src/main/java/com/jayway/jsonpath/internal/path/RootPathToken.java
  4. 1
      json-path/src/main/java/com/jayway/jsonpath/internal/path/ScanPathToken.java
  5. 95
      json-path/src/test/java/com/jayway/jsonpath/internal/function/Issue273.java

4
json-path/src/main/java/com/jayway/jsonpath/internal/path/EvaluationContextImpl.java
Unescape View File

@ -52,6 +52,10 @@ public class EvaluationContextImpl implements EvaluationContext {
private int resultIndex = 0;
public RootPathToken getRoot(){
return ((CompiledPath) path).getRoot();
}
public EvaluationContextImpl(Path path, Object rootDocument, Configuration configuration, boolean forUpdate) {
notNull(path, "path can not be null");
notNull(rootDocument, "root can not be null");

11
json-path/src/main/java/com/jayway/jsonpath/internal/path/PathToken.java
Unescape View File

@ -29,6 +29,12 @@ public abstract class PathToken {
private PathToken next;
private Boolean definite = null;
private Boolean upstreamDefinite = null;
private int upstreamArrayIndex = -1;
public void setUpstreamArrayIndex(int idx){
upstreamArrayIndex = idx;
}
PathToken appendTailToken(PathToken next) {
this.next = next;
@ -75,7 +81,10 @@ public abstract class PathToken {
}
PathRef pathRef = ctx.forUpdate() ? PathRef.create(model, property) : PathRef.NO_OP;
if (isLeaf()) {
ctx.addResult(evalPath, pathRef, propertyVal);
String idx = "[" + String.valueOf(upstreamArrayIndex) + "]";
if(idx.equals("[-1]") || ctx.getRoot().getTail().prev().getPathFragment().equals(idx)){
ctx.addResult(evalPath, pathRef, propertyVal);
}
}
else {
next().evaluate(evalPath, pathRef, propertyVal, ctx);

4
json-path/src/main/java/com/jayway/jsonpath/internal/path/RootPathToken.java
Unescape View File

@ -32,6 +32,10 @@ public class RootPathToken extends PathToken {
this.tokenCount = 1;
}
public PathToken getTail(){
return this.tail;
}
@Override
public int getTokenCount() {
return tokenCount;

1
json-path/src/main/java/com/jayway/jsonpath/internal/path/ScanPathToken.java
Unescape View File

@ -55,6 +55,7 @@ public class ScanPathToken extends PathToken {
int idx = 0;
for (Object evalModel : models) {
String evalPath = currentPath + "[" + idx + "]";
next.setUpstreamArrayIndex(idx);
next.evaluate(evalPath, parent, evalModel, ctx);
idx++;
}

95
json-path/src/test/java/com/jayway/jsonpath/internal/function/Issue273.java
Unescape View File

@ -0,0 +1,95 @@
package com.jayway.jsonpath.internal.function;
import net.minidev.json.JSONArray;
import com.jayway.jsonpath.JsonPath;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class Issue273 {
@Test
public void testGetPropertyFromArray(){
String json = "[\n" +
" [\n" +
" {\n" +
" \"category\" : \"reference\",\n" +
" \"author\" : \"Nigel Rees\",\n" +
" \"title\" : \"Sayings of the Century\",\n" +
" \"price\" : 8.95\n" +
" },\n" +
" {\n" +
" \"category\" : \"fiction\",\n" +
" \"author\" : \"Evelyn Waugh\",\n" +
" \"title\" : \"Sword of Honour\",\n" +
" \"price\" : 12.99\n" +
" },\n" +
" {\n" +
" \"category\" : \"fiction\",\n" +
" \"author\" : \"Herman Melville\",\n" +
" \"title\" : \"Moby Dick\",\n" +
" \"isbn\" : \"0-553-21311-3\",\n" +
" \"price\" : 8.99\n" +
" },\n" +
" {\n" +
" \"category\" : \"fiction\",\n" +
" \"author\" : \"J. R. R. Tolkien\",\n" +
" \"title\" : \"The Lord of the Rings\",\n" +
" \"isbn\" : \"0-395-19395-8\",\n" +
" \"price\" : 22.99\n" +
" }\n" +
" ],\n" +
" {\n" +
" \"color\" : \"red\",\n" +
" \"price\" : 19.95\n" +
" }\n" +
"]\n";
JSONArray arr = JsonPath.read(json,"$..[2].author");
assertEquals(arr.get(0), "Herman Melville");
}
@Test
public void testGetPropertyFromObject(){
String json = "{\n" +
" \"store\": {\n" +
" \"book\": [\n" +
" {\n" +
" \"category\": \"reference\",\n" +
" \"author\": \"Nigel Rees\",\n" +
" \"title\": \"Sayings of the Century\",\n" +
" \"price\": 8.95\n" +
" },\n" +
" {\n" +
" \"category\": \"fiction\",\n" +
" \"author\": \"Evelyn Waugh\",\n" +
" \"title\": \"Sword of Honour\",\n" +
" \"price\": 12.99\n" +
" },\n" +
" {\n" +
" \"category\": \"fiction\",\n" +
" \"author\": \"Herman Melville\",\n" +
" \"title\": \"Moby Dick\",\n" +
" \"isbn\": \"0-553-21311-3\",\n" +
" \"price\": 8.99\n" +
" },\n" +
" {\n" +
" \"category\": \"fiction\",\n" +
" \"author\": \"J. R. R. Tolkien\",\n" +
" \"title\": \"The Lord of the Rings\",\n" +
" \"isbn\": \"0-395-19395-8\",\n" +
" \"price\": 22.99\n" +
" }\n" +
" ],\n" +
" \"bicycle\": {\n" +
" \"color\": \"red\",\n" +
" \"price\": 19.95\n" +
" }\n" +
" },\n" +
" \"expensive\": 10\n" +
"}\n" +
" ";
JSONArray arr = JsonPath.read(json,"$..[2].author");
assertEquals(arr.get(0), "Herman Melville");
}
}
Write Preview
Loading…
Cancel
Save