Avoid reflection in RepositoryRestMvcConfiguration.

We now completely avoid reflection in RepositoryRestMvcConfiguration by delaying all bean lookups that were previously declared through autowired fields.

Fixes #2057.

Author: odrotbohm

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

@@ -29,7 +29,6 @@
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -88,6 +87,7 @@
 import org.springframework.data.rest.webmvc.support.RepositoryEntityLinks;
 import org.springframework.data.util.AnnotatedTypeScanner;
 import org.springframework.data.util.Lazy;
+import org.springframework.data.util.StreamUtils;
 import org.springframework.data.web.HateoasPageableHandlerMethodArgumentResolver;
 import org.springframework.data.web.HateoasSortHandlerMethodArgumentResolver;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
@@ -155,47 +155,43 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
 	private static final boolean IS_JPA_AVAILABLE = ClassUtils.isPresent("javax.persistence.EntityManager",
 			RepositoryRestMvcConfiguration.class.getClassLoader());
 
-	@Autowired ApplicationContext applicationContext;
+	private final ApplicationContext applicationContext;
+	private final ConversionService defaultConversionService;
 
-	@Autowired(required = false) List<EntityLookup<?>> lookups = Collections.emptyList();
-
-	@Autowired List<HttpMessageConverter<?>> defaultMessageConverters;
-
-	ObjectProvider<LinkRelationProvider> relProvider;
-	ObjectProvider<CurieProvider> curieProvider;
-	ObjectProvider<HalConfiguration> halConfiguration;
-	ObjectProvider<ObjectMapper> objectMapper;
-	ObjectProvider<RepresentationModelProcessorInvoker> invoker;
-	ObjectProvider<MessageResolver> resolver;
-	ObjectProvider<GeoModule> geoModule;
-
-	ConversionService defaultConversionService;
+	private final ObjectProvider<LinkRelationProvider> relProvider;
+	private final ObjectProvider<CurieProvider> curieProvider;
+	private final ObjectProvider<HalConfiguration> halConfiguration;
+	private final ObjectProvider<ObjectMapper> objectMapper;
+	private final ObjectProvider<RepresentationModelProcessorInvoker> invoker;
+	private final ObjectProvider<MessageResolver> resolver;
+	private final ObjectProvider<GeoModule> geoModule;
+	private final ObjectProvider<PathPatternParser> parser;
 
 	private final Lazy<ObjectMapper> mapper;
-	private final ObjectProvider<PathPatternParser> parser;
+	private final Lazy<? extends List<EntityLookup<?>>> lookups;
+	private final Lazy<? extends List<HttpMessageConverter<?>>> defaultMessageConverters;
+	private final Lazy<RepositoryRestConfigurerDelegate> configurerDelegate;
+	private final Lazy<SelfLinkProvider> selfLinkProvider;
+	private final Lazy<PersistentEntityResourceHandlerMethodArgumentResolver> persistentEntityArgumentResolver;
+	private final Lazy<RootResourceInformationHandlerMethodArgumentResolver> repoRequestArgumentResolver;
+	private final Lazy<BaseUri> baseUri;
+	private final Lazy<RepositoryResourceMappings> resourceMappings;
+	private final Lazy<Repositories> repositories;
+	private final Lazy<ResourceMetadataHandlerMethodArgumentResolver> resourceMetadataHandlerMethodArgumentResolver;
+	private final Lazy<ExcerptProjector> excerptProjector;
+	private final Lazy<PersistentEntities> persistentEntities;
+	private final Lazy<BackendIdHandlerMethodArgumentResolver> backendIdHandlerMethodArgumentResolver;
+	private final Lazy<Associations> associationLinks;
+	private final Lazy<EnumTranslator> enumTranslator;
+	private final Lazy<ServerHttpRequestMethodArgumentResolver> serverHttpRequestMethodArgumentResolver;
+	private final Lazy<ETagArgumentResolver> eTagArgumentResolver;
+	private final Lazy<RepositoryInvokerFactory> repositoryInvokerFactory;
+	private final Lazy<RepositoryRestConfiguration> repositoryRestConfiguration;
+	private final Lazy<HateoasPageableHandlerMethodArgumentResolver> pageableResolver;
+	private final Lazy<HateoasSortHandlerMethodArgumentResolver> sortResolver;
 
 	private ClassLoader beanClassLoader;
 
