Return parsed and rewritten query string from DefaultEntityQuery.

We now return the rewritten form of a query with all normalization and reformatting applied by QueryEnhancer. This allows a consistent representation of query strings.

Closes #4034

Author: mp911de

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

@@ -20,6 +20,8 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.data.util.Lazy;
+
 /**
  * Encapsulation of a JPA query string, typically returning entities or DTOs. Provides access to parameter bindings.
  * <p>
@@ -40,11 +42,13 @@
 class DefaultEntityQuery implements EntityQuery, DeclaredQuery {
 
 	private final PreprocessedQuery query;
+	private final Lazy<String> queryString;
 	private final QueryEnhancer queryEnhancer;
 
 	DefaultEntityQuery(PreprocessedQuery query, QueryEnhancerFactory queryEnhancerFactory) {
 		this.query = query;
 		this.queryEnhancer = queryEnhancerFactory.create(query);
+		this.queryString = Lazy.of(() -> queryEnhancer.getQuery().getQueryString());
 	}
 
 	@Override
@@ -59,7 +63,7 @@ public boolean isNative() {
 
 	@Override
 	public String getQueryString() {
-		return query.getQueryString();
+		return queryString.get();
 	}
 
 	@Override

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

@@ -281,10 +281,10 @@ void reusesPositionalLikeBindingsWherePossible() {
 		assertThat(query.getQueryString()).isEqualTo(
 				"select u from User u where u.firstname like ?1 or u.firstname like ?2 or u.firstname like ?2 or u.firstname like ?1");
 
-		query = new TestEntityQuery("select u from User u where u.firstname like %?1 or u.firstname =?1", false);
+		query = new TestEntityQuery("select u from User u where u.firstname like %?1 or u.firstname = ?1", false);
 
 		assertThat(query.hasParameterBindings()).isTrue();
-		assertThat(query.getQueryString()).isEqualTo("select u from User u where u.firstname like ?1 or u.firstname =?2");
+		assertThat(query.getQueryString()).isEqualTo("select u from User u where u.firstname like ?1 or u.firstname = ?2");
 	}
 
 	@Test // GH-3041

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

@@ -99,7 +99,6 @@ class SimpleJpaQueryUnitTests {
 	private ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
 
 	@BeforeEach
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	void setUp() throws SecurityException, NoSuchMethodException {
 
 		when(em.getMetamodel()).thenReturn(metamodel);
@@ -148,7 +147,6 @@ void doesNotApplyPaginationToCountQuery() throws Exception {
 	}
 
 	@Test
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	void discoversNativeQuery() throws Exception {
 
 		Method method = SampleRepository.class.getMethod("findNativeByLastname", String.class);
@@ -166,7 +164,6 @@ void discoversNativeQuery() throws Exception {
 	}
 
 	@Test // GH-3155
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	void discoversNativeQueryFromNativeQueryInterface() throws Exception {
 
 		Method method = SampleRepository.class.getMethod("findByLastnameNativeAnnotation", String.class);
@@ -184,7 +181,6 @@ void discoversNativeQueryFromNativeQueryInterface() throws Exception {
 	}
 
 	@Test // DATAJPA-352
-	@SuppressWarnings("unchecked")
 	void doesNotValidateCountQueryIfNotPagingMethod() throws Exception {
 
 		Method method = SampleRepository.class.getMethod("findByAnnotatedQuery");
@@ -346,7 +342,7 @@ void resolvesExpressionInCountQuery() throws Exception {
 		JpaQueryMethod queryMethod = new JpaQueryMethod(method, metadata, factory, extractor);
 
 		AbstractJpaQuery jpaQuery = new SimpleJpaQuery(queryMethod, em,
-				queryMethod.getDeclaredQuery("select u from User u"),
+				queryMethod.getDeclaredQuery("select u from User /*some comment*/ u"),
 				queryMethod.getDeclaredQuery("select count(u.id) from #{#entityName} u"), CONFIG);
 		jpaQuery.createCountQuery(
 				new JpaParametersParameterAccessor(queryMethod.getParameters(), new Object[] { PageRequest.of(1, 10) }));