Skip to content

Bugfix/49 fix alias generator handler #50

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
DivineThreepwood merged 2 commits into from
Jan 11, 2022
Merged

Bugfix/49 fix alias generator handler #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c101fc
make sure alias number is reset after consistency handler reset.
DivineThreepwood Jan 11, 2022
a15758d
Improve code style
DivineThreepwood Jan 11, 2022
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
28 changes: 11 additions & 17 deletions .../org/openbase/bco/registry/unit/core/consistency/UnitAliasGenerationConsistencyHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,7 @@ import java.util.stream.Collectors
*/
class UnitAliasGenerationConsistencyHandler (private val unitRegistry: UnitRegistry) :
AbstractProtoBufRegistryConsistencyHandler<String, UnitConfig, Builder>() {
private var unitTypeAliasNumberMap: MutableMap<UnitType, Int>?
private var updateNeeded = true

init {
unitTypeAliasNumberMap = HashMap()
}
private var unitTypeAliasNumberMap: MutableMap<UnitType, Int> = mutableMapOf()

@Throws(CouldNotPerformException::class, EntryModification::class)
override fun processData(
Expand Down Expand Up @@ -76,7 +71,7 @@ class UnitAliasGenerationConsistencyHandler (private val unitRegistry: UnitRegis
if (unitConfig.aliasList.isEmpty() ||
unitConfig.aliasList.stream().noneMatch { it: String -> it.startsWith(aliasPrefix) }
) {
if (updateNeeded) {
if (unitTypeAliasNumberMap.isEmpty()) {
try {
updateUnitTypeAliasNumberMap()
} catch (ex: CouldNotPerformException) {
Expand Down Expand Up @@ -107,20 +102,19 @@ class UnitAliasGenerationConsistencyHandler (private val unitRegistry: UnitRegis

@Throws(CouldNotPerformException::class)
private fun updateUnitTypeAliasNumberMap() {
for (unitConfig in unitRegistry.getUnitConfigsFiltered(false)) {
registerAlias(unitConfig)
}
unitRegistry.getUnitConfigsFiltered(false)
.onEach { registerAlias(it) }
}

private fun generateAndRegisterAlias(unitType: UnitType): String {

// init if not exist
if (!unitTypeAliasNumberMap!!.containsKey(unitType)) {
unitTypeAliasNumberMap!![unitType] = 0
if (!unitTypeAliasNumberMap.containsKey(unitType)) {
unitTypeAliasNumberMap[unitType] = 0
}

// generate next number
val newNumber = unitTypeAliasNumberMap!![unitType]!! + 1
val newNumber = unitTypeAliasNumberMap[unitType]!! + 1

// register number
registerNumber(newNumber, unitType)
Expand All @@ -144,7 +138,7 @@ class UnitAliasGenerationConsistencyHandler (private val unitRegistry: UnitRegis
if (split.size != 2) {
return
}
if (split[0] != StringProcessor.transformUpperCaseToPascalCase(unitType.name)) {
if (split.first() != StringProcessor.transformUpperCaseToPascalCase(unitType.name)) {
return
}
try {
Expand All @@ -155,13 +149,13 @@ class UnitAliasGenerationConsistencyHandler (private val unitRegistry: UnitRegis
}

private fun registerNumber(number: Int, unitType: UnitType) {
if (!unitTypeAliasNumberMap!!.containsKey(unitType) || unitTypeAliasNumberMap!![unitType]!! < number) {
unitTypeAliasNumberMap!![unitType] = number
if (!unitTypeAliasNumberMap.containsKey(unitType) || unitTypeAliasNumberMap[unitType]!! < number) {
unitTypeAliasNumberMap[unitType] = number
}
}

override fun reset() {
updateNeeded = true
unitTypeAliasNumberMap.clear()
}

companion object {
Expand Down