fix: deserializer

Justintime50 · Justintime50 · commit 5f4cb0bd0e2a · 2025-02-26T13:49:36.000-07:00
diff --git a/src/main/java/com/easypost/exception/API/BadRequestError.java b/src/main/java/com/easypost/exception/API/BadRequestError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class BadRequestError extends APIException {
     /**
      * BadRequestError constructor.
@@ -12,7 +13,7 @@ public class BadRequestError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public BadRequestError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public BadRequestError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/ForbiddenError.java b/src/main/java/com/easypost/exception/API/ForbiddenError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class ForbiddenError extends APIException {
     /**
      * ForbiddenError constructor.
@@ -12,7 +13,7 @@ public class ForbiddenError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public ForbiddenError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public ForbiddenError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/GatewayTimeoutError.java b/src/main/java/com/easypost/exception/API/GatewayTimeoutError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class GatewayTimeoutError extends APIException {
     /**
      * GatewayTimeoutError constructor.
@@ -12,7 +13,7 @@ public class GatewayTimeoutError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public GatewayTimeoutError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public GatewayTimeoutError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/InternalServerError.java b/src/main/java/com/easypost/exception/API/InternalServerError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class InternalServerError extends APIException {
     /**
      * InternalServerError constructor.
@@ -12,7 +13,7 @@ public class InternalServerError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public InternalServerError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public InternalServerError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/InvalidRequestError.java b/src/main/java/com/easypost/exception/API/InvalidRequestError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class InvalidRequestError extends APIException {
     /**
      * InvalidRequestError constructor.
@@ -12,7 +13,7 @@ public class InvalidRequestError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public InvalidRequestError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public InvalidRequestError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/MethodNotAllowedError.java b/src/main/java/com/easypost/exception/API/MethodNotAllowedError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class MethodNotAllowedError extends APIException {
     /**
      * MethodNotAllowedError constructor.
@@ -12,7 +13,7 @@ public class MethodNotAllowedError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public MethodNotAllowedError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public MethodNotAllowedError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/NotFoundError.java b/src/main/java/com/easypost/exception/API/NotFoundError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class NotFoundError extends APIException {
     /**
      * NotFoundError constructor.
@@ -12,7 +13,7 @@ public class NotFoundError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public NotFoundError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public NotFoundError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/PaymentError.java b/src/main/java/com/easypost/exception/API/PaymentError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class PaymentError extends APIException {
     /**
      * PaymentError constructor.
@@ -12,7 +13,7 @@ public class PaymentError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public PaymentError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public PaymentError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/RateLimitError.java b/src/main/java/com/easypost/exception/API/RateLimitError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class RateLimitError extends APIException {
     /**
      * RateLimitError constructor.
@@ -12,7 +13,7 @@ public class RateLimitError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public RateLimitError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public RateLimitError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/RedirectError.java b/src/main/java/com/easypost/exception/API/RedirectError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class RedirectError extends APIException {
     /**
      * RedirectError constructor.
@@ -12,7 +13,7 @@ public class RedirectError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public RedirectError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public RedirectError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/ServiceUnavailableError.java b/src/main/java/com/easypost/exception/API/ServiceUnavailableError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class ServiceUnavailableError extends APIException {
     /**
      * ServiceUnavailablError constructor.
@@ -12,7 +13,7 @@ public class ServiceUnavailableError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public ServiceUnavailableError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public ServiceUnavailableError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/TimeoutError.java b/src/main/java/com/easypost/exception/API/TimeoutError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class TimeoutError extends APIException {
     /**
      * TimeoutError constructor.
@@ -12,7 +13,7 @@ public class TimeoutError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public TimeoutError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public TimeoutError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/UnauthorizedError.java b/src/main/java/com/easypost/exception/API/UnauthorizedError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class UnauthorizedError extends APIException {
     /**
      * UnauthorizedError constructor.
@@ -12,7 +13,7 @@ public class UnauthorizedError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public UnauthorizedError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public UnauthorizedError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/API/UnknownApiError.java b/src/main/java/com/easypost/exception/API/UnknownApiError.java
@@ -1,8 +1,9 @@
 package com.easypost.exception.API;
 
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.exception.APIException;
 
+import java.util.List;
+
 public class UnknownApiError extends APIException {
     /**
      * UnknownApiError constructor.
@@ -12,7 +13,7 @@ public class UnknownApiError extends APIException {
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public UnknownApiError(final String message, final String code, FieldErrorOrStringList errors, final int statusCode) {
+    public UnknownApiError(final String message, final String code, List<Object> errors, final int statusCode) {
         super(message, code, errors, statusCode);
     }
 }
diff --git a/src/main/java/com/easypost/exception/APIException.java b/src/main/java/com/easypost/exception/APIException.java
@@ -1,21 +1,21 @@
 package com.easypost.exception;
 
-import com.easypost.model.FieldErrorOrStringList;
+import java.util.List;
 
 public class APIException extends EasyPostException {
     private static final long serialVersionUID = 1L;
     private final String code;
     private final Integer statusCode;
     private final String message;
-    private final FieldErrorOrStringList errors;
+    private final List<Object> errors;
 
     /**
      * APIException constructor.
      *
      * @param message the exception message
      */
     public APIException(final String message) {
-        this(message, null);
+        this(message, null, null, null, null);
     }
 
     /**
@@ -35,8 +35,8 @@ public APIException(final String message, final Throwable ex) {
      * @param code       the exception code
      * @param errors     the errors array
      */
-    public APIException(final String message, final String code, final FieldErrorOrStringList errors) {
-        this(message, code, errors, null);
+    public APIException(final String message, final String code, final List<Object> errors) {
+        this(message, code, errors, null, null);
     }
 
     /**
@@ -47,7 +47,7 @@ public APIException(final String message, final String code, final FieldErrorOrS
      * @param errors     the errors array
      * @param statusCode the exception status code
      */
-    public APIException(final String message, final String code, final FieldErrorOrStringList errors, final Integer statusCode) {
+    public APIException(final String message, final String code, final List<Object> errors, final Integer statusCode) {
         this(message, code, errors, statusCode, null);
     }
 
@@ -60,7 +60,7 @@ public APIException(final String message, final String code, final FieldErrorOrS
      * @param statusCode the exception status code
      * @param ex         the exception cause
      */
-    public APIException(final String message, final String code, final FieldErrorOrStringList errors, final Integer statusCode, final Throwable ex) {
+    public APIException(final String message, final String code, final List<Object> errors, final Integer statusCode, final Throwable ex) {
         super(message);
         this.message = message;
         this.code = code;
@@ -101,7 +101,7 @@ public String getMessage() {
      *
      * @return errors of the exception
      */
-    public FieldErrorOrStringList getErrors() {
+    public List<Object> getErrors() {
         return errors;
     }
 }
diff --git a/src/main/java/com/easypost/http/Requestor.java b/src/main/java/com/easypost/http/Requestor.java
@@ -24,7 +24,6 @@
 import com.easypost.hooks.RequestHookResponses;
 import com.easypost.hooks.ResponseHookResponses;
 import com.easypost.model.EasyPostResource;
-import com.easypost.model.FieldErrorOrStringList;
 import com.easypost.service.EasyPostClient;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -646,7 +645,7 @@ protected static void handleAPIError(String rBody, final int rCode)
         APIException error = Constants.Http.GSON.fromJson(rBody, APIException.class);
         String errorMessage = error.getMessage();
         String errorCode = error.getCode();
-        FieldErrorOrStringList errors = error.getErrors();
+        List<Object> errors = error.getErrors();
 
         if (rCode >= Constants.ErrorCodes.REDIRECT_CODE_BEGIN && rCode <= Constants.ErrorCodes.REDIRECT_CODE_END) {
             throw new RedirectError(errorMessage, errorCode, errors, rCode);
diff --git a/src/main/java/com/easypost/model/ErrorDeserializer.java b/src/main/java/com/easypost/model/ErrorDeserializer.java
diff --git a/src/main/java/com/easypost/model/FieldErrorOrString.java b/src/main/java/com/easypost/model/FieldErrorOrString.java
diff --git a/src/main/java/com/easypost/model/FieldErrorOrStringList.java b/src/main/java/com/easypost/model/FieldErrorOrStringList.java
diff --git a/src/test/java/com/easypost/ErrorTest.java b/src/test/java/com/easypost/ErrorTest.java
