Generate automatic routes names.

1 files changed, 32 insertions, 25 deletions

diff --git a/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt b/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt
index df3245c3..fc464154 100644
--- a/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt
+++ b/src/main/kotlin/pl/treksoft/kvision/remote/ServiceManager.kt
@@ -26,94 +26,101 @@ import kotlinx.coroutines.experimental.Deferred
 /**
  * Multiplatform service manager.
  */
-actual open class ServiceManager<out T> actual constructor(service: T?) {
+actual open class ServiceManager<out T> actual constructor(service: T) {
     protected val calls: MutableMap<String, Pair<String, RpcHttpMethod>> = mutableMapOf()
+    var counter: Int = 0
 
     /**
      * Binds a given route with a function of the receiver.
-     * @param route a route
      * @param function a function of the receiver
+     * @param route a route
      * @param method a HTTP method
      * @param prefix an URL address prefix
      */
     protected actual inline fun <reified RET> bind(
-        route: String,
-        noinline function: T.(Request?) -> Deferred<RET>, method: RpcHttpMethod, prefix: String
+        noinline function: T.(Request?) -> Deferred<RET>,
+        route: String?, method: RpcHttpMethod, prefix: String
     ) {
-        calls[function.toString()] = Pair("$prefix$route", method)
+        val routeDef = if (route != null) route else "route${this::class.simpleName}${counter++}"
+        calls[function.toString()] = Pair("$prefix$routeDef", method)
     }
 
     /**
      * Binds a given route with a function of the receiver.
-     * @param route a route
      * @param function a function of the receiver
+     * @param route a route
      * @param method a HTTP method
      * @param prefix an URL address prefix
      */
     protected actual inline fun <reified PAR, reified RET> bind(
-        route: String,
-        noinline function: T.(PAR, Request?) -> Deferred<RET>, method: RpcHttpMethod, prefix: String
+        noinline function: T.(PAR, Request?) -> Deferred<RET>,
+        route: String?, method: RpcHttpMethod, prefix: String
     ) {
-        calls[function.toString()] = Pair("$prefix$route", method)
+        val routeDef = if (route != null) route else "route${this::class.simpleName}${counter++}"
+        calls[function.toString()] = Pair("$prefix$routeDef", method)
     }
 
     /**
      * Binds a given route with a function of the receiver.
-     * @param route a route
      * @param function a function of the receiver
+     * @param route a route
      * @param method a HTTP method
      * @param prefix an URL address prefix
      */
     protected actual inline fun <reified PAR1, reified PAR2, reified RET> bind(
-        route: String,
-        noinline function: T.(PAR1, PAR2, Request?) -> Deferred<RET>, method: RpcHttpMethod, prefix: String
+        noinline function: T.(PAR1, PAR2, Request?) -> Deferred<RET>,
+        route: String?, method: RpcHttpMethod, prefix: String
     ) {
-        calls[function.toString()] = Pair("$prefix$route", method)
+        val routeDef = if (route != null) route else "route${this::class.simpleName}${counter++}"
+        calls[function.toString()] = Pair("$prefix$routeDef", method)
     }
 
     /**
      * Binds a given route with a function of the receiver.
-     * @param route a route
      * @param function a function of the receiver
+     * @param route a route
      * @param method a HTTP method
      * @param prefix an URL address prefix
      */
     protected actual inline fun <reified PAR1, reified PAR2, reified PAR3, reified RET> bind(
-        route: String,
-        noinline function: T.(PAR1, PAR2, PAR3, Request?) -> Deferred<RET>, method: RpcHttpMethod, prefix: String
+        noinline function: T.(PAR1, PAR2, PAR3, Request?) -> Deferred<RET>,
+        route: String?, method: RpcHttpMethod, prefix: String
     ) {
-        calls[function.toString()] = Pair("$prefix$route", method)
+        val routeDef = if (route != null) route else "route${this::class.simpleName}${counter++}"
+        calls[function.toString()] = Pair("$prefix$routeDef", method)
     }
 
     /**
      * Binds a given route with a function of the receiver.
-     * @param route a route
      * @param function a function of the receiver
+     * @param route a route
      * @param method a HTTP method
      * @param prefix an URL address prefix
      */
     protected actual inline fun <reified PAR1, reified PAR2, reified PAR3, reified PAR4, reified RET> bind(
-        route: String,
-        noinline function: T.(PAR1, PAR2, PAR3, PAR4, Request?) -> Deferred<RET>, method: RpcHttpMethod, prefix: String
+        noinline function: T.(PAR1, PAR2, PAR3, PAR4, Request?) -> Deferred<RET>,
+        route: String?, method: RpcHttpMethod, prefix: String
     ) {
-        calls[function.toString()] = Pair("$prefix$route", method)
+        val routeDef = if (route != null) route else "route${this::class.simpleName}${counter++}"
+        calls[function.toString()] = Pair("$prefix$routeDef", method)
     }
 
     /**
      * Binds a given route with a function of the receiver.
-     * @param route a route
      * @param function a function of the receiver
+     * @param route a route
      * @param method a HTTP method
      * @param prefix an URL address prefix
      */
     protected actual inline fun <reified PAR1, reified PAR2, reified PAR3,
             reified PAR4, reified PAR5, reified RET> bind(
-        route: String,
         noinline function: T.(PAR1, PAR2, PAR3, PAR4, PAR5, Request?) -> Deferred<RET>,
+        route: String?,
         method: RpcHttpMethod,
         prefix: String
     ) {
-        calls[function.toString()] = Pair("$prefix$route", method)
+        val routeDef = if (route != null) route else "route${this::class.simpleName}${counter++}"
+        calls[function.toString()] = Pair("$prefix$routeDef", method)
     }
 
     /**
@@ -127,4 +134,4 @@ actual open class ServiceManager<out T> actual constructor(service: T?) {
      * Returns the map of defined paths.
      */
     actual fun getCalls(): Map<String, Pair<String, RpcHttpMethod>> = calls
-}
+}
\ No newline at end of file