From a55d5985fc9da62ce8e4523d44ec7bcaa92b81f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 28 Sep 2026 10:06:07 +0200 Subject: [PATCH] Polish contribution See gh-51842 --- .../CodecsAutoConfigurationTests.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/module/spring-boot-http-codec/src/test/java/org/springframework/boot/http/codec/autoconfigure/CodecsAutoConfigurationTests.java b/module/spring-boot-http-codec/src/test/java/org/springframework/boot/http/codec/autoconfigure/CodecsAutoConfigurationTests.java index 8463f8dcd28..7adc04246ee 100644 --- a/module/spring-boot-http-codec/src/test/java/org/springframework/boot/http/codec/autoconfigure/CodecsAutoConfigurationTests.java +++ b/module/spring-boot-http-codec/src/test/java/org/springframework/boot/http/codec/autoconfigure/CodecsAutoConfigurationTests.java @@ -27,6 +27,7 @@ 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; @@ -161,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) @@ -171,15 +183,6 @@ class CodecsAutoConfigurationTests { }); } - @Test - void applyKotlinxSerializationJsonAutoConfigurationBeforeCodecsAutoConfiguration() { - this.contextRunner.withConfiguration(AutoConfigurations.of(KotlinxSerializationJsonAutoConfiguration.class)) - .run((context) -> { - Map codecCustomizers = context.getBeansOfType(CodecCustomizer.class); - assertThat(codecCustomizers).containsKey("kotlinxJsonCodecCustomizer"); - }); - } - @SuppressWarnings("unchecked") private T findEncoder(AssertableApplicationContext context, Class encoderClass) { ServerCodecConfigurer configurer = ServerCodecConfigurer.create();