Skip to content

Commit aae3df0

Browse files
committed
Adapt to HttpMessageConverters changes in Framework
See spring-projects/spring-framework#33894
1 parent 741561d commit aae3df0

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ public void setServletContext(ServletContext servletContext) {
217217
}
218218

219219
@Override
220+
@SuppressWarnings("removal")
220221
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
221222
this.messageConvertersProvider
222223
.ifAvailable((customConverters) -> converters.addAll(customConverters.getConverters()));

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ void containsDefaults() {
5656
}
5757
assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class,
5858
StringHttpMessageConverter.class, ResourceHttpMessageConverter.class,
59-
ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class,
60-
MappingJackson2HttpMessageConverter.class, MappingJackson2CborHttpMessageConverter.class,
61-
MappingJackson2YamlHttpMessageConverter.class, MappingJackson2XmlHttpMessageConverter.class);
59+
ResourceRegionHttpMessageConverter.class, MappingJackson2HttpMessageConverter.class,
60+
MappingJackson2CborHttpMessageConverter.class, MappingJackson2YamlHttpMessageConverter.class,
61+
AllEncompassingFormHttpMessageConverter.class, MappingJackson2XmlHttpMessageConverter.class);
6262
}
6363

6464
@Test
@@ -126,9 +126,9 @@ protected List<HttpMessageConverter<?>> postProcessConverters(List<HttpMessageCo
126126
}
127127
assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class,
128128
StringHttpMessageConverter.class, ResourceHttpMessageConverter.class,
129-
ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class,
130-
MappingJackson2HttpMessageConverter.class, MappingJackson2CborHttpMessageConverter.class,
131-
MappingJackson2YamlHttpMessageConverter.class);
129+
ResourceRegionHttpMessageConverter.class, MappingJackson2HttpMessageConverter.class,
130+
MappingJackson2CborHttpMessageConverter.class, MappingJackson2YamlHttpMessageConverter.class,
131+
AllEncompassingFormHttpMessageConverter.class);
132132
}
133133

134134
@Test

0 commit comments

Comments
 (0)