Merge branch 'matthewtckr-UnknownEventType'

Author: stephenc

src/main/java/org/zendesk/client/v2/model/events/Event.java

@@ -2,14 +2,16 @@
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 /**
  * @author stephenc
  * @since 05/04/2013 11:53
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type",
+    visible = true, defaultImpl = UnknownEvent.class)
 @JsonSubTypes({
         @JsonSubTypes.Type(value = CommentEvent.class, name = "Comment"),
         @JsonSubTypes.Type(value = VoiceCommentEvent.class, name = "VoiceComment"),
@@ -31,7 +33,7 @@
         @JsonSubTypes.Type(value = OrganizationActivityEvent.class, name = "OrganizationActivity"),
         @JsonSubTypes.Type(value = AgentMacroReferenceEvent.class, name = "AgentMacroReference")
 })
-
+@JsonIgnoreProperties(ignoreUnknown = true)
 public abstract class Event implements Serializable {
 
     private static final long serialVersionUID = 1L;

src/main/java/org/zendesk/client/v2/model/events/UnknownEvent.java

@@ -0,0 +1,26 @@
+package org.zendesk.client.v2.model.events;
+
+public class UnknownEvent extends Event {
+
+    private static final long serialVersionUID = 1L;
+
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("UnknownEvent");
+        sb.append("{id=").append(getId());
+        sb.append(", type=\"").append(getType()).append("\"");
+        sb.append('}');
+        return sb.toString();
+    }
+}

src/test/java/org/zendesk/client/v2/model/EventTest.java

@@ -2,13 +2,15 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 import org.zendesk.client.v2.model.events.AgentMacroReferenceEvent;
 import org.zendesk.client.v2.model.events.AttachmentRedactionEvent;
 import org.zendesk.client.v2.model.events.CommentRedactionEvent;
 import org.zendesk.client.v2.model.events.Event;
 import org.zendesk.client.v2.model.events.OrganizationActivityEvent;
+import org.zendesk.client.v2.model.events.UnknownEvent;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -62,16 +64,26 @@ public void testCommentRedactionEvent() {
     assertEquals( "CommentRedactionEvent{commentId=18974155255}", ev.toString() );
   }
 
-    @Test
-    public void testAgentMacroReferenceEvent() {
-        String json = "{ \"id\": 789, \"type\": \"AgentMacroReference\", \"via\": { \"channel\": \"web\", \"source\": {"
-            + "\"from\": {}, \"to\": {}, \"rel\": null } }, \"macro_title\": \"TheMacroTitle\", \"macro_id\": \"123\" }";
-        Event ev = parseJson( json.getBytes() );
-        assertNotNull(ev);
-        assertEquals(AgentMacroReferenceEvent.class, ev.getClass());
-        assertEquals(new Long(789L), ev.getId());
-        assertEquals(new Long(123L), ((AgentMacroReferenceEvent) ev).getMacroId());
-        assertEquals("TheMacroTitle", ((AgentMacroReferenceEvent) ev).getMacroTitle());
-        assertNotNull(((AgentMacroReferenceEvent) ev).getVia());
-    }
+  @Test
+  public void testAgentMacroReferenceEvent() {
+    String json = "{ \"id\": 789, \"type\": \"AgentMacroReference\", \"via\": { \"channel\": \"web\", \"source\": {"
+        + "\"from\": {}, \"to\": {}, \"rel\": null } }, \"macro_title\": \"TheMacroTitle\", \"macro_id\": \"123\" }";
+    Event ev = parseJson( json.getBytes() );
+    assertNotNull(ev);
+    assertEquals(AgentMacroReferenceEvent.class, ev.getClass());
+    assertEquals(new Long(789L), ev.getId());
+    assertEquals(new Long(123L), ((AgentMacroReferenceEvent) ev).getMacroId());
+    assertEquals("TheMacroTitle", ((AgentMacroReferenceEvent) ev).getMacroTitle());
+    assertNotNull(((AgentMacroReferenceEvent) ev).getVia());
+  }
+
+  @Test
+  public void testUnknownEvent() {
+    String json = "{ \"id\": 123, \"type\": \"NotARealEventType\" }";
+    Event ev = parseJson(json.getBytes());
+    assertNotNull(ev);
+    assertEquals(UnknownEvent.class, ev.getClass());
+    assertEquals("NotARealEventType", ((UnknownEvent) ev).getType());
+    assertTrue(ev.toString().contains("NotARealEventType"));
+  }
 }