Merge pull request hellosign#50 from HelloFax/issue-49

Chris Paul · web-flow · commit 005d561c2b52 · 2017-03-07T10:38:31.000-08:00
Add new callback event types.
diff --git a/src/main/java/com/hellosign/sdk/resource/Event.java b/src/main/java/com/hellosign/sdk/resource/Event.java
@@ -33,6 +33,8 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.hellosign.sdk.HelloSignException;
 import com.hellosign.sdk.resource.support.Signature;
@@ -46,6 +48,8 @@
  */
 public class Event extends AbstractResource {
 
+    private static final Logger logger = LoggerFactory.getLogger(Event.class);
+
     public static final String EVENT_KEY = "event";
     public static final String EVENT_METADATA = "event_metadata";
     public static final String REPORTED_FOR_ACCOUNT_ID = "reported_for_account_id";
@@ -70,21 +74,17 @@ public class Event extends AbstractResource {
      */
     public Event(JSONObject json) throws HelloSignException {
         super(json, EVENT_KEY);
-        if (EventType.test.equals(getType())) {
-            return;
-        }
-        if (json.has(SignatureRequest.SIGREQ_KEY)) {
-            try {
-                resource = new SignatureRequest(json.getJSONObject(SignatureRequest.SIGREQ_KEY));
-            } catch (JSONException ex) {
-                throw new HelloSignException(ex);
+        try {
+            if (EventType.test.equals(getType())) {
+                return;
             }
-        } else if (json.has(Template.TEMPLATE_KEY)) {
-            try {
+            if (json.has(SignatureRequest.SIGREQ_KEY)) {
+                resource = new SignatureRequest(json.getJSONObject(SignatureRequest.SIGREQ_KEY));
+            } else if (json.has(Template.TEMPLATE_KEY)) {
                 resource = new Template(json.getJSONObject(Template.TEMPLATE_KEY));
-            } catch (JSONException ex) {
-                throw new HelloSignException(ex);
             }
+        } catch (JSONException ex) {
+            throw new HelloSignException(ex);
         }
     }
 
@@ -277,7 +277,14 @@ public boolean hasTemplate() {
      * @return EventType enum
      */
     public EventType getType() {
-        return EventType.valueOf(getTypeString());
+        String typeStr = getTypeString();
+        EventType type = null;
+        try {
+            type = EventType.valueOf(typeStr);
+        } catch (Exception ex) {
+            logger.warn("Unexpected type: " + typeStr);
+        }
+        return type;
     }
 
     /**
diff --git a/src/main/java/com/hellosign/sdk/resource/support/types/EventType.java b/src/main/java/com/hellosign/sdk/resource/support/types/EventType.java
@@ -25,5 +25,24 @@
  */
 
 public enum EventType {
-    signature_request_viewed, signature_request_signed, signature_request_sent, signature_request_all_signed, signature_request_invalid, signature_request_remind, signature_request_destroyed, signature_request_canceled, signature_request_declined, account_confirmed, template_created, template_error, file_error, test, callback_test, unknown_error, sign_url_invalid, signature_request_email_bounce
+    signature_request_viewed,
+    signature_request_signed,
+    signature_request_sent,
+    signature_request_all_signed,
+    signature_request_invalid,
+    signature_request_remind,
+    signature_request_destroyed,
+    signature_request_canceled,
+    signature_request_declined,
+    account_confirmed,
+    template_created,
+    template_error,
+    file_error,
+    test,
+    callback_test,
+    unknown_error,
+    sign_url_invalid,
+    signature_request_email_bounce,
+    signature_request_downloadable,
+    signature_request_delegated
 }
