diff options
| author | Robert Jaros <rjaros@finn.pl> | 2019-04-16 18:07:11 +0200 |
|---|---|---|
| committer | Robert Jaros <rjaros@finn.pl> | 2019-04-16 18:07:11 +0200 |
| commit | 856d753c7f335dacd9cc4daf666a152378886200 (patch) | |
| tree | 549c667ba6047a0405bd112d8e91be117c798012 /kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft | |
| parent | 2382d82d5aaed8e6519da9e82d771ee94007b2cd (diff) | |
| download | kvision-856d753c7f335dacd9cc4daf666a152378886200.tar.gz kvision-856d753c7f335dacd9cc4daf666a152378886200.tar.bz2 kvision-856d753c7f335dacd9cc4daf666a152378886200.zip | |
Upgrade Kotlin to 1.3.30
Upgrade coroutines to 1.2.0
Upgrade serialization to 0.11.0
Upgrade Ktor to 1.1.4
Upgrade Spring Boot to 2.1.4
Diffstat (limited to 'kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft')
| -rw-r--r-- | kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt index ca08b080..c3c179fc 100644 --- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt +++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt @@ -30,8 +30,6 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.ReceiveChannel import kotlinx.coroutines.channels.SendChannel -import kotlinx.coroutines.channels.filterNotNull -import kotlinx.coroutines.channels.map import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch import org.jooby.Kooby @@ -344,16 +342,19 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass: ws.close() } launch { - val requestChannel = incoming.map { - val jsonRpcRequest = getParameter<JsonRpcRequest>(it) - if (jsonRpcRequest.params.size == 1) { - getParameter<PAR1>(jsonRpcRequest.params[0]) - } else { - null - } - }.filterNotNull() + val requestChannel = Channel<PAR1>() val responseChannel = Channel<PAR2>() coroutineScope { + launch { + for (p in incoming) { + val jsonRpcRequest = getParameter<JsonRpcRequest>(p) + if (jsonRpcRequest.params.size == 1) { + val par = getParameter<PAR1>(jsonRpcRequest.params[0]) + requestChannel.send(par) + } + } + requestChannel.close() + } launch(Dispatchers.IO) { for (p in responseChannel) { val text = mapper.writeValueAsString( |