Merge pull request #170 from intercom/MM/json_ignore

add ignoreUnknown to all models

Author: mmartinic

.gitignore

@@ -6,6 +6,7 @@ out/*
 *.ipr
 *.iws
 build
+out
 */build/*
 */build/**/*.jar
 *.war

intercom-java/src/main/java/io/intercom/api/Notification.java

@@ -10,7 +10,7 @@
 import java.util.Map;
 
 @SuppressWarnings("UnusedDeclaration")
-@JsonIgnoreProperties({"intercom"})
+@JsonIgnoreProperties(value = {"intercom"}, ignoreUnknown = true)
 public class Notification extends TypedData {
 
     public static Notification readJSON(String json) throws InvalidException {
@@ -200,18 +200,18 @@ public boolean equals(Object o) {
     @Override
     public String toString() {
         return "Notification{" +
-            "type='" + type + '\'' +
-            ", id='" + id + '\'' +
-            ", topic='" + topic + '\'' +
-            ", appID='" + appID + '\'' +
-            ", data=" + data +
-            ", deliveryStatus='" + deliveryStatus + '\'' +
-            ", deliveryAttempts=" + deliveryAttempts +
-            ", deliveredAt=" + deliveredAt +
-            ", firstSentAt=" + firstSentAt +
-            ", createdAt=" + createdAt +
-            ", links=" + links +
-            ", self=" + self +
-            "} " + super.toString();
+                "type='" + type + '\'' +
+                ", id='" + id + '\'' +
+                ", topic='" + topic + '\'' +
+                ", appID='" + appID + '\'' +
+                ", data=" + data +
+                ", deliveryStatus='" + deliveryStatus + '\'' +
+                ", deliveryAttempts=" + deliveryAttempts +
+                ", deliveredAt=" + deliveredAt +
+                ", firstSentAt=" + firstSentAt +
+                ", createdAt=" + createdAt +
+                ", links=" + links +
+                ", self=" + self +
+                "} " + super.toString();
     }
 }

intercom-java/src/main/java/io/intercom/api/Reply.java

@@ -1,7 +1,9 @@
 package io.intercom.api;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 class Reply<T extends Replier> extends TypedData {
 
     @JsonProperty("message_type")

intercom-java/src/main/java/io/intercom/api/ScrollableTypedDataCollection.java

@@ -1,11 +1,13 @@
 package io.intercom.api;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.Lists;
 
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public abstract class ScrollableTypedDataCollection<T extends TypedData> extends TypedData {
 

intercom-java/src/main/java/io/intercom/api/TypedDataCollection.java

@@ -13,7 +13,7 @@
 import java.util.Map;
 
 @SuppressWarnings("UnusedDeclaration")
-@JsonIgnoreProperties({"page"})
+@JsonIgnoreProperties(value={"page"}, ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public abstract class TypedDataCollection<T extends TypedData> extends TypedData {
 

intercom-java/src/test/java/io/intercom/api/NotificationTest.java

@@ -0,0 +1,39 @@
+package io.intercom.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static io.intercom.api.TestSupport.load;
+import static org.junit.Assert.assertEquals;
+
+public class NotificationTest {
+    private static ObjectMapper mapper;
+
+    @BeforeClass
+    public static void beforeClass() {
+        mapper = TestSupport.objectMapper();
+    }
+
+    @Test
+    public void testPayload() throws Exception {
+        String json = load("notification.json");
+        final Notification notification = mapper.readValue(json, Notification.class);
+
+        assertEquals("notif_d9697680-d363-11e7-9ccb-d3a7f70c358c", notification.getId());
+        assertEquals(1511781145L, notification.getCreatedAt());
+        assertEquals("a86dr8yl", notification.getAppID());
+        assertEquals("pending", notification.getDeliveryStatus());
+        assertEquals("user.created", notification.getTopic());
+        assertEquals(1, notification.getDeliveryAttempts());
+        assertEquals(1511781146L, notification.getFirstSentAt());
+
+        final NotificationData notificationData = notification.getData();
+        final Map notificationDataItem = notificationData.getItem();
+        assertEquals("user", notificationDataItem.get("type"));
+        assertEquals("5a1bf31767893985752b4041", notificationDataItem.get("id"));
+        assertEquals("test1234", notificationDataItem.get("user_id"));
+    }
+}

intercom-java/src/test/resources/notification.json

@@ -0,0 +1,72 @@
+{
+    "type" : "notification_event",
+    "app_id" : "a86dr8yl",
+    "data" : {
+        "type" : "notification_event_data",
+        "item" : {
+            "type" : "user",
+            "id" : "5a1bf31767893985752b4041",
+            "user_id" : "test1234",
+            "anonymous" : false,
+            "email" : "[email protected]",
+            "phone" : "1234567890",
+            "name" : "name1",
+            "pseudonym" : null,
+            "avatar" : {
+                "type" : "avatar",
+                "image_url" : "http://example.org/128Wash.jpg"
+            },
+            "app_id" : "a86dr8yl",
+            "companies" : {
+                "type" : "company.list",
+                "companies" : [ ]
+            },
+            "location_data": {
+                "type": "location_data",
+                "city_name": "Dublin",
+                "continent_code": "EU",
+                "country_code": "IRL",
+                "country_name": "Ireland",
+                "latitude": 53.159233,
+                "longitude": -6.723,
+                "postal_code": null,
+                "region_name": "Dublin",
+                "timezone": "Europe/Dublin"
+            },
+            "last_request_at" : "2017-10-17T12:38:46.000Z",
+            "last_seen_ip" : "1.2.3.4",
+            "created_at" : "2017-11-27T11:12:24.000Z",
+            "remote_created_at" : "2017-10-17T12:38:47.000Z",
+            "signed_up_at" : "2017-10-17T12:38:47.000Z",
+            "updated_at" : "2017-11-27T11:12:24.713Z",
+            "session_count" : 0,
+            "social_profiles" : {
+                "type" : "social_profile.list",
+                "social_profiles" : [ ]
+            },
+            "unsubscribed_from_emails" : false,
+            "marked_email_as_spam" : false,
+            "has_hard_bounced" : false,
+            "user_agent_data" : "abc",
+            "tags" : {
+                "type" : "tag.list",
+                "tags" : [ ]
+            },
+            "segments" : {
+                "type" : "segment.list",
+                "segments" : [ ]
+            },
+            "custom_attributes" : { }
+        }
+    },
+    "links" : { },
+    "id" : "notif_d9697680-d363-11e7-9ccb-d3a7f70c358c",
+    "topic" : "user.created",
+    "delivery_status" : "pending",
+    "delivery_attempts" : 1,
+    "delivered_at" : 0,
+    "first_sent_at" : 1511781146,
+    "created_at" : 1511781145,
+    "self" : null,
+    "test_unknown_property" : "1234"
+}