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

Renamed convertToAllowedCharacters() to convertDiacriticsAndReservedXmlCharacters(), removed side effect that containsOnlyAllowedCharacters() converts diacritics and XML characters and added default implementation convertDiacriticsAndReservedXmlCharactersAndCheckIfContainsOnlyAllowedCharacters()

This commit is contained in:
dankito 2020-05-14 14:48:56 +02:00
parent f89e2855d2
commit deb7f3ad36
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fints4k/src/main/kotlin/net/dankito/fints/messages/segmente/implementierte/sepa/ISepaMessageCreator.kt
View File

@ -5,8 +5,14 @@ interface ISepaMessageCreator {
fun createXmlFile(filename: String, replacementStrings: Map<String, String>): String fun createXmlFile(filename: String, replacementStrings: Map<String, String>): String
fun convertDiacriticsAndReservedXmlCharactersAndCheckIfContainsOnlyAllowedCharacters(stringToTest: String): Boolean {
val convertedString = convertDiacriticsAndReservedXmlCharacters(stringToTest)
return containsOnlyAllowedCharacters(convertedString)
}
fun containsOnlyAllowedCharacters(stringToTest: String): Boolean fun containsOnlyAllowedCharacters(stringToTest: String): Boolean
fun convertToAllowedCharacters(input: String): String fun convertDiacriticsAndReservedXmlCharacters(input: String): String
} }

6
fints4k/src/main/kotlin/net/dankito/fints/messages/segmente/implementierte/sepa/SepaBankTransferBase.kt
View File

@ -26,14 +26,14 @@ open class SepaBankTransferBase(
debitorBic, debitorBic,
mapOf( mapOf(
SepaMessageCreator.NumberOfTransactionsKey to "1", // TODO: may someday support more then one transaction per file SepaMessageCreator.NumberOfTransactionsKey to "1", // TODO: may someday support more then one transaction per file
"DebitorName" to messageCreator.convertToAllowedCharacters(debitor.name), "DebitorName" to messageCreator.convertDiacriticsAndReservedXmlCharacters(debitor.name),
"DebitorIban" to account.iban!!, "DebitorIban" to account.iban!!,
"DebitorBic" to debitorBic, "DebitorBic" to debitorBic,
"CreditorName" to messageCreator.convertToAllowedCharacters(data.creditorName), "CreditorName" to messageCreator.convertDiacriticsAndReservedXmlCharacters(data.creditorName),
"CreditorIban" to data.creditorIban.replace(" ", ""), "CreditorIban" to data.creditorIban.replace(" ", ""),
"CreditorBic" to data.creditorBic.replace(" ", ""), "CreditorBic" to data.creditorBic.replace(" ", ""),
"Amount" to data.amount.toString(), // TODO: check if ',' or '.' should be used as decimal separator "Amount" to data.amount.toString(), // TODO: check if ',' or '.' should be used as decimal separator
"Usage" to if (data.usage.isEmpty()) " " else messageCreator.convertToAllowedCharacters(data.usage), "Usage" to if (data.usage.isEmpty()) " " else messageCreator.convertDiacriticsAndReservedXmlCharacters(data.usage),
"RequestedExecutionDate" to RequestedExecutionDateValueForNotScheduledTransfers "RequestedExecutionDate" to RequestedExecutionDateValueForNotScheduledTransfers
), ),
messageCreator messageCreator

6
fints4k/src/main/kotlin/net/dankito/fints/messages/segmente/implementierte/sepa/SepaMessageCreator.kt
View File

@ -39,12 +39,10 @@ open class SepaMessageCreator : ISepaMessageCreator {
override fun containsOnlyAllowedCharacters(stringToTest: String): Boolean { override fun containsOnlyAllowedCharacters(stringToTest: String): Boolean {
val convertedString = convertToAllowedCharacters(stringToTest) return AllowedSepaCharactersPattern.matcher(stringToTest).matches()
return AllowedSepaCharactersPattern.matcher(convertedString).matches()
} }
override fun convertToAllowedCharacters(input: String): String { override fun convertDiacriticsAndReservedXmlCharacters(input: String): String {
// TODO: add other replacement strings // TODO: add other replacement strings
return input return input
.replace("\"", "&quot;") .replace("\"", "&quot;")

2
ui/BankingUiCommon/src/main/java/net/dankito/banking/util/InputValidator.kt
View File

@ -82,7 +82,7 @@ open class InputValidator {
} }
open fun convertToAllowedSepaCharacters(string: String): String { open fun convertToAllowedSepaCharacters(string: String): String {
return sepaMessageCreator.convertToAllowedCharacters(string) return sepaMessageCreator.convertDiacriticsAndReservedXmlCharacters(string)
} }