diff options
author | Robert Jaros <rjaros@finn.pl> | 2020-04-18 20:20:21 +0200 |
---|---|---|
committer | Robert Jaros <rjaros@finn.pl> | 2020-04-18 20:20:21 +0200 |
commit | 80f33eae37fff276f538ce43d2b0e18f773a839b (patch) | |
tree | 1c788e268e7042656db9cc4a62592d890fe12f53 /kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft | |
parent | 7b994ca5d71f195781ac129f3d3d180fb79c7380 (diff) | |
download | kvision-80f33eae37fff276f538ce43d2b0e18f773a839b.tar.gz kvision-80f33eae37fff276f538ce43d2b0e18f773a839b.tar.bz2 kvision-80f33eae37fff276f538ce43d2b0e18f773a839b.zip |
Support for method annotations for compiler plugin (#142)
Diffstat (limited to 'kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft')
-rw-r--r-- | kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt index 9e4bc87f..aabb0752 100644 --- a/kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt +++ b/kvision-modules/kvision-server-javalin/src/jvmMain/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt @@ -445,7 +445,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass: noinline function: suspend T.(ReceiveChannel<PAR1>, SendChannel<PAR2>) -> Unit, route: String? ) { - val routeDef = "route${this::class.simpleName}${counter++}" + val routeDef = route ?: "route${this::class.simpleName}${counter++}" webSocketRequests["/kvws/$routeDef"] = { ws -> ws.onConnect { ctx -> val incoming = Channel<String>() @@ -521,9 +521,10 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass: */ @Suppress("TooGenericExceptionCaught") protected actual inline fun <reified RET> bindTabulatorRemote( - noinline function: suspend T.(Int?, Int?, List<RemoteFilter>?, List<RemoteSorter>?, String?) -> RemoteData<RET> + noinline function: suspend T.(Int?, Int?, List<RemoteFilter>?, List<RemoteSorter>?, String?) -> RemoteData<RET>, + route: String? ) { - val routeDef = "route${this::class.simpleName}${counter++}" + val routeDef = route ?: "route${this::class.simpleName}${counter++}" addRoute(HttpMethod.POST, "/kv/$routeDef") { ctx -> val jsonRpcRequest = ctx.body<JsonRpcRequest>() @Suppress("MagicNumber") |