Update config

config/resources/application.yaml

@@ -1,10 +1,3 @@
-db:
-    jdbc-url: jdbc:h2:./notes-db;
-    username: h2
-    password: ''
-    connection-timeout: 3000
-    maximum-pool-size: 10
-
 jwt:
     secret: 'PliLvfk7l4WF+cZJk66LR5Mpnh+ocbvJ2wfUCK2UCms='
     validity: 24
@@ -13,3 +6,5 @@ jwt:
 server:
     host: localhost
     port: 8080
+
+data-dir: ./data

config/src/Config.kt

@@ -1,32 +0,0 @@
-package be.simplenotes.config
-
-import io.micronaut.context.annotation.ConfigurationInject
-import io.micronaut.context.annotation.ConfigurationProperties
-import java.util.concurrent.TimeUnit
-
-@ConfigurationProperties("db")
-data class DataSourceConfig @ConfigurationInject constructor(
-    val jdbcUrl: String,
-    val username: String,
-    val password: String,
-    val maximumPoolSize: Int,
-    val connectionTimeout: Long,
-) {
-    override fun toString() = "DataSourceConfig(jdbcUrl='$jdbcUrl', username='$username', password='***', " +
-        "maximumPoolSize=$maximumPoolSize, connectionTimeout=$connectionTimeout)"
-}
-
-@ConfigurationProperties("jwt")
-data class JwtConfig @ConfigurationInject constructor(
-    val secret: String,
-    val validity: Long,
-    val timeUnit: TimeUnit,
-) {
-    override fun toString() = "JwtConfig(secret='***', validity=$validity, timeUnit=$timeUnit)"
-}
-
-@ConfigurationProperties("server")
-data class ServerConfig @ConfigurationInject constructor(
-    val host: String,
-    val port: Int,
-)

config/src/DataConfig.kt

@@ -0,0 +1,58 @@
+package be.simplenotes.config
+
+import io.micronaut.context.annotation.*
+import java.nio.file.Path
+import java.util.concurrent.TimeUnit
+import javax.inject.Singleton
+
+data class DataConfig(val dataDir: String)
+
+data class DataSourceConfig(
+    val jdbcUrl: String,
+    val maximumPoolSize: Int,
+    val connectionTimeout: Long,
+)
+
+@ConfigurationProperties("jwt")
+data class JwtConfig @ConfigurationInject constructor(
+    val secret: String,
+    val validity: Long,
+    val timeUnit: TimeUnit,
+) {
+    override fun toString() = "JwtConfig(secret='***', validity=$validity, timeUnit=$timeUnit)"
+}
+
+@ConfigurationProperties("server")
+data class ServerConfig @ConfigurationInject constructor(
+    val host: String,
+    val port: Int,
+)
+
+@Factory
+class ConfigFactory {
+
+    @Singleton
+    @Requires(notEnv = ["test"])
+    fun datasourceConfig(dataConfig: DataConfig) = DataSourceConfig(
+        jdbcUrl = "jdbc:h2:" + Path.of(dataConfig.dataDir, "simplenotes").normalize().toAbsolutePath(),
+        maximumPoolSize = 10,
+        connectionTimeout = 1000
+    )
+
+    @Singleton
+    @Requires(env = ["test"])
+    fun testDatasourceConfig() = DataSourceConfig(
+        jdbcUrl = "jdbc:h2:mem:regular;DB_CLOSE_DELAY=-1",
+        maximumPoolSize = 2,
+        connectionTimeout = 1000
+    )
+
+    @Singleton
+    @Requires(notEnv = ["test"])
+    fun dataConfig(@Property(name = "data-dir") dataDir: String) = DataConfig(dataDir)
+
+    @Singleton
+    @Requires(env = ["test"])
+    fun testDataConfig() = DataConfig("/tmp")
+
+}