Merge pull request #129 from intercom/MM/bulk_users

add data_type for bulk user actions

Author: mmartinic

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

@@ -171,7 +171,7 @@ private <T> T handleSuccess(JavaType javaType, HttpURLConnection conn, int respo
     }
 
     private boolean shouldSkipResponseEntity(JavaType javaType, HttpURLConnection conn, int responseCode) {
-        return responseCode == 202 || responseCode == 204 || Void.class.equals(javaType.getRawClass()) || "DELETE".equals(conn.getRequestMethod());
+        return responseCode == 204 || Void.class.equals(javaType.getRawClass()) || "DELETE".equals(conn.getRequestMethod());
     }
 
     private <T> T readEntity(HttpURLConnection conn, int responseCode, JavaType javaType) throws IOException {

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

@@ -35,15 +35,19 @@ public JobItem() {
     }
 
     public JobItem(String method, T data) {
-        checkNotNull(method, data);
-        this.method = method;
-        this.data = data;
-        this.dataType = data.getType();
+        this(method, data, null);
     }
 
-    private void checkNotNull(String method, T data) {
+    JobItem(String method, T data, String dataType) {
         Conditions.checkNotNull(method, "item method must be supplied");
         Conditions.checkNotNull(data, "item data must be supplied");
+        this.method = method;
+        this.data = data;
+        this.dataType = dataType;
+        if (dataType == null) {
+            this.dataType = data.getType();
+        }
+        Conditions.checkNotNull(data, "item dataType must be supplied");
     }
 
     public String getType() {

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

@@ -120,9 +120,8 @@ static List<JobItem<UserUpdate>> validateAndConvertJobItems(List<JobItem<User>>
             final JobSupport jobSupport = new JobSupport();
             for (JobItem<User> item : items) {
                 jobSupport.validateJobItem(item, BULK_METHODS);
-                updateItems.add(
-                    new JobItem<UserUpdate>(
-                        item.getMethod(), buildFrom(item.getData())));
+                final JobItem<UserUpdate> jobItem = new JobItem<UserUpdate>(item.getMethod(), buildFrom(item.getData()), item.getData().getType());
+                updateItems.add(jobItem);
             }
             return updateItems;
         }