Drop using FACTORY_BEAN_OBJECT_TYPE attribute entirely.

We now constantly use RootBeanDefinition.setBeanClass(…) (for the raw factory type) and ….setTargetType(…) to declare the actual repository type.

Ticket: #2894.

Author: odrotbohm

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

@@ -25,17 +25,16 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.AutowireCandidateResolver;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.context.annotation.ContextAnnotationAutowireCandidateResolver;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.env.Environment;
@@ -70,7 +69,6 @@ public class RepositoryConfigurationDelegate {
 	private static final String REPOSITORY_REGISTRATION = "Spring Data %s - Registering repository: %s - Interface: %s - Factory: %s";
 	private static final String MULTIPLE_MODULES = "Multiple Spring Data modules found, entering strict repository configuration mode";
 	private static final String NON_DEFAULT_AUTOWIRE_CANDIDATE_RESOLVER = "Non-default AutowireCandidateResolver (%s) detected. Skipping the registration of LazyRepositoryInjectionPointResolver. Lazy repository injection will not be working";
-	private static final String FACTORY_BEAN_OBJECT_TYPE = FactoryBean.OBJECT_TYPE_ATTRIBUTE;
 
 	private static final Log logger = LogFactory.getLog(RepositoryConfigurationDelegate.class);
 
@@ -183,9 +181,10 @@ public List<BeanComponentDefinition> registerRepositoriesIn(BeanDefinitionRegist
 				extension.postProcess(definitionBuilder, (AnnotationRepositoryConfigurationSource) configurationSource);
 			}
 
-			AbstractBeanDefinition beanDefinition = definitionBuilder.getBeanDefinition();
+			RootBeanDefinition beanDefinition = (RootBeanDefinition) definitionBuilder.getBeanDefinition();
 
-			beanDefinition.setAttribute(FACTORY_BEAN_OBJECT_TYPE, getRepositoryInterface(configuration));
+			beanDefinition.setTargetType(getRepositoryInterface(configuration));
+			// beanDefinition.setAttribute(FACTORY_BEAN_OBJECT_TYPE, getRepositoryInterface(configuration));
 			beanDefinition.setResourceDescription(configuration.getResourceDescription());
 
 			String beanName = configurationSource.generateBeanName(beanDefinition);
@@ -323,7 +322,8 @@ private Class<?> getRepositoryInterface(RepositoryConfiguration<?> configuration
 				? ClassUtils.getDefaultClassLoader()
 				: resourceLoader.getClassLoader();
 
-		return ReflectionUtils.loadIfPresent(interfaceName, classLoader);
+		return ReflectionUtils.loadIfPresent(interfaceName,
+				classLoader != null ? classLoader : getClass().getClassLoader());
 	}
 
 	/**

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

@@ -39,7 +39,6 @@
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.DecoratingProxy;
-import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.aot.AotContext;
 import org.springframework.data.projection.EntityProjectionIntrospector;
@@ -219,18 +218,9 @@ protected void enhanceRepositoryBeanDefinition(RegisteredBean repositoryBean,
 				.introspectType(repositoryMetadata.getRepositoryFactoryBeanClassName()).resolveType()
 				.orElse(RepositoryFactoryBeanSupport.class);
 
-		ResolvableType resolvedRepositoryFactoryBeanType = ResolvableType.forClass(repositoryFactoryBeanType);
-
 		RootBeanDefinition repositoryBeanDefinition = repositoryBean.getMergedBeanDefinition();
-
-		if (isRepositoryWithTypeParameters(resolvedRepositoryFactoryBeanType)) {
-			repositoryBeanDefinition.setTargetType(ResolvableType.forClassWithGenerics(repositoryFactoryBeanType,
-					repositoryContext.getRepositoryInformation().getRepositoryInterface(), Object.class, Object.class));
-		} else {
-			repositoryBeanDefinition.setTargetType(resolvedRepositoryFactoryBeanType);
-			repositoryBeanDefinition.setAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE,
-					repositoryContext.getRepositoryInformation().getRepositoryInterface());
-		}
+		repositoryBeanDefinition.setBeanClass(repositoryFactoryBeanType);
+		repositoryBeanDefinition.setTargetType(repositoryContext.getRepositoryInformation().getRepositoryInterface());
 	}
 
 	/**
@@ -239,8 +229,6 @@ protected void enhanceRepositoryBeanDefinition(RegisteredBean repositoryBean,
 	 * @param moduleContribution {@link BiConsumer} used by data modules to submit contributions; can be {@literal null}.
 	 * @return this.
 	 */
-
-	@SuppressWarnings("unused")
 	public RepositoryRegistrationAotContribution withModuleContribution(
 			@Nullable BiConsumer<AotRepositoryContext, GenerationContext> moduleContribution) {
 		this.moduleContribution = moduleContribution;
@@ -385,8 +373,4 @@ static boolean isJavaOrPrimitiveType(Class<?> type) {
 	public Predicate<Class<?>> typeFilter() { // like only document ones. // TODO: As in MongoDB?
 		return it -> true;
 	}
-
-	private static boolean isRepositoryWithTypeParameters(ResolvableType type) {
-		return type.getGenerics().length == 3;
-	}
 }

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

@@ -25,8 +25,8 @@
 import org.mockito.quality.Strictness;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.ListableBeanFactory;
+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;
@@ -76,10 +76,13 @@ void registersRepositoryBeanNameAsAttribute() {
 		for (var definition : delegate.registerRepositoriesIn(context, extension)) {
 
 			var beanDefinition = definition.getBeanDefinition();
-			var attribute = beanDefinition.getAttribute(FactoryBean.OBJECT_TYPE_ATTRIBUTE);
 
-			assertThat(attribute).isInstanceOfSatisfying(Class.class, it -> {
-				assertThat(it.getName()).endsWith("Repository");
+			assertThat(beanDefinition).isInstanceOfSatisfying(RootBeanDefinition.class, it -> {
+
+				var type = it.getTargetType();
+
+				assertThat(type).isNotNull();
+				assertThat(type.getName()).endsWith("Repository");
 			});
 		}
 	}