refactor(model-server): moved file dumping out of InMemoryStoreClient

Author: slisson

model-server/src/main/kotlin/org/modelix/model/server/Main.kt

@@ -56,11 +56,11 @@ import org.modelix.model.server.store.IStoreClient
 import org.modelix.model.server.store.IgniteStoreClient
 import org.modelix.model.server.store.InMemoryStoreClient
 import org.modelix.model.server.store.LocalModelClient
+import org.modelix.model.server.store.loadDump
+import org.modelix.model.server.store.writeDump
 import org.modelix.model.server.templates.PageWithMenuBar
 import org.slf4j.LoggerFactory
 import java.io.File
-import java.io.FileReader
-import java.io.FileWriter
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.time.Duration
@@ -111,18 +111,16 @@ object Main {
                 }
                 storeClient = InMemoryStoreClient()
                 if (cmdLineArgs.dumpInName != null) {
-                    val file = File(cmdLineArgs.dumpInName)
-                    val keys = storeClient.load(FileReader(file))
-                    println(
-                        "Values loaded from " + file.absolutePath + " (" + keys + ")",
-                    )
+                    val file = File(cmdLineArgs.dumpInName!!)
+                    val keys = storeClient.loadDump(file)
+                    println("Values loaded from " + file.absolutePath + " (" + keys + ")")
                 }
                 if (cmdLineArgs.dumpOutName != null) {
                     Runtime.getRuntime()
                         .addShutdownHook(
                             DumpOutThread(
                                 storeClient,
-                                cmdLineArgs.dumpOutName,
+                                cmdLineArgs.dumpOutName ?: "dump",
                             ),
                         )
                 }
@@ -243,24 +241,14 @@ object Main {
         }
     }
 
-    private class DumpOutThread internal constructor(inMemoryStoreClient: InMemoryStoreClient, dumpName: String?) :
+    private class DumpOutThread internal constructor(storeClient: IStoreClient, dumpName: String) :
         Thread(
             Runnable {
-                var fw: FileWriter? = null
                 try {
-                    fw = FileWriter(File(dumpName))
-                    inMemoryStoreClient.dump(fw!!)
+                    storeClient.writeDump(File(dumpName))
                     println("[Saved memory store into $dumpName]")
                 } catch (e: IOException) {
                     e.printStackTrace()
-                } finally {
-                    if (fw != null) {
-                        try {
-                            fw!!.close()
-                        } catch (e: IOException) {
-                            e.printStackTrace()
-                        }
-                    }
                 }
             },
         )

model-server/src/main/kotlin/org/modelix/model/server/store/IStoreClient.kt

@@ -19,6 +19,8 @@ import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withTimeoutOrNull
 import org.modelix.model.IKeyListener
+import java.io.File
+import java.io.IOException
 import kotlin.time.Duration.Companion.seconds
 
 interface IStoreClient : AutoCloseable {
@@ -80,3 +82,30 @@ suspend fun pollEntry(storeClient: IStoreClient, key: String, lastKnownValue: St
     }
     return result
 }
+
+fun IStoreClient.loadDump(file: File): Int {
+    var n = 0
+    file.useLines { lines ->
+        val entries = lines.associate { line ->
+            val parts = line.split("#".toRegex(), limit = 2)
+            n++
+            parts[0] to parts[1]
+        }
+        putAll(entries, silent = true)
+    }
+    return n
+}
+
+@Synchronized
+@Throws(IOException::class)
+fun IStoreClient.writeDump(file: File) {
+    file.writer().use { writer ->
+        for ((key, value) in getAll()) {
+            if (value == null) continue
+            writer.append(key)
+            writer.append("#")
+            writer.append(value)
+            writer.append("\n")
+        }
+    }
+}

model-server/src/main/kotlin/org/modelix/model/server/store/InMemoryStoreClient.kt

@@ -16,10 +16,6 @@ package org.modelix.model.server.store
 
 import org.modelix.model.IKeyListener
 import org.slf4j.LoggerFactory
-import java.io.BufferedReader
-import java.io.FileReader
-import java.io.FileWriter
-import java.io.IOException
 import kotlin.collections.HashMap
 
 fun generateId(idStr: String?): Long {
@@ -104,30 +100,6 @@ class InMemoryStoreClient : IStoreClient {
         return id
     }
 
-    @Synchronized
-    @Throws(IOException::class)
-    fun dump(fileWriter: FileWriter) {
-        for (key in values.keys) {
-            fileWriter.append(key)
-            fileWriter.append("#")
-            fileWriter.append(values[key])
-            fileWriter.append("\n")
-        }
-    }
-
-    @Synchronized
-    fun load(fileReader: FileReader?): Int {
-        val br = BufferedReader(fileReader)
-        val n = intArrayOf(0)
-        br.lines()
-            .forEach { line: String ->
-                val parts = line.split("#".toRegex(), limit = 2).toTypedArray()
-                values[parts[0]] = parts[1]
-                n[0]++
-            }
-        return n[0]
-    }
-
     @Synchronized
     override fun <T> runTransaction(body: () -> T): T {
         if (transactionValues == null) {