Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support properties in kotlinx.serialization converters

Browse Source 
This commit adds support for Kotlin properties in Spring WebMVC
controllers, supported for reasons explained in gh-31856, with
kotlinx.serialization converters.

Closes gh-34284
This commit is contained in:
Sébastien Deleuze
2025-01-27 14:49:31 +01:00
parent a970fc16aa
commit 5499878de0
2 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-web/src/test/kotlin/org/springframework/http/converter/json/KotlinSerializationJsonHttpMessageConverterTests.kt
View File

@@ -16,18 +16,11 @@
package org.springframework.http.converter.json
import java.lang.reflect.ParameterizedType
import java.lang.reflect.Type
import java.nio.charset.StandardCharsets
import kotlinx.serialization.Serializable
import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatExceptionOfType
import org.junit.jupiter.api.Test
import org.springframework.core.MethodParameter
import kotlin.reflect.javaType
import kotlin.reflect.typeOf
import org.springframework.core.Ordered
import org.springframework.core.ResolvableType
import org.springframework.http.MediaType
@@ -35,8 +28,12 @@ import org.springframework.http.converter.HttpMessageNotReadableException
import org.springframework.http.customJson
import org.springframework.web.testfixture.http.MockHttpInputMessage
import org.springframework.web.testfixture.http.MockHttpOutputMessage
import java.lang.reflect.ParameterizedType
import java.math.BigDecimal
import java.nio.charset.StandardCharsets
import kotlin.reflect.javaType
import kotlin.reflect.jvm.javaMethod
import kotlin.reflect.typeOf
/**
* Tests for the JSON conversion using kotlinx.serialization.
@@ -388,6 +385,19 @@ class KotlinSerializationJsonHttpMessageConverterTests {
assertThat(result).isEqualTo(expectedJson)
}
@Test
fun writeProperty() {
val outputMessage = MockHttpOutputMessage()
val method = this::class.java.getDeclaredMethod("getValue")
val methodParameter = MethodParameter.forExecutable(method, -1)
this.converter.write(value, ResolvableType.forMethodParameter(methodParameter), null, outputMessage, null)
val result = outputMessage.getBodyAsString(StandardCharsets.UTF_8)
assertThat(outputMessage.headers).containsEntry("Content-Type", listOf("application/json"))
assertThat(result).isEqualTo("42")
}
@Serializable
@Suppress("ArrayInDataClass")
@@ -413,4 +423,7 @@ class KotlinSerializationJsonHttpMessageConverterTests {
fun handleMapWithNullable(map: Map<String, String?>) = map
val value: Int
get() = 42
}