Merge pull request #159 from prowide/SRU2023

SRU2023
prowide · Nov 21, 2023 · c2b8fc1 · c2b8fc1
2 parents 0c722ec + 2df8916
commit c2b8fc1
Show file tree

Hide file tree

Showing 1,024 changed files with 22,069 additions and 40,728 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,54 @@
 # Prowide Core - CHANGELOG
 
-#### 9.3.19 - October 2023
+#### 9.4.13 - November 2023
+  * (PW-1697) Fixed validation/parse pattern in field 29O
+  * (PW-1697) MT306 changes in field 30I
+  * Added DistinguishedName with Builder in order to encapsulate the BIC branch name logic 
+
+#### 9.4.12 - November 2023
+  * (PW-1697) Fixed validation pattern in fields 14[H,K,L,M,N,O] and 29J
+
+#### 9.4.11 - November 2023
+  * (PW-1695) Fixed a stack overflow in the fields fromJson implementation when a malformed JSON input contains empty field names
+  * (PW-1688) Added missing field labels for SRU2023 changes in the pw_swift_*.properties file
+
+#### 9.4.10 - October 2023
+  * (PW-1675) update to Field 31R to support also two date components as requested by SCORE messages
+  * Added 36B and 36D getters to MT543
+
+#### 9.4.9 - October 2023
+  * (PW-1659) Field 24G deprecated Name and Address for Narrative
+
+#### 9.4.8 - October 2023
   * Added default methods for sender, receiver, and identifier extraction to the MessageExtractionStrategy
   * Added JSON to the `FileFormat` enumeration
 
-#### 9.3.18 - September 2023
+#### 9.4.7 - September 2023
+  * (PW-1478) Fixed Field 44J parse and getValue to enable proper data preservation when the field contains multiline content
+
+#### 9.4.6 - September 2023
   * Added support for an optional `pw-swift-core.properties` to customize the behavior of the SafeXmlUtils class
 
-#### 9.3.17 - July 2023
+#### 9.4.5 - August 2023
+  * (PW-1478) Field 44J parse and getValue fix
+
+#### 9.4.4 - August 2023
+  * (PW-1478) Field 44J format fixed to allow multiline
+
+#### 9.4.3 - July 2023
+  * (PW-1461) Remove deprecation of field 31R model since is it used back in SRU2023
   * (PW-1405) Trim original String payload when creating an AbstractSwiftMessage
 
-#### 9.3.16 - June 2023
+#### 9.4.2 - June 2023
   * (GH-163) Remove unnecessary padding in sender and receiver in AbstractMT#creeate(number, sender, receiver) method
