Unverified Commit 358b8c9a authored by Jérémie Bresson's avatar Jérémie Bresson Committed by GitHub
Browse files

Add id to ProtectedBranch and BranchAccessLevel (#901)

parent 2be235b8
...@@ -4,11 +4,20 @@ import org.gitlab4j.api.utils.JacksonJson; ...@@ -4,11 +4,20 @@ import org.gitlab4j.api.utils.JacksonJson;
public class BranchAccessLevel { public class BranchAccessLevel {
private Long id;
private AccessLevel accessLevel; private AccessLevel accessLevel;
private String accessLevelDescription; private String accessLevelDescription;
private Long userId; private Long userId;
private Long groupId; private Long groupId;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public AccessLevel getAccessLevel() { public AccessLevel getAccessLevel() {
return this.accessLevel; return this.accessLevel;
} }
......
...@@ -7,12 +7,21 @@ import org.gitlab4j.api.utils.JacksonJson; ...@@ -7,12 +7,21 @@ import org.gitlab4j.api.utils.JacksonJson;
public class ProtectedBranch { public class ProtectedBranch {
private Long id;
private String name; private String name;
private List<BranchAccessLevel> pushAccessLevels; private List<BranchAccessLevel> pushAccessLevels;
private List<BranchAccessLevel> mergeAccessLevels; private List<BranchAccessLevel> mergeAccessLevels;
private List<BranchAccessLevel> unprotectAccessLevels; private List<BranchAccessLevel> unprotectAccessLevels;
private Boolean codeOwnerApprovalRequired; private Boolean codeOwnerApprovalRequired;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() { public String getName() {
return this.name; return this.name;
} }
......
{ {
"id": 457,
"name": "develop", "name": "develop",
"push_access_levels": [ "push_access_levels": [
{ {
"id": 123,
"access_level": 40, "access_level": 40,
"access_level_description": "Masters" "access_level_description": "Masters"
}, },
...@@ -11,6 +13,7 @@ ...@@ -11,6 +13,7 @@
], ],
"merge_access_levels": [ "merge_access_levels": [
{ {
"id": 789,
"access_level": 40, "access_level": 40,
"access_level_description": "Masters" "access_level_description": "Masters"
}, },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment