Merge pull request #64 from Adyen/develop

Merge from develop for new release 1.2.1

Author: rikterbeek

README.md

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

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.adyen</groupId>
     <artifactId>adyen-java-api-library</artifactId>
     <packaging>jar</packaging>
-    <version>1.2.0</version>
+    <version>1.2.1</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,7 +35,7 @@ public class Client {
     public static final String HPP_LIVE = "https://live.adyen.com/hpp";
     public static final String API_VERSION = "v25";
     public static final String USER_AGENT_SUFFIX = "adyen-java-api-library/";
-    public static final String LIB_VERSION = "1.2.0";
+    public static final String LIB_VERSION = "1.2.1";
 
     public Client() {
         this.config = new Config();

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

@@ -20,6 +20,7 @@
  */
 package com.adyen.model;
 
+import java.util.Map;
 import java.util.Objects;
 import com.google.gson.annotations.SerializedName;
 
@@ -31,7 +32,7 @@ public class TokenDetails {
   private String tokenDataType = null;
 
   @SerializedName("tokenData")
-  private String tokenData = null;
+  private Map<String, String> tokenData = null;
 
   public TokenDetails tokenDataType(String tokenDataType) {
     this.tokenDataType = tokenDataType;
@@ -50,24 +51,23 @@ public void setTokenDataType(String tokenDataType) {
     this.tokenDataType = tokenDataType;
   }
 
-  public TokenDetails tokenData(String tokenData) {
+  public TokenDetails tokenData(Map<String,String> tokenData) {
     this.tokenData = tokenData;
     return this;
   }
 
-   /**
+  /**
    * Get tokenData
    * @return tokenData
-  **/
-  public String getTokenData() {
+   */
+  public Map<String, String> getTokenData() {
     return tokenData;
   }
 
-  public void setTokenData(String tokenData) {
+  public void setTokenData(Map<String, String> tokenData) {
     this.tokenData = tokenData;
   }
 
-
   @Override
   public boolean equals(Object o) {
     if (this == o) {

src/main/java/com/adyen/model/hpp/DirectoryLookupRequest.java

@@ -1,4 +1,4 @@
-/**
+/*
  *                       ######
  *                       ######
  * ############    ####( ######  #####. ######  ############   ############
@@ -31,7 +31,7 @@ public class DirectoryLookupRequest {
     private String skinCode;
     private String merchantAccount;
     private String hmacKey;
-
+    private String shopperLocale;
 
     public DirectoryLookupRequest() {
         sessionValidity = Util.calculateSessionValidity();
@@ -108,4 +108,13 @@ public DirectoryLookupRequest setHmacKey(String hmacKey) {
         this.hmacKey = hmacKey;
         return this;
     }
+
+    public String getShopperLocale() {
+        return shopperLocale;
+    }
+
+    public DirectoryLookupRequest setShopperLocale(String shopperLocale) {
+        this.shopperLocale = shopperLocale;
+        return this;
+    }
 }

src/main/java/com/adyen/service/HostedPaymentPages.java

@@ -45,6 +45,7 @@
 import static com.adyen.constants.HPPConstants.Fields.PAYMENT_AMOUNT;
 import static com.adyen.constants.HPPConstants.Fields.SESSION_VALIDITY;
 import static com.adyen.constants.HPPConstants.Fields.SKIN_CODE;
+import static com.adyen.constants.HPPConstants.Response.SHOPPER_LOCALE;
 
 public class HostedPaymentPages extends Service {
     public HostedPaymentPages(Client client) {
@@ -83,6 +84,7 @@ public SortedMap<String, String> getPostParametersFromDLRequest(DirectoryLookupR
         postParameters.put(MERCHANT_REFERENCE, request.getMerchantReference());
         postParameters.put(SESSION_VALIDITY, request.getSessionValidity());
         postParameters.put(COUNTRY_CODE, request.getCountryCode());
+        postParameters.put(SHOPPER_LOCALE, request.getShopperLocale());
 
         HMACValidator hmacValidator = new HMACValidator();
 

src/test/java/com/adyen/DirectoryLookupTest.java

@@ -44,7 +44,11 @@
  */
 public class DirectoryLookupTest extends BaseTest {
     private DirectoryLookupRequest createDirectoryLookupRequest() {
-        DirectoryLookupRequest directoryLookupRequest = new DirectoryLookupRequest().setCountryCode("NL").setMerchantReference("test:\\'test").setPaymentAmount("1000").setCurrencyCode("EUR");
+        DirectoryLookupRequest directoryLookupRequest = new DirectoryLookupRequest().setCountryCode("NL")
+                                                                                    .setMerchantReference("test:\\'test")
+                                                                                    .setPaymentAmount("1000")
+                                                                                    .setCurrencyCode("EUR")
+                                                                                    .setShopperLocale("en_GB");
         return directoryLookupRequest;
     }
 

src/test/java/com/adyen/RecurringTest.java

@@ -60,8 +60,8 @@ public void testListRecurringDetails() throws Exception {
         RecurringDetailsRequest request = createRecurringDetailsRequest();
 
         RecurringDetailsResult result = recurring.listRecurringDetails(request);
-        assertEquals(1, result.getDetails().size());
-        assertEquals(1, result.getRecurringDetails().size());
+        assertEquals(2, result.getDetails().size());
+        assertEquals(2, result.getRecurringDetails().size());
 
         RecurringDetail recurringDetail = result.getRecurringDetails().get(0);
         assertEquals("recurringReference", recurringDetail.getRecurringDetailReference());

src/test/resources/mocks/recurring/listRecurringDetails-success.json

@@ -25,6 +25,36 @@
         "recurringDetailReference": "recurringReference",
         "variant": "visa"
       }
+    },
+    {
+      "RecurringDetail": {
+        "acquirer": "PayPalSandbox",
+        "acquirerAccount": "TestPmmAcquirerAccount",
+        "billingAddress": {
+          "city": "City",
+          "country": "NL",
+          "houseNumberOrName": "1",
+          "postalCode": "2312aa",
+          "stateOrProvince": "NA",
+          "street": "Street"
+        },
+        "contractTypes": [
+          "RECURRING"
+        ],
+        "creationDate": "2017-10-10T08:50:02+02:00",
+        "firstPspReference": "8515076181707110",
+        "paymentMethodVariant": "paypal",
+        "recurringDetailReference": "8315076181982020",
+        "tokenDetails": {
+          "tokenData": {
+            "EmailId": "tedtest@test.nl",
+            "PayPal.PayerId": "H95EPL8B2KFE6",
+            "BillingAgreementId": "B-7MA42752FE774625C"
+          },
+          "tokenDataType": "PayPal"
+        },
+        "variant": "paypal"
+      }
     }
   ],
   "shopperReference": "test-123",