root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Sébastien Deleuze 2025-02-18 11:41:47 +01:00
parent 4dd83c814c 2099e046d3
commit 63ee6e6fe2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java
View File

@ -435,6 +435,7 @@ final class DefaultRestClientBuilder implements RestClient.Builder {
private List<HttpMessageConverter<?>> initMessageConverters() { private List<HttpMessageConverter<?>> initMessageConverters() {
if (this.messageConverters == null) { if (this.messageConverters == null) {
this.messageConverters = new ArrayList<>(); this.messageConverters = new ArrayList<>();
this.messageConverters.add(new ByteArrayHttpMessageConverter()); this.messageConverters.add(new ByteArrayHttpMessageConverter());
this.messageConverters.add(new StringHttpMessageConverter()); this.messageConverters.add(new StringHttpMessageConverter());
this.messageConverters.add(new ResourceHttpMessageConverter(false)); this.messageConverters.add(new ResourceHttpMessageConverter(false));
@ -468,19 +469,21 @@ final class DefaultRestClientBuilder implements RestClient.Builder {
else if (kotlinSerializationJsonPresent) { else if (kotlinSerializationJsonPresent) {
this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter()); this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());
} }
if (jackson2SmilePresent) { if (jackson2SmilePresent) {
this.messageConverters.add(new MappingJackson2SmileHttpMessageConverter()); this.messageConverters.add(new MappingJackson2SmileHttpMessageConverter());
} }
if (jackson2CborPresent) { if (jackson2CborPresent) {
this.messageConverters.add(new MappingJackson2CborHttpMessageConverter()); this.messageConverters.add(new MappingJackson2CborHttpMessageConverter());
} }
else if (kotlinSerializationCborPresent) { else if (kotlinSerializationCborPresent) {
this.messageConverters.add(new KotlinSerializationCborHttpMessageConverter()); this.messageConverters.add(new KotlinSerializationCborHttpMessageConverter());
} }
if (jackson2YamlPresent) { if (jackson2YamlPresent) {
this.messageConverters.add(new MappingJackson2YamlHttpMessageConverter()); this.messageConverters.add(new MappingJackson2YamlHttpMessageConverter());
} }
} }
return this.messageConverters; return this.messageConverters;
} }