Merge pull request #342 from Adyen/develop

Release 6.1.0

Author: andrei-dediu

.github/CODEOWNERS

@@ -1 +1 @@
-* @rkewlani @AlexandrosMor @martinsrenato @rikterbeek @andrei-dediu
+* @rkewlani @AlexandrosMor @martinsrenato @rikterbeek @andrei-dediu @Aleffio

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>6.0.0</version>
+  <version>6.1.0</version>
 </dependency>
 ```
 

pom.xml

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

@@ -35,17 +35,17 @@ public class Client {
     public static final String HPP_LIVE = "https://live.adyen.com/hpp";
     public static final String MARKETPAY_ENDPOINT_TEST = "https://cal-test.adyen.com/cal/services";
     public static final String MARKETPAY_ENDPOINT_LIVE = "https://cal-live.adyen.com/cal/services";
-    public static final String API_VERSION = "v51";
+    public static final String API_VERSION = "v52";
     public static final String PAYOUT_API_VERSION = "v51";
     public static final String RECURRING_API_VERSION = "v25";
     public static final String MARKETPAY_ACCOUNT_API_VERSION = "v5";
     public static final String MARKETPAY_FUND_API_VERSION = "v5";
     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 = "6.0.0";
+    public static final String LIB_VERSION = "6.1.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";
+    public static final String CHECKOUT_API_VERSION = "v52";
     public static final String BIN_LOOKUP_PAL_SUFFIX = "/pal/servlet/BinLookup/";
     public static final String BIN_LOOKUP_API_VERSION = "v50";
     public static final String CHECKOUT_UTILITY_API_VERSION = "v1";

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

@@ -34,6 +34,7 @@
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 
+
 /**
  * AbstractPaymentRequest Base for PaymentRequest and PaymentRequest3D
  */
@@ -96,6 +97,33 @@ public String toString() {
     @SerializedName("fraudOffset")
     private Integer fraudOffset = null;
 
+    /**
+     * How to process a combo card (for some Brazilian cards only). Allowed values: * debit * credit
+     */
+    public enum FundingSourceEnum {
+
+        @SerializedName("debit") DEBIT("debit"),
+        @SerializedName("credit") CREDIT("credit");
+
+        private String value;
+
+        FundingSourceEnum(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        @Override
+        public String toString() {
+            return String.valueOf(value);
+        }
+    }
+
+    @SerializedName("fundingSource")
+    private FundingSourceEnum fundingSource = null;
+
     @SerializedName("sessionId")
     private String sessionId = null;
 
@@ -173,7 +201,8 @@ public AbstractPaymentRequest() {
 
     /**
      * Set browser data
-     * @param userAgent http header
+     *
+     * @param userAgent    http header
      * @param acceptHeader http header
      * @return browser data
      */
@@ -415,6 +444,25 @@ public T sessionId(String sessionId) {
         return (T) this;
     }
 
+    public T fundingSource(FundingSourceEnum fundingSource) {
+        this.fundingSource = fundingSource;
+        return (T) this;
+    }
+
+    /**
+     * How to process a combo card (for some Brazilian cards only). Allowed values: * debit * credit
+     *
+     * @return fundingSource
+     **/
+    public FundingSourceEnum getFundingSource() {
+        return fundingSource;
+    }
+
+    public void setFundingSource(FundingSourceEnum fundingSource) {
+        this.fundingSource = fundingSource;
+    }
+
+
     /**
      * Get sessionId
      *
@@ -781,6 +829,7 @@ public T enableRealTimeUpdate(Boolean enableRealTimeUpdate) {
 
     /**
      * Choose if a specific transaction should use the Real-time Account Updater, regardless of other settings.
+     *
      * @return enableRealTimeUpdate
      **/
     public Boolean isEnableRealTimeUpdate() {
@@ -798,6 +847,7 @@ public T threeDSAuthenticationOnly(Boolean threeDSAuthenticationOnly) {
 
     /**
      * If set to true, you will only perform the [3D Secure 2 authentication](https://docs.adyen.com/checkout/3d-secure/native-3ds2/authentication-only), and not the payment authorisation.
+     *
      * @return threeDSAuthenticationOnly
      **/
     public Boolean isThreeDSAuthenticationOnly() {
@@ -829,6 +879,7 @@ public boolean equals(Object o) {
                 && Objects.equals(this.recurring, paymentRequest.recurring)
                 && Objects.equals(this.shopperStatement, paymentRequest.shopperStatement)
                 && Objects.equals(this.fraudOffset, paymentRequest.fraudOffset)
+                && Objects.equals(this.fundingSource, paymentRequest.fundingSource)
                 && Objects.equals(this.sessionId, paymentRequest.sessionId)
                 && Objects.equals(this.additionalAmount, paymentRequest.additionalAmount)
                 && Objects.equals(this.selectedRecurringDetailReference, paymentRequest.selectedRecurringDetailReference)
@@ -857,40 +908,41 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         return Objects.hash(amount,
-                            reference,
-                            billingAddress,
-                            shopperIP,
-                            merchantAccount,
-                            browserInfo,
-                            shopperInteraction,
-                            shopperEmail,
-                            shopperReference,
-                            recurring,
-                            shopperStatement,
-                            fraudOffset,
-                            sessionId,
-                            additionalAmount,
-                            selectedRecurringDetailReference,
-                            orderReference,
-                            merchantOrderReference,
-                            dccQuote,
-                            additionalData,
-                            shopperName,
-                            shopperLocale,
-                            selectedBrand,
-                            deliveryAddress,
-                            deliveryDate,
-                            deviceFingerprint,
-                            installments,
-                            socialSecurityNumber,
-                            captureDelayHours,
-                            dateOfBirth,
-                            telephoneNumber,
-                            mcc,
-                            metadata,
-                            applicationInfo,
-                            enableRealTimeUpdate,
-                            threeDSAuthenticationOnly);
+                reference,
+                billingAddress,
+                shopperIP,
+                merchantAccount,
+                browserInfo,
+                shopperInteraction,
+                shopperEmail,
+                shopperReference,
+                recurring,
+                shopperStatement,
+                fraudOffset,
+                fundingSource,
+                sessionId,
+                additionalAmount,
+                selectedRecurringDetailReference,
+                orderReference,
+                merchantOrderReference,
+                dccQuote,
+                additionalData,
+                shopperName,
+                shopperLocale,
+                selectedBrand,
+                deliveryAddress,
+                deliveryDate,
+                deviceFingerprint,
+                installments,
+                socialSecurityNumber,
+                captureDelayHours,
+                dateOfBirth,
+                telephoneNumber,
+                mcc,
+                metadata,
+                applicationInfo,
+                enableRealTimeUpdate,
+                threeDSAuthenticationOnly);
     }
 
     @Override
@@ -909,6 +961,7 @@ public String toString() {
         sb.append("    recurring: ").append(toIndentedString(recurring)).append("\n");
         sb.append("    shopperStatement: ").append(toIndentedString(shopperStatement)).append("\n");
         sb.append("    fraudOffset: ").append(toIndentedString(fraudOffset)).append("\n");
+        sb.append("    fundingSource: ").append(toIndentedString(fundingSource)).append("\n");
         sb.append("    sessionId: ").append(toIndentedString(sessionId)).append("\n");
         sb.append("    additionalAmount: ").append(toIndentedString(additionalAmount)).append("\n");
         sb.append("    selectedRecurringDetailReference: ").append(toIndentedString(selectedRecurringDetailReference)).append("\n");
@@ -943,10 +996,10 @@ private String stringifyAdditionalData() {
 
         Map<String, String> nonSensitiveAdditionalData = new HashMap<String, String>(additionalData);
         List<String> keys = Arrays.asList(ApiConstants.AdditionalData.Card.Encrypted.JSON,
-                                          ApiConstants.AdditionalData.ENCRYPTED_CARD_NUMBER,
-                                          ApiConstants.AdditionalData.ENCRYPTED_EXPIRY_MONTH,
-                                          ApiConstants.AdditionalData.ENCRYPTED_EXPIRY_YEAR,
-                                          ApiConstants.AdditionalData.ENCRYPTED_SECURITY_CODE);
+                ApiConstants.AdditionalData.ENCRYPTED_CARD_NUMBER,
+                ApiConstants.AdditionalData.ENCRYPTED_EXPIRY_MONTH,
+                ApiConstants.AdditionalData.ENCRYPTED_EXPIRY_YEAR,
+                ApiConstants.AdditionalData.ENCRYPTED_SECURITY_CODE);
 
         for (String key : keys) {
             if (nonSensitiveAdditionalData.containsKey(key)) {

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

@@ -22,6 +22,7 @@
 package com.adyen.model.checkout;
 
 import com.adyen.Util.DateUtil;
+import com.adyen.model.Amount;
 import com.adyen.model.FraudResult;
 import com.adyen.model.ThreeDS2Result;
 import com.google.gson.TypeAdapter;
@@ -106,6 +107,9 @@ public class PaymentsResponse {
     @SerializedName("action")
     private CheckoutPaymentsAction action;
 
+    @SerializedName("amount")
+    private Amount amount = null;
+
     public PaymentsResponse additionalData(Map<String, String> additionalData) {
         this.additionalData = additionalData;
         return this;
@@ -372,6 +376,24 @@ public PaymentsResponse action(CheckoutPaymentsAction action) {
         return this;
     }
 
+    public PaymentsResponse amount(Amount amount) {
+        this.amount = amount;
+        return this;
+    }
+
+    /**
+     * Get amount
+     *
+     * @return amount
+     **/
+    public Amount getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Amount amount) {
+        this.amount = amount;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -397,13 +419,15 @@ public boolean equals(Object o) {
                 && Objects.equals(this.outputDetails, paymentsResponse.outputDetails)
                 && Objects.equals(this.authentication, paymentsResponse.authentication)
                 && Objects.equals(this.threeDS2Result, paymentsResponse.threeDS2Result)
-                && Objects.equals(this.action, paymentsResponse.action);
+                && Objects.equals(this.action, paymentsResponse.action)
+                && Objects.equals(this.amount, paymentsResponse.amount);
+
 
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(additionalData, details, fraudResult, paymentData, pspReference, redirect, refusalReason, resultCode, serviceError, authResponse, merchantReference, outputDetails, authentication, threeDS2Result, action);
+        return Objects.hash(additionalData, details, fraudResult, paymentData, pspReference, redirect, refusalReason, resultCode, serviceError, authResponse, merchantReference, outputDetails, authentication, threeDS2Result, action, amount);
     }
 
     @Override
@@ -426,6 +450,7 @@ public String toString() {
         sb.append("    authentication: ").append(toIndentedString(authentication)).append("\n");
         sb.append("    threeDS2Result: ").append(toIndentedString(threeDS2Result)).append("\n");
         sb.append("    action: ").append(toIndentedString(action)).append("\n");
+        sb.append("    amount: ").append(toIndentedString(amount)).append("\n");
         sb.append("}");
         return sb.toString();
     }