Adopt JpaParameters to reflect the actual parameter type when using generics

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-jpa-parent</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.0-GH-3254-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data JPA Parent</name>
@@ -37,7 +37,7 @@
 		<jsqlparser>4.5</jsqlparser>
 		<mysql-connector-java>8.0.33</mysql-connector-java>
 		<postgresql>42.6.0</postgresql>
-		<springdata.commons>3.3.0-SNAPSHOT</springdata.commons>
+		<springdata.commons>3.3.0-GH-2995-SNAPSHOT</springdata.commons>
 		<vavr>0.10.3</vavr>
 
 		<hibernate.groupId>org.hibernate</hibernate.groupId>

spring-data-envers/pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-envers</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.0-GH-3254-SNAPSHOT</version>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-jpa-parent</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.0-GH-3254-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.3.0-SNAPSHOT</version>
+		<version>3.3.0-GH-3254-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.3.0-SNAPSHOT</version>
+	<version>3.3.0-GH-3254-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.3.0-SNAPSHOT</version>
+		<version>3.3.0-GH-3254-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -20,12 +20,15 @@
 import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.List;
+import java.util.function.Function;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.data.jpa.repository.Temporal;
 import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;
+import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.Parameters;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
 
 /**
@@ -41,16 +44,43 @@ public class JpaParameters extends Parameters<JpaParameters, JpaParameter> {
 	 * Creates a new {@link JpaParameters} instance from the given {@link Method}.
 	 *
 	 * @param method must not be {@literal null}.
+	 * @deprecated since 3.2.1, use {@link #JpaParameters(RepositoryMetadata, Method)} instead.
 	 */
+	@Deprecated(since = "3.2.1", forRemoval = true)
 	public JpaParameters(Method method) {
-		super(method);
+		super(null, method, null);
+	}
+
+	/**
+	 * Creates a new {@link JpaParameters} instance from the given {@link Method}.
+	 *
+	 * @param method must not be {@literal null}.
+	 * @param metadata not be {@literal null}.
+	 * @since 3.2.1
+	 */
+	public JpaParameters(RepositoryMetadata metadata, Method method) {
+		super(metadata, method, methodParameter -> new JpaParameter(methodParameter, metadata.getDomainTypeInformation()));
+	}
+
+	/**
+	 * Creates a new {@link JpaParameters} instance from the given {@link Method}.
+	 *
+	 * @param metadata must not be {@literal null}.
+	 * @param method must not be {@literal null}.
+	 * @param parameterFactory must not be {@literal null}.
+	 * @since 3.2.1
+	 */
+	protected JpaParameters(RepositoryMetadata metadata, Method method,
+			Function<MethodParameter, JpaParameter> parameterFactory) {
+		super(metadata, method, parameterFactory);
 	}
 
 	private JpaParameters(List<JpaParameter> parameters) {
 		super(parameters);
 	}
 
 	@Override
+	@Deprecated(forRemoval = true)
 	protected JpaParameter createParameter(MethodParameter parameter) {
 		return new JpaParameter(parameter);
 	}