-	private Lazy<RepositoryRestConfigurerDelegate> configurerDelegate;
-	private Lazy<SelfLinkProvider> selfLinkProvider;
-	private Lazy<PersistentEntityResourceHandlerMethodArgumentResolver> persistentEntityArgumentResolver;
-	private Lazy<RootResourceInformationHandlerMethodArgumentResolver> repoRequestArgumentResolver;
-	private Lazy<BaseUri> baseUri;
-	private Lazy<RepositoryResourceMappings> resourceMappings;
-	private Lazy<Repositories> repositories;
-	private Lazy<ResourceMetadataHandlerMethodArgumentResolver> resourceMetadataHandlerMethodArgumentResolver;
-	private Lazy<ExcerptProjector> excerptProjector;
-	private Lazy<PersistentEntities> persistentEntities;
-	private Lazy<BackendIdHandlerMethodArgumentResolver> backendIdHandlerMethodArgumentResolver;
-	private Lazy<Associations> associationLinks;
-	private Lazy<EnumTranslator> enumTranslator;
-	private Lazy<ServerHttpRequestMethodArgumentResolver> serverHttpRequestMethodArgumentResolver;
-	private Lazy<ETagArgumentResolver> eTagArgumentResolver;
-	private Lazy<RepositoryInvokerFactory> repositoryInvokerFactory;
-	private Lazy<RepositoryRestConfiguration> repositoryRestConfiguration;
-	private Lazy<HateoasPageableHandlerMethodArgumentResolver> pageableResolver;
-	private Lazy<HateoasSortHandlerMethodArgumentResolver> sortResolver;
-
 	public RepositoryRestMvcConfiguration( //
 			ApplicationContext context, //
 			@Qualifier("mvcConversionService") ObjectFactory<ConversionService> conversionService, //
@@ -210,6 +206,7 @@ public RepositoryRestMvcConfiguration( //
 
 		super(context, conversionService);
 
+		this.applicationContext = context;
 		this.relProvider = relProvider;
 		this.curieProvider = curieProvider;
 		this.halConfiguration = halConfiguration;
@@ -218,6 +215,7 @@ public RepositoryRestMvcConfiguration( //
 		this.resolver = resolver;
 		this.geoModule = geoModule;
 		this.parser = parser;
+		this.defaultConversionService = new DefaultFormattingConversionService();
 
 		this.mapper = Lazy.of(() -> {
 
@@ -253,11 +251,10 @@ public RepositoryRestMvcConfiguration( //
 		this.serverHttpRequestMethodArgumentResolver = Lazy
 				.of(() -> context.getBean(ServerHttpRequestMethodArgumentResolver.class));
 		this.eTagArgumentResolver = Lazy.of(() -> context.getBean(ETagArgumentResolver.class));
+
 		this.repositoryInvokerFactory = Lazy.of(() -> new UnwrappingRepositoryInvokerFactory(
 				new DefaultRepositoryInvokerFactory(repositories.get(), defaultConversionService), getEntityLookups()));
 
-		this.defaultConversionService = new DefaultFormattingConversionService();
-
 		this.configurerDelegate = Lazy.of(() -> {
 
 			return new RepositoryRestConfigurerDelegate(context.getBeanProvider(RepositoryRestConfigurer.class)
@@ -268,6 +265,11 @@ public RepositoryRestMvcConfiguration( //
 		this.repositoryRestConfiguration = Lazy.of(() -> context.getBean(RepositoryRestConfiguration.class));
 		this.pageableResolver = Lazy.of(() -> context.getBean(HateoasPageableHandlerMethodArgumentResolver.class));
 		this.sortResolver = Lazy.of(() -> context.getBean(HateoasSortHandlerMethodArgumentResolver.class));
+
+		// Resolution via ResolvableType needed to make the wildcard assignment work
+
+		this.lookups = beansOfType(context, EntityLookup.class);
+		this.defaultMessageConverters = beansOfType(context, HttpMessageConverter.class);
 	}
 
 	/*
@@ -747,7 +749,7 @@ public void extendHandlerExceptionResolvers(List<HandlerExceptionResolver> excep
 		ExceptionHandlerExceptionResolver er = new ExceptionHandlerExceptionResolver();
 		er.setCustomArgumentResolvers(defaultMethodArgumentResolvers(selfLinkProvider.get(),
 				persistentEntityArgumentResolver.get(), repoRequestArgumentResolver.get()));
-		er.setMessageConverters(defaultMessageConverters);
+		er.setMessageConverters(defaultMessageConverters.get());
 
 		configurerDelegate.get().configureExceptionHandlerExceptionResolver(er);
 
@@ -879,7 +881,7 @@ protected List<EntityLookup<?>> getEntityLookups() {
 
 		List<EntityLookup<?>> lookups = new ArrayList<>();
 		lookups.addAll(repositoryRestConfiguration.get().getEntityLookups(repositories.get()));
-		lookups.addAll(this.lookups);
+		lookups.addAll(this.lookups.get());
 
 		return lookups;
 	}
@@ -990,6 +992,23 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 				.forEach(it -> it.customizeResources(registry, repositoryRestConfiguration.get()));
 	}
 
+	/**
+	 * Helper to be able to obtain a {@link List} of generic types. Otherwise the assignment from {@code Foo} to
+	 * {@code Foo<?>} doesn't work.
+	 *
+	 * @param <S>
+	 * @param context
+	 * @param type
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	private static <S> Lazy<List<S>> beansOfType(ApplicationContext context, Class<?> type) {
+
+		return Lazy.of(() -> (List<S>) context.getBeanProvider(type)
+				.orderedStream()
+				.collect(StreamUtils.toUnmodifiableList()));
+	}
+
 	private static class ResourceSupportHttpMessageConverter extends TypeConstrainedMappingJackson2HttpMessageConverter
 			implements Ordered {