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

Refine RequestResponseBodyMethodProcessorKotlinTests

Browse Source 
Improve read tests and fix copyright.

See gh-34992
This commit is contained in:
Sébastien Deleuze
2025-06-05 14:04:59 +02:00
parent a439e9030f
commit 4d09eb569b
1 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
spring-webmvc/src/test/kotlin/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorKotlinTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2025 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.
@@ -19,16 +19,21 @@ package org.springframework.web.servlet.mvc.method.annotation
import kotlinx.serialization.Serializable
import org.assertj.core.api.Assertions
import org.junit.jupiter.api.Test
import org.springframework.core.MethodParameter
import org.springframework.http.converter.StringHttpMessageConverter
import org.springframework.http.converter.json.KotlinSerializationJsonHttpMessageConverter
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean
import org.springframework.web.bind.WebDataBinder
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.ResponseBody
import org.springframework.web.bind.support.WebDataBinderFactory
import org.springframework.web.context.request.NativeWebRequest
import org.springframework.web.context.request.ServletWebRequest
import org.springframework.web.method.HandlerMethod
import org.springframework.web.method.support.ModelAndViewContainer
import org.springframework.web.testfixture.servlet.MockHttpServletRequest
import org.springframework.web.testfixture.servlet.MockHttpServletResponse
import java.nio.charset.StandardCharsets
import kotlin.reflect.jvm.javaMethod
/**
@@ -44,6 +49,8 @@ class RequestResponseBodyMethodProcessorKotlinTests {
private val request: NativeWebRequest = ServletWebRequest(servletRequest, servletResponse)
private val factory = ValidatingBinderFactory()
@Test
fun writeWithKotlinSerializationJsonMessageConverter() {
val method = SampleController::writeMessage::javaMethod.get()!!
@@ -79,33 +86,37 @@ class RequestResponseBodyMethodProcessorKotlinTests {
@Test
fun readWithKotlinSerializationJsonMessageConverter() {
val method = SampleController::readMessage::javaMethod.get()!!
val handlerMethod = HandlerMethod(SampleController(), method)
val methodReturnType = handlerMethod.returnType
val content = "{\"value\" : \"foo\"}"
this.servletRequest.setContent(content.toByteArray(StandardCharsets.UTF_8))
this.servletRequest.setContentType("application/json")
val converters = listOf(StringHttpMessageConverter(), KotlinSerializationJsonHttpMessageConverter())
val processor = RequestResponseBodyMethodProcessor(converters, null, null)
val returnValue: Any = SampleController().readMessage(Message("foo"))
processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request)
val method = SampleController::readMessage::javaMethod.get()!!
val methodParameter = MethodParameter(method, 0)
Assertions.assertThat(this.servletResponse.contentAsString).isEqualTo("foo")
val result = processor.resolveArgument(methodParameter, container, request, factory) as Message
Assertions.assertThat(result).isEqualTo(Message("foo"))
}
@Suppress("UNCHECKED_CAST")
@Test
fun readGenericTypeWithKotlinSerializationJsonMessageConverter() {
val method = SampleController::readMessages::javaMethod.get()!!
val handlerMethod = HandlerMethod(SampleController(), method)
val methodReturnType = handlerMethod.returnType
val content = "[{\"value\" : \"foo\"}, {\"value\" : \"bar\"}]"
this.servletRequest.setContent(content.toByteArray(StandardCharsets.UTF_8))
this.servletRequest.setContentType("application/json")
val converters = listOf(StringHttpMessageConverter(), KotlinSerializationJsonHttpMessageConverter())
val processor = RequestResponseBodyMethodProcessor(converters, null, null)
val returnValue: Any = SampleController().readMessages(listOf(Message("foo"), Message("bar")))
processor.handleReturnValue(returnValue, methodReturnType, this.container, this.request)
val method = SampleController::readMessages::javaMethod.get()!!
val methodParameter = MethodParameter(method, 0)
Assertions.assertThat(this.servletResponse.contentAsString)
.isEqualTo("foo bar")
val result = processor.resolveArgument(methodParameter, container, request, factory) as List<Message>
Assertions.assertThat(result).containsExactly(Message("foo"), Message("bar"))
}
@@ -130,4 +141,15 @@ class RequestResponseBodyMethodProcessorKotlinTests {
@Serializable
data class Message(val value: String)
private class ValidatingBinderFactory : WebDataBinderFactory {
override fun createBinder(request: NativeWebRequest, target: Any?, objectName: String): WebDataBinder {
val validator = LocalValidatorFactoryBean()
validator.afterPropertiesSet()
val dataBinder = WebDataBinder(target, objectName)
dataBinder.setValidator(validator)
return dataBinder
}
}
}