diff --git a/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java b/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java
index d1f9c7e408..dac61093c4 100644
--- a/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java
+++ b/src/main/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSource.java
@@ -51,6 +51,7 @@
  * @author Mark Paluch
  * @author Johannes Englmeier
  * @author Florian Cramer
+ * @author Yanming Zhou
  */
 public class AnnotationRepositoryConfigurationSource extends RepositoryConfigurationSourceSupport {
 
@@ -68,8 +69,6 @@ public class AnnotationRepositoryConfigurationSource extends RepositoryConfigura
 	private final AnnotationMetadata enableAnnotationMetadata;
 	private final AnnotationAttributes attributes;
 	private final ResourceLoader resourceLoader;
-	private final Environment environment;
-	private final BeanDefinitionRegistry registry;
 	private final boolean hasExplicitFilters;
 
 	/**
@@ -121,8 +120,6 @@ public AnnotationRepositoryConfigurationSource(AnnotationMetadata metadata, Clas
 		this.enableAnnotationMetadata = AnnotationMetadata.introspect(annotation);
 		this.configMetadata = metadata;
 		this.resourceLoader = resourceLoader;
-		this.environment = environment;
-		this.registry = registry;
 		this.hasExplicitFilters = hasExplicitFilters(attributes);
 	}
 
diff --git a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java
index d2682b5859..8417513610 100644
--- a/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java
+++ b/src/main/java/org/springframework/data/repository/config/RepositoryConfigurationSourceSupport.java
@@ -34,14 +34,13 @@
  * @author Thomas Darimont
  * @author Peter Rietzler
  * @author Jens Schauder
+ * @author Yanming Zhou
  */
 public abstract class RepositoryConfigurationSourceSupport implements RepositoryConfigurationSource {
 
-	protected static final String DEFAULT_REPOSITORY_IMPL_POSTFIX = "Impl";
-
-	private final Environment environment;
+	protected final Environment environment;
 	private final RepositoryBeanNameGenerator beanNameGenerator;
-	private final BeanDefinitionRegistry registry;
+	protected final BeanDefinitionRegistry registry;
 
 	/**
 	 * Creates a new {@link RepositoryConfigurationSourceSupport} with the given environment.
@@ -117,7 +116,7 @@ public ImplementationDetectionConfiguration toImplementationDetectionConfigurati
 		return new SpringImplementationDetectionConfiguration(this, factory);
 	}
 
-	private class SpringImplementationDetectionConfiguration implements ImplementationDetectionConfiguration {
+	private static class SpringImplementationDetectionConfiguration implements ImplementationDetectionConfiguration {
 
 		private final RepositoryConfigurationSource source;
 		private final MetadataReaderFactory metadataReaderFactory;