Skip to content

Commit 63ee6e6

Browse files
committed
Merge branch '6.2.x'
2 parents 4dd83c8 + 2099e04 commit 63ee6e6

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ public RestClient.Builder apply(Consumer<RestClient.Builder> builderConsumer) {
435435
private List<HttpMessageConverter<?>> initMessageConverters() {
436436
if (this.messageConverters == null) {
437437
this.messageConverters = new ArrayList<>();
438+
438439
this.messageConverters.add(new ByteArrayHttpMessageConverter());
439440
this.messageConverters.add(new StringHttpMessageConverter());
440441
this.messageConverters.add(new ResourceHttpMessageConverter(false));
@@ -468,19 +469,21 @@ else if (jsonbPresent) {
468469
else if (kotlinSerializationJsonPresent) {
469470
this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());
470471
}
472+
471473
if (jackson2SmilePresent) {
472474
this.messageConverters.add(new MappingJackson2SmileHttpMessageConverter());
473475
}
476+
474477
if (jackson2CborPresent) {
475478
this.messageConverters.add(new MappingJackson2CborHttpMessageConverter());
476479
}
477480
else if (kotlinSerializationCborPresent) {
478481
this.messageConverters.add(new KotlinSerializationCborHttpMessageConverter());
479482
}
483+
480484
if (jackson2YamlPresent) {
481485
this.messageConverters.add(new MappingJackson2YamlHttpMessageConverter());
482486
}
483-
484487
}
485488
return this.messageConverters;
486489
}

0 commit comments

Comments
 (0)