Add support for regex pattern in folders

src/main/java/jenkins/advancedqueue/jobinclusion/strategy/FolderBasedJobInclusionStrategy.java

@@ -24,14 +24,19 @@
 package jenkins.advancedqueue.jobinclusion.strategy;
 
 import com.cloudbees.hudson.plugins.folder.Folder;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.Extension;
 import hudson.model.Job;
 import hudson.util.ListBoxModel;
 import java.util.List;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 import jenkins.advancedqueue.DecisionLogger;
 import jenkins.advancedqueue.Messages;
 import jenkins.advancedqueue.jobinclusion.JobInclusionStrategy;
 import jenkins.model.Jenkins;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 /**
@@ -59,9 +64,32 @@
     }
     ;
 
+    @Restricted(NoExternalUse.class)
+    public static class JobPattern {
+        private String jobPattern;
+
+        @DataBoundConstructor
+        public JobPattern(String jobPattern) {
+            this.jobPattern = jobPattern;
+        }
+    }
+
     private String folderName;
 
+    private boolean useJobFilter = false;
+
+    private String jobPattern;
+    private transient Pattern compiledPattern;
+
     @DataBoundConstructor
+    public FolderBasedJobInclusionStrategy(String folderName, JobPattern jobFilter) {
+        this.folderName = folderName;
+        this.useJobFilter = (jobFilter != null);
+        if (this.useJobFilter) {
+            this.jobPattern = jobFilter.jobPattern;
+        }
+    }
+
     public FolderBasedJobInclusionStrategy(String folderName) {
         this.folderName = folderName;
     }
@@ -70,8 +98,56 @@
         return folderName;
     }
 
+    public boolean isUseJobFilter() {
+        return useJobFilter;
+    }
+
+    @CheckForNull
+    public String getJobPattern() {
+        return jobPattern;
+    }
+
+    @CheckForNull
+    private Pattern getCompiledPattern() throws PatternSyntaxException {
+        if (jobPattern == null) return null;
+
+        if (compiledPattern == null) compiledPattern = Pattern.compile(jobPattern);
+
+        return compiledPattern;
+    }
+
     @Override
     public boolean contains(DecisionLogger decisionLogger, Job<?, ?> job) {
-        return job.getFullName().startsWith(folderName);
+        if (job != null && job.getFullName().startsWith(folderName)) {
+            if (!isUseJobFilter() || getJobPattern() == null || getCompiledPattern() == null) {
+                decisionLogger.addDecisionLog(2, "Not using filter ...");
+                return true;
+            } else {
+                decisionLogger.addDecisionLog(2, "Using filter ...");
+                try {
+                    Pattern pattern = getCompiledPattern();
+                    if (pattern == null) {
+                        decisionLogger.addDecisionLog(3, "Job filter is null ...");
+                        return false;
+                    }
+                    if (job.getName() == null) {
+                        decisionLogger.addDecisionLog(3, "Job name is null ...");
+                        return false;
+                    }
+                    java.util.regex.Matcher matcher = pattern.matcher(job.getName());
+                    if (matcher.matches()) {
+                        decisionLogger.addDecisionLog(3, "Job is matching the filter ...");
+                        return true;
+                    } else {
+                        decisionLogger.addDecisionLog(3, "Job is not matching the filter ...");
+                        return false;
+                    }
+                } catch (PatternSyntaxException e) {
+                    decisionLogger.addDecisionLog(3, "Filter has syntax error");
+                    return false;
+                }
+            }
+        }
+        return false;
     }
 }

src/main/resources/jenkins/advancedqueue/jobinclusion/strategy/FolderBasedJobInclusionStrategy/config.jelly

@@ -5,6 +5,11 @@
 			<j:forEach var="folder" items="${descriptor.listFolderItems}">
 				<f:option value="${folder.value}" selected="${folder.value==instance.folderName}">${folder.name}</f:option>
 			</j:forEach>
+			<f:optionalBlock name="jobFilter" checked="${instance.useJobFilter}" title="Use a regular expression to only include a subset of the included Jobs">
+			    <f:entry title="Regular Expression">
+			        <f:textbox name="jobPattern" field="jobPattern" value="${instance.jobPattern}" />
+			    </f:entry>
+			</f:optionalBlock>
 		</select>
 	</f:entry>
 </j:jelly>

src/main/resources/jenkins/advancedqueue/jobinclusion/strategy/FolderBasedJobInclusionStrategy/help-jobPattern.html

@@ -0,0 +1,3 @@
+<div>
+    The regex pattern to be used to filter jobs inside the folder.
+</div>