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

Improved error handling and error messages in FilterCompiler.

pull/158/head
Kalle Stenflo 9 years ago
parent
0fdc030c8a
commit
d1475e1237
4 changed files with 73 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/CharacterIndex.java
  2. 51
      json-path/src/main/java/com/jayway/jsonpath/internal/filter/FilterCompiler.java
  3. 2
      json-path/src/main/java/com/jayway/jsonpath/internal/filter/RelationalOperator.java
  4. 5
      json-path/src/test/java/com/jayway/jsonpath/FilterCompilerTest.java

2
json-path/src/main/java/com/jayway/jsonpath/internal/CharacterIndex.java
Unescape View File

@ -67,6 +67,7 @@ public class CharacterIndex {
} }
return -1; return -1;
} }
public int indexOfMatchingCloseChar(int startPosition, char openChar, char closeChar, boolean skipStrings, boolean skipRegex) { public int indexOfMatchingCloseChar(int startPosition, char openChar, char closeChar, boolean skipStrings, boolean skipRegex) {
if(charAt(startPosition) != openChar){ if(charAt(startPosition) != openChar){
throw new InvalidPathException("Expected " + openChar + " but found " + charAt(startPosition)); throw new InvalidPathException("Expected " + openChar + " but found " + charAt(startPosition));
@ -136,6 +137,7 @@ public class CharacterIndex {
} }
return -1; return -1;
} }
public int indexOfClosingBracket(int startPosition, boolean skipStrings, boolean skipRegex) { public int indexOfClosingBracket(int startPosition, boolean skipStrings, boolean skipRegex) {
return indexOfMatchingCloseChar(startPosition, OPEN_PARENTHESIS, CLOSE_PARENTHESIS, skipStrings, skipRegex); return indexOfMatchingCloseChar(startPosition, OPEN_PARENTHESIS, CLOSE_PARENTHESIS, skipStrings, skipRegex);
} }

51
json-path/src/main/java/com/jayway/jsonpath/internal/filter/FilterCompiler.java
Unescape View File

@ -41,18 +41,15 @@ public class FilterCompiler {
private static final char TRUE = 't'; private static final char TRUE = 't';
private static final char FALSE = 'f'; private static final char FALSE = 'f';
private static final char NULL = 'n'; private static final char NULL = 'n';
private static final char BANG = '!'; private static final char NOT = '!';
private static final char PATTERN = '/'; private static final char PATTERN = '/';
private static final char IGNORE_CASE = 'i';
private CharacterIndex filter; private CharacterIndex filter;
public static Filter compile(String filterString) { public static Filter compile(String filterString) {
try {
FilterCompiler compiler = new FilterCompiler(filterString); FilterCompiler compiler = new FilterCompiler(filterString);
return new CompiledFilter(compiler.compile()); return new CompiledFilter(compiler.compile());
} catch (Exception e){
throw new InvalidPathException("Could not compile inline filter : " + filterString, e);
}
} }
private FilterCompiler(String filterString) { private FilterCompiler(String filterString) {
@ -73,37 +70,37 @@ public class FilterCompiler {
} }
public Predicate compile() { public Predicate compile() {
try {
Stack<LogicalOperator> opsStack = new Stack<LogicalOperator>(); Stack<LogicalOperator> opsStack = new Stack<LogicalOperator>();
Stack<ExpressionNode> expStack = new Stack<ExpressionNode>(); Stack<ExpressionNode> expStack = new Stack<ExpressionNode>();
int unbalancedBrackets = 0; int unbalancedParenthesis = 0;
while (filter.skipBlanks().inBounds()) { while (filter.skipBlanks().inBounds()) {
int pos = filter.position(); int pos = filter.position();
switch (filter.currentChar()) { switch (filter.currentChar()) {
case OPEN_PARENTHESIS: case OPEN_PARENTHESIS:
unbalancedBrackets++; unbalancedParenthesis++;
filter.incrementPosition(1); filter.incrementPosition(1);
break; break;
case CLOSE_PARENTHESIS: case CLOSE_PARENTHESIS:
unbalancedBrackets--; unbalancedParenthesis--;
filter.incrementPosition(1); filter.incrementPosition(1);
ExpressionNode expressionNode = expStack.pop(); ExpressionNode expressionNode = expStack.pop();
if(!opsStack.isEmpty()){ if (!opsStack.isEmpty()) {
if(expStack.isEmpty()){ if (expStack.isEmpty()) {
throw new InvalidPathException("Expected expression on right hand side of operator"); throw new InvalidPathException("Expected expression on right hand side of operator " + opsStack.peek().getOperatorString() + " in filter " + filter);
} }
ExpressionNode right = expStack.pop(); ExpressionNode right = expStack.pop();
expressionNode = ExpressionNode.createExpressionNode(expressionNode, opsStack.pop(), right); expressionNode = ExpressionNode.createExpressionNode(expressionNode, opsStack.pop(), right);
while(!opsStack.isEmpty()){ while (!opsStack.isEmpty()) {
expressionNode = ExpressionNode.createExpressionNode(expressionNode, opsStack.pop(), expStack.pop()); expressionNode = ExpressionNode.createExpressionNode(expressionNode, opsStack.pop(), expStack.pop());
} }
} }
expStack.push(expressionNode); expStack.push(expressionNode);
break; break;
case BANG: case NOT:
filter.incrementPosition(1); filter.incrementPosition(1);
break; break;
case OR: case OR:
@ -116,18 +113,24 @@ public class FilterCompiler {
expStack.push(relationalExpressionNode); expStack.push(relationalExpressionNode);
break; break;
} }
if(pos >= filter.position()){ if (pos >= filter.position()) {
throw new InvalidPathException("Failed to parse filter " + filter.toString()); throw new InvalidPathException("Failed to parse filter " + filter.toString());
} }
} }
if(unbalancedBrackets != 0){ if (unbalancedParenthesis != 0) {
throw new InvalidPathException("Failed to parse filter. Brackets are not balanced. " + filter.toString()); throw new InvalidPathException("Failed to parse filter. Parenthesis are not balanced. " + filter.toString());
} }
Predicate predicate = expStack.pop(); Predicate predicate = expStack.pop();
logger.trace(predicate.toString());
if (logger.isTraceEnabled()) logger.trace(predicate.toString());
return predicate; return predicate;
} catch (InvalidPathException e){
throw e;
} catch (Exception e) {
throw new InvalidPathException("Failed to parse filter: " + filter + ", error on position: " + filter.position() + ", char: " + filter.currentChar());
}
} }
private ValueNode readValueNode() { private ValueNode readValueNode() {
@ -205,7 +208,7 @@ public class FilterCompiler {
private ValueNode.NullNode readNullLiteral() { private ValueNode.NullNode readNullLiteral() {
int begin = filter.position(); int begin = filter.position();
if(filter.currentChar() == 'n' && filter.inBounds(filter.position() + 3)){ if(filter.currentChar() == NULL && filter.inBounds(filter.position() + 3)){
CharSequence nullValue = filter.subSequence(filter.position(), filter.position() + 4); CharSequence nullValue = filter.subSequence(filter.position(), filter.position() + 4);
if("null".equals(nullValue.toString())){ if("null".equals(nullValue.toString())){
logger.trace("NullLiteral from {} to {} -> [{}]", begin, filter.position()+3, nullValue); logger.trace("NullLiteral from {} to {} -> [{}]", begin, filter.position()+3, nullValue);
@ -243,7 +246,7 @@ public class FilterCompiler {
if (closingIndex == -1) { if (closingIndex == -1) {
throw new InvalidPathException("Pattern not closed. Expected " + PATTERN + " in " + filter); throw new InvalidPathException("Pattern not closed. Expected " + PATTERN + " in " + filter);
} else { } else {
if(filter.inBounds(closingIndex+1) && filter.charAt(closingIndex+1) == 'i'){ if(filter.inBounds(closingIndex+1) && filter.charAt(closingIndex+1) == IGNORE_CASE){
closingIndex++; closingIndex++;
} }
filter.setPosition(closingIndex + 1); filter.setPosition(closingIndex + 1);
@ -258,7 +261,7 @@ public class FilterCompiler {
int closingSingleQuoteIndex = filter.nextIndexOfUnescaped(endChar); int closingSingleQuoteIndex = filter.nextIndexOfUnescaped(endChar);
if (closingSingleQuoteIndex == -1) { if (closingSingleQuoteIndex == -1) {
throw new InvalidPathException("String not closed. Expected " + endChar + " in " + filter); throw new InvalidPathException("String literal does not have matching quotes. Expected " + endChar + " in " + filter);
} else { } else {
filter.setPosition(closingSingleQuoteIndex + 1); filter.setPosition(closingSingleQuoteIndex + 1);
} }
@ -280,7 +283,7 @@ public class FilterCompiler {
private ValueNode.BooleanNode readBooleanLiteral() { private ValueNode.BooleanNode readBooleanLiteral() {
int begin = filter.position(); int begin = filter.position();
int end = filter.currentChar() == 't' ? filter.position() + 3 : filter.position() + 4; int end = filter.currentChar() == TRUE ? filter.position() + 3 : filter.position() + 4;
if(!filter.inBounds(end)){ if(!filter.inBounds(end)){
throw new InvalidPathException("Expected boolean literal"); throw new InvalidPathException("Expected boolean literal");
@ -319,7 +322,7 @@ public class FilterCompiler {
} }
} }
boolean shouldExists = !(previousSignificantChar == BANG); boolean shouldExists = !(previousSignificantChar == NOT);
CharSequence path = filter.subSequence(begin, filter.position()); CharSequence path = filter.subSequence(begin, filter.position());
return ValueNode.createPathNode(path, false, shouldExists); return ValueNode.createPathNode(path, false, shouldExists);
} }
@ -359,7 +362,7 @@ public class FilterCompiler {
} }
private boolean isRelationalOperatorChar(char c) { private boolean isRelationalOperatorChar(char c) {
return c == LT || c == GT || c == EQ || c == TILDE || c == BANG; return c == LT || c == GT || c == EQ || c == TILDE || c == NOT;
} }
private static final class CompiledFilter extends Filter { private static final class CompiledFilter extends Filter {

2
json-path/src/main/java/com/jayway/jsonpath/internal/filter/RelationalOperator.java
Unescape View File

@ -33,7 +33,7 @@ public enum RelationalOperator {
return operator; return operator;
} }
} }
throw new InvalidPathException("Operator " + operatorString + " not supported "); throw new InvalidPathException("Filter operator " + operatorString + " is not supported!");
} }
@Override @Override

5
json-path/src/test/java/com/jayway/jsonpath/FilterCompilerTest.java
Unescape View File

@ -7,7 +7,6 @@ import static org.assertj.core.api.Assertions.assertThat;
public class FilterCompilerTest { public class FilterCompilerTest {
@Test @Test
public void valid_filters_compile() { public void valid_filters_compile() {
assertThat(compile("[?(@)]").toString()).isEqualTo("[?(@)]"); assertThat(compile("[?(@)]").toString()).isEqualTo("[?(@)]");
@ -60,6 +59,10 @@ public class FilterCompilerTest {
assertThat(compile("[?(@[\")]@$)]\"] == \")]@$)]\")]").toString()).isEqualTo("[?(@[\")]@$)]\"] == \")]@$)]\")]"); assertThat(compile("[?(@[\")]@$)]\"] == \")]@$)]\")]").toString()).isEqualTo("[?(@[\")]@$)]\"] == \")]@$)]\")]");
} }
@Test(expected = InvalidPathException.class)
public void invalid_path_when_string_literal_is_unquoted() {
compile("[?(@.foo == x)]");
}
@Test @Test
public void invalid_filters_does_not_compile() { public void invalid_filters_does_not_compile() {

Write Preview
Loading…
Cancel
Save