spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-22 05:49:04 +00:00
Code Issues Projects Releases Wiki Activity

Refine Kotlin Serialization codec type checks

Browse Source 
ServerSentEvent and String checks, removed from
KotlinSerializationSupport in Spring Framework 7.0, are reintroduced by
this commit at the right level (KotlinSerializationSupport for
ServerSentEvent and KotlinSerializationString(Decoder|Encoder) for
String).

Closes gh-35885
This commit is contained in:
Sébastien Deleuze
2025-11-25 13:31:39 +01:00
parent f3908832c5
commit 4ee0a8ee33
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/codec/KotlinSerializationStringDecoder.java
+1 -1
View File
@@ -102,7 +102,7 @@ public abstract class KotlinSerializationStringDecoder<T extends StringFormat> e
@Override
public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType) {
return canSerialize(elementType, mimeType);
return canSerialize(elementType, mimeType) && !CharSequence.class.isAssignableFrom(elementType.toClass());
}
@Override
spring-web/src/main/java/org/springframework/http/codec/KotlinSerializationStringEncoder.java
+1 -1
View File
@@ -101,7 +101,7 @@ public abstract class KotlinSerializationStringEncoder<T extends StringFormat> e
@Override
public boolean canEncode(ResolvableType elementType, @Nullable MimeType mimeType) {
return canSerialize(elementType, mimeType);
return canSerialize(elementType, mimeType) && !String.class.isAssignableFrom(elementType.toClass());
}
@Override
spring-web/src/main/java/org/springframework/http/codec/KotlinSerializationSupport.java
+1 -1
View File
@@ -117,7 +117,7 @@ public abstract class KotlinSerializationSupport<T extends SerialFormat> {
if (!this.typePredicate.test(type) || ResolvableType.NONE.equals(type)) {
return false;
}
return serializer(type) != null && supports(mimeType);
return serializer(type) != null && supports(mimeType) && !ServerSentEvent.class.isAssignableFrom(type.toClass());
}
private boolean supports(@Nullable MimeType mimeType) {
spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonDecoderTests.kt
+1 -1
View File
@@ -80,7 +80,7 @@ class KotlinSerializationJsonDecoderTests : AbstractDecoderTests<KotlinSerializa
assertThat(decoderForAllTypes.canDecode(ResolvableType.forClass(Pojo::class.java), MediaType.APPLICATION_JSON)).isTrue()
assertThat(decoderForAllTypes.canDecode(ResolvableType.forClass(Pojo::class.java), jsonSubtype)).isTrue()
assertThat(decoderForAllTypes.canDecode(ResolvableType.forClass(Pojo::class.java), null)).isTrue()
assertThat(decoderForAllTypes.canDecode(ResolvableType.forClass(String::class.java), null)).isTrue()
assertThat(decoderForAllTypes.canDecode(ResolvableType.forClass(String::class.java), null)).isFalse()
assertThat(decoderForAllTypes.canDecode(ResolvableType.forClass(Pojo::class.java), MediaType.APPLICATION_XML)).isFalse()
assertThat(decoderForAllTypes.canDecode(ResolvableType.forClass(Pojo::class.java),
MediaType("application", "json", StandardCharsets.UTF_8))).isTrue()
spring-web/src/test/kotlin/org/springframework/http/codec/json/KotlinSerializationJsonEncoderTests.kt
+1 -1
View File
@@ -91,7 +91,7 @@ class KotlinSerializationJsonEncoderTests : AbstractEncoderTests<KotlinSerializa
assertThat(encoderForAllTypes.canEncode(pojoType, MediaType.APPLICATION_NDJSON)).isTrue()
assertThat(encoderForAllTypes.canEncode(ResolvableType.forClass(String::class.java), null)).isTrue()
assertThat(encoderForAllTypes.canEncode(ResolvableType.forClass(String::class.java), null)).isFalse()
assertThat(encoderForAllTypes.canEncode(ResolvableType.forClass(Pojo::class.java), MediaType.APPLICATION_XML)).isFalse()
val sseType = ResolvableType.forClass(ServerSentEvent::class.java)
assertThat(encoderForAllTypes.canEncode(sseType, MediaType.APPLICATION_JSON)).isFalse()