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
......@@ -29,18 +29,18 @@ public class Environment {
}
}
private Integer id;
private Long id;
private String name;
private String slug;
private String externalUrl;
private EnvironmentState state;
private Deployment lastDeployment;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -6,10 +6,10 @@ import java.util.List;
import org.gitlab4j.api.utils.JacksonJson;
public class Epic {
private Integer id;
private Integer iid;
private Integer groupId;
private Long id;
private Long iid;
private Long groupId;
private String title;
private String description;
private Author author;
......@@ -19,27 +19,27 @@ public class Epic {
private Date createdAt;
private Date updatedAt;
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;
}
public Integer getGroupId() {
public Long getGroupId() {
return groupId;
}
public void setGroupId(Integer groupId) {
public void setGroupId(Long groupId) {
this.groupId = groupId;
}
......@@ -50,7 +50,7 @@ public class Epic {
public void setTitle(String title) {
this.title = title;
}
public Epic withTitle(String title) {
this.title = title;
return (this);
......
......@@ -17,22 +17,26 @@ public class EpicIssue extends Issue {
private Map<String, String> links;
private Boolean subscribed;
private Integer epicIssueId;
private Long epicIssueId;
private Integer relativePosition;
public Integer getDownvotes() {
@Override
public Integer getDownvotes() {
return downvotes;
}
public void setDownvotes(Integer downvotes) {
@Override
public void setDownvotes(Integer downvotes) {
this.downvotes = downvotes;
}
public Integer getUpvotes() {
@Override
public Integer getUpvotes() {
return upvotes;
}
public void setUpvotes(Integer upvotes) {
@Override
public void setUpvotes(Integer upvotes) {
this.upvotes = upvotes;
}
......@@ -53,19 +57,21 @@ public class EpicIssue extends Issue {
return (links.get(name));
}
public Boolean getSubscribed() {
@Override
public Boolean getSubscribed() {
return subscribed;
}
public void setSubscribed(Boolean subscribed) {
@Override
public void setSubscribed(Boolean subscribed) {
this.subscribed = subscribed;
}
public Integer getEpicIssueId() {
public Long getEpicIssueId() {
return epicIssueId;
}
public void setEpicIssueId(Integer epicIssueId) {
public void setEpicIssueId(Long epicIssueId) {
this.epicIssueId = epicIssueId;
}
......
......@@ -10,12 +10,12 @@ public class Event {
private String actionName;
private Author author;
private Integer authorId;
private Long authorId;
private String authorUsername;
private EventData data;
private Integer projectId;
private Integer targetId;
private Integer targetIid;
private Long projectId;
private Long targetId;
private Long targetIid;
private String targetTitle;
private TargetType targetType;
private String title;
......@@ -40,11 +40,11 @@ public class Event {
this.author = author;
}
public Integer getAuthorId() {
public Long getAuthorId() {
return authorId;
}
public void setAuthorId(Integer authorId) {
public void setAuthorId(Long authorId) {
this.authorId = authorId;
}
......@@ -64,27 +64,27 @@ public class Event {
this.data = data;
}
public Integer getProjectId() {
public Long getProjectId() {
return projectId;
}
public void setProjectId(Integer projectId) {
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
public Integer getTargetId() {
public Long getTargetId() {
return targetId;
}
public void setTargetId(Integer targetId) {
public void setTargetId(Long targetId) {
this.targetId = targetId;
}
public Integer getTargetIid() {
public Long getTargetIid() {
return targetIid;
}
public void setTargetIid(Integer targetIid) {
public void setTargetIid(Long targetIid) {
this.targetIid = targetIid;
}
......@@ -146,7 +146,7 @@ public class Event {
return this;
}
public Event withAuthorId(Integer authorId) {
public Event withAuthorId(Long authorId) {
this.authorId = authorId;
return this;
}
......@@ -161,17 +161,17 @@ public class Event {
return this;
}
public Event withProjectId(Integer projectId) {
public Event withProjectId(Long projectId) {
this.projectId = projectId;
return this;
}
public Event withTargetId(Integer targetId) {
public Event withTargetId(Long targetId) {
this.targetId = targetId;
return this;
}
public Event withTargetIid(Integer targetIid) {
public Event withTargetIid(Long targetIid) {
this.targetIid = targetIid;
return this;
}
......
......@@ -13,7 +13,7 @@ public class EventData {
private String ref;
private Repository repository;
private Integer totalCommitsCount;
private Integer userId;
private Long userId;
private String userName;
public String getAfter() {
......@@ -64,11 +64,11 @@ public class EventData {
this.totalCommitsCount = totalCommitsCount;
}
public Integer getUserId() {
public Long getUserId() {
return this.userId;
}
public void setUserId(Integer userId) {
public void setUserId(Long userId) {
this.userId = userId;
}
......@@ -111,7 +111,7 @@ public class EventData {
return this;
}
public EventData withUserId(Integer userId) {
public EventData withUserId(Long userId) {
this.userId = userId;
return this;
}
......
......@@ -45,7 +45,7 @@ public class ExportStatus {
}
}
private Integer id;
private Long id;
private String description;
private String name;
private String nameWithNamespace;
......@@ -57,11 +57,11 @@ public class ExportStatus {
@JsonProperty("_links")
private Map<String, String> links;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -4,15 +4,15 @@ import java.util.Date;
public class GpgKey {
private Integer id;
private Long id;
private String key;
private Date created_at;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -4,18 +4,18 @@ import org.gitlab4j.api.utils.JacksonJson;
public class GpgSignature {
private Integer gpgKeyId;
private Long gpgKeyId;
private String gpgKeyPrimaryKeyid;
private String gpgKeyUserName;
private String gpgKeyUserEmail;
private String verificationStatus;
private String gpgKeySubkeyId;
public Integer getGpgKeyId() {
public Long getGpgKeyId() {
return gpgKeyId;
}
public void setGpgKeyId(Integer gpgKeyId) {
public void setGpgKeyId(Long gpgKeyId) {
this.gpgKeyId = gpgKeyId;
}
......
......@@ -49,7 +49,7 @@ public class Group {
}
private Integer id;
private Long id;
private String name;
private String path;
private String description;
......@@ -60,7 +60,7 @@ public class Group {
private Boolean requestAccessEnabled;
private String fullName;
private String fullPath;
private Integer parentId;
private Long parentId;
private Integer sharedRunnersMinutesLimit;
private Statistics statistics;
private List<Project> projects;
......@@ -71,11 +71,11 @@ public class Group {
@JsonSerialize(using = JacksonJson.DateOnlySerializer.class)
private Date markedForDeletionOn;
public Integer getId() {
public Long getId() {
return this.id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......@@ -159,11 +159,11 @@ public class Group {
this.fullPath = fullPath;
}
public Integer getParentId() {
public Long getParentId() {
return parentId;
}
public void setParentId(Integer parentId) {
public void setParentId(Long parentId) {
this.parentId = parentId;
}
......@@ -223,7 +223,7 @@ public class Group {
this.runnersToken = runnersToken;
}
public Group withId(Integer id) {
public Group withId(Long id) {
this.id = id;
return this;
}
......@@ -278,7 +278,7 @@ public class Group {
return this;
}
public Group withParentId(Integer parentId) {
public Group withParentId(Long parentId) {
this.parentId = parentId;
return this;
}
......
......@@ -58,13 +58,13 @@ public class GroupParams {
private Boolean emailsDisabled;
private Boolean lfsEnabled;
private Boolean requestAccessEnabled;
private Integer parentId;
private Long parentId;
private Integer sharedRunnersMinutesLimit;
private Integer extraSharedRunnersMinutesLimit;
private DefaultBranchProtectionLevel defaultBranchProtection;
private Boolean membershipLock;
private Integer fileTemplateProjectId;
private Long fileTemplateProjectId;
/**
* The parent group ID for creating nested group. For create only.
......@@ -72,7 +72,7 @@ public class GroupParams {
* @param parentId the parent group ID for creating nested group
* @return this GroupParms instance
*/
public GroupParams withParentId(Integer parentId) {
public GroupParams withParentId(Long parentId) {
this.parentId = parentId;
return (this);
}
......@@ -94,7 +94,7 @@ public class GroupParams {
* @param fileTemplateProjectId the ID of a project to load custom file templates from
* @return this GroupParms instance
*/
public GroupParams withFileTemplateProjectId(Integer fileTemplateProjectId) {
public GroupParams withFileTemplateProjectId(Long fileTemplateProjectId) {
this.fileTemplateProjectId = fileTemplateProjectId;
return (this);
}
......
......@@ -39,7 +39,7 @@ public class ImpersonationToken {
private List<Scope> scopes;
private Boolean revoked;
private String name;
private Integer id;
private Long id;
private Date createdAt;
private Boolean impersonation;
private Date expiresAt;
......@@ -84,11 +84,11 @@ public class ImpersonationToken {
this.name = name;
}
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -35,7 +35,7 @@ public class ImportStatus {
}
}
private Integer id;
private Long id;
private String description;
private String name;
private String nameWithNamespace;
......@@ -45,11 +45,11 @@ public class ImportStatus {
private Status importStatus;
private String importError;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -9,7 +9,7 @@ import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.node.IntNode;
import com.fasterxml.jackson.databind.node.LongNode;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.databind.node.ValueNode;
......@@ -58,13 +58,13 @@ public class Issue {
@JsonIgnore
private String externalId;
@JsonIgnore
private Integer id;
private Long id;
private Integer iid;
private Integer issueLinkId;
private Long iid;
private Long issueLinkId;
private List<String> labels;
private Milestone milestone;
private Integer projectId;
private Long projectId;
private IssueState state;
private Boolean subscribed;
private String title;
......@@ -145,19 +145,19 @@ public class Issue {
actualId = id;
if (actualId instanceof TextNode) {
externalId = actualId.asText();
} else if (actualId instanceof IntNode) {
this.id = actualId.asInt();
} else if (actualId instanceof LongNode) {
this.id = actualId.asLong();
}
}
public Integer getId() {
public Long getId() {
return (id);
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
if (id != null) {
actualId = new IntNode(id);
actualId = new LongNode(id);
externalId = null;
}
}
......@@ -174,19 +174,19 @@ public class Issue {
}
}
public Integer getIid() {
public Long getIid() {
return iid;
}
public void setIid(Integer iid) {
public void setIid(Long iid) {
this.iid = iid;
}
public Integer getIssueLinkId() {
public Long getIssueLinkId() {
return issueLinkId;
}
public void setIssueLinkId(Integer issueLinkId) {
public void setIssueLinkId(Long issueLinkId) {
this.issueLinkId = issueLinkId;
}
......@@ -206,11 +206,11 @@ public class Issue {
this.milestone = milestone;
}
public Integer getProjectId() {
public Long getProjectId() {
return projectId;
}
public void setProjectId(Integer projectId) {
public void setProjectId(Long projectId) {
this.projectId = projectId;
}
......
......@@ -30,18 +30,18 @@ public class IssueEvent {
}
}
private int id;
private Long id;
private User user;
private String createdAt;
private ResourceType resourceType;
private int resourceId;
private Long resourceId;
private String state;
public int getId() {
public Long getId() {
return id;
}
public void setId(int id) {
public void setId(Long id) {
this.id = id;
}
......@@ -69,11 +69,11 @@ public class IssueEvent {
this.resourceType = resourceType;
}
public int getResourceId() {
public Long getResourceId() {
return resourceId;
}
public void setResourceId(int resourceId) {
public void setResourceId(Long resourceId) {
this.resourceId = resourceId;
}
......
......@@ -44,12 +44,12 @@ public class IssueFilter {
/**
* Return issues created by the given user id.
*/
private Integer authorId;
private Long authorId;
/**
* Return issues assigned to the given user id.
*/
private Integer assigneeId;
private Long assigneeId;
/**
* Return issues reacted by the authenticated user by the given emoji.
......@@ -133,19 +133,19 @@ public class IssueFilter {
this.scope = scope;
}
public Integer getAuthorId() {
public Long getAuthorId() {
return authorId;
}
public void setAuthorId(Integer authorId) {
public void setAuthorId(Long authorId) {
this.authorId = authorId;
}
public Integer getAssigneeId() {
public Long getAssigneeId() {
return assigneeId;
}
public void setAssigneeId(Integer assigneeId) {
public void setAssigneeId(Long assigneeId) {
this.assigneeId = assigneeId;
}
......@@ -239,12 +239,12 @@ public class IssueFilter {
return (this);
}
public IssueFilter withAuthorId(Integer authorId) {
public IssueFilter withAuthorId(Long authorId) {
this.authorId = authorId;
return (this);
}
public IssueFilter withAssigneeId(Integer assigneeId) {
public IssueFilter withAssigneeId(Long assigneeId) {
this.assigneeId = assigneeId;
return (this);
}
......
......@@ -18,24 +18,24 @@ public class IssuesStatisticsFilter {
private List<String> labels;
private String milestone;
private IssueScope scope;
private Integer authorId;
private Integer assigneeId;
private Long authorId;
private Long assigneeId;
private String myReactionEmoji;
private List<Integer> iids;
private List<Long> iids;
private String search;
private String in;
private Date createdAfter;
private Date createdBefore;
private Date updatedAfter;
private Date updatedBefore;
private Date updatedBefore;
private Boolean confidential;
public IssuesStatisticsFilter withLabels(List<String> labels) {
this.labels = labels;
return (this);
}
public IssuesStatisticsFilter withIids(List<Integer> iids) {
public IssuesStatisticsFilter withIids(List<Long> iids) {
this.iids = iids;
return (this);
}
......@@ -50,12 +50,12 @@ public class IssuesStatisticsFilter {
return (this);
}
public IssuesStatisticsFilter withAuthorId(Integer authorId) {
public IssuesStatisticsFilter withAuthorId(Long authorId) {
this.authorId = authorId;
return (this);
}
public IssuesStatisticsFilter withAssigneeId(Integer assigneeId) {
public IssuesStatisticsFilter withAssigneeId(Long assigneeId) {
this.assigneeId = assigneeId;
return (this);
}
......
......@@ -7,7 +7,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class Job {
private Integer id;
private Long id;
private Commit commit;
private String coverage;
private Date createdAt;
......@@ -31,11 +31,11 @@ public class Job {
private Float duration;
private Project project;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......@@ -215,7 +215,7 @@ public class Job {
this.project = project;
}
public Job withId(Integer id) {
public Job withId(Long id) {
this.id = id;
return this;
}
......
......@@ -8,7 +8,7 @@ import org.gitlab4j.api.utils.JacksonJson;
public class Key {
private Date createdAt;
private Integer id;
private Long id;
private String key;
private String title;
private User user;
......@@ -21,11 +21,11 @@ public class Key {
this.createdAt = createdAt;
}
public Integer getId() {
public Long getId() {
return this.id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
public class Label {
private Integer id;
private Long id;
private String name;
private String color;
private String description;
......@@ -17,11 +17,11 @@ public class Label {
private Boolean subscribed;
private Integer priority;
public Integer getId() {
public Long getId() {
return id;
}
public void setId(Integer id) {
public void setId(Long id) {
this.id = id;
}
......
......@@ -32,19 +32,19 @@ public class LabelEvent {
}
}
private int id;
private Long id;
private User user;
private String createdAt;
private ResourceType resourceType;
private int resourceId;
private Long resourceId;
private Label label;
private String action;
public int getId() {
public Long getId() {
return id;
}
public void setId(int id) {
public void setId(Long id) {
this.id = id;
}
......@@ -72,11 +72,11 @@ public class LabelEvent {
this.resourceType = resourceType;
}
public int getResourceId() {
public Long getResourceId() {
return resourceId;
}
public void setResourceId(int resourceId) {
public void setResourceId(Long resourceId) {
this.resourceId = resourceId;
}
......
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