Merge pull request #811 from gitlab4j/issue-810

Fix #810 : Change all model Ids to Long

src/main/java/org/gitlab4j/api/models/Runner.java

@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
 
 public class Runner {
 
-    private Integer id;
+    private Long id;
     private String description;
     private Boolean active;
     private Boolean isShared;
@@ -67,11 +67,11 @@ public class Runner {
         }
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -132,7 +132,7 @@ public class Runner {
     }
 
 
-    public Runner withId(Integer id) {
+    public Runner withId(Long id) {
         this.id = id;
         return this;
     }

src/main/java/org/gitlab4j/api/models/SearchBlob.java

@@ -7,10 +7,10 @@ public class SearchBlob {
     private String basename;
     private String data;
     private String filename;
-    private Integer id;
+    private Long id;
     private String ref;
     private Integer startline;
-    private Integer projectId;
+    private Long projectId;
 
     public String getBasename() {
         return basename;
@@ -36,11 +36,11 @@ public class SearchBlob {
         this.filename = filename;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -60,11 +60,11 @@ public class SearchBlob {
         this.startline = startline;
     }
 
-    public Integer getProjectId() {
+    public Long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(Integer projectId) {
+    public void setProjectId(Long projectId) {
         this.projectId = projectId;
     }
 

src/main/java/org/gitlab4j/api/models/Snippet.java

@@ -33,7 +33,7 @@ public class Snippet {
     private Date createdAt;
     private Date expiresAt;
     private String fileName;
-    private Integer id;
+    private Long id;
     private String title;
     private String updatedAt;
     private String webUrl;
@@ -89,11 +89,11 @@ public class Snippet {
         this.fileName = fileName;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return this.id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

src/main/java/org/gitlab4j/api/models/SshKey.java

@@ -7,19 +7,19 @@ import org.gitlab4j.api.utils.JacksonJson;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class SshKey {
-    
-    private Integer id;
+
+    private Long id;
     private String title;
     private String key;
     private Date createdAt;
 
-    private Integer userId;
+    private Long userId;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -48,11 +48,11 @@ public class SshKey {
     }
 
     @JsonIgnore
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 

src/main/java/org/gitlab4j/api/models/SystemHook.java

@@ -6,7 +6,7 @@ import org.gitlab4j.api.utils.JacksonJson;
 
 public class SystemHook {
 
-    private Integer id;
+    private Long id;
     private String url;
     private Date createdAt;
     private Boolean pushEvents;
@@ -15,11 +15,11 @@ public class SystemHook {
     private Boolean repositoryUpdateEvents;
     private Boolean mergeRequestsEvents;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -79,7 +79,7 @@ public class SystemHook {
         return mergeRequestsEvents;
     }
 
-    public SystemHook withId(Integer id) {
+    public SystemHook withId(Long id) {
         this.id = id;
         return (this);
     }

src/main/java/org/gitlab4j/api/models/Todo.java

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class Todo {
 
-    private Integer id;
+    private Long id;
     private Project project;
     private Author author;
     private TodoAction actionName;
@@ -33,11 +33,11 @@ public class Todo {
     private TodoState state;
     private Date createdAt;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

src/main/java/org/gitlab4j/api/models/Trigger.java

@@ -4,7 +4,7 @@ import java.util.Date;
 
 public class Trigger {
 
-    private Integer id;
+    private Long id;
     private String description;
     private Date createdAt;
     private Date lastUsed;
@@ -12,11 +12,11 @@ public class Trigger {
     private Date updatedAt;
     private User owner;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

src/main/java/org/gitlab4j/api/services/NotificationService.java

@@ -33,7 +33,7 @@ public abstract class NotificationService {
     public static final String PROJECT_URL_PROP = "project_url";
     public static final String PUSH_EVENTS_PROP = "push_events";
 
-    private Integer id;
+    private Long id;
     private String title;
     private String slug;
     private Date createdAt;
@@ -56,11 +56,11 @@ public abstract class NotificationService {
 
     public abstract GitLabApiForm servicePropertiesForm();
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java

@@ -15,11 +15,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
     private String groupAccess;
     private String groupName;
     private String groupPath;
-    private Integer groupId;
+    private Long groupId;
     private String userEmail;
     private String userName;
     private String userUsername;
-    private Integer userId;
+    private Long userId;
 
     public Date getCreatedAt() {
         return createdAt;
@@ -37,7 +37,8 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
         this.updatedAt = updatedAt;
     }
 
-    public String getEventName() {
+    @Override
+	public String getEventName() {
         return this.eventName;
     }
 
@@ -69,11 +70,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
         this.groupPath = groupPath;
     }
 
-    public Integer getGroupId() {
+    public Long getGroupId() {
         return groupId;
     }
 
-    public void setGroupId(Integer groupId) {
+    public void setGroupId(Long groupId) {
         this.groupId = groupId;
     }
 
@@ -101,11 +102,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
         this.userUsername = userUsername;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 

src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java

@@ -5,18 +5,18 @@ import java.util.Date;
 import org.gitlab4j.api.utils.JacksonJson;
 
 public class GroupSystemHookEvent extends AbstractSystemHookEvent {
-    
+
     public static final String GROUP_CREATE_EVENT = "group_create";
     public static final String GROUP_DESTROY_EVENT = "group_destroy";
     public static final String GROUP_RENAME_EVENT = "group_rename";
-    
+
     private Date createdAt;
     private Date updatedAt;
     private String eventName;
     private String name;
     private String path;
     private String fullPath;
-    private Integer groupId;
+    private Long groupId;
     private String ownerEmail;
     private String ownerName;
     private String oldPath;
@@ -38,7 +38,8 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent {
         this.updatedAt = updatedAt;
     }
 
-    public String getEventName() {
+    @Override
+	public String getEventName() {
         return this.eventName;
     }
 
@@ -70,11 +71,11 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent {
         this.fullPath = fullPath;
     }
 
-    public Integer getGroupId() {
+    public Long getGroupId() {
         return groupId;
     }
 
-    public void setGroupId(Integer groupId) {
+    public void setGroupId(Long groupId) {
         this.groupId = groupId;
     }
 

src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java

@@ -14,7 +14,7 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent {
     private String eventName;
     private String username;
     private String key;
-    private Integer id;
+    private Long id;
 
     public Date getCreatedAt() {
         return createdAt;
@@ -56,11 +56,11 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent {
         this.key = key;
     }
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java

@@ -6,13 +6,13 @@ import org.gitlab4j.api.models.Visibility;
 import org.gitlab4j.api.utils.JacksonJson;
 
 public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
-    
+
     public static final String PROJECT_CREATE_EVENT = "project_create";
     public static final String PROJECT_DESTROY_EVENT = "project_destroy";
     public static final String PROJECT_RENAME_EVENT = "project_rename";
     public static final String PROJECT_TRANSFER_EVENT = "project_transfer";
-    public static final String PROJECT_UPDATE_EVENT = "project_update"; 
-    
+    public static final String PROJECT_UPDATE_EVENT = "project_update";
+
     private Date createdAt;
     private Date updatedAt;
     private String eventName;
@@ -20,7 +20,7 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
     private String ownerEmail;
     private String ownerName;
     private String path;
-    private Integer projectId;
+    private Long projectId;
     private String pathWithNamespace;
     private Visibility projectVisibility;
     private String oldPathWithNamespace;
@@ -41,7 +41,8 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
         this.updatedAt = updatedAt;
     }
 
-    public String getEventName() {
+    @Override
+	public String getEventName() {
         return this.eventName;
     }
 
@@ -81,11 +82,11 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
         this.path = path;
     }
 
-    public Integer getProjectId() {
+    public Long getProjectId() {
         return this.projectId;
     }
 
-    public void setProjectId(Integer projectId) {
+    public void setProjectId(Long projectId) {
         this.projectId = projectId;
     }
 

src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java

@@ -10,18 +10,19 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent {
     public static final String REPOSITORY_UPDATE_EVENT = "repository_update";
 
     private String eventName;
-    private Integer userId;
+    private Long userId;
     private String userName;
     private String userEmail;
     private String userAvatar;
 
-    private Integer projectId;
+    private Long projectId;
     private EventProject project;
 
     private List<RepositoryChange> changes;
     private List<String> refs;
 
-    public String getEventName() {
+    @Override
+	public String getEventName() {
         return (eventName);
     }
 
@@ -29,11 +30,11 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent {
         this.eventName = eventName;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return this.userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
@@ -61,11 +62,11 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent {
         this.userAvatar = userAvatar;
     }
 
-    public Integer getProjectId() {
+    public Long getProjectId() {
         return this.projectId;
     }
 
-    public void setProjectId(Integer projectId) {
+    public void setProjectId(Long projectId) {
         this.projectId = projectId;
     }
 

src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java

@@ -6,22 +6,22 @@ import org.gitlab4j.api.models.Visibility;
 import org.gitlab4j.api.utils.JacksonJson;
 
 public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
-    
+
     public static final String NEW_TEAM_MEMBER_EVENT = "user_add_to_team";
     public static final String TEAM_MEMBER_REMOVED_EVENT = "user_remove_from_team";
-    
+
     private Date createdAt;
     private Date updatedAt;
     private String eventName;
     private String projectAccess;
     private String projectName;
     private String projectPath;
-    private Integer projectId;
+    private Long projectId;
     private String projectPathWithNamespace;
     private String userEmail;
     private String userName;
     private String userUsername;
-    private Integer userId;
+    private Long userId;
     private Visibility projectVisibility;
 
     public Date getCreatedAt() {
@@ -40,7 +40,8 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
         this.updatedAt = updatedAt;
     }
 
-    public String getEventName() {
+    @Override
+	public String getEventName() {
         return this.eventName;
     }
 
@@ -72,11 +73,11 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
         this.projectPath = projectPath;
     }
 
-    public Integer getProjectId() {
+    public Long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(Integer projectId) {
+    public void setProjectId(Long projectId) {
         this.projectId = projectId;
     }
 
@@ -112,11 +113,11 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
         this.userUsername = userUsername;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 

src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java

@@ -5,7 +5,7 @@ import java.util.Date;
 import org.gitlab4j.api.utils.JacksonJson;
 
 public class UserSystemHookEvent extends AbstractSystemHookEvent {
-    
+
     public static final String USER_CREATE_EVENT = "user_create";
     public static final String USER_DESTROY_EVENT = "user_destroy";
     public static final String USER_RENAME_EVENT = "user_rename";
@@ -17,11 +17,12 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
     private String email;
     private String name;
     private String username;
-    private Integer userId;
+    private Long userId;
     private String oldUsername;
     private String state;
 
-    public String getEventName() {
+    @Override
+	public String getEventName() {
         return this.eventName;
     }
 
@@ -69,11 +70,11 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
         this.username = username;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 

src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java

@@ -13,13 +13,13 @@ public abstract class AbstractPushEvent {
     private String ref;
     private String checkoutSha;
 
-    private Integer userId;
+    private Long userId;
     private String userName;
     private String userUsername;
     private String userEmail;
     private String userAvatar;
 
-    private Integer projectId;
+    private Long projectId;
     private EventProject project;
     private EventRepository repository;
     private List<EventCommit> commits;
@@ -69,11 +69,11 @@ public abstract class AbstractPushEvent {
         this.checkoutSha = checkoutSha;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
@@ -109,11 +109,11 @@ public abstract class AbstractPushEvent {
         this.userAvatar = userAvatar;
     }
 
-    public Integer getProjectId() {
+    public Long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(Integer projectId) {
+    public void setProjectId(Long projectId) {
         this.projectId = projectId;
     }
 
@@ -179,7 +179,7 @@ public abstract class AbstractPushEvent {
 
     /**
      * Gets the branch name from the ref. Will return null if the ref does not start with "refs/heads/".
-     * 
+     *
      * @return the branch name from the ref
      */
     @JsonIgnore

src/main/java/org/gitlab4j/api/webhook/BuildCommit.java

@@ -6,7 +6,7 @@ import org.gitlab4j.api.utils.JacksonJson;
 
 public class BuildCommit {
 
-    private Integer id;
+    private Long id;
     private String sha;
     private String message;
     private String authorName;
@@ -17,11 +17,11 @@ public class BuildCommit {
     private Date startedAt;
     private Date finishedAt;
 
-    public Integer getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Long id) {
         this.id = id;
     }
 

src/main/java/org/gitlab4j/api/webhook/BuildEvent.java

@@ -18,7 +18,7 @@ public class BuildEvent extends AbstractEvent {
     private Boolean tag;
     private String beforeSha;
     private String sha;
-    private Integer buildId;
+    private Long buildId;
     private String buildName;
     private String buildStage;
     private String buildStatus;
@@ -27,13 +27,14 @@ public class BuildEvent extends AbstractEvent {
     private Float buildDuration;
     private Boolean buildAllowFailure;
     private String buildFailureReason;
-    private Integer projectId;
+    private Long projectId;
     private String projectName;
     private User user;
     private BuildCommit commit;
     private EventRepository repository;
 
-    public String getObjectKind() {
+    @Override
+	public String getObjectKind() {
         return (OBJECT_KIND);
     }
 
@@ -74,11 +75,11 @@ public class BuildEvent extends AbstractEvent {
         this.sha = sha;
     }
 
-    public Integer getBuildId() {
+    public Long getBuildId() {
         return buildId;
     }
 
-    public void setBuildId(Integer buildId) {
+    public void setBuildId(Long buildId) {
         this.buildId = buildId;
     }
 
@@ -146,11 +147,11 @@ public class BuildEvent extends AbstractEvent {
         this.buildFailureReason = buildFailureReason;
     }
 
-    public Integer getProjectId() {
+    public Long getProjectId() {
         return projectId;
     }
 
-    public void setProjectId(Integer projectId) {
+    public void setProjectId(Long projectId) {
         this.projectId = projectId;
     }
 

src/main/java/org/gitlab4j/api/webhook/DeploymentEvent.java

@@ -10,7 +10,7 @@ public class DeploymentEvent extends AbstractEvent {
 
     private String status;
     private String statusChangedAt;
-    private Integer deployableId;
+    private Long deployableId;
     private String deployableUrl;
     private String environment;
     private EventProject project;
@@ -20,7 +20,8 @@ public class DeploymentEvent extends AbstractEvent {
     private String commitUrl;
     private String commitTitle;
 
-    public String getObjectKind() {
+    @Override
+	public String getObjectKind() {
         return (OBJECT_KIND);
     }
 
@@ -45,11 +46,11 @@ public class DeploymentEvent extends AbstractEvent {
         this.statusChangedAt = statusChangedAt;
     }
 
-    public Integer getDeployableId() {
+    public Long getDeployableId() {
         return deployableId;
     }
 
-    public void setDeployableId(Integer deployableId) {
+    public void setDeployableId(Long deployableId) {
         this.deployableId = deployableId;
     }
 

src/main/java/org/gitlab4j/api/webhook/EventChanges.java

@@ -12,24 +12,24 @@ import org.gitlab4j.api.utils.JacksonJson;
 
 public abstract class EventChanges {
 
-    private ChangeContainer<Integer> authorId;
+    private ChangeContainer<Long> authorId;
     private ChangeContainer<Date> createdAt;
     private ChangeContainer<Date> updatedAt;
-    private ChangeContainer<Integer> updatedById;
+    private ChangeContainer<Long> updatedById;
     private ChangeContainer<String> title;
     private ChangeContainer<String> description;
     private ChangeContainer<String> state;
-    private ChangeContainer<Integer> milestoneId;
+    private ChangeContainer<Long> milestoneId;
     private ChangeContainer<List<EventLabel>> labels;
     private ChangeContainer<List<Assignee>> assignees;
     private ChangeContainer<Integer> totalTimeSpent;
     private Map<String, ChangeContainer<Object>> otherProperties = new LinkedHashMap<>();
 
-    public ChangeContainer<Integer> getAuthorId() {
+    public ChangeContainer<Long> getAuthorId() {
         return authorId;
     }
 
-    public void setAuthorId(ChangeContainer<Integer> authorId) {
+    public void setAuthorId(ChangeContainer<Long> authorId) {
         this.authorId = authorId;
     }
 
@@ -49,11 +49,11 @@ public abstract class EventChanges {
         this.updatedAt = updatedAt;
     }
 
-    public ChangeContainer<Integer> getUpdatedById() {
+    public ChangeContainer<Long> getUpdatedById() {
         return updatedById;
     }
 
-    public void setUpdatedById(ChangeContainer<Integer> updatedById) {
+    public void setUpdatedById(ChangeContainer<Long> updatedById) {
         this.updatedById = updatedById;
     }
 
@@ -81,11 +81,11 @@ public abstract class EventChanges {
         this.state = state;
     }
 
-    public ChangeContainer<Integer> getMilestoneId() {
+    public ChangeContainer<Long> getMilestoneId() {
         return milestoneId;
     }
 
-    public void setMilestoneId(ChangeContainer<Integer> milestoneId) {
+    public void setMilestoneId(ChangeContainer<Long> milestoneId) {
         this.milestoneId = milestoneId;
     }