small changes

Mangopay · Dec 21, 2023 · d8f6b36 · d8f6b36
1 parent 6c4d033
commit d8f6b36
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 60 deletions.
diff --git a/src/main/java/com/mangopay/core/deserializer/PayInDeserializer.java b/src/main/java/com/mangopay/core/deserializer/PayInDeserializer.java
@@ -255,6 +255,8 @@ public PayIn deserialize(JsonElement json, Type typeOfT, JsonDeserializationCont
                     payInExecutionDetailsDirect.setApplied3DSVersion(object.get("Applied3DSVersion").getAsString());
                 if (object.has("RecurringPayinRegistrationId") && !object.get("RecurringPayinRegistrationId").isJsonNull())
                     payInExecutionDetailsDirect.setRecurringPayinRegistrationId(object.get("RecurringPayinRegistrationId").getAsString());
+                if (object.has("CardInfo") && !object.get("CardInfo").isJsonNull())
+                    payInExecutionDetailsDirect.setCardInfo((CardInfo) context.deserialize(object.get("CardInfo"), CardInfo.class));
                 payIn.setExecutionDetails(payInExecutionDetailsDirect);
                 break;
             case EXTERNAL_INSTRUCTION:

diff --git a/src/main/java/com/mangopay/core/deserializer/RecurringPayInDeserializer.java b/src/main/java/com/mangopay/core/deserializer/RecurringPayInDeserializer.java
@@ -2,12 +2,14 @@
 
 import com.google.gson.*;
 import com.mangopay.core.Billing;
+import com.mangopay.core.CardInfo;
 import com.mangopay.core.SecurityInfo;
 import com.mangopay.core.enumerations.CardType;
 import com.mangopay.core.enumerations.CultureCode;
 import com.mangopay.core.enumerations.SecureMode;
 import com.mangopay.entities.RecurringPayIn;
-import com.mangopay.entities.subentities.*;
+import com.mangopay.entities.subentities.PayInExecutionDetailsDirect;
+import com.mangopay.entities.subentities.PayInPaymentDetailsCard;
 
 import java.lang.reflect.Type;
 
@@ -56,6 +58,8 @@ public RecurringPayIn deserialize(JsonElement json, Type typeOfT, JsonDeserializ
                     payInExecutionDetailsDirect.setRequested3DSVersion(object.get("Requested3DSVersion").getAsString());
                 if (object.has("Applied3DSVersion") && !object.get("Applied3DSVersion").isJsonNull())
                     payInExecutionDetailsDirect.setApplied3DSVersion(object.get("Applied3DSVersion").getAsString());
+                if (object.has("CardInfo") && !object.get("CardInfo").isJsonNull())
+                    payInExecutionDetailsDirect.setCardInfo((CardInfo) context.deserialize(object.get("CardInfo"), CardInfo.class));
                 payIn.setExecutionDetails(payInExecutionDetailsDirect);
                 break;
         }

diff --git a/src/main/java/com/mangopay/core/serializer/PayInSerializer.java b/src/main/java/com/mangopay/core/serializer/PayInSerializer.java
@@ -19,7 +19,6 @@ public JsonElement serialize(PayIn src, Type typeOfSrc, JsonSerializationContext
         object.add("PaymentType", context.serialize(src.getPaymentType()));
         object.add("ExecutionType", context.serialize(src.getExecutionType()));
         object.add("ExecutionDetails", context.serialize(src.getExecutionDetails()));
-        object.add("CardInfo", context.serialize(src.getCardInfo()));
         switch (src.getPaymentDetails().getClass().getSimpleName()) {
             case "PayInPaymentDetailsBankWire":
                 object.add("DeclaredDebitedFunds", context.serialize(((PayInPaymentDetailsBankWire) src.getPaymentDetails()).getDeclaredDebitedFunds()));

diff --git a/src/main/java/com/mangopay/entities/PayIn.java b/src/main/java/com/mangopay/entities/PayIn.java
@@ -1,7 +1,6 @@
 package com.mangopay.entities;
 
 import com.google.gson.annotations.SerializedName;
-import com.mangopay.core.CardInfo;
 import com.mangopay.core.enumerations.PayInExecutionType;
 import com.mangopay.core.enumerations.PayInPaymentType;
 import com.mangopay.core.interfaces.PayInExecutionDetails;
@@ -47,12 +46,6 @@ public class PayIn extends Transaction {
     @SerializedName("ExecutionDetails")
     private PayInExecutionDetails executionDetails;
 
-    /**
-     * Information of the card
-     */
-    @SerializedName("CardInfo")
-    private CardInfo cardInfo;
-
     public String getCreditedWalletId() {
         return creditedWalletId;
     }
@@ -93,14 +86,6 @@ public void setExecutionDetails(PayInExecutionDetails executionDetails) {
         this.executionDetails = executionDetails;
     }
 
-    public CardInfo getCardInfo() {
-        return cardInfo;
-    }
-
-    public void setCardInfo(CardInfo cardInfo) {
-        this.cardInfo = cardInfo;
-    }
-
     /**
      * Gets the structure that maps which property depends on other property.
      *

diff --git a/src/main/java/com/mangopay/entities/RecurringPayInCIT.java b/src/main/java/com/mangopay/entities/RecurringPayInCIT.java
@@ -1,7 +1,6 @@
 package com.mangopay.entities;
 
 import com.google.gson.annotations.SerializedName;
-import com.mangopay.core.CardInfo;
 import com.mangopay.core.Dto;
 import com.mangopay.core.Money;
 import com.mangopay.entities.subentities.BrowserInfo;
@@ -35,17 +34,6 @@ public class RecurringPayInCIT extends Dto {
     @SerializedName("Fees")
     private Money fees;
 
-    @SerializedName("CardInfo")
-    private CardInfo cardInfo;
-
-    public CardInfo getCardInfo() {
-        return cardInfo;
-    }
-
-    public void setCardInfo(CardInfo cardInfo) {
-        this.cardInfo = cardInfo;
-    }
-
     public String getRecurringPayInRegistrationId() {
         return recurringPayInRegistrationId;
     }

diff --git a/src/main/java/com/mangopay/entities/RecurringPayInMIT.java b/src/main/java/com/mangopay/entities/RecurringPayInMIT.java
@@ -1,7 +1,6 @@
 package com.mangopay.entities;
 
 import com.google.gson.annotations.SerializedName;
-import com.mangopay.core.CardInfo;
 import com.mangopay.core.Dto;
 import com.mangopay.core.Money;
 
@@ -25,17 +24,6 @@ public class RecurringPayInMIT extends Dto {
     @SerializedName("Tag")
     private String tag;
 
-    @SerializedName("CardInfo")
-    private CardInfo cardInfo;
-
-    public CardInfo getCardInfo() {
-        return cardInfo;
-    }
-
-    public void setCardInfo(CardInfo cardInfo) {
-        this.cardInfo = cardInfo;
-    }
-
     public String getRecurringPayInRegistrationId() {
         return recurringPayInRegistrationId;
     }

diff --git a/src/main/java/com/mangopay/entities/subentities/PayInExecutionDetailsDirect.java b/src/main/java/com/mangopay/entities/subentities/PayInExecutionDetailsDirect.java
@@ -1,10 +1,7 @@
 package com.mangopay.entities.subentities;
 
 import com.google.gson.annotations.SerializedName;
-import com.mangopay.core.Billing;
-import com.mangopay.core.Dto;
-import com.mangopay.core.ObjectTool;
-import com.mangopay.core.SecurityInfo;
+import com.mangopay.core.*;
 import com.mangopay.core.enumerations.CultureCode;
 import com.mangopay.core.enumerations.SecureMode;
 import com.mangopay.core.interfaces.PayInExecutionDetails;
@@ -68,6 +65,12 @@ public class PayInExecutionDetailsDirect extends Dto implements PayInExecutionDe
     @SerializedName("Culture")
     private CultureCode culture;
 
+    /**
+     * Information of the card
+     */
+    @SerializedName("CardInfo")
+    private CardInfo cardInfo;
+
     public PayInExecutionDetailsDirect() {
     }
 
@@ -216,6 +219,15 @@ public PayInExecutionDetailsDirect setRecurringPayinRegistrationId(String recurr
         return this;
     }
 
+    public CardInfo getCardInfo() {
+        return cardInfo;
+    }
+
+    public PayInExecutionDetailsDirect setCardInfo(CardInfo cardInfo) {
+        this.cardInfo = cardInfo;
+        return this;
+    }
+
     @Override
     public Map<String, Type> getSubObjects() {
 

diff --git a/src/test/java/com/mangopay/core/PayInApiImplTest.java b/src/test/java/com/mangopay/core/PayInApiImplTest.java
@@ -696,11 +696,11 @@ public void testDirectPayInCheckCardInfo() {
         try {
             PayIn payIn = this.getNewPayInCardDirect();
 
-            assertNotNull(payIn.getCardInfo());
-            assertNotNull(payIn.getCardInfo().getBrand());
-            assertNotNull(payIn.getCardInfo().getType());
-            assertNotNull(payIn.getCardInfo().getIssuingBank());
-            assertNotNull(payIn.getCardInfo().getBin());
+            assertNotNull(((PayInExecutionDetailsDirect)payIn.getExecutionDetails()).getCardInfo());
+            assertNotNull(((PayInExecutionDetailsDirect)payIn.getExecutionDetails()).getCardInfo().getBrand());
+            assertNotNull(((PayInExecutionDetailsDirect)payIn.getExecutionDetails()).getCardInfo().getType());
+            assertNotNull(((PayInExecutionDetailsDirect)payIn.getExecutionDetails()).getCardInfo().getIssuingBank());
+            assertNotNull(((PayInExecutionDetailsDirect)payIn.getExecutionDetails()).getCardInfo().getBin());
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -1013,11 +1013,11 @@ public void testCreateRecurringPaymentMITCheckCardInfo() {
             cit.setDebitedFunds(new Money().setAmount(11).setCurrency(CurrencyIso.EUR));
             RecurringPayIn createdCit = this.api.getPayInApi().createRecurringPayInCIT(null, cit);
 
-            assertNotNull(createdCit.getCardInfo());
-            assertNotNull(createdCit.getCardInfo().getBrand());
-            assertNotNull(createdCit.getCardInfo().getType());
-            assertNotNull(createdCit.getCardInfo().getIssuingBank());
-            assertNotNull(createdCit.getCardInfo().getBin());
+            assertNotNull(((PayInExecutionDetailsDirect)createdCit.getExecutionDetails()).getCardInfo());
+            assertNotNull(((PayInExecutionDetailsDirect)createdCit.getExecutionDetails()).getCardInfo().getBrand());
+            assertNotNull(((PayInExecutionDetailsDirect)createdCit.getExecutionDetails()).getCardInfo().getType());
+            assertNotNull(((PayInExecutionDetailsDirect)createdCit.getExecutionDetails()).getCardInfo().getIssuingBank());
+            assertNotNull(((PayInExecutionDetailsDirect)createdCit.getExecutionDetails()).getCardInfo().getBin());
 
             RecurringPayInMIT mit = new RecurringPayInMIT();
             mit.setRecurringPayInRegistrationId(result.getId());
@@ -1027,11 +1027,11 @@ public void testCreateRecurringPaymentMITCheckCardInfo() {
             mit.setTag("custom meta");
             RecurringPayIn createdMit = this.api.getPayInApi().createRecurringPayInMIT(null, mit);
 
-            assertNotNull(createdMit.getCardInfo());
-            assertNotNull(createdMit.getCardInfo().getBrand());
-            assertNotNull(createdMit.getCardInfo().getType());
-            assertNotNull(createdMit.getCardInfo().getIssuingBank());
-            assertNotNull(createdMit.getCardInfo().getBin());
+            assertNotNull(((PayInExecutionDetailsDirect)createdMit.getExecutionDetails()).getCardInfo());
+            assertNotNull(((PayInExecutionDetailsDirect)createdMit.getExecutionDetails()).getCardInfo().getBrand());
+            assertNotNull(((PayInExecutionDetailsDirect)createdMit.getExecutionDetails()).getCardInfo().getType());
+            assertNotNull(((PayInExecutionDetailsDirect)createdMit.getExecutionDetails()).getCardInfo().getIssuingBank());
+            assertNotNull(((PayInExecutionDetailsDirect)createdMit.getExecutionDetails()).getCardInfo().getBin());
         } catch (Exception e) {
             fail(e.getMessage());
         }