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

Upgrade to Coroutines 1.3.2

Browse Source 
Closes gh-23663
This commit is contained in:
Sebastien Deleuze
2019-09-25 21:51:04 +02:00
parent c10dcec9ed
commit 091c512f0d
17 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-messaging/src/main/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensions.kt
View File

@@ -17,7 +17,6 @@
package org.springframework.messaging.rsocket
import io.rsocket.transport.ClientTransport
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.reactive.awaitFirstOrNull
import kotlinx.coroutines.reactive.awaitSingle
@@ -119,7 +118,6 @@ suspend inline fun <reified T : Any> RSocketRequester.RequestSpec.retrieveAndAwa
* @author Sebastien Deleuze
* @since 5.2
*/
@ExperimentalCoroutinesApi
inline fun <reified T : Any> RSocketRequester.RequestSpec.retrieveFlow(): Flow<T> =
retrieveFlux(object : ParameterizedTypeReference<T>() {}).asFlow()

4
spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketClientToServerCoroutinesIntegrationTests.kt
View File

@@ -21,7 +21,6 @@ import io.rsocket.RSocketFactory
import io.rsocket.frame.decoder.PayloadDecoder
import io.rsocket.transport.netty.server.CloseableChannel
import io.rsocket.transport.netty.server.TcpServerTransport
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flow
@@ -49,7 +48,6 @@ import java.time.Duration
* @author Sebastien Deleuze
* @author Rossen Stoyanchev
*/
@ExperimentalCoroutinesApi
class RSocketClientToServerCoroutinesIntegrationTests {
@Test
@@ -105,7 +103,6 @@ class RSocketClientToServerCoroutinesIntegrationTests {
.verify(Duration.ofSeconds(5))
}
@ExperimentalCoroutinesApi
@Controller
class ServerController {
@@ -160,7 +157,6 @@ class RSocketClientToServerCoroutinesIntegrationTests {
@Configuration
open class ServerConfig {
@ExperimentalCoroutinesApi
@Bean
open fun controller(): ServerController {
return ServerController()

2
spring-messaging/src/test/kotlin/org/springframework/messaging/rsocket/RSocketRequesterExtensionsTests.kt
View File

@@ -18,7 +18,6 @@ package org.springframework.messaging.rsocket
import io.mockk.every
import io.mockk.mockk
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.toList
import kotlinx.coroutines.runBlocking
@@ -122,7 +121,6 @@ class RSocketRequesterExtensionsTests {
}
@Test
@ExperimentalCoroutinesApi
fun retrieveFlow() {
val requestSpec = mockk<RSocketRequester.RequestSpec>()
every { requestSpec.retrieveFlux(match<ParameterizedTypeReference<*>>(stringTypeRefMatcher)) } returns Flux.just("foo", "bar")