Merge pull request #261 from mercadopago/fix/empty-date-for-serializer

Avoid exception when a date field is empty
mercadopago · Aug 15, 2023 · e2b156d · e2b156d
2 parents 0923d52 + 634c275
commit e2b156d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ already.
 <dependency>
     <groupId>com.mercadopago</groupId>
     <artifactId>sdk-java</artifactId>
-    <version>2.1.12</version>
+    <version>2.1.13</version>
 </dependency>
   ```
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.mercadopago</groupId>
     <artifactId>sdk-java</artifactId>
-    <version>2.1.12</version>
+    <version>2.1.13</version>
     <packaging>jar</packaging>
 
     <name>Mercadopago SDK</name>

diff --git a/src/main/java/com/mercadopago/MercadoPagoConfig.java b/src/main/java/com/mercadopago/MercadoPagoConfig.java
@@ -15,7 +15,7 @@
 /** Mercado Pago configuration class. */
 public class MercadoPagoConfig {
 
-  public static final String CURRENT_VERSION = "2.1.12";
+  public static final String CURRENT_VERSION = "2.1.13";
 
   public static final String PRODUCT_ID = "BC32A7VTRPP001U8NHJ0";
 

diff --git a/src/main/java/com/mercadopago/serialization/Serializer.java b/src/main/java/com/mercadopago/serialization/Serializer.java
@@ -49,6 +49,10 @@ public class Serializer {
   private static final String SERIALIZE_DATE_FORMAT_ISO8601 = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
 
   private static OffsetDateTime parseDateTime(JsonElement json) {
+    if (json == null || json.getAsString().isEmpty()) {
+      return null;
+    }
+
     for (int i = 0; i < ISO8601_DATETIME_FORMATTERS.length; i++) {
       try {
         return OffsetDateTime.parse(json.getAsString(), ISO8601_DATETIME_FORMATTERS[i]);

diff --git a/src/test/java/com/mercadopago/client/payment/PaymentClientTest.java b/src/test/java/com/mercadopago/client/payment/PaymentClientTest.java
@@ -576,7 +576,7 @@ private void assertPaymentFields(Payment payment) {
     assertEquals(date, payment.getDateApproved());
     assertEquals(date, payment.getDateLastUpdated());
     assertNull(payment.getDateOfExpiration());
-    assertEquals(date, payment.getMoneyReleaseDate());
+    assertNull(payment.getMoneyReleaseDate());
     assertEquals("regular_payment", payment.getOperationType());
     assertEquals("24", payment.getIssuerId());
     assertEquals("master", payment.getPaymentMethodId());

diff --git a/src/test/java/com/mercadopago/resources/mocks/response/payment/payment_base.json b/src/test/java/com/mercadopago/resources/mocks/response/payment/payment_base.json
@@ -4,7 +4,7 @@
   "date_approved": "2022-01-10T10:10:10.000-00:00",
   "date_last_updated": "2022-01-10T10:10:10.000-00:00",
   "date_of_expiration": null,
-  "money_release_date": "2022-01-10T10:10:10.000-00:00",
+  "money_release_date": "",
   "operation_type": "regular_payment",
   "issuer_id": "24",
   "payment_method_id": "master",