Skip to content

Commit a8f540f

Browse files
authored
Remove duplicates member in child classes, add "@OverRide" annotation (#1256)
Fixes #1255
1 parent c75a2b7 commit a8f540f

File tree

14 files changed

+11
-34
lines changed

14 files changed

+11
-34
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public String toValue() {
3434
return (enumHelper.toString(this));
3535
}
3636

37+
@Override
3738
public String toString() {
3839
return (enumHelper.toString(this));
3940
}
@@ -241,6 +242,7 @@ public String getLinkByName(String name) {
241242
return (links.get(name));
242243
}
243244

245+
@Override
244246
public String toString() {
245247
return (JacksonJson.toJsonString(this));
246248
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public void setUrl(String url) {
7777
this.url = url;
7878
}
7979

80+
@Override
8081
public String toString() {
8182
return (JacksonJson.toJsonString(this));
8283
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChildEpic.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
public class ChildEpic extends AbstractEpic<ChildEpic> {
66
private static final long serialVersionUID = 1L;
77

8+
@Override
89
public String toString() {
910
return (JacksonJson.toJsonString(this));
1011
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public class CreatedChildEpic extends AbstractMinimalEpic<CreatedChildEpic> {
77

88
private Boolean hasChildren;
99
private Boolean hasIssues;
10-
private String url;
1110
private String relationUrl;
1211

1312
public Boolean getHasChildren() {
@@ -26,14 +25,6 @@ public void setHasIssues(Boolean hasIssues) {
2625
this.hasIssues = hasIssues;
2726
}
2827

29-
public String getUrl() {
30-
return url;
31-
}
32-
33-
public void setUrl(String url) {
34-
this.url = url;
35-
}
36-
3728
public String getRelationUrl() {
3829
return relationUrl;
3930
}
@@ -42,6 +33,7 @@ public void setRelationUrl(String relationUrl) {
4233
this.relationUrl = relationUrl;
4334
}
4435

36+
@Override
4537
public String toString() {
4638
return (JacksonJson.toJsonString(this));
4739
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public void setSubscribed(Boolean subscribed) {
4949
this.subscribed = subscribed;
5050
}
5151

52+
@Override
5253
public String toString() {
5354
return (JacksonJson.toJsonString(this));
5455
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicInLink.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
public class EpicInLink extends AbstractEpic<EpicInLink> {
66
private static final long serialVersionUID = 1L;
77

8+
@Override
89
public String toString() {
910
return (JacksonJson.toJsonString(this));
1011
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEpic.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
public class IssueEpic extends AbstractMinimalEpic<IssueEpic> {
66
private static final long serialVersionUID = 1L;
77

8+
@Override
89
public String toString() {
910
return (JacksonJson.toJsonString(this));
1011
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public void setLinkUpdatedAt(Date linkUpdatedAt) {
7676
this.linkUpdatedAt = linkUpdatedAt;
7777
}
7878

79+
@Override
7980
public String toString() {
8081
return (JacksonJson.toJsonString(this));
8182
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public void setUpdatedAt(Date updatedAt) {
6363
this.updatedAt = updatedAt;
6464
}
6565

66+
@Override
6667
public String toString() {
6768
return (JacksonJson.toJsonString(this));
6869
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public enum Type {
1212
BLOB,
1313
COMMIT;
1414

15+
@Override
1516
public String toString() {
1617
return (name().toLowerCase());
1718
}

gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public class User extends AbstractUser<User> {
3333
private String publicEmail;
3434
private Integer sharedRunnersMinutesLimit;
3535
private String skype;
36-
private String state;
3736
private Integer themeId;
3837
private String twitter;
3938
private Boolean twoFactorEnabled;
@@ -232,14 +231,6 @@ public void setSkype(String skype) {
232231
this.skype = skype;
233232
}
234233

235-
public String getState() {
236-
return state;
237-
}
238-
239-
public void setState(String state) {
240-
this.state = state;
241-
}
242-
243234
public Integer getThemeId() {
244235
return themeId;
245236
}
@@ -398,11 +389,6 @@ public User withSkype(String skype) {
398389
return this;
399390
}
400391

401-
public User withState(String state) {
402-
this.state = state;
403-
return this;
404-
}
405-
406392
public User withThemeId(Integer themeId) {
407393
this.themeId = themeId;
408394
return this;

gitlab4j-models/src/main/java/org/gitlab4j/api/services/HipChatService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public class HipChatService extends NotificationService {
1313
public static final String ROOM_PROP = "room";
1414
public static final String API_VERSION_PROP = "api_version";
1515
public static final String SERVER_PROP = "server";
16-
public static final String NOTIFY_ONLY_BROKEN_PIPELINES_PROP = "notify_only_broken_pipelines";
1716

1817
/**
1918
* Get the form data for this service based on it's properties.

gitlab4j-models/src/main/java/org/gitlab4j/api/services/JiraService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public class JiraService extends NotificationService {
1212
public static final String URL_PROP = "url";
1313
public static final String API_URL_PROP = "api_url";
1414
public static final String PROJECT_KEY_PROP = "project_key";
15-
public static final String USERNAME_PROP = "username";
1615
public static final String JIRA_ISSUE_TRANSITION_ID_PROP = "jira_issue_transition_id";
1716
public static final String COMMIT_EVENTS_PROP = "commit_events";
1817

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public class MergeRequestSystemHookEvent extends MergeRequestEvent implements Sy
1010
public static final String X_GITLAB_EVENT = "System Hook";
1111
public static final String MERGE_REQUEST_EVENT = "merge_request";
1212

13-
private String eventType;
1413
private String eventName;
1514

1615
@Override
@@ -27,14 +26,6 @@ public void setEventName(String eventName) {
2726
this.eventName = eventName;
2827
}
2928

30-
public String getEventType() {
31-
return eventType;
32-
}
33-
34-
public void setEventType(String eventType) {
35-
this.eventType = eventType;
36-
}
37-
3829
/**
3930
* @deprecated use {@link #setEventType(String)} instead
4031
* @param eventType

0 commit comments

Comments
 (0)