Polishing.

Refine error message format.

See #2736
Original pull request: #2738

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/SimpleJpaQuery.java

@@ -64,10 +64,10 @@ public SimpleJpaQuery(JpaQueryMethod method, EntityManager em, String sourceQuer
 
 		super(method, em, sourceQuery, countQueryString, queryRewriter, valueExpressionDelegate);
 
-		validateQuery(getQuery(), "Validation failed for query %s for method %s", method);
+		validateQuery(getQuery(), "Query '%s' validation failed for method %s", method);
 
 		if (method.isPageQuery()) {
-			validateQuery(getCountQuery(), "Count query %s validation failed for method %s", method);
+			validateQuery(getCountQuery(), "Count query '%s' validation failed for method %s", method);
 		}
 	}
 
@@ -83,24 +83,14 @@ private void validateQuery(DeclaredQuery query, String errorMessage, JpaQueryMet
 			return;
 		}
 
-		EntityManager validatingEm = null;
-		var queryString = query.getQueryString();
-
-		try {
-			validatingEm = getEntityManager().getEntityManagerFactory().createEntityManager();
+		String queryString = query.getQueryString();
+		try (EntityManager validatingEm = getEntityManager().getEntityManagerFactory().createEntityManager()) {
 			validatingEm.createQuery(queryString);
-
 		} catch (RuntimeException e) {
 
 			// Needed as there's ambiguities in how an invalid query string shall be expressed by the persistence provider
 			// https://download.oracle.com/javaee-archive/jpa-spec.java.net/users/2012/07/0404.html
-			throw new IllegalArgumentException(errorMessage.formatted(query, method), e);
-
-		} finally {
-
-			if (validatingEm != null) {
-				validatingEm.close();
-			}
+			throw new IllegalArgumentException(errorMessage.formatted(queryString, method), e);
 		}
 	}
 }

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/SimpleJpaQueryUnitTests.java

@@ -192,7 +192,7 @@ void doesNotValidateCountQueryIfNotPagingMethod() throws Exception {
 		createJpaQuery(method);
 	}
 
-	@Test // DATAJPA-352
+	@Test // DATAJPA-352, GH-2736
 	void validatesAndRejectsCountQueryIfPagingMethod() throws Exception {
 
 		Method method = SampleRepository.class.getMethod("pageByAnnotatedQuery", Pageable.class);
@@ -201,7 +201,7 @@ void validatesAndRejectsCountQueryIfPagingMethod() throws Exception {
 
 		assertThatIllegalArgumentException() //
 				.isThrownBy(() -> createJpaQuery(method)) //
-				.withMessageContaining("Count") //
+				.withMessageContaining("User u") //
 				.withMessageContaining(method.getName());
 	}
 
@@ -293,19 +293,19 @@ void resolvesExpressionInCountQuery() throws Exception {
 	}
 
 	private AbstractJpaQuery createJpaQuery(Method method) {
-		return createJpaQuery(method, null);
+		return createJpaQuery(method, Optional.empty());
 	}
 
-	private AbstractJpaQuery createJpaQuery(JpaQueryMethod queryMethod, @Nullable String queryString, @Nullable String countQueryString) {
+	private AbstractJpaQuery createJpaQuery(JpaQueryMethod queryMethod, String queryString, @Nullable String countQueryString) {
 
 		return JpaQueryFactory.INSTANCE.fromMethodWithQueryString(queryMethod, em, queryString, countQueryString,
 				QueryRewriter.IdentityQueryRewriter.INSTANCE, ValueExpressionDelegate.create());
 	}
 
-	private AbstractJpaQuery createJpaQuery(Method method, @Nullable Optional<String> countQueryString) {
+	private AbstractJpaQuery createJpaQuery(Method method, Optional<String> countQueryString) {
 
 		JpaQueryMethod queryMethod = new JpaQueryMethod(method, metadata, factory, extractor);
-		return createJpaQuery(queryMethod, queryMethod.getAnnotatedQuery(), countQueryString == null ? null : countQueryString.orElse(queryMethod.getCountQuery()));
+		return createJpaQuery(queryMethod, queryMethod.getAnnotatedQuery(),  countQueryString.orElse(queryMethod.getCountQuery()));
 	}
 
 	interface SampleRepository {