From 804af4bb3fc6f96cbcc9496a3353c55724de67ae Mon Sep 17 00:00:00 2001
From: Christoph Strobl <christoph.strobl@broadcom.com>
Date: Mon, 19 Aug 2024 15:41:07 +0200
Subject: [PATCH] Remove Specification.where method in favour of all().

Also remove serialVersionUID.

Original Pull Request: #3578
---
 .../data/jpa/domain/DeleteSpecification.java  |  3 ---
 .../jpa/domain/PredicateSpecification.java    |  3 ---
 .../data/jpa/domain/Specification.java        | 20 +------------------
 .../data/jpa/domain/UpdateSpecification.java  |  3 ---
 4 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/DeleteSpecification.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/DeleteSpecification.java
index b3bfd93ae2..738ad212ce 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/DeleteSpecification.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/DeleteSpecification.java
@@ -20,7 +20,6 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.stream.StreamSupport;
@@ -37,8 +36,6 @@
 @FunctionalInterface
 public interface DeleteSpecification<T> extends Serializable {
 
-	@Serial long serialVersionUID = 1L;
-
 	/**
 	 * Simple static factory method to create a specification deleting all objects.
 	 *
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/PredicateSpecification.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/PredicateSpecification.java
index b3e52f4249..49ff92c5ba 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/PredicateSpecification.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/PredicateSpecification.java
@@ -19,7 +19,6 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.stream.StreamSupport;
@@ -35,8 +34,6 @@
  */
 public interface PredicateSpecification<T> extends Serializable {
 
-	@Serial long serialVersionUID = 1L;
-
 	/**
 	 * Simple static factory method to create a specification matching all objects.
 	 *
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/Specification.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/Specification.java
index 4aca01862b..73e45e308f 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/Specification.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/Specification.java
@@ -21,7 +21,6 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.stream.StreamSupport;
@@ -44,8 +43,6 @@
 @FunctionalInterface
 public interface Specification<T> extends Serializable {
 
-	@Serial long serialVersionUID = 1L;
-
 	/**
 	 * Simple static factory method to create a specification matching all objects.
 	 *
@@ -56,21 +53,6 @@ static <T> Specification<T> all() {
 		return (root, query, builder) -> null;
 	}
 
-	/**
-	 * Simple static factory method to add some syntactic sugar around a {@link Specification}.
-	 *
-	 * @param <T> the type of the {@link Root} the resulting {@literal Specification} operates on.
-	 * @param spec must not be {@literal null}.
-	 * @return guaranteed to be not {@literal null}.
-	 * @since 2.0
-	 */
-	static <T> Specification<T> where(Specification<T> spec) {
-
-		Assert.notNull(spec, "Specification must not be null");
-
-		return spec;
-	}
-
 	/**
 	 * Simple static factory method to add some syntactic sugar translating {@link PredicateSpecification} to
 	 * {@link Specification}.
@@ -83,7 +65,7 @@ static <T> Specification<T> where(PredicateSpecification<T> spec) {
 
 		Assert.notNull(spec, "PredicateSpecification must not be null");
 
-		return where((root, update, criteriaBuilder) -> spec.toPredicate(root, criteriaBuilder));
+		return (root, update, criteriaBuilder) -> spec.toPredicate(root, criteriaBuilder);
 	}
 
 	/**
diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/UpdateSpecification.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/UpdateSpecification.java
index 8e217fc0f4..2872b0ab0f 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/UpdateSpecification.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/domain/UpdateSpecification.java
@@ -20,7 +20,6 @@
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.stream.StreamSupport;
@@ -37,8 +36,6 @@
 @FunctionalInterface
 public interface UpdateSpecification<T> extends Serializable {
 
-	@Serial long serialVersionUID = 1L;
-
 	/**
 	 * Simple static factory method to create a specification deleting all objects.
 	 *