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

Fix handling of null predicate in Specification.not().

Browse Source 
When toPredicate() returns null, Specification.not() now returns
builder.disjunction() instead of builder.not(null). This change
ensures proper handling of null predicates in negated specifications.

Closes #3849
Original pull request: #3856

Signed-off-by: SWQXDBA <983110853@qq.com>
This commit is contained in:
SWQXDBA
2025-04-23 20:03:17 +08:00
committed by Mark Paluch
parent 17fef3ca8d
commit 2f47f22baa
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/Specification.java
View File

@@ -56,7 +56,13 @@ public interface Specification<T> extends Serializable {
return spec == null //
? (root, query, builder) -> null //
: (root, query, builder) -> builder.not(spec.toPredicate(root, query, builder));
: (root, query, builder) -> {
Predicate predicate = spec.toPredicate(root, query, builder);
if(predicate != null) {
return builder.not(predicate);
}
return builder.disjunction();
};
}
/**

11
spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java
View File

@@ -214,6 +214,17 @@ class SpecificationUnitTests {
verify(builder).or(firstPredicate, secondPredicate);
}
@Test // #3849
void notWithNullPredicate() {
Specification<Object> spec = (r, q, cb) -> null;
Specification<Object> notSpec = Specification.not(spec);
notSpec.toPredicate(root, query, builder);
verify(builder).disjunction();
}
static class SerializableSpecification implements Serializable, Specification<Object> {
@Override