SRU2023 v10.1 #85
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,5 +29,6 @@ lib | |
| .idea/jpa-buddy.xml | ||
| release.sh | ||
| .idea/sonarlint | ||
| .java-version | ||
| *.hprof | ||
| .idea/copilot | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,17 +31,6 @@ Apache License 2.0 | |
|
|
||
| SWIFT is a trademark of S.W.I.F.T. SCRL. (www.swift.com) | ||
|
|
||
| ### Build | ||
|
|
||
| For better build performance, local configurations can be setup in a gradle.properties file such as: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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' | ||
| } | ||
| } | ||
| apply plugin: 'pl.allegro.tech.build.axion-release' | ||
|
|
@@ -40,7 +40,7 @@ allprojects { | |
| options.encoding = 'UTF-8' | ||
| java { | ||
| toolchain { | ||
| languageVersion.set(JavaLanguageVersion.of(11)) | ||
| } | ||
| } | ||
| doLast { | ||
|
|
@@ -60,6 +60,13 @@ allprojects { | |
| username "${project.prowideRepoUser}" | ||
| password "${project.prowideRepoPass}" | ||
| } | ||
| } | ||
| maven { | ||
| url "${project.prowideRepo}/repository/maven-snapshots/" | ||
| credentials { | ||
| username "${project.prowideRepoUser}" | ||
| password "${project.prowideRepoPass}" | ||
| } | ||
| maven { | ||
| url "${project.prowideRepo}/repository/maven-snapshots/" | ||
| credentials { | ||
|
|
@@ -71,7 +78,11 @@ allprojects { | |
| } | ||
| } | ||
|
|
||
| sourceSets.named('main') { | ||
| java { | ||
| setSrcDirs(['src/main/java', 'src/generated/java']) | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(Jar) { | ||
| manifest.attributes( | ||
|
|
@@ -82,8 +93,8 @@ allprojects { | |
| '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.iso20022' | ||
| ) | ||
|
|
@@ -98,6 +109,9 @@ subprojects { | |
| dependencies { | ||
| implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
| implementation 'com.google.code.gson:gson:2.9.0' | ||
| implementation 'com.sun.xml.bind:jaxb-impl:4.0.5' | ||
| // bind-api is included transitively by jaxb-impl | ||
| // implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' | ||
| } | ||
|
|
||
| tasks.withType(Jar) { | ||
|
|
@@ -118,8 +132,14 @@ configure(subprojects.findAll {it.name.endsWith('-mx')}) { | |
| dependencies { | ||
| api project(':iso20022-core') | ||
| implementation project(specificTypesProject) | ||
|
|
||
| implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
| implementation 'com.google.code.gson:gson:2.9.0' | ||
|
|
||
| implementation 'com.sun.xml.bind:jaxb-impl:4.0.5' | ||
| // bind-api is included transitively by jaxb-impl | ||
| // implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' | ||
|
|
||
| compileOnly 'javax.persistence:javax.persistence-api:2.2' | ||
| } | ||
| } | ||
|
|
@@ -134,15 +154,15 @@ configure(subprojects.findAll {it.name.endsWith('-mx')}) { | |
| project(':iso20022-core') { | ||
| dependencies { | ||
| // included build | ||
| api 'com.prowidesoftware:pw-swift-core:SRU2023-10.1.15' | ||
|
|
||
| implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
| implementation 'com.google.code.gson:gson:2.9.0' | ||
|
|
||
| compileOnly 'jakarta.persistence:jakarta.persistence-api:3.1.0' | ||
|
There was a problem hiding this comment. Tip Codebase Verification Ensure Complete Transition to Jakarta Persistence API The
Analysis chainTransition to Jakarta Persistence API: Ensure Compatibility. The transition from Also applies to: 165-165 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Description: Verify compatibility of the transition to `jakarta.persistence`.
# Test: Search for any `javax.persistence` usage that might need updating.
rg --type java 'javax\.persistence'
Length of output: 37 Script: #!/bin/bash
# Description: Search for any `javax.persistence` references in XML configuration files or other build scripts.
# Search in XML files for `javax.persistence` usage.
rg --type xml 'javax\.persistence'
# Search in other Gradle build files for `javax.persistence` usage.
rg --type gradle 'javax\.persistence'
Length of output: 149 |
||
| compileOnly 'jakarta.validation:jakarta.validation-api:3.0.2' | ||
|
|
||
| testImplementation 'jakarta.persistence:jakarta.persistence-api:3.1.0' | ||
| testImplementation('org.junit.jupiter:junit-jupiter:5.8.2') | ||
| testImplementation group: 'com.google.guava', name: 'guava', version: '31.1-jre' | ||
| testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.22.0' | ||
|
|
@@ -194,7 +214,11 @@ jar { | |
| archivesBaseName = 'pw-iso20022' | ||
| subprojects.each { subproject -> | ||
| from subproject.configurations.archives.allArtifacts.files.collect { | ||
| // filter out any artifacts that are not jars | ||
| if (it.name.endsWith('.jar')) { | ||
| println "Adding ${it.name} to fat jar" | ||
| zipTree(it) | ||
| } | ||
| } | ||
| } | ||
| duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
|
|
@@ -313,9 +337,22 @@ artifacts { | |
| // declared dependencies for pom generation | ||
| dependencies { | ||
| // included build (keep in sync with the latest Prowide Core version) | ||
|
|
||
| api 'com.prowidesoftware:pw-swift-core:SRU2023-10.1.15' | ||
|
|
||
| // included transitive dependencies from Prowide Core | ||
| //implementation 'org.apache.commons:commons-lang3:3.12.0' | ||
| //implementation 'com.google.code.gson:gson:2.9.0' | ||
|
|
||
| // jaxb is required because it is no longer included in the JDK | ||
| implementation 'com.sun.xml.bind:jaxb-impl:4.0.5' | ||
| // bind-api is included transitively by jaxb-impl | ||
| // implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' | ||
| } | ||
|
|
||
| project.ext { | ||
| // publishing repository | ||
| nexusRepo = project.version.endsWith('-SNAPSHOT') ? 'maven-snapshots' : 'maven-releases' | ||
| } | ||
|
|
||
| // repo for publishing | ||
|
|
@@ -452,7 +489,7 @@ tasks.register('bundle', Jar) { | |
| from ("$buildDir/libs") { | ||
| include '*.asc' | ||
| } | ||
| archiveFileName.set('bundle.jar') | ||
| } | ||
|
|
||
| tasks.withType(Test) { | ||
|
|
@@ -461,15 +498,15 @@ tasks.withType(Test) { | |
| } | ||
| } | ||
|
|
||
| task('testOn17', type: Test) { | ||
| javaLauncher = javaToolchains.launcherFor { | ||
| languageVersion = JavaLanguageVersion.of(17) | ||
| } | ||
| } | ||
|
|
||
| task('testOn19', type: Test) { | ||
| javaLauncher = javaToolchains.launcherFor { | ||
| languageVersion = JavaLanguageVersion.of(19) | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip | ||
| networkTimeout=10000 | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,12 +18,12 @@ | |
| import com.google.gson.Gson; | ||
| import com.google.gson.GsonBuilder; | ||
| import com.prowidesoftware.swift.model.mx.*; | ||
| import jakarta.persistence.*; | ||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
| import org.apache.commons.lang3.StringUtils; | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,21 +25,18 @@ | |
| import com.prowidesoftware.swift.model.MessageStandardType; | ||
| import com.prowidesoftware.swift.model.MxId; | ||
| import com.prowidesoftware.swift.model.mt.AbstractMT; | ||
| import com.prowidesoftware.swift.model.mx.adapters.*; | ||
| import com.prowidesoftware.swift.utils.Lib; | ||
| import jakarta.xml.bind.JAXBContext; | ||
| import jakarta.xml.bind.annotation.XmlTransient; | ||
| import java.io.*; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.time.*; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
| import javax.xml.transform.Source; | ||
| import javax.xml.transform.dom.DOMResult; | ||
| import javax.xml.transform.stream.StreamSource; | ||
|
|
@@ -263,11 +260,7 @@ public static AbstractMX parse(final String xml, MxId id, final MxReadConfigurat | |
| * @since 7.10.3 | ||
| */ | ||
| protected static <T> T fromJson(String json, Class<T> classOfT) { | ||
| final Gson gson = getGsonBuilderWithCustomAdapters(); | ||
| return gson.fromJson(json, classOfT); | ||
| } | ||
|
|
||
|
|
@@ -279,11 +272,7 @@ protected static <T> T fromJson(String json, Class<T> classOfT) { | |
| * @since 7.10.3 | ||
| */ | ||
| public static AbstractMX fromJson(String json) { | ||
| final Gson gson = getGsonBuilderWithCustomAdapters(); | ||
| return gson.fromJson(json, AbstractMX.class); | ||
| } | ||
|
|
||
|
|
@@ -638,14 +627,23 @@ public Element element(JAXBContext inputContext) { | |
| */ | ||
| @Override | ||
| public String toJson() { | ||
| // we use AbstractMX and not this.getClass() in order to force usage of the adapter | ||
| final Gson gson = getGsonBuilderWithCustomAdapters(); | ||
| return gson.toJson(this, AbstractMX.class); | ||
| } | ||
|
|
||
| private static Gson getGsonBuilderWithCustomAdapters() { | ||
| final Gson gson = new GsonBuilder() | ||
| .registerTypeAdapter(AbstractMX.class, new AbstractMXAdapter()) | ||
| .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeJsonAdapter()) | ||
| .registerTypeAdapter(OffsetTime.class, new OffsetTimeJsonAdapter()) | ||
| .registerTypeAdapter(LocalDate.class, new LocalDateJsonAdapter()) | ||
| .registerTypeAdapter(Year.class, new YearJsonAdapter()) | ||
| .registerTypeAdapter(YearMonth.class, new YearMonthJsonAdapter()) | ||
| .registerTypeAdapter(AppHdr.class, new AppHdrAdapter()) | ||
| .setPrettyPrinting() | ||
| .create(); | ||
| return gson; | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,7 +36,6 @@ class AbstractMXAdapter implements JsonSerializer<AbstractMX>, JsonDeserializer< | |
| @Override | ||
| public JsonElement serialize(final AbstractMX mx, Type type, final JsonSerializationContext context) { | ||
| // default serialization | ||
| JsonObject object = context.serialize(mx).getAsJsonObject(); | ||
| object.addProperty("@xmlns", mx.getNamespace()); | ||
| object.addProperty(IDENTIFIER, mx.getMxId().id()); | ||
|
|
@@ -53,7 +52,7 @@ public AbstractMX deserialize(JsonElement json, Type typeOfT, JsonDeserializatio | |
| } | ||
| MxId id = new MxId(prim.getAsString()); | ||
|
|
||
| Class<?> klass; | ||
| try { | ||
| String className = "com.prowidesoftware.swift.model.mx.Mx" + id.camelized(); | ||
| klass = Class.forName(className); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,8 +18,8 @@ | |
| import com.prowidesoftware.deprecation.DeprecationUtils; | ||
| import com.prowidesoftware.deprecation.ProwideDeprecated; | ||
| import com.prowidesoftware.deprecation.TargetYear; | ||
| import java.time.OffsetDateTime; | ||
| import java.util.Objects; | ||
| import org.w3c.dom.Element; | ||
|
|
||
| /** | ||
|
|
@@ -96,7 +96,7 @@ public interface AppHdr { | |
| * | ||
| * @return found date or null if the element is not found | ||
| */ | ||
| OffsetDateTime creationDate(); | ||
|
|
||
| /** | ||
| * Sets the creation date in the header object with current moment in UTC time zone. | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Incorrect heading level.
The heading level should increment by one level at a time. Change the heading level from
####to###.Committable suggestion
Tools
Markdownlint