spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-27 04:19:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
Closes gh-49016
This commit is contained in:
Brian Clozel
2026-01-29 09:47:25 +01:00
parent f8f1da605e 53c1f424ce
commit e53d008d07
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-http-converter/src/main/java/org/springframework/boot/http/converter/autoconfigure/Jackson2HttpMessageConvertersConfiguration.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.springframework.boot.http.converter.autoconfigure;
import com.fasterxml.jackson.databind.ObjectMapper;
import tools.jackson.dataformat.xml.XmlMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
module/spring-boot-http-converter/src/test/java/org/springframework/boot/http/converter/autoconfigure/HttpMessageConvertersAutoConfigurationTests.java
+24 -1
View File
@@ -187,7 +187,7 @@ class HttpMessageConvertersAutoConfigurationTests {
@Test
@Deprecated(since = "4.0.0", forRemoval = true)
@SuppressWarnings("removal")
void jackson2ServerAndClientConvertersShouldBeDifferent() {
void jackson2ServerAndClientJsonConvertersShouldBeDifferent() {
this.contextRunner.withUserConfiguration(Jackson2ObjectMapperConfig.class)
.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
.run((context) -> {
@@ -201,6 +201,23 @@ class HttpMessageConvertersAutoConfigurationTests {
});
}
@Test
@Deprecated(since = "4.0.0", forRemoval = true)
@SuppressWarnings("removal")
void jackson2ServerAndClientXmlConvertersShouldBeDifferent() {
this.contextRunner.withUserConfiguration(Jackson2ObjectMapperConfig.class)
.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
.run((context) -> {
assertThat(context).hasSingleBean(
Jackson2HttpMessageConvertersConfiguration.Jackson2XmlMessageConvertersCustomizer.class);
HttpMessageConverter<?> serverConverter = findConverter(getServerConverters(context),
org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter.class);
HttpMessageConverter<?> clientConverter = findConverter(getClientConverters(context),
org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter.class);
assertThat(serverConverter).isNotEqualTo(clientConverter);
});
}
@Test
void gsonNotAvailable() {
this.contextRunner.run((context) -> {
@@ -579,8 +596,14 @@ class HttpMessageConvertersAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@SuppressWarnings("removal")
static class Jackson2ObjectMapperConfig {
@Bean
org.springframework.http.converter.json.Jackson2ObjectMapperBuilder objectMapperBuilder() {
return new org.springframework.http.converter.json.Jackson2ObjectMapperBuilder();
}
@Bean
ObjectMapper objectMapper() {
return new ObjectMapper();