Skip to content

Java 8 maintenance #234

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Java 8 maintenance #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cefd2e1
feat: back-port to Java 8
zubri Apr 9, 2025
3426cd2
Merge branch 'main' into java8-maintenance
zubri Apr 10, 2025
3175277
Merge branch 'main' into java8-maintenance
zubri Apr 24, 2025
adba24d
chore: release
zubri Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 26 additions & 28 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,98 +1,96 @@
# Prowide Core - CHANGELOG

#### 10.2.6 - April 2025
#### 9.5.6 - April 2025
* (CU-86b49rvw4) Updated label for Fields 14[P,Q,R]/16W/29[Q,W]
* (PW-2239) BIC Branch check for all upper and lower case
* (PW-2239) Notify Test and Training BIC usage in DN.

#### 10.2.5 - December 2024
#### 9.5.5 - December 2024
* Update apache-commons-lang3 from 3.14.0 to 3.17.0 fixing derived apache-text dependency vulnerabilities
* Minor thread safety fix in the `PropertyLoaded` class, used by the `SafeXmlUtils`
* Gradle wrapper update to 8.12

#### 10.2.4 - November 2024
#### 9.5.4 - November 2024
* Rolling back SHA-256 checksum algorithm to MD5 in the MT message model

#### 10.2.3 - November 2024
#### 9.5.3 - November 2024
* (PW-2040) Updated the BBAN validation data file to the IBAN REGISTRY Jul 2024 release
* (PW-2006) Fixed `getMUR` and `setMUR` in `SwiftMessage` to prioritize field 108 in block 4 over block 3 for system messages (category 0)
* Added new `MtSequenceEnum` with all the available inner sequences of specific MT schemas
* Added `isSystemMessage()` to SwiftMessage to check if the message is a category 0 message (010. 011, etc...)
* Added new `MtSequenceEnum` with all the available inner sequences of specific MT schemas
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Remove duplicated entry.
The bullet "* Added new MtSequenceEnum with all the available inner sequences of specific MT schemas" appears twice in the 9.5.3 section (lines 19 and 21). Please remove the redundant line at line 21 to avoid confusion.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

21-21: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)


Comment on lines +16 to 22
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Version update for November 2024 (9.5.3) – Duplicate Entry Warning
The entry “#### 9.5.3 - November 2024” shows two identical bullet points for “Added new MtSequenceEnum with all the available inner sequences of specific MT schemas” (on lines 17 and 19). Please verify whether the duplication is intentional or if one needs to be removed to avoid redundancy.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

14-14: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

15-15: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

15-15: Trailing spaces
Expected: 0 or 2; Actual: 1

(MD009, no-trailing-spaces)

15-15: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

16-16: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

17-17: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

18-18: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

19-19: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

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

#### 10.2.1 - June 2024
#### 9.5.1 - June 2024
* (PW-1913) Added IBAN validation for Egypt local account structure
* Restore deprecated method in MT210 class
Comment on lines 9 to 29
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Markdown Formatting Considerations
Several markdownlint warnings (e.g. heading levels, blank lines around headings/lists, and unordered list indentation) have been reported. Although these are not functional issues, aligning the file’s formatting with our markdown guidelines would improve readability. Consider addressing these formatting issues in a future update if they are not within the scope of this back-port.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

4-4: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

4-4: Trailing spaces
Expected: 0 or 2; Actual: 1

(MD009, no-trailing-spaces)

4-4: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

5-5: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

6-6: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

8-8: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

9-9: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

9-9: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

11-11: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

12-12: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

12-12: Trailing spaces
Expected: 0 or 2; Actual: 1

(MD009, no-trailing-spaces)

12-12: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

13-13: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

14-14: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

15-15: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

16-16: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

18-18: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

19-19: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

19-19: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

20-20: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

22-22: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

23-23: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

23-23: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

24-24: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)


