Merge pull request #63 from Adyen/fix-token-details

#61 tokenData should be a Map of <String,String> rather then a string.

Author: rikterbeek

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/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",