codinux
/
fints4k
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extracted parseCodeEnum() for a single value

This commit is contained in:
dankl 2019-10-06 14:30:00 +02:00 committed by dankito
parent 676a7f0b71
commit 46a23d17d5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fints4javaLib/src/main/kotlin/net/dankito/fints/response/ResponseParser.kt
View File

@ -135,7 +135,7 @@ open class ResponseParser {
val iban = returnNullIfEmpty(dataElementGroups[2])
val customerId = dataElementGroups[3]
val accountType = parseCodeEnum(listOf(dataElementGroups[4]), AccountTypeCode.values()).first().type
val accountType = parseCodeEnum(dataElementGroups[4], AccountTypeCode.values()).type
val currency = dataElementGroups[5]
val accountHolderName1 = dataElementGroups[6]
val accountHolderName2 = returnNullIfEmpty(dataElementGroups[7])
@ -181,7 +181,7 @@ open class ResponseParser {
}
protected open fun parseSecurityMethod(methodString: String): Sicherheitsverfahren {
return parseCodeEnum(listOf(methodString), Sicherheitsverfahren.values()).first()
return parseCodeEnum(methodString, Sicherheitsverfahren.values())
}
protected open fun parseSecurityMethodVersion(versionString: String): VersionDesSicherheitsverfahrens {
@ -192,7 +192,11 @@ open class ResponseParser {
protected open fun <T : ICodeEnum> parseCodeEnum(codeValues: List<String>, allValues: Array<T>): List<T> {
// mapNotNull: don't crash if new, at time of implementation unknown values get introduced / returned by bank
return codeValues.mapNotNull { code -> allValues.first { it.code == code } }
return codeValues.mapNotNull { code -> parseCodeEnum(code, allValues) }
}
protected open fun <T : ICodeEnum> parseCodeEnum(code: String, allValues: Array<T>): T {
return allValues.first { it.code == code }
}