Unverified Commit f237167c authored by Gautier de Saint Martin Lacaze's avatar Gautier de Saint Martin Lacaze
Browse files

Fix #810 : Change all model Ids to Long

parent bdc1f6d3
...@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue; ...@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
public class Runner { public class Runner {
private Integer id; private Long id;
private String description; private String description;
private Boolean active; private Boolean active;
private Boolean isShared; private Boolean isShared;
...@@ -67,11 +67,11 @@ public class Runner { ...@@ -67,11 +67,11 @@ public class Runner {
} }
} }
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
...@@ -132,7 +132,7 @@ public class Runner { ...@@ -132,7 +132,7 @@ public class Runner {
} }
public Runner withId(Integer id) { public Runner withId(Long id) {
this.id = id; this.id = id;
return this; return this;
} }
......
...@@ -7,10 +7,10 @@ public class SearchBlob { ...@@ -7,10 +7,10 @@ public class SearchBlob {
private String basename; private String basename;
private String data; private String data;
private String filename; private String filename;
private Integer id; private Long id;
private String ref; private String ref;
private Integer startline; private Integer startline;
private Integer projectId; private Long projectId;
public String getBasename() { public String getBasename() {
return basename; return basename;
...@@ -36,11 +36,11 @@ public class SearchBlob { ...@@ -36,11 +36,11 @@ public class SearchBlob {
this.filename = filename; this.filename = filename;
} }
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
...@@ -60,11 +60,11 @@ public class SearchBlob { ...@@ -60,11 +60,11 @@ public class SearchBlob {
this.startline = startline; this.startline = startline;
} }
public Integer getProjectId() { public Long getProjectId() {
return projectId; return projectId;
} }
public void setProjectId(Integer projectId) { public void setProjectId(Long projectId) {
this.projectId = projectId; this.projectId = projectId;
} }
......
...@@ -33,7 +33,7 @@ public class Snippet { ...@@ -33,7 +33,7 @@ public class Snippet {
private Date createdAt; private Date createdAt;
private Date expiresAt; private Date expiresAt;
private String fileName; private String fileName;
private Integer id; private Long id;
private String title; private String title;
private String updatedAt; private String updatedAt;
private String webUrl; private String webUrl;
...@@ -89,11 +89,11 @@ public class Snippet { ...@@ -89,11 +89,11 @@ public class Snippet {
this.fileName = fileName; this.fileName = fileName;
} }
public Integer getId() { public Long getId() {
return this.id; return this.id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
......
...@@ -7,19 +7,19 @@ import org.gitlab4j.api.utils.JacksonJson; ...@@ -7,19 +7,19 @@ import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
public class SshKey { public class SshKey {
private Integer id; private Long id;
private String title; private String title;
private String key; private String key;
private Date createdAt; private Date createdAt;
private Integer userId; private Long userId;
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
...@@ -48,11 +48,11 @@ public class SshKey { ...@@ -48,11 +48,11 @@ public class SshKey {
} }
@JsonIgnore @JsonIgnore
public Integer getUserId() { public Long getUserId() {
return userId; return userId;
} }
public void setUserId(Integer userId) { public void setUserId(Long userId) {
this.userId = userId; this.userId = userId;
} }
......
...@@ -6,7 +6,7 @@ import org.gitlab4j.api.utils.JacksonJson; ...@@ -6,7 +6,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class SystemHook { public class SystemHook {
private Integer id; private Long id;
private String url; private String url;
private Date createdAt; private Date createdAt;
private Boolean pushEvents; private Boolean pushEvents;
...@@ -15,11 +15,11 @@ public class SystemHook { ...@@ -15,11 +15,11 @@ public class SystemHook {
private Boolean repositoryUpdateEvents; private Boolean repositoryUpdateEvents;
private Boolean mergeRequestsEvents; private Boolean mergeRequestsEvents;
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
...@@ -79,7 +79,7 @@ public class SystemHook { ...@@ -79,7 +79,7 @@ public class SystemHook {
return mergeRequestsEvents; return mergeRequestsEvents;
} }
public SystemHook withId(Integer id) { public SystemHook withId(Long id) {
this.id = id; this.id = id;
return (this); return (this);
} }
......
...@@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; ...@@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
public class Todo { public class Todo {
private Integer id; private Long id;
private Project project; private Project project;
private Author author; private Author author;
private TodoAction actionName; private TodoAction actionName;
...@@ -33,11 +33,11 @@ public class Todo { ...@@ -33,11 +33,11 @@ public class Todo {
private TodoState state; private TodoState state;
private Date createdAt; private Date createdAt;
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
......
...@@ -4,7 +4,7 @@ import java.util.Date; ...@@ -4,7 +4,7 @@ import java.util.Date;
public class Trigger { public class Trigger {
private Integer id; private Long id;
private String description; private String description;
private Date createdAt; private Date createdAt;
private Date lastUsed; private Date lastUsed;
...@@ -12,11 +12,11 @@ public class Trigger { ...@@ -12,11 +12,11 @@ public class Trigger {
private Date updatedAt; private Date updatedAt;
private User owner; private User owner;
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
......
...@@ -33,7 +33,7 @@ public abstract class NotificationService { ...@@ -33,7 +33,7 @@ public abstract class NotificationService {
public static final String PROJECT_URL_PROP = "project_url"; public static final String PROJECT_URL_PROP = "project_url";
public static final String PUSH_EVENTS_PROP = "push_events"; public static final String PUSH_EVENTS_PROP = "push_events";
private Integer id; private Long id;
private String title; private String title;
private String slug; private String slug;
private Date createdAt; private Date createdAt;
...@@ -56,11 +56,11 @@ public abstract class NotificationService { ...@@ -56,11 +56,11 @@ public abstract class NotificationService {
public abstract GitLabApiForm servicePropertiesForm(); public abstract GitLabApiForm servicePropertiesForm();
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
......
...@@ -15,11 +15,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { ...@@ -15,11 +15,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
private String groupAccess; private String groupAccess;
private String groupName; private String groupName;
private String groupPath; private String groupPath;
private Integer groupId; private Long groupId;
private String userEmail; private String userEmail;
private String userName; private String userName;
private String userUsername; private String userUsername;
private Integer userId; private Long userId;
public Date getCreatedAt() { public Date getCreatedAt() {
return createdAt; return createdAt;
...@@ -37,7 +37,8 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { ...@@ -37,7 +37,8 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
this.updatedAt = updatedAt; this.updatedAt = updatedAt;
} }
public String getEventName() { @Override
public String getEventName() {
return this.eventName; return this.eventName;
} }
...@@ -69,11 +70,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { ...@@ -69,11 +70,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
this.groupPath = groupPath; this.groupPath = groupPath;
} }
public Integer getGroupId() { public Long getGroupId() {
return groupId; return groupId;
} }
public void setGroupId(Integer groupId) { public void setGroupId(Long groupId) {
this.groupId = groupId; this.groupId = groupId;
} }
...@@ -101,11 +102,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { ...@@ -101,11 +102,11 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
this.userUsername = userUsername; this.userUsername = userUsername;
} }
public Integer getUserId() { public Long getUserId() {
return userId; return userId;
} }
public void setUserId(Integer userId) { public void setUserId(Long userId) {
this.userId = userId; this.userId = userId;
} }
......
...@@ -5,18 +5,18 @@ import java.util.Date; ...@@ -5,18 +5,18 @@ import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class GroupSystemHookEvent extends AbstractSystemHookEvent { public class GroupSystemHookEvent extends AbstractSystemHookEvent {
public static final String GROUP_CREATE_EVENT = "group_create"; public static final String GROUP_CREATE_EVENT = "group_create";
public static final String GROUP_DESTROY_EVENT = "group_destroy"; public static final String GROUP_DESTROY_EVENT = "group_destroy";
public static final String GROUP_RENAME_EVENT = "group_rename"; public static final String GROUP_RENAME_EVENT = "group_rename";
private Date createdAt; private Date createdAt;
private Date updatedAt; private Date updatedAt;
private String eventName; private String eventName;
private String name; private String name;
private String path; private String path;
private String fullPath; private String fullPath;
private Integer groupId; private Long groupId;
private String ownerEmail; private String ownerEmail;
private String ownerName; private String ownerName;
private String oldPath; private String oldPath;
...@@ -38,7 +38,8 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent { ...@@ -38,7 +38,8 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent {
this.updatedAt = updatedAt; this.updatedAt = updatedAt;
} }
public String getEventName() { @Override
public String getEventName() {
return this.eventName; return this.eventName;
} }
...@@ -70,11 +71,11 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent { ...@@ -70,11 +71,11 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent {
this.fullPath = fullPath; this.fullPath = fullPath;
} }
public Integer getGroupId() { public Long getGroupId() {
return groupId; return groupId;
} }
public void setGroupId(Integer groupId) { public void setGroupId(Long groupId) {
this.groupId = groupId; this.groupId = groupId;
} }
......
...@@ -14,7 +14,7 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent { ...@@ -14,7 +14,7 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent {
private String eventName; private String eventName;
private String username; private String username;
private String key; private String key;
private Integer id; private Long id;
public Date getCreatedAt() { public Date getCreatedAt() {
return createdAt; return createdAt;
...@@ -56,11 +56,11 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent { ...@@ -56,11 +56,11 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent {
this.key = key; this.key = key;
} }
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
......
...@@ -6,13 +6,13 @@ import org.gitlab4j.api.models.Visibility; ...@@ -6,13 +6,13 @@ import org.gitlab4j.api.models.Visibility;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class ProjectSystemHookEvent extends AbstractSystemHookEvent { public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
public static final String PROJECT_CREATE_EVENT = "project_create"; public static final String PROJECT_CREATE_EVENT = "project_create";
public static final String PROJECT_DESTROY_EVENT = "project_destroy"; public static final String PROJECT_DESTROY_EVENT = "project_destroy";
public static final String PROJECT_RENAME_EVENT = "project_rename"; public static final String PROJECT_RENAME_EVENT = "project_rename";
public static final String PROJECT_TRANSFER_EVENT = "project_transfer"; 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 createdAt;
private Date updatedAt; private Date updatedAt;
private String eventName; private String eventName;
...@@ -20,7 +20,7 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent { ...@@ -20,7 +20,7 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
private String ownerEmail; private String ownerEmail;
private String ownerName; private String ownerName;
private String path; private String path;
private Integer projectId; private Long projectId;
private String pathWithNamespace; private String pathWithNamespace;
private Visibility projectVisibility; private Visibility projectVisibility;
private String oldPathWithNamespace; private String oldPathWithNamespace;
...@@ -41,7 +41,8 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent { ...@@ -41,7 +41,8 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
this.updatedAt = updatedAt; this.updatedAt = updatedAt;
} }
public String getEventName() { @Override
public String getEventName() {
return this.eventName; return this.eventName;
} }
...@@ -81,11 +82,11 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent { ...@@ -81,11 +82,11 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
this.path = path; this.path = path;
} }
public Integer getProjectId() { public Long getProjectId() {
return this.projectId; return this.projectId;
} }
public void setProjectId(Integer projectId) { public void setProjectId(Long projectId) {
this.projectId = projectId; this.projectId = projectId;
} }
......
...@@ -10,18 +10,19 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent { ...@@ -10,18 +10,19 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent {
public static final String REPOSITORY_UPDATE_EVENT = "repository_update"; public static final String REPOSITORY_UPDATE_EVENT = "repository_update";
private String eventName; private String eventName;
private Integer userId; private Long userId;
private String userName; private String userName;
private String userEmail; private String userEmail;
private String userAvatar; private String userAvatar;
private Integer projectId; private Long projectId;
private EventProject project; private EventProject project;
private List<RepositoryChange> changes; private List<RepositoryChange> changes;
private List<String> refs; private List<String> refs;
public String getEventName() { @Override
public String getEventName() {
return (eventName); return (eventName);
} }
...@@ -29,11 +30,11 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent { ...@@ -29,11 +30,11 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent {
this.eventName = eventName; this.eventName = eventName;
} }
public Integer getUserId() { public Long getUserId() {
return this.userId; return this.userId;
} }
public void setUserId(Integer userId) { public void setUserId(Long userId) {
this.userId = userId; this.userId = userId;
} }
...@@ -61,11 +62,11 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent { ...@@ -61,11 +62,11 @@ public class RepositorySystemHookEvent extends AbstractSystemHookEvent {
this.userAvatar = userAvatar; this.userAvatar = userAvatar;
} }
public Integer getProjectId() { public Long getProjectId() {
return this.projectId; return this.projectId;
} }
public void setProjectId(Integer projectId) { public void setProjectId(Long projectId) {
this.projectId = projectId; this.projectId = projectId;
} }
......
...@@ -6,22 +6,22 @@ import org.gitlab4j.api.models.Visibility; ...@@ -6,22 +6,22 @@ import org.gitlab4j.api.models.Visibility;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
public static final String NEW_TEAM_MEMBER_EVENT = "user_add_to_team"; public static final String NEW_TEAM_MEMBER_EVENT = "user_add_to_team";
public static final String TEAM_MEMBER_REMOVED_EVENT = "user_remove_from_team"; public static final String TEAM_MEMBER_REMOVED_EVENT = "user_remove_from_team";
private Date createdAt; private Date createdAt;
private Date updatedAt; private Date updatedAt;
private String eventName; private String eventName;
private String projectAccess; private String projectAccess;
private String projectName; private String projectName;
private String projectPath; private String projectPath;
private Integer projectId; private Long projectId;
private String projectPathWithNamespace; private String projectPathWithNamespace;
private String userEmail; private String userEmail;
private String userName; private String userName;
private String userUsername; private String userUsername;
private Integer userId; private Long userId;
private Visibility projectVisibility; private Visibility projectVisibility;
public Date getCreatedAt() { public Date getCreatedAt() {
...@@ -40,7 +40,8 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { ...@@ -40,7 +40,8 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
this.updatedAt = updatedAt; this.updatedAt = updatedAt;
} }
public String getEventName() { @Override
public String getEventName() {
return this.eventName; return this.eventName;
} }
...@@ -72,11 +73,11 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { ...@@ -72,11 +73,11 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
this.projectPath = projectPath; this.projectPath = projectPath;
} }
public Integer getProjectId() { public Long getProjectId() {
return projectId; return projectId;
} }
public void setProjectId(Integer projectId) { public void setProjectId(Long projectId) {
this.projectId = projectId; this.projectId = projectId;
} }
...@@ -112,11 +113,11 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { ...@@ -112,11 +113,11 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
this.userUsername = userUsername; this.userUsername = userUsername;
} }
public Integer getUserId() { public Long getUserId() {
return userId; return userId;
} }
public void setUserId(Integer userId) { public void setUserId(Long userId) {
this.userId = userId; this.userId = userId;
} }
......
...@@ -5,7 +5,7 @@ import java.util.Date; ...@@ -5,7 +5,7 @@ import java.util.Date;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
public class UserSystemHookEvent extends AbstractSystemHookEvent { public class UserSystemHookEvent extends AbstractSystemHookEvent {
public static final String USER_CREATE_EVENT = "user_create"; public static final String USER_CREATE_EVENT = "user_create";
public static final String USER_DESTROY_EVENT = "user_destroy"; public static final String USER_DESTROY_EVENT = "user_destroy";
public static final String USER_RENAME_EVENT = "user_rename"; public static final String USER_RENAME_EVENT = "user_rename";
...@@ -17,11 +17,12 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { ...@@ -17,11 +17,12 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
private String email; private String email;
private String name; private String name;
private String username; private String username;
private Integer userId; private Long userId;
private String oldUsername; private String oldUsername;
private String state; private String state;
public String getEventName() { @Override
public String getEventName() {
return this.eventName; return this.eventName;
} }
...@@ -69,11 +70,11 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent { ...@@ -69,11 +70,11 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
this.username = username; this.username = username;
} }
public Integer getUserId() { public Long getUserId() {
return userId; return userId;
} }
public void setUserId(Integer userId) { public void setUserId(Long userId) {
this.userId = userId; this.userId = userId;
} }
......
...@@ -13,13 +13,13 @@ public abstract class AbstractPushEvent { ...@@ -13,13 +13,13 @@ public abstract class AbstractPushEvent {
private String ref; private String ref;
private String checkoutSha; private String checkoutSha;
private Integer userId; private Long userId;
private String userName; private String userName;
private String userUsername; private String userUsername;
private String userEmail; private String userEmail;
private String userAvatar; private String userAvatar;
private Integer projectId; private Long projectId;
private EventProject project; private EventProject project;
private EventRepository repository; private EventRepository repository;
private List<EventCommit> commits; private List<EventCommit> commits;
...@@ -69,11 +69,11 @@ public abstract class AbstractPushEvent { ...@@ -69,11 +69,11 @@ public abstract class AbstractPushEvent {
this.checkoutSha = checkoutSha; this.checkoutSha = checkoutSha;
} }
public Integer getUserId() { public Long getUserId() {
return userId; return userId;
} }
public void setUserId(Integer userId) { public void setUserId(Long userId) {
this.userId = userId; this.userId = userId;
} }
...@@ -109,11 +109,11 @@ public abstract class AbstractPushEvent { ...@@ -109,11 +109,11 @@ public abstract class AbstractPushEvent {
this.userAvatar = userAvatar; this.userAvatar = userAvatar;
} }
public Integer getProjectId() { public Long getProjectId() {
return projectId; return projectId;
} }
public void setProjectId(Integer projectId) { public void setProjectId(Long projectId) {
this.projectId = projectId; this.projectId = projectId;
} }
...@@ -179,7 +179,7 @@ public abstract class AbstractPushEvent { ...@@ -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/". * 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 * @return the branch name from the ref
*/ */
@JsonIgnore @JsonIgnore
......
...@@ -6,7 +6,7 @@ import org.gitlab4j.api.utils.JacksonJson; ...@@ -6,7 +6,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class BuildCommit { public class BuildCommit {
private Integer id; private Long id;
private String sha; private String sha;
private String message; private String message;
private String authorName; private String authorName;
...@@ -17,11 +17,11 @@ public class BuildCommit { ...@@ -17,11 +17,11 @@ public class BuildCommit {
private Date startedAt; private Date startedAt;
private Date finishedAt; private Date finishedAt;
public Integer getId() { public Long getId() {
return id; return id;
} }
public void setId(Integer id) { public void setId(Long id) {
this.id = id; this.id = id;
} }
......
...@@ -18,7 +18,7 @@ public class BuildEvent extends AbstractEvent { ...@@ -18,7 +18,7 @@ public class BuildEvent extends AbstractEvent {
private Boolean tag; private Boolean tag;
private String beforeSha; private String beforeSha;
private String sha; private String sha;
private Integer buildId; private Long buildId;
private String buildName; private String buildName;
private String buildStage; private String buildStage;
private String buildStatus; private String buildStatus;
...@@ -27,13 +27,14 @@ public class BuildEvent extends AbstractEvent { ...@@ -27,13 +27,14 @@ public class BuildEvent extends AbstractEvent {
private Float buildDuration; private Float buildDuration;
private Boolean buildAllowFailure; private Boolean buildAllowFailure;
private String buildFailureReason; private String buildFailureReason;
private Integer projectId; private Long projectId;
private String projectName; private String projectName;
private User user; private User user;
private BuildCommit commit; private BuildCommit commit;
private EventRepository repository; private EventRepository repository;
public String getObjectKind() { @Override
public String getObjectKind() {
return (OBJECT_KIND); return (OBJECT_KIND);
} }
...@@ -74,11 +75,11 @@ public class BuildEvent extends AbstractEvent { ...@@ -74,11 +75,11 @@ public class BuildEvent extends AbstractEvent {
this.sha = sha; this.sha = sha;
} }
public Integer getBuildId() { public Long getBuildId() {
return buildId; return buildId;
} }
public void setBuildId(Integer buildId) { public void setBuildId(Long buildId) {
this.buildId = buildId; this.buildId = buildId;
} }
...@@ -146,11 +147,11 @@ public class BuildEvent extends AbstractEvent { ...@@ -146,11 +147,11 @@ public class BuildEvent extends AbstractEvent {
this.buildFailureReason = buildFailureReason; this.buildFailureReason = buildFailureReason;
} }
public Integer getProjectId() { public Long getProjectId() {
return projectId; return projectId;
} }
public void setProjectId(Integer projectId) { public void setProjectId(Long projectId) {
this.projectId = projectId; this.projectId = projectId;
} }
......
...@@ -10,7 +10,7 @@ public class DeploymentEvent extends AbstractEvent { ...@@ -10,7 +10,7 @@ public class DeploymentEvent extends AbstractEvent {
private String status; private String status;
private String statusChangedAt; private String statusChangedAt;
private Integer deployableId; private Long deployableId;
private String deployableUrl; private String deployableUrl;
private String environment; private String environment;
private EventProject project; private EventProject project;
...@@ -20,7 +20,8 @@ public class DeploymentEvent extends AbstractEvent { ...@@ -20,7 +20,8 @@ public class DeploymentEvent extends AbstractEvent {
private String commitUrl; private String commitUrl;
private String commitTitle; private String commitTitle;
public String getObjectKind() { @Override
public String getObjectKind() {
return (OBJECT_KIND); return (OBJECT_KIND);
} }
...@@ -45,11 +46,11 @@ public class DeploymentEvent extends AbstractEvent { ...@@ -45,11 +46,11 @@ public class DeploymentEvent extends AbstractEvent {
this.statusChangedAt = statusChangedAt; this.statusChangedAt = statusChangedAt;
} }
public Integer getDeployableId() { public Long getDeployableId() {
return deployableId; return deployableId;
} }
public void setDeployableId(Integer deployableId) { public void setDeployableId(Long deployableId) {
this.deployableId = deployableId; this.deployableId = deployableId;
} }
......
...@@ -12,24 +12,24 @@ import org.gitlab4j.api.utils.JacksonJson; ...@@ -12,24 +12,24 @@ import org.gitlab4j.api.utils.JacksonJson;
public abstract class EventChanges { public abstract class EventChanges {
private ChangeContainer<Integer> authorId; private ChangeContainer<Long> authorId;
private ChangeContainer<Date> createdAt; private ChangeContainer<Date> createdAt;
private ChangeContainer<Date> updatedAt; private ChangeContainer<Date> updatedAt;
private ChangeContainer<Integer> updatedById; private ChangeContainer<Long> updatedById;
private ChangeContainer<String> title; private ChangeContainer<String> title;
private ChangeContainer<String> description; private ChangeContainer<String> description;
private ChangeContainer<String> state; private ChangeContainer<String> state;
private ChangeContainer<Integer> milestoneId; private ChangeContainer<Long> milestoneId;
private ChangeContainer<List<EventLabel>> labels; private ChangeContainer<List<EventLabel>> labels;
private ChangeContainer<List<Assignee>> assignees; private ChangeContainer<List<Assignee>> assignees;
private ChangeContainer<Integer> totalTimeSpent; private ChangeContainer<Integer> totalTimeSpent;
private Map<String, ChangeContainer<Object>> otherProperties = new LinkedHashMap<>(); private Map<String, ChangeContainer<Object>> otherProperties = new LinkedHashMap<>();
public ChangeContainer<Integer> getAuthorId() { public ChangeContainer<Long> getAuthorId() {
return authorId; return authorId;
} }
public void setAuthorId(ChangeContainer<Integer> authorId) { public void setAuthorId(ChangeContainer<Long> authorId) {
this.authorId = authorId; this.authorId = authorId;
} }
...@@ -49,11 +49,11 @@ public abstract class EventChanges { ...@@ -49,11 +49,11 @@ public abstract class EventChanges {
this.updatedAt = updatedAt; this.updatedAt = updatedAt;
} }
public ChangeContainer<Integer> getUpdatedById() { public ChangeContainer<Long> getUpdatedById() {
return updatedById; return updatedById;
} }
public void setUpdatedById(ChangeContainer<Integer> updatedById) { public void setUpdatedById(ChangeContainer<Long> updatedById) {
this.updatedById = updatedById; this.updatedById = updatedById;
} }
...@@ -81,11 +81,11 @@ public abstract class EventChanges { ...@@ -81,11 +81,11 @@ public abstract class EventChanges {
this.state = state; this.state = state;
} }
public ChangeContainer<Integer> getMilestoneId() { public ChangeContainer<Long> getMilestoneId() {
return milestoneId; return milestoneId;
} }
public void setMilestoneId(ChangeContainer<Integer> milestoneId) { public void setMilestoneId(ChangeContainer<Long> milestoneId) {
this.milestoneId = milestoneId; this.milestoneId = milestoneId;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment