diff --git a/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt b/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt index 63029eb6110e..0d7635a5e019 100644 --- a/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt +++ b/spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt @@ -94,61 +94,61 @@ inline fun RSocketRequester.RequestSpec.dataWithType(flow: Flo /** - * Coroutines variant of [RSocketRequester.RequestSpec.send]. + * Coroutines variant of [RSocketRequester.RetrieveSpec.send]. * * @author Sebastien Deleuze * @since 5.2 */ -suspend fun RSocketRequester.RequestSpec.sendAndAwait() { +suspend fun RSocketRequester.RetrieveSpec.sendAndAwait() { send().awaitFirstOrNull() } /** - * Coroutines variant of [RSocketRequester.RequestSpec.retrieveMono]. + * Coroutines variant of [RSocketRequester.RetrieveSpec.retrieveMono]. * * @author Sebastien Deleuze * @since 5.2 */ -suspend inline fun RSocketRequester.RequestSpec.retrieveAndAwait(): T = +suspend inline fun RSocketRequester.RetrieveSpec.retrieveAndAwait(): T = retrieveMono(object : ParameterizedTypeReference() {}).awaitSingle() /** - * Nullable coroutines variant of [RSocketRequester.RequestSpec.retrieveMono]. + * Nullable coroutines variant of [RSocketRequester.RetrieveSpec.retrieveMono]. * * @author Sebastien Deleuze * @since 5.2.1 */ -suspend inline fun RSocketRequester.RequestSpec.retrieveAndAwaitOrNull(): T? = +suspend inline fun RSocketRequester.RetrieveSpec.retrieveAndAwaitOrNull(): T? = retrieveMono(object : ParameterizedTypeReference() {}).awaitFirstOrNull() /** - * Coroutines variant of [RSocketRequester.RequestSpec.retrieveFlux]. + * Coroutines variant of [RSocketRequester.RetrieveSpec.retrieveFlux]. * * @author Sebastien Deleuze * @since 5.2 */ -inline fun RSocketRequester.RequestSpec.retrieveFlow(): Flow = +inline fun RSocketRequester.RetrieveSpec.retrieveFlow(): Flow = retrieveFlux(object : ParameterizedTypeReference() {}).asFlow() /** - * Extension for [RSocketRequester.RequestSpec.retrieveMono] providing a `retrieveMono()` + * Extension for [RSocketRequester.RetrieveSpec.retrieveMono] providing a `retrieveMono()` * variant leveraging Kotlin reified type parameters. This extension is not subject to type * erasure and retains actual generic type arguments. * * @author Sebastien Deleuze * @since 5.2 */ -inline fun RSocketRequester.RequestSpec.retrieveMono(): Mono = +inline fun RSocketRequester.RetrieveSpec.retrieveMono(): Mono = retrieveMono(object : ParameterizedTypeReference() {}) /** - * Extension for [RSocketRequester.RequestSpec.retrieveFlux] providing a `retrieveFlux()` + * Extension for [RSocketRequester.RetrieveSpec.retrieveFlux] providing a `retrieveFlux()` * variant leveraging Kotlin reified type parameters. This extension is not subject to type * erasure and retains actual generic type arguments. * * @author Sebastien Deleuze * @since 5.2 */ -inline fun RSocketRequester.RequestSpec.retrieveFlux(): Flux = +inline fun RSocketRequester.RetrieveSpec.retrieveFlux(): Flux = retrieveFlux(object : ParameterizedTypeReference() {}) diff --git a/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensionsTests.kt b/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensionsTests.kt index 065476966e3c..b05e718ae33d 100644 --- a/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensionsTests.kt +++ b/spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensionsTests.kt @@ -103,56 +103,56 @@ class RSocketRequesterExtensionsTests { @Test fun sendAndAwait() { - val requestSpec = mockk() - every { requestSpec.send() } returns Mono.empty() + val retrieveSpec = mockk() + every { retrieveSpec.send() } returns Mono.empty() runBlocking { - requestSpec.sendAndAwait() + retrieveSpec.sendAndAwait() } } @Test fun retrieveAndAwait() { val response = "foo" - val requestSpec = mockk() - every { requestSpec.retrieveMono(match>(stringTypeRefMatcher)) } returns Mono.just("foo") + val retrieveSpec = mockk() + every { retrieveSpec.retrieveMono(match>(stringTypeRefMatcher)) } returns Mono.just("foo") runBlocking { - assertThat(requestSpec.retrieveAndAwait()).isEqualTo(response) + assertThat(retrieveSpec.retrieveAndAwait()).isEqualTo(response) } } @Test fun retrieveAndAwaitOrNull() { - val requestSpec = mockk() - every { requestSpec.retrieveMono(match>(stringTypeRefMatcher)) } returns Mono.empty() + val retrieveSpec = mockk() + every { retrieveSpec.retrieveMono(match>(stringTypeRefMatcher)) } returns Mono.empty() runBlocking { - assertThat(requestSpec.retrieveAndAwaitOrNull()).isNull() + assertThat(retrieveSpec.retrieveAndAwaitOrNull()).isNull() } } @Test fun retrieveFlow() { - val requestSpec = mockk() - every { requestSpec.retrieveFlux(match>(stringTypeRefMatcher)) } returns Flux.just("foo", "bar") + val retrieveSpec = mockk() + every { retrieveSpec.retrieveFlux(match>(stringTypeRefMatcher)) } returns Flux.just("foo", "bar") runBlocking { - assertThat(requestSpec.retrieveFlow().toList()).contains("foo", "bar") + assertThat(retrieveSpec.retrieveFlow().toList()).contains("foo", "bar") } } @Test fun retrieveMono() { - val requestSpec = mockk() - every { requestSpec.retrieveMono(match>(stringTypeRefMatcher)) } returns Mono.just("foo") + val retrieveSpec = mockk() + every { retrieveSpec.retrieveMono(match>(stringTypeRefMatcher)) } returns Mono.just("foo") runBlocking { - assertThat(requestSpec.retrieveMono().block()).isEqualTo("foo") + assertThat(retrieveSpec.retrieveMono().block()).isEqualTo("foo") } } @Test fun retrieveFlux() { - val requestSpec = mockk() - every { requestSpec.retrieveFlux(match>(stringTypeRefMatcher)) } returns Flux.just("foo", "bar") + val retrieveSpec = mockk() + every { retrieveSpec.retrieveFlux(match>(stringTypeRefMatcher)) } returns Flux.just("foo", "bar") runBlocking { - assertThat(requestSpec.retrieveFlux().collectList().block()).contains("foo", "bar") + assertThat(retrieveSpec.retrieveFlux().collectList().block()).contains("foo", "bar") } } }