Avoid eager reference to BackendIdConverter beans.

Switched to bean method parameter reference to all BackendIdConverter instances.

Fixes #2055.
This commit is contained in:
Oliver Drotbohm
2021-08-19 23:19:08 +02:00
parent 160f35ed10
commit 9cd9e1cef9

View File

@@ -158,7 +158,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
@Autowired ApplicationContext applicationContext;
@Autowired(required = false) List<BackendIdConverter> idConverters = Collections.emptyList();
@Autowired(required = false) List<EntityLookup<?>> lookups = Collections.emptyList();
@Autowired List<HttpMessageConverter<?>> defaultMessageConverters;
@@ -848,10 +847,10 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
}
@Bean
public PluginRegistry<BackendIdConverter, Class<?>> backendIdConverterRegistry() {
public PluginRegistry<BackendIdConverter, Class<?>> backendIdConverterRegistry(
List<BackendIdConverter> backendIdConverter) {
List<BackendIdConverter> converters = new ArrayList<>(idConverters.size());
converters.addAll(this.idConverters);
List<BackendIdConverter> converters = new ArrayList<>(backendIdConverter);
converters.add(DefaultIdConverter.INSTANCE);
return PluginRegistry.of(converters);