Skip to content

Commit 90a8a90

Browse files
bdgouldbdgould
committed
cleanup
1 parent 2f9098b commit 90a8a90

17 files changed

+189
-17
lines changed

‎gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
import org.gitlab4j.models.utils.JacksonJson;
99
import org.gitlab4j.models.utils.JacksonJsonEnumHelper;
1010

11-
import com.fasterxml.jackson.annotation.JsonCreator;
12-
import com.fasterxml.jackson.annotation.JsonIgnore;
13-
import com.fasterxml.jackson.annotation.JsonProperty;
14-
import com.fasterxml.jackson.annotation.JsonValue;
11+
import com.fasterxml.jackson.annotation.*;
1512

1613
public class AbstractEpic<E extends AbstractEpic<E>> extends AbstractMinimalEpic<E> implements Serializable {
1714
private static final long serialVersionUID = 1L;
@@ -38,21 +35,58 @@ public String toString() {
3835
}
3936
}
4037

38+
@JsonProperty("parent_iid")
4139
private Long parentIid;
40+
41+
@JsonProperty("description")
4242
private String description;
43+
44+
@JsonProperty("state")
4345
private EpicState state;
46+
47+
@JsonProperty("web_url")
4448
private String webUrl;
49+
50+
@JsonProperty("references")
4551
private References references;
52+
53+
@JsonProperty("author")
4654
private Author author;
55+
56+
@JsonProperty("labels")
4757
private List<String> labels;
58+
59+
@JsonProperty("start_date")
60+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
4861
private Date startDate;
62+
63+
@JsonProperty("due_date")
64+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
4965
private Date dueDate;
66+
67+
@JsonProperty("end_date")
68+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
5069
private Date endDate;
70+
71+
@JsonProperty("created_at")
72+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
5173
private Date createdAt;
74+
75+
@JsonProperty("updated_at")
76+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
5277
private Date updatedAt;
78+
79+
@JsonProperty("closed_at")
80+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
5381
private Date closedAt;
82+
83+
@JsonProperty("downvotes")
5484
private Integer downvotes;
85+
86+
@JsonProperty("upvotes")
5587
private Integer upvotes;
88+
89+
@JsonProperty("color")
5690
private String color;
5791

5892
@JsonProperty("_links")

‎gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractGroup.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,28 @@
55
import org.gitlab4j.models.utils.JacksonJson;
66

77
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
8+
import com.fasterxml.jackson.annotation.JsonProperty;
89

910
@JsonIgnoreProperties(ignoreUnknown = true)
1011
public abstract class AbstractGroup<G extends AbstractGroup<G>> implements Serializable {
1112
private static final long serialVersionUID = 1L;
1213

14+
@JsonProperty("id")
1315
private Long id;
16+
17+
@JsonProperty("name")
1418
private String name;
19+
20+
@JsonProperty("avatar_url")
1521
private String avatarUrl;
22+
23+
@JsonProperty("web_url")
1624
private String webUrl;
25+
26+
@JsonProperty("full_name")
1727
private String fullName;
28+
29+
@JsonProperty("full_path")
1830
private String fullPath;
1931

2032
public Long getId() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractIssue.java‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.gitlab4j.models.Constants.IssueState;
88
import org.gitlab4j.models.utils.JacksonJson;
99

10+
import com.fasterxml.jackson.annotation.JsonFormat;
1011
import com.fasterxml.jackson.annotation.JsonIgnore;
1112
import com.fasterxml.jackson.annotation.JsonProperty;
1213
import com.fasterxml.jackson.databind.node.IntNode;
@@ -45,15 +46,38 @@ public String toString() {
4546
}
4647
}
4748

49+
@JsonProperty("assignee")
4850
private Assignee assignee;
51+
52+
@JsonProperty("assignees")
4953
private List<Assignee> assignees;
54+
55+
@JsonProperty("author")
5056
private Author author;
57+
58+
@JsonProperty("confidential")
5159
private Boolean confidential;
60+
61+
@JsonProperty("created_at")
62+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
5263
private Date createdAt;
64+
65+
@JsonProperty("updated_at")
66+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
5367
private Date updatedAt;
68+
69+
@JsonProperty("closed_at")
70+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
5471
private Date closedAt;
72+
73+
@JsonProperty("closed_by")
5574
private User closedBy;
75+
76+
@JsonProperty("description")
5677
private String description;
78+
79+
@JsonProperty("due_date")
80+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
5781
private Date dueDate;
5882

