root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Replace KotlinBodySpec with extensions function 

Prior to this commit, the ResponseSpec::expectBody extension function
returned a special KotlinBodySpec, due to
https://youtrack.jetbrains.com/issue/KT-5464.

Now that KT-5464 has been fixed in Kotlin 1.6, we have no need for
KotlinBodySpec, so this commit replaces it with a extension function
that returns the Java BodySpec.

Closes gh-28144
This commit is contained in:
Arjen Poutsma 2022-03-08 16:06:01 +01:00
parent 5119aafe4f
commit 1be3eecb2a
1 changed files with 6 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
spring-test/src/main/kotlin/org/springframework/test/web/reactive/server/WebTestClientExtensions.kt
View File

@ -19,7 +19,6 @@ package org.springframework.test.web.reactive.server
import kotlinx.coroutines.flow.Flow
import org.reactivestreams.Publisher
import org.springframework.core.ParameterizedTypeReference
import org.springframework.test.util.AssertionErrors.assertEquals
import org.springframework.test.web.reactive.server.WebTestClient.*
/**
@ -59,53 +58,17 @@ inline fun <reified T : Any> RequestBodySpec.body(flow: Flow<T>): RequestHeaders
body(flow, object : ParameterizedTypeReference<T>() {})
/**
* Extension for [ResponseSpec.expectBody] providing an `expectBody<Foo>()` variant and
* a workaround for [KT-5464](https://youtrack.jetbrains.com/issue/KT-5464) which
* prevents to use `WebTestClient.BodySpec` in Kotlin.
* Extension for [ResponseSpec.expectBody] providing an `expectBody<Foo>()` variant
* leveraging Kotlin reified type parameters. This extension is not subject ot type
* erasure and retains actual generic type arguments.
*
* @author Sebastien Deleuze
* @author Arjen Poutsma
* @since 5.0
*/
@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
inline fun <reified B : Any> ResponseSpec.expectBody(): KotlinBodySpec<B> =
expectBody(object : ParameterizedTypeReference<B>() {}).returnResult().let {
object : KotlinBodySpec<B> {
override fun isEqualTo(expected: B): KotlinBodySpec<B> = it
.assertWithDiagnostics { assertEquals("Response body", expected, it.responseBody) }
.let { this }
override fun consumeWith(consumer: (EntityExchangeResult<B>) -> Unit): KotlinBodySpec<B> =
it.assertWithDiagnostics { consumer.invoke(it) }.let { this }
override fun returnResult(): EntityExchangeResult<B> = it
}
}
/**
* Kotlin compliant `WebTestClient.BodySpec` for expectations on the response body decoded
* to a single Object, see [KT-5464](https://youtrack.jetbrains.com/issue/KT-5464) for
* more details.
* @since 5.0.6
*/
interface KotlinBodySpec<B> {
/**
* Assert the extracted body is equal to the given value.
*/
fun isEqualTo(expected: B): KotlinBodySpec<B>
/**
* Assert the exchange result with the given consumer.
*/
fun consumeWith(consumer: (EntityExchangeResult<B>) -> Unit): KotlinBodySpec<B>
/**
* Exit the chained API and return an `ExchangeResult` with the
* decoded response content.
*/
fun returnResult(): EntityExchangeResult<B>
}
inline fun <reified B : Any> ResponseSpec.expectBody(): BodySpec<B, *> =
expectBody(object : ParameterizedTypeReference<B>() {})
/**
* Extension for [ResponseSpec.expectBodyList] providing a `expectBodyList<Foo>()` variant.