From aae3df0cdc6d3d0ef8b06d1cb5a03494b7c9f603 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Thu, 26 Jun 2025 17:26:00 +0200 Subject: [PATCH] Adapt to HttpMessageConverters changes in Framework See spring-projects/spring-framework#33894 --- .../web/servlet/WebMvcAutoConfiguration.java | 1 + .../http/HttpMessageConvertersTests.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index 465684b8c31..1b4e27f6e57 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -217,6 +217,7 @@ public class WebMvcAutoConfiguration { } @Override + @SuppressWarnings("removal") public void configureMessageConverters(List> converters) { this.messageConvertersProvider .ifAvailable((customConverters) -> converters.addAll(customConverters.getConverters())); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java index 1e475098368..e70674676f1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersTests.java @@ -56,9 +56,9 @@ class HttpMessageConvertersTests { } assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, - ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class, - MappingJackson2HttpMessageConverter.class, MappingJackson2CborHttpMessageConverter.class, - MappingJackson2YamlHttpMessageConverter.class, MappingJackson2XmlHttpMessageConverter.class); + ResourceRegionHttpMessageConverter.class, MappingJackson2HttpMessageConverter.class, + MappingJackson2CborHttpMessageConverter.class, MappingJackson2YamlHttpMessageConverter.class, + AllEncompassingFormHttpMessageConverter.class, MappingJackson2XmlHttpMessageConverter.class); } @Test @@ -126,9 +126,9 @@ class HttpMessageConvertersTests { } assertThat(converterClasses).containsExactly(ByteArrayHttpMessageConverter.class, StringHttpMessageConverter.class, ResourceHttpMessageConverter.class, - ResourceRegionHttpMessageConverter.class, AllEncompassingFormHttpMessageConverter.class, - MappingJackson2HttpMessageConverter.class, MappingJackson2CborHttpMessageConverter.class, - MappingJackson2YamlHttpMessageConverter.class); + ResourceRegionHttpMessageConverter.class, MappingJackson2HttpMessageConverter.class, + MappingJackson2CborHttpMessageConverter.class, MappingJackson2YamlHttpMessageConverter.class, + AllEncompassingFormHttpMessageConverter.class); } @Test