Move remaining keys to env extension file

javaBin · Dec 19, 2024 · a877672 · a877672
1 parent 6c2ee46
commit a877672
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/kotlin/no/java/conf/Application.kt b/src/main/kotlin/no/java/conf/Application.kt
@@ -37,8 +37,8 @@ fun Application.module() {
     val searchClient = searchClient(environment.searchClientConfig())
     val searchService = searchService(environment.searchServiceConfig(searchClient))
 
-    val sleepingPillService = sleepingPillService(httpClient(), environment.endpointConfig("javazone.sleepingpill"))
-    val localFileService = localFileService(environment.localFileConfig("javazone.localfile"))
+    val sleepingPillService = sleepingPillService(httpClient(), environment.endpointConfig())
+    val localFileService = localFileService(environment.localFileConfig())
 
     configureSerialization()
     configureMonitoring()

diff --git a/src/main/kotlin/no/java/conf/EnvironmentExtensions.kt b/src/main/kotlin/no/java/conf/EnvironmentExtensions.kt
@@ -39,12 +39,12 @@ fun ApplicationEnvironment.searchServiceConfig(searchClient: SearchClient) =
         skipIndex = bool("elastic.skipindex")
     )
 
-fun ApplicationEnvironment.endpointConfig(key: String) =
-    config.configList(key).map {
+fun ApplicationEnvironment.endpointConfig() =
+    config.configList("javazone.sleepingpill").map {
         EndpointConfig(it.int("year"), it.str("endpoint"))
     }
 
-fun ApplicationEnvironment.localFileConfig(key: String) =
-    config.configList(key).map {
+fun ApplicationEnvironment.localFileConfig() =
+    config.configList("javazone.localfile").map {
         LocalFileConfig(it.int("year"), it.str("LocalFileConfig"))
     }