Add support for query hints to count queries supporting findAll(Specification,Pageable)

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa-parent</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-gh-2054-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA Parent</name>

spring-data-envers/pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-envers</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-gh-2054-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-gh-2054-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa-distribution/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-gh-2054-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa</artifactId>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-gh-2054-SNAPSHOT</version>
 
 	<name>Spring Data JPA</name>
 	<description>Spring Data module for JPA repositories.</description>
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-gh-2054-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java

@@ -308,6 +308,13 @@ protected QueryHints getQueryHints() {
 		return metadata == null ? NoHints.INSTANCE : DefaultQueryHints.of(entityInformation, metadata);
 	}
 
+	/**
+	 * Returns {@link QueryHints} with the query hints on the current {@link CrudMethodMetadata} for count queries.
+	 */
+	protected QueryHints getQueryHintsForCount() {
+		return metadata == null ? NoHints.INSTANCE : DefaultQueryHints.of(entityInformation, metadata).forCounts();
+	}
+
 	@Deprecated
 	@Override
 	public T getOne(ID id) {
@@ -749,7 +756,7 @@ protected <S extends T> TypedQuery<Long> getCountQuery(@Nullable Specification<S
 		// Remove all Orders the Specifications might have applied
 		query.orderBy(Collections.emptyList());
 
-		return em.createQuery(query);
+		return applyRepositoryMethodMetadataForCount(em.createQuery(query));
 	}
 
 	/**
@@ -799,6 +806,21 @@ private void applyQueryHints(Query query) {
 		getQueryHints().withFetchGraphs(em).forEach(query::setHint);
 	}
 
+	private <S> TypedQuery<S> applyRepositoryMethodMetadataForCount(TypedQuery<S> query) {
+
+		if (metadata == null) {
+			return query;
+		}
+
+		applyQueryHintsForCount(query);
+
+		return query;
+	}
+
+	private void applyQueryHintsForCount(Query query) {
+		getQueryHintsForCount().forEach(query::setHint);
+	}
+
 	/**
 	 * Executes a count query and transparently sums up all values returned.
 	 *

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/support/SimpleJpaRepositoryUnitTests.java

@@ -18,16 +18,17 @@
 import static java.util.Collections.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
-
-import java.util.Arrays;
-import java.util.Optional;
+import static org.springframework.data.jpa.domain.Specification.*;
 
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 
+import java.util.Arrays;
+import java.util.Optional;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -192,4 +193,14 @@ void doNothingWhenNonExistentInstanceGetsDeleted() {
 		verify(em, never()).remove(newUser);
 		verify(em, never()).merge(newUser);
 	}
+
+	@Test // GH-2054
+	void applyQueryHintsToCountQueriesForSpecificationPageables() {
+
+		when(query.getResultList()).thenReturn(Arrays.asList(new User(), new User()));
+
+		repo.findAll(where(null), PageRequest.of(2, 1));
+
+		verify(metadata).getQueryHintsForCount();
+	}
 }