From 97f30e663c273f078af8309066f1bc32ac3e51b1 Mon Sep 17 00:00:00 2001 From: Pavel Reznicek Date: Mon, 12 Mar 2018 13:45:48 +0100 Subject: [PATCH 1/3] missing attributes added in GitlabIssue class (#295) --- .../org/gitlab/api/models/GitlabIssue.java | 295 ++++++++++++------ 1 file changed, 202 insertions(+), 93 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabIssue.java b/src/main/java/org/gitlab/api/models/GitlabIssue.java index 3d7f8cef..2c96ea34 100644 --- a/src/main/java/org/gitlab/api/models/GitlabIssue.java +++ b/src/main/java/org/gitlab/api/models/GitlabIssue.java @@ -1,136 +1,245 @@ package org.gitlab.api.models; +import java.time.LocalDate; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; public class GitlabIssue { - public enum Action { - LEAVE, CLOSE, REOPEN - } + public enum Action { + LEAVE, CLOSE, REOPEN + } - public static final String STATE_CLOSED = "closed"; - public static final String STATE_OPENED = "opened"; + public static final String STATE_CLOSED = "closed"; + public static final String STATE_OPENED = "opened"; - public static final String URL = "/issues"; + public static final String URL = "/issues"; - private int id; - private int iid; + private int id; + private int iid; - @JsonProperty("project_id") - private int projectId; + @JsonProperty("project_id") + private int projectId; - private String title; - private String description; - private String[] labels; - private GitlabMilestone milestone; + private String title; + private String description; + private String[] labels; + private GitlabMilestone milestone; - private GitlabUser assignee; - private GitlabUser author; + private List assignees; + private GitlabUser assignee; + private GitlabUser author; - private String state; + @JsonProperty("user_notes_count") + private Integer userNotesCount; - @JsonProperty("updated_at") - private Date updatedAt; + @JsonProperty("upvotes") + private Integer upVotes; - @JsonProperty("created_at") - private Date createdAt; + @JsonProperty("downvotes") + private Integer downVotes; - public int getId() { - return id; - } + @JsonProperty("due_date") + private LocalDate dueDate; - public void setId(int id) { - this.id = id; - } + private Boolean confidential; - public int getIid() { - return iid; - } + @JsonProperty("discussion_locked") + private Boolean discussionLocked; - public void setIid(int iid) { - this.iid = iid; - } + @JsonProperty("time_stats") + private GitlabIssueTimeStats timeStats; - public int getProjectId() { - return projectId; - } + private String state; - public void setProjectId(int projectId) { - this.projectId = projectId; - } + @JsonProperty("updated_at") + private Date updatedAt; - public String getTitle() { - return title; - } + @JsonProperty("created_at") + private Date createdAt; - public void setTitle(String title) { - this.title = title; - } + @JsonProperty("closed_at") + private Date closedAt; - public String getDescription() { - return description; - } + @JsonProperty("web_url") + private String webUrl; - public void setDescription(String description) { - this.description = description; - } + public int getId() { + return id; + } - public String[] getLabels() { - return labels; - } + public void setId(int id) { + this.id = id; + } - public void setLabels(String[] labels) { - this.labels = labels; - } + public int getIid() { + return iid; + } - public GitlabMilestone getMilestone() { - return milestone; - } + public void setIid(int iid) { + this.iid = iid; + } - public void setMilestone(GitlabMilestone milestone) { - this.milestone = milestone; - } + public int getProjectId() { + return projectId; + } - public GitlabUser getAssignee() { - return assignee; - } + public void setProjectId(int projectId) { + this.projectId = projectId; + } - public void setAssignee(GitlabUser assignee) { - this.assignee = assignee; - } + public String getTitle() { + return title; + } - public GitlabUser getAuthor() { - return author; - } + public void setTitle(String title) { + this.title = title; + } - public void setAuthor(GitlabUser author) { - this.author = author; - } + public String getDescription() { + return description; + } - public String getState() { - return state; - } + public void setDescription(String description) { + this.description = description; + } - public void setState(String state) { - this.state = state; - } + public String[] getLabels() { + return labels; + } - public Date getUpdatedAt() { - return updatedAt; - } + public void setLabels(String[] labels) { + this.labels = labels; + } - public void setUpdatedAt(Date updatedAt) { - this.updatedAt = updatedAt; - } + public GitlabMilestone getMilestone() { + return milestone; + } - public Date getCreatedAt() { - return createdAt; - } + public void setMilestone(GitlabMilestone milestone) { + this.milestone = milestone; + } - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } + public List getAssignees() { + return assignees; + } + + public void setAssignees(List assignees) { + this.assignees = assignees; + } + + public GitlabUser getAssignee() { + return assignee; + } + + public void setAssignee(GitlabUser assignee) { + this.assignee = assignee; + } + + public GitlabUser getAuthor() { + return author; + } + + public void setAuthor(GitlabUser author) { + this.author = author; + } + + public Integer getUserNotesCount() { + return userNotesCount; + } + + public void setUserNotesCount(Integer userNotesCount) { + this.userNotesCount = userNotesCount; + } + + public Integer getUpVotes() { + return upVotes; + } + + public void setUpVotes(Integer upVotes) { + this.upVotes = upVotes; + } + + public Integer getDownVotes() { + return downVotes; + } + + public void setDownVotes(Integer downVotes) { + this.downVotes = downVotes; + } + + public LocalDate getDueDate() { + return dueDate; + } + + public void setDueDate(LocalDate dueDate) { + this.dueDate = dueDate; + } + + public Boolean getConfidential() { + return confidential; + } + + public void setConfidential(Boolean confidential) { + this.confidential = confidential; + } + + public Boolean getDiscussionLocked() { + return discussionLocked; + } + + public void setDiscussionLocked(Boolean discussionLocked) { + this.discussionLocked = discussionLocked; + } + + public GitlabIssueTimeStats getTimeStats() { + return timeStats; + } + + public void setTimeStats(GitlabIssueTimeStats timeStats) { + this.timeStats = timeStats; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getClosedAt() { + return closedAt; + } + + public void setClosedAt(Date closedAt) { + this.closedAt = closedAt; + } + + public String getWebUrl() { + return webUrl; + } + + public void setWebUrl(String webUrl) { + this.webUrl = webUrl; + } } From 2d77f5d7c8e2aaa5c4af8185179bfd94f62dadcd Mon Sep 17 00:00:00 2001 From: Pavel Reznicek Date: Mon, 12 Mar 2018 13:50:22 +0100 Subject: [PATCH 2/3] Revert "missing attributes added in GitlabIssue class (#295)" This reverts commit 97f30e663c273f078af8309066f1bc32ac3e51b1. --- .../org/gitlab/api/models/GitlabIssue.java | 295 ++++++------------ 1 file changed, 93 insertions(+), 202 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabIssue.java b/src/main/java/org/gitlab/api/models/GitlabIssue.java index 2c96ea34..3d7f8cef 100644 --- a/src/main/java/org/gitlab/api/models/GitlabIssue.java +++ b/src/main/java/org/gitlab/api/models/GitlabIssue.java @@ -1,245 +1,136 @@ package org.gitlab.api.models; -import java.time.LocalDate; import java.util.Date; -import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; public class GitlabIssue { - public enum Action { - LEAVE, CLOSE, REOPEN - } + public enum Action { + LEAVE, CLOSE, REOPEN + } - public static final String STATE_CLOSED = "closed"; - public static final String STATE_OPENED = "opened"; + public static final String STATE_CLOSED = "closed"; + public static final String STATE_OPENED = "opened"; - public static final String URL = "/issues"; + public static final String URL = "/issues"; - private int id; - private int iid; + private int id; + private int iid; - @JsonProperty("project_id") - private int projectId; + @JsonProperty("project_id") + private int projectId; - private String title; - private String description; - private String[] labels; - private GitlabMilestone milestone; + private String title; + private String description; + private String[] labels; + private GitlabMilestone milestone; - private List assignees; - private GitlabUser assignee; - private GitlabUser author; + private GitlabUser assignee; + private GitlabUser author; - @JsonProperty("user_notes_count") - private Integer userNotesCount; + private String state; - @JsonProperty("upvotes") - private Integer upVotes; + @JsonProperty("updated_at") + private Date updatedAt; - @JsonProperty("downvotes") - private Integer downVotes; + @JsonProperty("created_at") + private Date createdAt; - @JsonProperty("due_date") - private LocalDate dueDate; + public int getId() { + return id; + } - private Boolean confidential; + public void setId(int id) { + this.id = id; + } - @JsonProperty("discussion_locked") - private Boolean discussionLocked; + public int getIid() { + return iid; + } - @JsonProperty("time_stats") - private GitlabIssueTimeStats timeStats; + public void setIid(int iid) { + this.iid = iid; + } - private String state; + public int getProjectId() { + return projectId; + } - @JsonProperty("updated_at") - private Date updatedAt; + public void setProjectId(int projectId) { + this.projectId = projectId; + } - @JsonProperty("created_at") - private Date createdAt; + public String getTitle() { + return title; + } - @JsonProperty("closed_at") - private Date closedAt; + public void setTitle(String title) { + this.title = title; + } - @JsonProperty("web_url") - private String webUrl; + public String getDescription() { + return description; + } - public int getId() { - return id; - } + public void setDescription(String description) { + this.description = description; + } - public void setId(int id) { - this.id = id; - } + public String[] getLabels() { + return labels; + } - public int getIid() { - return iid; - } + public void setLabels(String[] labels) { + this.labels = labels; + } - public void setIid(int iid) { - this.iid = iid; - } + public GitlabMilestone getMilestone() { + return milestone; + } - public int getProjectId() { - return projectId; - } + public void setMilestone(GitlabMilestone milestone) { + this.milestone = milestone; + } - public void setProjectId(int projectId) { - this.projectId = projectId; - } + public GitlabUser getAssignee() { + return assignee; + } - public String getTitle() { - return title; - } + public void setAssignee(GitlabUser assignee) { + this.assignee = assignee; + } - public void setTitle(String title) { - this.title = title; - } + public GitlabUser getAuthor() { + return author; + } - public String getDescription() { - return description; - } + public void setAuthor(GitlabUser author) { + this.author = author; + } - public void setDescription(String description) { - this.description = description; - } + public String getState() { + return state; + } - public String[] getLabels() { - return labels; - } + public void setState(String state) { + this.state = state; + } - public void setLabels(String[] labels) { - this.labels = labels; - } + public Date getUpdatedAt() { + return updatedAt; + } - public GitlabMilestone getMilestone() { - return milestone; - } + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } - public void setMilestone(GitlabMilestone milestone) { - this.milestone = milestone; - } + public Date getCreatedAt() { + return createdAt; + } - public List getAssignees() { - return assignees; - } - - public void setAssignees(List assignees) { - this.assignees = assignees; - } - - public GitlabUser getAssignee() { - return assignee; - } - - public void setAssignee(GitlabUser assignee) { - this.assignee = assignee; - } - - public GitlabUser getAuthor() { - return author; - } - - public void setAuthor(GitlabUser author) { - this.author = author; - } - - public Integer getUserNotesCount() { - return userNotesCount; - } - - public void setUserNotesCount(Integer userNotesCount) { - this.userNotesCount = userNotesCount; - } - - public Integer getUpVotes() { - return upVotes; - } - - public void setUpVotes(Integer upVotes) { - this.upVotes = upVotes; - } - - public Integer getDownVotes() { - return downVotes; - } - - public void setDownVotes(Integer downVotes) { - this.downVotes = downVotes; - } - - public LocalDate getDueDate() { - return dueDate; - } - - public void setDueDate(LocalDate dueDate) { - this.dueDate = dueDate; - } - - public Boolean getConfidential() { - return confidential; - } - - public void setConfidential(Boolean confidential) { - this.confidential = confidential; - } - - public Boolean getDiscussionLocked() { - return discussionLocked; - } - - public void setDiscussionLocked(Boolean discussionLocked) { - this.discussionLocked = discussionLocked; - } - - public GitlabIssueTimeStats getTimeStats() { - return timeStats; - } - - public void setTimeStats(GitlabIssueTimeStats timeStats) { - this.timeStats = timeStats; - } - - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - - public Date getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Date updatedAt) { - this.updatedAt = updatedAt; - } - - public Date getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; - } - - public Date getClosedAt() { - return closedAt; - } - - public void setClosedAt(Date closedAt) { - this.closedAt = closedAt; - } - - public String getWebUrl() { - return webUrl; - } - - public void setWebUrl(String webUrl) { - this.webUrl = webUrl; - } + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } } From 6aa83403e13b18d38a5cae80b76fd812de7e5d6b Mon Sep 17 00:00:00 2001 From: Pavel Reznicek Date: Mon, 12 Mar 2018 14:05:30 +0100 Subject: [PATCH 3/3] missing attributes added in GitlabIssue class (#295) --- .../org/gitlab/api/models/GitlabIssue.java | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/src/main/java/org/gitlab/api/models/GitlabIssue.java b/src/main/java/org/gitlab/api/models/GitlabIssue.java index 3d7f8cef..de62fb5a 100644 --- a/src/main/java/org/gitlab/api/models/GitlabIssue.java +++ b/src/main/java/org/gitlab/api/models/GitlabIssue.java @@ -1,6 +1,8 @@ package org.gitlab.api.models; +import java.time.LocalDate; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,9 +28,30 @@ public enum Action { private String[] labels; private GitlabMilestone milestone; + private List assignees; private GitlabUser assignee; private GitlabUser author; + @JsonProperty("user_notes_count") + private Integer userNotesCount; + + @JsonProperty("upvotes") + private Integer upVotes; + + @JsonProperty("downvotes") + private Integer downVotes; + + @JsonProperty("due_date") + private LocalDate dueDate; + + private Boolean confidential; + + @JsonProperty("discussion_locked") + private Boolean discussionLocked; + + @JsonProperty("time_stats") + private GitlabIssueTimeStats timeStats; + private String state; @JsonProperty("updated_at") @@ -37,6 +60,12 @@ public enum Action { @JsonProperty("created_at") private Date createdAt; + @JsonProperty("closed_at") + private Date closedAt; + + @JsonProperty("web_url") + private String webUrl; + public int getId() { return id; } @@ -93,6 +122,13 @@ public void setMilestone(GitlabMilestone milestone) { this.milestone = milestone; } + public List getAssignees() { + return assignees; + } + + public void setAssignees(List assignees) { + this.assignees = assignees; + } public GitlabUser getAssignee() { return assignee; } @@ -109,6 +145,62 @@ public void setAuthor(GitlabUser author) { this.author = author; } + public Integer getUserNotesCount() { + return userNotesCount; + } + + public void setUserNotesCount(Integer userNotesCount) { + this.userNotesCount = userNotesCount; + } + + public Integer getUpVotes() { + return upVotes; + } + + public void setUpVotes(Integer upVotes) { + this.upVotes = upVotes; + } + + public Integer getDownVotes() { + return downVotes; + } + + public void setDownVotes(Integer downVotes) { + this.downVotes = downVotes; + } + + public LocalDate getDueDate() { + return dueDate; + } + + public void setDueDate(LocalDate dueDate) { + this.dueDate = dueDate; + } + + public Boolean getConfidential() { + return confidential; + } + + public void setConfidential(Boolean confidential) { + this.confidential = confidential; + } + + public Boolean getDiscussionLocked() { + return discussionLocked; + } + + public void setDiscussionLocked(Boolean discussionLocked) { + this.discussionLocked = discussionLocked; + } + + public GitlabIssueTimeStats getTimeStats() { + return timeStats; + } + + public void setTimeStats(GitlabIssueTimeStats timeStats) { + this.timeStats = timeStats; + } + public String getState() { return state; }