Skip to content

Fix null check for querydsl predicate executor #4275

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
stupid58fly wants to merge 1 commit into
base: main
Choose a base branch
from
+129 −3
Open

Fix null check for querydsl predicate executor #4275

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
7 changes: 4 additions & 3 deletions ...in/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import com.querydsl.core.types.ConstantImpl;
import com.querydsl.core.types.EntityPath;
import com.querydsl.core.types.Expression;
import com.querydsl.core.types.NullExpression;
import com.querydsl.core.types.Ops;
import com.querydsl.core.types.OrderSpecifier;
import com.querydsl.core.types.Predicate;
Expand All @@ -74,6 +73,7 @@
* @author Jens Schauder
* @author Greg Turnquist
* @author Yanming Zhou
* @author Ilya Bakaev
*/
public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecutor<T>, JpaRepositoryConfigurationAware {

Expand Down Expand Up @@ -424,8 +424,9 @@ public BooleanExpression compare(Order order, Expression<?> propertyExpression,

@Override
public BooleanExpression compare(String property, Expression<?> propertyExpression, @Nullable Object value) {
return Expressions.booleanOperation(Ops.EQ, propertyExpression,
value == null ? NullExpression.DEFAULT : ConstantImpl.create(value));
return value == null
? Expressions.booleanOperation(Ops.IS_NULL, propertyExpression)
: Expressions.booleanOperation(Ops.EQ, propertyExpression, ConstantImpl.create(value));
}

@Override
Expand Down
125 changes: 125 additions & 0 deletions ...g-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
* @author Geoffrey Deremetz
* @author Krzysztof Krason
* @author Yanming Zhou
* @author Ilya Bakaev
*/
@ExtendWith(SpringExtension.class)
@ContextConfiguration("classpath:application-context.xml")
Expand Down Expand Up @@ -1522,6 +1523,130 @@ void scrollByPartTreeKeysetBackward() {
assertThat(previousWindow.hasNext()).isFalse();
}

@Test
void scrollByPredicateKeysetWithAscNullsFirst() {

User jane1 = new User("Jane", "Doe", "jane@doe1.com");
User jane2 = new User("Jane", null, "jane@doe2.com");
User jane3 = new User("Jane", null, "jane@doe3.com");
User john1 = new User("John", "Doe", "john@doe1.com");
User john2 = new User("John", null, "john@doe2.com");
User john3 = new User("John", null, "john@doe3.com");

repository.saveAllAndFlush(Arrays.asList(john1, john2, john3, jane1, jane2, jane3));

Sort sort = Sort.by(
Order.asc("firstname"),
Order.asc("lastname").nullsFirst(),
Order.asc("emailAddress")
);

Window<User> firstWindow = repository.findBy(QUser.user.firstname.startsWith("J"),
q -> q.limit(1).sortBy(sort).scroll(ScrollPosition.keyset()));

assertThat(firstWindow).containsOnly(jane2);
assertThat(firstWindow.hasNext()).isTrue();

Window<User> nextWindow = repository.findBy(QUser.user.firstname.startsWith("J"),
q -> q.limit(3).sortBy(sort).scroll(firstWindow.positionAt(0)));

assertThat(nextWindow).containsExactly(jane3, jane1, john2);
assertThat(nextWindow.hasNext()).isTrue();
}

@Test // GH-2878
void scrollByPredicateKeysetWithDescNullsFirst() {

User jane1 = new User("Jane", "Doe", "jane@doe1.com");
User jane2 = new User("Jane", null, "jane@doe2.com");
User jane3 = new User("Jane", null, "jane@doe3.com");
User john1 = new User("John", "Doe", "john@doe1.com");
User john2 = new User("John", null, "john@doe2.com");
User john3 = new User("John", null, "john@doe3.com");

repository.saveAllAndFlush(Arrays.asList(john1, john2, john3, jane1, jane2, jane3));

Sort sort = Sort.by(
Order.asc("firstname"),
Order.desc("lastname").nullsFirst(),
Order.asc("emailAddress")
);

Window<User> firstWindow = repository.findBy(QUser.user.firstname.startsWith("J"),
q -> q.limit(1).sortBy(sort).scroll(ScrollPosition.keyset()));

assertThat(firstWindow).containsOnly(jane2);
assertThat(firstWindow.hasNext()).isTrue();

Window<User> nextWindow = repository.findBy(QUser.user.firstname.startsWith("J"),
q -> q.limit(3).sortBy(sort).scroll(firstWindow.positionAt(0)));

assertThat(nextWindow).containsExactly(jane3, jane1, john2);
assertThat(nextWindow.hasNext()).isTrue();
}

@Test // GH-2878
void scrollByPredicateKeysetWithAscNullsLast() {

User jane1 = new User("Jane", "Doe", "jane@doe1.com");
User jane2 = new User("Jane", null, "jane@doe2.com");
User jane3 = new User("Jane", null, "jane@doe3.com");
User john1 = new User("John", "Doe", "john@doe1.com");
User john2 = new User("John", null, "john@doe2.com");
User john3 = new User("John", null, "john@doe3.com");

repository.saveAllAndFlush(Arrays.asList(john1, john2, john3, jane1, jane2, jane3));

Sort sort = Sort.by(
Order.asc("firstname"),
Order.asc("lastname").nullsLast(),
Order.asc("emailAddress")
);

Window<User> firstWindow = repository.findBy(QUser.user.firstname.startsWith("J"),
q -> q.limit(1).sortBy(sort).scroll(ScrollPosition.keyset()));

assertThat(firstWindow).containsOnly(jane1);
assertThat(firstWindow.hasNext()).isTrue();

Window<User> nextWindow = repository.findBy(QUser.user.firstname.startsWith("J"),
q -> q.limit(3).sortBy(sort).scroll(firstWindow.positionAt(0)));

assertThat(nextWindow).containsExactly(jane2, jane3, john1);
assertThat(nextWindow.hasNext()).isTrue();
}

@Test // GH-2878
void scrollByPredicateKeysetWithDescNullsLast() {

User jane1 = new User("Jane", "Doe", "jane@doe1.com");
User jane2 = new User("Jane", null, "jane@doe2.com");
User jane3 = new User("Jane", null, "jane@doe3.com");
User john1 = new User("John", "Doe", "john@doe1.com");
User john2 = new User("John", null, "john@doe2.com");
User john3 = new User("John", null, "john@doe3.com");

repository.saveAllAndFlush(Arrays.asList(john1, john2, john3, jane1, jane2, jane3));

Sort sort = Sort.by(
Order.asc("firstname"),
Order.desc("lastname").nullsLast(),
Order.asc("emailAddress")
);

Window<User> firstWindow = repository.findBy(QUser.user.firstname.startsWith("J"),
q -> q.limit(1).sortBy(sort).scroll(ScrollPosition.keyset()));

assertThat(firstWindow).containsOnly(jane1);
assertThat(firstWindow.hasNext()).isTrue();

Window<User> nextWindow = repository.findBy(QUser.user.firstname.startsWith("J"),
q -> q.limit(3).sortBy(sort).scroll(firstWindow.positionAt(0)));

assertThat(nextWindow).containsExactly(jane2, jane3, john1);
assertThat(nextWindow.hasNext()).isTrue();
}

@Test // GH-3015, GH-3407
void shouldApplyOffsetScrollPosition() {

Expand Down