Skip to content

Commit 44eb844

Browse files
committed
Minor mods to protected branch functionality.
1 parent c2186d4 commit 44eb844

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

src/main/java/org/gitlab4j/api/ProtectedBranchesApi.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import java.util.List;
1010

1111
public class ProtectedBranchesApi extends AbstractApi {
12+
1213
public ProtectedBranchesApi(GitLabApi gitLabApi) {
1314
super(gitLabApi);
1415
}

src/main/java/org/gitlab4j/api/RepositoryApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import javax.ws.rs.core.Response;
1616

1717
import org.gitlab4j.api.GitLabApi.ApiVersion;
18-
import org.gitlab4j.api.models.AccessLevel;
1918
import org.gitlab4j.api.models.Branch;
2019
import org.gitlab4j.api.models.CompareResults;
2120
import org.gitlab4j.api.models.Tag;

src/main/java/org/gitlab4j/api/models/BranchAccessLevelDetail.java renamed to src/main/java/org/gitlab4j/api/models/BranchAccessLevel.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66

77
@XmlRootElement
88
@XmlAccessorType(XmlAccessType.FIELD)
9-
public class BranchAccessLevelDetail {
10-
private String accessLevel;
9+
public class BranchAccessLevel {
10+
11+
private AccessLevel accessLevel;
1112
private String accessLevelDescription;
1213

13-
public String getAccessLevel() {
14+
public AccessLevel getAccessLevel() {
1415
return this.accessLevel;
1516
}
1617

17-
public void setAccessLevel(String accessLevel) {
18+
public void setAccessLevel(AccessLevel accessLevel) {
1819
this.accessLevel = accessLevel;
1920
}
2021

src/main/java/org/gitlab4j/api/models/ProtectedBranch.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
@XmlRootElement
1010
@XmlAccessorType(XmlAccessType.FIELD)
1111
public class ProtectedBranch {
12+
1213
private String name;
13-
private List<BranchAccessLevelDetail> pushAccessLevels;
14-
private List<BranchAccessLevelDetail> mergeAccessLevels;
14+
private List<BranchAccessLevel> pushAccessLevels;
15+
private List<BranchAccessLevel> mergeAccessLevels;
1516

1617
public String getName() {
1718
return this.name;
@@ -21,19 +22,19 @@ public void setName(String name) {
2122
this.name = name;
2223
}
2324

24-
public List<BranchAccessLevelDetail> getPushAccessLevels() {
25+
public List<BranchAccessLevel> getPushAccessLevels() {
2526
return this.pushAccessLevels;
2627
}
2728

28-
public void setPushAccessLevels(List<BranchAccessLevelDetail> pushAccessLevels) {
29+
public void setPushAccessLevels(List<BranchAccessLevel> pushAccessLevels) {
2930
this.pushAccessLevels = pushAccessLevels;
3031
}
3132

32-
public List<BranchAccessLevelDetail> getMergeAccessLevels() {
33+
public List<BranchAccessLevel> getMergeAccessLevels() {
3334
return this.mergeAccessLevels;
3435
}
3536

36-
public void setMergeAccessLevels(List<BranchAccessLevelDetail> mergeAccessLevels) {
37+
public void setMergeAccessLevels(List<BranchAccessLevel> mergeAccessLevels) {
3738
this.mergeAccessLevels = mergeAccessLevels;
3839
}
3940

0 commit comments

Comments
 (0)