Skip to content

Commit 551d17a

Browse files
committed
final removal and deleted jaxb dependency
1 parent d432f59 commit 551d17a

3 files changed

Lines changed: 10 additions & 38 deletions

File tree

pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<swagger-core-version>1.6.16</swagger-core-version>
4141
<swagger-annotations-v3-version>2.2.30</swagger-annotations-v3-version>
4242
<jakarta.ws.rs-api-version>3.1.0</jakarta.ws.rs-api-version>
43-
<jaxb-api-version>2.3.1</jaxb-api-version>
4443
<httpclient5-version>5.5</httpclient5-version>
4544

4645
<!-- Test -->
@@ -282,11 +281,6 @@
282281
<artifactId>jakarta.ws.rs-api</artifactId>
283282
<version>${jakarta.ws.rs-api-version}</version>
284283
</dependency>
285-
<dependency>
286-
<groupId>javax.xml.bind</groupId>
287-
<artifactId>jaxb-api</artifactId>
288-
<version>${jaxb-api-version}</version>
289-
</dependency>
290284
<dependency>
291285
<groupId>org.apache.httpcomponents.client5</groupId>
292286
<artifactId>httpclient5</artifactId>

src/main/java/com/adyen/model/nexo/AuthenticatedData.java

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package com.adyen.model.nexo;
22

3+
import com.google.gson.annotations.SerializedName;
34
import java.util.ArrayList;
45
import java.util.List;
5-
import javax.xml.bind.annotation.XmlAccessType;
6-
import javax.xml.bind.annotation.XmlAccessorType;
7-
import javax.xml.bind.annotation.XmlElement;
8-
import javax.xml.bind.annotation.XmlElements;
9-
import javax.xml.bind.annotation.XmlType;
106

117
/**
128
* Definition: Cryptographic Message Syntax (CMS) data structure containing MACed data with
@@ -37,33 +33,26 @@
3733
* &lt;/complexType&gt;
3834
* </pre>
3935
*/
40-
@XmlAccessorType(XmlAccessType.FIELD)
41-
@XmlType(
42-
name = "AuthenticatedData",
43-
propOrder = {"keyTransportOrKEK", "macAlgorithm", "encapsulatedContent"})
4436
public class AuthenticatedData {
4537

4638
/** The Key transport or kek. */
47-
@XmlElements({
48-
@XmlElement(name = "KeyTransport", type = KeyTransport.class),
49-
@XmlElement(name = "KEK", type = KEK.class)
50-
})
39+
@SerializedName("keyTransportOrKEK")
5140
protected List<Object> keyTransportOrKEK;
5241

5342
/** The Mac algorithm. */
54-
@XmlElement(name = "MACAlgorithm", required = true)
43+
@SerializedName("MACAlgorithm")
5544
protected AlgorithmIdentifier macAlgorithm;
5645

5746
/** The Encapsulated content. */
58-
@XmlElement(name = "EncapsulatedContent", required = true)
47+
@SerializedName("EncapsulatedContent")
5948
protected EncapsulatedContent encapsulatedContent;
6049

6150
/** The Version. */
62-
@XmlElement(name = "Version")
51+
@SerializedName("Version")
6352
protected VersionType version;
6453

6554
/** The Mac. */
66-
@XmlElement(name = "MAC", required = true)
55+
@SerializedName("MAC")
6756
protected byte[] mac;
6857

6958
/**

src/main/java/com/adyen/model/nexo/EnvelopedData.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package com.adyen.model.nexo;
22

3+
import com.google.gson.annotations.SerializedName;
34
import java.util.ArrayList;
45
import java.util.List;
5-
import javax.xml.bind.annotation.XmlAccessType;
6-
import javax.xml.bind.annotation.XmlAccessorType;
7-
import javax.xml.bind.annotation.XmlElement;
8-
import javax.xml.bind.annotation.XmlElements;
9-
import javax.xml.bind.annotation.XmlType;
106

117
/**
128
* Definition: Cryptographic Message Syntax (CMS) data structure containing encrypted data with
@@ -35,25 +31,18 @@
3531
* &lt;/complexType&gt;
3632
* </pre>
3733
*/
38-
@XmlAccessorType(XmlAccessType.FIELD)
39-
@XmlType(
40-
name = "EnvelopedData",
41-
propOrder = {"keyTransportOrKEK", "encryptedContent"})
4234
public class EnvelopedData {
4335

4436
/** The Key transport or kek. */
45-
@XmlElements({
46-
@XmlElement(name = "KeyTransport", type = KeyTransport.class),
47-
@XmlElement(name = "KEK", type = KEK.class)
48-
})
37+
@SerializedName("keyTransportOrKEK")
4938
protected List<Object> keyTransportOrKEK;
5039

5140
/** The Encrypted content. */
52-
@XmlElement(name = "EncryptedContent", required = true)
41+
@SerializedName("EncryptedContent")
5342
protected EncryptedContent encryptedContent;
5443

5544
/** The Version. */
56-
@XmlElement(name = "Version")
45+
@SerializedName("Version")
5746
protected VersionType version;
5847

5948
/**

0 commit comments

Comments
 (0)