Make branchesAlwaysIncludedRegex parameter not required (#399)

jenkinsci · Feb 9, 2024 · de45e0b · de45e0b
1 parent fca1f2c
commit de45e0b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/BranchDiscoveryTrait.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/BranchDiscoveryTrait.java
@@ -3,6 +3,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import hudson.Util;
 import hudson.util.ListBoxModel;
 import java.util.regex.Pattern;
 import jenkins.scm.api.SCMHead;
@@ -23,6 +24,7 @@
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
 
 /**
  * A {@link Discovery} trait for GitLab that will discover branches on the repository.
@@ -49,12 +51,10 @@ public class BranchDiscoveryTrait extends SCMSourceTrait {
      * Constructor for stapler.
      *
      * @param strategyId the strategy id.
-     * @param branchesAlwaysIncludedRegex the branchesAlwaysIncludedRegex.
      */
     @DataBoundConstructor
-    public BranchDiscoveryTrait(int strategyId, String branchesAlwaysIncludedRegex) {
+    public BranchDiscoveryTrait(int strategyId) {
         this.strategyId = strategyId;
-        this.branchesAlwaysIncludedRegex = branchesAlwaysIncludedRegex;
     }
 
     /**
@@ -85,6 +85,14 @@ public String getBranchesAlwaysIncludedRegex() {
         return branchesAlwaysIncludedRegex;
     }
 
+    /**
+     * Sets the branchesAlwaysIncludedRegex.
+     */
+    @DataBoundSetter
+    public void setBranchesAlwaysIncludedRegex(@CheckForNull String branchesAlwaysIncludedRegex) {
+        this.branchesAlwaysIncludedRegex = Util.fixEmptyAndTrim(branchesAlwaysIncludedRegex);
+    }
+
     /**
      * Returns the compiled {@link Pattern} of the branchesAlwaysIncludedRegex.
      *