Defer MappingContext lookup in PersistentEntities to allow bean creation while MappingContext is being initialized.

Closes #2489

Author: mp911de

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

@@ -19,6 +19,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -274,9 +275,8 @@ public RepositoryRestMvcConfiguration( //
 
 		this.configurerDelegate = Lazy.of(() -> {
 
-			return new RepositoryRestConfigurerDelegate(context.getBeanProvider(RepositoryRestConfigurer.class)
-					.orderedStream()
-					.collect(Collectors.toList()));
+			return new RepositoryRestConfigurerDelegate(
+					context.getBeanProvider(RepositoryRestConfigurer.class).orderedStream().collect(Collectors.toList()));
 		});
 
 		this.repositoryRestConfiguration = Lazy.of(() -> context.getBean(RepositoryRestConfiguration.class));
@@ -316,16 +316,11 @@ public RepositoryRelProvider repositoryRelProvider(ObjectFactory<ResourceMapping
 	}
 
 	@Bean
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public PersistentEntities persistentEntities() {
 
-		List<MappingContext<?, ?>> arrayList = new ArrayList<>();
-
-		for (MappingContext<?, ?> context : BeanFactoryUtils
-				.beansOfTypeIncludingAncestors(applicationContext, MappingContext.class).values()) {
-			arrayList.add(context);
-		}
-
-		return new PersistentEntities(arrayList);
+		return new PersistentEntities(() -> (Iterator) BeanFactoryUtils
+				.beansOfTypeIncludingAncestors(applicationContext, MappingContext.class).values().iterator());
 	}
 
 	@Bean
@@ -337,8 +332,7 @@ public DefaultFormattingConversionService defaultConversionService(PersistentEnt
 		Supplier<ConversionService> supplier = () -> conversionService;
 
 		// Add Spring Data Commons formatters
-		conversionService
-				.addConverter(new UriToEntityConverter(persistentEntities, repositoryInvokerFactory, supplier));
+		conversionService.addConverter(new UriToEntityConverter(persistentEntities, repositoryInvokerFactory, supplier));
 		conversionService.addConverter(new StringToAggregateReferenceConverter(supplier));
 		conversionService.addConverter(StringToLdapNameConverter.INSTANCE);
 		addFormatters(conversionService);
@@ -450,8 +444,7 @@ public ResourceMetadataHandlerMethodArgumentResolver resourceMetadataHandlerMeth
 	@Bean
 	public BackendIdHandlerMethodArgumentResolver backendIdHandlerMethodArgumentResolver(
 			PluginRegistry<BackendIdConverter, Class<?>> backendIdConverterRegistry,
-			ResourceMetadataHandlerMethodArgumentResolver resourceMetadataHandlerMethodArgumentResolver,
-			BaseUri baseUri) {
+			ResourceMetadataHandlerMethodArgumentResolver resourceMetadataHandlerMethodArgumentResolver, BaseUri baseUri) {
 
 		return new BackendIdHandlerMethodArgumentResolver(backendIdConverterRegistry,
 				resourceMetadataHandlerMethodArgumentResolver, baseUri);
@@ -469,8 +462,7 @@ public ETagArgumentResolver eTagArgumentResolver() {
 	 * @return
 	 */
 	@Bean
-	public RepositoryEntityLinks entityLinks(
-			ObjectFactory<HateoasPageableHandlerMethodArgumentResolver> pageableResolver, //
+	public RepositoryEntityLinks entityLinks(ObjectFactory<HateoasPageableHandlerMethodArgumentResolver> pageableResolver, //
 			Repositories repositories, //
 			RepositoryResourceMappings resourceMappings, //
 			PluginRegistry<BackendIdConverter, //
@@ -494,18 +486,15 @@ public RepositoryEntityLinks entityLinks(
 	@Bean
 	public PersistentEntityResourceHandlerMethodArgumentResolver persistentEntityArgumentResolver(
 			@Qualifier("defaultMessageConverters") List<HttpMessageConverter<?>> defaultMessageConverters,
-			RootResourceInformationHandlerMethodArgumentResolver repoRequestArgumentResolver,
-			Associations associationLinks,
-			BackendIdHandlerMethodArgumentResolver backendIdHandlerMethodArgumentResolver,
-			PersistentEntities entities) {
+			RootResourceInformationHandlerMethodArgumentResolver repoRequestArgumentResolver, Associations associationLinks,
+			BackendIdHandlerMethodArgumentResolver backendIdHandlerMethodArgumentResolver, PersistentEntities entities) {
 
 		PluginRegistry<EntityLookup<?>, Class<?>> lookups = PluginRegistry.of(getEntityLookups());
 		DomainObjectReader reader = new DomainObjectReader(entities, associationLinks);
 		BindContextFactory factory = new PersistentEntitiesBindContextFactory(entities, defaultConversionService);
 
 		return new PersistentEntityResourceHandlerMethodArgumentResolver(defaultMessageConverters,
-				repoRequestArgumentResolver, backendIdHandlerMethodArgumentResolver,
-				reader, lookups, factory);
+				repoRequestArgumentResolver, backendIdHandlerMethodArgumentResolver, reader, lookups, factory);
 	}
 
 	/**
@@ -520,8 +509,8 @@ public PersistentEntityToJsonSchemaConverter jsonSchemaConverter(PersistentEntit
 			RepositoryRestConfiguration repositoryRestConfiguration) {
 
 		return new PersistentEntityToJsonSchemaConverter(persistentEntities, associationLinks, resolver.getObject(),
-				objectMapper(),
-				repositoryRestConfiguration, new ValueTypeSchemaPropertyCustomizerFactory(repositoryInvokerFactory));
+				objectMapper(), repositoryRestConfiguration,
+				new ValueTypeSchemaPropertyCustomizerFactory(repositoryInvokerFactory));
 	}
 
 	/**
@@ -569,8 +558,7 @@ public TypeConstrainedMappingJackson2HttpMessageConverter jacksonHttpMessageConv
 	//
 
 	@Bean
-	public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter(
-			LinkCollector linkCollector,
+	public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter(LinkCollector linkCollector,
 			RepositoryRestConfiguration repositoryRestConfiguration) {
 
 		ArrayList<MediaType> mediaTypes = new ArrayList<>();
@@ -600,8 +588,7 @@ public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageC
 	 * @since 3.5
 	 */
 	@Bean
-	TypeConstrainedMappingJackson2HttpMessageConverter halFormsJacksonHttpMessageConverter(
-			LinkCollector linkCollector) {
+	TypeConstrainedMappingJackson2HttpMessageConverter halFormsJacksonHttpMessageConverter(LinkCollector linkCollector) {
 
 		LinkRelationProvider defaultedRelProvider = this.relProvider.getIfUnique(EvoInflectorLinkRelationProvider::new);
 		HalFormsConfiguration configuration = new HalFormsConfiguration(
@@ -612,9 +599,8 @@ TypeConstrainedMappingJackson2HttpMessageConverter halFormsJacksonHttpMessageCon
 
 		mapper.registerModule(persistentEntityJackson2Module(linkCollector));
 		mapper.registerModule(new Jackson2HalFormsModule());
-		mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(
-				defaultedRelProvider, curieProvider, resolver.getObject(), configuration.getHalConfiguration(),
-				applicationContext.getAutowireCapableBeanFactory()));
+		mapper.setHandlerInstantiator(new Jackson2HalModule.HalHandlerInstantiator(defaultedRelProvider, curieProvider,
+				resolver.getObject(), configuration.getHalConfiguration(), applicationContext.getAutowireCapableBeanFactory()));
 
 		return new HalFormsHttpMessageConverter(applicationContext, mapper);
 	}
@@ -667,9 +653,9 @@ public RequestMappingHandlerAdapter repositoryExporterHandlerAdapter(
 		initializer.setConversionService(defaultConversionService);
 		initializer.setValidator(validator.getIfUnique());
 
-		RepositoryRestHandlerAdapter handlerAdapter = new RepositoryRestHandlerAdapter(defaultMethodArgumentResolvers(
-				selfLinkProvider, persistentEntityArgumentResolver, persistentEntityResourceAssemblerArgumentResolver,
-				repoRequestArgumentResolver));
+		RepositoryRestHandlerAdapter handlerAdapter = new RepositoryRestHandlerAdapter(
+				defaultMethodArgumentResolvers(selfLinkProvider, persistentEntityArgumentResolver,
+						persistentEntityResourceAssemblerArgumentResolver, repoRequestArgumentResolver));
 		handlerAdapter.setWebBindingInitializer(initializer);
 		handlerAdapter.setMessageConverters(defaultMessageConverters);
 
@@ -739,8 +725,7 @@ protected Module persistentEntityJackson2Module(LinkCollector linkCollector) {
 
 		EmbeddedResourcesAssembler assembler = new EmbeddedResourcesAssembler(persistentEntities.get(),
 				associationLinks.get(), excerptProjector.get());
-		LookupObjectSerializer lookupObjectSerializer = new LookupObjectSerializer(
-				PluginRegistry.of(getEntityLookups()));
+		LookupObjectSerializer lookupObjectSerializer = new LookupObjectSerializer(PluginRegistry.of(getEntityLookups()));
 
 		return new PersistentEntityJackson2Module(associationLinks.get(), persistentEntities.get(),
 				new UriToEntityConverter(persistentEntities.get(), repositoryInvokerFactory.get(),
@@ -753,8 +738,7 @@ protected LinkCollector linkCollector(PersistentEntities persistentEntities, Sel
 			Associations associationLinks) {
 
 		return configurerDelegate.get()
-				.customizeLinkCollector(
-						new DefaultLinkCollector(persistentEntities, selfLinkProvider, associationLinks));
+				.customizeLinkCollector(new DefaultLinkCollector(persistentEntities, selfLinkProvider, associationLinks));
 	}
 
 	@Bean
@@ -771,9 +755,9 @@ public void extendHandlerExceptionResolvers(List<HandlerExceptionResolver> excep
 
 		ExceptionHandlerExceptionResolver er = new ExceptionHandlerExceptionResolver();
 		er.setApplicationContext(applicationContext);
-		er.setCustomArgumentResolvers(defaultMethodArgumentResolvers(selfLinkProvider.get(),
-				persistentEntityArgumentResolver.get(), persistentEntityResourceAssemblerArgumentResolver.get(),
-				repoRequestArgumentResolver.get()));
+		er.setCustomArgumentResolvers(
+				defaultMethodArgumentResolvers(selfLinkProvider.get(), persistentEntityArgumentResolver.get(),
+						persistentEntityResourceAssemblerArgumentResolver.get(), repoRequestArgumentResolver.get()));
 		er.setMessageConverters(defaultMessageConverters.get());
 
 		configurerDelegate.get().configureExceptionHandlerExceptionResolver(er);
@@ -948,8 +932,7 @@ PersistentEntityResourceAssemblerArgumentResolver persistentEntityResourceAssemb
 		projectionFactory.setBeanClassLoader(beanClassLoader);
 
 		return new PersistentEntityResourceAssemblerArgumentResolver(persistentEntities.get(), selfLinkProvider.get(),
-				repositoryRestConfiguration.get().getProjectionConfiguration(), projectionFactory,
-				associationLinks.get());
+				repositoryRestConfiguration.get().getProjectionConfiguration(), projectionFactory, associationLinks.get());
 	}
 
 	protected ObjectMapper basicObjectMapper() {
@@ -965,10 +948,8 @@ protected ObjectMapper basicObjectMapper() {
 		configurerDelegate.get().configureJacksonObjectMapper(objectMapper);
 
 		objectMapper.registerModule(geoModule.getObject());
-		objectMapper.registerModule(new AggregateReferenceResolvingModule(
-				new UriToEntityConverter(persistentEntities.get(), repositoryInvokerFactory.get(),
-						() -> defaultConversionService),
-				resourceMappings.get()));
+		objectMapper.registerModule(new AggregateReferenceResolvingModule(new UriToEntityConverter(persistentEntities.get(),
+				repositoryInvokerFactory.get(), () -> defaultConversionService), resourceMappings.get()));
 
 		if (repositoryRestConfiguration.get().isEnableEnumTranslation()) {
 			objectMapper.registerModule(new JacksonSerializers(enumTranslator.get()));
@@ -1040,9 +1021,8 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
 	@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()));
+		return Lazy
+				.of(() -> (List<S>) context.getBeanProvider(type).orderedStream().collect(StreamUtils.toUnmodifiableList()));
 	}
 
 	private static class ResourceSupportHttpMessageConverter extends TypeConstrainedMappingJackson2HttpMessageConverter