From c5574ea35ae9024282180d5f8c40015b2859d754 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson Date: Tue, 24 Jan 2023 06:29:04 +0100 Subject: [PATCH] Add id to ProtectedBranch and BranchAccessLevel --- .../java/org/gitlab4j/api/models/BranchAccessLevel.java | 9 +++++++++ .../java/org/gitlab4j/api/models/ProtectedBranch.java | 9 +++++++++ .../resources/org/gitlab4j/api/protected-branch.json | 3 +++ 3 files changed, 21 insertions(+) diff --git a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java index a93b0d9ed..bf97b96d7 100644 --- a/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java +++ b/src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java @@ -4,11 +4,20 @@ public class BranchAccessLevel { + private Long id; private AccessLevel accessLevel; private String accessLevelDescription; private Long userId; private Long groupId; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public AccessLevel getAccessLevel() { return this.accessLevel; } diff --git a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java index 222cf2f1d..49c780657 100644 --- a/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java +++ b/src/main/java/org/gitlab4j/api/models/ProtectedBranch.java @@ -7,12 +7,21 @@ public class ProtectedBranch { + private Long id; private String name; private List pushAccessLevels; private List mergeAccessLevels; private List unprotectAccessLevels; private Boolean codeOwnerApprovalRequired; + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public String getName() { return this.name; } diff --git a/src/test/resources/org/gitlab4j/api/protected-branch.json b/src/test/resources/org/gitlab4j/api/protected-branch.json index 891af31c6..082f273b9 100644 --- a/src/test/resources/org/gitlab4j/api/protected-branch.json +++ b/src/test/resources/org/gitlab4j/api/protected-branch.json @@ -1,7 +1,9 @@ { + "id": 457, "name": "develop", "push_access_levels": [ { + "id": 123, "access_level": 40, "access_level_description": "Masters" }, @@ -11,6 +13,7 @@ ], "merge_access_levels": [ { + "id": 789, "access_level": 40, "access_level_description": "Masters" },