Merge pull request #604 from Adyen/develop

Release 17.0.0

.github/CODEOWNERS

@@ -1 +1 @@
-* @rkewlani @martinsrenato @Aleffio @abhilash-adyen @saquibsayyad 
+* @rkewlani @martinsrenato @Aleffio @abhilash-adyen @saquibsayyad @AlexandrosMor @wboereboom

README.md

@@ -41,7 +41,7 @@ You can use Maven and add this dependency to your project's POM:
 <dependency>
   <groupId>com.adyen</groupId>
   <artifactId>adyen-java-api-library</artifactId>
-  <version>16.0.0</version>
+  <version>17.0.0</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.adyen</groupId>
     <artifactId>adyen-java-api-library</artifactId>
     <packaging>jar</packaging>
-    <version>16.0.0</version>
+    <version>17.0.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

@@ -26,7 +26,6 @@
 import com.adyen.httpclient.ClientInterface;
 
 import java.security.KeyStore;
-import java.util.Optional;
 
 public class Client {
     private ClientInterface httpClient;
@@ -48,7 +47,7 @@ public class Client {
     public static final String MARKETPAY_NOTIFICATION_API_VERSION = "v6";
     public static final String MARKETPAY_HOP_API_VERSION = "v6";
     public static final String LIB_NAME = "adyen-java-api-library";
-    public static final String LIB_VERSION = "16.0.0";
+    public static final String LIB_VERSION = "17.0.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_ENDPOINT_CERT_LIVE = "https://checkoutcert-live-%s.adyen.com/checkout";
@@ -226,8 +225,7 @@ public String toString() {
     }
 
     public ClientInterface getHttpClient() {
-        this.httpClient = Optional.ofNullable(this.httpClient).orElseGet(AdyenHttpClient::new);
-        return this.httpClient;
+        return this.httpClient == null ? new AdyenHttpClient() : this.httpClient;
     }
 
     public void setHttpClient(ClientInterface httpClient) {

src/main/java/com/adyen/model/ThreeDSecureData.java

@@ -120,6 +120,12 @@ public String toString() {
     @SerializedName("cavv")
     private String cavv = null;
 
+    @SerializedName("tavv")
+    private String tavv = null;
+
+    @SerializedName("tokenAuthenticationVerificationValue")
+    private String tokenAuthenticationVerificationValue = null;
+
     @SerializedName("eci")
     private String eci = null;
 
@@ -220,6 +226,33 @@ public ThreeDSecureData cavv(String cavv) {
         return this;
     }
 
+    /**
+     * Network token cryptogram.
+     *
+     * @return tavv
+     **/
+    public String getTavv() {
+        return tavv;
+    }
+
+    public void setTavv(String tavv) {
+        this.tavv = tavv;
+    }
+
+    /**
+     * Network token authentication verification value (TAVV). The network token cryptogram.
+     *
+     * @return tokenAuthenticationVerificationValue
+     **/
+    public String getTokenAuthenticationVerificationValue() {
+        return tokenAuthenticationVerificationValue;
+    }
+
+    public void setTokenAuthenticationVerificationValue(String tokenAuthenticationVerificationValue) {
+        this.tokenAuthenticationVerificationValue = tokenAuthenticationVerificationValue;
+    }
+
+
     /**
      * the cardholder authentication value (base64 encoded, 20 bytes in decoded form)
      *
@@ -336,6 +369,8 @@ public boolean equals(Object o) {
                 && Objects.equals(this.authenticationResponse, threeDSecureData.authenticationResponse)
                 && Objects.equals(this.xid, threeDSecureData.xid)
                 && Objects.equals(this.cavv, threeDSecureData.cavv)
+                && Objects.equals(this.tavv, threeDSecureData.tavv)
+                && Objects.equals(this.tokenAuthenticationVerificationValue, threeDSecureData.tokenAuthenticationVerificationValue)
                 && Objects.equals(this.eci, threeDSecureData.eci)
                 && Objects.equals(this.dsTransID, threeDSecureData.dsTransID)
                 && Objects.equals(this.challengeCancel, threeDSecureData.challengeCancel)
@@ -345,7 +380,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(cavvAlgorithm, directoryResponse, authenticationResponse, xid, cavv, eci, dsTransID, challengeCancel, riskScore, transStatusReason);
+        return Objects.hash(cavvAlgorithm, directoryResponse, authenticationResponse, xid, cavv, tavv, tokenAuthenticationVerificationValue, eci, dsTransID, challengeCancel, riskScore, transStatusReason);
     }
 
 
@@ -359,6 +394,8 @@ public String toString() {
         sb.append("    authenticationResponse: ").append(toIndentedString(authenticationResponse)).append("\n");
         sb.append("    xid: ").append(toIndentedString(xid)).append("\n");
         sb.append("    cavv: ").append(toIndentedString(cavv)).append("\n");
+        sb.append("    tavv: ").append(toIndentedString(tavv)).append("\n");
+        sb.append("    tokenAuthenticationVerificationValue: ").append(toIndentedString(tokenAuthenticationVerificationValue)).append("\n");
         sb.append("    eci: ").append(toIndentedString(eci)).append("\n");
         sb.append("    dsTransID: ").append(toIndentedString(dsTransID)).append("\n");
         sb.append("    challengeCancel").append(toIndentedString(challengeCancel)).append("\n");

src/main/java/com/adyen/model/marketpay/AccountHolderStatus.java

@@ -42,7 +42,7 @@
 
 public class AccountHolderStatus {
     @SerializedName("events")
-    private List<AccountEventContainer> events = null;
+    private List<AccountEvent> events = null;
 
     @SerializedName("payoutState")
     private AccountPayoutState payoutState = null;
@@ -105,14 +105,14 @@ public StatusEnum read(final JsonReader jsonReader) throws IOException {
     @SerializedName("statusReason")
     private String statusReason = null;
 
-    public AccountHolderStatus events(List<AccountEventContainer> events) {
+    public AccountHolderStatus events(List<AccountEvent> events) {
         this.events = events;
         return this;
     }
 
-    public AccountHolderStatus addEventsItem(AccountEventContainer eventsItem) {
+    public AccountHolderStatus addEventsItem(AccountEvent eventsItem) {
         if (this.events == null) {
-            this.events = new ArrayList<AccountEventContainer>();
+            this.events = new ArrayList<AccountEvent>();
         }
         this.events.add(eventsItem);
         return this;
@@ -123,11 +123,11 @@ public AccountHolderStatus addEventsItem(AccountEventContainer eventsItem) {
      *
      * @return events
      **/
-    public List<AccountEventContainer> getEvents() {
+    public List<AccountEvent> getEvents() {
         return events;
     }
 
-    public void setEvents(List<AccountEventContainer> events) {
+    public void setEvents(List<AccountEvent> events) {
         this.events = events;
     }
 

src/main/java/com/adyen/model/marketpay/BusinessDetails.java

@@ -63,6 +63,9 @@ public class BusinessDetails {
     @SerializedName("taxId")
     private String taxId = null;
 
+    @SerializedName("listedUltimateParentCompany")
+    private List<UltimateParentCompany> listedUltimateParentCompany = null;
+
     public BusinessDetails doingBusinessAs(String doingBusinessAs) {
         this.doingBusinessAs = doingBusinessAs;
         return this;
@@ -259,6 +262,32 @@ public void setStockTicker(String stockTicker) {
         this.stockTicker = stockTicker;
     }
 
+    /**
+     * Information about the parent public company. Required if the account holder is 100% owned by a publicly listed
+     * company.
+     *
+     * @return listedUltimateParentCompany
+     */
+    public List<UltimateParentCompany> getListedUltimateParentCompany() {
+        return listedUltimateParentCompany;
+    }
+
+    public void setListedUltimateParentCompany(List<UltimateParentCompany> listedUltimateParentCompany) {
+        this.listedUltimateParentCompany = listedUltimateParentCompany;
+    }
+
+    public BusinessDetails listedUltimateParentCompany(List<UltimateParentCompany> listedUltimateParentCompany) {
+        this.listedUltimateParentCompany = listedUltimateParentCompany;
+        return this;
+    }
+
+    public BusinessDetails addListedUltimateParentCompanyItem(UltimateParentCompany listedUltimateParentCompanyItem) {
+        if (this.listedUltimateParentCompany == null) {
+            this.listedUltimateParentCompany = new ArrayList<>();
+        }
+        this.listedUltimateParentCompany.add(listedUltimateParentCompanyItem);
+        return this;
+    }
 
     @Override
     public boolean equals(Object o) {
@@ -278,12 +307,13 @@ public boolean equals(Object o) {
                 Objects.equals(this.stockExchange, businessDetails.stockExchange) &&
                 Objects.equals(this.stockNumber, businessDetails.stockNumber) &&
                 Objects.equals(this.stockTicker, businessDetails.stockTicker) &&
-                Objects.equals(this.taxId, businessDetails.taxId);
+                Objects.equals(this.taxId, businessDetails.taxId) &&
+                Objects.equals(this.listedUltimateParentCompany, businessDetails.listedUltimateParentCompany);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(doingBusinessAs, incorporatedAt, legalBusinessName, registrationNumber, shareholders, signatories, stockExchange, stockNumber, stockTicker, taxId);
+        return Objects.hash(doingBusinessAs, incorporatedAt, legalBusinessName, registrationNumber, shareholders, signatories, stockExchange, stockNumber, stockTicker, taxId, listedUltimateParentCompany);
     }
 
 
@@ -302,6 +332,7 @@ public String toString() {
         sb.append("    stockNumber: ").append(toIndentedString(stockNumber)).append("\n");
         sb.append("    stockTicker: ").append(toIndentedString(stockTicker)).append("\n");
         sb.append("    taxId: ").append(toIndentedString(taxId)).append("\n");
+        sb.append("    listedUltimateParentCompany: ").append(toIndentedString(listedUltimateParentCompany)).append("\n");
         sb.append("}");
         return sb.toString();
     }