Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Config injections now use a ConcurrentHashMap

Browse Source
This commit is contained in:
Auxilor
2023-04-24 22:05:37 +01:00
parent acb326c0c8
commit fc0a07d1c5
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt
View File

@@ -15,7 +15,7 @@ open class EcoConfig(
private val values = ConcurrentHashMap<String, Any?>()
@Transient
var injections = mutableListOf<InjectablePlaceholder>()
var injections = ConcurrentHashMap<String, InjectablePlaceholder>()
fun init(values: Map<String, Any?>) {
this.values.clear()
@@ -104,12 +104,12 @@ open class EcoConfig(
}
override fun getSubsectionOrNull(path: String): Config? {
return (get(path) as? Config)?.apply { this.addInjectablePlaceholder(injections) }
return (get(path) as? Config)?.apply { this.addInjectablePlaceholder(injections.values) }
}
override fun getSubsectionsOrNull(path: String): List<Config>? {
return getList<Config>(path)
?.map { it.apply { this.addInjectablePlaceholder(injections) } }
?.map { it.apply { this.addInjectablePlaceholder(injections.values) } }
?.toList()
}
@@ -180,12 +180,13 @@ open class EcoConfig(
}
override fun addInjectablePlaceholder(placeholders: Iterable<InjectablePlaceholder>) {
injections.removeIf { placeholders.any { placeholder -> it.identifier == placeholder.identifier } }
injections.addAll(placeholders)
for (placeholder in placeholders) {
injections[placeholder.identifier] = placeholder
}
}
override fun getPlaceholderInjections(): List<InjectablePlaceholder> {
return injections.toList()
return injections.values.toList()
}
override fun clearInjectedPlaceholders() {

5
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfigSection.kt
View File

@@ -2,14 +2,15 @@ package com.willfp.eco.internal.config
import com.willfp.eco.core.config.ConfigType
import com.willfp.eco.core.placeholder.InjectablePlaceholder
import java.util.concurrent.ConcurrentHashMap
class EcoConfigSection(
type: ConfigType,
values: Map<String, Any?> = emptyMap(),
injections: Collection<InjectablePlaceholder> = emptyList()
injections: MutableMap<String, InjectablePlaceholder> = mutableMapOf()
) : EcoConfig(type) {
init {
this.init(values)
this.injections = injections.toMutableList()
this.injections = ConcurrentHashMap(injections)
}
}