New kvision-server-spring-boot module with support for Spring Boot server-side integration.

Kotlin upgrade to 1.3.0-rc-190.

3 files changed, 215 insertions, 97 deletions

diff --git a/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/JoobyServiceManager.kt b/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/JoobyServiceManager.kt
new file mode 100644
index 00000000..dceae898
--- /dev/null
+++ b/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/JoobyServiceManager.kt
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2017-present Robert Jaros
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package pl.treksoft.kvision.remote
+
+import kotlinx.coroutines.Deferred
+
+/**
+ * Multiplatform service manager for Jooby.
+ */
+expect open class JoobyServiceManager<T : Any>(service: T) : ServiceManager {
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified RET> bind(
+        noinline function: T.(Request?) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR, reified RET> bind(
+        noinline function: T.(PAR, Request?) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR1, reified PAR2, reified RET> bind(
+        noinline function: T.(PAR1, PAR2, Request?) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified RET> bind(
+        noinline function: T.(PAR1, PAR2, PAR3, Request?) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified PAR4, reified RET> bind(
+        noinline function: T.(PAR1, PAR2, PAR3, PAR4, Request?) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified PAR4, reified PAR5, reified RET> bind(
+        noinline function: T.(PAR1, PAR2, PAR3, PAR4, PAR5, Request?) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Applies all defined routes to the given server.
+     * @param k a server
+     */
+    fun applyRoutes(k: KVServer)
+
+}
diff --git a/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt b/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt
index 07f60851..6f696475 100644
--- a/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt
+++ b/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt
@@ -21,8 +21,6 @@
  */
 package pl.treksoft.kvision.remote
 
-import kotlinx.coroutines.Deferred
-
 enum class RpcHttpMethod {
     POST,
     PUT,
@@ -38,102 +36,10 @@ enum class HttpMethod {
     OPTIONS
 }
 
-/**
- * Multiplatform service manager.
- */
-expect open class ServiceManager<out T>(service: T) {
-    /**
-     * Binds a given route with a function of the receiver.
-     * @param function a function of the receiver
-     * @param route a route
-     * @param method a HTTP method
-     * @param prefix an URL address prefix
-     */
-    protected inline fun <reified RET> bind(
-        noinline function: T.(Request?) -> Deferred<RET>,
-        route: String? = null,
-        method: RpcHttpMethod = RpcHttpMethod.POST,
-        prefix: String = "/"
-    )
-
-    /**
-     * Binds a given route with a function of the receiver.
-     * @param function a function of the receiver
-     * @param route a route
-     * @param method a HTTP method
-     * @param prefix an URL address prefix
-     */
-    protected inline fun <reified PAR, reified RET> bind(
-        noinline function: T.(PAR, Request?) -> Deferred<RET>,
-        route: String? = null,
-        method: RpcHttpMethod = RpcHttpMethod.POST,
-        prefix: String = "/"
-    )
-
-    /**
-     * Binds a given route with a function of the receiver.
-     * @param function a function of the receiver
-     * @param route a route
-     * @param method a HTTP method
-     * @param prefix an URL address prefix
-     */
-    protected inline fun <reified PAR1, reified PAR2, reified RET> bind(
-        noinline function: T.(PAR1, PAR2, Request?) -> Deferred<RET>,
-        route: String? = null,
-        method: RpcHttpMethod = RpcHttpMethod.POST,
-        prefix: String = "/"
-    )
-
-    /**
-     * Binds a given route with a function of the receiver.
-     * @param function a function of the receiver
-     * @param route a route
-     * @param method a HTTP method
-     * @param prefix an URL address prefix
-     */
-    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified RET> bind(
-        noinline function: T.(PAR1, PAR2, PAR3, Request?) -> Deferred<RET>,
-        route: String? = null,
-        method: RpcHttpMethod = RpcHttpMethod.POST,
-        prefix: String = "/"
-    )
-
-    /**
-     * Binds a given route with a function of the receiver.
-     * @param function a function of the receiver
-     * @param route a route
-     * @param method a HTTP method
-     * @param prefix an URL address prefix
-     */
-    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified PAR4, reified RET> bind(
-        noinline function: T.(PAR1, PAR2, PAR3, PAR4, Request?) -> Deferred<RET>,
-        route: String? = null,
-        method: RpcHttpMethod = RpcHttpMethod.POST,
-        prefix: String = "/"
-    )
-
-    /**
-     * Binds a given route with a function of the receiver.
-     * @param function a function of the receiver
-     * @param route a route
-     * @param method a HTTP method
-     * @param prefix an URL address prefix
-     */
-    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified PAR4, reified PAR5, reified RET> bind(
-        noinline function: T.(PAR1, PAR2, PAR3, PAR4, PAR5, Request?) -> Deferred<RET>,
-        route: String? = null,
-        method: RpcHttpMethod = RpcHttpMethod.POST,
-        prefix: String = "/"
-    )
-
-    /**
-     * Applies all defined routes to the given server.
-     * @param k a server
-     */
-    fun applyRoutes(k: KVServer)
-
+interface ServiceManager {
     /**
      * Returns the map of defined paths.
      */
-    fun getCalls(): Map<String, Pair<String, RpcHttpMethod>>
+    fun getCalls(): Map<String, Pair<String, RpcHttpMethod>> = mapOf()
+
 }
diff --git a/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/SpringServiceManager.kt b/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/SpringServiceManager.kt
new file mode 100644
index 00000000..0e17d4e7
--- /dev/null
+++ b/kvision-modules/kvision-common/src/main/kotlin/pl/treksoft/kvision/remote/SpringServiceManager.kt
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2017-present Robert Jaros
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package pl.treksoft.kvision.remote
+
+import kotlinx.coroutines.Deferred
+import kotlin.reflect.KClass
+
+/**
+ * Multiplatform service manager for Spring  Boot.
+ */
+expect open class SpringServiceManager<T : Any>(serviceClass: KClass<T>) : ServiceManager {
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified RET> bind(
+        noinline function: T.() -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR, reified RET> bind(
+        noinline function: T.(PAR) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR1, reified PAR2, reified RET> bind(
+        noinline function: T.(PAR1, PAR2) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified RET> bind(
+        noinline function: T.(PAR1, PAR2, PAR3) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified PAR4, reified RET> bind(
+        noinline function: T.(PAR1, PAR2, PAR3, PAR4) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+
+    /**
+     * Binds a given route with a function of the receiver.
+     * @param function a function of the receiver
+     * @param route a route
+     * @param method a HTTP method
+     */
+    protected inline fun <reified PAR1, reified PAR2, reified PAR3, reified PAR4, reified PAR5, reified RET> bind(
+        noinline function: T.(PAR1, PAR2, PAR3, PAR4, PAR5) -> Deferred<RET>,
+        route: String? = null,
+        method: RpcHttpMethod = RpcHttpMethod.POST
+    )
+}