Skip to content

Commit f2f8775

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

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
@@ -157,7 +157,6 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
157157

158158
@Autowired ApplicationContext applicationContext;
159159

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

163162
@Autowired List<HttpMessageConverter<?>> defaultMessageConverters;
@@ -844,10 +843,10 @@ public HateoasSortHandlerMethodArgumentResolver sortResolver() {
844843
}
845844

846845
@Bean
847-
public PluginRegistry<BackendIdConverter, Class<?>> backendIdConverterRegistry() {
846+
public PluginRegistry<BackendIdConverter, Class<?>> backendIdConverterRegistry(
847+
List<BackendIdConverter> backendIdConverter) {
848848

849-
List<BackendIdConverter> converters = new ArrayList<>(idConverters.size());
850-
converters.addAll(this.idConverters);
849+
List<BackendIdConverter> converters = new ArrayList<>(backendIdConverter);
851850
converters.add(DefaultIdConverter.INSTANCE);
852851

853852
return PluginRegistry.of(converters);

0 commit comments

Comments
 (0)