Skip to content
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 80 additions & 76 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,43 +61,42 @@

<!-- Build properties -->
<java.version>1.8</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Artifact Dependencies Version-->
<commons-configuration2.version>2.10.1</commons-configuration2.version>
<commons-lang.version>3.18.0</commons-lang.version>
<commons-io.version>2.17.0</commons-io.version>
<!-- Artifact Dependencies Versions -->
<commons-configuration2.version>2.14.0</commons-configuration2.version>
<commons-lang.version>3.20.0</commons-lang.version>
<commons-io.version>2.21.0</commons-io.version>
<commons-math3.version>3.6.1</commons-math3.version>
<commons-codec.version>1.15</commons-codec.version>
<slf4j.version>1.7.35</slf4j.version>
<httpclient.version>4.5.13</httpclient.version>
<jackson.version>2.13.3</jackson.version>
<bcpkix-jdk18.version>1.79</bcpkix-jdk18.version>
<lombok.version>1.18.22</lombok.version>
<commons-codec.version>1.21.0</commons-codec.version>
<slf4j.version>2.0.17</slf4j.version>
<httpclient.version>4.5.14</httpclient.version>
<jackson-annotations.version>2.21</jackson-annotations.version>
<jackson-datatype.version>2.21.2</jackson-datatype.version>
<bcpkix-jdk18.version>1.83</bcpkix-jdk18.version>
<lombok.version>1.18.44</lombok.version>
<iban-commons.version>1.8.4</iban-commons.version>

<!-- IBAN Generator -->
<iban4j.version>3.2.3-RELEASE</iban4j.version>
<!-- Maven Plugin Versions -->
<exec-maven-plugin.version>3.6.3</exec-maven-plugin.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<maven-surefire-plugin.version>3.5.5</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
<extra-enforcer-rules.version>1.12.0</extra-enforcer-rules.version>

<!-- Maven Pluging Version -->
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
<jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>

<!-- Tests version -->
<junit.version>5.10.2</junit.version>
<junit-platform-launcher.version>1.8.2</junit-platform-launcher.version>
<junit-platform-surefire-provider.version>1.2.0</junit-platform-surefire-provider.version>
<mockito.version>4.3.1</mockito.version>
<assertj.version>3.22.0</assertj.version>
<!-- Test Dependency Versions -->
<junit.version>5.14.3</junit.version>
<assertj.version>3.27.7</assertj.version>
<mockito.version>4.11.0</mockito.version>

<!-- Sonar -->
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
Expand Down Expand Up @@ -160,20 +159,20 @@
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<version>${jackson-annotations.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson-datatype.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
<version>${jackson-datatype.version}</version>
</dependency>
<dependency>
<groupId>org.bitbucket.b_c</groupId>
Expand All @@ -187,35 +186,18 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.iban4j</groupId>
<artifactId>iban4j</artifactId>
<version>${iban4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<groupId>de.speedbanking</groupId>
<artifactId>iban-commons</artifactId>
<version>${iban-commons.version}</version>
<scope>test</scope>
</dependency>
<!-- use single aggregator artefact to pull in JUnit 5 -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>${junit-platform-launcher.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand All @@ -237,6 +219,8 @@
</dependencies>

<build>
<defaultGoal>clean verify</defaultGoal>

<plugins>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
Expand All @@ -253,10 +237,8 @@
<phase>validate</phase>
<configuration>
<configLocation>google_checks.xml</configLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
</configuration>
Expand Down Expand Up @@ -286,6 +268,40 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
<executions>
<execution>
<id>enforce-bytecode-version</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>${java.version}</maxJdkVersion>
</enforceBytecodeVersion>
<requireMavenVersion>
<version>[3.8.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.8, 1.9)</version>
</requireJavaVersion>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>${extra-enforcer-rules.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -320,7 +336,7 @@
<skip>true</skip>
</configuration>
</plugin>
<!-- To sign the artifacts -->
<!-- To sign the artifacts -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand All @@ -347,7 +363,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<!-- <argLine>${surefireArgLine}</argLine>-->
<!-- <argLine>${surefireArgLine}</argLine> -->
<reuseForks>true</reuseForks>
<trimStackTrace>false</trimStackTrace>
<includes>
Expand All @@ -366,18 +382,6 @@
<exclude>**/utils/*</exclude>
</excludes>
</configuration>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>${junit-platform-surefire-provider.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/ibanity/samples/helper/SampleHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import com.ibanity.apis.client.products.xs2a.sandbox.models.FinancialInstitutionUser;
import com.ibanity.apis.client.products.xs2a.sandbox.models.factory.create.FinancialInstitutionHoldingCreationQuery;
import com.ibanity.apis.client.products.xs2a.sandbox.models.factory.create.FinancialInstitutionTransactionCreationQuery;
import de.speedbanking.iban.IbanRegistry;
import de.speedbanking.iban.RandomIban;
import org.apache.commons.math3.util.Precision;
import org.iban4j.CountryCode;
import org.iban4j.Iban;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -68,7 +68,7 @@ public static FinancialInstitutionTransactionCreationQuery generateRandomTransac
.description("Car rental")

.counterpartName("Stroman, Hettinger and Swift")
.counterpartReference(Iban.random(CountryCode.BE).getAccountNumber())
.counterpartReference(RandomIban.of(IbanRegistry.BE).getAccountNumber())

.executionDate(Instant.now().plus(3, ChronoUnit.DAYS))
.valueDate(Instant.now().minus(1, ChronoUnit.DAYS))
Expand Down Expand Up @@ -96,7 +96,7 @@ public static PaymentInitiationRequestCreationQuery generateRandomPaymentInitiat
.currency("EUR")

.creditorName("Fake Creditor Name")
.creditorAccountReference(Iban.random(CountryCode.BE).toString())
.creditorAccountReference(RandomIban.of(IbanRegistry.BE).toString())
.creditorAccountReferenceType("IBAN")

.remittanceInformationType("unstructured")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import com.ibanity.apis.client.products.xs2a.sandbox.services.FinancialInstitutionAccountsService;
import com.ibanity.apis.client.services.IbanityService;
import com.ibanity.samples.helper.SampleHelper;
import org.iban4j.CountryCode;
import org.iban4j.Iban;
import de.speedbanking.iban.IbanRegistry;
import de.speedbanking.iban.RandomIban;

import static java.time.Instant.parse;
import java.util.UUID;
Expand All @@ -30,7 +30,7 @@ public FinancialInstitutionAccount create(FinancialInstitution financialInstitut
.currentBalance(SampleHelper.generateRandomAmount())
.currency("EUR")
.description("Checking Account")
.reference(Iban.random(CountryCode.BE).toString())
.reference(RandomIban.of(IbanRegistry.BE).toString())
.referenceType("IBAN")
.product("Easy account")
.holderName("John Doe")
Expand Down