Merge pull request #314 from Adyen/develop

Version Update 4.2.0

Author: andrei-dediu

README.md

@@ -38,7 +38,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.adyen</groupId>
   <artifactId>adyen-java-api-library</artifactId>
-  <version>4.1.0</version>
+  <version>4.2.0</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.adyen</groupId>
     <artifactId>adyen-java-api-library</artifactId>
     <packaging>jar</packaging>
-    <version>4.1.0</version>
+    <version>4.2.0</version>
     <name>Adyen Java API Library</name>
     <description>Adyen API Client Library for Java</description>
     <url>https://github.com/adyen/adyen-java-api-library</url>

src/main/java/com/adyen/Client.java

@@ -42,7 +42,7 @@ public class Client {
     public static final String MARKETPAY_FUND_API_VERSION = "v3";
     public static final String MARKETPAY_NOTIFICATION_API_VERSION = "v1";
     public static final String LIB_NAME = "adyen-java-api-library";
-    public static final String LIB_VERSION = "4.1.0";
+    public static final String LIB_VERSION = "4.2.0";
     public static final String CHECKOUT_ENDPOINT_TEST = "https://checkout-test.adyen.com/checkout";
     public static final String CHECKOUT_ENDPOINT_LIVE_SUFFIX = "-checkout-live.adyenpayments.com/checkout";
     public static final String CHECKOUT_API_VERSION = "v51";

src/main/java/com/adyen/enums/Gender.java

@@ -0,0 +1,23 @@
+package com.adyen.enums;
+
+public enum Gender {
+    MALE {
+
+        public String toString() {
+            return "MALE";
+        }
+    },
+    FEMALE {
+
+        public String toString() {
+            return "FEMALE";
+        }
+    },
+    UNKNOWN {
+
+        public String toString() {
+            return "UNKNOWN";
+        }
+
+    }
+}

src/main/java/com/adyen/model/checkout/DefaultPaymentMethodDetails.java

@@ -50,8 +50,14 @@ public class DefaultPaymentMethodDetails implements PaymentMethodDetails {
     private String encryptedExpiryYear;
     @SerializedName("encryptedSecurityCode")
     private String encryptedSecurityCode;
+    /**
+     * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead.
+     */
+    @Deprecated
     @SerializedName("recurringDetailReference")
     private String recurringDetailReference;
+    @SerializedName("storedPaymentMethodId")
+    private String storedPaymentMethodId;
     @SerializedName("storeDetails")
     private Boolean storeDetails;
     /**
@@ -70,6 +76,8 @@ public class DefaultPaymentMethodDetails implements PaymentMethodDetails {
     private String applepayToken;
     @SerializedName("paywithgoogle.token")
     private String googlepayToken;
+    @SerializedName("separateDeliveryAddress")
+    private Boolean separateDeliveryAddress;
 
     @Override
     public String getType() {
@@ -229,19 +237,44 @@ public DefaultPaymentMethodDetails encryptedSecurityCode(String encryptedSecurit
         return this;
     }
 
+    /**
+     * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead.
+     */
+    @Deprecated
     public String getRecurringDetailReference() {
         return recurringDetailReference;
     }
 
+    /**
+     * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead.
+     */
+    @Deprecated
     public void setRecurringDetailReference(String recurringDetailReference) {
         this.recurringDetailReference = recurringDetailReference;
     }
 
+    /**
+     * @deprecated This field is deprecated. Use {@link DefaultPaymentMethodDetails#storedPaymentMethodId } instead.
+     */
+    @Deprecated
     public DefaultPaymentMethodDetails recurringDetailReference(String recurringDetailReference) {
         this.recurringDetailReference = recurringDetailReference;
         return this;
     }
 
+    public String getStoredPaymentMethodId() {
+        return storedPaymentMethodId;
+    }
+
+    public void setStoredPaymentMethodId(String storedPaymentMethodId) {
+        this.storedPaymentMethodId = storedPaymentMethodId;
+    }
+
+    public DefaultPaymentMethodDetails storedPaymentMethodId(String storedPaymentMethodId) {
+        this.storedPaymentMethodId = storedPaymentMethodId;
+        return this;
+    }
+
     public Boolean getStoreDetails() {
         return storeDetails;
     }
@@ -325,6 +358,14 @@ public void setGooglepayToken(String googlepayToken) {
         this.googlepayToken = googlepayToken;
     }
 
+    public Boolean getSeparateDeliveryAddress() {
+        return separateDeliveryAddress;
+    }
+
+    public void setSeparateDeliveryAddress(Boolean separateDeliveryAddress) {
+        this.separateDeliveryAddress = separateDeliveryAddress;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -347,21 +388,23 @@ public boolean equals(Object o) {
                 && Objects.equals(encryptedExpiryYear, that.encryptedExpiryYear)
                 && Objects.equals(encryptedSecurityCode, that.encryptedSecurityCode)
                 && Objects.equals(recurringDetailReference, that.recurringDetailReference)
+                && Objects.equals(storedPaymentMethodId, that.storedPaymentMethodId)
                 && Objects.equals(storeDetails, that.storeDetails)
                 && Objects.equals(idealIssuer, that.idealIssuer)
                 && Objects.equals(issuer, that.issuer)
                 && Objects.equals(sepaIbanNumber, that.sepaIbanNumber)
                 && Objects.equals(sepaOwnerName, that.sepaOwnerName)
                 && Objects.equals(applepayToken, that.applepayToken)
-                && Objects.equals(googlepayToken, that.googlepayToken);
+                && Objects.equals(googlepayToken, that.googlepayToken)
+                && Objects.equals(separateDeliveryAddress, that.separateDeliveryAddress);
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(type, number, expiryMonth, expiryYear, holderName, cvc, installmentConfigurationKey,
                 personalDetails, encryptedCardNumber, encryptedExpiryMonth, encryptedExpiryYear, encryptedSecurityCode,
-                recurringDetailReference, storeDetails, idealIssuer, issuer, sepaOwnerName, sepaIbanNumber,
-                applepayToken, googlepayToken);
+                recurringDetailReference, storedPaymentMethodId, storeDetails, idealIssuer, issuer, sepaOwnerName,
+                sepaIbanNumber, applepayToken, googlepayToken, separateDeliveryAddress);
     }
 
     @Override
@@ -380,13 +423,15 @@ public String toString() {
                 ", encryptedExpiryYear='" + encryptedExpiryYear + '\'' +
                 ", encryptedSecurityCode='" + encryptedSecurityCode + '\'' +
                 ", recurringDetailReference='" + recurringDetailReference + '\'' +
+                ", storedPaymentMethodId='" + storedPaymentMethodId + '\'' +
                 ", storeDetails=" + storeDetails +
                 ", idealIssuer='" + idealIssuer + '\'' +
                 ", issuer='" + issuer + '\'' +
                 ", sepaOwnerName='" + sepaOwnerName + '\'' +
                 ", sepaIbanNumber='" + sepaIbanNumber + '\'' +
                 ", applepayToken='" + applepayToken + '\'' +
                 ", googlepayToken='" + googlepayToken + '\'' +
+                ", separateDeliveryAddress='" + separateDeliveryAddress + '\'' +
                 '}';
     }
 }

src/main/java/com/adyen/model/checkout/PersonalDetails.java

@@ -20,6 +20,7 @@
  */
 package com.adyen.model.checkout;
 
+import com.adyen.enums.Gender;
 import com.google.gson.annotations.SerializedName;
 
 public class PersonalDetails {
@@ -31,6 +32,8 @@ public class PersonalDetails {
     private String lastName;
     @SerializedName("dateOfBirth")
     private String dateOfBirth;
+    @SerializedName("gender")
+    private Gender gender;
     @SerializedName("telephoneNumber")
     private String telephoneNumber;
     @SerializedName("socialSecurityNumber")
@@ -68,6 +71,10 @@ public String getLastName() {
         return lastName;
     }
 
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
     public PersonalDetails lastName(String lastName) {
         this.lastName = lastName;
         return this;
@@ -77,6 +84,10 @@ public String getDateOfBirth() {
         return dateOfBirth;
     }
 
+    public void setDateOfBirth(String dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
     public PersonalDetails dateOfBirth(String dateOfBirth) {
         this.dateOfBirth = dateOfBirth;
         return this;
@@ -86,6 +97,10 @@ public String getTelephoneNumber() {
         return telephoneNumber;
     }
 
+    public void setTelephoneNumber(String telephoneNumber) {
+        this.telephoneNumber = telephoneNumber;
+    }
+
     public PersonalDetails telephoneNumber(String telephoneNumber) {
         this.telephoneNumber = telephoneNumber;
         return this;
@@ -95,6 +110,10 @@ public String getSocialSecurityNumber() {
         return socialSecurityNumber;
     }
 
+    public void setSocialSecurityNumber(String socialSecurityNumber) {
+        this.socialSecurityNumber = socialSecurityNumber;
+    }
+
     public PersonalDetails socialSecurityNumber(String socialSecurityNumber) {
         this.socialSecurityNumber = socialSecurityNumber;
         return this;
@@ -104,11 +123,28 @@ public String getShopperEmail() {
         return shopperEmail;
     }
 
+    public void setShopperEmail(String shopperEmail) {
+        this.shopperEmail = shopperEmail;
+    }
+
     public PersonalDetails shopperEmail(String shopperEmail) {
         this.shopperEmail = shopperEmail;
         return this;
     }
 
+    public Gender getGender() {
+        return gender;
+    }
+
+    public void setGender(Gender gender) {
+        this.gender = gender;
+    }
+
+    public PersonalDetails gender(Gender gender) {
+        this.gender = gender;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "PersonalDetails{"
@@ -133,6 +169,9 @@ public String toString() {
                 + ", shopperEmail='"
                 + shopperEmail
                 + '\''
+                + ", gender='"
+                + gender
+                + '\''
                 + '}';
     }
 }

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

@@ -19,7 +19,7 @@
  *     <enumeration value="Code25"/>
  *     <enumeration value="Code128"/>
  *     <enumeration value="PDF417"/>
- *     <enumeration value="QRCODE"/>
+ *     <enumeration value="QRCode"/>
  *   </restriction>
  * </simpleType>
  * </pre>
@@ -60,7 +60,8 @@ public enum BarcodeType {
     /**
      * Qrcode barcode type.
      */
-    QRCODE("QRCODE");
+    @XmlEnumValue("QRCode")
+    QRCODE("QRCode");
     private final String value;
 
     BarcodeType(String v) {

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

@@ -4,7 +4,6 @@
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
 
 
 /**
@@ -26,15 +25,15 @@
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "OutputBarcode", propOrder = {
-        "value"
+        "barcodeValue"
 })
 public class OutputBarcode {
 
     /**
      * The Value.
      */
-    @XmlValue
-    protected String value;
+    @XmlAttribute(name = "BarcodeValue")
+    protected String barcodeValue;
     /**
      * The Barcode.
      */
@@ -47,16 +46,16 @@ public class OutputBarcode {
      * @return possible      object is     {@link String }
      */
     public String getValue() {
-        return value;
+        return barcodeValue;
     }
 
     /**
-     * Sets the value of the value property.
+     * Sets the value of the barcodeValue property.
      *
-     * @param value allowed object is     {@link String }
+     * @param barcodeValue allowed object is     {@link String }
      */
-    public void setValue(String value) {
-        this.value = value;
+    public void setBarcodeValue(String barcodeValue) {
+        this.barcodeValue = barcodeValue;
     }
 
     /**