Skip to content

[FIX] Operators: String format statements should use correct escaping… #2

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

Open
Kkoile wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[FIX] Operators: String format statements should use correct escaping… #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...ping-spring-data/src/main/java/net/seesharpsoft/spring/data/jpa/expression/Operators.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ protected Object evaluate(String leftOperand, String rightOperand) {

@Override
protected Expression createExpression(From root, AbstractQuery query, CriteriaBuilder builder, Expression left, String right) {
return builder.like(left, String.format("\\%%s\\%", right));
return builder.like(left, String.format("%%%s%%", right));
}
};
public static final Operator STARTS_WITH = new LikeOperatorBase("startsWith", 90) {
Expand All @@ -243,7 +243,7 @@ protected Object evaluate(String leftOperand, String rightOperand) {

@Override
protected Expression createExpression(From root, AbstractQuery query, CriteriaBuilder builder, Expression left, String right) {
return builder.like(left, String.format("%s\\%", right));
return builder.like(left, String.format("%s%%", right));
}
};
public static final Operator ENDS_WITH = new LikeOperatorBase("endsWith", 90) {
Expand All @@ -254,7 +254,7 @@ protected Object evaluate(String leftOperand, String rightOperand) {

@Override
protected Expression createExpression(From root, AbstractQuery query, CriteriaBuilder builder, Expression left, String right) {
return builder.like(left, String.format("\\%%s", right));
return builder.like(left, String.format("%%%s", right));
}
};

Expand Down
14 changes: 11 additions & 3 deletions ...ng-spring-data/src/test/java/net/seesharpsoft/spring/data/jpa/expression/OperatorsUT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
package net.seesharpsoft.spring.data.jpa.expression;

import javafx.util.Pair;
import net.seesharpsoft.spring.test.mock.CriteriaBuilderMockBuilder;
import net.seesharpsoft.spring.test.mock.CriteriaQueryMockBuilder;
import net.seesharpsoft.spring.test.mock.ExpressionMockBuilder;
import org.junit.Test;
import javafx.util.Pair;

import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
import javax.persistence.criteria.Root;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;

import static org.hamcrest.MatcherAssert.assertThat;
Expand Down Expand Up @@ -97,6 +95,16 @@ public void unary_operator_asExpression_should_handle_no_values() {
Operators.NOT.createExpression(root, query, builder);
}

@Test
public void startsWith_operator_should_create_a_working_condition() {
CriteriaBuilder builder = CriteriaBuilderMockBuilder.newCriteriaBuilder();
CriteriaQuery query = CriteriaQueryMockBuilder.newCriteriaQuery();
Root root = ExpressionMockBuilder.newRoot(null);

Expression expression = Operators.STARTS_WITH.createExpression(root, query, builder, "PATH", "NEEDLE");
assertThat(expression.toString(), is("like('PATH', NEEDLE%)"));
}

@Test
public void numerical_operators_should_evaluate_correctly() {
List<Pair> inputs = new ArrayList<>();
Expand Down