feat: use DataBoundSetter

Author: johannespfeiffer

src/main/java/hudson/plugins/git/GitPublisher.java

@@ -25,10 +25,7 @@
 import org.eclipse.jgit.transport.URIish;
 import org.jenkinsci.plugins.gitclient.GitClient;
 import org.jenkinsci.plugins.gitclient.PushCommand;
-import org.kohsuke.stapler.AncestorInPath;
-import org.kohsuke.stapler.DataBoundConstructor;
-import org.kohsuke.stapler.QueryParameter;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.*;
 
 import javax.servlet.ServletException;
 import java.io.IOException;
@@ -303,7 +300,7 @@ else if (!tagExists) {
                         remote = gitSCM.getParamExpandedRepo(environment, remote);
                         remoteURI = remote.getURIs().get(0);
 
-                        if (b.isRebaseBeforePush()) {
+                        if (b.getRebaseBeforePush()) {
                             listener.getLogger().println("Fetch and rebase with " + branchName + " of " + targetRepo);
                             git.fetch_().from(remoteURI, remote.getFetchRefSpecs()).execute();
                             if (!git.revParse("HEAD").equals(git.revParse(targetRepo + "/" + branchName))) {
@@ -505,15 +502,20 @@ public static final class BranchToPush extends PushConfig {
         public String getBranchName() {
             return branchName;
         }
-        public boolean isRebaseBeforePush() {
-            return rebaseBeforePush;
-        }
 
         @DataBoundConstructor
-        public BranchToPush(String targetRepoName, String branchName, boolean rebaseBeforePush) {
+        public BranchToPush(String targetRepoName, String branchName) {
             super(targetRepoName);
             this.branchName = Util.fixEmptyAndTrim(branchName);
-            this.rebaseBeforePush = rebaseBeforePush;
+        }
+
+        @DataBoundSetter
+        public void setRebaseBeforePush(boolean shouldRebase) {
+            this.rebaseBeforePush = shouldRebase;
+        }
+
+        public boolean getRebaseBeforePush() {
+            return rebaseBeforePush;
         }
 
         @Extension

src/test/java/hudson/plugins/git/GitPublisherTest.java

@@ -140,7 +140,7 @@ public void testMergeAndPush() throws Exception {
 
         project.getPublishersList().add(new GitPublisher(
                 Collections.<TagToPush>emptyList(),
-                Collections.singletonList(new BranchToPush("origin", "integration", false)),
+                Collections.singletonList(new BranchToPush("origin", "integration")),
                 Collections.<NoteToPush>emptyList(),
                 true, true, false));
 
@@ -177,7 +177,7 @@ public void testMergeAndPushFF() throws Exception {
 
         project.getPublishersList().add(new GitPublisher(
                 Collections.<TagToPush>emptyList(),
-                Collections.singletonList(new BranchToPush("origin", "integration", false)),
+                Collections.singletonList(new BranchToPush("origin", "integration")),
                 Collections.<NoteToPush>emptyList(),
                 true, true, false));
 
@@ -262,7 +262,7 @@ public void testMergeAndPushNoFF() throws Exception {
 
         project.getPublishersList().add(new GitPublisher(
                 Collections.<TagToPush>emptyList(),
-                Collections.singletonList(new BranchToPush("origin", "integration", false)),
+                Collections.singletonList(new BranchToPush("origin", "integration")),
                 Collections.<NoteToPush>emptyList(),
                 true, true, false));
 
@@ -351,7 +351,7 @@ public void testMergeAndPushFFOnly() throws Exception {
 
         project.getPublishersList().add(new GitPublisher(
                 Collections.<TagToPush>emptyList(),
-                Collections.singletonList(new BranchToPush("origin", "integration", false)),
+                Collections.singletonList(new BranchToPush("origin", "integration")),
                 Collections.<NoteToPush>emptyList(),
                 true, true, false));
 
@@ -454,7 +454,7 @@ public void testPushEnvVarsInRemoteConfig() throws Exception{
 
         project.getPublishersList().add(new GitPublisher(
         		Collections.singletonList(new TagToPush("$TARGET_NAME", tag_name, "", false, false)),
-                Collections.singletonList(new BranchToPush("$TARGET_NAME", "$TARGET_BRANCH", false)),
+                Collections.singletonList(new BranchToPush("$TARGET_NAME", "$TARGET_BRANCH")),
                 Collections.singletonList(new NoteToPush("$TARGET_NAME", note_content, Constants.R_NOTES_COMMITS, false)),
                 true, false, true));
 
@@ -485,7 +485,7 @@ public void testForcePush() throws Exception {
 
         GitPublisher forcedPublisher = new GitPublisher(
                 Collections.<TagToPush>emptyList(),
-                Collections.singletonList(new BranchToPush("origin", "otherbranch", false)),
+                Collections.singletonList(new BranchToPush("origin", "otherbranch")),
                 Collections.<NoteToPush>emptyList(),
                 true, true, true);
         project.getPublishersList().add(forcedPublisher);
@@ -532,7 +532,7 @@ public void testForcePush() throws Exception {
         project.getPublishersList().remove(forcedPublisher);
         GitPublisher unforcedPublisher = new GitPublisher(
                 Collections.<TagToPush>emptyList(),
-                Collections.singletonList(new BranchToPush("origin", "otherbranch", false)),
+                Collections.singletonList(new BranchToPush("origin", "otherbranch")),
                 Collections.<NoteToPush>emptyList(),
                 true, true, false);
         project.getPublishersList().add(unforcedPublisher);
@@ -582,7 +582,7 @@ public void testMergeAndPushWithSkipTagEnabled() throws Exception {
 
       project.getPublishersList().add(new GitPublisher(
           Collections.<TagToPush>emptyList(),
-          Collections.singletonList(new BranchToPush("origin", "integration", false)),
+          Collections.singletonList(new BranchToPush("origin", "integration")),
           Collections.<NoteToPush>emptyList(),
           true, true, false));
 
@@ -613,9 +613,12 @@ public void testRebaseBeforePush() throws Exception {
                 Collections.<GitSCMExtension>emptyList());
         project.setScm(scm);
 
+        BranchToPush btp = new BranchToPush("origin", "master");
+        btp.setRebaseBeforePush(true);
+
         GitPublisher rebasedPublisher = new GitPublisher(
                 Collections.<TagToPush>emptyList(),
-                Collections.singletonList(new BranchToPush("origin", "master", true)),
+                Collections.singletonList(btp),
                 Collections.<NoteToPush>emptyList(),
                 true, true, true);
         project.getPublishersList().add(rebasedPublisher);
@@ -698,7 +701,7 @@ private void checkEnvVar(FreeStyleProject project, String envName, String envVal
         String noteValue = "note for " + envValue;
         GitPublisher publisher = new GitPublisher(
                 Collections.singletonList(new TagToPush("origin", tagNameReference, tagMessageReference, false, true)),
-                Collections.singletonList(new BranchToPush("origin", envReference, false)),
+                Collections.singletonList(new BranchToPush("origin", envReference)),
                 Collections.singletonList(new NoteToPush("origin", noteReference, Constants.R_NOTES_COMMITS, false)),
                 true, true, true);
         assertTrue(publisher.isForcePush());