Avoid RepositoryRestConfigurerDelegate exposed as bean.

Improving the configuration situation for RRCD, whose bean declaration required access to all RepositoryRestConfigurer instances while implementing the interface itself, too.  We now rather hide the creation of that instance in a Lazy as it doesn't need any kind of lifecycle management.

Author: odrotbohm

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestConfigurerDelegate.java

@@ -34,7 +34,7 @@
  * @author Oliver Gierke
  * @soundtrack Florian Reichelt & Max Ender - Abschlusskonzert (https://www.youtube.com/watch?v=5WP0P-ndinY)
  */
-public class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer {
+class RepositoryRestConfigurerDelegate implements RepositoryRestConfigurer {
 
 	private final Iterable<RepositoryRestConfigurer> delegates;
 

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java

@@ -259,17 +259,16 @@ public RepositoryRestMvcConfiguration( //
 				new DefaultRepositoryInvokerFactory(repositories.get(), defaultConversionService), getEntityLookups()));
 
 		this.defaultConversionService = new DefaultFormattingConversionService();
-		this.configurerDelegate = Lazy.of(() -> context.getBean(RepositoryRestConfigurerDelegate.class));
+
+		this.configurerDelegate = Lazy.of(() -> {
+			return new RepositoryRestConfigurerDelegate(context.getBeansOfType(RepositoryRestConfigurer.class).values());
+		});
+
 		this.repositoryRestConfiguration = Lazy.of(() -> context.getBean(RepositoryRestConfiguration.class));
 		this.pageableResolver = Lazy.of(() -> context.getBean(HateoasPageableHandlerMethodArgumentResolver.class));
 		this.sortResolver = Lazy.of(() -> context.getBean(HateoasSortHandlerMethodArgumentResolver.class));
 	}
 
-	@Bean
-	public static RepositoryRestConfigurerDelegate configurerDelegate(List<RepositoryRestConfigurer> configurers) {
-		return new RepositoryRestConfigurerDelegate(configurers);
-	}
-
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader)
@@ -305,8 +304,7 @@ public PersistentEntities persistentEntities() {
 	@Bean
 	@Qualifier
 	public DefaultFormattingConversionService defaultConversionService(PersistentEntities persistentEntities,
-			RepositoryInvokerFactory repositoryInvokerFactory, Repositories repositories,
-			RepositoryRestConfigurerDelegate configurerDelegate) {
+			RepositoryInvokerFactory repositoryInvokerFactory, Repositories repositories) {
 
 		DefaultFormattingConversionService conversionService = (DefaultFormattingConversionService) defaultConversionService;
 
@@ -316,7 +314,7 @@ public DefaultFormattingConversionService defaultConversionService(PersistentEnt
 		conversionService.addConverter(StringToLdapNameConverter.INSTANCE);
 		addFormatters(conversionService);
 
-		configurerDelegate.configureConversionService(conversionService);
+		configurerDelegate.get().configureConversionService(conversionService);
 
 		return conversionService;
 	}
@@ -326,11 +324,11 @@ public DefaultFormattingConversionService defaultConversionService(PersistentEnt
 	 * {@link org.springframework.validation.Validator} instances assigned to specific domain types.
 	 */
 	@Bean
-	public ValidatingRepositoryEventListener validatingRepositoryEventListener(ObjectFactory<PersistentEntities> entities,
-			RepositoryRestConfigurerDelegate configurerDelegate) {
+	public ValidatingRepositoryEventListener validatingRepositoryEventListener(
+			ObjectFactory<PersistentEntities> entities) {
 
 		ValidatingRepositoryEventListener listener = new ValidatingRepositoryEventListener(entities);
-		configurerDelegate.configureValidatingRepositoryEventListener(listener);
+		configurerDelegate.get().configureValidatingRepositoryEventListener(listener);
 
 		return listener;
 	}
@@ -775,7 +773,7 @@ public List<HttpMessageConverter<?>> defaultMessageConverters(
 			@Qualifier("halJacksonHttpMessageConverter") TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter,
 			@Qualifier("halFormsJacksonHttpMessageConverter") TypeConstrainedMappingJackson2HttpMessageConverter halFormsJacksonHttpMessageConverter,
 			AlpsJsonHttpMessageConverter alpsJsonHttpMessageConverter,
-			UriListHttpMessageConverter uriListHttpMessageConverter, RepositoryRestConfigurerDelegate configurerDelegate,
+			UriListHttpMessageConverter uriListHttpMessageConverter,
 			RepositoryRestConfiguration repositoryRestConfiguration) {
 
 		List<HttpMessageConverter<?>> messageConverters = new ArrayList<>();
@@ -800,7 +798,7 @@ public List<HttpMessageConverter<?>> defaultMessageConverters(
 		messageConverters.add(fallbackJsonConverter);
 		messageConverters.add(uriListHttpMessageConverter);
 
-		configurerDelegate.configureHttpMessageConverters(messageConverters);
+		configurerDelegate.get().configureHttpMessageConverters(messageConverters);
 
 		return messageConverters;
 	}