From 5b52f2fc2de043b393f71d3b8af3492c9c56fca8 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Fri, 6 Jun 2025 18:15:08 +0200 Subject: [PATCH] Remove duplicates member in child classes, add "@Override" annotation Fixes #1255 --- .../java/org/gitlab4j/api/models/AbstractEpic.java | 2 ++ .../gitlab4j/api/models/AbstractMinimalEpic.java | 1 + .../java/org/gitlab4j/api/models/ChildEpic.java | 1 + .../org/gitlab4j/api/models/CreatedChildEpic.java | 10 +--------- .../main/java/org/gitlab4j/api/models/Epic.java | 1 + .../java/org/gitlab4j/api/models/EpicInLink.java | 1 + .../java/org/gitlab4j/api/models/IssueEpic.java | 1 + .../java/org/gitlab4j/api/models/RelatedEpic.java | 1 + .../org/gitlab4j/api/models/RelatedEpicLink.java | 1 + .../java/org/gitlab4j/api/models/TreeItem.java | 1 + .../main/java/org/gitlab4j/api/models/User.java | 14 -------------- .../org/gitlab4j/api/services/HipChatService.java | 1 - .../org/gitlab4j/api/services/JiraService.java | 1 - .../systemhooks/MergeRequestSystemHookEvent.java | 9 --------- 14 files changed, 11 insertions(+), 34 deletions(-) diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java index 27cc2ad2f..9ec5c7854 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractEpic.java @@ -34,6 +34,7 @@ public String toValue() { return (enumHelper.toString(this)); } + @Override public String toString() { return (enumHelper.toString(this)); } @@ -241,6 +242,7 @@ public String getLinkByName(String name) { return (links.get(name)); } + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java index bdfe2bf27..ae3c61155 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/AbstractMinimalEpic.java @@ -77,6 +77,7 @@ public void setUrl(String url) { this.url = url; } + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChildEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChildEpic.java index 9b9ba5e0e..8b7f986ff 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChildEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/ChildEpic.java @@ -5,6 +5,7 @@ public class ChildEpic extends AbstractEpic { private static final long serialVersionUID = 1L; + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java index fd4ebba81..ca4d09780 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/CreatedChildEpic.java @@ -7,7 +7,6 @@ public class CreatedChildEpic extends AbstractMinimalEpic { private Boolean hasChildren; private Boolean hasIssues; - private String url; private String relationUrl; public Boolean getHasChildren() { @@ -26,14 +25,6 @@ public void setHasIssues(Boolean hasIssues) { this.hasIssues = hasIssues; } - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - public String getRelationUrl() { return relationUrl; } @@ -42,6 +33,7 @@ public void setRelationUrl(String relationUrl) { this.relationUrl = relationUrl; } + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java index 86556e3b4..49cd882d7 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/Epic.java @@ -49,6 +49,7 @@ public void setSubscribed(Boolean subscribed) { this.subscribed = subscribed; } + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicInLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicInLink.java index 00c415ee1..1ef1560be 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicInLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/EpicInLink.java @@ -5,6 +5,7 @@ public class EpicInLink extends AbstractEpic { private static final long serialVersionUID = 1L; + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEpic.java index 2a47019fa..d2106cf21 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/IssueEpic.java @@ -5,6 +5,7 @@ public class IssueEpic extends AbstractMinimalEpic { private static final long serialVersionUID = 1L; + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java index 7b584dab7..7f3c5fd9c 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpic.java @@ -76,6 +76,7 @@ public void setLinkUpdatedAt(Date linkUpdatedAt) { this.linkUpdatedAt = linkUpdatedAt; } + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java index 319c3cc1a..0885594b8 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/RelatedEpicLink.java @@ -63,6 +63,7 @@ public void setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; } + @Override public String toString() { return (JacksonJson.toJsonString(this)); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java index 89745a61c..ef0d42370 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/TreeItem.java @@ -12,6 +12,7 @@ public enum Type { BLOB, COMMIT; + @Override public String toString() { return (name().toLowerCase()); } diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java index 04d28ab88..520099ddd 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/models/User.java @@ -33,7 +33,6 @@ public class User extends AbstractUser { private String publicEmail; private Integer sharedRunnersMinutesLimit; private String skype; - private String state; private Integer themeId; private String twitter; private Boolean twoFactorEnabled; @@ -232,14 +231,6 @@ public void setSkype(String skype) { this.skype = skype; } - public String getState() { - return state; - } - - public void setState(String state) { - this.state = state; - } - public Integer getThemeId() { return themeId; } @@ -398,11 +389,6 @@ public User withSkype(String skype) { return this; } - public User withState(String state) { - this.state = state; - return this; - } - public User withThemeId(Integer themeId) { this.themeId = themeId; return this; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/services/HipChatService.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/services/HipChatService.java index f6f873c95..f7de1f189 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/services/HipChatService.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/services/HipChatService.java @@ -13,7 +13,6 @@ public class HipChatService extends NotificationService { public static final String ROOM_PROP = "room"; public static final String API_VERSION_PROP = "api_version"; public static final String SERVER_PROP = "server"; - public static final String NOTIFY_ONLY_BROKEN_PIPELINES_PROP = "notify_only_broken_pipelines"; /** * Get the form data for this service based on it's properties. diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/services/JiraService.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/services/JiraService.java index 6a99de968..3a1fec4ac 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/services/JiraService.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/services/JiraService.java @@ -12,7 +12,6 @@ public class JiraService extends NotificationService { public static final String URL_PROP = "url"; public static final String API_URL_PROP = "api_url"; public static final String PROJECT_KEY_PROP = "project_key"; - public static final String USERNAME_PROP = "username"; public static final String JIRA_ISSUE_TRANSITION_ID_PROP = "jira_issue_transition_id"; public static final String COMMIT_EVENTS_PROP = "commit_events"; diff --git a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java index ed09c445c..40e82d273 100644 --- a/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java +++ b/gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java @@ -10,7 +10,6 @@ public class MergeRequestSystemHookEvent extends MergeRequestEvent implements Sy public static final String X_GITLAB_EVENT = "System Hook"; public static final String MERGE_REQUEST_EVENT = "merge_request"; - private String eventType; private String eventName; @Override @@ -27,14 +26,6 @@ public void setEventName(String eventName) { this.eventName = eventName; } - public String getEventType() { - return eventType; - } - - public void setEventType(String eventType) { - this.eventType = eventType; - } - /** * @deprecated use {@link #setEventType(String)} instead * @param eventType