#### 10.2.0 - May 2024
#### 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
* Dependency update: commons-lang3 -> 3.14.0'
* Dependency update: gson -> 2.11.0'

Comment on lines +31 to 36
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Version update for May 2024 (9.5.0) – SWIFT Release, Deprecation Revision, and Dependency Updates
The entry specifies the SWIFT Standard update and a yearly deprecation phase revision. Notably, the dependency updates for commons-lang3 and gson on lines 32 and 33 include trailing apostrophes (e.g. “3.14.0'”). Please review these for potential typos.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

29-29: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

30-30: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

30-30: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

31-31: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

31-31: Bare URL used
null

(MD034, no-bare-urls)

32-32: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

33-33: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

#### 10.1.15 - May 2024
#### 9.4.16 - May 2024
* (PW-1862) Added NarrativeFragment class for detailed line information in StructuredNarrative fragments
* Fixed SwiftMessage getPDE(): return empty value instead of null when codeword exists and has no value
* Added isPercentage() helper method to field 37K

#### 10.1.14 - March 2024
#### 9.4.15 - March 2024
* (PW-1812) Updated the narrative resolver, format 2 (used in field 72 for example), to allow empty values as part of the narrative fragment
* Updated validators for BIC, country, and currency constraints to utilize keywords for i18n-compatible messages
* Deprecated unnecessary methods in the SafeXmlUtils class

#### 10.1.13 - December 2023
#### 9.4.14 - December 2023
* (PW-1718) Changed the getComponentLabel(component) in Field59F to be dynamic based on the line identifiers (similar to existing API in Field50F)

#### 10.1.12 - November 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

#### 10.1.11 - November 2023
#### 9.4.12 - November 2023
* (PW-1697) Fixed validation pattern in fields 14[H,K,L,M,N,O] and 29J

#### 10.1.10 - November 2023
#### 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

Comment on lines +58 to 61
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Version update for November 2023 (9.4.11) – Critical JSON Parsing Fix
A stack overflow issue in the fromJson implementation for fields, as well as missing field labels for SRU2023 changes, have been addressed here. This fix is critical; ensure thorough regression testing is performed.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

56-56: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

57-57: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

57-57: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

58-58: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

#### 10.1.9 - October 2023
#### 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

#### 10.1.8 - October 2023
#### 9.4.9 - October 2023
* (PW-1659) Field 24G deprecated Name and Address for Narrative

Comment on lines +66 to 68
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Version update for October 2023 (9.4.9) – Deprecation Notice for Field 24G
This update deprecates “Name and Address” in Field 24G for Narrative. It would be useful to document the migration path for users affected by this change.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

64-64: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

65-65: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

65-65: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

#### 10.1.7 - October 2023
#### 9.4.8 - October 2023
* Added default methods for sender, receiver, and identifier extraction to the MessageExtractionStrategy
* Added JSON to the `FileFormat` enumeration

#### 10.1.6 - 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

#### 10.1.5 - September 2023
#### 9.4.6 - September 2023
* Added support for an optional `pw-swift-core.properties` to customize the behavior of the SafeXmlUtils class

Comment on lines +76 to 78
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Version update for September 2023 (9.4.6) – Optional Properties Support
The addition of support for an optional pw‑swift‑core.properties file to customize the behavior of SafeXmlUtils is a useful feature. Please update the associated documentation to guide users on how to leverage this property file.

🧰 Tools
🪛 markdownlint-cli2 (0.17.2)

74-74: Headings should be surrounded by blank lines
Expected: 1; Actual: 0; Below

(MD022, blanks-around-headings)

75-75: Unordered list indentation
Expected: 0; Actual: 2

(MD007, ul-indent)

75-75: Lists should be surrounded by blank lines
null

(MD032, blanks-around-lists)

#### 10.1.4 - September 2023
#### 9.4.5 - August 2023
* (PW-1478) Field 44J parse and getValue fix

#### 10.1.3 - August 2023
#### 9.4.4 - August 2023
* (PW-1478) Field 44J format fixed to allow multiline

#### 10.1.2 - August 2023
#### 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

#### 10.1.1 - July 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

#### 10.1.0 - June 2023
* Migration to Java 11
* Migration to Jakarta EE 10
* (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
Expand Down
56 changes: 28 additions & 28 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath 'ru.vyarus:gradle-quality-plugin:4.9.0'
classpath 'pl.allegro.tech.build:axion-release-plugin:1.15.1'
classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.23.3'
classpath 'ru.vyarus:gradle-quality-plugin:5.0.0'
classpath 'pl.allegro.tech.build:axion-release-plugin:1.14.5' // starting with version 15.* requires Java 11
classpath 'io.github.gradle-nexus:publish-plugin:2.0.0'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.13.0' // above this version requires Java 11
}
}
apply plugin: 'pl.allegro.tech.build.axion-release'
Expand Down Expand Up @@ -38,7 +38,7 @@ project.version = "${SRU}-${scmVersion.version}"

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(8))
}
}

