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

Allow number strings to be compared to numbers

pull/1023/head
Ian 5 months ago
parent
45333e0a31
commit
017359cc3a
1 changed files with 16 additions and 0 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. 16
      json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java

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

@ -102,6 +102,10 @@ public class EvaluatorFactory {
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) < 0; return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) < 0;
} if(left.isStringNode() && right.isStringNode()){ } if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) < 0; return left.asStringNode().getString().compareTo(right.asStringNode().getString()) < 0;
} if(left.isStringNode() && right.isNumberNode()){
return left.asStringNode().getString().compareTo(right.asNumberNode().getNumber().toString()) < 0;
} if(left.isNumberNode() && right.isStringNode()){
return left.asNumberNode().getNumber().toString().compareTo(right.asStringNode().getString()) < 0;
} if (left.isOffsetDateTimeNode() && right.isOffsetDateTimeNode()){ //workaround for issue: https://github.com/json-path/JsonPath/issues/613 } 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 left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) < 0;
} }
@ -116,6 +120,10 @@ public class EvaluatorFactory {
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) <= 0; return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) <= 0;
} if(left.isStringNode() && right.isStringNode()){ } if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) <= 0; return left.asStringNode().getString().compareTo(right.asStringNode().getString()) <= 0;
} if(left.isStringNode() && right.isNumberNode()){
return left.asStringNode().getString().compareTo(right.asNumberNode().getNumber().toString()) <= 0;
} if(left.isNumberNode() && right.isStringNode()){
return left.asNumberNode().getNumber().toString().compareTo(right.asStringNode().getString()) <= 0;
} if (left.isOffsetDateTimeNode() && right.isOffsetDateTimeNode()){ //workaround for issue: https://github.com/json-path/JsonPath/issues/613 } 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 left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) <= 0;
} }
@ -130,6 +138,10 @@ public class EvaluatorFactory {
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) > 0; return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) > 0;
} else if(left.isStringNode() && right.isStringNode()){ } else if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) > 0; return left.asStringNode().getString().compareTo(right.asStringNode().getString()) > 0;
} else if (left.isStringNode() && right.isNumberNode()){
return left.asStringNode().getString().compareTo(right.asNumberNode().getNumber().toString()) > 0;
} else if (left.isNumberNode() && right.isStringNode()){
return left.asNumberNode().getNumber().toString().compareTo(right.asStringNode().getString()) > 0;
} else if (left.isOffsetDateTimeNode() && right.isOffsetDateTimeNode()){ //workaround for issue: https://github.com/json-path/JsonPath/issues/613 } 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 left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) > 0;
} }
@ -144,6 +156,10 @@ public class EvaluatorFactory {
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) >= 0; return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) >= 0;
} else if(left.isStringNode() && right.isStringNode()){ } else if(left.isStringNode() && right.isStringNode()){
return left.asStringNode().getString().compareTo(right.asStringNode().getString()) >= 0; return left.asStringNode().getString().compareTo(right.asStringNode().getString()) >= 0;
} else if (left.isStringNode() && right.isNumberNode()){
return left.asStringNode().getString().compareTo(right.asNumberNode().getNumber().toString()) >= 0;
} else if (left.isNumberNode() && right.isStringNode()){
return left.asNumberNode().getNumber().toString().compareTo(right.asStringNode().getString()) >= 0;
} else if (left.isOffsetDateTimeNode() && right.isOffsetDateTimeNode()){ //workaround for issue: https://github.com/json-path/JsonPath/issues/613 } 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 left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) >= 0;
} }

Write Preview
Loading…
Cancel
Save