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
Showing with 152 additions and 151 deletions
+152 -151
......@@ -7,7 +7,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class License {
private Integer id;
private Long id;
private String plan;
private Date createdAt;
private Date startsAt;
......@@ -20,11 +20,11 @@ public class License {
private Map<String, String> licensee;
private Map<String, Integer> addOns;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -4,16 +4,16 @@ import org.gitlab4j.api.utils.JacksonJson;
public class Membership {
private Integer sourceId;
private Long sourceId;
private String sourceName;
private MembershipSourceType sourceType;
private AccessLevel accessLevel;
public Integer getSourceId() {
public Long getSourceId() {
return sourceId;
}
public void setSourceId(Integer sourceId) {
public void setSourceId(Long sourceId) {
this.sourceId = sourceId;
}
......
......@@ -28,8 +28,8 @@ public class MergeRequest {
private Integer downvotes;
private Boolean forceRemoveSourceBranch;
private Boolean hasConflicts;
private Integer id;
private Integer iid;
private Long id;
private Long iid;
private List<String> labels;
private Date latestBuildFinishedAt;
private Date latestBuildStartedAt;
......@@ -42,16 +42,16 @@ public class MergeRequest {
private String mergeError;
private Milestone milestone;
private Pipeline pipeline;
private Integer projectId;
private Long projectId;
private String sha;
private Boolean shouldRemoveSourceBranch;
private String sourceBranch;
private Integer sourceProjectId;
private Long sourceProjectId;
private Boolean squash;
private String state;
private Boolean subscribed;
private String targetBranch;
private Integer targetProjectId;
private Long targetProjectId;
private TaskCompletionStatus taskCompletionStatus;
private References references;
private TimeStats timeStats;
......@@ -208,19 +208,19 @@ public class MergeRequest {
this.hasConflicts = hasConflicts;
}
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
public Integer getIid() {
public Long getIid() {
return iid;
}
public void setIid(Integer iid) {
public void setIid(Long iid) {
this.iid = iid;
}
......@@ -320,11 +320,11 @@ public class MergeRequest {
this.pipeline = pipeline;
}
public Integer getProjectId() {
public Long getProjectId() {
return projectId;
}
public void setProjectId(Integer projectId) {
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
......@@ -352,11 +352,11 @@ public class MergeRequest {
this.sourceBranch = sourceBranch;
}
public Integer getSourceProjectId() {
public Long getSourceProjectId() {
return sourceProjectId;
}
public void setSourceProjectId(Integer sourceProjectId) {
public void setSourceProjectId(Long sourceProjectId) {
this.sourceProjectId = sourceProjectId;
}
......@@ -392,11 +392,11 @@ public class MergeRequest {
this.targetBranch = targetBranch;
}
public Integer getTargetProjectId() {
public Long getTargetProjectId() {
return targetProjectId;
}
public void setTargetProjectId(Integer targetProjectId) {
public void setTargetProjectId(Long targetProjectId) {
this.targetProjectId = targetProjectId;
}
......
......@@ -7,22 +7,22 @@ import org.gitlab4j.api.utils.JacksonJson;
public class MergeRequestDiff {
private Integer id;
private Long id;
private String headCommitSha;
private String baseCommitSha;
private String startCommitSha;
private Date createdAt;
private Integer mergeRequestId;
private Long mergeRequestId;
private String state;
private String realSize;
private List<Commit> commits;
private List<Diff> diffs;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......@@ -58,11 +58,11 @@ public class MergeRequestDiff {
this.createdAt = createdAt;
}
public Integer getMergeRequestId() {
public Long getMergeRequestId() {
return mergeRequestId;
}
public void setMergeRequestId(Integer mergeRequestId) {
public void setMergeRequestId(Long mergeRequestId) {
this.mergeRequestId = mergeRequestId;
}
......
......@@ -21,8 +21,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
*/
public class MergeRequestFilter {
private Integer projectId;
private List<Integer> iids;
private Long projectId;
private List<Long> iids;
private MergeRequestState state;
private MergeRequestOrderBy orderBy;
private SortOrder sort;
......@@ -38,8 +38,8 @@ public class MergeRequestFilter {
/**
* Filter MR by created by the given user id. Combine with scope=all or scope=assigned_to_me
*/
private Integer authorId;
private Integer assigneeId;
private Long authorId;
private Long assigneeId;
private String myReactionEmoji;
private String sourceBranch;
private String targetBranch;
......@@ -47,28 +47,28 @@ public class MergeRequestFilter {
private MergeRequestSearchIn in;
private Boolean wip;
public Integer getProjectId() {
public Long getProjectId() {
return projectId;
}
public void setProjectId(Integer projectId) {
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
public MergeRequestFilter withProjectId(Integer projectId) {
public MergeRequestFilter withProjectId(Long projectId) {
this.projectId = projectId;
return (this);
}
public List<Integer> getIids() {
public List<Long> getIids() {
return iids;
}
public void setIids(List<Integer> iids) {
public void setIids(List<Long> iids) {
this.iids = iids;
}
public MergeRequestFilter withIids(List<Integer> iids) {
public MergeRequestFilter withIids(List<Long> iids) {
this.iids = iids;
return (this);
}
......@@ -216,28 +216,28 @@ public class MergeRequestFilter {
return (this);
}
public Integer getAuthorId() {
public Long getAuthorId() {
return authorId;
}
public void setAuthorId(Integer authorId) {
public void setAuthorId(Long authorId) {
this.authorId = authorId;
}
public MergeRequestFilter withAuthorId(Integer authorId) {
public MergeRequestFilter withAuthorId(Long authorId) {
this.authorId = authorId;
return (this);
}
public Integer getAssigneeId() {
public Long getAssigneeId() {
return assigneeId;
}
public void setAssigneeId(Integer assigneeId) {
public void setAssigneeId(Long assigneeId) {
this.assigneeId = assigneeId;
}
public MergeRequestFilter withAssigneeId(Integer assigneeId) {
public MergeRequestFilter withAssigneeId(Long assigneeId) {
this.assigneeId = assigneeId;
return (this);
}
......@@ -293,7 +293,7 @@ public class MergeRequestFilter {
this.search = search;
return (this);
}
public MergeRequestSearchIn getIn() {
return in;
}
......
......@@ -14,13 +14,13 @@ public class MergeRequestParams {
private String sourceBranch;
private String targetBranch;
private String title;
private Integer assigneeId;
private List<Integer> assigneeIds;
private List<Integer> reviewerIds;
private Integer milestoneId;
private Long assigneeId;
private List<Long> assigneeIds;
private List<Long> reviewerIds;
private Long milestoneId;
private List<String> labels;
private String description;
private Integer targetProjectId;
private Long targetProjectId;
private StateEvent stateEvent;
private Boolean removeSourceBranch;
private Boolean squash;
......@@ -67,7 +67,7 @@ public class MergeRequestParams {
* @param assigneeId the assigneeId to set
* @return the reference to this MergeRequestParams instance
*/
public MergeRequestParams withAssigneeId(Integer assigneeId) {
public MergeRequestParams withAssigneeId(Long assigneeId) {
this.assigneeId = assigneeId;
return (this);
}
......@@ -79,7 +79,7 @@ public class MergeRequestParams {
* @param assigneeIds the assigneeIds to set
* @return the reference to this MergeRequestParams instance
*/
public MergeRequestParams withAssigneeIds(List<Integer> assigneeIds) {
public MergeRequestParams withAssigneeIds(List<Long> assigneeIds) {
this.assigneeIds = assigneeIds;
return (this);
}
......@@ -91,7 +91,7 @@ public class MergeRequestParams {
* @param reviewerIds the reviewerIds to set
* @return the reference to this MergeRequestParams instance
*/
public MergeRequestParams withReviewerIds(List<Integer> reviewerIds) {
public MergeRequestParams withReviewerIds(List<Long> reviewerIds) {
this.reviewerIds = reviewerIds;
return (this);
}
......@@ -102,7 +102,7 @@ public class MergeRequestParams {
* @param milestoneId the milestoneId to set
* @return the reference to this MergeRequestParams instance
*/
public MergeRequestParams withMilestoneId(Integer milestoneId) {
public MergeRequestParams withMilestoneId(Long milestoneId) {
this.milestoneId = milestoneId;
return (this);
}
......@@ -146,7 +146,7 @@ public class MergeRequestParams {
* @param targetProjectId the targetProjectId to set
* @return the reference to this MergeRequestParams instance
*/
public MergeRequestParams withTargetProjectId(Integer targetProjectId) {
public MergeRequestParams withTargetProjectId(Long targetProjectId) {
this.targetProjectId = targetProjectId;
return (this);
}
......
......@@ -10,10 +10,10 @@ public class Milestone {
private String description;
private Date startDate;
private Date dueDate;
private Integer id;
private Integer iid;
private Integer projectId;
private Integer groupId;
private Long id;
private Long iid;
private Long projectId;
private Long groupId;
private String state;
private String title;
private Date updatedAt;
......@@ -50,35 +50,35 @@ public class Milestone {
this.dueDate = dueDate;
}
public Integer getId() {
public Long getId() {
return this.id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
public Integer getIid() {
public Long getIid() {
return this.iid;
}
public void setIid(Integer iid) {
public void setIid(Long iid) {
this.iid = iid;
}
public Integer getProjectId() {
public Long getProjectId() {
return this.projectId;
}
public void setProjectId(Integer projectId) {
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
public Integer getGroupId() {
public Long getGroupId() {
return groupId;
}
public void setGroupId(Integer groupId) {
public void setGroupId(Long groupId) {
this.groupId = groupId;
}
......
......@@ -4,7 +4,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class Namespace {
private Integer id;
private Long id;
private String name;
private String path;
private String kind;
......@@ -12,11 +12,11 @@ public class Namespace {
private String avatarUrl;
private String webUrl;
public Integer getId() {
public Long getId() {
return this.id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......@@ -52,7 +52,7 @@ public class Namespace {
this.fullPath = fullPath;
}
public Namespace withId(Integer id) {
public Namespace withId(Long id) {
this.id = id;
return this;
}
......
......@@ -83,13 +83,13 @@ public class Note {
private Boolean downvote;
private Date expiresAt;
private String fileName;
private Integer id;
private Integer noteableId;
private Long id;
private Long noteableId;
// Use String for noteableType until the constant is fixed in the GitLab API
private String noteableType;
private Integer noteableIid;
private Long noteableIid;
private Boolean system;
private String title;
private Date updatedAt;
......@@ -158,19 +158,19 @@ public class Note {
this.fileName = fileName;
}
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
public Integer getNoteableId() {
public Long getNoteableId() {
return noteableId;
}
public void setNoteableId(Integer noteableId) {
public void setNoteableId(Long noteableId) {
this.noteableId = noteableId;
}
......@@ -182,11 +182,11 @@ public class Note {
this.noteableType = noteableType;
}
public Integer getNoteableIid() {
public Long getNoteableIid() {
return noteableIid;
}
public void setNoteableIid(Integer noteableIid) {
public void setNoteableIid(Long noteableIid) {
this.noteableIid = noteableIid;
}
......
......@@ -4,16 +4,16 @@ import org.gitlab4j.api.utils.JacksonJson;
public class Package {
private Integer id;
private Long id;
private String name;
private String version;
private PackageType packageType;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -6,27 +6,27 @@ import org.gitlab4j.api.utils.JacksonJson;
public class PackageFile {
private Integer id;
private Integer packageId;
private Long id;
private Long packageId;
private Date created_at;
private String fileName;
private Long size;
private String fileMd5;
private String fileSha1;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
public Integer getPackageId() {
public Long getPackageId() {
return packageId;
}
public void setPackageId(Integer packageId) {
public void setPackageId(Long packageId) {
this.packageId = packageId;
}
......
......@@ -7,7 +7,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class Pipeline {
private Integer id;
private Long id;
private PipelineStatus status;
private String ref;
private String sha;
......@@ -25,11 +25,11 @@ public class Pipeline {
private String webUrl;
private DetailedStatus detailedStatus;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -7,7 +7,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class PipelineSchedule {
private Integer id;
private Long id;
private String description;
private String ref;
private String cron;
......@@ -20,11 +20,11 @@ public class PipelineSchedule {
private Owner owner;
private List<Variable> variables;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -46,13 +46,13 @@ public class Project {
private String avatarUrl;
private Boolean containerRegistryEnabled;
private Date createdAt;
private Integer creatorId;
private Long creatorId;
private String defaultBranch;
private String description;
private Integer forksCount;
private Project forkedFromProject;
private String httpUrlToRepo;
private Integer id;
private Long id;
private Boolean isPublic;
private Boolean issuesEnabled;
private Boolean jobsEnabled;
......@@ -163,11 +163,11 @@ public class Project {
this.createdAt = createdAt;
}
public Integer getCreatorId() {
public Long getCreatorId() {
return creatorId;
}
public void setCreatorId(Integer creatorId) {
public void setCreatorId(Long creatorId) {
this.creatorId = creatorId;
}
......@@ -221,15 +221,15 @@ public class Project {
this.httpUrlToRepo = httpUrlToRepo;
}
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
public Project withId(Integer id) {
public Project withId(Long id) {
this.id = id;
return (this);
}
......@@ -333,7 +333,7 @@ public class Project {
return (this);
}
public Project withNamespaceId(int namespaceId) {
public Project withNamespaceId(long namespaceId) {
this.namespace = new Namespace();
this.namespace.setId(namespaceId);
return (this);
......
......@@ -30,8 +30,8 @@ public class ProjectFilter {
private Boolean wikiChecksumFailed;
private Boolean repositoryChecksumFailed;
private AccessLevel minAccessLevel;
private Integer idAfter;
private Integer idBefore;
private Long idAfter;
private Long idBefore;
private Date lastActivityAfter;
private Date lastActivityBefore;
private String repositoryStorage;
......@@ -44,7 +44,7 @@ public class ProjectFilter {
*/
public ProjectFilter withArchived(Boolean archived) {
this.archived = archived;
return (this);
return (this);
}
/**
......@@ -55,7 +55,7 @@ public class ProjectFilter {
*/
public ProjectFilter withVisibility(Visibility visibility) {
this.visibility = visibility;
return (this);
return (this);
}
/**
......@@ -103,7 +103,7 @@ public class ProjectFilter {
}
/**
* Return only limited fields for each project. This is a no-op without
* Return only limited fields for each project. This is a no-op without
* authentication as then only simple fields are returned.
*
* @param simple if true, return only limited fields for each project
......@@ -160,7 +160,7 @@ public class ProjectFilter {
/**
* Include custom attributes in response (admins only).
*
*
* @param withCustomAttributes if true, include custom attributes in the repsonse
* @return the reference to this ProjectFilter instance
*/
......@@ -233,7 +233,8 @@ public class ProjectFilter {
* @return the reference to this ProjectFilter instance
* @deprecated Replaced by {@link #withMinAccessLevel(AccessLevel) getComponentAt}
*/
public ProjectFilter minAccessLevel(AccessLevel minAccessLevel) {
@Deprecated
public ProjectFilter minAccessLevel(AccessLevel minAccessLevel) {
this.minAccessLevel = minAccessLevel;
return (this);
}
......@@ -255,7 +256,7 @@ public class ProjectFilter {
* @param idAfter limit results to projects with IDs greater than the specified project ID
* @return the reference to this ProjectFilter instance
*/
public ProjectFilter withIdAfter(Integer idAfter) {
public ProjectFilter withIdAfter(Long idAfter) {
this.idAfter = idAfter;
return (this);
}
......@@ -266,7 +267,7 @@ public class ProjectFilter {
* @param idBefore limit results to projects with IDs less than the specified project ID
* @return the reference to this ProjectFilter instance
*/
public ProjectFilter withIdBefore(Integer idBefore) {
public ProjectFilter withIdBefore(Long idBefore) {
this.idBefore = idBefore;
return (this);
}
......
......@@ -10,13 +10,13 @@ public class ProjectHook {
private Boolean buildEvents;
private Date createdAt;
private Boolean enableSslVerification;
private Integer id;
private Long id;
private Boolean issuesEvents;
private Boolean mergeRequestsEvents;
private Boolean noteEvents;
private Boolean jobEvents;
private Boolean pipelineEvents;
private Integer projectId;
private Long projectId;
private Boolean pushEvents;
private Boolean tagPushEvents;
private String url;
......@@ -55,11 +55,11 @@ public class ProjectHook {
this.enableSslVerification = enableSslVerification;
}
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......@@ -103,11 +103,11 @@ public class ProjectHook {
this.pipelineEvents = pipelineEvents;
}
public Integer getProjectId() {
public Long getProjectId() {
return projectId;
}
public void setProjectId(Integer projectId) {
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
......
......@@ -4,16 +4,16 @@ import org.gitlab4j.api.utils.JacksonJson;
public class ProjectSharedGroup {
private Integer groupId;
private Long groupId;
private String groupName;
private String groupFullPath;
private AccessLevel groupAccessLevel;
public int getGroupId() {
public long getGroupId() {
return groupId;
}
public void setGroupId(int groupId) {
public void setGroupId(long groupId) {
this.groupId = groupId;
}
......
......@@ -6,8 +6,8 @@ import org.gitlab4j.api.utils.JacksonJson;
public class PushRules {
private Integer id;
private Integer projectId;
private Long id;
private Long projectId;
private String commitMessageRegex;
private String commitMessageNegativeRegex;
private String branchNameRegex;
......@@ -21,23 +21,23 @@ public class PushRules {
private Boolean commitCommitterCheck;
private Boolean rejectUnsignedCommits;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
public Integer getProjectId() {
public Long getProjectId() {
return projectId;
}
public void setProjectId(Integer projectId) {
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
public PushRules withProjectId(Integer projectId) {
public PushRules withProjectId(Long projectId) {
this.projectId = projectId;
return (this);
}
......@@ -49,7 +49,7 @@ public class PushRules {
public void setCommitMessageRegex(String commitMessageRegex) {
this.commitMessageRegex = commitMessageRegex;
}
public PushRules withCommitMessageRegex(String commitMessageRegex) {
this.commitMessageRegex = commitMessageRegex;
return (this);
......@@ -62,7 +62,7 @@ public class PushRules {
public void setCommitMessageNegativeRegex(String commitMessageNegativeRegex) {
this.commitMessageNegativeRegex = commitMessageNegativeRegex;
}
public PushRules withCommitMessageNegativeRegex(String commitMessageNegativeRegex) {
this.commitMessageNegativeRegex = commitMessageNegativeRegex;
return (this);
......@@ -74,12 +74,12 @@ public class PushRules {
public void setBranchNameRegex(String branchNameRegex) {
this.branchNameRegex = branchNameRegex;
}
public PushRules withBranchNameRegex(String branchNameRegex) {
this.branchNameRegex = branchNameRegex;
return (this);
}
public Boolean getDenyDeleteTag() {
return denyDeleteTag;
}
......@@ -87,12 +87,12 @@ public class PushRules {
public void setDenyDeleteTag(Boolean denyDeleteTag) {
this.denyDeleteTag = denyDeleteTag;
}
public PushRules withDenyDeleteTag(Boolean denyDeleteTag) {
this.denyDeleteTag = denyDeleteTag;
return (this);
}
public Date getCreatedAt() {
return createdAt;
}
......@@ -108,12 +108,12 @@ public class PushRules {
public void setMemberCheck(Boolean memberCheck) {
this.memberCheck = memberCheck;
}
public PushRules withMemberCheck(Boolean memberCheck) {
this.memberCheck = memberCheck;
return (this);
}
public Boolean getPreventSecrets() {
return preventSecrets;
}
......@@ -121,12 +121,12 @@ public class PushRules {
public void setPreventSecrets(Boolean preventSecrets) {
this.preventSecrets = preventSecrets;
}
public PushRules withPreventSecrets(Boolean preventSecrets) {
this.preventSecrets = preventSecrets;
return (this);
}
public String getAuthorEmailRegex() {
return authorEmailRegex;
}
......@@ -134,12 +134,12 @@ public class PushRules {
public void setAuthorEmailRegex(String authorEmailRegex) {
this.authorEmailRegex = authorEmailRegex;
}
public PushRules withAuthorEmailRegex(String authorEmailRegex) {
this.authorEmailRegex = authorEmailRegex;
return (this);
}
public String getFileNameRegex() {
return fileNameRegex;
}
......@@ -147,12 +147,12 @@ public class PushRules {
public void setFileNameRegex(String fileNameRegex) {
this.fileNameRegex = fileNameRegex;
}
public PushRules withFileNameRegex(String fileNameRegex) {
this.fileNameRegex = fileNameRegex;
return (this);
}
public Integer getMaxFileSize() {
return maxFileSize;
}
......@@ -160,7 +160,7 @@ public class PushRules {
public void setMaxFileSize(Integer maxFileSize) {
this.maxFileSize = maxFileSize;
}
public PushRules withMaxFileSize(Integer maxFileSize) {
this.maxFileSize = maxFileSize;
return (this);
......
......@@ -6,17 +6,17 @@ import java.util.Date;
public class RegistryRepository {
private Integer id;
private Long id;
private String name;
private String path;
private String location;
private Date createdAt;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -6,7 +6,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class RemoteMirror {
private Integer id;
private Long id;
private Boolean enabled;
private String lastError;
private Date lastSuccessfulUpdateAt;
......@@ -17,11 +17,11 @@ public class RemoteMirror {
private String updateStatus;
private String url;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
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