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

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51877
This commit is contained in:
Stéphane Nicoll
2026-09-28 10:11:10 +02:00
parent ed674dc20c 34b3df1ac6
commit a2a08124f1
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-http-codec/src/main/java/org/springframework/boot/http/codec/autoconfigure/CodecsAutoConfiguration.java
+2 -1
View File
@@ -55,7 +55,8 @@ import org.springframework.web.reactive.function.client.WebClient;
* @since 4.0.0
*/
@AutoConfiguration(afterName = { "org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration",
"org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration" })
"org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration",
"org.springframework.boot.kotlinx.serialization.json.autoconfigure.KotlinxSerializationJsonAutoConfiguration" })
@ConditionalOnClass({ CodecConfigurer.class, WebClient.class })
public final class CodecsAutoConfiguration {
module/spring-boot-http-codec/src/test/java/org/springframework/boot/http/codec/autoconfigure/CodecsAutoConfigurationTests.java
+13
View File
@@ -27,6 +27,8 @@ import tools.jackson.databind.json.JsonMapper;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.http.codec.CodecCustomizer;
import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration.KotlinxSerializationJsonCodecConfiguration;
import org.springframework.boot.kotlinx.serialization.json.autoconfigure.KotlinxSerializationJsonAutoConfiguration;
import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -160,6 +162,17 @@ class CodecsAutoConfigurationTests {
});
}
@Test
void kotlinSerializationAppliesKotlinxJsonCodecCustomizer() {
this.contextRunner.withConfiguration(AutoConfigurations.of(KotlinxSerializationJsonAutoConfiguration.class))
.run((context) -> {
String kotlinJsonCodeCustomizerBeanName = "kotlinxJsonCodecCustomizer";
assertThat(context).hasSingleBean(KotlinxSerializationJsonCodecConfiguration.class)
.hasBean(kotlinJsonCodeCustomizerBeanName);
assertThat(context.getBean(kotlinJsonCodeCustomizerBeanName)).isInstanceOf(CodecCustomizer.class);
});
}
@Test
void userProvidedCustomizerCanOverrideKotlinxJsonCodecCustomizer() {
this.contextRunner.withUserConfiguration(KotlinxJsonConfiguration.class, CodecCustomizerConfiguration.class)