Expand All @@ -57,44 +57,38 @@ dependencies {
implementation 'org.apache.commons:commons-lang3:3.17.0'
implementation 'com.google.code.gson:gson:2.11.0'

// jakarta is only used for annotations, we do not add it as implementation dependency on purpose to avoid forcing
// users to use jakarta jars in their project when they might not even be using JPA or JAXB at all
compileOnly 'jakarta.persistence:jakarta.persistence-api:3.1.0' // jakarta 3.1 is Jakarta EE 10, jakarta 3.2 would imply migration to Jakarta EE 11
compileOnly 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
compileOnly 'jakarta.validation:jakarta.validation-api:3.1.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 'jakarta.persistence:jakarta.persistence-api:3.1.0'
testImplementation 'jakarta.validation:jakarta.validation-api:3.1.0'
testImplementation 'javax.validation:validation-api:2.0.1.Final'
testImplementation 'javax.persistence:javax.persistence-api:2.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
testImplementation 'org.assertj:assertj-core:3.27.2'
testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
testImplementation 'org.xmlunit:xmlunit-matchers:2.10.0'
testImplementation 'org.xmlunit:xmlunit-assertj:2.10.0'
}

sourceSets.named('main') {
java {
setSrcDirs(['src/main/java', 'src/generated/java'])
}
}
sourceSets.main.java.srcDirs = ['src/main/java', 'src/generated/java']
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Source Sets Configuration Update
The main Java source directories are now explicitly set to include both src/main/java and src/generated/java. Please ensure that the generated sources are produced in the expected location and that this change does not affect the compilation process unexpectedly.


test {
useJUnitPlatform()
}

tasks.withType(Jar).configureEach {
manifest.attributes(
'Specification-Title': 'Prowide Core',
'Specification-Version': project.version,
'Specification-Vendor': "${SRU}",
'Implementation-Title': 'Prowide Core',
'Implementation-Version': project.version,
'Implementation-Vendor': 'www.prowidesoftware.com',
'Built-OS': System.getProperty('os.name'),
'Source-Compatibility': JavaVersion.VERSION_11,
'Target-Compatibility': JavaVersion.VERSION_11,
'Built-Date': new Date().format("yyyy-MM-dd"),
'Automatic-Module-Name': 'com.prowidesoftware.core'
'Specification-Title': 'Prowide Core',
'Specification-Version': project.version,
'Specification-Vendor': "${SRU}",
'Implementation-Title': 'Prowide Core',
'Implementation-Version': project.version,
'Implementation-Vendor': 'www.prowidesoftware.com',
'Built-OS': System.getProperty('os.name'),
'Source-Compatibility': project.sourceCompatibility,
'Target-Compatibility': project.targetCompatibility,
'Built-Date': new Date().format("yyyy-MM-dd"),
'Automatic-Module-Name': 'com.prowidesoftware.core'
)
}

