From 110ba60c6557bf16a3bfc5f7ff5af46a98164c75 Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Fri, 1 Feb 2019 11:54:25 +0100 Subject: Refactor server-side interfaces. --- .../kotlin/pl/treksoft/kvision/remote/KVServer.kt | 117 --------------------- .../pl/treksoft/kvision/remote/KVServiceManager.kt | 10 +- .../kotlin/pl/treksoft/kvision/remote/Profile.kt | 111 +++++++++++++++++++ 3 files changed, 113 insertions(+), 125 deletions(-) delete mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt create mode 100644 kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt (limited to 'kvision-modules/kvision-remote/src/main') diff --git a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt deleted file mode 100644 index 7b74ab00..00000000 --- a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServer.kt +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 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.serialization.Serializable -import kotlinx.serialization.Transient - -/** - * A server. - * Not used on the js platform. - */ -actual open class KVServer - -/** - * A user profile. - */ -@Serializable -actual data class Profile( - val id: String? = null, - val attributes: MutableMap = mutableMapOf(), - val authenticationAttributes: MutableMap = mutableMapOf(), - val roles: MutableSet = mutableSetOf(), - val permissions: MutableSet = mutableSetOf(), - val linkedId: String? = null, - val remembered: Boolean = false, - val clientName: String? = null -) { - @Transient - var username: String? - get() = attributes["username"] - set(value) { - if (value != null) { - attributes["username"] = value - } else { - attributes.remove("username") - } - } - @Transient - var firstName: String? - get() = attributes["first_name"] - set(value) { - if (value != null) { - attributes["first_name"] = value - } else { - attributes.remove("first_name") - } - } - @Transient - var familyName: String? - get() = attributes["family_name"] - set(value) { - if (value != null) { - attributes["family_name"] = value - } else { - attributes.remove("family_name") - } - } - @Transient - var displayName: String? - get() = attributes["display_name"] - set(value) { - if (value != null) { - attributes["display_name"] = value - } else { - attributes.remove("display_name") - } - } - @Transient - var email: String? - get() = attributes["email"] - set(value) { - if (value != null) { - attributes["email"] = value - } else { - attributes.remove("email") - } - } - @Transient - var pictureUrl: String? - get() = attributes["picture_url"] - set(value) { - if (value != null) { - attributes["picture_url"] = value - } else { - attributes.remove("picture_url") - } - } - @Transient - var profileUrl: String? - get() = attributes["profile_url"] - set(value) { - if (value != null) { - attributes["profile_url"] = value - } else { - attributes.remove("profile_url") - } - } -} diff --git a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt index 383e8bb2..c13c4c18 100644 --- a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt +++ b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt @@ -26,7 +26,7 @@ import kotlin.reflect.KClass /** * Multiplatform service manager. */ -actual open class KVServiceManager actual constructor(serviceClass: KClass) : ServiceManager { +actual open class KVServiceManager actual constructor(serviceClass: KClass) { protected val calls: MutableMap> = mutableMapOf() var counter: Int = 0 @@ -131,12 +131,6 @@ actual open class KVServiceManager actual constructor(serviceClass: KCl /** * Returns the map of defined paths. */ - override fun getCalls(): Map> = calls + fun getCalls(): Map> = calls - /** - * Applies all defined routes to the given server. - * Not used on the js platform. - */ - actual fun applyRoutes(k: KVServer) { - } } diff --git a/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt new file mode 100644 index 00000000..d5745afe --- /dev/null +++ b/kvision-modules/kvision-remote/src/main/kotlin/pl/treksoft/kvision/remote/Profile.kt @@ -0,0 +1,111 @@ +/* + * 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.serialization.Serializable +import kotlinx.serialization.Transient + +/** + * A user profile. + */ +@Serializable +actual data class Profile( + val id: String? = null, + val attributes: MutableMap = mutableMapOf(), + val authenticationAttributes: MutableMap = mutableMapOf(), + val roles: MutableSet = mutableSetOf(), + val permissions: MutableSet = mutableSetOf(), + val linkedId: String? = null, + val remembered: Boolean = false, + val clientName: String? = null +) { + @Transient + var username: String? + get() = attributes["username"] + set(value) { + if (value != null) { + attributes["username"] = value + } else { + attributes.remove("username") + } + } + @Transient + var firstName: String? + get() = attributes["first_name"] + set(value) { + if (value != null) { + attributes["first_name"] = value + } else { + attributes.remove("first_name") + } + } + @Transient + var familyName: String? + get() = attributes["family_name"] + set(value) { + if (value != null) { + attributes["family_name"] = value + } else { + attributes.remove("family_name") + } + } + @Transient + var displayName: String? + get() = attributes["display_name"] + set(value) { + if (value != null) { + attributes["display_name"] = value + } else { + attributes.remove("display_name") + } + } + @Transient + var email: String? + get() = attributes["email"] + set(value) { + if (value != null) { + attributes["email"] = value + } else { + attributes.remove("email") + } + } + @Transient + var pictureUrl: String? + get() = attributes["picture_url"] + set(value) { + if (value != null) { + attributes["picture_url"] = value + } else { + attributes.remove("picture_url") + } + } + @Transient + var profileUrl: String? + get() = attributes["profile_url"] + set(value) { + if (value != null) { + attributes["profile_url"] = value + } else { + attributes.remove("profile_url") + } + } +} -- cgit