Skip to content

Commit 6fac30a

Browse files
christophstroblmp911de
authored andcommitted
Remove Specification.where method in favour of all().
Also remove serialVersionUID. Original Pull Request: #3578
1 parent 8d942bd commit 6fac30a

File tree

4 files changed

+1
-30
lines changed

4 files changed

+1
-30
lines changed

Diff for: spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/DeleteSpecification.java

-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import jakarta.persistence.criteria.Predicate;
2121
import jakarta.persistence.criteria.Root;
2222

23-
import java.io.Serial;
2423
import java.io.Serializable;
2524
import java.util.Arrays;
2625
import java.util.stream.StreamSupport;
@@ -37,8 +36,6 @@
3736
@FunctionalInterface
3837
public interface DeleteSpecification<T> extends Serializable {
3938

40-
@Serial long serialVersionUID = 1L;
41-
4239
/**
4340
* Simple static factory method to create a specification deleting all objects.
4441
*

Diff for: spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/PredicateSpecification.java

-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import jakarta.persistence.criteria.Predicate;
2020
import jakarta.persistence.criteria.Root;
2121

22-
import java.io.Serial;
2322
import java.io.Serializable;
2423
import java.util.Arrays;
2524
import java.util.stream.StreamSupport;
@@ -35,8 +34,6 @@
3534
*/
3635
public interface PredicateSpecification<T> extends Serializable {
3736

38-
@Serial long serialVersionUID = 1L;
39-
4037
/**
4138
* Simple static factory method to create a specification matching all objects.
4239
*

Diff for: spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/Specification.java

+1-21
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import jakarta.persistence.criteria.Predicate;
2222
import jakarta.persistence.criteria.Root;
2323

24-
import java.io.Serial;
2524
import java.io.Serializable;
2625
import java.util.Arrays;
2726
import java.util.stream.StreamSupport;
@@ -44,8 +43,6 @@
4443
@FunctionalInterface
4544
public interface Specification<T> extends Serializable {
4645

47-
@Serial long serialVersionUID = 1L;
48-
4946
/**
5047
* Simple static factory method to create a specification matching all objects.
5148
*
@@ -56,23 +53,6 @@ static <T> Specification<T> all() {
5653
return (root, query, builder) -> null;
5754
}
5855

59-
/**
60-
* Simple static factory method to add some syntactic sugar around a {@link Specification}.
61-
*
62-
* @param <T> the type of the {@link Root} the resulting {@literal Specification} operates on.
63-
* @param spec must not be {@literal null}.
64-
* @return guaranteed to be not {@literal null}.
65-
* @since 2.0
66-
* @deprecated since 3.5.
67-
*/
68-
@Deprecated(since = "3.5.0", forRemoval = true)
69-
static <T> Specification<T> where(Specification<T> spec) {
70-
71-
Assert.notNull(spec, "Specification must not be null");
72-
73-
return spec;
74-
}
75-
7656
/**
7757
* Simple static factory method to add some syntactic sugar translating {@link PredicateSpecification} to
7858
* {@link Specification}.
@@ -85,7 +65,7 @@ static <T> Specification<T> where(PredicateSpecification<T> spec) {
8565

8666
Assert.notNull(spec, "PredicateSpecification must not be null");
8767

88-
return where((root, update, criteriaBuilder) -> spec.toPredicate(root, criteriaBuilder));
68+
return (root, update, criteriaBuilder) -> spec.toPredicate(root, criteriaBuilder);
8969
}
9070

9171
/**

Diff for: spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/UpdateSpecification.java

-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import jakarta.persistence.criteria.Predicate;
2121
import jakarta.persistence.criteria.Root;
2222

23-
import java.io.Serial;
2423
import java.io.Serializable;
2524
import java.util.Arrays;
2625
import java.util.stream.StreamSupport;
@@ -37,8 +36,6 @@
3736
@FunctionalInterface
3837
public interface UpdateSpecification<T> extends Serializable {
3938

40-
@Serial long serialVersionUID = 1L;
41-
4239
/**
4340
* Simple static factory method to create a specification deleting all objects.
4441
*

0 commit comments

Comments
 (0)