fix user message sending

Author: dehora

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

@@ -58,6 +58,7 @@ public static AdminCollection list()
     public Admin() {
     }
 
+    @JsonIgnore
     public String getReplyType() {
         return getType() + "_reply";
     }

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

@@ -1,6 +1,7 @@
 package io.intercom.api;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -107,6 +108,7 @@ static UserUpdate buildFrom(User user) {
         }
 
         @JsonProperty("type")
+        @JsonInclude(JsonInclude.Include.ALWAYS)
         private final String type = "user";
 
         @JsonProperty("id")
@@ -232,6 +234,7 @@ public Boolean isNewSession() {
     }
 
     @JsonProperty("type")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private final String type = "user";
 
     @JsonProperty("id")
@@ -316,6 +319,7 @@ boolean isUntag() {
         return untag == null ? false : untag;
     }
 
+    @JsonIgnore
     public String getReplyType() {
         return getType() + "_reply";
     }

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

@@ -16,7 +16,7 @@ public class UserMessage extends TypedData {
     private final String type = "user_message";
 
     @JsonProperty("message_type")
-    private final String messageType = "inapp";
+    private String messageType;
 
     @JsonProperty("id")
     private String id;

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

@@ -56,10 +56,11 @@ public void TestUserIncludesId() throws Exception {
         user.setId("5432");
         final String json = mapper.writeValueAsString(user);
         final Map map = mapper.readValue(json, Map.class);
-        assertTrue(map.size() == 3);
+        assertTrue(map.size() == 4);
         assertTrue(map.containsKey("email"));
         assertTrue(map.containsKey("user_id"));
         assertTrue(map.containsKey("id"));
+        assertTrue(map.containsKey("type"));
     }
 
     @Test
@@ -69,9 +70,10 @@ public void TestUserSerdesNullAndNotEmpty() throws Exception {
         user.setUserId("1");
         final String json = mapper.writeValueAsString(user);
         final Map map = mapper.readValue(json, Map.class);
-        assertTrue(map.size() == 2);
+        assertTrue(map.size() == 3);
         assertTrue(map.containsKey("email"));
         assertTrue(map.containsKey("user_id"));
+        assertTrue(map.containsKey("type"));
     }
 
     @Test