Skip to content

PR for #173 #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 18, 2016
Merged

PR for #173 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cb9b47
add test for #173
jochenberger Feb 18, 2016
4bfa932
fail when there are spaces inside array indexes
jochenberger Feb 18, 2016
f3ac1a0
fail when there are multiple commas between subscriptions
jochenberger Feb 18, 2016
7115c61
fix detection of trailing comma
jochenberger Feb 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions json-path/src/main/java/com/jayway/jsonpath/internal/path/ArrayIndexOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;

import static java.lang.Character.isDigit;

public class ArrayIndexOperation {

private final static Pattern COMMA = Pattern.compile("\\s*,\\s*");

private final List<Integer> indexes;

private ArrayIndexOperation(List<Integer> indexes) {
Expand Down Expand Up @@ -39,13 +42,13 @@ public static ArrayIndexOperation parse(String operation) {
//check valid chars
for (int i = 0; i < operation.length(); i++) {
char c = operation.charAt(i);
if (!isDigit(c) && c != ',') {
if (!isDigit(c) && c != ',' && c != ' ') {
throw new InvalidPathException("Failed to parse ArrayIndexOperation: " + operation);
}
}
String[] tokens = operation.split(",");
String[] tokens = COMMA.split(operation, -1);

List<Integer> tempIndexes = new ArrayList<Integer>();
List<Integer> tempIndexes = new ArrayList<Integer>(tokens.length);
for (String token : tokens) {
tempIndexes.add(parseInteger(token));
}
Expand Down
14 changes: 12 additions & 2 deletions json-path/src/main/java/com/jayway/jsonpath/internal/path/PathCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ private boolean readArrayToken(PathTokenAppender appender) {
return false;
}

String expression = path.subSequence(expressionBeginIndex, expressionEndIndex).toString().replace(" ", "");
String expression = path.subSequence(expressionBeginIndex, expressionEndIndex).toString().trim();

if ("*".equals(expression)) {
return false;
Expand All @@ -521,7 +521,7 @@ private boolean readArrayToken(PathTokenAppender appender) {
//check valid chars
for (int i = 0; i < expression.length(); i++) {
char c = expression.charAt(i);
if (!isDigit(c) && c != COMMA && c != MINUS && c != SPLIT) {
if (!isDigit(c) && c != COMMA && c != MINUS && c != SPLIT && c != SPACE) {
return false;
}
}
Expand Down Expand Up @@ -560,6 +560,7 @@ private boolean readBracketPropertyToken(PathTokenAppender appender) {
int endPosition = 0;
boolean inProperty = false;
boolean inEscape = false;
boolean lastSignificantWasComma = false;

while (path.inBounds(readPosition)) {
char c = path.charAt(readPosition);
Expand All @@ -569,6 +570,9 @@ private boolean readBracketPropertyToken(PathTokenAppender appender) {
} else if('\\' == c){
inEscape = true;
} else if (c == CLOSE_SQUARE_BRACKET && !inProperty) {
if (lastSignificantWasComma){
fail("Found empty property at index "+readPosition);
}
break;
} else if (c == potentialStringDelimiter) {
if (inProperty && !inEscape) {
Expand All @@ -579,7 +583,13 @@ private boolean readBracketPropertyToken(PathTokenAppender appender) {
} else {
startPosition = readPosition + 1;
inProperty = true;
lastSignificantWasComma = false;
}
} else if (c == COMMA){
if (lastSignificantWasComma){
fail("Found empty property at index "+readPosition);
}
lastSignificantWasComma = true;
}
readPosition++;
}
Expand Down
15 changes: 15 additions & 0 deletions json-path/src/test/java/com/jayway/jsonpath/PathCompilerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,19 @@ public void issue_predicate_can_have_square_bracket_in_prop() {

assertThat(result).containsExactly("] it");
}

@Test(expected = InvalidPathException.class)
public void array_indexes_must_be_separated_by_commas() {
compile("$[0, 1, 2 4]");
}

@Test(expected = InvalidPathException.class)
public void trailing_comma_after_list_is_not_accepted() {
compile("$['1','2',]");
}

@Test(expected = InvalidPathException.class)
public void accept_only_a_single_comma_between_indexes() {
compile("$['1', ,'3']");
}
}