refactor(config): delete unnecessary nested structure in db

yoshinorin · Jul 20, 2024 · 6445d56 · 6445d56
1 parent 2755cf6
commit 6445d56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -1,10 +1,8 @@
 db {
-  ctx {
-    dataSourceClassName = "org.mariadb.jdbc.MariaDbDataSource"
-    dataSource.url = ${?QUALTET_DB_DATASOURCE_URL}
-    dataSource.user = ${?QUALTET_DB_USER}
-    dataSource.password = ${?QUALTET_DB_PASSWORD}
-  }
+  dataSourceClassName = "org.mariadb.jdbc.MariaDbDataSource"
+  dataSource.url = ${?QUALTET_DB_DATASOURCE_URL}
+  dataSource.user = ${?QUALTET_DB_USER}
+  dataSource.password = ${?QUALTET_DB_PASSWORD}
 }
 
 http {

diff --git a/src/main/scala/net/yoshinorin/qualtet/config/ApplicationConfig.scala b/src/main/scala/net/yoshinorin/qualtet/config/ApplicationConfig.scala
@@ -27,9 +27,9 @@ object ApplicationConfig {
 
   private val config: TypeSafeConfig = ConfigFactory.load
 
-  private val dbUrl: String = config.getString("db.ctx.dataSource.url")
-  private val dbUser: String = config.getString("db.ctx.dataSource.user")
-  private val dbPassword: String = config.getString("db.ctx.dataSource.password")
+  private val dbUrl: String = config.getString("db.dataSource.url")
+  private val dbUser: String = config.getString("db.dataSource.user")
+  private val dbPassword: String = config.getString("db.dataSource.password")
 
   private val httpHost: String = config.getString("http.host")
   private val httpPort: Int = config.getInt("http.port")

diff --git a/src/test/resources/application.conf b/src/test/resources/application.conf
@@ -1,10 +1,8 @@
 db {
-  ctx {
-    dataSourceClassName = "org.mariadb.jdbc.MariaDbDataSource"
-    dataSource.user = ${?QUALTET_DB_USER}
-    dataSource.password = ${?QUALTET_DB_PASSWORD}
-    dataSource.url = "jdbc:mariadb://127.0.0.1:33066/qualtet?useUnicode=true&characterEncoding=utf8mb4"
-  }
+  dataSourceClassName = "org.mariadb.jdbc.MariaDbDataSource"
+  dataSource.user = ${?QUALTET_DB_USER}
+  dataSource.password = ${?QUALTET_DB_PASSWORD}
+  dataSource.url = "jdbc:mariadb://127.0.0.1:33066/qualtet?useUnicode=true&characterEncoding=utf8mb4"
 }
 
 http {