add errorCode to InvalidMessageException

ActiveCampaign · Apr 17, 2020 · 8942dc7 · 8942dc7
1 parent b54a830
commit 8942dc7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/main/java/com/wildbit/java/postmark/client/HttpClientHandler.java b/src/main/java/com/wildbit/java/postmark/client/HttpClientHandler.java
@@ -140,7 +140,7 @@ private void validateResponse(HttpClient.ClientResponse response) throws Postmar
                 throw new InvalidAPIKeyException(dataHandler.formatErrorMessage(message));
 
             case 422:
-                throw new InvalidMessageException(dataHandler.formatErrorMessage(message));
+                throw new InvalidMessageException(dataHandler.formatErrorMessage(message), dataHandler.formatErrorCode(message));
 
             case 500:
                 throw new InternalServerException(dataHandler.formatErrorMessage(message));

diff --git a/src/main/java/com/wildbit/java/postmark/client/data/DataHandler.java b/src/main/java/com/wildbit/java/postmark/client/data/DataHandler.java
@@ -70,6 +70,23 @@ public String formatErrorMessage(String data) throws IOException {
         return node.get("Message").textValue();
     }
 
+    /**
+     * Helper for filtering out error code returned by Postmark in case of HTTP status code 422
+     * @param data JSON object as String
+     * @return error code
+     * @throws IOException in case converting String to Object fails
+     */
+    public Integer formatErrorCode(String data) throws IOException {
+        JsonNode node = fromJson(data, JsonNode.class);
+        JsonNode errorCodeNode = node.get("ErrorCode");
+
+        if (errorCodeNode == null || errorCodeNode.isNull()) {
+            return null;
+        }
+
+        return errorCodeNode.intValue();
+    }
+
     /**
      * Sets data mapper to be strict when making conversion of data to objects.
      * If there is a mismatch between object and String in any other case than letter case,

diff --git a/src/main/java/com/wildbit/java/postmark/client/exception/InvalidMessageException.java b/src/main/java/com/wildbit/java/postmark/client/exception/InvalidMessageException.java
@@ -5,8 +5,15 @@
  */
 
 public class InvalidMessageException extends PostmarkException {
-    public InvalidMessageException(String message) {
+    private final Integer errorCode;
+
+    public InvalidMessageException(String message, Integer errorCode) {
         super(message);
+        this.errorCode = errorCode;
+    }
+
+    public Integer getErrorCode() {
+        return errorCode;
     }
 }