Switch from Integer to Long for id type. Closes cloudbees-oss#8

stephenc · stephenc · commit 248b9139194f · 2014-06-26T11:29:50.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>com.cloudbees.thirdparty</groupId>
   <artifactId>zendesk-java-client</artifactId>
-  <version>0.0.5-SNAPSHOT</version>
+  <version>0.1.0-SNAPSHOT</version>
 
   <name>zendesk-java-client</name>
   <description>Java client for the ZenDesk API</description>
diff --git a/src/main/java/org/zendesk/client/v2/ZenDesk.java b/src/main/java/org/zendesk/client/v2/ZenDesk.java
diff --git a/src/main/java/org/zendesk/client/v2/model/Audit.java b/src/main/java/org/zendesk/client/v2/model/Audit.java
@@ -12,20 +12,20 @@
  * @since 05/04/2013 10:22
  */
 public class Audit {
-    private Integer id;
-    private Integer ticketId;
+    private Long id;
+    private Long ticketId;
     private Map<String, Object> metadata;
     private Via via;
     private Date createdAt;
-    private Integer authorId;
+    private Long authorId;
     private List<Event> events;
 
     @JsonProperty("author_id")
-    public Integer getAuthorId() {
+    public Long getAuthorId() {
         return authorId;
     }
 
-    public void setAuthorId(Integer authorId) {
+    public void setAuthorId(Long authorId) {
         this.authorId = authorId;
     }
 
@@ -46,11 +46,11 @@ public void setEvents(List<Event> events) {
         this.events = events;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -63,11 +63,11 @@ public void setMetadata(Map<String, Object> metadata) {
     }
 
     @JsonProperty("ticket_id")
-    public Integer getTicketId() {
+    public Long getTicketId() {
         return ticketId;
     }
 
-    public void setTicketId(Integer ticketId) {
+    public void setTicketId(Long ticketId) {
         this.ticketId = ticketId;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/Comment.java b/src/main/java/org/zendesk/client/v2/model/Comment.java
@@ -11,9 +11,9 @@
  * @since 09/04/2013 15:09
  */
 public class Comment {
-    private Integer id;
+    private Long id;
     private String body;
-    private Integer authorId;
+    private Long authorId;
     private List<String> uploads;
     private List<Attachment> attachments;
     private Date createdAt;
@@ -56,11 +56,11 @@ public void setAttachments(List<Attachment> attachments) {
     }
 
     @JsonProperty("author_id")
-    public Integer getAuthorId() {
+    public Long getAuthorId() {
         return authorId;
     }
 
-    public void setAuthorId(Integer authorId) {
+    public void setAuthorId(Long authorId) {
         this.authorId = authorId;
     }
 
@@ -73,11 +73,11 @@ public void setCreatedAt(Date createdAt) {
         this.createdAt = createdAt;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/CustomFieldValue.java b/src/main/java/org/zendesk/client/v2/model/CustomFieldValue.java
@@ -8,14 +8,14 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class CustomFieldValue {
-    private Integer id;
+    private Long id;
     private String value;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/Field.java b/src/main/java/org/zendesk/client/v2/model/Field.java
@@ -10,7 +10,7 @@
  * @since 05/04/2013 12:03
  */
 public class Field {
-    private Integer id;
+    private Long id;
     private String url;
     private String type;
     private String title;
@@ -81,11 +81,11 @@ public void setEditableInPortal(Boolean editableInPortal) {
         this.editableInPortal = editableInPortal;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/Group.java b/src/main/java/org/zendesk/client/v2/model/Group.java
@@ -9,7 +9,7 @@
  * @since 22/04/2013 16:27
  */
 public class Group {
-    private Integer id;
+    private Long id;
     private String url;
     private String name;
     private Boolean deleted;
@@ -19,11 +19,11 @@ public class Group {
     public Group() {
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/Identity.java b/src/main/java/org/zendesk/client/v2/model/Identity.java
@@ -9,7 +9,7 @@
 * @since 09/04/2013 14:37
 */
 public class Identity {
-    private Integer id;
+    private Long id;
     private String url;
     private Integer userId;
     private String type;
@@ -43,11 +43,11 @@ public void setValue(String value) {
         this.value = value;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/Organization.java b/src/main/java/org/zendesk/client/v2/model/Organization.java
@@ -10,15 +10,15 @@
  * @since 22/04/2013 15:38
  */
 public class Organization {
-    private Integer id;
+    private Long id;
     private String externalId;
     private String name;
     private Date createdAt;
     private Date updatedAt;
     private List<String> domainNames;
     private String details;
     private String notes;
-    private Integer groupId;
+    private Long groupId;
     private Boolean sharedTickets;
     private Boolean sharedComments;
     private List<String> tags;
@@ -62,19 +62,19 @@ public void setExternalId(String externalId) {
     }
 
     @JsonProperty("group_id")
-    public Integer getGroupId() {
+    public Long getGroupId() {
         return groupId;
     }
 
-    public void setGroupId(Integer groupId) {
+    public void setGroupId(Long groupId) {
         this.groupId = groupId;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/Photo.java b/src/main/java/org/zendesk/client/v2/model/Photo.java
@@ -9,7 +9,7 @@
  * @since 05/04/2013 15:36
  */
 public class Photo {
-    private Integer id;
+    private Long id;
     private String fileName;
     private String contentUrl;
     private String contentType;
@@ -42,11 +42,11 @@ public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/Request.java b/src/main/java/org/zendesk/client/v2/model/Request.java
@@ -9,14 +9,14 @@
  * @since 09/04/2013 15:08
  */
 public class Request {
-    protected Integer id;
+    protected Long id;
     protected String url;
     protected String subject;
     protected String description;
     protected Status status;
     protected Ticket.Requester requester;
-    protected Integer requesterId;
-    protected Integer organizationId;
+    protected Long requesterId;
+    protected Long organizationId;
     protected Via via;
     protected Date createdAt;
     protected Date updatedAt;
@@ -40,29 +40,29 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
     @JsonProperty("organization_id")
-    public Integer getOrganizationId() {
+    public Long getOrganizationId() {
         return organizationId;
     }
 
-    public void setOrganizationId(Integer organizationId) {
+    public void setOrganizationId(Long organizationId) {
         this.organizationId = organizationId;
     }
 
     @JsonProperty("requester_id")
-    public Integer getRequesterId() {
+    public Long getRequesterId() {
         return requesterId;
     }
 
-    public void setRequesterId(Integer requesterId) {
+    public void setRequesterId(Long requesterId) {
         this.requesterId = requesterId;
         if (requesterId != null) {
             this.requester = null;
diff --git a/src/main/java/org/zendesk/client/v2/model/SatisfactionRating.java b/src/main/java/org/zendesk/client/v2/model/SatisfactionRating.java
@@ -11,23 +11,23 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class SatisfactionRating {
-    private Integer id;
+    private Long id;
     private String url;
-    private Integer assigneeId;
-    private Integer groupId;
-    private Integer requesterId;
-    private Integer ticketId;
+    private Long assigneeId;
+    private Long groupId;
+    private Long requesterId;
+    private Long ticketId;
     private String score;
     private Date createdAt;
     private Date updatedAt;
     private String comment;
 
     @JsonProperty("assignee_id")
-    public Integer getAssigneeId() {
+    public Long getAssigneeId() {
         return assigneeId;
     }
 
-    public void setAssigneeId(Integer assigneeId) {
+    public void setAssigneeId(Long assigneeId) {
         this.assigneeId = assigneeId;
     }
 
@@ -49,28 +49,28 @@ public void setCreatedAt(Date createdAt) {
     }
 
     @JsonProperty("group_id")
-    public Integer getGroupId() {
+    public Long getGroupId() {
         return groupId;
     }
 
-    public void setGroupId(Integer groupId) {
+    public void setGroupId(Long groupId) {
         this.groupId = groupId;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
     @JsonProperty("requester_id")
-    public Integer getRequesterId() {
+    public Long getRequesterId() {
         return requesterId;
     }
 
-    public void setRequesterId(Integer requesterId) {
+    public void setRequesterId(Long requesterId) {
         this.requesterId = requesterId;
     }
 
@@ -83,11 +83,11 @@ public void setScore(String score) {
     }
 
     @JsonProperty("ticket_id")
-    public Integer getTicketId() {
+    public Long getTicketId() {
         return ticketId;
     }
 
-    public void setTicketId(Integer ticketId) {
+    public void setTicketId(Long ticketId) {
         this.ticketId = ticketId;
     }
 
diff --git a/src/main/java/org/zendesk/client/v2/model/Ticket.java b/src/main/java/org/zendesk/client/v2/model/Ticket.java
diff --git a/src/main/java/org/zendesk/client/v2/model/User.java b/src/main/java/org/zendesk/client/v2/model/User.java
diff --git a/src/test/java/org/zendesk/client/v2/RealSmokeTest.java b/src/test/java/org/zendesk/client/v2/RealSmokeTest.java

Original file line number	Diff line number	Diff line change
`@@ -12,20 +12,20 @@`
`12`	`12`	`* @since 05/04/2013 10:22`
`13`	`13`	`*/`
`14`	`14`	`public class Audit {`
`15`		`- private Integer id;`
`16`		`- private Integer ticketId;`
	`15`	`+ private Long id;`
	`16`	`+ private Long ticketId;`
`17`	`17`	`private Map<String, Object> metadata;`
`18`	`18`	`private Via via;`
`19`	`19`	`private Date createdAt;`
`20`		`- private Integer authorId;`
	`20`	`+ private Long authorId;`
`21`	`21`	`private List<Event> events;`
`22`	`22`
`23`	`23`	`@JsonProperty("author_id")`
`24`		`- public Integer getAuthorId() {`
	`24`	`+ public Long getAuthorId() {`
`25`	`25`	`return authorId;`
`26`	`26`	`}`
`27`	`27`
`28`		`- public void setAuthorId(Integer authorId) {`
	`28`	`+ public void setAuthorId(Long authorId) {`
`29`	`29`	`this.authorId = authorId;`
`30`	`30`	`}`
`31`	`31`
`@@ -46,11 +46,11 @@ public void setEvents(List<Event> events) {`
`46`	`46`	`this.events = events;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public Integer getId() {`
	`49`	`+ public Long getId() {`
`50`	`50`	`return id;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public void setId(Integer id) {`
	`53`	`+ public void setId(Long id) {`
`54`	`54`	`this.id = id;`
`55`	`55`	`}`
`56`	`56`
`@@ -63,11 +63,11 @@ public void setMetadata(Map<String, Object> metadata) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@JsonProperty("ticket_id")`
`66`		`- public Integer getTicketId() {`
	`66`	`+ public Long getTicketId() {`
`67`	`67`	`return ticketId;`
`68`	`68`	`}`
`69`	`69`
`70`		`- public void setTicketId(Integer ticketId) {`
	`70`	`+ public void setTicketId(Long ticketId) {`
`71`	`71`	`this.ticketId = ticketId;`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`	`* @since 09/04/2013 15:09`
`12`	`12`	`*/`
`13`	`13`	`public class Comment {`
`14`		`- private Integer id;`
	`14`	`+ private Long id;`
`15`	`15`	`private String body;`
`16`		`- private Integer authorId;`
	`16`	`+ private Long authorId;`
`17`	`17`	`private List<String> uploads;`
`18`	`18`	`private List<Attachment> attachments;`
`19`	`19`	`private Date createdAt;`
`@@ -56,11 +56,11 @@ public void setAttachments(List<Attachment> attachments) {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@JsonProperty("author_id")`
`59`		`- public Integer getAuthorId() {`
	`59`	`+ public Long getAuthorId() {`
`60`	`60`	`return authorId;`
`61`	`61`	`}`
`62`	`62`
`63`		`- public void setAuthorId(Integer authorId) {`
	`63`	`+ public void setAuthorId(Long authorId) {`
`64`	`64`	`this.authorId = authorId;`
`65`	`65`	`}`
`66`	`66`
`@@ -73,11 +73,11 @@ public void setCreatedAt(Date createdAt) {`
`73`	`73`	`this.createdAt = createdAt;`
`74`	`74`	`}`
`75`	`75`
`76`		`- public Integer getId() {`
	`76`	`+ public Long getId() {`
`77`	`77`	`return id;`
`78`	`78`	`}`
`79`	`79`
`80`		`- public void setId(Integer id) {`
	`80`	`+ public void setId(Long id) {`
`81`	`81`	`this.id = id;`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* @since 05/04/2013 12:03`
`11`	`11`	`*/`
`12`	`12`	`public class Field {`
`13`		`- private Integer id;`
	`13`	`+ private Long id;`
`14`	`14`	`private String url;`
`15`	`15`	`private String type;`
`16`	`16`	`private String title;`
`@@ -81,11 +81,11 @@ public void setEditableInPortal(Boolean editableInPortal) {`
`81`	`81`	`this.editableInPortal = editableInPortal;`
`82`	`82`	`}`
`83`	`83`
`84`		`- public Integer getId() {`
	`84`	`+ public Long getId() {`
`85`	`85`	`return id;`
`86`	`86`	`}`
`87`	`87`
`88`		`- public void setId(Integer id) {`
	`88`	`+ public void setId(Long id) {`
`89`	`89`	`this.id = id;`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* @since 22/04/2013 16:27`
`10`	`10`	`*/`
`11`	`11`	`public class Group {`
`12`		`- private Integer id;`
	`12`	`+ private Long id;`
`13`	`13`	`private String url;`
`14`	`14`	`private String name;`
`15`	`15`	`private Boolean deleted;`
`@@ -19,11 +19,11 @@ public class Group {`
`19`	`19`	`public Group() {`
`20`	`20`	`}`
`21`	`21`
`22`		`- public Integer getId() {`
	`22`	`+ public Long getId() {`
`23`	`23`	`return id;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public void setId(Integer id) {`
	`26`	`+ public void setId(Long id) {`
`27`	`27`	`this.id = id;`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* @since 09/04/2013 14:37`
`10`	`10`	`*/`
`11`	`11`	`public class Identity {`
`12`		`- private Integer id;`
	`12`	`+ private Long id;`
`13`	`13`	`private String url;`
`14`	`14`	`private Integer userId;`
`15`	`15`	`private String type;`
`@@ -43,11 +43,11 @@ public void setValue(String value) {`
`43`	`43`	`this.value = value;`
`44`	`44`	`}`
`45`	`45`
`46`		`- public Integer getId() {`
	`46`	`+ public Long getId() {`
`47`	`47`	`return id;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public void setId(Integer id) {`
	`50`	`+ public void setId(Long id) {`
`51`	`51`	`this.id = id;`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* @since 05/04/2013 15:36`
`10`	`10`	`*/`
`11`	`11`	`public class Photo {`
`12`		`- private Integer id;`
	`12`	`+ private Long id;`
`13`	`13`	`private String fileName;`
`14`	`14`	`private String contentUrl;`
`15`	`15`	`private String contentType;`
`@@ -42,11 +42,11 @@ public void setFileName(String fileName) {`
`42`	`42`	`this.fileName = fileName;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public Integer getId() {`
	`45`	`+ public Long getId() {`
`46`	`46`	`return id;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public void setId(Integer id) {`
	`49`	`+ public void setId(Long id) {`
`50`	`50`	`this.id = id;`
`51`	`51`	`}`
`52`	`52`