Merge branch 'SRU2023' into SRU2023_v10

prowide · Jun 14, 2023 · 2353ab0 · 2353ab0
2 parents 53a5cd2 + cb54ed4
commit 2353ab0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 #### 10.1.0 - SNAPSHOT
   * Migration to Java 11
   * Migration to Jakarta EE 10
+  * (GH-163) Remove unnecessary padding in sender and receiver in AbstractMT#creeate(number, sender, receiver) method
+  * (PW-1323) Fixing missing pattern issue in Field44J
 
 #### 9.4.0 - May 2022
   * SWIFT Standard release update 2023 (live 19 November 2023)

diff --git 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, "/"));
     }
 
     /**

diff --git 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;
     }