From c5f0c6397f82c1f310e34c69a5c384db8dc1cd7c Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Tue, 10 Dec 2024 10:15:19 +0100
Subject: [PATCH] Polishing.

Extract assertion message constants from QuerydslJpaPredicateExecutor.

See #3698
---
 .../support/QuerydslJpaPredicateExecutor.java | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java
index c16f95c0a1..08f3b7ab07 100644
--- a/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java
+++ b/spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java
@@ -75,6 +75,12 @@
  */
 public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecutor<T>, JpaRepositoryConfigurationAware {
 
+	private static final String PREDICATE_MUST_NOT_BE_NULL = "Predicate must not be null";
+	private static final String ORDER_SPECIFIERS_MUST_NOT_BE_NULL = "Order specifiers must not be null";
+	private static final String SORT_MUST_NOT_BE_NULL = "Sort must not be null";
+	private static final String PAGEABLE_MUST_NOT_BE_NULL = "Pageable 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 EntityPath<T> path;
 	private final Querydsl querydsl;
@@ -116,7 +122,7 @@ public void setProjectionFactory(ProjectionFactory projectionFactory) {
 	@Override
 	public Optional<T> findOne(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(predicate, PREDICATE_MUST_NOT_BE_NULL);
 
 		try {
 			return Optional.ofNullable(createQuery(predicate).select(path).limit(2).fetchOne());
@@ -128,7 +134,7 @@ public Optional<T> findOne(Predicate predicate) {
 	@Override
 	public List<T> findAll(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(predicate, PREDICATE_MUST_NOT_BE_NULL);
 
 		return createQuery(predicate).select(path).fetch();
 	}
@@ -136,8 +142,8 @@ public List<T> findAll(Predicate predicate) {
 	@Override
 	public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
-		Assert.notNull(orders, "Order specifiers must not be null");
+		Assert.notNull(predicate, PREDICATE_MUST_NOT_BE_NULL);
+		Assert.notNull(orders, ORDER_SPECIFIERS_MUST_NOT_BE_NULL);
 
 		return executeSorted(createQuery(predicate).select(path), orders);
 	}
@@ -145,8 +151,8 @@ public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 	@Override
 	public List<T> findAll(Predicate predicate, Sort sort) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
-		Assert.notNull(sort, "Sort must not be null");
+		Assert.notNull(predicate, PREDICATE_MUST_NOT_BE_NULL);
+		Assert.notNull(sort, SORT_MUST_NOT_BE_NULL);
 
 		return executeSorted(createQuery(predicate).select(path), sort);
 	}
@@ -154,7 +160,7 @@ public List<T> findAll(Predicate predicate, Sort sort) {
 	@Override
 	public List<T> findAll(OrderSpecifier<?>... orders) {
 
-		Assert.notNull(orders, "Order specifiers must not be null");
+		Assert.notNull(orders, ORDER_SPECIFIERS_MUST_NOT_BE_NULL);
 
 		return executeSorted(createQuery(new Predicate[0]).select(path), orders);
 	}
@@ -162,8 +168,8 @@ public List<T> findAll(OrderSpecifier<?>... orders) {
 	@Override
 	public Page<T> findAll(Predicate predicate, Pageable pageable) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
-		Assert.notNull(pageable, "Pageable must not be null");
+		Assert.notNull(predicate, PREDICATE_MUST_NOT_BE_NULL);
+		Assert.notNull(pageable, PAGEABLE_MUST_NOT_BE_NULL);
 
 		final JPQLQuery<?> countQuery = createCountQuery(predicate);
 		JPQLQuery<T> query = querydsl.applyPagination(pageable, createQuery(predicate).select(path));
@@ -175,8 +181,8 @@ public Page<T> findAll(Predicate predicate, Pageable pageable) {
 	@Override
 	public <S extends T, R> R findBy(Predicate predicate, Function<FetchableFluentQuery<S>, R> queryFunction) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
-		Assert.notNull(queryFunction, "Query function must not be null");
+		Assert.notNull(predicate, PREDICATE_MUST_NOT_BE_NULL);
+		Assert.notNull(queryFunction, QUERY_FUNCTION_MUST_NOT_BE_NULL);
 
 		Function<Sort, AbstractJPAQuery<?, ?>> finder = sort -> {
 			AbstractJPAQuery<?, ?> select = (AbstractJPAQuery<?, ?>) createQuery(predicate).select(path);
@@ -260,7 +266,7 @@ public boolean exists(Predicate predicate) {
 	 */
 	protected AbstractJPAQuery<?, ?> createQuery(Predicate... predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(predicate, PREDICATE_MUST_NOT_BE_NULL);
 
 		AbstractJPAQuery<?, ?> query = doCreateQuery(getQueryHints().withFetchGraphs(entityManager), predicate);
 		CrudMethodMetadata metadata = getRepositoryMethodMetadata();