Improve query method validation exceptions for declared queries.

When validating manually declared queries on repositories, the exception that captures the query to validate now actually also reports it in the exception message.

Closes: #2736.
Original pull request: #2738

Author: odrotbohm

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

@@ -48,11 +48,10 @@ public SimpleJpaQuery(JpaQueryMethod method, EntityManager em, DeclaredQuery que
 
 		super(method, em, query, countQuery, queryConfiguration);
 
-		validateQuery(getQuery().getQueryString(), "Validation failed for query for method %s", method);
+		validateQuery(getQuery(), "Validation failed for query %s for method %s", method);
 
 		if (method.isPageQuery()) {
-			validateQuery(getCountQuery().getQueryString(),
-					String.format("Count query validation failed for method %s", method));
+			validateQuery(getCountQuery(), "Count query %s validation failed for method %s", method);
 		}
 	}
 
@@ -62,19 +61,24 @@ public SimpleJpaQuery(JpaQueryMethod method, EntityManager em, DeclaredQuery que
 	 * @param query
 	 * @param errorMessage
 	 */
-	private void validateQuery(String query, String errorMessage, Object... arguments) {
+	private void validateQuery(QueryProvider query, String errorMessage, JpaQueryMethod method) {
 
 		if (getQueryMethod().isProcedureQuery()) {
 			return;
 		}
 
-        try (EntityManager validatingEm = getEntityManager().getEntityManagerFactory().createEntityManager()) {
-            validatingEm.createQuery(query);
-        } catch (RuntimeException e) {
+		EntityManager validatingEm = null;
+		var queryString = query.getQueryString();
+
+		try {
+			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://java.net/projects/jpa-spec/lists/jsr338-experts/archive/2012-07/message/17
-            throw new IllegalArgumentException(String.format(errorMessage, arguments), e);
+            // https://download.oracle.com/javaee-archive/jpa-spec.java.net/users/2012/07/0404.html
+            throw new IllegalArgumentException(errorMessage.formatted(query, method), e);
         }
 	}
 }

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

@@ -41,7 +41,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -194,14 +193,15 @@ void doesNotValidateCountQueryIfNotPagingMethod() throws Exception {
 	}
 
 	@Test // DATAJPA-352
-	@SuppressWarnings("unchecked")
 	void validatesAndRejectsCountQueryIfPagingMethod() throws Exception {
 
 		Method method = SampleRepository.class.getMethod("pageByAnnotatedQuery", Pageable.class);
 
 		when(em.createQuery(Mockito.contains("count"))).thenThrow(IllegalArgumentException.class);
 
-		assertThatIllegalArgumentException().isThrownBy(() -> createJpaQuery(method)).withMessageContaining("Count")
+		assertThatIllegalArgumentException() //
+				.isThrownBy(() -> createJpaQuery(method)) //
+				.withMessageContaining("Count") //
 				.withMessageContaining(method.getName());
 	}