DATACMNS-891 - Moved to constructor injection for RepositoryFactoryBeanSupport.

RepositoryFactoryBeanSupport now takes the repository interface as a constructor argument instead of as a setter. This makes sure that the container induced type prediction for factory beans actually wires the interface *before* it calls getObjectType() on the instance. This allows us to remove the extra infrastructure we had in place to predict the bean types and autowiring will just work out of the box.

Adapted infrastructure code accordingly, removed obsolete infrastructure code and adapted test cases accordingly.

Author: odrotbohm

src/main/java/org/springframework/data/repository/config/RepositoryBeanDefinitionBuilder.java

@@ -82,13 +82,13 @@ public BeanDefinitionBuilder build(RepositoryConfiguration<?> configuration) {
 		Assert.notNull(resourceLoader, "ResourceLoader must not be null!");
 
 		String factoryBeanName = configuration.getRepositoryFactoryBeanName();
-		factoryBeanName = StringUtils.hasText(factoryBeanName) ? factoryBeanName : extension
-				.getRepositoryFactoryClassName();
+		factoryBeanName = StringUtils.hasText(factoryBeanName) ? factoryBeanName
+				: extension.getRepositoryFactoryClassName();
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(factoryBeanName);
 
 		builder.getRawBeanDefinition().setSource(configuration.getSource());
-		builder.addPropertyValue("repositoryInterface", configuration.getRepositoryInterface());
+		builder.addConstructorArgValue(configuration.getRepositoryInterface());
 		builder.addPropertyValue("queryLookupStrategyKey", configuration.getQueryLookupStrategyKey());
 		builder.addPropertyValue("lazyInit", configuration.isLazyInit());
 		builder.addPropertyValue("repositoryBaseClass", configuration.getRepositoryBaseClassName());
@@ -127,8 +127,8 @@ private String registerCustomImplementation(RepositoryConfiguration<?> configura
 			return beanName;
 		}
 
-		AbstractBeanDefinition beanDefinition = implementationDetector.detectCustomImplementation(
-				configuration.getImplementationClassName(), configuration.getBasePackages());
+		AbstractBeanDefinition beanDefinition = implementationDetector
+				.detectCustomImplementation(configuration.getImplementationClassName(), configuration.getBasePackages());
 
 		if (null == beanDefinition) {
 			return null;

src/main/java/org/springframework/data/repository/config/RepositoryBeanNameGenerator.java

@@ -65,7 +65,7 @@ public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry
 	 */
 	private Class<?> getRepositoryInterfaceFrom(BeanDefinition beanDefinition) {
 
-		Object value = beanDefinition.getPropertyValues().getPropertyValue("repositoryInterface").getValue();
+		Object value = beanDefinition.getConstructorArgumentValues().getArgumentValue(0, Class.class).getValue();
 
 		if (value instanceof Class<?>) {
 			return (Class<?>) value;

src/main/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupport.java

@@ -33,7 +33,6 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -50,8 +49,6 @@ public abstract class RepositoryConfigurationExtensionSupport implements Reposit
 	private static final String CLASS_LOADING_ERROR = "%s - Could not load type %s using class loader %s.";
 	private static final String MULTI_STORE_DROPPED = "Spring Data {} - Could not safely identify store assignment for repository candidate {}.";
 
-	private static final String FACTORY_BEAN_TYPE_PREDICTING_POST_PROCESSOR = "org.springframework.data.repository.core.support.FactoryBeanTypePredictingBeanPostProcessor";
-
 	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getModuleName()
@@ -114,18 +111,8 @@ public String getDefaultNamedQueryLocation() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#registerBeansForRoot(org.springframework.beans.factory.support.BeanDefinitionRegistry, org.springframework.data.repository.config.RepositoryConfigurationSource)
 	 */
-	public void registerBeansForRoot(BeanDefinitionRegistry registry, RepositoryConfigurationSource configurationSource) {
-
-		String typeName = RepositoryFactoryBeanSupport.class.getName();
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder
-				.rootBeanDefinition(FACTORY_BEAN_TYPE_PREDICTING_POST_PROCESSOR);
-		builder.addConstructorArgValue(typeName);
-		builder.addConstructorArgValue("repositoryInterface");
-
-		registerIfNotAlreadyRegistered(builder.getBeanDefinition(), registry, typeName.concat("_Predictor"),
-				configurationSource.getSource());
-	}
+	public void registerBeansForRoot(BeanDefinitionRegistry registry,
+			RepositoryConfigurationSource configurationSource) {}
 
 	/**
 	 * Returns the prefix of the module to be used to create the default location for Spring Data named queries.

src/main/java/org/springframework/data/repository/core/support/FactoryBeanTypePredictingBeanPostProcessor.java

@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Required;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.data.mapping.PersistentEntity;
@@ -53,10 +52,10 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<S, ID>,
 		implements InitializingBean, RepositoryFactoryInformation<S, ID>, FactoryBean<T>, BeanClassLoaderAware,
 		BeanFactoryAware, ApplicationEventPublisherAware {
 
-	private RepositoryFactorySupport factory;
+	private final Class<? extends T> repositoryInterface;
 
+	private RepositoryFactorySupport factory;
 	private Key queryLookupStrategyKey;
-	private Class<? extends T> repositoryInterface;
 	private Class<?> repositoryBaseClass;
 	private Object customImplementation;
 	private NamedQueries namedQueries;
@@ -72,14 +71,13 @@ public abstract class RepositoryFactoryBeanSupport<T extends Repository<S, ID>,
 	private RepositoryMetadata repositoryMetadata;
 
 	/**
-	 * Setter to inject the repository interface to implement.
+	 * Creates a new {@link RepositoryFactoryBeanSupport} for the given repository interface.
 	 * 
-	 * @param repositoryInterface the repository interface to set
+	 * @param repositoryInterface must not be {@literal null}.
 	 */
-	@Required
-	public void setRepositoryInterface(Class<? extends T> repositoryInterface) {
+	protected RepositoryFactoryBeanSupport(Class<? extends T> repositoryInterface) {
 
-		Assert.notNull(repositoryInterface);
+		Assert.notNull(repositoryInterface, "Repository interface must not be null!");
 		this.repositoryInterface = repositoryInterface;
 	}
 
@@ -229,9 +227,8 @@ public T getObject() {
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
 	 */
-	@SuppressWarnings("unchecked")
 	public Class<? extends T> getObjectType() {
-		return (Class<? extends T>) (null == repositoryInterface ? Repository.class : repositoryInterface);
+		return repositoryInterface;
 	}
 
 	/*
@@ -248,8 +245,6 @@ public boolean isSingleton() {
 	 */
 	public void afterPropertiesSet() {
 
-		Assert.notNull(repositoryInterface, "Repository interface must not be null on initialization!");
-
 		this.factory = createRepositoryFactory();
 		this.factory.setQueryLookupStrategyKey(queryLookupStrategyKey);
 		this.factory.setNamedQueries(namedQueries);

src/main/java/org/springframework/data/repository/core/support/RepositoryFactoryBeanSupport.java

@@ -40,6 +40,15 @@ public abstract class TransactionalRepositoryFactoryBeanSupport<T extends Reposi
 	private RepositoryProxyPostProcessor exceptionPostProcessor;
 	private boolean enableDefaultTransactions = true;
 
+	/**
+	 * Creates a new {@link TransactionalRepositoryFactoryBeanSupport} for the given repository interface.
+	 * 
+	 * @param repositoryInterface must not be {@literal null}.
+	 */
+	protected TransactionalRepositoryFactoryBeanSupport(Class<? extends T> repositoryInterface) {
+		super(repositoryInterface);
+	}
+
 	/**
 	 * Setter to configure which transaction manager to be used. We have to use the bean name explicitly as otherwise the
 	 * qualifier of the {@link org.springframework.transaction.annotation.Transactional} annotation is used. By explicitly

src/main/java/org/springframework/data/repository/core/support/TransactionalRepositoryFactoryBeanSupport.java

@@ -62,7 +62,7 @@ public void usesAnnotationValueIfAnnotationPresent() {
 	private BeanDefinition getBeanDefinitionFor(Class<?> repositoryInterface) {
 
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(RepositoryFactoryBeanSupport.class);
-		builder.addPropertyValue("repositoryInterface", repositoryInterface.getName());
+		builder.addConstructorArgValue(repositoryInterface.getName());
 		return builder.getBeanDefinition();
 	}
 

src/test/java/org/springframework/data/repository/config/RepositoryBeanNameGeneratorUnitTests.java

@@ -23,12 +23,7 @@
 import java.util.Collections;
 
 import org.junit.Test;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.env.StandardEnvironment;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.core.type.StandardAnnotationMetadata;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 
@@ -65,26 +60,6 @@ public void considersRepositoryInterfaceExtendingStoreInterfaceStrictMatch() {
 		assertThat(extension.isStrictRepositoryCandidate(ExtendingInterface.class), is(true));
 	}
 
-	/**
-	 * @see DATACMNS-609
-	 */
-	@Test
-	public void registersRepositoryInterfaceAwareBeanPostProcessorOnlyOnceForMultipleConfigurations() {
-
-		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
-		AnnotationMetadata annotationMetadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
-
-		DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
-		StandardEnvironment environment = new StandardEnvironment();
-		AnnotationRepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(
-				annotationMetadata, EnableRepositories.class, resourceLoader, environment);
-
-		extension.registerBeansForRoot(beanFactory, configurationSource);
-		extension.registerBeansForRoot(beanFactory, configurationSource);
-
-		assertThat(beanFactory.getBeanDefinitionCount(), is(1));
-	}
-
 	static class SampleRepositoryConfigurationExtension extends RepositoryConfigurationExtensionSupport {
 
 		@Override