do not register bean for method context

Author: christophstrobl

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

@@ -15,7 +15,8 @@
  */
 package org.springframework.data.repository.config;
 
-import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.*;
+import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.GENERATED_BEAN_NAME_SEPARATOR;
+import static org.springframework.beans.factory.support.BeanDefinitionReaderUtils.generateBeanName;
 
 import java.lang.annotation.Annotation;
 import java.util.Collection;
@@ -27,20 +28,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.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.log.LogMessage;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.RepositoryMethodContext;
 import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
-import org.springframework.data.repository.core.support.DefaultRepositoryMethodContext;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -113,34 +110,7 @@ public String getDefaultNamedQueryLocation() {
 
 	@Override
 	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(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;
-		}
-
-
-	}
+			RepositoryConfigurationSource configurationSource) {}
 
 	/**
 	 * Returns the prefix of the module to be used to create the default location for Spring Data named queries.

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

@@ -276,24 +276,6 @@ void considersGenericLength() {
 		assertThat(it.getGeneric(1).resolve()).isEqualTo(Person.class);
 	}
 
-	@Test // GH-3175
-	void registersRepositoryMethodContextForInjection() {
-
-		var environment = new StandardEnvironment();
-		var context = new GenericApplicationContext();
-		context.registerBean("fragment", MyFragmentImpl.class);
-
-		RepositoryConfigurationSource configSource = new AnnotationRepositoryConfigurationSource(
-				AnnotationMetadata.introspect(TestConfig.class), EnableRepositories.class, context, environment,
-				context.getDefaultListableBeanFactory(), new AnnotationBeanNameGenerator());
-
-		var delegate = new RepositoryConfigurationDelegate(configSource, context, environment);
-
-		delegate.registerRepositoriesIn(context, extension);
-
-		assertThat(context.containsBeanDefinition("repositoryMethodContextFactory")).isTrue();
-	}
-
 	private static ListableBeanFactory assertLazyRepositoryBeanSetup(Class<?> configClass) {
 
 		var context = new AnnotationConfigApplicationContext(configClass);