Do not use instance supplier

Author: christophstrobl

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

@@ -27,6 +27,7 @@
 
 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.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -115,9 +116,30 @@ public void registerBeansForRoot(BeanDefinitionRegistry registry,
 			RepositoryConfigurationSource configurationSource) {
 
 		// A proxy RepositoryMethodContext for dependency injection
+//		registerIfNotAlreadyRegistered(
+//				() -> new RootBeanDefinition(RepositoryMethodContext.class, DefaultRepositoryMethodContext::getInjectionProxy),
+//				registry, "repositoryMethodContextFactory", configurationSource);
+
 		registerIfNotAlreadyRegistered(
-				() -> new RootBeanDefinition(RepositoryMethodContext.class, DefaultRepositoryMethodContext::getInjectionProxy),
-				registry, "repositoryMethodContextFactory", configurationSource);
+			() -> new RootBeanDefinition(RepositoryMethodContextFactoryBean.class),
+			registry, "repositoryMethodContextFactory", configurationSource);
+	}
+
+	static class RepositoryMethodContextFactoryBean implements FactoryBean<RepositoryMethodContext> {
+
+		@Nullable
+		@Override
+		public RepositoryMethodContext getObject() throws Exception {
+			return DefaultRepositoryMethodContext.getInjectionProxy();
+		}
+
+		@Nullable
+		@Override
+		public Class<?> getObjectType() {
+			return RepositoryMethodContext.class;
+		}
+
+
 	}
 
 	/**