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

Renamed closing to ending

This commit is contained in:
dankl 2019-10-05 18:47:45 +02:00 committed by dankito
parent f30fd61d69
commit 67ec1700e0
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fints4javaLib/src/main/kotlin/net/dankito/fints/messages/MessageBuilder.kt
View File

@ -16,14 +16,14 @@ import java.util.concurrent.ThreadLocalRandom
/** /**
* Takes the Segments of they payload, may signs and encrypts them, calculates message size, * Takes the Segments of they payload, may signs and encrypts them, calculates message size,
* adds the message header and closing, and formats the whole message to string. * adds the message header and ending, and formats the whole message to string.
*/ */
open class MessageBuilder(protected val generator: ISegmentNumberGenerator = SegmentNumberGenerator(), open class MessageBuilder(protected val generator: ISegmentNumberGenerator = SegmentNumberGenerator(),
protected val utils: FinTsUtils = FinTsUtils()) { protected val utils: FinTsUtils = FinTsUtils()) {
companion object { companion object {
const val MessageHeaderLength = 30 const val MessageHeaderLength = 30
const val MessageClosingLength = 11 const val MessageEndingLength = 11
const val AddedSeparatorsLength = 3 const val AddedSeparatorsLength = 3
} }
@ -90,13 +90,13 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
val formattedPayload = formatPayload(payload) val formattedPayload = formatPayload(payload)
val messageSize = formattedPayload.length + MessageHeaderLength + MessageClosingLength + AddedSeparatorsLength val messageSize = formattedPayload.length + MessageHeaderLength + MessageEndingLength + AddedSeparatorsLength
val header = Nachrichtenkopf(ISegmentNumberGenerator.FirstSegmentNumber, messageSize, dialogData) val header = Nachrichtenkopf(ISegmentNumberGenerator.FirstSegmentNumber, messageSize, dialogData)
val closing = Nachrichtenabschluss(generator.getNextSegmentNumber(), dialogData) val ending = Nachrichtenabschluss(generator.getNextSegmentNumber(), dialogData)
return listOf(header.format(), formattedPayload, closing.format()) return listOf(header.format(), formattedPayload, ending.format())
.joinToString(Separators.SegmentSeparator, postfix = Separators.SegmentSeparator) .joinToString(Separators.SegmentSeparator, postfix = Separators.SegmentSeparator)
} }
@ -114,13 +114,13 @@ open class MessageBuilder(protected val generator: ISegmentNumberGenerator = Seg
time time
) )
val signatureClosing = Signaturabschluss( val signatureEnding = Signaturabschluss(
generator.getNextSegmentNumber(), generator.getNextSegmentNumber(),
controlReference, controlReference,
customer.pin customer.pin
) )
return listOf(signatureHeader, *payloadSegments.toTypedArray(), signatureClosing) return listOf(signatureHeader, *payloadSegments.toTypedArray(), signatureEnding)
} }

4
fints4javaLib/src/main/kotlin/net/dankito/fints/messages/segmente/SegmentId.kt
View File

@ -5,7 +5,7 @@ enum class SegmentId(val id: String) {
MessageHeader("HNHBK"), MessageHeader("HNHBK"),
MessageClosing("HNHBS"), MessageEnding("HNHBS"),
EncryptionHeader("HNVSK"), EncryptionHeader("HNVSK"),
@ -13,7 +13,7 @@ enum class SegmentId(val id: String) {
SignatureHeader("HNSHK"), SignatureHeader("HNSHK"),
SignatureClosing("HNSHA"), SignatureEnding("HNSHA"),
DialogEnd("HKEND"), DialogEnd("HKEND"),

2
fints4javaLib/src/main/kotlin/net/dankito/fints/messages/segmente/implementierte/Nachrichtenabschluss.kt
View File

@ -16,6 +16,6 @@ open class Nachrichtenabschluss(
dialogData: DialogData dialogData: DialogData
) : Segment(listOf( ) : Segment(listOf(
Segmentkopf(SegmentId.MessageClosing, 1, segmentNumber), Segmentkopf(SegmentId.MessageEnding, 1, segmentNumber),
Nachrichtennummer(dialogData.messageNumber) Nachrichtennummer(dialogData.messageNumber)
), Existenzstatus.Mandatory) ), Existenzstatus.Mandatory)

2
fints4javaLib/src/main/kotlin/net/dankito/fints/messages/segmente/implementierte/Signaturabschluss.kt
View File

@ -19,7 +19,7 @@ open class Signaturabschluss(
pinOrTan: String pinOrTan: String
) )
: Segment(listOf( : Segment(listOf(
Segmentkopf(SegmentId.SignatureClosing, 2, segmentNumber), Segmentkopf(SegmentId.SignatureEnding, 2, segmentNumber),
Sicherheitskontrollreferenz(securityControlReference), // has to be the same as in Signaturkopf Sicherheitskontrollreferenz(securityControlReference), // has to be the same as in Signaturkopf
NotAllowedDatenelement(), // only used for HBCI, not allowed for PIN/TAN NotAllowedDatenelement(), // only used for HBCI, not allowed for PIN/TAN
BenutzerdefinierteSignatur(pinOrTan) BenutzerdefinierteSignatur(pinOrTan)