Spring/spring-data-jpa
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consider Specification order in composition.

Browse Source 
We now consider the ordering of left-hand-side and right-hand-side arguments when composing specifications. The primary aspect is consistency so that predicates appear in the actual SQL query in the order they were combined. Most SQL databases tend to reorder the criteria according to the most useful query execution plan. Only special cases tend to follow deferred evaluation when using OR combination.

Resolves #2146.
This commit is contained in:
Mark Paluch
2021-02-02 11:56:02 +01:00
parent aba0d17b13
commit 7d044c22f1
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/springframework/data/jpa/domain/SpecificationComposition.java
View File

@@ -30,6 +30,7 @@ import org.springframework.lang.Nullable;
* @author Sebastian Staudt
* @author Oliver Gierke
* @author Jens Schauder
* @author Mark Paluch
* @see Specification
* @since 2.2
*/
@@ -44,8 +45,8 @@ class SpecificationComposition {
return (root, query, builder) -> {
Predicate otherPredicate = toPredicate(lhs, root, query, builder);
Predicate thisPredicate = toPredicate(rhs, root, query, builder);
Predicate thisPredicate = toPredicate(lhs, root, query, builder);
Predicate otherPredicate = toPredicate(rhs, root, query, builder);
if (thisPredicate == null) {
return otherPredicate;

32
src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.data.jpa.domain;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import static org.springframework.data.jpa.domain.Specification.*;
import static org.springframework.data.jpa.domain.Specification.not;
import static org.springframework.util.SerializationUtils.*;
@@ -40,6 +41,7 @@ import org.mockito.junit.MockitoJUnitRunner;
* @author Thomas Darimont
* @author Sebastian Staudt
* @author Jens Schauder
* @author Mark Paluch
*/
@SuppressWarnings("serial")
@RunWith(MockitoJUnitRunner.class)
@@ -142,6 +144,36 @@ public class SpecificationUnitTests implements Serializable {
assertThat(transferredSpecification).isNotNull();
}
@Test // #2146
public void andCombinesSpecificationsInOrder() {
Predicate firstPredicate = mock(Predicate.class);
Predicate secondPredicate = mock(Predicate.class);
Specification<Object> first = ((root1, query1, criteriaBuilder) -> firstPredicate);
Specification<Object> second = ((root1, query1, criteriaBuilder) -> secondPredicate);
first.and(second).toPredicate(root, query, builder);
verify(builder).and(firstPredicate, secondPredicate);
}
@Test // #2146
void orCombinesSpecificationsInOrder() {
Predicate firstPredicate = mock(Predicate.class);
Predicate secondPredicate = mock(Predicate.class);
Specification<Object> first = ((root1, query1, criteriaBuilder) -> firstPredicate);
Specification<Object> second = ((root1, query1, criteriaBuilder) -> secondPredicate);
first.or(second).toPredicate(root, query, builder);
verify(builder).or(firstPredicate, secondPredicate);
}
public class SerializableSpecification implements Serializable, Specification<Object> {
@Override