diff --git a/src/main/java/org/springframework/data/jpa/domain/Specification.java b/src/main/java/org/springframework/data/jpa/domain/Specification.java index 113d3a270..97e1d43b0 100644 --- a/src/main/java/org/springframework/data/jpa/domain/Specification.java +++ b/src/main/java/org/springframework/data/jpa/domain/Specification.java @@ -15,8 +15,6 @@ */ package org.springframework.data.jpa.domain; -import static org.springframework.data.jpa.domain.SpecificationComposition.*; - import java.io.Serializable; import javax.persistence.criteria.CriteriaBuilder; @@ -51,7 +49,7 @@ public interface Specification extends Serializable { static Specification not(@Nullable Specification spec) { return spec == null // - ? (root, query, builder) -> null// + ? (root, query, builder) -> null // : (root, query, builder) -> builder.not(spec.toPredicate(root, query, builder)); } @@ -74,9 +72,8 @@ public interface Specification extends Serializable { * @return The conjunction of the specifications * @since 2.0 */ - default Specification and(@Nullable Specification other) { - return composed(this, other, CriteriaBuilder::and); + return SpecificationComposition.composed(this, other, CriteriaBuilder::and); } /** @@ -87,7 +84,7 @@ public interface Specification extends Serializable { * @since 2.0 */ default Specification or(@Nullable Specification other) { - return composed(this, other, CriteriaBuilder::or); + return SpecificationComposition.composed(this, other, CriteriaBuilder::or); } /**