Skip to content

Commit 7e919d2

Browse files
bclozelbclozel
committed
Reorder multipart converter for server converters
Closes spring-projectsgh-33894
1 parent beedf0a commit 7e919d2

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎spring-web/src/main/java/org/springframework/http/converter/DefaultHttpMessageConverters.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -589,11 +589,11 @@ List<HttpMessageConverter<?>> getMessageConverters() {
589589

590590
allConverters.addAll(this.serverMessageConverters.getBaseConverters());
591591
allConverters.addAll(this.resourceMessageConverters);
592-
allConverters.addAll(this.serverMessageConverters.getCoreConverters());
593-
allConverters.addAll(this.serverMessageConverters.getCustomConverters());
594592
if (!partConverters.isEmpty()) {
595593
allConverters.add(new AllEncompassingFormHttpMessageConverter(partConverters));
596594
}
595+
allConverters.addAll(this.serverMessageConverters.getCoreConverters());
596+
allConverters.addAll(this.serverMessageConverters.getCustomConverters());
597597
if (this.configurer != null) {
598598
allConverters.forEach(this.configurer);
599599
}

‎spring-web/src/test/java/org/springframework/http/converter/DefaultHttpMessageConvertersTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,11 @@ void defaultConverters() {
219219
assertThat(converters.forServer()).hasExactlyElementsOfTypes(
220220
ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class,
221221
ResourceHttpMessageConverter.class, ResourceRegionHttpMessageConverter.class,
222+
AllEncompassingFormHttpMessageConverter.class,
222223
JacksonJsonHttpMessageConverter.class, JacksonSmileHttpMessageConverter.class,
223224
JacksonCborHttpMessageConverter.class, JacksonYamlHttpMessageConverter.class,
224225
JacksonXmlHttpMessageConverter.class, KotlinSerializationProtobufHttpMessageConverter.class,
225-
AtomFeedHttpMessageConverter.class, RssChannelHttpMessageConverter.class,
226-
AllEncompassingFormHttpMessageConverter.class);
226+
AtomFeedHttpMessageConverter.class, RssChannelHttpMessageConverter.class);
227227
}
228228

229229
@Test
@@ -244,7 +244,7 @@ void multipartConverterContainsOtherConverters() {
244244
void registerCustomMessageConverter() {
245245
var converters = HttpMessageConverters.create()
246246
.additionalMessageConverter(new CustomHttpMessageConverter()).build();
247-
assertThat(converters.forServer()).hasExactlyElementsOfTypes(CustomHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class);
247+
assertThat(converters.forServer()).hasExactlyElementsOfTypes(AllEncompassingFormHttpMessageConverter.class, CustomHttpMessageConverter.class);
248248
}
249249

250250
@Test

‎spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ void requestMappingHandlerAdapter() {
213213
List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
214214
assertThat(converters).hasSize(3);
215215
assertThat(converters.get(0).getClass()).isEqualTo(StringHttpMessageConverter.class);
216-
assertThat(converters.get(1).getClass()).isEqualTo(JacksonJsonHttpMessageConverter.class);
217-
assertThat(converters.get(2).getClass()).isEqualTo(AllEncompassingFormHttpMessageConverter.class);
218-
ObjectMapper objectMapper = ((JacksonJsonHttpMessageConverter) converters.get(1)).getObjectMapper();
216+
assertThat(converters.get(1).getClass()).isEqualTo(AllEncompassingFormHttpMessageConverter.class);
217+
assertThat(converters.get(2).getClass()).isEqualTo(JacksonJsonHttpMessageConverter.class);
218+
ObjectMapper objectMapper = ((JacksonJsonHttpMessageConverter) converters.get(2)).getObjectMapper();
219219
assertThat(objectMapper.deserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)).isFalse();
220220
assertThat(objectMapper.deserializationConfig().isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)).isFalse();
221221
assertThat(objectMapper.serializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)).isFalse();

0 commit comments

Comments
 (0)