From 51e248f06178a728a51c2e6a0f5db996c34f2290 Mon Sep 17 00:00:00 2001 From: ptorres-prowide <90214684+ptorres-prowide@users.noreply.github.com> Date: Tue, 13 Jun 2023 14:35:55 -0300 Subject: [PATCH 1/4] CU-860qg6pmb_PW-1323--Re-Important-Prowide-Product-Changes-this-Year (#164) --- CHANGELOG.md | 3 +++ build.gradle | 2 +- .../java/com/prowidesoftware/swift/model/field/Field44J.java | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72e858129..d8efdbfe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Prowide Core - CHANGELOG +#### 9.4.1-SNAPSHOT + * (PW-1323) Fixing missing pattern issue in Field44J + #### 9.4.0 - May 2022 * SWIFT Standard release update 2023 (live 19 November 2023) * Yearly revision of deprecation phase (see https://dev.prowidesoftware.com/SRU2022/getting-started/deprecation/) diff --git a/build.gradle b/build.gradle index a24d60970..76e5828cc 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ scmVersion { } } //project.version = "${SRU}-${scmVersion.version}" -project.version = "${SRU}-9.4.0" +project.version = "${SRU}-9.4.1-SNAPSHOT" tasks.withType(JavaCompile) { options.encoding = 'UTF-8' diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field44J.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field44J.java index f9fd4b109..533e05b35 100644 --- a/src/generated/java/com/prowidesoftware/swift/model/field/Field44J.java +++ b/src/generated/java/com/prowidesoftware/swift/model/field/Field44J.java @@ -192,8 +192,9 @@ public static Tag emptyTag() { @Override public void parse(final String value) { init(3); - // @NotImplemented - throw new org.apache.commons.lang3.NotImplementedException("Missing parserPattern in Field.vm : S[/S][/S]"); + setComponent1(SwiftParseUtils.getTokenFirst(value, null, "/")); + setComponent2(SwiftParseUtils.getTokenSecond(value, "/")); + setComponent3(SwiftParseUtils.getTokenThirdLast(value, "/")); } /** From 87b84ad5885ad301869f1e3b837be67e190eb8f2 Mon Sep 17 00:00:00 2001 From: zubri Date: Tue, 13 Jun 2023 14:47:12 -0300 Subject: [PATCH 2/4] GH-163: Remove unnecessary padding in sender and receiver in AbstractMT#creeate(number, sender, receiver) method --- CHANGELOG.md | 3 +++ .../com/prowidesoftware/swift/model/mt/AbstractMT.java | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8518cf54..1285910b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Prowide Core - CHANGELOG +#### 9.3.16 - SNAPSHOT + * (GH-163) Remove unnecessary padding in sender and receiver in AbstractMT#creeate(number, sender, receiver) method + #### 9.3.15 - May 2023 * (PW-1341) Avoid log pollution with exception stacktrace in Field#formatAccount method * (PW-1264) Added distinguishedName(boolean includeDefaultBranch) method to BIC in order to return default branch name diff --git a/src/main/java/com/prowidesoftware/swift/model/mt/AbstractMT.java b/src/main/java/com/prowidesoftware/swift/model/mt/AbstractMT.java index e1df52947..82c2b6052 100644 --- a/src/main/java/com/prowidesoftware/swift/model/mt/AbstractMT.java +++ b/src/main/java/com/prowidesoftware/swift/model/mt/AbstractMT.java @@ -183,14 +183,11 @@ public static AbstractMT create(final int messageType, final String sender, fina String msgType = getMessageTypeAsString(messageType); b2.setMessageType(msgType); b2.setInput(true); - // TODO revisar valores de inicializacion b2.setMessagePriority("N"); - b2.setDeliveryMonitoring("2"); - b2.setObsolescencePeriod("020"); sm.setBlock2(b2); final AbstractMT result = sm.toMT(); - result.setSender(StringUtils.rightPad(sender, 12, 'X')); - result.setReceiver(StringUtils.rightPad(receiver, 12, 'X')); + result.setSender(sender); + result.setReceiver(receiver); return result; } From ba024d1ef09ad642380985145c6a2c8104718aaf Mon Sep 17 00:00:00 2001 From: zubri Date: Tue, 13 Jun 2023 14:47:31 -0300 Subject: [PATCH 3/4] Add missing codewords --- .../java/com/prowidesoftware/swift/SchemeConstantsB.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsB.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsB.java index 53153cca1..af09fca75 100644 --- a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsB.java +++ b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsB.java @@ -62,6 +62,11 @@ public interface SchemeConstantsB { String BMRB = "BMRB"; String BRIT = "BRIT"; String BUY = "BUY"; + String BY_DEF_PAYMENT = "BY_DEF_PAYMENT"; + String BY_NEGOTIATION = "BY_NEGOTIATION"; + String BY_ACCEPTANCE = "BY_ACCEPTANCE"; + String BY_PAYMENT = "BY_PAYMENT"; + String BY_MIXED_PYMT = "BY_MIXED_PYMT"; String BILL = "BILL"; String BAGN = "BAGN"; String BATC = "BATC"; From cb54ed458c6adf5e68713e3a99af7b5b7bcd6896 Mon Sep 17 00:00:00 2001 From: zubri Date: Tue, 13 Jun 2023 19:04:04 -0300 Subject: [PATCH 4/4] release --- CHANGELOG.md | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b228117e3..e150bebd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Prowide Core - CHANGELOG -#### 9.4.1-SNAPSHOT +#### 9.4.1 - June 2023 * (GH-163) Remove unnecessary padding in sender and receiver in AbstractMT#creeate(number, sender, receiver) method * (PW-1323) Fixing missing pattern issue in Field44J diff --git a/build.gradle b/build.gradle index 76e5828cc..740810119 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ scmVersion { } } //project.version = "${SRU}-${scmVersion.version}" -project.version = "${SRU}-9.4.1-SNAPSHOT" +project.version = "${SRU}-9.4.1" tasks.withType(JavaCompile) { options.encoding = 'UTF-8'