chore(model-server): pass properties instead of a file to create IgniteStoreClient

Passing properties instead of files simplifies testing.

Author: Oleksandr Dzhychko

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

@@ -75,9 +75,11 @@ import org.modelix.model.server.store.writeDump
 import org.slf4j.LoggerFactory
 import org.springframework.util.ResourceUtils
 import java.io.File
+import java.io.FileReader
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.time.Duration
+import java.util.Properties
 import javax.sql.DataSource
 
 object Main {
@@ -143,9 +145,11 @@ object Main {
                         )
                 }
             } else if (cmdLineArgs.localPersistence) {
-                storeClient = IgniteStoreClient(cmdLineArgs.jdbcConfFile, inmemory = true)
+                val jdbcProperties = cmdLineArgs.jdbcConfFile?.let(::readJdbcProperties)
+                storeClient = IgniteStoreClient(jdbcProperties, inmemory = true)
             } else {
-                storeClient = IgniteStoreClient(cmdLineArgs.jdbcConfFile)
+                val jdbcProperties = cmdLineArgs.jdbcConfFile?.let(::readJdbcProperties)
+                storeClient = IgniteStoreClient(jdbcProperties)
                 if (cmdLineArgs.schemaInit) {
                     val dataSource: DataSource = Ignition.loadSpringBean<DataSource>(
                         Main::class.java.getResource("ignite.xml"),
@@ -251,6 +255,16 @@ object Main {
         }
     }
 
+    private fun readJdbcProperties(jdbcConfFile: File): Properties {
+        val properties = Properties()
+        try {
+            properties.load(FileReader(jdbcConfFile))
+        } catch (e: IOException) {
+            throw IllegalStateException("Could not load the JDBC configuration from ${jdbcConfFile.absolutePath}.", e)
+        }
+        return properties
+    }
+
     /**
      * Installs the status pages extension with a configuration suitable for generating application/problem+json
      * responses as defined in the API specification.

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

@@ -26,9 +26,6 @@ import org.modelix.model.IGenericKeyListener
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.persistent.HashUtil
 import org.modelix.model.server.SqlUtils
-import java.io.File
-import java.io.FileReader
-import java.io.IOException
 import java.sql.SQLException
 import java.util.*
 import javax.cache.Cache
@@ -40,7 +37,9 @@ private val LOG = KotlinLogging.logger { }
  * Store client implementation with an ignite cache.
  * If [inmemory] is true, the data is not persisted in a database.
  */
-class IgniteStoreClient(jdbcConfFile: File? = null, private val inmemory: Boolean = false) : IsolatingStore, AutoCloseable {
+class IgniteStoreClient(jdbcProperties: Properties? = null, private val inmemory: Boolean = false) :
+    IsolatingStore,
+    AutoCloseable {
 
     companion object {
         private const val ENTRY_CHANGED_TOPIC = "entryChanged"
@@ -68,28 +67,14 @@ class IgniteStoreClient(jdbcConfFile: File? = null, private val inmemory: Boolea
      * from ignite.xml is used
      */
     init {
-        if (jdbcConfFile != null) {
+        if (jdbcProperties != null) {
             // Given that systemPropertiesMode is set to 2 (SYSTEM_PROPERTIES_MODE_OVERRIDE) in
             // ignite.xml, we can override the properties through system properties
-            try {
-                val properties = Properties()
-                properties.load(FileReader(jdbcConfFile))
-                for (pn in properties.stringPropertyNames()) {
-                    if (pn.startsWith("jdbc.")) {
-                        System.setProperty(pn, properties.getProperty(pn))
-                    } else {
-                        throw RuntimeException(
-                            "Properties not related to jdbc are not permitted. Check file " +
-                                jdbcConfFile.absolutePath,
-                        )
-                    }
+            for (propertyName in jdbcProperties.stringPropertyNames()) {
+                require(propertyName.startsWith("jdbc.")) {
+                    "Property `$propertyName` is invalid. Only properties starting with `jdbc.` are permitted."
                 }
-            } catch (e: IOException) {
-                throw RuntimeException(
-                    "We are unable to load the JDBC configuration from " +
-                        jdbcConfFile.absolutePath,
-                    e,
-                )
+                System.setProperty(propertyName, jdbcProperties.getProperty(propertyName))
             }
         }
         if (!inmemory) updateDatabaseSchema()