Skip to content
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

Allow number strings to be compared to numbers #1023

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow number strings to be compared to numbers #1023

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
017359c
Allow number strings to be compared to numbers
Oct 11, 2024
55d21ab
Change comparisons to handle number conversion and fallback to string…
Oct 17, 2024
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
77 changes: 73 additions & 4 deletions json-path/src/main/java/com/jayway/jsonpath/internal/filter/EvaluatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import java.util.Map;
import java.util.regex.Pattern;

import java.math.BigDecimal;

import static com.jayway.jsonpath.internal.filter.ValueNodes.PatternNode;
import static com.jayway.jsonpath.internal.filter.ValueNodes.ValueListNode;

Expand Down Expand Up @@ -102,6 +104,23 @@ 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.isStringNode() && right.isNumberNode()) {
// Try to parse the string as a number for comparison
try {
BigDecimal leftAsNumber = new BigDecimal(left.asStringNode().getString());
return leftAsNumber.compareTo(right.asNumberNode().getNumber()) < 0;
} catch (NumberFormatException e) {
return left.asStringNode().getString().compareTo(right.asNumberNode().getNumber().toString()) < 0;
}
}
if (left.isNumberNode() && right.isStringNode()) {
// Try to parse the string as a number for comparison
try {
BigDecimal rightAsNumber = new BigDecimal(right.asStringNode().getString());
return left.asNumberNode().getNumber().compareTo(rightAsNumber) < 0;
} catch (NumberFormatException e) {
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
return left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) < 0;
}
Expand All @@ -116,6 +135,24 @@ 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.isStringNode() && right.isNumberNode()) {
// Try to parse the string as a number for comparison
try {
BigDecimal leftAsNumber = new BigDecimal(left.asStringNode().getString());
return leftAsNumber.compareTo(right.asNumberNode().getNumber()) <= 0;
} catch (NumberFormatException e) {
// If parsing fails, fall back to string comparison
return left.asStringNode().getString().compareTo(right.asNumberNode().getNumber().toString()) <= 0;
}
} if (left.isNumberNode() && right.isStringNode()) {
// Try to parse the string as a number for comparison
try {
BigDecimal rightAsNumber = new BigDecimal(right.asStringNode().getString());
return left.asNumberNode().getNumber().compareTo(rightAsNumber) <= 0;
} catch (NumberFormatException e) {
// If parsing fails, fall back to string comparison
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
return left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) <= 0;
}
Expand All @@ -128,9 +165,25 @@ private static class GreaterThanEvaluator implements Evaluator {
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
if(left.isNumberNode() && right.isNumberNode()){
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) > 0;
} else if(left.isStringNode() && right.isStringNode()){
} 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
} if (left.isStringNode() && right.isNumberNode()) {
// Try to parse the string as a number for comparison
try {
BigDecimal leftAsNumber = new BigDecimal(left.asStringNode().getString());
return leftAsNumber.compareTo(right.asNumberNode().getNumber()) > 0;
} catch (NumberFormatException e) {
return left.asStringNode().getString().compareTo(right.asNumberNode().getNumber().toString()) > 0;
}
} if (left.isNumberNode() && right.isStringNode()) {
// Try to parse the string as a number for comparison
try {
BigDecimal rightAsNumber = new BigDecimal(right.asStringNode().getString());
return left.asNumberNode().getNumber().compareTo(rightAsNumber) > 0;
} catch (NumberFormatException e) {
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
return left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) > 0;
}
return false;
Expand All @@ -142,9 +195,25 @@ private static class GreaterThanEqualsEvaluator implements Evaluator {
public boolean evaluate(ValueNode left, ValueNode right, Predicate.PredicateContext ctx) {
if(left.isNumberNode() && right.isNumberNode()){
return left.asNumberNode().getNumber().compareTo(right.asNumberNode().getNumber()) >= 0;
} else if(left.isStringNode() && right.isStringNode()){
} 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
} if (left.isStringNode() && right.isNumberNode()) {
// Try to parse the string as a number for comparison
try {
BigDecimal leftAsNumber = new BigDecimal(left.asStringNode().getString());
return leftAsNumber.compareTo(right.asNumberNode().getNumber()) >= 0;
} catch (NumberFormatException e) {
return left.asStringNode().getString().compareTo(right.asNumberNode().getNumber().toString()) >= 0;
}
} if (left.isNumberNode() && right.isStringNode()) {
// Try to parse the string as a number for comparison
try {
BigDecimal rightAsNumber = new BigDecimal(right.asStringNode().getString());
return left.asNumberNode().getNumber().compareTo(rightAsNumber) >= 0;
} catch (NumberFormatException e) {
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
return left.asOffsetDateTimeNode().getDate().compareTo(right.asOffsetDateTimeNode().getDate()) >= 0;
}
return false;
Expand Down