T notEmpty(T chars, String message) {
+ if (chars == null || chars.length() == 0) {
+ throw new IllegalArgumentException(message);
+ }
+ return chars;
+ }
+
+ /**
+ * Validate that the specified argument character sequence is
+ * neither {@code null} nor a length of zero (no characters);
+ * otherwise throwing an exception with the specified message.
+ *
+ * Validate.notEmpty(myString, "The string must not be empty");
+ *
+ * @param bytes the bytes to check, validated not null by this method
+ * @param message the {@link String#format(String, Object...)} exception message if invalid, not null
+ * @return the validated character sequence (never {@code null} method for chaining)
+ * @throws NullPointerException if the character sequence is {@code null}
+ * @throws IllegalArgumentException if the character sequence is empty
+ */
+ public static byte[] notEmpty(byte[] bytes, String message) {
+ if (bytes == null || bytes.length == 0) {
+ throw new IllegalArgumentException(message);
+ }
+ return bytes;
+ }
+
/**
* Validate that the specified argument character sequence is
* neither {@code null} nor a length of zero (no characters);
@@ -379,10 +439,7 @@ public static boolean onlyOneIsTrueNonThrow(final boolean... expressions) {
* @throws IllegalArgumentException if the character sequence is empty
*/
public static T notEmpty(T chars, String message, Object... values) {
- if (chars == null) {
- throw new IllegalArgumentException(String.format(message, values));
- }
- if (chars.length() == 0) {
+ if (chars == null || chars.length() == 0) {
throw new IllegalArgumentException(String.format(message, values));
}
return chars;
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
old mode 100644
new mode 100755
index ac47274a7..322a17198
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
@@ -4,7 +4,12 @@
import com.jayway.jsonpath.Predicate;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
+import java.util.regex.Pattern;
+
+import static com.jayway.jsonpath.internal.filter.ValueNodes.PatternNode;
+import static com.jayway.jsonpath.internal.filter.ValueNodes.ValueListNode;
public class EvaluatorFactory {
@@ -30,6 +35,8 @@ public class EvaluatorFactory {
evaluators.put(RelationalOperator.MATCHES, new PredicateMatchEvaluator());
evaluators.put(RelationalOperator.TYPE, new TypeEvaluator());
evaluators.put(RelationalOperator.SUBSETOF, new SubsetOfEvaluator());
+ evaluators.put(RelationalOperator.ANYOF, new AnyOfEvaluator());
+ evaluators.put(RelationalOperator.NONEOF, new NoneOfEvaluator());
}
public static Evaluator createEvaluator(RelationalOperator operator){
@@ -95,6 +102,8 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) < 0;
} if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) < 0;
+ } if (left.isOffsetDateTimeNode() && right.isOffsetDateTimeNode()){ //workaround for issue: https://github.com/json-path/JsonPath/issues/613
+ return left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) < 0;
}
return false;
}
@@ -107,6 +116,8 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) <= 0;
} if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) <= 0;
+ } if (left.isOffsetDateTimeNode() && right.isOffsetDateTimeNode()){ //workaround for issue: https://github.com/json-path/JsonPath/issues/613
+ return left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) <= 0;
}
return false;
}
@@ -119,6 +130,8 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) > 0;
} else if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) > 0;
+ } else if (left.isOffsetDateTimeNode() && right.isOffsetDateTimeNode()){ //workaround for issue: https://github.com/json-path/JsonPath/issues/613
+ return left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) > 0;
}
return false;
}
@@ -131,6 +144,8 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) >= 0;
} else if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) >= 0;
+ } else if (left.isOffsetDateTimeNode() && right.isOffsetDateTimeNode()){ //workaround for issue: https://github.com/json-path/JsonPath/issues/613
+ return left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) >= 0;
}
return false;
}
@@ -168,7 +183,7 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
private static class InEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
- ValueNode.ValueListNode valueListNode;
+ ValueListNode valueListNode;
if(right.isJsonNode()){
ValueNode vn = right.asJsonNode().asValueListNode(ctx);
if(vn.isUndefinedNode()){
@@ -193,12 +208,12 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
private static class AllEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
- ValueNode.ValueListNode requiredValues = right.asValueListNode();
+ ValueListNode requiredValues = right.asValueListNode();
if(left.isJsonNode()){
ValueNode valueNode = left.asJsonNode().asValueListNode(ctx); //returns UndefinedNode if conversion is not possible
if(valueNode.isValueListNode()){
- ValueNode.ValueListNode shouldContainAll = valueNode.asValueListNode();
+ ValueListNode shouldContainAll = valueNode.asValueListNode();
for (ValueNode required : requiredValues) {
if(!shouldContainAll.contains(required)){
return false;
@@ -243,16 +258,41 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
}
if (left.isPatternNode()) {
- return matches(left.asPatternNode(), getInput(right));
+ if (right.isValueListNode() || (right.isJsonNode() && right.asJsonNode().isArray(ctx))) {
+ return matchesAny(left.asPatternNode(), right.asJsonNode().asValueListNode(ctx));
+ } else {
+ return matches(left.asPatternNode(), getInput(right));
+ }
} else {
- return matches(right.asPatternNode(), getInput(left));
+ if (left.isValueListNode() || (left.isJsonNode() && left.asJsonNode().isArray(ctx))) {
+ return matchesAny(right.asPatternNode(), left.asJsonNode().asValueListNode(ctx));
+ } else {
+ return matches(right.asPatternNode(), getInput(left));
+ }
}
}
- private boolean matches(ValueNode.PatternNode patternNode, String inputToMatch) {
+ private boolean matches(PatternNode patternNode, String inputToMatch) {
return patternNode.getCompiledPattern().matcher(inputToMatch).matches();
}
+ private boolean matchesAny(PatternNode patternNode, ValueNode valueNode) {
+ if (!valueNode.isValueListNode()) {
+ return false;
+ }
+
+ ValueListNode listNode = valueNode.asValueListNode();
+ Pattern pattern = patternNode.getCompiledPattern();
+
+ for (Iterator it = listNode.iterator(); it.hasNext(); ) {
+ String input = getInput(it.next());
+ if (pattern.matcher(input).matches()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private String getInput(ValueNode valueNode) {
String input = "";
@@ -269,7 +309,7 @@ private String getInput(ValueNode valueNode) {
private static class SubsetOfEvaluator implements Evaluator {
@Override
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
- ValueNode.ValueListNode rightValueListNode;
+ ValueListNode rightValueListNode;
if(right.isJsonNode()){
ValueNode vn = right.asJsonNode().asValueListNode(ctx);
if(vn.isUndefinedNode()){
@@ -280,7 +320,7 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
} else {
rightValueListNode = right.asValueListNode();
}
- ValueNode.ValueListNode leftValueListNode;
+ ValueListNode leftValueListNode;
if(left.isJsonNode()){
ValueNode vn = left.asJsonNode().asValueListNode(ctx);
if(vn.isUndefinedNode()){
@@ -295,4 +335,77 @@ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateCont
}
}
+ private static class AnyOfEvaluator implements Evaluator {
+ @Override
+ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
+ ValueListNode rightValueListNode;
+ if (right.isJsonNode()) {
+ ValueNode vn = right.asJsonNode().asValueListNode(ctx);
+ if (vn.isUndefinedNode()) {
+ return false;
+ } else {
+ rightValueListNode = vn.asValueListNode();
+ }
+ } else {
+ rightValueListNode = right.asValueListNode();
+ }
+ ValueListNode leftValueListNode;
+ if (left.isJsonNode()) {
+ ValueNode vn = left.asJsonNode().asValueListNode(ctx);
+ if (vn.isUndefinedNode()) {
+ return false;
+ } else {
+ leftValueListNode = vn.asValueListNode();
+ }
+ } else {
+ leftValueListNode = left.asValueListNode();
+ }
+
+ for (ValueNode leftValueNode : leftValueListNode) {
+ for (ValueNode rightValueNode : rightValueListNode) {
+ if (leftValueNode.equals(rightValueNode)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
+
+ private static class NoneOfEvaluator implements Evaluator {
+ @Override
+ public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
+ ValueListNode rightValueListNode;
+ if (right.isJsonNode()) {
+ ValueNode vn = right.asJsonNode().asValueListNode(ctx);
+ if (vn.isUndefinedNode()) {
+ return false;
+ } else {
+ rightValueListNode = vn.asValueListNode();
+ }
+ } else {
+ rightValueListNode = right.asValueListNode();
+ }
+ ValueListNode leftValueListNode;
+ if (left.isJsonNode()) {
+ ValueNode vn = left.asJsonNode().asValueListNode(ctx);
+ if (vn.isUndefinedNode()) {
+ return false;
+ } else {
+ leftValueListNode = vn.asValueListNode();
+ }
+ } else {
+ leftValueListNode = left.asValueListNode();
+ }
+
+ for (ValueNode leftValueNode : leftValueListNode) {
+ for (ValueNode rightValueNode : rightValueListNode) {
+ if (leftValueNode.equals(rightValueNode)) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+ }
}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/FilterCompiler.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/FilterCompiler.java
index 67b512e41..ecec37091 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/FilterCompiler.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/FilterCompiler.java
@@ -4,13 +4,14 @@
import com.jayway.jsonpath.InvalidPathException;
import com.jayway.jsonpath.Predicate;
import com.jayway.jsonpath.internal.CharacterIndex;
+import static com.jayway.jsonpath.internal.filter.ValueNodes.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
-public class FilterCompiler {
+public class FilterCompiler {
private static final Logger logger = LoggerFactory.getLogger(FilterCompiler.class);
private static final char DOC_CONTEXT = '$';
@@ -132,11 +133,9 @@ private ExpressionNode readLogicalOR() {
while (true) {
int savepoint = filter.position();
- try {
- filter.readSignificantSubSequence(LogicalOperator.OR.getOperatorString());
+ if (filter.hasSignificantSubSequence(LogicalOperator.OR.getOperatorString())) {
ops.add(readLogicalAND());
- }
- catch (InvalidPathException exc) {
+ } else {
filter.setPosition(savepoint);
break;
}
@@ -152,11 +151,9 @@ private ExpressionNode readLogicalAND() {
while (true) {
int savepoint = filter.position();
- try {
- filter.readSignificantSubSequence(LogicalOperator.AND.getOperatorString());
+ if (filter.hasSignificantSubSequence(LogicalOperator.AND.getOperatorString())) {
ops.add(readLogicalANDOperand());
- }
- catch (InvalidPathException exc) {
+ } else {
filter.setPosition(savepoint);
break;
}
@@ -201,10 +198,10 @@ private RelationalExpressionNode readExpression() {
filter.setPosition(savepoint);
}
- ValueNode.PathNode pathNode = left.asPathNode();
+ PathNode pathNode = left.asPathNode();
left = pathNode.asExistsCheck(pathNode.shouldExists());
RelationalOperator operator = RelationalOperator.EXISTS;
- ValueNode right = left.asPathNode().shouldExists() ? ValueNode.TRUE : ValueNode.FALSE;
+ ValueNode right = left.asPathNode().shouldExists() ? ValueNodes.TRUE : ValueNodes.FALSE;
return new RelationalExpressionNode(left, operator, right);
}
@@ -243,7 +240,7 @@ private RelationalOperator readRelationalOperator() {
return RelationalOperator.fromString(operator.toString());
}
- private ValueNode.NullNode readNullLiteral() {
+ private NullNode readNullLiteral() {
int begin = filter.position();
if(filter.currentChar() == NULL && filter.inBounds(filter.position() + 3)){
CharSequence nullValue = filter.subSequence(filter.position(), filter.position() + 4);
@@ -256,7 +253,7 @@ private ValueNode.NullNode readNullLiteral() {
throw new InvalidPathException("Expected value");
}
- private ValueNode.JsonNode readJsonLiteral(){
+ private JsonNode readJsonLiteral(){
int begin = filter.position();
char openChar = filter.currentChar();
@@ -277,14 +274,32 @@ private ValueNode.JsonNode readJsonLiteral(){
}
- private ValueNode.PatternNode readPattern() {
+ private int endOfFlags(int position) {
+ int endIndex = position;
+ char[] currentChar = new char[1];
+ while (filter.inBounds(endIndex)) {
+ currentChar[0] = filter.charAt(endIndex);
+ if (PatternFlag.parseFlags(currentChar) > 0) {
+ endIndex++;
+ continue;
+ }
+ break;
+ }
+ return endIndex;
+ }
+
+ private PatternNode readPattern() {
int begin = filter.position();
int closingIndex = filter.nextIndexOfUnescaped(PATTERN);
if (closingIndex == -1) {
throw new InvalidPathException("Pattern not closed. Expected " + PATTERN + " in " + filter);
} else {
- if(filter.inBounds(closingIndex+1) && filter.charAt(closingIndex+1) == IGNORE_CASE){
- closingIndex++;
+ if (filter.inBounds(closingIndex+1)) {
+ int endFlagsIndex = endOfFlags(closingIndex + 1);
+ if (endFlagsIndex > closingIndex) {
+ CharSequence flags = filter.subSequence(closingIndex + 1, endFlagsIndex);
+ closingIndex += flags.length();
+ }
}
filter.setPosition(closingIndex + 1);
}
@@ -293,7 +308,7 @@ private ValueNode.PatternNode readPattern() {
return ValueNode.createPatternNode(pattern);
}
- private ValueNode.StringNode readStringLiteral(char endChar) {
+ private StringNode readStringLiteral(char endChar) {
int begin = filter.position();
int closingSingleQuoteIndex = filter.nextIndexOfUnescaped(endChar);
@@ -307,7 +322,7 @@ private ValueNode.StringNode readStringLiteral(char endChar) {
return ValueNode.createStringNode(stringLiteral, true);
}
- private ValueNode.NumberNode readNumberLiteral() {
+ private NumberNode readNumberLiteral() {
int begin = filter.position();
while (filter.inBounds() && filter.isNumberCharacter(filter.position())) {
@@ -318,7 +333,7 @@ private ValueNode.NumberNode readNumberLiteral() {
return ValueNode.createNumberNode(numberLiteral);
}
- private ValueNode.BooleanNode readBooleanLiteral() {
+ private BooleanNode readBooleanLiteral() {
int begin = filter.position();
int end = filter.currentChar() == TRUE ? filter.position() + 3 : filter.position() + 4;
@@ -335,7 +350,7 @@ private ValueNode.BooleanNode readBooleanLiteral() {
return ValueNode.createBooleanNode(boolValue);
}
- private ValueNode.PathNode readPath() {
+ private PathNode readPath() {
char previousSignificantChar = filter.previousSignificantChar();
int begin = filter.position();
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/PatternFlag.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/PatternFlag.java
new file mode 100644
index 000000000..3ac051288
--- /dev/null
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/PatternFlag.java
@@ -0,0 +1,48 @@
+package com.jayway.jsonpath.internal.filter;
+
+import java.util.regex.Pattern;
+
+public enum PatternFlag {
+ UNIX_LINES(Pattern.UNIX_LINES, 'd'),
+ CASE_INSENSITIVE(Pattern.CASE_INSENSITIVE, 'i'),
+ COMMENTS(Pattern.COMMENTS, 'x'),
+ MULTILINE(Pattern.MULTILINE, 'm'),
+ DOTALL(Pattern.DOTALL, 's'),
+ UNICODE_CASE(Pattern.UNICODE_CASE, 'u'),
+ UNICODE_CHARACTER_CLASS(Pattern.UNICODE_CHARACTER_CLASS, 'U');
+
+ private final int code;
+ private final char flag;
+
+ private PatternFlag(int code, char flag) {
+ this.code = code;
+ this.flag = flag;
+ }
+
+ public static int parseFlags(char[] flags) {
+ int flagsValue = 0;
+ for (char flag : flags) {
+ flagsValue |= getCodeByFlag(flag);
+ }
+ return flagsValue;
+ }
+
+ public static String parseFlags(int flags) {
+ StringBuilder builder = new StringBuilder();
+ for (PatternFlag patternFlag : PatternFlag.values()) {
+ if ((patternFlag.code & flags) == patternFlag.code) {
+ builder.append(patternFlag.flag);
+ }
+ }
+ return builder.toString();
+ }
+
+ private static int getCodeByFlag(char flag) {
+ for (PatternFlag patternFlag : PatternFlag.values()) {
+ if (patternFlag.flag == flag) {
+ return patternFlag.code;
+ }
+ }
+ return 0;
+ }
+}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/RelationalOperator.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/RelationalOperator.java
index 830cc3bb3..509869450 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/RelationalOperator.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/RelationalOperator.java
@@ -2,6 +2,8 @@
import com.jayway.jsonpath.InvalidPathException;
+import java.util.Locale;
+
public enum RelationalOperator {
GTE(">="),
@@ -30,7 +32,9 @@ public enum RelationalOperator {
TYPE("TYPE"),
MATCHES("MATCHES"),
EMPTY("EMPTY"),
- SUBSETOF("SUBSETOF");
+ SUBSETOF("SUBSETOF"),
+ ANYOF("ANYOF"),
+ NONEOF("NONEOF");
private final String operatorString;
@@ -38,9 +42,10 @@ public enum RelationalOperator {
this.operatorString = operatorString;
}
- public static RelationalOperator fromString(String operatorString){
+ public static RelationalOperator fromString(String operatorString) {
+ String upperCaseOperatorString = operatorString.toUpperCase(Locale.ROOT);
for (RelationalOperator operator : RelationalOperator.values()) {
- if(operator.operatorString.equals(operatorString.toUpperCase()) ){
+ if(operator.operatorString.equals(upperCaseOperatorString) ){
return operator;
}
}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
index 5135f848a..cdf0dd97f 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNode.java
@@ -1,39 +1,18 @@
package com.jayway.jsonpath.internal.filter;
-import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.InvalidPathException;
import com.jayway.jsonpath.JsonPathException;
-import com.jayway.jsonpath.Option;
-import com.jayway.jsonpath.PathNotFoundException;
import com.jayway.jsonpath.Predicate;
import com.jayway.jsonpath.internal.Path;
-import com.jayway.jsonpath.internal.Utils;
import com.jayway.jsonpath.internal.path.PathCompiler;
-import com.jayway.jsonpath.internal.path.PredicateContextImpl;
-import com.jayway.jsonpath.spi.json.JsonProvider;
-
import net.minidev.json.parser.JSONParser;
-import net.minidev.json.parser.ParseException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-public abstract class ValueNode {
+import java.time.OffsetDateTime;
+import java.util.regex.Pattern;
- public static final NullNode NULL_NODE = new NullNode();
- public static final BooleanNode TRUE = new BooleanNode("true");
- public static final BooleanNode FALSE = new BooleanNode("false");
- public static final UndefinedNode UNDEFINED = new UndefinedNode();
+import static com.jayway.jsonpath.internal.filter.ValueNodes.*;
+public abstract class ValueNode {
public abstract Class type(Predicate.PredicateContext ctx);
@@ -125,6 +104,16 @@ public ClassNode asClassNode() {
throw new InvalidPathException("Expected class node");
}
+ //workaround for issue: https://github.com/json-path/JsonPath/issues/613
+ public boolean isOffsetDateTimeNode(){
+ return false;
+ }
+
+ public OffsetDateTimeNode asOffsetDateTimeNode(){
+ throw new InvalidPathException("Expected offsetDateTime node");
+ }
+
+
private static boolean isPath(Object o) {
if(o == null || !(o instanceof String)){
return false;
@@ -174,7 +163,8 @@ private static boolean isJson(Object o) {
//
//----------------------------------------------------
public static ValueNode toValueNode(Object o){
- if(o == null) return ValueNode.NULL_NODE;
+
+ if(o == null) return NULL_NODE;
if(o instanceof ValueNode) return (ValueNode)o;
if(o instanceof Class) return createClassNode((Class)o);
else if(isPath(o)) return new PathNode(o.toString(), false, false);
@@ -184,7 +174,9 @@ public static ValueNode toValueNode(Object o){
else if(o instanceof Number) return createNumberNode(o.toString());
else if(o instanceof Boolean) return createBooleanNode(o.toString());
else if(o instanceof Pattern) return createPatternNode((Pattern)o);
+ else if (o instanceof OffsetDateTime) return createOffsetDateTimeNode(o.toString()); //workaround for issue: https://github.com/json-path/JsonPath/issues/613
else throw new JsonPathException("Could not determine value type");
+
}
public static StringNode createStringNode(CharSequence charSequence, boolean escape){
@@ -223,6 +215,12 @@ public static PatternNode createPatternNode(Pattern pattern) {
return new PatternNode(pattern);
}
+ //workaround for issue: https://github.com/json-path/JsonPath/issues/613
+ public static OffsetDateTimeNode createOffsetDateTimeNode(CharSequence charSequence){
+ return new OffsetDateTimeNode(charSequence);
+ }
+
+
public static UndefinedNode createUndefinedNode() {
return UNDEFINED;
}
@@ -235,624 +233,6 @@ public static ValueNode createPathNode(Path path) {
return new PathNode(path);
}
- //----------------------------------------------------
- //
- // ValueNode Implementations
- //
- //----------------------------------------------------
- public static class PatternNode extends ValueNode {
- private final String pattern;
- private final Pattern compiledPattern;
-
- private PatternNode(CharSequence charSequence) {
- String tmp = charSequence.toString();
- int begin = tmp.indexOf('/');
- int end = tmp.lastIndexOf('/');
- int flags = tmp.endsWith("/i") ? Pattern.CASE_INSENSITIVE : 0;
- this.pattern = tmp.substring(begin + 1, end);
- this.compiledPattern = Pattern.compile(pattern, flags);
- }
-
- public PatternNode(Pattern pattern) {
- this.pattern = pattern.pattern();
- this.compiledPattern = pattern;
- }
-
-
- public Pattern getCompiledPattern() {
- return compiledPattern;
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return Void.TYPE;
- }
-
- public boolean isPatternNode() {
- return true;
- }
-
- public PatternNode asPatternNode() {
- return this;
- }
-
- @Override
- public String toString() {
-
- String flags = "";
- if((compiledPattern.flags() & Pattern.CASE_INSENSITIVE) == Pattern.CASE_INSENSITIVE){
- flags = "i";
- }
- if(!pattern.startsWith("/")){
- return "/" + pattern + "/" + flags;
- } else {
- return pattern;
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof PatternNode)) return false;
-
- PatternNode that = (PatternNode) o;
-
- return !(compiledPattern != null ? !compiledPattern.equals(that.compiledPattern) : that.compiledPattern != null);
-
- }
- }
-
- public static class JsonNode extends ValueNode {
- private final Object json;
- private final boolean parsed;
-
- private JsonNode(CharSequence charSequence) {
- json = charSequence.toString();
- parsed = false;
- }
-
- public JsonNode(Object parsedJson) {
- json = parsedJson;
- parsed = true;
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- if(isArray(ctx)) return List.class;
- else if(isMap(ctx)) return Map.class;
- else if(parse(ctx) instanceof Number) return Number.class;
- else if(parse(ctx) instanceof String) return String.class;
- else if(parse(ctx) instanceof Boolean) return Boolean.class;
- else return Void.class;
- }
-
- public boolean isJsonNode() {
- return true;
- }
-
- public JsonNode asJsonNode() {
- return this;
- }
-
- public ValueNode asValueListNode(Predicate.PredicateContext ctx){
- if(!isArray(ctx)){
- return UNDEFINED;
- } else {
- return new ValueListNode(Collections.unmodifiableList((List) parse(ctx)));
- }
- }
-
- public Object parse(Predicate.PredicateContext ctx){
- try {
- return parsed ? json : new JSONParser(JSONParser.MODE_PERMISSIVE).parse(json.toString());
- } catch (ParseException e) {
- throw new IllegalArgumentException(e);
- }
- }
-
- public boolean isParsed() {
- return parsed;
- }
-
- public Object getJson() {
- return json;
- }
-
- public boolean isArray(Predicate.PredicateContext ctx) {
- return ctx.configuration().jsonProvider().isArray(parse(ctx));
- }
-
- public boolean isMap(Predicate.PredicateContext ctx) {
- return ctx.configuration().jsonProvider().isMap(parse(ctx));
- }
-
- public int length(Predicate.PredicateContext ctx) {
- return isArray(ctx) ? ctx.configuration().jsonProvider().length(parse(ctx)) : -1;
- }
-
- public boolean isEmpty(Predicate.PredicateContext ctx) {
- if (isArray(ctx) || isMap(ctx)) return ctx.configuration().jsonProvider().length(parse(ctx)) == 0;
- else if((parse(ctx) instanceof String)) return ((String)parse(ctx)).length() == 0;
- return true;
- }
-
- @Override
- public String toString() {
- return json.toString();
- }
-
- public boolean equals(JsonNode jsonNode, Predicate.PredicateContext ctx) {
- if (this == jsonNode) return true;
- return !(json != null ? !json.equals(jsonNode.parse(ctx)) : jsonNode.json != null);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof JsonNode)) return false;
-
- JsonNode jsonNode = (JsonNode) o;
-
- return !(json != null ? !json.equals(jsonNode.json) : jsonNode.json != null);
- }
- }
-
- public static class StringNode extends ValueNode {
- private final String string;
- private boolean useSingleQuote = true;
-
- private StringNode(CharSequence charSequence, boolean escape) {
- if(charSequence.length() > 1){
- char open = charSequence.charAt(0);
- char close = charSequence.charAt(charSequence.length()-1);
-
- if(open == '\'' && close == '\''){
- charSequence = charSequence.subSequence(1, charSequence.length()-1);
- } else if(open == '"' && close == '"'){
- charSequence = charSequence.subSequence(1, charSequence.length()-1);
- useSingleQuote = false;
- }
- }
- string = escape ? Utils.unescape(charSequence.toString()) : charSequence.toString();
- }
-
- @Override
- public NumberNode asNumberNode() {
- BigDecimal number = null;
- try {
- number = new BigDecimal(string);
- } catch (NumberFormatException nfe){
- return NumberNode.NAN;
- }
- return new NumberNode(number);
- }
-
- public String getString() {
- return string;
- }
-
- public int length(){
- return getString().length();
- }
-
- public boolean isEmpty(){
- return getString().isEmpty();
- }
-
- public boolean contains(String str) {
- return getString().contains(str);
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return String.class;
- }
-
- public boolean isStringNode() {
- return true;
- }
-
- public StringNode asStringNode() {
- return this;
- }
-
- @Override
- public String toString() {
- String quote = useSingleQuote ? "'" : "\"";
- return quote + Utils.escape(string, true) + quote;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof StringNode) && !(o instanceof NumberNode)) return false;
-
- StringNode that = ((ValueNode) o).asStringNode();
-
- return !(string != null ? !string.equals(that.getString()) : that.getString() != null);
-
- }
- }
-
- public static class NumberNode extends ValueNode {
-
- public static NumberNode NAN = new NumberNode((BigDecimal)null);
-
- private final BigDecimal number;
-
- private NumberNode(BigDecimal number) {
- this.number = number;
- }
- private NumberNode(CharSequence num) {
- number = new BigDecimal(num.toString());
- }
-
- @Override
- public StringNode asStringNode() {
- return new StringNode(number.toString(), false);
- }
-
- public BigDecimal getNumber() {
- return number;
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return Number.class;
- }
-
- public boolean isNumberNode() {
- return true;
- }
-
- public NumberNode asNumberNode() {
- return this;
- }
-
- @Override
- public String toString() {
- return number.toString();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof NumberNode) && !(o instanceof StringNode)) return false;
-
- NumberNode that = ((ValueNode)o).asNumberNode();
-
- if(that == NumberNode.NAN){
- return false;
- } else {
- return number.compareTo(that.number) == 0;
- }
- }
- }
- public static class BooleanNode extends ValueNode {
- private final Boolean value;
-
- private BooleanNode(CharSequence boolValue) {
- value = Boolean.parseBoolean(boolValue.toString());
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return Boolean.class;
- }
-
- public boolean isBooleanNode() {
- return true;
- }
-
- public BooleanNode asBooleanNode() {
- return this;
- }
-
- public boolean getBoolean() {
- return value;
- }
-
- @Override
- public String toString() {
- return value.toString();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof BooleanNode)) return false;
-
- BooleanNode that = (BooleanNode) o;
-
- return !(value != null ? !value.equals(that.value) : that.value != null);
- }
- }
-
- public static class ClassNode extends ValueNode {
- private final Class clazz;
-
- private ClassNode(Class clazz) {
- this.clazz = clazz;
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return Class.class;
- }
-
- public boolean isClassNode() {
- return true;
- }
-
- public ClassNode asClassNode() {
- return this;
- }
-
- public Class getClazz() {
- return clazz;
- }
-
- @Override
- public String toString() {
- return clazz.getName();
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof ClassNode)) return false;
-
- ClassNode that = (ClassNode) o;
-
- return !(clazz != null ? !clazz.equals(that.clazz) : that.clazz != null);
- }
- }
-
- public static class NullNode extends ValueNode {
-
- private NullNode() {}
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return Void.class;
- }
-
- @Override
- public boolean isNullNode() {
- return true;
- }
-
- @Override
- public NullNode asNullNode() {
- return this;
- }
-
- @Override
- public String toString() {
- return "null";
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof NullNode)) return false;
-
- return true;
- }
- }
-
- public static class UndefinedNode extends ValueNode {
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return Void.class;
- }
-
- public UndefinedNode asUndefinedNode() {
- return this;
- }
-
- public boolean isUndefinedNode() {
- return true;
- }
-
- @Override
- public boolean equals(Object o) {
- return false;
- }
- }
-
- public static class PredicateNode extends ValueNode {
-
- private final Predicate predicate;
-
- public PredicateNode(Predicate predicate) {
- this.predicate = predicate;
- }
-
- public Predicate getPredicate() {
- return predicate;
- }
-
- public PredicateNode asPredicateNode() {
- return this;
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return Void.class;
- }
-
- public boolean isPredicateNode() {
- return true;
- }
-
- @Override
- public boolean equals(Object o) {
- return false;
- }
-
- @Override
- public String toString() {
- return predicate.toString();
- }
- }
-
- public static class ValueListNode extends ValueNode implements Iterable {
-
- private List nodes = new ArrayList();
-
- public ValueListNode(Collection values) {
- for (Object value : values) {
- nodes.add(toValueNode(value));
- }
- }
-
- public boolean contains(ValueNode node){
- return nodes.contains(node);
- }
-
- public boolean subsetof(ValueListNode right) {
- for (ValueNode leftNode : nodes) {
- if (!right.nodes.contains(leftNode)) {
- return false;
- }
- }
- return true;
- }
-
- public List getNodes() {
- return Collections.unmodifiableList(nodes);
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return List.class;
- }
-
- public boolean isValueListNode() {
- return true;
- }
-
- public ValueListNode asValueListNode() {
- return this;
- }
-
- @Override
- public String toString() {
- return "[" + Utils.join(",", nodes) + "]";
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof ValueListNode)) return false;
-
- ValueListNode that = (ValueListNode) o;
-
- return !(that != null ? !nodes.equals(that.nodes) : that.nodes != null);
- }
-
- @Override
- public Iterator iterator() {
- return nodes.iterator();
- }
- }
-
- public static class PathNode extends ValueNode {
-
- private static final Logger logger = LoggerFactory.getLogger(PathNode.class);
-
- private final Path path;
- private final boolean existsCheck;
- private final boolean shouldExist;
-
- PathNode(Path path) {
- this(path, false, false);
- }
-
- PathNode(CharSequence charSequence, boolean existsCheck, boolean shouldExist) {
- this(PathCompiler.compile(charSequence.toString()), existsCheck, shouldExist);
- }
-
- PathNode(Path path, boolean existsCheck, boolean shouldExist) {
- this.path = path;
- this.existsCheck = existsCheck;
- this.shouldExist = shouldExist;
- logger.trace("PathNode {} existsCheck: {}", path, existsCheck);
- }
-
- public Path getPath() {
- return path;
- }
-
- public boolean isExistsCheck() {
- return existsCheck;
- }
-
- public boolean shouldExists() {
- return shouldExist;
- }
-
- @Override
- public Class type(Predicate.PredicateContext ctx) {
- return Void.class;
- }
-
- public boolean isPathNode() {
- return true;
- }
-
- public PathNode asPathNode() {
- return this;
- }
-
- public PathNode asExistsCheck(boolean shouldExist) {
- return new PathNode(path, true, shouldExist);
- }
-
- @Override
- public String toString() {
- return existsCheck && ! shouldExist ? Utils.concat("!" , path.toString()) : path.toString();
- }
-
- public ValueNode evaluate(Predicate.PredicateContext ctx) {
- if (isExistsCheck()) {
- try {
- Configuration c = Configuration.builder().jsonProvider(ctx.configuration().jsonProvider()).options(Option.REQUIRE_PROPERTIES).build();
- Object result = path.evaluate(ctx.item(), ctx.root(), c).getValue(false);
- return result == JsonProvider.UNDEFINED ? ValueNode.FALSE : ValueNode.TRUE;
- } catch (PathNotFoundException e) {
- return ValueNode.FALSE;
- }
- } else {
- try {
- Object res;
- if (ctx instanceof PredicateContextImpl) {
- //This will use cache for document ($) queries
- PredicateContextImpl ctxi = (PredicateContextImpl) ctx;
- res = ctxi.evaluate(path);
- } else {
- Object doc = path.isRootPath() ? ctx.root() : ctx.item();
- res = path.evaluate(doc, ctx.root(), ctx.configuration()).getValue();
- }
- res = ctx.configuration().jsonProvider().unwrap(res);
-
- if (res instanceof Number) return ValueNode.createNumberNode(res.toString());
- else if (res instanceof BigDecimal) return ValueNode.createNumberNode(res.toString());
- else if (res instanceof String) return ValueNode.createStringNode(res.toString(), false);
- else if (res instanceof Boolean) return ValueNode.createBooleanNode(res.toString());
- else if (res == null) return ValueNode.NULL_NODE;
- else if (ctx.configuration().jsonProvider().isArray(res)) return ValueNode.createJsonNode(res);
- else if (ctx.configuration().jsonProvider().isMap(res)) return ValueNode.createJsonNode(res);
- else throw new JsonPathException("Could not convert " + res.toString() + " to a ValueNode");
- } catch (PathNotFoundException e) {
- return ValueNode.UNDEFINED;
- }
- }
- }
-
-
- }
}
+
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNodes.java b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNodes.java
new file mode 100644
index 000000000..3f459a8c1
--- /dev/null
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/filter/ValueNodes.java
@@ -0,0 +1,712 @@
+package com.jayway.jsonpath.internal.filter;
+
+import java.math.BigDecimal;
+import java.time.OffsetDateTime;
+import java.util.*;
+import java.util.regex.Pattern;
+
+import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.JsonPathException;
+import com.jayway.jsonpath.Option;
+import com.jayway.jsonpath.PathNotFoundException;
+import com.jayway.jsonpath.Predicate;
+import com.jayway.jsonpath.internal.Path;
+import com.jayway.jsonpath.internal.Utils;
+import com.jayway.jsonpath.internal.path.PathCompiler;
+import com.jayway.jsonpath.internal.path.PredicateContextImpl;
+import com.jayway.jsonpath.spi.json.JsonProvider;
+import net.minidev.json.parser.JSONParser;
+import net.minidev.json.parser.ParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Moved these nodes out of the ValueNode abstract class.
+ * This is to avoid this possible issue:
+ *
+ * Classes that refer to their own subclasses in their static initializers or in static fields.
+ * Such references can cause JVM-level deadlocks in multithreaded environment, when
+ * one thread tries to load superclass and another thread tries to load subclass at the same time.
+ */
+public interface ValueNodes {
+
+ NullNode NULL_NODE = new NullNode();
+ BooleanNode TRUE = new BooleanNode("true");
+ BooleanNode FALSE = new BooleanNode("false");
+ UndefinedNode UNDEFINED = new UndefinedNode();
+
+ //----------------------------------------------------
+ //
+ // ValueNode Implementations
+ //
+ //----------------------------------------------------
+ class PatternNode extends ValueNode {
+ private final String pattern;
+ private final Pattern compiledPattern;
+ private final String flags;
+
+ PatternNode(CharSequence charSequence) {
+ String tmp = charSequence.toString();
+ int begin = tmp.indexOf('/');
+ int end = tmp.lastIndexOf('/');
+ this.pattern = tmp.substring(begin + 1, end);
+ int flagsIndex = end + 1;
+ this.flags = tmp.length() > flagsIndex ? tmp.substring(flagsIndex) : "";
+ this.compiledPattern = Pattern.compile(pattern, PatternFlag.parseFlags(flags.toCharArray()));
+ }
+
+ PatternNode(Pattern pattern) {
+ this.pattern = pattern.pattern();
+ this.compiledPattern = pattern;
+ this.flags = PatternFlag.parseFlags(pattern.flags());
+ }
+
+
+ Pattern getCompiledPattern() {
+ return compiledPattern;
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return Void.TYPE;
+ }
+
+ public boolean isPatternNode() {
+ return true;
+ }
+
+ public PatternNode asPatternNode() {
+ return this;
+ }
+
+ @Override
+ public String toString() {
+
+ if(!pattern.startsWith("/")){
+ return "/" + pattern + "/" + flags;
+ } else {
+ return pattern;
+ }
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof PatternNode)) return false;
+
+ PatternNode that = (PatternNode) o;
+
+ return !(compiledPattern != null ? !compiledPattern.equals(that.compiledPattern) : that.compiledPattern != null);
+
+ }
+ }
+
+ class JsonNode extends ValueNode {
+ private final Object json;
+ private final boolean parsed;
+
+ JsonNode(CharSequence charSequence) {
+ json = charSequence.toString();
+ parsed = false;
+ }
+
+ JsonNode(Object parsedJson) {
+ json = parsedJson;
+ parsed = true;
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ if(isArray(ctx)) return List.class;
+ else if(isMap(ctx)) return Map.class;
+ else if(parse(ctx) instanceof Number) return Number.class;
+ else if(parse(ctx) instanceof String) return String.class;
+ else if(parse(ctx) instanceof Boolean) return Boolean.class;
+ else return Void.class;
+ }
+
+ public boolean isJsonNode() {
+ return true;
+ }
+
+ public JsonNode asJsonNode() {
+ return this;
+ }
+
+ public ValueNode asValueListNode(Predicate.PredicateContext ctx){
+ if(!isArray(ctx)){
+ return UNDEFINED;
+ } else {
+ return new ValueListNode(Collections.unmodifiableList((List) parse(ctx)));
+ }
+ }
+
+ public Object parse(Predicate.PredicateContext ctx){
+ try {
+ return parsed ? json : new JSONParser(JSONParser.MODE_PERMISSIVE).parse(json.toString());
+ } catch (ParseException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ public boolean isParsed() {
+ return parsed;
+ }
+
+ public Object getJson() {
+ return json;
+ }
+
+ public boolean isArray(Predicate.PredicateContext ctx) {
+ return parse(ctx) instanceof List;
+ }
+
+ public boolean isMap(Predicate.PredicateContext ctx) {
+ return parse(ctx) instanceof Map;
+ }
+
+ public int length(Predicate.PredicateContext ctx) {
+ return isArray(ctx) ? ((List) parse(ctx)).size() : -1;
+ }
+
+ public boolean isEmpty(Predicate.PredicateContext ctx) {
+ if (isArray(ctx) || isMap(ctx)) return ((Collection) parse(ctx)).size() == 0;
+ else if((parse(ctx) instanceof String)) return ((String)parse(ctx)).length() == 0;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return json.toString();
+ }
+
+ public boolean equals(JsonNode jsonNode, Predicate.PredicateContext ctx) {
+ if (this == jsonNode) return true;
+ return !(json != null ? !json.equals(jsonNode.parse(ctx)) : jsonNode.json != null);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof JsonNode)) return false;
+
+ JsonNode jsonNode = (JsonNode) o;
+
+ return !(json != null ? !json.equals(jsonNode.json) : jsonNode.json != null);
+ }
+ }
+
+ class StringNode extends ValueNode {
+ private final String string;
+ private boolean useSingleQuote = true;
+
+ StringNode(CharSequence charSequence, boolean escape) {
+ if (escape && charSequence.length() > 1) {
+ char open = charSequence.charAt(0);
+ char close = charSequence.charAt(charSequence.length()-1);
+ if (open == '\'' && close == '\'') {
+ charSequence = charSequence.subSequence(1, charSequence.length()-1);
+ } else if (open == '"' && close == '"') {
+ charSequence = charSequence.subSequence(1, charSequence.length()-1);
+ useSingleQuote = false;
+ }
+ string = Utils.unescape(charSequence.toString());
+ } else {
+ string = charSequence.toString();
+ }
+ }
+
+ @Override
+ public NumberNode asNumberNode() {
+ BigDecimal number = null;
+ try {
+ number = new BigDecimal(string);
+ } catch (NumberFormatException nfe){
+ return NumberNode.NAN;
+ }
+ return new NumberNode(number);
+ }
+
+ public String getString() {
+ return string;
+ }
+
+ public int length(){
+ return getString().length();
+ }
+
+ public boolean isEmpty(){
+ return getString().isEmpty();
+ }
+
+ public boolean contains(String str) {
+ return getString().contains(str);
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return String.class;
+ }
+
+ public boolean isStringNode() {
+ return true;
+ }
+
+ public StringNode asStringNode() {
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ String quote = useSingleQuote ? "'" : "\"";
+ return quote + Utils.escape(string, true) + quote;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof StringNode) && !(o instanceof NumberNode)) return false;
+
+ StringNode that = ((ValueNode) o).asStringNode();
+
+ return !(string != null ? !string.equals(that.getString()) : that.getString() != null);
+
+ }
+ }
+
+ class NumberNode extends ValueNode {
+
+ public static NumberNode NAN = new NumberNode((BigDecimal)null);
+
+ private final BigDecimal number;
+
+ NumberNode(BigDecimal number) {
+ this.number = number;
+ }
+ NumberNode(CharSequence num) {
+ number = new BigDecimal(num.toString());
+ }
+
+ @Override
+ public StringNode asStringNode() {
+ return new StringNode(number.toString(), false);
+ }
+
+ public BigDecimal getNumber() {
+ return number;
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return Number.class;
+ }
+
+ public boolean isNumberNode() {
+ return true;
+ }
+
+ public NumberNode asNumberNode() {
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return number.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof NumberNode) && !(o instanceof StringNode)) return false;
+
+ NumberNode that = ((ValueNode)o).asNumberNode();
+
+ if(that == NumberNode.NAN){
+ return false;
+ } else {
+ return number.compareTo(that.number) == 0;
+ }
+ }
+ }
+
+ //workaround for issue: https://github.com/json-path/JsonPath/issues/613
+ class OffsetDateTimeNode extends ValueNode {
+
+ private final OffsetDateTime dateTime;
+
+
+ OffsetDateTimeNode(OffsetDateTime dateTime) {
+ this.dateTime = dateTime;
+ }
+
+ OffsetDateTimeNode(CharSequence date) {
+ dateTime = OffsetDateTime.parse(date);
+ }
+
+ @Override
+ public StringNode asStringNode() {
+ return new StringNode(dateTime.toString(), false);
+ }
+
+ public OffsetDateTime getDate() {
+ return dateTime;
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return OffsetDateTimeNode.class;
+ }
+
+ public boolean isOffsetDateTimeNode() {
+ return true;
+ }
+
+ public OffsetDateTimeNode asOffsetDateTimeNode() {
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return dateTime.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof OffsetDateTimeNode) && !(o instanceof StringNode)) return false;
+ OffsetDateTimeNode that = ((ValueNode)o).asOffsetDateTimeNode();
+ return dateTime.compareTo(that.dateTime) == 0;
+ }
+ }
+
+
+
+ class BooleanNode extends ValueNode {
+ private final Boolean value;
+
+ private BooleanNode(CharSequence boolValue) {
+ value = Boolean.parseBoolean(boolValue.toString());
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return Boolean.class;
+ }
+
+ public boolean isBooleanNode() {
+ return true;
+ }
+
+ public BooleanNode asBooleanNode() {
+ return this;
+ }
+
+ public boolean getBoolean() {
+ return value;
+ }
+
+ @Override
+ public String toString() {
+ return value.toString();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof BooleanNode)) return false;
+
+ BooleanNode that = (BooleanNode) o;
+
+ return !(value != null ? !value.equals(that.value) : that.value != null);
+ }
+ }
+
+
+
+
+
+ class ClassNode extends ValueNode {
+ private final Class clazz;
+
+ ClassNode(Class clazz) {
+ this.clazz = clazz;
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return Class.class;
+ }
+
+ public boolean isClassNode() {
+ return true;
+ }
+
+ public ClassNode asClassNode() {
+ return this;
+ }
+
+ public Class getClazz() {
+ return clazz;
+ }
+
+ @Override
+ public String toString() {
+ return clazz.getName();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof ClassNode)) return false;
+
+ ClassNode that = (ClassNode) o;
+
+ return !(clazz != null ? !clazz.equals(that.clazz) : that.clazz != null);
+ }
+ }
+
+ class NullNode extends ValueNode {
+
+ private NullNode() {}
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return Void.class;
+ }
+
+ @Override
+ public boolean isNullNode() {
+ return true;
+ }
+
+ @Override
+ public NullNode asNullNode() {
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return "null";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof NullNode)) return false;
+
+ return true;
+ }
+ }
+
+ class UndefinedNode extends ValueNode {
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return Void.class;
+ }
+
+ public UndefinedNode asUndefinedNode() {
+ return this;
+ }
+
+ public boolean isUndefinedNode() {
+ return true;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return false;
+ }
+ }
+
+ class PredicateNode extends ValueNode {
+
+ private final Predicate predicate;
+
+ public PredicateNode(Predicate predicate) {
+ this.predicate = predicate;
+ }
+
+ public Predicate getPredicate() {
+ return predicate;
+ }
+
+ public PredicateNode asPredicateNode() {
+ return this;
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return Void.class;
+ }
+
+ public boolean isPredicateNode() {
+ return true;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return predicate.toString();
+ }
+ }
+
+ class ValueListNode extends ValueNode implements Iterable {
+
+ private List nodes = new ArrayList();
+
+ public ValueListNode(Collection values) {
+ for (Object value : values) {
+ nodes.add(toValueNode(value));
+ }
+ }
+
+ public boolean contains(ValueNode node){
+ return nodes.contains(node);
+ }
+
+ public boolean subsetof(ValueListNode right) {
+ for (ValueNode leftNode : nodes) {
+ if (!right.nodes.contains(leftNode)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public List getNodes() {
+ return Collections.unmodifiableList(nodes);
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return List.class;
+ }
+
+ public boolean isValueListNode() {
+ return true;
+ }
+
+ public ValueListNode asValueListNode() {
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return "[" + Utils.join(",", nodes) + "]";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof ValueListNode)) return false;
+
+ ValueListNode that = (ValueListNode) o;
+
+ return nodes.equals(that.nodes);
+ }
+
+ @Override
+ public Iterator iterator() {
+ return nodes.iterator();
+ }
+ }
+
+ class PathNode extends ValueNode {
+
+ private static final Logger logger = LoggerFactory.getLogger(PathNode.class);
+
+ private final Path path;
+ private final boolean existsCheck;
+ private final boolean shouldExist;
+
+ PathNode(Path path) {
+ this(path, false, false);
+ }
+
+ PathNode(CharSequence charSequence, boolean existsCheck, boolean shouldExist) {
+ this(PathCompiler.compile(charSequence.toString()), existsCheck, shouldExist);
+ }
+
+ PathNode(Path path, boolean existsCheck, boolean shouldExist) {
+ this.path = path;
+ this.existsCheck = existsCheck;
+ this.shouldExist = shouldExist;
+ logger.trace("PathNode {} existsCheck: {}", path, existsCheck);
+ }
+
+ public Path getPath() {
+ return path;
+ }
+
+ public boolean isExistsCheck() {
+ return existsCheck;
+ }
+
+ public boolean shouldExists() {
+ return shouldExist;
+ }
+
+ @Override
+ public Class type(Predicate.PredicateContext ctx) {
+ return Void.class;
+ }
+
+ public boolean isPathNode() {
+ return true;
+ }
+
+ public PathNode asPathNode() {
+ return this;
+ }
+
+ public PathNode asExistsCheck(boolean shouldExist) {
+ return new PathNode(path, true, shouldExist);
+ }
+
+ @Override
+ public String toString() {
+ return existsCheck && ! shouldExist ? Utils.concat("!" , path.toString()) : path.toString();
+ }
+
+ public ValueNode evaluate(Predicate.PredicateContext ctx) {
+ if (isExistsCheck()) {
+ try {
+ Configuration c = Configuration.builder().jsonProvider(ctx.configuration().jsonProvider()).options(Option.REQUIRE_PROPERTIES).build();
+ Object result = path.evaluate(ctx.item(), ctx.root(), c).getValue(false);
+ return result == JsonProvider.UNDEFINED ? FALSE : TRUE;
+ } catch (PathNotFoundException e) {
+ return FALSE;
+ }
+ } else {
+ try {
+ Object res;
+ if (ctx instanceof PredicateContextImpl) {
+ //This will use cache for document ($) queries
+ PredicateContextImpl ctxi = (PredicateContextImpl) ctx;
+ res = ctxi.evaluate(path);
+ } else {
+ Object doc = path.isRootPath() ? ctx.root() : ctx.item();
+ res = path.evaluate(doc, ctx.root(), ctx.configuration()).getValue();
+ }
+ res = ctx.configuration().jsonProvider().unwrap(res);
+
+ if (res instanceof Number) return ValueNode.createNumberNode(res.toString());
+ else if (res instanceof String) return ValueNode.createStringNode(res.toString(), false);
+ else if (res instanceof Boolean) return ValueNode.createBooleanNode(res.toString());
+ else if (res instanceof OffsetDateTime) return ValueNode.createOffsetDateTimeNode(res.toString()); //workaround for issue: https://github.com/json-path/JsonPath/issues/613
+ else if (res == null) return NULL_NODE;
+ else if (ctx.configuration().jsonProvider().isArray(res)) return ValueNode.createJsonNode(ctx.configuration().mappingProvider().map(res, List.class, ctx.configuration()));
+ else if (ctx.configuration().jsonProvider().isMap(res)) return ValueNode.createJsonNode(ctx.configuration().mappingProvider().map(res, Map.class, ctx.configuration()));
+ else throw new JsonPathException("Could not convert " + res.getClass().toString()+":"+ res.toString() + " to a ValueNode");
+ } catch (PathNotFoundException e) {
+ return UNDEFINED;
+ }
+ }
+ }
+ }
+}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/Parameter.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/Parameter.java
index 75824ff87..94a3e3572 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/Parameter.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/Parameter.java
@@ -1,11 +1,15 @@
package com.jayway.jsonpath.internal.function;
+import com.jayway.jsonpath.internal.EvaluationContext;
import com.jayway.jsonpath.internal.Path;
import com.jayway.jsonpath.internal.function.latebinding.ILateBindingValue;
-import com.jayway.jsonpath.internal.function.latebinding.PathLateBindingValue;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
/**
- * Created by matt@mjgreenwood.net on 12/10/15.
+ * Defines a parameter as passed to a function with late binding support for lazy evaluation.
*/
public class Parameter {
private ParamType type;
@@ -65,4 +69,69 @@ public String getJson() {
public void setJson(String json) {
this.json = json;
}
+
+ public ILateBindingValue getILateBingValue(){
+ return lateBinding;
+ }
+
+ /**
+ * Translate the collection of parameters into a collection of values of type T.
+ *
+ * @param type
+ * The type to translate the collection into.
+ *
+ * @param ctx
+ * Context.
+ *
+ * @param parameters
+ * Collection of parameters.
+ *
+ * @param
+ * Type T returned as a List of T.
+ *
+ * @return
+ * List of T either empty or containing contents.
+ */
+ public static List toList(final Class type, final EvaluationContext ctx, final List parameters) {
+ List values = new ArrayList();
+ if (null != parameters) {
+ for (Parameter param : parameters) {
+ consume(type, ctx, values, param.getValue());
+ }
+ }
+ return values;
+ }
+
+ /**
+ * Either consume the object as an array and add each element to the collection, or alternatively add each element
+ *
+ * @param expectedType
+ * the expected class type to consume, if null or not of this type the element is not added to the array.
+ *
+ * @param ctx
+ * the JSON context to determine if this is an array or value.
+ *
+ * @param collection
+ * The collection to append into.
+ *
+ * @param value
+ * The value to evaluate.
+ */
+ public static void consume(Class expectedType, EvaluationContext ctx, Collection collection, Object value) {
+ if (ctx.configuration().jsonProvider().isArray(value)) {
+ for (Object o : ctx.configuration().jsonProvider().toIterable(value)) {
+ if (o != null && expectedType.isAssignableFrom(o.getClass())) {
+ collection.add(o);
+ } else if (o != null && expectedType == String.class) {
+ collection.add(o.toString());
+ }
+ }
+ } else {
+ if (value != null && expectedType.isAssignableFrom(value.getClass())) {
+ collection.add(value);
+ } else if (value != null && expectedType == String.class) {
+ collection.add(value.toString());
+ }
+ }
+ }
}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunction.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunction.java
index 7f0a38023..ac3a353ba 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunction.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunction.java
@@ -30,7 +30,7 @@ public interface PathFunction {
* Eval context, state bag used as the path is traversed, maintains the result of executing
*
* @param parameters
- * @return
+ * @return result
*/
Object invoke(String currentPath, PathRef parent, Object model, EvaluationContext ctx, List parameters);
}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunctionFactory.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunctionFactory.java
index a35f61bf3..3a31151f2 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunctionFactory.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/PathFunctionFactory.java
@@ -2,11 +2,15 @@
import com.jayway.jsonpath.InvalidPathException;
import com.jayway.jsonpath.internal.function.json.Append;
+import com.jayway.jsonpath.internal.function.json.KeySetFunction;
import com.jayway.jsonpath.internal.function.numeric.Average;
import com.jayway.jsonpath.internal.function.numeric.Max;
import com.jayway.jsonpath.internal.function.numeric.Min;
import com.jayway.jsonpath.internal.function.numeric.StandardDeviation;
import com.jayway.jsonpath.internal.function.numeric.Sum;
+import com.jayway.jsonpath.internal.function.sequence.First;
+import com.jayway.jsonpath.internal.function.sequence.Index;
+import com.jayway.jsonpath.internal.function.sequence.Last;
import com.jayway.jsonpath.internal.function.text.Concatenate;
import com.jayway.jsonpath.internal.function.text.Length;
@@ -21,7 +25,6 @@
* Leverages the function's name in order to determine which function to execute which is maintained internally
* here via a static map
*
- * Created by mattg on 6/27/15.
*/
public class PathFunctionFactory {
@@ -42,9 +45,15 @@ public class PathFunctionFactory {
map.put("concat", Concatenate.class);
// JSON Entity Functions
- map.put("length", Length.class);
+ map.put(Length.TOKEN_NAME, Length.class);
map.put("size", Length.class);
map.put("append", Append.class);
+ map.put("keys", KeySetFunction.class);
+
+ // Sequential Functions
+ map.put("first", First.class);
+ map.put("last", Last.class);
+ map.put("index", Index.class);
FUNCTIONS = Collections.unmodifiableMap(map);
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/json/KeySetFunction.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/json/KeySetFunction.java
new file mode 100644
index 000000000..049d6de0e
--- /dev/null
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/json/KeySetFunction.java
@@ -0,0 +1,23 @@
+package com.jayway.jsonpath.internal.function.json;
+
+import com.jayway.jsonpath.internal.EvaluationContext;
+import com.jayway.jsonpath.internal.PathRef;
+import com.jayway.jsonpath.internal.function.Parameter;
+import com.jayway.jsonpath.internal.function.PathFunction;
+
+import java.util.List;
+
+/**
+ * Author: Sergey Saiyan sergey.sova42@gmail.com
+ * Created at 21/02/2018.
+ */
+public class KeySetFunction implements PathFunction {
+
+ @Override
+ public Object invoke(String currentPath, PathRef parent, Object model, EvaluationContext ctx, List parameters) {
+ if (ctx.configuration().jsonProvider().isMap(model)) {
+ return ctx.configuration().jsonProvider().getPropertyKeys(model);
+ }
+ return null;
+ }
+}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/latebinding/JsonLateBindingValue.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/latebinding/JsonLateBindingValue.java
index 0f653ad16..a72442931 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/latebinding/JsonLateBindingValue.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/latebinding/JsonLateBindingValue.java
@@ -34,7 +34,7 @@ public JsonLateBindingValue(JsonProvider jsonProvider, Parameter jsonParameter)
* Evaluate the JSON document at the point of need using the JSON parameter and associated document model which may
* itself originate from yet another function thus recursively invoking late binding methods.
*
- * @return
+ * @return the late value
*/
@Override
public Object get() {
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/latebinding/PathLateBindingValue.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/latebinding/PathLateBindingValue.java
index 04181cb77..38139f3a8 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/latebinding/PathLateBindingValue.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/latebinding/PathLateBindingValue.java
@@ -16,7 +16,8 @@
import com.jayway.jsonpath.Configuration;
import com.jayway.jsonpath.internal.Path;
-import com.jayway.jsonpath.internal.function.ParamType;
+
+import java.util.Objects;
/**
* Defines the contract for late bindings, provides document state and enough context to perform the evaluation at a later
@@ -27,21 +28,31 @@
*/
public class PathLateBindingValue implements ILateBindingValue {
private final Path path;
- private final Object rootDocument;
+ private final String rootDocument;
private final Configuration configuration;
-
+ private final Object result;
public PathLateBindingValue(final Path path, final Object rootDocument, final Configuration configuration) {
this.path = path;
- this.rootDocument = rootDocument;
+ this.rootDocument = rootDocument.toString();
this.configuration = configuration;
+ this.result = path.evaluate(rootDocument, rootDocument, configuration).getValue();
}
/**
- * Evaluate the expression at the point of need for Path type expressions
*
- * @return
+ * @return the late value
*/
public Object get() {
- return path.evaluate(rootDocument, rootDocument, configuration).getValue();
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ PathLateBindingValue that = (PathLateBindingValue) o;
+ return Objects.equals(path, that.path) &&
+ rootDocument.equals(that.rootDocument) &&
+ Objects.equals(configuration, that.configuration);
}
}
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java
index fe97628ca..cbc9f7bc9 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/numeric/AbstractAggregation.java
@@ -48,12 +48,9 @@ public Object invoke(String currentPath, PathRef parent, Object model, Evaluatio
}
}
if (parameters != null) {
- for (Parameter param : parameters) {
- Object value = param.getValue();
- if (null != value && value instanceof Number) {
- count++;
- next((Number)value);
- }
+ for (Number value : Parameter.toList(Number.class, ctx, parameters)) {
+ count++;
+ next(value);
}
}
if (count != 0) {
diff --git a/json-path/src/main/java/com/jayway/jsonpath/internal/function/sequence/AbstractSequenceAggregation.java b/json-path/src/main/java/com/jayway/jsonpath/internal/function/sequence/AbstractSequenceAggregation.java
new file mode 100644
index 000000000..24c87e136
--- /dev/null
+++ b/json-path/src/main/java/com/jayway/jsonpath/internal/function/sequence/AbstractSequenceAggregation.java
@@ -0,0 +1,47 @@
+package com.jayway.jsonpath.internal.function.sequence;
+
+import com.jayway.jsonpath.JsonPathException;
+import com.jayway.jsonpath.internal.EvaluationContext;
+import com.jayway.jsonpath.internal.PathRef;
+import com.jayway.jsonpath.internal.function.Parameter;
+import com.jayway.jsonpath.internal.function.PathFunction;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Defines the pattern for taking item from collection of JSONArray by index
+ *
+ * Created by git9527 on 6/11/22.
+ */
+public abstract class AbstractSequenceAggregation implements PathFunction {
+
+ protected abstract int targetIndex(EvaluationContext ctx, List parameters);
+
+ @Override
+ public Object invoke(String currentPath, PathRef parent, Object model, EvaluationContext ctx, List parameters) {
+ if(ctx.configuration().jsonProvider().isArray(model)){
+
+ Iterable objects = ctx.configuration().jsonProvider().toIterable(model);
+ List