spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Brian Clozel
2026-04-01 11:06:24 +02:00
parent 6b5f0e92b1 aebf7c97f7
commit 5e16e25109
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/converter/DefaultHttpMessageConverters.java
+15 -19
View File
@@ -505,11 +505,11 @@ class DefaultHttpMessageConverters implements HttpMessageConverters {
}
List<HttpMessageConverter<?>> partConverters = new ArrayList<>(this.getCustomConverters());
List<HttpMessageConverter<?>> allConverters = new ArrayList<>(this.getCustomConverters());
if (this.registerDefaults) {
allConverters.addAll(this.getBaseConverters());
if (this.resourceConverter != null) {
allConverters.add(this.resourceConverter);
}
allConverters.addAll(this.getBaseConverters());
if (this.resourceConverter != null) {
allConverters.add(this.resourceConverter);
}
if (!this.getCoreConverters().isEmpty()) {
// use separate instances of base converters for multipart
partConverters.addAll(List.of(new ByteArrayHttpMessageConverter(),
new StringHttpMessageConverter(), new ResourceHttpMessageConverter()));
@@ -518,9 +518,7 @@ class DefaultHttpMessageConverters implements HttpMessageConverters {
if (!partConverters.isEmpty() || !allConverters.isEmpty()) {
allConverters.add(new MultipartHttpMessageConverter(partConverters));
}
if (this.registerDefaults) {
allConverters.addAll(this.getCoreConverters());
}
allConverters.addAll(this.getCoreConverters());
if (this.convertersListConfigurer != null) {
this.convertersListConfigurer.accept(allConverters);
}
@@ -641,14 +639,14 @@ class DefaultHttpMessageConverters implements HttpMessageConverters {
}
List<HttpMessageConverter<?>> partConverters = new ArrayList<>(this.getCustomConverters());
List<HttpMessageConverter<?>> allConverters = new ArrayList<>(this.getCustomConverters());
if (this.registerDefaults) {
allConverters.addAll(this.getBaseConverters());
if (this.resourceConverter != null) {
allConverters.add(this.resourceConverter);
}
if (this.resourceRegionConverter != null) {
allConverters.add(this.resourceRegionConverter);
}
allConverters.addAll(this.getBaseConverters());
if (this.resourceConverter != null) {
allConverters.add(this.resourceConverter);
}
if (this.resourceRegionConverter != null) {
allConverters.add(this.resourceRegionConverter);
}
if (!this.getCoreConverters().isEmpty()) {
// use separate instances of base converters for multipart
partConverters.addAll(List.of(new ByteArrayHttpMessageConverter(),
new StringHttpMessageConverter(), new ResourceHttpMessageConverter()));
@@ -657,9 +655,7 @@ class DefaultHttpMessageConverters implements HttpMessageConverters {
if (!partConverters.isEmpty() || !allConverters.isEmpty()) {
allConverters.add(new MultipartHttpMessageConverter(partConverters));
}
if (this.registerDefaults) {
allConverters.addAll(this.getCoreConverters());
}
allConverters.addAll(this.getCoreConverters());
if (this.convertersListConfigurer != null) {
this.convertersListConfigurer.accept(allConverters);
}
spring-web/src/test/java/org/springframework/http/converter/DefaultHttpMessageConvertersTests.java
+10 -5
View File
@@ -186,10 +186,13 @@ class DefaultHttpMessageConvertersTests {
}
@Test
void shouldNotConfigureOverridesWhenDefaultOff() {
void shouldConfigureOverridesWhenDefaultOff() {
var stringConverter = new StringHttpMessageConverter();
var converters = HttpMessageConverters.forClient().withStringConverter(stringConverter).build();
assertThat(converters).isEmpty();
assertThat(converters).hasExactlyElementsOfTypes(
StringHttpMessageConverter.class, MultipartHttpMessageConverter.class);
var configured = findMessageConverter(StringHttpMessageConverter.class, converters);
assertThat(configured).isEqualTo(stringConverter);
}
@Test
@@ -320,12 +323,14 @@ class DefaultHttpMessageConvertersTests {
assertThat(multipartConverter.getPartConverters()).hasAtLeastOneElementOfType(CustomHttpMessageConverter.class);
}
@Test
void shouldNotConfigureOverridesWhenDefaultOff() {
void shouldConfigureOverridesWhenDefaultOff() {
var stringConverter = new StringHttpMessageConverter();
var converters = HttpMessageConverters.forServer().withStringConverter(stringConverter).build();
assertThat(converters).isEmpty();
assertThat(converters).hasExactlyElementsOfTypes(
StringHttpMessageConverter.class, MultipartHttpMessageConverter.class);
var configured = findMessageConverter(StringHttpMessageConverter.class, converters);
assertThat(configured).isEqualTo(stringConverter);
}
@Test