From 29f16ab09f12c24d4e6ef1ce53ef91d6473d0772 Mon Sep 17 00:00:00 2001
From: Hyeon Sung <gorae930301@gmail.com>
Date: Mon, 2 Dec 2024 16:50:11 +0900
Subject: [PATCH] Extract repeated string literals in `SimpleJpaRepository` to
 constants.

Closes #3698
---
 .../support/SimpleJpaRepository.java          | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
index d170a8acf..f40821ab3 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
@@ -100,7 +100,11 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 
 	private static final String ID_MUST_NOT_BE_NULL = "The given id must not be null";
 	private static final String IDS_MUST_NOT_BE_NULL = "Ids must not be null";
+	private static final String ENTITY_MUST_NOT_BE_NULL = "Entity must not be null";
 	private static final String ENTITIES_MUST_NOT_BE_NULL = "Entities must not be null";
+	private static final String EXAMPLE_MUST_NOT_BE_NULL = "Example must not be null";
+	private static final String SPECIFICATION_MUST_NOT_BE_NULL = "Specification must not be null";
+	private static final String QUERY_FUNCTION_MUST_NOT_BE_NULL = "Query function must not be null";
 
 	private final JpaEntityInformation<T, ?> entityInformation;
 	private final EntityManager entityManager;
@@ -190,7 +194,7 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 	@SuppressWarnings("unchecked")
 	public void delete(T entity) {
 
-		Assert.notNull(entity, "Entity must not be null");
+		Assert.notNull(entity, ENTITY_MUST_NOT_BE_NULL);
 
 		if (entityInformation.isNew(entity)) {
 			return;
@@ -495,8 +499,8 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 	@Override
 	public <S extends T, R> R findBy(Specification<T> spec, Function<FetchableFluentQuery<S>, R> queryFunction) {
 
-		Assert.notNull(spec, "Specification must not be null");
-		Assert.notNull(queryFunction, "Query function must not be null");
+		Assert.notNull(spec, SPECIFICATION_MUST_NOT_BE_NULL);
+		Assert.notNull(queryFunction, QUERY_FUNCTION_MUST_NOT_BE_NULL);
 
 		return doFindBy(spec, getDomainClass(), queryFunction);
 	}
@@ -504,8 +508,8 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 	private <S extends T, R> R doFindBy(Specification<T> spec, Class<T> domainClass,
 			Function<FetchableFluentQuery<S>, R> queryFunction) {
 
-		Assert.notNull(spec, "Specification must not be null");
-		Assert.notNull(queryFunction, "Query function must not be null");
+		Assert.notNull(spec, SPECIFICATION_MUST_NOT_BE_NULL);
+		Assert.notNull(queryFunction, QUERY_FUNCTION_MUST_NOT_BE_NULL);
 
 		ScrollQueryFactory scrollFunction = (sort, scrollPosition) -> {
 
@@ -594,8 +598,8 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 	@Override
 	public <S extends T, R> R findBy(Example<S> example, Function<FetchableFluentQuery<S>, R> queryFunction) {
 
-		Assert.notNull(example, "Example must not be null");
-		Assert.notNull(queryFunction, "Query function must not be null");
+		Assert.notNull(example, EXAMPLE_MUST_NOT_BE_NULL);
+		Assert.notNull(queryFunction, QUERY_FUNCTION_MUST_NOT_BE_NULL);
 
 		ExampleSpecification<S> spec = new ExampleSpecification<>(example, escapeCharacter);
 		Class<S> probeType = example.getProbeType();
@@ -622,7 +626,7 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 	@Transactional
 	public <S extends T> S save(S entity) {
 
-		Assert.notNull(entity, "Entity must not be null");
+		Assert.notNull(entity, ENTITY_MUST_NOT_BE_NULL);
 
 		if (entityInformation.isNew(entity)) {
 			entityManager.persist(entity);
@@ -997,7 +1001,7 @@ public class SimpleJpaRepository<T, ID> implements JpaRepositoryImplementation<T
 		 */
 		ExampleSpecification(Example<T> example, EscapeCharacter escapeCharacter) {
 
-			Assert.notNull(example, "Example must not be null");
+			Assert.notNull(example, EXAMPLE_MUST_NOT_BE_NULL);
 			Assert.notNull(escapeCharacter, "EscapeCharacter must not be null");
 
 			this.example = example;