Make target type of bean definition more accurate

Now generics of RepositoryFactoryBean will use generics from Repository instead of Object.class if possible

Author: quaff

Diff for: src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java

@@ -46,6 +46,8 @@
 import org.springframework.core.log.LogMessage;
 import org.springframework.core.metrics.ApplicationStartup;
 import org.springframework.core.metrics.StartupStep;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.RepositoryDefinition;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.data.util.ReflectionUtils;
 import org.springframework.lang.Nullable;
@@ -64,6 +66,7 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  * @author John Blum
+ * @author Yanming Zhou
  */
 public class RepositoryConfigurationDelegate {
 
@@ -330,12 +333,26 @@ private ResolvableType getRepositoryInterface(RepositoryConfiguration<?> configu
 
 		int numberOfGenerics = factoryBean.getTypeParameters().length;
 
-		Class<?>[] generics = new Class<?>[numberOfGenerics];
-		generics[0] = repositoryInterface;
+		ResolvableType[] generics = new ResolvableType[numberOfGenerics];
+		generics[0] = ResolvableType.forClass(repositoryInterface);
 
 		if (numberOfGenerics > 1) {
-			for (int i = 1; i < numberOfGenerics; i++) {
-				generics[i] = Object.class;
+			ResolvableType[] typeArguments;
+			if (repositoryInterface.isAnnotationPresent(RepositoryDefinition.class)) {
+				RepositoryDefinition rd = repositoryInterface.getAnnotation(RepositoryDefinition.class);
+				typeArguments = new ResolvableType[] { ResolvableType.forClass(rd.domainClass()), ResolvableType.forClass(rd.idClass()) };
+			}
+			else {
+				typeArguments = generics[0].as(Repository.class).getGenerics();
+			}
+
+			if (typeArguments.length == numberOfGenerics - 1) {
+				System.arraycopy(typeArguments, 0, generics, 1, numberOfGenerics - 1);
+			}
+			else {
+				for (int i = 1; i < numberOfGenerics; i++) {
+					generics[i] = ResolvableType.forClass(Object.class);
+				}
 			}
 		}
 

Diff for: src/test/java/org/springframework/data/repository/config/RepositoryConfigurationDelegateUnitTests.java

@@ -26,13 +26,15 @@
 import org.springframework.aop.framework.Advised;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.AnnotationBeanNameGenerator;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.ResolvableType;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.metrics.ApplicationStartup;
 import org.springframework.core.type.AnnotationMetadata;
@@ -46,13 +48,19 @@
 import org.springframework.data.repository.core.support.DummyRepositoryFactoryBean;
 import org.springframework.data.repository.sample.AddressRepository;
 import org.springframework.data.repository.sample.AddressRepositoryClient;
+import org.springframework.data.repository.sample.Product;
 import org.springframework.data.repository.sample.ProductRepository;
+import org.springframework.data.repository.sample.SampleAnnotatedRepository;
+
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * Unit tests for {@link RepositoryConfigurationDelegate}.
  *
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Yanming Zhou
  * @soundtrack Richard Spaven - Tribute (Whole Other*)
  */
 @ExtendWith(MockitoExtension.class)
@@ -87,6 +95,38 @@ void registersRepositoryBeanNameAsAttribute() {
 		}
 	}
 
+	@Test
+	void registersAccurateTargetTypeOfBeanDefinition() {
+
+		var environment = new StandardEnvironment();
+		var context = new GenericApplicationContext();
+
+		RepositoryConfigurationSource configSource = new AnnotationRepositoryConfigurationSource(
+				new StandardAnnotationMetadata(TestConfig.class, true), EnableRepositories.class, context, environment,
+				context.getDefaultListableBeanFactory(), null);
+
+		var delegate = new RepositoryConfigurationDelegate(configSource, context, environment);
+		List<BeanComponentDefinition> bcds = delegate.registerRepositoriesIn(context, extension);
+		var productRepository = bcds.stream().filter(bcd ->
+				bcd.getName().equals("productRepository")).map(BeanComponentDefinition::getBeanDefinition).findFirst();
+		var sampleAnnotatedRepository = bcds.stream().filter(bcd ->
+				bcd.getName().equals("sampleAnnotatedRepository")).map(BeanComponentDefinition::getBeanDefinition).findFirst();
+
+		assertThat(productRepository).isPresent().get().isInstanceOfSatisfying(RootBeanDefinition.class, it -> {
+			ResolvableType[] generics = it.getResolvableType().getGenerics();
+			assertThat(generics[0].resolve()).isSameAs(ProductRepository.class);
+			assertThat(generics[1].resolve()).isSameAs(Product.class);
+			assertThat(generics[2].resolve()).isSameAs(Long.class);
+		});
+
+		assertThat(sampleAnnotatedRepository).isPresent().get().isInstanceOfSatisfying(RootBeanDefinition.class, it -> {
+			ResolvableType[] generics = it.getResolvableType().getGenerics();
+			assertThat(generics[0].resolve()).isSameAs(SampleAnnotatedRepository.class);
+			assertThat(generics[1].resolve()).isSameAs(Object.class);
+			assertThat(generics[2].resolve()).isSameAs(Serializable.class);
+		});
+	}
+
 	@Test // DATACMNS-1368
 	void registersLazyAutowireCandidateResolver() {
 		assertLazyRepositoryBeanSetup(LazyConfig.class);