Skip to content
Merged
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
40 changes: 34 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<swagger-core-version>1.6.16</swagger-core-version>
<swagger-annotations-v3-version>2.2.30</swagger-annotations-v3-version>
<jakarta.ws.rs-api-version>3.1.0</jakarta.ws.rs-api-version>
<jaxb-api-version>2.3.1</jaxb-api-version>
<httpclient5-version>5.5</httpclient5-version>

<!-- Test -->
Expand All @@ -62,6 +61,7 @@
<spotless-maven-plugin-version>3.2.1</spotless-maven-plugin-version>
<maven-surefire-plugin-version>3.5.2</maven-surefire-plugin-version>
<google-java-format-version>1.34.1</google-java-format-version>
<maven-enforcer-version>3.4.1</maven-enforcer-version>
</properties>
<scm>
<connection>scm:git:git@github.com:Adyen/adyen-java-api-library.git</connection>
Expand Down Expand Up @@ -237,7 +237,40 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin-version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-version}</version>
<executions>
<execution>
<id>enforce-jakarta-compliance</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>javax.xml.bind:jaxb-api</exclude>

<!-- Not used but keeping exclusions for Jakarta EE 9+ compatibility -->
<exclude>javax.servlet:servlet-api</exclude>
<exclude>javax.servlet:javax.servlet-api</exclude>
<exclude>javax.persistence:javax.persistence-api</exclude>
<exclude>javax.persistence:persistence-api</exclude>
<exclude>javax.validation:validation-api</exclude>
<exclude>javax.inject:javax.inject</exclude>
</excludes>
<message>
STOP! A legacy javax.* dependency was detected
</message>
</bannedDependencies>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down Expand Up @@ -282,11 +315,6 @@
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta.ws.rs-api-version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api-version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
Expand Down
15 changes: 4 additions & 11 deletions src/main/java/com/adyen/model/nexo/AbortRequest.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package com.adyen.model.nexo;

import com.google.gson.annotations.SerializedName;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;

/**
* Definition: Body of the Abort Request messageType. -- Usage: It conveys Information requested for
Expand All @@ -29,24 +26,20 @@
* &lt;/complexType&gt;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(
name = "AbortRequest",
propOrder = {"messageReference", "abortReason", "displayOutput"})
public class AbortRequest {

/** The Message reference. */
@XmlElement(name = "MessageReference", required = true)
@SerializedName("MessageReference")
@Schema(description = "Identification of a previous POI transaction.")
protected MessageReference messageReference;

/** The Abort reason. */
@XmlElement(name = "AbortReason", required = true)
@SerializedName("AbortReason")
@Schema(description = "Reason of aborting a transaction")
protected String abortReason;

/** The Display output. */
@XmlElement(name = "DisplayOutput")
@SerializedName("DisplayOutput")
@Schema(
description =
"Information to display and the way to process the display. --Rule: To display an abort message to the Customer")
Expand Down
22 changes: 9 additions & 13 deletions src/main/java/com/adyen/model/nexo/AccountType.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.adyen.model.nexo;

import com.google.gson.annotations.SerializedName;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.Arrays;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;

