Skip to content

Commit 2d69145

Browse files
author
t.mucs
committed
Add remove_source_branch_after_merge to Project and ProjectApi.updateProject and createProject
1 parent 4ab9c15 commit 2d69145

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,7 @@ public Project createProject(Project project, String importUrl) throws GitLabApi
10241024
.withParam("build_git_strategy", project.getBuildGitStrategy())
10251025
.withParam("build_coverage_regex", project.getBuildCoverageRegex())
10261026
.withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
1027+
.withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge());
10271028

10281029
Namespace namespace = project.getNamespace();
10291030
if (namespace != null && namespace.getId() != null) {

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,11 @@ public void setRemoveSourceBranchAfterMerge(Boolean removeSourceBranchAfterMerge
788788
this.removeSourceBranchAfterMerge = removeSourceBranchAfterMerge;
789789
}
790790

791+
public Project withRemoveSourceBranchAfterMerge(Boolean removeSourceBranchAfterMerge) {
792+
this.removeSourceBranchAfterMerge = removeSourceBranchAfterMerge;
793+
return this;
794+
}
795+
791796
public Boolean getAutoDevopsEnabled() {
792797
return autoDevopsEnabled;
793798
}

src/test/java/org/gitlab4j/api/TestProjectApi.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ public void testUpdate() throws GitLabApiException {
238238
.withTagList(Arrays.asList("tag1", "tag2"))
239239
.withMergeMethod(Project.MergeMethod.MERGE)
240240
.withSuggestionCommitMessage("SuggestionCommitMessageOriginal")
241+
.withRemoveSourceBranchAfterMerge(false);
241242

242243
Project newProject = gitLabApi.getProjectApi().createProject(project);
243244
assertNotNull(newProject);
@@ -251,6 +252,7 @@ public void testUpdate() throws GitLabApiException {
251252
assertTrue(Visibility.PUBLIC == newProject.getVisibility() || Boolean.TRUE == newProject.getPublic());
252253
assertEquals(Project.MergeMethod.MERGE, newProject.getMergeMethod());
253254
assertEquals(project.getSuggestionCommitMessage(), newProject.getSuggestionCommitMessage());
255+
assertEquals(project.getRemoveSourceBranchAfterMerge(), newProject.getRemoveSourceBranchAfterMerge());
254256

255257
project = new Project()
256258
.withId(newProject.getId())
@@ -263,6 +265,7 @@ public void testUpdate() throws GitLabApiException {
263265
.withVisibility(Visibility.PRIVATE)
264266
.withMergeMethod(Project.MergeMethod.REBASE_MERGE)
265267
.withSuggestionCommitMessage("SuggestionCommitMessageUpdated")
268+
.withRemoveSourceBranchAfterMerge(true);
266269

267270
Project updatedProject = gitLabApi.getProjectApi().updateProject(project);
268271
assertNotNull(updatedProject);
@@ -275,6 +278,7 @@ public void testUpdate() throws GitLabApiException {
275278
assertTrue(Visibility.PRIVATE == updatedProject.getVisibility() || Boolean.FALSE == updatedProject.getPublic());
276279
assertEquals(Project.MergeMethod.REBASE_MERGE, updatedProject.getMergeMethod());
277280
assertEquals(project.getSuggestionCommitMessage(), updatedProject.getSuggestionCommitMessage());
281+
assertEquals(true, updatedProject.getRemoveSourceBranchAfterMerge());
278282
}
279283

280284
@Test

0 commit comments

Comments
 (0)