Skip to content

Commit c1a2ae1

Browse files
committed
Avoid eager reference to BackendIdConverter beans.
Switched to bean method parameter reference to all BackendIdConverter instances. Fixes #2055.
1 parent 516726a commit c1a2ae1

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
158158

159159
@Autowired ApplicationContext applicationContext;
160160

161-
@Autowired(required = false) List<BackendIdConverter> idConverters = Collections.emptyList();
162161
@Autowired(required = false) List<EntityLookup<?>> lookups = Collections.emptyList();
163162

164163
@Autowired List<HttpMessageConverter<?>> defaultMessageConverters;
@@ -809,10 +808,10 @@ public HateoasSortHandlerMethodArgumentResolver sortResolver() {
809808
}
810809

811810
@Bean
812-
public PluginRegistry<BackendIdConverter, Class<?>> backendIdConverterRegistry() {
811+
public PluginRegistry<BackendIdConverter, Class<?>> backendIdConverterRegistry(
812+
List<BackendIdConverter> backendIdConverter) {
813813

814-
List<BackendIdConverter> converters = new ArrayList<>(idConverters.size());
815-
converters.addAll(this.idConverters);
814+
List<BackendIdConverter> converters = new ArrayList<>(backendIdConverter);
816815
converters.add(DefaultIdConverter.INSTANCE);
817816

818817
return PluginRegistry.of(converters);

0 commit comments

Comments
 (0)