Add prune source, draft, and squash merge options when creating PR (#154)

Author: Puffy1215

src/main/java/com/gitee/jenkins/gitee/api/GiteeClient.java

@@ -13,7 +13,7 @@ public interface GiteeClient {
 
     User getCurrentUser();
 
-    void createPullRequest(PullRequest pr);
+    void createPullRequest(PullRequest pr, boolean pruneSourceBranch, boolean draft, boolean squash);
 
     List<Label> getLabels(String owner, String repo);
 

src/main/java/com/gitee/jenkins/gitee/api/impl/GiteeApiProxy.java

@@ -1,18 +1,22 @@
 package com.gitee.jenkins.gitee.api.impl;
 
-
 import java.util.List;
 
 import com.gitee.jenkins.gitee.api.model.*;
 
-
-
 interface GiteeApiProxy {
     void createPullRequestNote(String owner, String repo, Integer pullRequestId, String body);
+
     void headCurrentUser();
+
     void acceptPullRequest(String owner, String repo, Integer pullRequestId);
-    void createPullRequest(String owner, String repo, String title, String base, String head, String body);
+
+    void createPullRequest(String owner, String repo, String title, String base, String head, String body,
+            Boolean pruneSourceBranch, Boolean draft, Boolean squash);
+
     List<PullRequest> getPullRequest(String owner, String repo, String base, String head);
+
     User getCurrentUser();
+
     List<Label> getLabels(String owner, String repo);
 }

src/main/java/com/gitee/jenkins/gitee/api/impl/GiteeV5ApiProxy.java

@@ -41,7 +41,10 @@ void createPullRequest(@PathParam("ownerPath") String ownerPath,
                             @FormParam("title") String title,
                             @FormParam("base") String base,
                             @FormParam("head") String head,
-                            @FormParam("body") String body);
+                            @FormParam("body") String body,
+                            @FormParam("prune_source_branch") Boolean pruneSourceBranch,
+                            @FormParam("draft") Boolean isDraft,
+                            @FormParam("squash") Boolean isSquashMerge);
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)

src/main/java/com/gitee/jenkins/gitee/api/impl/ResteasyGiteeClient.java

@@ -1,19 +1,16 @@
 package com.gitee.jenkins.gitee.api.impl;
 
-
 import java.util.List;
 
 import com.gitee.jenkins.gitee.api.GiteeClient;
 import com.gitee.jenkins.gitee.api.model.*;
 import com.google.common.base.Function;
 
