Simplify configuration

Dockerfile

@@ -24,6 +24,8 @@ COPY --from=jdkbuilder /myjdk /myjdk
 COPY app/build/libs/app-with-dependencies*.jar /app/simplenotes.jar
 WORKDIR /app
 
+ENV SERVER_HOST 0.0.0.0
+
 CMD [ \
     "/myjdk/bin/java", \
     "--add-opens", \

config/resources/application.yaml

@@ -1,6 +1,5 @@
 db:
     jdbc-url: jdbc:h2:./notes-db;
-    driver-class-name: org.h2.Driver
     username: h2
     password: ''
     connection-timeout: 3000

config/src/Config.kt

@@ -7,14 +7,13 @@ import java.util.concurrent.TimeUnit
 @ConfigurationProperties("db")
 data class DataSourceConfig @ConfigurationInject constructor(
     val jdbcUrl: String,
-    val driverClassName: String,
     val username: String,
     val password: String,
     val maximumPoolSize: Int,
     val connectionTimeout: Long,
 ) {
-    override fun toString() = "DataSourceConfig(jdbcUrl='$jdbcUrl', driverClassName='$driverClassName', " +
-        "username='$username', password='***', maximumPoolSize=$maximumPoolSize, connectionTimeout=$connectionTimeout)"
+    override fun toString() = "DataSourceConfig(jdbcUrl='$jdbcUrl', username='$username', password='***', " +
+        "maximumPoolSize=$maximumPoolSize, connectionTimeout=$connectionTimeout)"
 }
 
 @ConfigurationProperties("jwt")

docker-compose.yml

@@ -32,9 +32,7 @@ services:
             - .env
         environment:
             - TZ=Europe/Brussels
-            - SERVER_HOST=0.0.0.0
             - DB_JDBC_URL=jdbc:mariadb://db:3306/simplenotes
-            - DB_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver
             - DB_USERNAME=simplenotes
             # .env:
             # - JWT_SECRET

persistence/src/PersistenceModule.kt

@@ -23,7 +23,11 @@ class PersistenceModule {
     internal fun dataSource(conf: DataSourceConfig): HikariDataSource {
         val hikariConfig = HikariConfig().also {
             it.jdbcUrl = conf.jdbcUrl
-            it.driverClassName = conf.driverClassName
+            it.driverClassName = when {
+                conf.jdbcUrl.startsWith("jdbc:mariadb") -> "org.mariadb.jdbc.Driver"
+                conf.jdbcUrl.startsWith("jdbc:h2") -> "org.h2.Driver"
+                else -> error("Unsupported database")
+            }
             it.username = conf.username
             it.password = conf.password
             it.maximumPoolSize = conf.maximumPoolSize

persistence/test/DataSources.kt

@@ -7,7 +7,6 @@ class KMariadbContainer : MariaDBContainer<KMariadbContainer>("mariadb:10.5.5")
 
 fun h2dataSourceConfig() = DataSourceConfig(
     jdbcUrl = "jdbc:h2:mem:regular;DB_CLOSE_DELAY=-1;",
-    driverClassName = "org.h2.Driver",
     username = "h2",
     password = "",
     maximumPoolSize = 2,
@@ -16,7 +15,6 @@ fun h2dataSourceConfig() = DataSourceConfig(
 
 fun mariadbDataSourceConfig(jdbcUrl: String) = DataSourceConfig(
     jdbcUrl = jdbcUrl,
-    driverClassName = "org.mariadb.jdbc.Driver",
     username = "test",
     password = "test",
     maximumPoolSize = 2,