+  * (PW-1323) Fixing getValue method for pattern issue in Field44J
+
+#### 9.4.1 - June 2023
+  * (PW-1323) Fixing missing pattern issue in Field44J
+
+#### 9.4.0 - May 2023
+  * SWIFT Standard release update 2023 (live 19 November 2023)
+  * Yearly revision of deprecation phase (see https://dev.prowidesoftware.com/SRU2022/getting-started/deprecation/)
 
 #### 9.3.15 - May 2023
   * (PW-1341) Avoid log pollution with exception stacktrace in Field#formatAccount method

diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ archivesBaseName = 'pw-swift-core'
 group 'com.prowidesoftware'
 
 project.ext {
-    SRU = 'SRU2022'
+    SRU = 'SRU2023'
 }
 
 scmVersion {

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsA.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsA.java
@@ -32,7 +32,6 @@ public interface SchemeConstantsA {
     String AVRF = "AVRF";
     String AMER = "AMER";
     String AVSO = "AVSO";
-    String ASIA = "ASIA";
     String AVSF = "AVSF";
     String AFI_365 = "AFI/365";
     String ACT_365 = "ACT/365";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsB.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsB.java
@@ -62,11 +62,6 @@ 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";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsC.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsC.java
@@ -34,7 +34,9 @@ public interface SchemeConstantsC {
     String CAMN = "CAMN";
     String CLOSEOUT = "CLOSEOUT";
     String CANCEL = "CANCEL";
+    String CLOS = "CLOS";
     String CLST = "CLST";
+    String CONT = "CONT";
     String CONF = "CONF";
     String CALL = "CALL";
     String COUN = "COUN";
@@ -53,7 +55,6 @@ public interface SchemeConstantsC {
     String CORRSELLER = "CORRSELLER";
     String CSHPRTY = "CSHPRTY";
     String CNTR = "CNTR";
-    String CLOS = "CLOS";
     String COLN = "COLN";
     String COUP = "COUP";
     String CADETL = "CADETL";
@@ -133,6 +134,7 @@ public interface SchemeConstantsC {
     String CCPT = "CCPT";
     String CGEN = "CGEN";
     String CASD = "CASD";
+    String CNTI = "CNTI";
     String CALM = "CALM";
     String CACO = "CACO";
     String CBON = "CBON";
@@ -161,7 +163,6 @@ public interface SchemeConstantsC {
     String COLI = "COLI";
     String CDFI = "CDFI";
     String COMP = "COMP";
-    String CONT = "CONT";
     String CRDB = "CRDB";
     String CHAN = "CHAN";
     String CACN = "CACN";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsD.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsD.java
@@ -18,10 +18,13 @@ public interface SchemeConstantsD {
 
     String DERV = "DERV";
     String DUPL = "DUPL";
-    String DIGI = "DIGI";
+    String DIKI = "DIKI";
     String DKOT = "DKOT";
+    String DOKO = "DOKO";
+    String DUKI = "DUKI";
+    String DUKO = "DUKO";
+    String DISC = "DISC";
     String DKIN = "DKIN";
-    String DBTR = "DBTR";
     String DAVO = "DAVO";
     String DAVF = "DAVF";
     String D = "D";
@@ -65,7 +68,6 @@ public interface SchemeConstantsD {
     String DSWO = "DSWO";
     String DSWS = "DSWS";
     String DFLT = "DFLT";
-    String DISC = "DISC";
     String DISF = "DISF";
     String DSWA = "DSWA";
     String DIVI = "DIVI";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsE.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsE.java
@@ -23,6 +23,7 @@ public interface SchemeConstantsE {
     String ELEC = "ELEC";
     String EXOP = "EXOP";
     String E = "E";
+    String EXPI = "EXPI";
     String EURO = "EURO";
     String EXBO = "EXBO";
     String EMA = "EMA";
@@ -31,7 +32,6 @@ public interface SchemeConstantsE {
     String ESTT = "ESTT";
     String EXCH = "EXCH";
     String EXER = "EXER";
-    String EXPI = "EXPI";
     String EMAI = "EMAI";
     String EREG = "EREG";
     String EMOD = "EMOD";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsF.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsF.java
@@ -22,6 +22,7 @@ public interface SchemeConstantsF {
     String FBF = "FBF";
     String FAXT = "FAXT";
     String FEOMA = "FEOMA";
+    String FOLL = "FOLL";
     String FLIPPED = "FLIPPED";
     String FLOATFIXED = "FLOATFIXED";
     String FRABBA = "FRABBA";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsG.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsG.java
@@ -16,6 +16,7 @@
 @Generated
 public interface SchemeConstantsG {
 
+    String GLOB = "GLOB";
     String GENL = "GENL";
     String GROSS = "GROSS";
     String GUAR = "GUAR";
@@ -41,7 +42,6 @@ public interface SchemeConstantsG {
     String GENS = "GENS";
     String GERM = "GERM";
     String GIVE = "GIVE";
-    String GLOB = "GLOB";
     String GPPH = "GPPH";
     String GREX = "GREX";
     String GROS = "GROS";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsK.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsK.java
@@ -17,8 +17,6 @@
 public interface SchemeConstantsK {
 
     String KNOT = "KNOT";
-    String KIKO = "KIKO";
-    String KOKI = "KOKI";
     String KNIN = "KNIN";
     String KLO = "KLO";
     String KRUG = "KRUG";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsL.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsL.java
@@ -19,6 +19,7 @@ public interface SchemeConstantsL {
     String L = "L";
     String LC = "LC";
     String LF = "LF";
+    String LOCA = "LOCA";
     String LDDET = "LDDET";
     String LDCR = "LDCR";
     String LDCO = "LDCO";
@@ -27,7 +28,6 @@ public interface SchemeConstantsL {
     String LDPRTY2 = "LDPRTY2";
     String LDPRTY1 = "LDPRTY1";
     String LAST = "LAST";
-    String LOCA = "LOCA";
     String LOTS = "LOTS";
     String LANG = "LANG";
     String LOCO = "LOCO";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsM.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsM.java
@@ -17,6 +17,7 @@
 public interface SchemeConstantsM {
 
     String MIDE = "MIDE";
+    String MODI = "MODI";
     String M = "M";
     String MATU = "MATU";
     String MICO = "MICO";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsN.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsN.java
@@ -25,7 +25,6 @@ public interface SchemeConstantsN {
     String NEWT = "NEWT";
     String NEW = "NEW";
     String NETCASH = "NETCASH";
-    String NOTO = "NOTO";
     String NORMAL = "NORMAL";
     String NINT = "NINT";
     String NEWM = "NEWM";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsP.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsP.java
@@ -26,6 +26,7 @@ public interface SchemeConstantsP {
     String PTYA = "PTYA";
     String PRUR = "PRUR";
     String PRINCIPAL = "PRINCIPAL";
+    String PREC = "PREC";
     String PUTO = "PUTO";
     String PC = "PC";
     String PRIN = "PRIN";
@@ -95,7 +96,6 @@ public interface SchemeConstantsP {
     String PNTP = "PNTP";
     String PNST = "PNST";
     String PAIR = "PAIR";
-    String PREC = "PREC";
     String PWAL = "PWAL";
     String PENR = "PENR";
     String PTNI = "PTNI";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsS.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsS.java
@@ -22,9 +22,7 @@ public interface SchemeConstantsS {
     String SPRI = "SPRI";
     String SSTD = "SSTD";
     String SDVA = "SDVA";
-    String SKOT = "SKOT";
-    String SKIN = "SKIN";
-    String SITR = "SITR";
+    String SERS = "SERS";
     String SAFE = "SAFE";
     String SEME = "SEME";
     String SETPRTY = "SETPRTY";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsT.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsT.java
@@ -20,7 +20,6 @@ public interface SchemeConstantsT {
     String TELI = "TELI";
     String TELE = "TELE";
     String TELX = "TELX";
-    String TRIG = "TRIG";
     String TRAD = "TRAD";
     String TOSE = "TOSE";
     String TLDE = "TLDE";

diff --git a/src/generated/java/com/prowidesoftware/swift/SchemeConstantsU.java b/src/generated/java/com/prowidesoftware/swift/SchemeConstantsU.java
@@ -20,6 +20,9 @@ public interface SchemeConstantsU {
     String URGP = "URGP";
     String UNWD = "UNWD";
     String UNWR = "UNWR";
+    String UIKI = "UIKI";
+    String UOKO = "UOKO";
+    String UNAD = "UNAD";
     String UNWEIGHT = "UNWEIGHT";
     String UNDE = "UNDE";
     String UNT = "UNT";

diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field101.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field101.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 Prowide
+ * Copyright 2006-2023 Prowide
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,15 +57,15 @@
  * </ul>
  *
  * <p>
- * This class complies with standard release <strong>SRU2022</strong>
+ * This class complies with standard release <strong>SRU2023</strong>
  */
 @SuppressWarnings("unused")
 @Generated
 public class Field101 extends Field implements Serializable {
 	/**
 	 * Constant identifying the SRU to which this class belongs to.
 	 */
-	public static final int SRU = 2022;
+	public static final int SRU = 2023;
 
 	private static final long serialVersionUID = 1L;
 	/**
@@ -81,21 +81,21 @@ public class Field101 extends Field implements Serializable {
      * @deprecated Use {@link #parserPattern()} method instead.
      */
     @Deprecated
-    @ProwideDeprecated(phase3 = TargetYear.SRU2023)
+    @ProwideDeprecated(phase4 = TargetYear.SRU2024)
 	public static final String PARSER_PATTERN = "S";
 
     /**
      * @deprecated Use {@link #typesPattern()} method instead.
      */
     @Deprecated
-    @ProwideDeprecated(phase3 = TargetYear.SRU2023)
+    @ProwideDeprecated(phase4 = TargetYear.SRU2024)
 	public static final String COMPONENTS_PATTERN = "S";
 
     /**
      * @deprecated Use {@link #typesPattern()} method instead.
      */
     @Deprecated
-    @ProwideDeprecated(phase3 = TargetYear.SRU2023)
+    @ProwideDeprecated(phase4 = TargetYear.SRU2024)
 	public static final String TYPES_PATTERN = "S";
 
 	/**
@@ -219,7 +219,7 @@ public String getValueDisplay(int component, Locale locale) {
      */
     @Override
     @Deprecated
-    @ProwideDeprecated(phase3 = TargetYear.SRU2023)
+    @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public String componentsPattern() {
         return "S";
     }

diff --git a/src/generated/java/com/prowidesoftware/swift/model/field/Field102.java b/src/generated/java/com/prowidesoftware/swift/model/field/Field102.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2022 Prowide
+ * Copyright 2006-2023 Prowide
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,15 +58,15 @@
  * </ul>
  *
  * <p>
- * This class complies with standard release <strong>SRU2022</strong>
+ * This class complies with standard release <strong>SRU2023</strong>
  */
 @SuppressWarnings("unused")
 @Generated
 public class Field102 extends Field implements Serializable {
 	/**
 	 * Constant identifying the SRU to which this class belongs to.
 	 */
-	public static final int SRU = 2022;
+	public static final int SRU = 2023;
 
 	private static final long serialVersionUID = 1L;
 	/**
@@ -82,21 +82,21 @@ public class Field102 extends Field implements Serializable {
      * @deprecated Use {@link #parserPattern()} method instead.
      */
     @Deprecated
-    @ProwideDeprecated(phase3 = TargetYear.SRU2023)
+    @ProwideDeprecated(phase4 = TargetYear.SRU2024)
 	public static final String PARSER_PATTERN = "S";
 
     /**
      * @deprecated Use {@link #typesPattern()} method instead.
      */
     @Deprecated
-    @ProwideDeprecated(phase3 = TargetYear.SRU2023)
+    @ProwideDeprecated(phase4 = TargetYear.SRU2024)
 	public static final String COMPONENTS_PATTERN = "Z";
 
     /**
      * @deprecated Use {@link #typesPattern()} method instead.
      */
     @Deprecated
-    @ProwideDeprecated(phase3 = TargetYear.SRU2023)
+    @ProwideDeprecated(phase4 = TargetYear.SRU2024)
 	public static final String TYPES_PATTERN = "Z";
 
 	/**
@@ -220,7 +220,7 @@ public String getValueDisplay(int component, Locale locale) {
      */
     @Override
     @Deprecated
-    @ProwideDeprecated(phase3 = TargetYear.SRU2023)
+    @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public String componentsPattern() {
         return "Z";
     }