/**
* Java class for AccountType.
Expand All @@ -26,47 +24,45 @@
* &lt;/simpleType&gt;
* </pre>
*/
@XmlType(name = "AccountType")
@XmlEnum
public enum AccountType {

/** Default account */
@XmlEnumValue("Default")
@SerializedName("Default")
@Schema(description = "Default account")
DEFAULT("Default"),

/** Savings account */
@XmlEnumValue("Savings")
@SerializedName("Savings")
@Schema(description = "Savings account")
SAVINGS("Savings"),

/** Checking account */
@XmlEnumValue("Checking")
@SerializedName("Checking")
@Schema(description = "Checking account")
CHECKING("Checking"),

/** Credit card account */
@XmlEnumValue("CreditCard")
@SerializedName("CreditCard")
@Schema(description = "Credit card account")
CREDIT_CARD("CreditCard"),

/** Universal account */
@XmlEnumValue("Universal")
@SerializedName("Universal")
@Schema(description = "Universal account")
UNIVERSAL("Universal"),

/** Investment account */
@XmlEnumValue("Investment")
@SerializedName("Investment")
@Schema(description = "Investment account")
INVESTMENT("Investment"),

/** Card totals */
@XmlEnumValue("CardTotals")
@SerializedName("CardTotals")
@Schema(description = "Card totals")
CARD_TOTALS("CardTotals"),

/** e-Purse card account */
@XmlEnumValue("EpurseCard")
@SerializedName("EpurseCard")
@Schema(description = "e-Purse card account")
EPURSE_CARD("EpurseCard");

Expand Down
11 changes: 2 additions & 9 deletions src/main/java/com/adyen/model/nexo/AdminRequest.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package com.adyen.model.nexo;

import com.google.gson.annotations.SerializedName;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;

/**
* Definition: Content of the Custom Admin Request messageType. -- Usage: Empty
Expand All @@ -25,14 +22,10 @@
* &lt;/complexType&gt;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(
name = "AdminRequest",
propOrder = {"serviceIdentification"})
public class AdminRequest {

/** The Service identification. */
@XmlElement(name = "ServiceIdentification")
@SerializedName("ServiceIdentification")
@Schema(description = "Identification of the administrative service to process.")
protected String serviceIdentification;

Expand Down
11 changes: 2 additions & 9 deletions src/main/java/com/adyen/model/nexo/AdminResponse.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package com.adyen.model.nexo;

import com.google.gson.annotations.SerializedName;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;

/**
* Definition: Content of the Custom Admin Response messageType. -- Usage: It conveys the result of
Expand All @@ -26,14 +23,10 @@
* &lt;/complexType&gt;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(
name = "AdminResponse",
propOrder = {"response"})
public class AdminResponse {

/** The Response. */
@XmlElement(name = "Response", required = true)
@SerializedName("Response")
@Schema(description = "Result of a message request processing.")
protected Response response;

Expand Down
13 changes: 3 additions & 10 deletions src/main/java/com/adyen/model/nexo/AlgorithmIdentifier.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package com.adyen.model.nexo;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import com.google.gson.annotations.SerializedName;

/**
* Definition: Identification of a cryptographic algorithm -- Reference: RFC 3880: Internet X.509
Expand All @@ -27,18 +24,14 @@
* &lt;/complexType&gt;
* </pre>
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(
name = "AlgorithmIdentifier",
propOrder = {"parameter"})
public class AlgorithmIdentifier {

/** The Parameter. */
@XmlElement(name = "Parameter")
@SerializedName("Parameter")
protected Parameter parameter;

/** The Algorithm. */
@XmlElement(name = "Algorithm", required = true)
@SerializedName("Algorithm")
protected AlgorithmType algorithm;

/**
Expand Down
24 changes: 10 additions & 14 deletions src/main/java/com/adyen/model/nexo/AlgorithmType.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.adyen.model.nexo;

import com.google.gson.annotations.SerializedName;
import java.util.Arrays;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;

/**
* Java class for AlgorithmType.
Expand All @@ -26,68 +24,66 @@
* &lt;/simpleType&gt;
* </pre>
*/
@XmlType(name = "AlgorithmType")
@XmlEnum
public enum AlgorithmType {

/**
* Retail CBC-MAC (cf. ISO 9807, ANSI X9.19) - (OID: iso(1) member-body(2) fr(250) type-org (1)
* gie-cb(79) algorithm(10) epas(1) 2)
*/
@XmlEnumValue("id-retail-cbc-mac")
@SerializedName("id-retail-cbc-mac")
ID_RETAIL_CBC_MAC("id-retail-cbc-mac"),

/**
* Retail-CBC-MAC with SHA-256 - (OID: iso(1) member-body(2) fr(250) type-org (1) gie-cb(79)
* algorithm(10) epas(1) 3)
*/
@XmlEnumValue("id-retail-cbc-mac-sha-256")
@SerializedName("id-retail-cbc-mac-sha-256")
ID_RETAIL_CBC_MAC_SHA_256("id-retail-cbc-mac-sha-256"),

/**
* The UKPT or Master Session Key key encryption - (OID: iso(1) member-body(2) fr(250) type-org
* (1) gie-cb(79) algorithm(10) epas(1) 4)
*/
@XmlEnumValue("id-ukpt-wrap ")
@SerializedName("id-ukpt-wrap ")
ID_UKPT_WRAP("id-ukpt-wrap "),

/**
* DUKPT is specified in ANS X9.24-2004, Annex A, and ISO/DIS 13492-2006. - (OID: iso(1)
* member-body(2) fr(250) type-org (1) gie-cb(79) algorithm(10) epas(1) 1)
*/
@XmlEnumValue("id-dukpt-wrap")
@SerializedName("id-dukpt-wrap")
ID_DUKPT_WRAP("id-dukpt-wrap"),

/**
* Triple DES ECB encryption with double length key (112 Bit) as defined in FIPS PUB 46-3 - (OID:
* iso(1) member-body(2) fr(250) type-org (1) gie-cb(79)
*/
@XmlEnumValue("des-ede3-ecb")
@SerializedName("des-ede3-ecb")
DES_EDE_3_ECB("des-ede3-ecb"),

/**
* Triple DES CBC encryption with double length key (112 Bit) as defined in FIPS PUB 46-3 - (OID:
* iso(1) member-body(2) us(840) rsadsi(113549)
*/
@XmlEnumValue("des-ede3-cbc")
@SerializedName("des-ede3-cbc")
DES_EDE_3_CBC("des-ede3-cbc"),

/** Message Digest Algorithm SHA-256 as defined in FIPS 180-1 and 2 - (ISO20022 Label: SHA256) */
@XmlEnumValue("id-sha256")
@SerializedName("id-sha256")
ID_SHA_256("id-sha256"),

/**
* Signature Algorithms SHA-256 with RSA - (OID: iso(1) member-body(2) us(840) rsadsi(113549)
* pkcs(1) pkcs-1(1) 11)
*/
@XmlEnumValue("sha256WithRSAEncryption")
@SerializedName("sha256WithRSAEncryption")
SHA_256_WITH_RSA_ENCRYPTION("sha256WithRSAEncryption"),

/**
* Key Transport Algorithm RSA - (OID: iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1)
* pkcs-1(1) 1)
*/
@XmlEnumValue("rsaEncryption")
@SerializedName("rsaEncryption")
RSA_ENCRYPTION("rsaEncryption");
private final String value;

Expand Down
14 changes: 5 additions & 9 deletions src/main/java/com/adyen/model/nexo/AlignmentType.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.adyen.model.nexo;

import com.google.gson.annotations.SerializedName;
import java.util.Arrays;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;

/**
* Java class for AlignmentType.
Expand All @@ -21,21 +19,19 @@
* &lt;/simpleType&gt;
* </pre>
*/
@XmlType(name = "AlignmentType")
@XmlEnum
public enum AlignmentType {

/** Left alignment type. */
@XmlEnumValue("Left")
@SerializedName("Left")
LEFT("Left"),
/** Right alignment type. */
@XmlEnumValue("Right")
@SerializedName("Right")
RIGHT("Right"),
/** Centred alignment type. */
@XmlEnumValue("Centred")
@SerializedName("Centred")
CENTRED("Centred"),
/** Justified alignment type. */
@XmlEnumValue("Justified")
@SerializedName("Justified")
JUSTIFIED("Justified");
private final String value;

Expand Down
Loading
Loading