@@ -82,14 +112,31 @@ public static class JpaParameter extends Parameter {
 		 * Creates a new {@link JpaParameter}.
 		 *
 		 * @param parameter must not be {@literal null}.
+		 * @deprecated since 3.2.1
 		 */
+		@Deprecated(since = "3.2.1", forRemoval = true)
 		protected JpaParameter(MethodParameter parameter) {
 
 			super(parameter);
 
 			this.annotation = parameter.getParameterAnnotation(Temporal.class);
 			this.temporalType = null;
+			if (!isDateParameter() && hasTemporalParamAnnotation()) {
+				throw new IllegalArgumentException(
+						Temporal.class.getSimpleName() + " annotation is only allowed on Date parameter");
+			}
+		}
 
+		/**
+		 * Creates a new {@link JpaParameter}.
+		 *
+		 * @param parameter must not be {@literal null}.
+		 */
+		protected JpaParameter(MethodParameter parameter, TypeInformation<?> domainType) {
+
+			super(parameter, domainType);
+			this.annotation = parameter.getParameterAnnotation(Temporal.class);
+			this.temporalType = null;
 			if (!isDateParameter() && hasTemporalParamAnnotation()) {
 				throw new IllegalArgumentException(
 						Temporal.class.getSimpleName() + " annotation is only allowed on Date parameter");

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

@@ -447,8 +447,8 @@ private <T> T getMergedOrDefaultAnnotationValue(String attribute, Class annotati
 	}
 
 	@Override
-	protected JpaParameters createParameters(Method method) {
-		return new JpaParameters(method);
+	protected JpaParameters createParameters(RepositoryMetadata metadata, Method method) {
+		return new JpaParameters(metadata, method);
 	}
 
 	@Override

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

@@ -18,20 +18,24 @@
 import static jakarta.persistence.TemporalType.*;
 import static org.assertj.core.api.Assertions.*;
 
+import jakarta.persistence.TemporalType;
+
 import java.lang.reflect.Method;
 import java.util.Date;
 
-import jakarta.persistence.TemporalType;
-
 import org.junit.jupiter.api.Test;
+
 import org.springframework.data.jpa.repository.Temporal;
 import org.springframework.data.jpa.repository.query.JpaParameters.JpaParameter;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
 
 /**
  * Unit tests for {@link JpaParameters}.
  *
  * @author Oliver Gierke
  * @author Jens Schauder
+ * @author Mark Paluch
  */
 class JpaParametersUnitTests {
 
@@ -40,7 +44,7 @@ void findsTemporalParameterConfiguration() throws Exception {
 
 		Method method = SampleRepository.class.getMethod("foo", Date.class, String.class);
 
-		JpaParameters parameters = new JpaParameters(method);
+		JpaParameters parameters = new JpaParameters(new DefaultRepositoryMetadata(SampleRepository.class), method);
 
 		JpaParameter parameter = parameters.getBindableParameter(0);
 		assertThat(parameter.isSpecialParameter()).isFalse();
@@ -51,7 +55,7 @@ void findsTemporalParameterConfiguration() throws Exception {
 		assertThat(parameter.isTemporalParameter()).isFalse();
 	}
 
-	interface SampleRepository {
+	interface SampleRepository extends Repository<String, String> {
 
 		void foo(@Temporal(TIMESTAMP) Date date, String firstname);
 	}

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

@@ -68,6 +68,7 @@
  * @author Mark Paluch
  * @author Erik Pellizzon
  */
+@SuppressWarnings({"rawtypes", "unchecked"})
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
 class JpaQueryMethodUnitTests {
@@ -156,6 +157,8 @@ void returnsQueryIfAvailable() throws Exception {
 	void rejectsInvalidReturntypeOnPagebleFinder() {
 
 		when(metadata.getReturnedDomainClass(any())).thenReturn((Class) User.class);
+		when(metadata.getDomainTypeInformation()).thenReturn((TypeInformation) TypeInformation.of(User.class));
+		when(metadata.getRepositoryInterface()).thenReturn((Class) InvalidRepository.class);
 
 		assertThatIllegalStateException()
 				.isThrownBy(() -> new JpaQueryMethod(invalidReturnType, metadata, factory, extractor));
@@ -165,6 +168,8 @@ void rejectsInvalidReturntypeOnPagebleFinder() {
 	void rejectsPageableAndSortInFinderMethod() {
 
 		when(metadata.getReturnedDomainClass(any())).thenReturn((Class) User.class);
+		when(metadata.getDomainTypeInformation()).thenReturn((TypeInformation) TypeInformation.of(User.class));
+		when(metadata.getRepositoryInterface()).thenReturn((Class) InvalidRepository.class);
 
 		assertThatIllegalStateException()
 				.isThrownBy(() -> new JpaQueryMethod(pageableAndSort, metadata, factory, extractor));
@@ -318,8 +323,10 @@ void detectsLockAndQueryHintsOnIfUsedAsMetaAnnotation() throws Exception {
 	@Test // DATAJPA-466
 	void shouldStoreJpa21FetchGraphInformationAsHint() {
 
-		doReturn(User.class).when(metadata).getDomainType();
-		doReturn(User.class).when(metadata).getReturnedDomainClass(queryMethodWithCustomEntityFetchGraph);
+		when(metadata.getDomainType()).thenReturn((Class) User.class);
+		when(metadata.getReturnedDomainClass(queryMethodWithCustomEntityFetchGraph)).thenReturn((Class) User.class);
+		when(metadata.getDomainTypeInformation()).thenReturn((TypeInformation) TypeInformation.of(User.class));
+		when(metadata.getRepositoryInterface()).thenReturn((Class) InvalidRepository.class);
 
 		JpaQueryMethod method = new JpaQueryMethod(queryMethodWithCustomEntityFetchGraph, metadata, factory, extractor);
 
@@ -331,8 +338,10 @@ void shouldStoreJpa21FetchGraphInformationAsHint() {
 	@Test // DATAJPA-612
 	void shouldFindEntityGraphAnnotationOnOverriddenSimpleJpaRepositoryMethod() throws Exception {
 
-		doReturn(User.class).when(metadata).getDomainType();
-		doReturn(User.class).when(metadata).getReturnedDomainClass((Method) any());
+		when(metadata.getDomainType()).thenReturn((Class) User.class);
+		when(metadata.getReturnedDomainClass(any())).thenReturn((Class) User.class);
+		when(metadata.getReturnedDomainClass(queryMethodWithCustomEntityFetchGraph)).thenReturn((Class) User.class);
+		when(metadata.getRepositoryInterface()).thenReturn((Class) JpaRepositoryOverride.class);
 
 		JpaQueryMethod method = new JpaQueryMethod(JpaRepositoryOverride.class.getMethod("findAll"), metadata, factory,
 				extractor);
@@ -345,8 +354,10 @@ void shouldFindEntityGraphAnnotationOnOverriddenSimpleJpaRepositoryMethod() thro
 	@Test // DATAJPA-689
 	void shouldFindEntityGraphAnnotationOnOverriddenSimpleJpaRepositoryMethodFindOne() throws Exception {
 
-		doReturn(User.class).when(metadata).getDomainType();
-		doReturn(User.class).when(metadata).getReturnedDomainClass((Method) any());
+		when(metadata.getDomainType()).thenReturn((Class) User.class);
+		when(metadata.getReturnedDomainClass(any())).thenReturn((Class) User.class);
+		when(metadata.getDomainTypeInformation()).thenReturn((TypeInformation) TypeInformation.of(User.class));
+		when(metadata.getRepositoryInterface()).thenReturn((Class) InvalidRepository.class);
 
 		JpaQueryMethod method = new JpaQueryMethod(JpaRepositoryOverride.class.getMethod("findOne", Integer.class),
 				metadata, factory, extractor);
@@ -362,8 +373,10 @@ void shouldFindEntityGraphAnnotationOnOverriddenSimpleJpaRepositoryMethodFindOne
 	@Test
 	void shouldFindEntityGraphAnnotationOnQueryMethodGetOneByWithDerivedName() throws Exception {
 
-		doReturn(User.class).when(metadata).getDomainType();
-		doReturn(User.class).when(metadata).getReturnedDomainClass((Method) any());
+		when(metadata.getDomainType()).thenReturn((Class) User.class);
+		when(metadata.getDomainTypeInformation()).thenReturn((TypeInformation) TypeInformation.of(User.class));
+		when(metadata.getReturnedDomainClass(any())).thenReturn((Class) User.class);
+		when(metadata.getRepositoryInterface()).thenReturn((Class) JpaRepositoryOverride.class);
 
 		JpaQueryMethod method = new JpaQueryMethod(JpaRepositoryOverride.class.getMethod("getOneById", Integer.class),
 				metadata, factory, extractor);
@@ -473,8 +486,10 @@ void usesAliasedValueForQueryNativeQuery() throws Exception {
 	@Test // DATAJPA-871
 	void usesAliasedValueForEntityGraph() throws Exception {
 
-		doReturn(User.class).when(metadata).getDomainType();
-		doReturn(User.class).when(metadata).getReturnedDomainClass((Method) any());
+		when(metadata.getDomainType()).thenReturn((Class) User.class);
+		when(metadata.getDomainTypeInformation()).thenReturn((TypeInformation) TypeInformation.of(User.class));
+		when(metadata.getReturnedDomainClass(any())).thenReturn((Class) User.class);
+		when(metadata.getRepositoryInterface()).thenReturn((Class) JpaRepositoryOverride.class);
 
 		JpaQueryMethod method = new JpaQueryMethod(
 				JpaRepositoryOverride.class.getMethod("getOneWithCustomEntityGraphAnnotation"), metadata, factory, extractor);

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

@@ -15,14 +15,9 @@
  */
 package org.springframework.data.jpa.repository.query;
 
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
@@ -38,6 +33,7 @@
 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.Pageable;
 import org.springframework.data.jpa.provider.QueryExtractor;
@@ -75,6 +71,7 @@ void setUp() throws SecurityException, NoSuchMethodException {
 
 		method = SampleRepository.class.getMethod("foo", Pageable.class);
 		when(metadata.getDomainType()).thenReturn((Class) String.class);
+		when(metadata.getDomainTypeInformation()).thenReturn((TypeInformation) TypeInformation.of(String.class));
 		when(metadata.getReturnedDomainClass(method)).thenReturn((Class) String.class);
 		when(metadata.getReturnType(any(Method.class)))
 				.thenAnswer(invocation -> TypeInformation.fromReturnTypeOf(invocation.getArgument(0)));