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

Polishing.

Browse Source 
Reformat code. Refine tests.

See #3849
Original pull request: #3856
This commit is contained in:
Mark Paluch
2025-05-05 14:13:17 +02:00
parent 74071a60df
commit 83f70ffae6
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -206,7 +206,6 @@ class SpecificationUnitTests implements Serializable {
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);
@@ -214,14 +213,14 @@ class SpecificationUnitTests implements Serializable {
verify(builder).or(firstPredicate, secondPredicate);
}
@Test // #3849
@Test // GH-3849
void notWithNullPredicate() {
Specification<Object> spec = (r, q, cb) -> null;
Specification<Object> notSpec = Specification.not(spec);
when(builder.disjunction()).thenReturn(mock(Predicate.class));
notSpec.toPredicate(root, query, builder);
Specification<Object> notSpec = Specification.not((r, q, cb) -> null);
assertThat(notSpec.toPredicate(root, query, builder)).isNotNull();
verify(builder).disjunction();
}