Respect GitLab's delete source branch checkbox

jenkinsci · Jan 13, 2022 · 943dbb5 · 943dbb5
1 parent 2dddc2c
commit 943dbb5
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 15 deletions.
diff --git a/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/GitLabClient.java b/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/GitLabClient.java
@@ -26,7 +26,7 @@ public interface GitLabClient {
 
     void getCommit(String projectId, String sha);
 
-    void acceptMergeRequest(MergeRequest mr, String mergeCommitMessage, boolean shouldRemoveSourceBranch);
+    void acceptMergeRequest(MergeRequest mr, String mergeCommitMessage, Boolean shouldRemoveSourceBranch);
 
     void createMergeRequestNote(MergeRequest mr, String body);
 

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/AutodetectingGitLabClient.java b/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/AutodetectingGitLabClient.java
@@ -140,7 +140,7 @@ Void execute(GitLabClient client) {
     }
 
     @Override
-    public void acceptMergeRequest(final MergeRequest mr, final String mergeCommitMessage, final boolean shouldRemoveSourceBranch) {
+    public void acceptMergeRequest(final MergeRequest mr, final String mergeCommitMessage, final Boolean shouldRemoveSourceBranch) {
         execute(
             new GitLabOperation<Void>() {
                 @Override

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/GitLabApiProxy.java b/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/GitLabApiProxy.java
@@ -26,7 +26,7 @@ interface GitLabApiProxy {
 
     void getCommit(String projectId, String sha);
 
-    void acceptMergeRequest(Integer projectId, Integer mergeRequestId, String mergeCommitMessage, boolean shouldRemoveSourceBranch);
+    void acceptMergeRequest(Integer projectId, Integer mergeRequestId, String mergeCommitMessage, Boolean shouldRemoveSourceBranch);
 
     void createMergeRequestNote(Integer projectId, Integer mergeRequestId, String body);
 

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/ResteasyGitLabClient.java b/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/ResteasyGitLabClient.java
@@ -71,7 +71,7 @@ public void getCommit(String projectId, String sha) {
     }
 
     @Override
-    public void acceptMergeRequest(MergeRequest mr, String mergeCommitMessage, boolean shouldRemoveSourceBranch) {
+    public void acceptMergeRequest(MergeRequest mr, String mergeCommitMessage, Boolean shouldRemoveSourceBranch) {
         api.acceptMergeRequest(mr.getProjectId(), mergeRequestIdProvider.apply(mr), mergeCommitMessage, shouldRemoveSourceBranch);
     }
 

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/V3GitLabApiProxy.java b/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/V3GitLabApiProxy.java
@@ -119,7 +119,7 @@ void changeBuildStatus(@PathParam("projectId") @Encoded Integer projectId,
     void acceptMergeRequest(@PathParam("projectId") @Encoded Integer projectId,
                             @PathParam("mergeRequestId") @Encoded Integer mergeRequestId,
                             @FormParam("merge_commit_message") String mergeCommitMessage,
-                            @FormParam("should_remove_source_branch") boolean shouldRemoveSourceBranch);
+                            @FormParam("should_remove_source_branch") Boolean shouldRemoveSourceBranch);
 
     @POST
     @Produces(MediaType.APPLICATION_JSON)

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/V4GitLabApiProxy.java b/src/main/java/com/dabsquared/gitlabjenkins/gitlab/api/impl/V4GitLabApiProxy.java
@@ -119,7 +119,7 @@ void changeBuildStatus(@PathParam("projectId") @Encoded Integer projectId,
     void acceptMergeRequest(@PathParam("projectId") @Encoded Integer projectId,
                             @PathParam("mergeRequestIid") @Encoded Integer mergeRequestIid,
                             @FormParam("merge_commit_message") String mergeCommitMessage,
-                            @FormParam("should_remove_source_branch") boolean shouldRemoveSourceBranch);
+                            @FormParam("should_remove_source_branch") Boolean shouldRemoveSourceBranch);
 
     @POST
     @Produces(MediaType.APPLICATION_JSON)

diff --git a/src/main/java/com/dabsquared/gitlabjenkins/publisher/GitLabAcceptMergeRequestPublisher.java b/src/main/java/com/dabsquared/gitlabjenkins/publisher/GitLabAcceptMergeRequestPublisher.java
@@ -25,7 +25,7 @@
 public class GitLabAcceptMergeRequestPublisher extends MergeRequestNotifier {
     private static final Logger LOGGER = Logger.getLogger(GitLabAcceptMergeRequestPublisher.class.getName());
 
-    private boolean deleteSourceBranch = false;
+    private Boolean deleteSourceBranch;
 
     @DataBoundConstructor
     public GitLabAcceptMergeRequestPublisher() {

diff --git a/...st/java/com/dabsquared/gitlabjenkins/publisher/GitLabAcceptMergeRequestPublisherTest.java b/...st/java/com/dabsquared/gitlabjenkins/publisher/GitLabAcceptMergeRequestPublisherTest.java
@@ -69,8 +69,8 @@ public void success() throws IOException, InterruptedException {
         publish(mockSimpleBuild(GITLAB_CONNECTION_V4, Result.SUCCESS));
 
         mockServerClient.verify(
-            prepareAcceptMergeRequestWithSuccessResponse("v3", MERGE_REQUEST_ID),
-            prepareAcceptMergeRequestWithSuccessResponse("v4", MERGE_REQUEST_IID));
+            prepareAcceptMergeRequestWithSuccessResponse("v3", MERGE_REQUEST_ID, null),
+            prepareAcceptMergeRequestWithSuccessResponse("v4", MERGE_REQUEST_IID, null));
     }
 
     @Test
@@ -86,17 +86,22 @@ private void publish(AbstractBuild build) throws InterruptedException, IOExcepti
         publisher.perform(build, null, listener);
     }
 
-    private HttpRequest prepareAcceptMergeRequestWithSuccessResponse(String apiLevel, int mergeRequestId) throws UnsupportedEncodingException {
-        HttpRequest updateCommitStatus = prepareAcceptMergeRequest(apiLevel, mergeRequestId);
+    private HttpRequest prepareAcceptMergeRequestWithSuccessResponse(String apiLevel, int mergeRequestId, Boolean shouldRemoveSourceBranch) throws UnsupportedEncodingException {
+        HttpRequest updateCommitStatus = prepareAcceptMergeRequest(apiLevel, mergeRequestId, shouldRemoveSourceBranch);
         mockServerClient.when(updateCommitStatus).respond(response().withStatusCode(200));
         return updateCommitStatus;
     }
 
-    private HttpRequest prepareAcceptMergeRequest(String apiLevel, int mergeRequestId) throws UnsupportedEncodingException {
+    private HttpRequest prepareAcceptMergeRequest(String apiLevel, int mergeRequestId, Boolean removeSourceBranch) throws UnsupportedEncodingException {
+        String body = "merge_commit_message=Merge+Request+accepted+by+jenkins+build+success";
+        if (removeSourceBranch != null)
+        {
+            body += "&should_remove_source_branch=" + removeSourceBranch;
+        }
         return request()
                 .withPath("/gitlab/api/" + apiLevel + "/projects/" + PROJECT_ID + "/merge_requests/" + mergeRequestId + "/merge")
                 .withMethod("PUT")
                 .withHeader("PRIVATE-TOKEN", "secret")
-                .withBody("merge_commit_message=Merge+Request+accepted+by+jenkins+build+success&should_remove_source_branch=false");
+                .withBody(body);
     }
 }
diff --git a/src/test/java/com/dabsquared/gitlabjenkins/service/GitLabClientStub.java b/src/test/java/com/dabsquared/gitlabjenkins/service/GitLabClientStub.java
@@ -123,7 +123,7 @@ public void getCommit(String projectId, String sha) {
     }
 
     @Override
-    public void acceptMergeRequest(MergeRequest mr, String mergeCommitMessage, boolean shouldRemoveSourceBranch) {
+    public void acceptMergeRequest(MergeRequest mr, String mergeCommitMessage, Boolean shouldRemoveSourceBranch) {
 
     }
 

diff --git a/src/test/java/com/dabsquared/gitlabjenkins/util/GitLabClientStub.java b/src/test/java/com/dabsquared/gitlabjenkins/util/GitLabClientStub.java
@@ -70,7 +70,7 @@ public void getCommit(String projectId, String sha) {
     }
 
     @Override
-    public void acceptMergeRequest(MergeRequest mr, String mergeCommitMessage, boolean shouldRemoveSourceBranch) {
+    public void acceptMergeRequest(MergeRequest mr, String mergeCommitMessage, Boolean shouldRemoveSourceBranch) {
 
     }