Skip to content

Commit e03ce46

Browse files
committed
DATACMNS-1722 - More defensive lookup of XmlBeamHttpMessageConverter.
We now avoid a type reference to XmlBeamHttpMessageConverter in a field within SpringDataWebConfiguration to avoid a type reference to a potentially unresolvable type. This seems to have caused issues on certain JDK 14 builds [0]. [0] spring-projects/spring-framework#25050
1 parent 6761284 commit e03ce46

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo
6565

6666
private @Autowired Optional<PageableHandlerMethodArgumentResolverCustomizer> pageableResolverCustomizer;
6767
private @Autowired Optional<SortHandlerMethodArgumentResolverCustomizer> sortResolverCustomizer;
68-
private @Autowired Optional<XmlBeamHttpMessageConverter> xmlBeamHttpMessageConverter;
6968

7069
public SpringDataWebConfiguration(ApplicationContext context,
7170
@Qualifier("mvcConversionService") ObjectFactory<ConversionService> conversionService) {
@@ -168,7 +167,9 @@ public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
168167
}
169168

170169
if (ClassUtils.isPresent("org.xmlbeam.XBProjector", context.getClassLoader())) {
171-
converters.add(0, xmlBeamHttpMessageConverter.orElseGet(() -> new XmlBeamHttpMessageConverter()));
170+
171+
converters.add(0, context.getBeanProvider(XmlBeamHttpMessageConverter.class) //
172+
.getIfAvailable(() -> new XmlBeamHttpMessageConverter()));
172173
}
173174
}
174175

0 commit comments

Comments
 (0)