Expand Down Expand Up @@ -276,6 +270,12 @@ tasks.withType(Test).configureEach {
}
}

tasks.register('testOn11', Test) {
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(11)
}
}

tasks.register('testOn17', Test) {
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(17)
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/constraints/BicConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

import static java.lang.annotation.ElementType.*;

import jakarta.validation.Constraint;
import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;

/**
* Bean validation for BIC numbers.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/constraints/BicValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import com.prowidesoftware.swift.model.BIC;
import com.prowidesoftware.swift.model.BicValidationResult;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import org.apache.commons.lang3.StringUtils;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/constraints/CountryConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

import static java.lang.annotation.ElementType.*;

import jakarta.validation.Constraint;
import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;

/**
* Bean validation for ISO Alpha-2 country codes.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/constraints/CountryValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package com.prowidesoftware.swift.constraints;

import com.prowidesoftware.swift.utils.IsoUtils;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import org.apache.commons.lang3.StringUtils;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/constraints/CurrencyConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

import static java.lang.annotation.ElementType.*;

import jakarta.validation.Constraint;
import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;

/**
* Bean validation for ISO currency codes.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/constraints/CurrencyValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package com.prowidesoftware.swift.constraints;

import com.prowidesoftware.swift.utils.IsoUtils;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import org.apache.commons.lang3.StringUtils;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/constraints/IbanConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

import static java.lang.annotation.ElementType.*;

import jakarta.validation.Constraint;
import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;

/**
* Bean validation for IBAN numbers.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/constraints/IbanValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

import com.prowidesoftware.swift.model.IBAN;
import com.prowidesoftware.swift.model.IbanValidationResult;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import org.apache.commons.lang3.StringUtils;

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/model/AbstractSwiftMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
import com.google.gson.GsonBuilder;
import com.prowidesoftware.JsonSerializable;
import com.prowidesoftware.swift.utils.Lib;
import jakarta.persistence.*;
import jakarta.xml.bind.annotation.XmlTransient;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
import java.math.BigDecimal;
import java.text.NumberFormat;
import java.util.*;
import javax.persistence.*;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/prowidesoftware/swift/model/FileFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public enum FileFormat {
/**
* @deprecated undefined and unused file format
*/
@Deprecated
@ProwideDeprecated(phase3 = TargetYear.SRU2025)
MQ_MT("mt"),
/**
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/prowidesoftware/swift/model/MtSwiftMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
import com.prowidesoftware.swift.model.mt.AbstractMT;
import com.prowidesoftware.swift.model.mt.DefaultMtMetadataStrategy;
import com.prowidesoftware.swift.model.mt.MTVariant;
import jakarta.persistence.Column;
import jakarta.persistence.DiscriminatorValue;
import jakarta.persistence.Entity;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Calendar;
import java.util.Objects;
import java.util.Optional;
import java.util.logging.Level;
import javax.persistence.Column;
import javax.persistence.DiscriminatorValue;
import javax.persistence.Entity;
import org.apache.commons.lang3.EnumUtils;
import org.apache.commons.lang3.StringUtils;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/prowidesoftware/swift/model/SwiftMessageNote.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/
package com.prowidesoftware.swift.model;

import jakarta.persistence.*;
import java.util.Calendar;
import javax.persistence.*;

/**
* Comments associated to a message for application only usage (not part of the standard).
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/prowidesoftware/swift/model/SwiftMessageRevision.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*/
package com.prowidesoftware.swift.model;

import static jakarta.persistence.FetchType.LAZY;
import static javax.persistence.FetchType.LAZY;

import jakarta.persistence.*;
import java.util.Calendar;
import java.util.Objects;
import javax.persistence.*;

/**
* A revision is a snapshot of message content and is used to track the history of changes in a message.
Expand Down
Loading
Loading