Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SRU2024 #188

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
# Prowide Core - CHANGELOG

#### 9.4.18 - October 2024
#### 9.5.2 - October 2024
* Added new `FieldEnum` with all the available field names
* Code security improvements as per CodeQL recommendations

#### 9.4.17 - June 2024
#### 9.5.1 - June 2024
* (PW-1913) Added IBAN validation for Egypt local account structure
* Restore deprecated method in MT210 class

#### 9.5.0 - May 2024
* SWIFT Standard release update 2024 (live 16 November 2025)
* Yearly revision of deprecation phase (see https://dev.prowidesoftware.com/SRU2024/getting-started/deprecation/)
* Dependency update: commons-lang3 -> 3.14.0'
* Dependency update: gson -> 2.11.0'

#### 9.4.16 - May 2024
* (PW-1862) Added NarrativeFragment class for detailed line information in StructuredNarrative fragments
Expand Down
17 changes: 9 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ archivesBaseName = 'pw-swift-core'
group 'com.prowidesoftware'

project.ext {
SRU = 'SRU2023'
SRU = 'SRU2024'
}

scmVersion {
Expand All @@ -34,6 +34,7 @@ scmVersion {
}
}
project.version = "${SRU}-${scmVersion.version}"
//project.version = "${SRU}-9.5.0"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick (assertive)

Consider removing the commented-out version override

This commented-out line doesn't affect the build but might lead to confusion. If it's no longer needed for version overrides, consider removing it to keep the build file clean.


tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
Expand All @@ -52,20 +53,20 @@ repositories {
}

dependencies {
implementation 'org.apache.commons:commons-lang3:3.12.0'
implementation 'com.google.code.gson:gson:2.9.0'
implementation 'org.apache.commons:commons-lang3:3.14.0'
implementation 'com.google.code.gson:gson:2.11.0'

compileOnly 'javax.persistence:javax.persistence-api:2.2'
compileOnly 'javax.xml.bind:jaxb-api:2.3.1'
compileOnly 'javax.validation:validation-api:2.0.1.Final'

testImplementation 'javax.validation:validation-api:2.0.1.Final'
testImplementation 'javax.persistence:javax.persistence-api:2.2'
testImplementation('org.junit.jupiter:junit-jupiter:5.8.2')
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.22.0'
testImplementation group: 'org.xmlunit', name: 'xmlunit-core', version: '2.9.0'
testImplementation group: 'org.xmlunit', name: 'xmlunit-matchers', version: '2.9.0'
testImplementation group: 'org.xmlunit', name: 'xmlunit-assertj', version: '2.9.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
testImplementation 'org.assertj:assertj-core:3.25.3'
testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
testImplementation 'org.xmlunit:xmlunit-matchers:2.9.0'
testImplementation 'org.xmlunit:xmlunit-assertj:2.9.0'
}

sourceSets.main.java.srcDirs = ['src/main/java', 'src/generated/java']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ public interface SchemeConstantsA {
String ASET = "ASET";
String AMEND = "AMEND";
String AD = "AD";
String AVRO = "AVRO";
String AVRF = "AVRF";
String AVFF = "AVFF";
String AMER = "AMER";
String AVSS = "AVSS";
String AVSO = "AVSO";
String AVSF = "AVSF";
String ARTH = "ARTH";
String AFI_365 = "AFI/365";
String ACT_365 = "ACT/365";
String ACT_360 = "ACT/360";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public interface SchemeConstantsB {
String BWIT = "BWIT";
String BOLQ = "BOLQ";
String BIRI = "BIRI";
String BUYU = "BUYU";
String BASE = "BASE";
String BIDI = "BIDI";
String BORD = "BORD";
Expand Down Expand Up @@ -109,6 +110,5 @@ public interface SchemeConstantsB {
String BUTC = "BUTC";
String BUYA = "BUYA";
String BUYI = "BUYI";
String BUYU = "BUYU";

}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public interface SchemeConstantsE {
String ELEC = "ELEC";
String EXOP = "EXOP";
String E = "E";
String EMTA = "EMTA";
String EXPI = "EXPI";
String EURO = "EURO";
String EXBO = "EXBO";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public interface SchemeConstantsF {
String FAXT = "FAXT";
String FEOMA = "FEOMA";
String FOLL = "FOLL";
String FLIPPED = "FLIPPED";
String FLOATFIXED = "FLOATFIXED";
String FRABBA = "FRABBA";
String FIXEDFLOAT = "FIXEDFLOAT";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
public interface SchemeConstantsH {

String HOLD = "HOLD";
String HARM = "HARM";
String HOLP = "HOLP";
String HOLS = "HOLS";
String HEAR = "HEAR";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public interface SchemeConstantsM {

String MIDE = "MIDE";
String MODI = "MODI";
String MODP = "MODP";
String M = "M";
String MATU = "MATU";
String MICO = "MICO";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public interface SchemeConstantsN {
String NEWT = "NEWT";
String NEW = "NEW";
String NETCASH = "NETCASH";
String NORMAL = "NORMAL";
String NINT = "NINT";
String NEWM = "NEWM";
String NET = "NET";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public interface SchemeConstantsO {
String OTHR = "OTHR";
String OUR = "OUR";
String OTHER = "OTHER";
String OMIS = "OMIS";
String OTHRPRTY = "OTHRPRTY";
String ORDRPRTY = "ORDRPRTY";
String ORDR = "ORDR";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public interface SchemeConstantsP {
String PRUR = "PRUR";
String PRINCIPAL = "PRINCIPAL";
String PREC = "PREC";
String POST = "POST";
String PUTO = "PUTO";
String PC = "PC";
String PRIN = "PRIN";
Expand All @@ -43,7 +44,6 @@ public interface SchemeConstantsP {
String PUTT = "PUTT";
String PERSDET = "PERSDET";
String PBOX = "PBOX";
String POST = "POST";
String PFRE = "PFRE";
String PERM = "PERM";
String PAYS = "PAYS";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public interface SchemeConstantsR {
String RMAG = "RMAG";
String RALA = "RALA";
String RDTE = "RDTE";
String REVR = "REVR";
String RINR = "RINR";
String RMDR = "RMDR";
String RDDT = "RDDT";
Expand All @@ -100,7 +101,6 @@ public interface SchemeConstantsR {
String REDP = "REDP";
String RESA = "RESA";
String RDUQ = "RDUQ";
String REVR = "REVR";
String REFU = "REFU";
String RECDEL = "RECDEL";
String RELC = "RELC";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2023 Prowide
* Copyright 2006-2024 Prowide
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -54,15 +54,15 @@
* </ul>
*
* <p>
* This class complies with standard release <strong>SRU2023</strong>
* This class complies with standard release <strong>SRU2024</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 = 2023;
public static final int SRU = 2024;

private static final long serialVersionUID = 1L;
/**
Expand All @@ -74,27 +74,6 @@ public class Field101 extends Field implements Serializable {
*/
public static final String F_101 = "101";

/**
* @deprecated Use {@link #parserPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String PARSER_PATTERN = "S";

/**
* @deprecated Use {@link #typesPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String COMPONENTS_PATTERN = "S";

/**
* @deprecated Use {@link #typesPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String TYPES_PATTERN = "S";

/**
* Component number for the Application Identifier subfield.
*/
Expand Down Expand Up @@ -208,16 +187,6 @@ public String getValueDisplay(int component, Locale locale) {
return getComponent(1);
}

/**
* @deprecated Use {@link #typesPattern()} instead.
*/
@Override
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public String componentsPattern() {
return "S";
}

/**
* Returns the field component types pattern.
* <p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2023 Prowide
* Copyright 2006-2024 Prowide
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -55,15 +55,15 @@
* </ul>
*
* <p>
* This class complies with standard release <strong>SRU2023</strong>
* This class complies with standard release <strong>SRU2024</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 = 2023;
public static final int SRU = 2024;

private static final long serialVersionUID = 1L;
/**
Expand All @@ -75,27 +75,6 @@ public class Field102 extends Field implements Serializable {
*/
public static final String F_102 = "102";

/**
* @deprecated Use {@link #parserPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String PARSER_PATTERN = "S";

/**
* @deprecated Use {@link #typesPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String COMPONENTS_PATTERN = "Z";

/**
* @deprecated Use {@link #typesPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String TYPES_PATTERN = "Z";

/**
* Component number for the LT Address subfield.
*/
Expand Down Expand Up @@ -209,16 +188,6 @@ public String getValueDisplay(int component, Locale locale) {
return getComponent(1);
}

/**
* @deprecated Use {@link #typesPattern()} instead.
*/
@Override
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public String componentsPattern() {
return "Z";
}

/**
* Returns the field component types pattern.
* <p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2023 Prowide
* Copyright 2006-2024 Prowide
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -54,15 +54,15 @@
* </ul>
*
* <p>
* This class complies with standard release <strong>SRU2023</strong>
* This class complies with standard release <strong>SRU2024</strong>
*/
@SuppressWarnings("unused")
@Generated
public class Field103 extends Field implements Serializable {
/**
* Constant identifying the SRU to which this class belongs to.
*/
public static final int SRU = 2023;
public static final int SRU = 2024;

private static final long serialVersionUID = 1L;
/**
Expand All @@ -74,27 +74,6 @@ public class Field103 extends Field implements Serializable {
*/
public static final String F_103 = "103";

/**
* @deprecated Use {@link #parserPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String PARSER_PATTERN = "S";

/**
* @deprecated Use {@link #typesPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String COMPONENTS_PATTERN = "S";

/**
* @deprecated Use {@link #typesPattern()} method instead.
*/
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public static final String TYPES_PATTERN = "S";

/**
* Component number for the FINCopy Service Code subfield.
*/
Expand Down Expand Up @@ -208,16 +187,6 @@ public String getValueDisplay(int component, Locale locale) {
return getComponent(1);
}

/**
* @deprecated Use {@link #typesPattern()} instead.
*/
@Override
@Deprecated
@ProwideDeprecated(phase4 = TargetYear.SRU2024)
public String componentsPattern() {
return "S";
}

/**
* Returns the field component types pattern.
* <p>
Expand Down
Loading
Loading