Refine Kotlin serialization converters/codecs conditions

sdeleuze · sdeleuze · commit b8d9dee7bee3 · 2025-02-17T18:40:05.000+01:00
This commit is a follow-up of 34410 to refine the activation conditions of Kotlin serialization converters/codecs. Closes gh-34438
diff --git a/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java b/spring-web/src/main/java/org/springframework/http/codec/support/BaseDefaultCodecs.java
@@ -411,10 +411,6 @@ protected void initTypedReaders() {
 			addCodec(this.typedReaders, new DecoderHttpMessageReader<>(this.protobufDecoder != null ?
 					(ProtobufDecoder) this.protobufDecoder : new ProtobufDecoder()));
 		}
-		else if (kotlinSerializationProtobufPresent) {
-			addCodec(this.typedReaders, new DecoderHttpMessageReader<>(this.kotlinSerializationProtobufDecoder != null ?
-					(KotlinSerializationProtobufDecoder) this.kotlinSerializationProtobufDecoder : new KotlinSerializationProtobufDecoder()));
-		}
 		addCodec(this.typedReaders, new FormHttpMessageReader());
 		if (this.multipartReader != null) {
 			addCodec(this.typedReaders, this.multipartReader);
diff --git a/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,9 +87,6 @@ public AllEncompassingFormHttpMessageConverter() {
 			addPartConverter(new Jaxb2RootElementHttpMessageConverter());
 		}
 
-		if (kotlinSerializationJsonPresent) {
-			addPartConverter(new KotlinSerializationJsonHttpMessageConverter());
-		}
 		if (jackson2Present) {
 			addPartConverter(new MappingJackson2HttpMessageConverter());
 		}
@@ -99,6 +96,9 @@ else if (gsonPresent) {
 		else if (jsonbPresent) {
 			addPartConverter(new JsonbHttpMessageConverter());
 		}
+		else if (kotlinSerializationJsonPresent) {
+			addPartConverter(new KotlinSerializationJsonHttpMessageConverter());
+		}
 
 		if (jackson2XmlPresent) {
 			addPartConverter(new MappingJackson2XmlHttpMessageConverter());
@@ -111,15 +111,14 @@ else if (jsonbPresent) {
 		if (jackson2CborPresent) {
 			addPartConverter(new MappingJackson2CborHttpMessageConverter());
 		}
+		else if (kotlinSerializationCborPresent) {
+			addPartConverter(new KotlinSerializationCborHttpMessageConverter());
+		}
 
 		if (jackson2YamlPresent) {
 			addPartConverter(new MappingJackson2YamlHttpMessageConverter());
 		}
 
-		if (kotlinSerializationCborPresent) {
-			addPartConverter(new KotlinSerializationCborHttpMessageConverter());
-		}
-
 		if (kotlinSerializationProtobufPresent) {
 			addPartConverter(new KotlinSerializationProtobufHttpMessageConverter());
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java b/spring-web/src/main/java/org/springframework/web/client/DefaultRestClientBuilder.java
@@ -419,9 +419,6 @@ private List<HttpMessageConverter<?>> initMessageConverters() {
 			this.messageConverters.add(new ResourceHttpMessageConverter(false));
 			this.messageConverters.add(new AllEncompassingFormHttpMessageConverter());
 
-			if (kotlinSerializationJsonPresent) {
-				this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());
-			}
 			if (jackson2Present) {
 				this.messageConverters.add(new MappingJackson2HttpMessageConverter());
 			}
@@ -431,6 +428,9 @@ else if (gsonPresent) {
 			else if (jsonbPresent) {
 				this.messageConverters.add(new JsonbHttpMessageConverter());
 			}
+			else if (kotlinSerializationJsonPresent) {
+				this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());
+			}
 			if (jackson2SmilePresent) {
 				this.messageConverters.add(new MappingJackson2SmileHttpMessageConverter());
 			}
diff --git a/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java b/spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -204,9 +204,6 @@ else if (jaxb2Present) {
 			this.messageConverters.add(new KotlinSerializationProtobufHttpMessageConverter());
 		}
 
-		if (kotlinSerializationJsonPresent) {
-			this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());
-		}
 		if (jackson2Present) {
 			this.messageConverters.add(new MappingJackson2HttpMessageConverter());
 		}
@@ -216,6 +213,9 @@ else if (gsonPresent) {
 		else if (jsonbPresent) {
 			this.messageConverters.add(new JsonbHttpMessageConverter());
 		}
+		else if (kotlinSerializationJsonPresent) {
+			this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());
+		}
 
 		if (jackson2SmilePresent) {
 			this.messageConverters.add(new MappingJackson2SmileHttpMessageConverter());
diff --git a/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java b/spring-web/src/test/java/org/springframework/web/client/RestTemplateTests.java
@@ -108,14 +108,16 @@ void setup() {
 		template.setErrorHandler(errorHandler);
 	}
 
-	@Test // gh-29008
-	void defaultMessageConvertersWithKotlinSerialization() {
+	@Test
+	void defaultMessageConvertersWithoutKotlinSerialization() {
 		RestTemplate restTemplate = new RestTemplate();
 		List<HttpMessageConverter<?>> httpMessageConverters = restTemplate.getMessageConverters();
 		assertThat(httpMessageConverters).extracting("class").containsOnlyOnce(
-			KotlinSerializationJsonHttpMessageConverter.class,
 			MappingJackson2HttpMessageConverter.class
 		);
+		assertThat(httpMessageConverters).extracting("class").doesNotContain(
+				KotlinSerializationJsonHttpMessageConverter.class
+		);
 	}
 
 	@Test
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -891,9 +891,6 @@ else if (jaxb2Present) {
 			messageConverters.add(new Jaxb2RootElementHttpMessageConverter());
 		}
 
-		if (kotlinSerializationCborPresent) {
-			messageConverters.add(new KotlinSerializationCborHttpMessageConverter());
-		}
 		if (kotlinSerializationProtobufPresent) {
 			messageConverters.add(new KotlinSerializationProtobufHttpMessageConverter());
 		}
@@ -929,6 +926,9 @@ else if (kotlinSerializationJsonPresent) {
 			}
 			messageConverters.add(new MappingJackson2CborHttpMessageConverter(builder.build()));
 		}
+		else if (kotlinSerializationCborPresent) {
+			messageConverters.add(new KotlinSerializationCborHttpMessageConverter());
+		}
 		if (jackson2YamlPresent) {
 			Jackson2ObjectMapperBuilder builder = Jackson2ObjectMapperBuilder.yaml();
 			if (this.applicationContext != null) {
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -172,7 +172,7 @@ void requestMappingHandlerAdapter() {
 		ApplicationContext context = initContext(WebConfig.class);
 		RequestMappingHandlerAdapter adapter = context.getBean(RequestMappingHandlerAdapter.class);
 		List<HttpMessageConverter<?>> converters = adapter.getMessageConverters();
-		assertThat(converters).hasSizeGreaterThanOrEqualTo(14);
+		assertThat(converters).hasSizeGreaterThanOrEqualTo(13);
 		converters.stream()
 				.filter(AbstractJackson2HttpMessageConverter.class::isInstance)
 				.forEach(converter -> {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2024 the original author or authors.`
	`2`	`+ * Copyright 2002-2025 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -87,9 +87,6 @@ public AllEncompassingFormHttpMessageConverter() {`
`87`	`87`	`addPartConverter(new Jaxb2RootElementHttpMessageConverter());`
`88`	`88`	`}`
`89`	`89`
`90`		`- if (kotlinSerializationJsonPresent) {`
`91`		`- addPartConverter(new KotlinSerializationJsonHttpMessageConverter());`
`92`		`- }`
`93`	`90`	`if (jackson2Present) {`
`94`	`91`	`addPartConverter(new MappingJackson2HttpMessageConverter());`
`95`	`92`	`}`
`@@ -99,6 +96,9 @@ else if (gsonPresent) {`
`99`	`96`	`else if (jsonbPresent) {`
`100`	`97`	`addPartConverter(new JsonbHttpMessageConverter());`
`101`	`98`	`}`
	`99`	`+ else if (kotlinSerializationJsonPresent) {`
	`100`	`+ addPartConverter(new KotlinSerializationJsonHttpMessageConverter());`
	`101`	`+ }`
`102`	`102`
`103`	`103`	`if (jackson2XmlPresent) {`
`104`	`104`	`addPartConverter(new MappingJackson2XmlHttpMessageConverter());`
`@@ -111,15 +111,14 @@ else if (jsonbPresent) {`
`111`	`111`	`if (jackson2CborPresent) {`
`112`	`112`	`addPartConverter(new MappingJackson2CborHttpMessageConverter());`
`113`	`113`	`}`
	`114`	`+ else if (kotlinSerializationCborPresent) {`
	`115`	`+ addPartConverter(new KotlinSerializationCborHttpMessageConverter());`
	`116`	`+ }`
`114`	`117`
`115`	`118`	`if (jackson2YamlPresent) {`
`116`	`119`	`addPartConverter(new MappingJackson2YamlHttpMessageConverter());`
`117`	`120`	`}`
`118`	`121`
`119`		`- if (kotlinSerializationCborPresent) {`
`120`		`- addPartConverter(new KotlinSerializationCborHttpMessageConverter());`
`121`		`- }`
`122`		`-`
`123`	`122`	`if (kotlinSerializationProtobufPresent) {`
`124`	`123`	`addPartConverter(new KotlinSerializationProtobufHttpMessageConverter());`
`125`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -419,9 +419,6 @@ private List<HttpMessageConverter<?>> initMessageConverters() {`
`419`	`419`	`this.messageConverters.add(new ResourceHttpMessageConverter(false));`
`420`	`420`	`this.messageConverters.add(new AllEncompassingFormHttpMessageConverter());`
`421`	`421`
`422`		`- if (kotlinSerializationJsonPresent) {`
`423`		`- this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());`
`424`		`- }`
`425`	`422`	`if (jackson2Present) {`
`426`	`423`	`this.messageConverters.add(new MappingJackson2HttpMessageConverter());`
`427`	`424`	`}`
`@@ -431,6 +428,9 @@ else if (gsonPresent) {`
`431`	`428`	`else if (jsonbPresent) {`
`432`	`429`	`this.messageConverters.add(new JsonbHttpMessageConverter());`
`433`	`430`	`}`
	`431`	`+ else if (kotlinSerializationJsonPresent) {`
	`432`	`+ this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());`
	`433`	`+ }`
`434`	`434`	`if (jackson2SmilePresent) {`
`435`	`435`	`this.messageConverters.add(new MappingJackson2SmileHttpMessageConverter());`
`436`	`436`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,9 +204,6 @@ else if (jaxb2Present) {`
`204`	`204`	`this.messageConverters.add(new KotlinSerializationProtobufHttpMessageConverter());`
`205`	`205`	`}`
`206`	`206`
`207`		`- if (kotlinSerializationJsonPresent) {`
`208`		`- this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());`
`209`		`- }`
`210`	`207`	`if (jackson2Present) {`
`211`	`208`	`this.messageConverters.add(new MappingJackson2HttpMessageConverter());`
`212`	`209`	`}`
`@@ -216,6 +213,9 @@ else if (gsonPresent) {`
`216`	`213`	`else if (jsonbPresent) {`
`217`	`214`	`this.messageConverters.add(new JsonbHttpMessageConverter());`
`218`	`215`	`}`
	`216`	`+ else if (kotlinSerializationJsonPresent) {`
	`217`	`+ this.messageConverters.add(new KotlinSerializationJsonHttpMessageConverter());`
	`218`	`+ }`
`219`	`219`
`220`	`220`	`if (jackson2SmilePresent) {`
`221`	`221`	`this.messageConverters.add(new MappingJackson2SmileHttpMessageConverter());`
Original file line number	Diff line number	Diff line change
`@@ -891,9 +891,6 @@ else if (jaxb2Present) {`
`891`	`891`	`messageConverters.add(new Jaxb2RootElementHttpMessageConverter());`
`892`	`892`	`}`
`893`	`893`
`894`		`- if (kotlinSerializationCborPresent) {`
`895`		`- messageConverters.add(new KotlinSerializationCborHttpMessageConverter());`
`896`		`- }`
`897`	`894`	`if (kotlinSerializationProtobufPresent) {`
`898`	`895`	`messageConverters.add(new KotlinSerializationProtobufHttpMessageConverter());`
`899`	`896`	`}`
`@@ -929,6 +926,9 @@ else if (kotlinSerializationJsonPresent) {`
`929`	`926`	`}`
`930`	`927`	`messageConverters.add(new MappingJackson2CborHttpMessageConverter(builder.build()));`
`931`	`928`	`}`
	`929`	`+ else if (kotlinSerializationCborPresent) {`
	`930`	`+ messageConverters.add(new KotlinSerializationCborHttpMessageConverter());`
	`931`	`+ }`
`932`	`932`	`if (jackson2YamlPresent) {`
`933`	`933`	`Jackson2ObjectMapperBuilder builder = Jackson2ObjectMapperBuilder.yaml();`
`934`	`934`	`if (this.applicationContext != null) {`