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

Remove KClass based Kotlin extensions

Browse Source 
Issue: SPR-15660
This commit is contained in:
Sebastien Deleuze
2017-06-13 18:43:59 +02:00
parent 223315f96b
commit 04d5a2951c
18 changed files with 11 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@
package org.springframework.test.web.reactive.server
import org.reactivestreams.Publisher
import kotlin.reflect.KClass
/**
* Extension for [WebTestClient.RequestBodySpec.body] providing a variant without explicit class
@@ -29,15 +28,6 @@ import kotlin.reflect.KClass
inline fun <reified T : Any, S : Publisher<T>> WebTestClient.RequestBodySpec.body(publisher: S): WebTestClient.RequestHeadersSpec<*>
= body(publisher, T::class.java)
/**
* Extension for [WebTestClient.ResponseSpec.expectBody] providing a [KClass] based variant.
*
* @author Sebastien Deleuze
* @since 5.0
*/
fun <B : Any> WebTestClient.ResponseSpec.expectBody(type: KClass<B>): WebTestClient.BodySpec<B, *> =
expectBody(type.java)
/**
* Extension for [WebTestClient.ResponseSpec.expectBody] providing a `expectBody<Foo>()` variant.
*
@@ -47,15 +37,6 @@ fun <B : Any> WebTestClient.ResponseSpec.expectBody(type: KClass<B>): WebTestCli
inline fun <reified B : Any> WebTestClient.ResponseSpec.expectBody(): WebTestClient.BodySpec<B, *> =
expectBody(B::class.java)
/**
* Extension for [WebTestClient.ResponseSpec.expectBodyList] providing a [KClass] based variant.
*
* @author Sebastien Deleuze
* @since 5.0
*/
fun <E : Any> WebTestClient.ResponseSpec.expectBodyList(type: KClass<E>): WebTestClient.ListBodySpec<E> =
expectBodyList(type.java)
/**
* Extension for [WebTestClient.ResponseSpec.expectBodyList] providing a `expectBodyList<Foo>()` variant.
*
@@ -65,15 +46,6 @@ fun <E : Any> WebTestClient.ResponseSpec.expectBodyList(type: KClass<E>): WebTes
inline fun <reified E : Any> WebTestClient.ResponseSpec.expectBodyList(): WebTestClient.ListBodySpec<E> =
expectBodyList(E::class.java)
/**
* Extension for [WebTestClient.ResponseSpec.returnResult] providing a [KClass] based variant.
*
* @author Sebastien Deleuze
* @since 5.0
*/
fun <T : Any> WebTestClient.ResponseSpec.returnResult(type: KClass<T>): FluxExchangeResult<T> =
returnResult(type.java)
/**
* Extension for [WebTestClient.ResponseSpec.returnResult] providing a `returnResult<Foo>()` variant.
*

18
spring-test/src/test/kotlin/org/springframework/test/web/reactive/server/WebTestClientExtensionsTests.kt
View File

@@ -33,36 +33,18 @@ class WebTestClientExtensionsTests {
verify(requestBodySpec, times(1)).body(body, Foo::class.java)
}
@Test
fun `ResponseSpec#expectBody with KClass`() {
responseSpec.expectBody(Foo::class)
verify(responseSpec, times(1)).expectBody(Foo::class.java)
}
@Test
fun `ResponseSpec#expectBody with reified type parameters`() {
responseSpec.expectBody<Foo>()
verify(responseSpec, times(1)).expectBody(Foo::class.java)
}
@Test
fun `ResponseSpec#expectBodyList with KClass`() {
responseSpec.expectBodyList(Foo::class)
verify(responseSpec, times(1)).expectBodyList(Foo::class.java)
}
@Test
fun `ResponseSpec#expectBodyList with reified type parameters`() {
responseSpec.expectBodyList<Foo>()
verify(responseSpec, times(1)).expectBodyList(Foo::class.java)
}
@Test
fun `ResponseSpec#returnResult with KClass`() {
responseSpec.returnResult(Foo::class)
verify(responseSpec, times(1)).returnResult(Foo::class.java)
}
@Test
fun `ResponseSpec#returnResult with reified type parameters`() {
responseSpec.returnResult<Foo>()