-
 final class ResteasyGiteeClient implements GiteeClient {
     private final String hostUrl;
     private final GiteeApiProxy api;
     private final Function<PullRequest, Integer> pullRequestIdProvider;
 
-
     ResteasyGiteeClient(String hostUrl, GiteeApiProxy api, Function<PullRequest, Integer> pullRequestIdProvider) {
         this.hostUrl = hostUrl;
         this.api = api;
@@ -37,8 +34,9 @@ public void createPullRequestNote(PullRequest mr, String body) {
     }
 
     @Override
-    public void createPullRequest(PullRequest pr) {
-        api.createPullRequest(pr.getRepoOwner(), pr.getRepoPath(), pr.getTitle(), pr.getTargetBranch(), pr.getSourceBranch(), pr.getDescription());
+    public void createPullRequest(PullRequest pr, boolean pruneSourceBranch, boolean isDraft, boolean isSquashMerge) {
+        api.createPullRequest(pr.getRepoOwner(), pr.getRepoPath(), pr.getTitle(), pr.getTargetBranch(),
+                pr.getSourceBranch(), pr.getDescription(), pruneSourceBranch, isDraft, isSquashMerge);
     }
 
     @Override

src/main/java/com/gitee/jenkins/publisher/GiteeCreatePullRequestPublisher.java

@@ -48,6 +48,10 @@ public class GiteeCreatePullRequestPublisher extends Notifier implements MatrixA
     private List<LabelNameEntry> labelNames = Collections.<LabelNameEntry>emptyList();
     private boolean addDatetime;
 
+    private boolean pruneSourceBranch = false;
+    private boolean isDraft = false;
+    private boolean isSquashMerge = false;
+
     @DataBoundConstructor
     public GiteeCreatePullRequestPublisher() { }
 
@@ -88,6 +92,18 @@ public List<LabelNameEntry> getLabelNames() {
         return labelNames;
     }
 
+    public boolean getPruneSourceBranch() {
+        return pruneSourceBranch;
+    }
+
+    public boolean getIsDraft() {
+        return isDraft;
+    }
+
+    public boolean getIsSquashMerge() {
+        return isSquashMerge;
+    }
+
     @DataBoundSetter
     public void setRepo(String repo) {
         this.repo = repo;
@@ -128,6 +144,21 @@ public void setLabelNames(List<LabelNameEntry> labelNames) {
         this.labelNames = labelNames;
     }
 
+    @DataBoundSetter
+    public void setPruneSourceBranch(boolean pruneSourceBranch) {
+        this.pruneSourceBranch = pruneSourceBranch;
+    }
+
+    @DataBoundSetter
+    public void setIsDraft(boolean isDraft) {
+        this.isDraft = isDraft;
+    }
+
+    @DataBoundSetter
+    public void setIsSquashMerge(boolean isSquashMerge) {
+        this.isSquashMerge = isSquashMerge;
+    }
+
     @Override
     public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener)
             throws InterruptedException, IOException {
@@ -168,13 +199,13 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
             if (!client.getPullRequest(pr).isEmpty()) {
                 LOGGER.log(Level.INFO, "Pull request {0} -> {1} already exists", LoggerUtil.toArray(head, base));
                 if (launcher != null) {
-                    launcher.getListener().getLogger().println("Pull request {0} -> {1} already exists");
+                    launcher.getListener().getLogger().printf("Pull request {0} -> {1} already exists", head, base);
                 }
 
                 return true;
             }
 
-            client.createPullRequest(pr);
+            client.createPullRequest(pr, pruneSourceBranch, isDraft, isSquashMerge);
             LOGGER.log(Level.INFO, "Pull request {0} generated, {1} -> {2}", LoggerUtil.toArray(title, head, base));
         }
 

src/main/resources/com/gitee/jenkins/publisher/GiteeCreatePullRequestPublisher/config.jelly

@@ -25,4 +25,13 @@
     <f:entry title="${%Label.names}" field="labelNames">
         <f:repeatableHeteroProperty hasHeader="true" addCaption="${%Label.names}" />
     </f:entry>
+    <f:entry title="${%Prune.source}" field="pruneSourceBranch">
+        <f:checkbox/>
+    </f:entry>
+    <f:entry title="${%Is.draft}" field="isDraft">
+        <f:checkbox/>
+    </f:entry>
+    <f:entry title="${%Squash.merge}" field="isSquashMerge">
+        <f:checkbox/>
+    </f:entry>
 </j:jelly>

src/main/resources/com/gitee/jenkins/publisher/GiteeCreatePullRequestPublisher/config.properties

@@ -5,4 +5,7 @@ Add.datetime=Add datetime (keep unique)
 Target.branch=Target branch
 Source.branch=Source branch
 body=Description
-Label.names=Label Names
+Label.names=Label Names
+Prune.source=Prune Source Branch
+Is.draft=Set as Draft
+Squash.merge=Squash when merged

src/test/java/com/gitee/jenkins/trigger/handler/pull/PullRequestHookTriggerHandlerImplTest.java

@@ -999,7 +999,7 @@ public User getCurrentUser() {
         }
 
         @Override
-        public void createPullRequest(PullRequest pr) {
+        public void createPullRequest(PullRequest pr, boolean pruneSourceBranch, boolean isDraft, boolean isSquashMerge) {
             throw new UnsupportedOperationException("Unimplemented method 'createPullRequest'");
         }