Merge pull request #704 from modelix/refactor/cleanup

Model server code cleanup
modelix · Apr 18, 2024 · 1fcee2a · 1fcee2a
2 parents f03e5f5 + bad37ad
commit 1fcee2a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 34 deletions.
diff --git a/model-server/src/main/kotlin/org/modelix/model/server/Main.kt b/model-server/src/main/kotlin/org/modelix/model/server/Main.kt
@@ -22,8 +22,7 @@ import io.ktor.server.application.call
 import io.ktor.server.application.install
 import io.ktor.server.engine.embeddedServer
 import io.ktor.server.html.respondHtmlTemplate
-import io.ktor.server.http.content.resources
-import io.ktor.server.http.content.static
+import io.ktor.server.http.content.staticResources
 import io.ktor.server.netty.Netty
 import io.ktor.server.netty.NettyApplicationEngine
 import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
@@ -44,6 +43,7 @@ import kotlinx.html.h1
 import kotlinx.html.li
 import kotlinx.html.style
 import kotlinx.html.ul
+import kotlinx.html.unsafe
 import org.apache.commons.io.FileUtils
 import org.apache.ignite.Ignition
 import org.modelix.authorization.KeycloakUtils
@@ -204,24 +204,26 @@ object Main {
                 modelReplicationServer.init(this)
                 metricsHandler.init(this)
                 routing {
-                    static("/public") {
-                        resources("public")
-                    }
+                    staticResources("/public", "public")
                     get("/") {
                         call.respondHtmlTemplate(PageWithMenuBar("root", ".")) {
                             headContent {
                                 style {
-                                    +"""
-                                    body {
-                                        font-family: sans-serif;
-                                    table {
-                                        border-collapse: collapse;
-                                    }
-                                    td, th {
-                                        border: 1px solid #888;
-                                        padding: 3px 12px;
+                                    unsafe {
+                                        raw(
+                                            """
+                                            body {
+                                                font-family: sans-serif;
+                                            table {
+                                                border-collapse: collapse;
+                                            }
+                                            td, th {
+                                                border: 1px solid #888;
+                                                padding: 3px 12px;
+                                            }
+                                            """.trimIndent(),
+                                        )
                                     }
-                                    """.trimIndent()
                                 }
                             }
                             bodyContent {

diff --git a/model-server/src/main/kotlin/org/modelix/model/server/handlers/KeyValueLikeModelServer.kt b/model-server/src/main/kotlin/org/modelix/model/server/handlers/KeyValueLikeModelServer.kt
@@ -52,7 +52,6 @@ import org.modelix.model.server.store.IStoreClient
 import org.modelix.model.server.store.pollEntry
 import org.modelix.model.server.store.runTransactionSuspendable
 import org.modelix.model.server.templates.PageWithMenuBar
-import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.util.*
 import java.util.regex.Pattern
@@ -61,7 +60,7 @@ val PERMISSION_MODEL_SERVER = "model-server".asResource()
 val MODEL_SERVER_ENTRY = KeycloakResourceType("model-server-entry", KeycloakScope.READ_WRITE_DELETE)
 
 private fun toLong(value: String?): Long {
-    return if (value == null || value.isEmpty()) 0 else value.toLong()
+    return if (value.isNullOrEmpty()) 0 else value.toLong()
 }
 
 private class NotFoundException(description: String?) : RuntimeException(description)
@@ -78,10 +77,9 @@ class KeyValueLikeModelServer(
         this(repositoriesManager, repositoriesManager.client.store, InMemoryModels())
 
     companion object {
-        private val LOG = LoggerFactory.getLogger(KeyValueLikeModelServer::class.java)
-        val HASH_PATTERN = Pattern.compile("[a-zA-Z0-9\\-_]{5}\\*[a-zA-Z0-9\\-_]{38}")
-        const val PROTECTED_PREFIX = "$$$"
-        val HEALTH_KEY = PROTECTED_PREFIX + "health2"
+        private val HASH_PATTERN: Pattern = Pattern.compile("[a-zA-Z0-9\\-_]{5}\\*[a-zA-Z0-9\\-_]{38}")
+        private const val PROTECTED_PREFIX = "$$$"
+        private const val HEALTH_KEY = PROTECTED_PREFIX + "health2"
     }
 
     fun init(application: Application) {
@@ -262,7 +260,7 @@ class KeyValueLikeModelServer(
         val processed: MutableSet<String> = HashSet()
         val pending: MutableSet<String> = HashSet()
         pending.add(rootKey)
-        while (!pending.isEmpty()) {
+        while (pending.isNotEmpty()) {
             val keys: List<String> = ArrayList(pending)
             pending.clear()
             val values = storeClient.getAll(keys)
@@ -295,7 +293,7 @@ class KeyValueLikeModelServer(
         return result
     }
 
-    protected suspend fun CallContext.putEntries(newEntries: Map<String, String?>) {
+    private suspend fun CallContext.putEntries(newEntries: Map<String, String?>) {
         val referencedKeys: MutableSet<String> = HashSet()
         for ((key, value) in newEntries) {
             checkKeyPermission(key, EPermissionType.WRITE)
@@ -397,7 +395,7 @@ class KeyValueLikeModelServer(
         call.checkPermission(MODEL_SERVER_ENTRY.createInstance(key), type.toKeycloakScope())
     }
 
-    fun isHealthy(): Boolean {
+    private fun isHealthy(): Boolean {
         val value = toLong(storeClient[HEALTH_KEY]) + 1
         storeClient.put(HEALTH_KEY, java.lang.Long.toString(value))
         return toLong(storeClient[HEALTH_KEY]) >= value

diff --git a/model-server/src/main/kotlin/org/modelix/model/server/handlers/LightModelServer.kt b/model-server/src/main/kotlin/org/modelix/model/server/handlers/LightModelServer.kt
@@ -23,6 +23,7 @@ import io.ktor.websocket.Frame
 import io.ktor.websocket.readText
 import io.ktor.websocket.send
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
@@ -64,7 +65,7 @@ import kotlin.collections.set
 
 class LightModelServer(val client: LocalModelClient) {
 
-    fun getStore() = client.storeCache!!
+    private fun getStore() = client.storeCache
 
     fun init(application: Application) {
         application.apply {
@@ -79,7 +80,7 @@ class LightModelServer(val client: LocalModelClient) {
     }
 
     private fun getCurrentVersion(repositoryId: RepositoryId): CLVersion {
-        val versionHash = client.asyncStore?.get(repositoryId.getBranchKey())!!
+        val versionHash = client.asyncStore.get(repositoryId.getBranchKey())!!
         return CLVersion.loadFromHash(versionHash, getStore())
     }
 
@@ -362,18 +363,11 @@ class LightModelServer(val client: LocalModelClient) {
             node.allChildren.forEach { node2json(it, true, outputList) }
         }
     }
-
-    companion object {
-        private val LOG = mu.KotlinLogging.logger { }
-    }
 }
 
+@OptIn(ExperimentalCoroutinesApi::class)
 private suspend fun <T> Channel<T>.receiveLast(): T {
     var latest = receive()
     while (!isEmpty) latest = receive()
     return latest
 }
-
-private fun Channel<*>.clear() {
-    while (!isEmpty) tryReceive()
-}