Release version 2.5.0 (#229)

* Fix response for Terminal API Abort Requests

* PaymentsRequest browserInfo printed in toString method

* Add test for abortRequest

* Fix travis.yml

* Removing unused fields from payment request payload

* Restoring personalDetails

* Added merchantName to ThreeDS2RequestData

* Adding missing fields on PaymentInstrumentData

* Fix ForceEntryMode fields / InstalmentType json name

* Fix Instalment and CheckData typo

* Update currency code list

* Removing MRO currency

* Fix currency test

* RecurringDetail missing fields

* Add RecurringDetail mock test

* [PW-1398] Fix AuthenticationMethodType.OnlinePIN (#226)

* Fix AuthenticationMethodType.OnlinePIN

* Add OnlinePIN tests

* Bump to version 2.5.0

Author: martinsrenato

.travis.yml

@@ -1,5 +1,7 @@
 language: java
 
+dist: trusty
+
 jdk:
   - oraclejdk8
   - openjdk7

README.md

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

pom.xml

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

@@ -41,7 +41,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 = "2.4.1";
+    public static final String LIB_VERSION = "2.5.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 = "v49";

src/main/java/com/adyen/Util/Util.java

@@ -102,31 +102,28 @@ public static Amount createAmount(BigDecimal amount, String currency) {
 
     public static int getDecimalPlaces(String currency) {
         switch (currency) {
-            case "JPY":
-            case "IDR":
-            case "KRW":
-            case "BYR":
-            case "VND":
             case "CVE":
             case "DJF":
             case "GNF":
+            case "IDR":
+            case "JPY":
+            case "KMF":
+            case "KRW":
             case "PYG":
             case "RWF":
             case "UGX":
+            case "VND":
             case "VUV":
             case "XAF":
             case "XOF":
             case "XPF":
-            case "GHC":
-            case "KMF":
                 return 0;
-            case "MRO":
-                return 1;
             case "BHD":
+            case "IQD":
             case "JOD":
             case "KWD":
-            case "OMR":
             case "LYD":
+            case "OMR":
             case "TND":
                 return 3;
             default:

src/main/java/com/adyen/httpclient/HttpURLConnectionClient.java

@@ -105,10 +105,16 @@ public String request(String requestUrl, String requestBody, Config config, bool
 
     private static String getResponseBody(InputStream responseStream) throws IOException {
         //\A is the beginning of the stream boundary
-        Scanner scanner = new Scanner(responseStream, CHARSET);
-        String rBody = scanner.useDelimiter("\\A").next();
+        Scanner scanner = new Scanner(responseStream, CHARSET).useDelimiter("\\A");
+
+        String rBody = null;
+        if (scanner.hasNext()) {
+            rBody = scanner.next();
+        }
+
         scanner.close();
         responseStream.close();
+
         return rBody;
     }
 

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

@@ -144,6 +144,9 @@ public ChallengeIndicatorEnum read(final JsonReader jsonReader) throws IOExcepti
     @SerializedName("mcc")
     private String mcc = null;
 
+    @SerializedName("merchantName")
+    private String merchantName;
+
     public ThreeDS2RequestData authenticationOnly(Boolean authenticationOnly) {
         this.authenticationOnly = authenticationOnly;
         return this;
@@ -441,6 +444,26 @@ public ThreeDS2RequestData mcc(String mcc) {
         return this;
     }
 
+    /**
+     * Required for [authentication-only integration](https://docs.adyen.com/checkout/3d-secure-2/3ds2-checkout-authentication-only-integration). The merchant name that the
+     * issuer presents to the shopper if they get a challenge. We recommend to use the same value that you will use in the authorization. Maximum length is 40 characters.
+     * Optional for a [full 3D Secure 2 integration](https://docs.adyen.com/checkout/3d-secure-2/3ds2-checkout-api-integration). Use this field if you are enrolled for 3D Secure 2 with us and want to
+     * override the merchant name already configured on your account.
+     * @return merchantName
+     */
+    public String getMerchantName() {
+        return merchantName;
+    }
+
+    public void setMerchantName(String merchantName) {
+        this.merchantName = merchantName;
+    }
+
+    public ThreeDS2RequestData merchantName(String merchantName) {
+        this.merchantName = merchantName;
+        return this;
+    }
+
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -469,7 +492,8 @@ public boolean equals(java.lang.Object o) {
                 && Objects.equals(this.threeDSRequestorName, threeDS2RequestData.threeDSRequestorName)
                 && Objects.equals(this.acquirerBIN, threeDS2RequestData.acquirerBIN)
                 && Objects.equals(this.acquirerMerchantID, threeDS2RequestData.acquirerMerchantID)
-                && Objects.equals(this.mcc, threeDS2RequestData.mcc);
+                && Objects.equals(this.mcc, threeDS2RequestData.mcc)
+                && Objects.equals(this.merchantName, threeDS2RequestData.merchantName);
     }
 
     @Override
@@ -493,7 +517,8 @@ public int hashCode() {
                             threeDSRequestorName,
                             acquirerBIN,
                             acquirerMerchantID,
-                            mcc);
+                            mcc,
+                            merchantName);
     }
 
     @Override
@@ -521,6 +546,7 @@ public String toString() {
         sb.append("    acquirerBIN: ").append(toIndentedString(acquirerBIN)).append("\n");
         sb.append("    acquirerMerchantID: ").append(toIndentedString(acquirerMerchantID)).append("\n");
         sb.append("    mcc: ").append(toIndentedString(mcc)).append("\n");
+        sb.append("    merchantName: ").append(toIndentedString(merchantName)).append("\n");
         sb.append("}");
         return sb.toString();
     }

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

@@ -22,7 +22,7 @@
 package com.adyen.model.checkout;
 
 import java.util.Objects;
-import com.adyen.model.Address;
+
 import com.google.gson.annotations.SerializedName;
 
 public class DefaultPaymentMethodDetails implements PaymentMethodDetails {
@@ -42,10 +42,6 @@ public class DefaultPaymentMethodDetails implements PaymentMethodDetails {
     private String installmentConfigurationKey;
     @SerializedName("personalDetails")
     private PersonalDetails personalDetails;
-    @SerializedName("billingAddress")
-    private Address billingAddress;
-    @SerializedName("deliveryAddress")
-    private Address deliveryAddress;
     @SerializedName("encryptedCardNumber")
     private String encryptedCardNumber;
     @SerializedName("encryptedExpiryMonth")
@@ -171,32 +167,6 @@ public DefaultPaymentMethodDetails personalDetails(PersonalDetails personalDetai
         return this;
     }
 
-    public Address getBillingAddress() {
-        return billingAddress;
-    }
-
-    public void setBillingAddress(Address billingAddress) {
-        this.billingAddress = billingAddress;
-    }
-
-    public DefaultPaymentMethodDetails billingAddress(Address billingAddress) {
-        this.billingAddress = billingAddress;
-        return this;
-    }
-
-    public Address getDeliveryAddress() {
-        return deliveryAddress;
-    }
-
-    public void setDeliveryAddress(Address deliveryAddress) {
-        this.deliveryAddress = deliveryAddress;
-    }
-
-    public DefaultPaymentMethodDetails deliveryAddress(Address deliveryAddress) {
-        this.deliveryAddress = deliveryAddress;
-        return this;
-    }
-
     public String getEncryptedCardNumber() {
         return encryptedCardNumber;
     }
@@ -317,14 +287,10 @@ public boolean equals(Object o) {
                 && Objects.equals(number, that.number)
                 && Objects.equals(expiryMonth, that.expiryMonth)
                 && Objects.equals(expiryYear, that.expiryYear)
-                && Objects.equals(holderName,
-                                  that.holderName)
+                && Objects.equals(holderName, that.holderName)
                 && Objects.equals(cvc, that.cvc)
                 && Objects.equals(installmentConfigurationKey, that.installmentConfigurationKey)
-                && Objects.equals(personalDetails,
-                                  that.personalDetails)
-                && Objects.equals(billingAddress, that.billingAddress)
-                && Objects.equals(deliveryAddress, that.deliveryAddress)
+                && Objects.equals(personalDetails, that.personalDetails)
                 && Objects.equals(encryptedCardNumber, that.encryptedCardNumber)
                 && Objects.equals(encryptedExpiryMonth, that.encryptedExpiryMonth)
                 && Objects.equals(encryptedExpiryYear, that.encryptedExpiryYear)
@@ -339,22 +305,20 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         return Objects.hash(type,
-                            number,
-                            expiryMonth,
-                            expiryYear,
-                            holderName,
-                            cvc,
-                            installmentConfigurationKey,
-                            personalDetails,
-                            billingAddress,
-                            deliveryAddress,
-                            encryptedCardNumber,
-                            encryptedExpiryMonth,
-                            encryptedExpiryYear,
-                            encryptedSecurityCode,
-                            recurringDetailReference,
-                            storeDetails,
-                            idealIssuer);
+                number,
+                expiryMonth,
+                expiryYear,
+                holderName,
+                cvc,
+                installmentConfigurationKey,
+                personalDetails,
+                encryptedCardNumber,
+                encryptedExpiryMonth,
+                encryptedExpiryYear,
+                encryptedSecurityCode,
+                recurringDetailReference,
+                storeDetails,
+                idealIssuer);
     }
 
     @Override
@@ -377,10 +341,6 @@ public String toString() {
                 + '\''
                 + ", personalDetails="
                 + personalDetails
-                + ", billingAddress="
-                + billingAddress
-                + ", deliveryAddress="
-                + deliveryAddress
                 + ", encryptedExpiryMonth='"
                 + encryptedExpiryMonth
                 + '\''

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

@@ -1360,6 +1360,7 @@ public String toString() {
           + "    merchantAccount: " + toIndentedString(merchantAccount) + "\n"
           + "    merchantOrderReference: " + toIndentedString(merchantOrderReference) + "\n"
           + "    metadata: " + toIndentedString(metadata) + "\n"
+          + "    browserInfo: " + toIndentedString(browserInfo) + "\n"
           + "    orderReference: " + toIndentedString(orderReference) + "\n"
           + "    paymentMethod: " + toIndentedString(paymentMethod) + "\n"
           + "    reference: " + toIndentedString(reference) + "\n"