5983
@JsonProperty("id")
@@ -65,31 +89,79 @@ public String toString() {
6589
@JsonIgnore
6690
private Long id;
6791

92+
@JsonProperty("iid")
6893
private Long iid;
94+
95+
@JsonProperty("labels")
6996
private List<String> labels;
97+
98+
@JsonProperty("milestone")
7099
private Milestone milestone;
100+
101+
@JsonProperty("project_id")
71102
private Long projectId;
103+
104+
@JsonProperty("state")
72105
private IssueState state;
106+
107+
@JsonProperty("title")
73108
private String title;
109+
110+
@JsonProperty("user_notes_count")
74111
private Integer userNotesCount;
112+
113+
@JsonProperty("web_url")
75114
private String webUrl;
115+
116+
@JsonProperty("references")
76117
private References references;
118+
119+
@JsonProperty("weight")
77120
private Integer weight;
121+
122+
@JsonProperty("discussion_locked")
78123
private Boolean discussionLocked;
124+
125+
@JsonProperty("time_stats")
79126
private TimeStats timeStats;
127+
128+
@JsonProperty("severity")
80129
private String severity;
130+
131+
@JsonProperty("issue_type")
81132
private String issueType;
133+
134+
@JsonProperty("epic")
82135
private IssueEpic epic;
83136

137+
@JsonProperty("upvotes")
84138
private Integer upvotes;
139+
140+
@JsonProperty("downvotes")
85141
private Integer downvotes;
142+
143+
@JsonProperty("merge_requests_count")
86144
private Integer mergeRequestsCount;
145+
146+
@JsonProperty("has_tasks")
87147
private Boolean hasTasks;
148+
149+
@JsonProperty("task_status")
88150
private String taskStatus;
151+
152+
@JsonProperty("imported")
89153
private Boolean imported;
154+
155+
@JsonProperty("imported_from")
90156
private String importedFrom;
157+
158+
@JsonProperty("iteration")
91159
private Iteration iteration;
160+
161+
@JsonProperty("task_completion_status")
92162
private TaskCompletionStatus taskCompletionStatus;
163+
164+
@JsonProperty("health_status")
93165
private String healthStatus;
94166

95167
public Assignee getAssignee() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,30 @@
44

55
import org.gitlab4j.models.utils.JacksonJson;
66

7+
import com.fasterxml.jackson.annotation.JsonProperty;
8+
79
public class AbstractMinimalEpic<E extends AbstractMinimalEpic<E>> implements Serializable {
810
private static final long serialVersionUID = 1L;
911

12+
@JsonProperty("id")
1013
private Long id;
14+
15+
@JsonProperty("iid")
1116
private Long iid;
17+
18+
@JsonProperty("group_id")
1219
private Long groupId;
20+
21+
@JsonProperty("parent_id")
1322
private Long parentId;
23+
24+
@JsonProperty("title")
1425
private String title;
26+
27+
@JsonProperty("reference")
1528
private String reference;
29+
30+
@JsonProperty("url")
1631
private String url;
1732

1833
public Long getId() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractUser.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,37 @@
55

66
import org.gitlab4j.models.utils.JacksonJson;
77

8+
import com.fasterxml.jackson.annotation.JsonFormat;
89
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
10+
import com.fasterxml.jackson.annotation.JsonProperty;
911

1012
@JsonIgnoreProperties(ignoreUnknown = true)
1113
public abstract class AbstractUser<U extends AbstractUser<U>> implements Serializable {
1214
private static final long serialVersionUID = 1L;
1315

16+
@JsonProperty("avatar_url")
1417
private String avatarUrl;
18+
19+
@JsonProperty("created_at")
20+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1521
private Date createdAt;
22+
23+
@JsonProperty("email")
1624
private String email;
25+
26+
@JsonProperty("id")
1727
private Long id;
28+
29+
@JsonProperty("name")
1830
private String name;
31+
32+
@JsonProperty("state")
1933
private String state;
34+
35+
@JsonProperty("username")
2036
private String username;
37+
38+
@JsonProperty("web_url")
2139
private String webUrl;
2240

2341
public String getAvatarUrl() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/models/AcceptMergeRequestParams.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,27 @@
44

55
import org.gitlab4j.models.GitLabForm;
66

7+
import com.fasterxml.jackson.annotation.JsonProperty;
8+
79
public class AcceptMergeRequestParams implements Serializable {
810
private static final long serialVersionUID = 1L;
911

12+
@JsonProperty("merge_commit_message")
1013
private String mergeCommitMessage;
14+
15+
@JsonProperty("merge_when_pipeline_succeeds")
1116
private Boolean mergeWhenPipelineSucceeds;
17+
18+
@JsonProperty("sha")
1219
private String sha;
20+
21+
@JsonProperty("should_remove_source_branch")
1322
private Boolean shouldRemoveSourceBranch;
23+
24+
@JsonProperty("squash")
1425
private Boolean squash;
26+
27+
@JsonProperty("squash_commit_message")
1528
private String squashCommitMessage;
1629

1730
/**

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import java.util.Date;
44

5+
import org.gitlab4j.models.utils.JacksonJson;
6+
57
import com.fasterxml.jackson.annotation.JsonFormat;
68
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import org.gitlab4j.models.utils.JacksonJson;
89

910
public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
1011
private static final long serialVersionUID = 1L;

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import java.util.Date;
44

5+
import org.gitlab4j.models.utils.JacksonJson;
6+
57
import com.fasterxml.jackson.annotation.JsonFormat;
68
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import org.gitlab4j.models.utils.JacksonJson;
89

910
public class GroupSystemHookEvent extends AbstractSystemHookEvent {
1011
private static final long serialVersionUID = 1L;

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import java.util.Date;
44

5+
import org.gitlab4j.models.utils.JacksonJson;
6+
57
import com.fasterxml.jackson.annotation.JsonFormat;
68
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import org.gitlab4j.models.utils.JacksonJson;
89

910
public class KeySystemHookEvent extends AbstractSystemHookEvent {
1011
private static final long serialVersionUID = 1L;

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.gitlab4j.api.systemhooks;
22

3-
import com.fasterxml.jackson.annotation.JsonProperty;
43
import org.gitlab4j.api.webhook.MergeRequestEvent;
54

65
import com.fasterxml.jackson.annotation.JsonIgnore;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
77

88
public class MergeRequestSystemHookEvent extends MergeRequestEvent implements SystemHookEvent {
99
private static final long serialVersionUID = 1L;

0 commit comments

Comments
 (0)