From e1b18bb3dac4418a8524659eda82c755e7414a13 Mon Sep 17 00:00:00 2001 From: vimsucks Date: Sun, 18 Feb 2024 14:06:24 +0800 Subject: [PATCH 1/2] Fix wrongly named field in TeamMemberSystemHookEvent --- .../api/systemhooks/TeamMemberSystemHookEvent.java | 10 +++++----- .../gitlab4j/api/team-member-system-hook-event.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java index f8b31851d..dabc65740 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java @@ -14,7 +14,7 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { private Date createdAt; private Date updatedAt; private String eventName; - private String projectAccess; + private String accessLevel; private String projectName; private String projectPath; private Long projectId; @@ -50,12 +50,12 @@ public void setEventName(String eventName) { this.eventName = eventName; } - public String getProjectAccess() { - return projectAccess; + public String getAccessLevel() { + return accessLevel; } - public void setProjectAccess(String projectAccess) { - this.projectAccess = projectAccess; + public void setAccessLevel(String accessLevel) { + this.accessLevel = accessLevel; } public String getProjectName() { diff --git a/src/test/resources/org/gitlab4j/api/team-member-system-hook-event.json b/src/test/resources/org/gitlab4j/api/team-member-system-hook-event.json index fdebf50a5..7b31a5cdf 100644 --- a/src/test/resources/org/gitlab4j/api/team-member-system-hook-event.json +++ b/src/test/resources/org/gitlab4j/api/team-member-system-hook-event.json @@ -2,7 +2,7 @@ "created_at": "2012-07-21T07:30:56Z", "updated_at": "2012-07-21T07:38:22Z", "event_name": "user_add_to_team", - "project_access": "Master", + "access_level": "Master", "project_id": 74, "project_name": "StoreCloud", "project_path": "storecloud", From 69387aa997f245f5667fe4cda5a6bee04625338b Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Mon, 26 Feb 2024 14:34:26 +0100 Subject: [PATCH 2/2] Add deprecated field back --- .../systemhooks/TeamMemberSystemHookEvent.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java index dabc65740..939dd0a23 100644 --- a/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java +++ b/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java @@ -14,6 +14,8 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { private Date createdAt; private Date updatedAt; private String eventName; + @Deprecated + private String projectAccess; private String accessLevel; private String projectName; private String projectPath; @@ -50,6 +52,22 @@ public void setEventName(String eventName) { this.eventName = eventName; } + /** + * No longer used. Probably replaced by {@link #getAccessLevel()} + */ + @Deprecated + public String getProjectAccess() { + return projectAccess; + } + + /** + * No longer used. Probably replaced by {@link #setAccessLevel(String)} + */ + @Deprecated + public void setProjectAccess(String projectAccess) { + this.projectAccess = projectAccess; + } + public String getAccessLevel() { return accessLevel; }