Skip to content

Improve consistency of MergedApplicationConfig.kt #3611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rsinukov merged 1 commit into from
May 16, 2023
Merged

Improve consistency of MergedApplicationConfig.kt #3611

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ktor-server/ktor-server-core/jvmAndNix/src/io/ktor/server/config/MergedApplicationConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ internal class MergedApplicationConfig(
) : ApplicationConfig {

private val firstKeys by lazy { first.keys() }
private val secondKeys by lazy { second.keys() }

override fun property(path: String): ApplicationConfigValue = when {
firstKeys.contains(path) -> first.property(path)
Expand All @@ -53,17 +54,17 @@ internal class MergedApplicationConfig(

override fun config(path: String): ApplicationConfig {
if (firstKeys.none { it.startsWith("$path.") }) return second.config(path)
if (second.keys().none { it.startsWith("$path.") }) return first.config(path)
if (secondKeys.none { it.startsWith("$path.") }) return first.config(path)
return MergedApplicationConfig(first.config(path), second.config(path))
}

override fun configList(path: String): List<ApplicationConfig> {
val firstList = if (firstKeys.contains(path)) first.configList(path) else emptyList()
val secondList = if (second.keys().contains(path)) second.configList(path) else emptyList()
val secondList = if (secondKeys.contains(path)) second.configList(path) else emptyList()
return firstList + secondList
}

override fun keys(): Set<String> = firstKeys + second.keys()
override fun keys(): Set<String> = firstKeys + secondKeys

override fun toMap(): Map<String, Any?> = second.toMap() + first.toMap()
}