refactor: rename PendingBuildsHandler to MergeRequestBuildHandler

The handler cancels both queued and running MR builds, so the old name was misleading. Also remove the redundant nine-parameter factory overload that always defaulted cancelRunningBuildsOnUpdate to false.

Author: Manjunath M

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/AbstractWebHookTriggerHandler.java

@@ -36,7 +36,7 @@
 public abstract class AbstractWebHookTriggerHandler<H extends WebHook> implements WebHookTriggerHandler<H> {
 
     private static final Logger LOGGER = Logger.getLogger(AbstractWebHookTriggerHandler.class.getName());
-    protected PendingBuildsHandler pendingBuildsHandler = new PendingBuildsHandler();
+    protected MergeRequestBuildHandler mergeRequestBuildHandler = new MergeRequestBuildHandler();
 
     @Override
     public void handle(
@@ -70,7 +70,7 @@ public void handle(
 
     private void setCommitStatusPendingIfNecessary(Job<?, ?> job, H hook) {
         try {
-            String buildName = PendingBuildsHandler.resolvePendingBuildName(job);
+            String buildName = MergeRequestBuildHandler.resolvePendingBuildName(job);
             if (StringUtils.isNotBlank(buildName)) {
                 GitLabConnectionProperty connectionProperty = job.getProperty(GitLabConnectionProperty.class);
                 if (connectionProperty != null) {

…rigger/handler/PendingBuildsHandler.java …er/handler/MergeRequestBuildHandler.javasrc/main/java/com/dabsquared/gitlabjenkins/trigger/handler/PendingBuildsHandler.java renamed to src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/MergeRequestBuildHandler.java src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/PendingBuildsHandler.java renamed to src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/MergeRequestBuildHandler.java

@@ -24,9 +24,9 @@
 import org.jenkinsci.plugins.displayurlapi.DisplayURLProvider;
 import org.jenkinsci.plugins.workflow.job.WorkflowJob;
 
-public class PendingBuildsHandler {
+public class MergeRequestBuildHandler {
 
-    private static final Logger LOGGER = Logger.getLogger(PendingBuildsHandler.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(MergeRequestBuildHandler.class.getName());
 
     public void cancelPendingBuilds(Job<?, ?> job, Integer projectId, String branch) {
         Queue queue = Objects.requireNonNull(Jenkins.getInstance()).getQueue();

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerFactory.java

@@ -19,29 +19,6 @@ public final class MergeRequestHookTriggerHandlerFactory {
 
     private MergeRequestHookTriggerHandlerFactory() {}
 
-    public static MergeRequestHookTriggerHandler newMergeRequestHookTriggerHandler(
-            boolean triggerOnMergeRequest,
-            boolean triggerOnlyWithNewCommitsPushed,
-            boolean triggerOnAcceptedMergeRequest,
-            boolean triggerOnClosedMergeRequest,
-            TriggerOpenMergeRequest triggerOpenMergeRequest,
-            boolean skipWorkInProgressMergeRequest,
-            String labelsThatForcesBuildIfAdded,
-            boolean triggerOnApprovedMergeRequest,
-            boolean cancelPendingBuildsOnUpdate) {
-        return newMergeRequestHookTriggerHandler(
-                triggerOnMergeRequest,
-                triggerOnlyWithNewCommitsPushed,
-                triggerOnAcceptedMergeRequest,
-                triggerOnClosedMergeRequest,
-                triggerOpenMergeRequest,
-                skipWorkInProgressMergeRequest,
-                labelsThatForcesBuildIfAdded,
-                triggerOnApprovedMergeRequest,
-                cancelPendingBuildsOnUpdate,
-                false);
-    }
-
     public static MergeRequestHookTriggerHandler newMergeRequestHookTriggerHandler(
             boolean triggerOnMergeRequest,
             boolean triggerOnlyWithNewCommitsPushed,

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/merge/MergeRequestHookTriggerHandlerImpl.java

@@ -212,10 +212,10 @@ protected void cancelPendingBuildsIfNecessary(Job<?, ?> job, MergeRequestHook ho
         Integer sourceProjectId = hook.getObjectAttributes().getSourceProjectId();
         String sourceBranch = hook.getObjectAttributes().getSourceBranch();
         if (this.cancelPendingBuildsOnUpdate) {
-            this.pendingBuildsHandler.cancelPendingBuilds(job, sourceProjectId, sourceBranch);
+            this.mergeRequestBuildHandler.cancelPendingBuilds(job, sourceProjectId, sourceBranch);
         }
         if (this.cancelRunningBuildsOnUpdate) {
-            this.pendingBuildsHandler.cancelRunningBuilds(job, sourceProjectId, sourceBranch);
+            this.mergeRequestBuildHandler.cancelRunningBuilds(job, sourceProjectId, sourceBranch);
         }
     }
 

src/main/java/com/dabsquared/gitlabjenkins/trigger/handler/push/OpenMergeRequestPushHookTriggerHandler.java

@@ -16,7 +16,7 @@
 import com.dabsquared.gitlabjenkins.gitlab.hook.model.State;
 import com.dabsquared.gitlabjenkins.trigger.filter.BranchFilter;
 import com.dabsquared.gitlabjenkins.trigger.filter.MergeRequestLabelFilter;
-import com.dabsquared.gitlabjenkins.trigger.handler.PendingBuildsHandler;
+import com.dabsquared.gitlabjenkins.trigger.handler.MergeRequestBuildHandler;
 import com.dabsquared.gitlabjenkins.util.LoggerUtil;
 import hudson.model.Action;
 import hudson.model.CauseAction;
@@ -181,7 +181,7 @@ private CauseData retrieveCauseData(PushHook hook, Project project, MergeRequest
     }
 
     private void setCommitStatusPendingIfNecessary(Job<?, ?> job, Integer projectId, String commit, String ref) {
-        String buildName = PendingBuildsHandler.resolvePendingBuildName(job);
+        String buildName = MergeRequestBuildHandler.resolvePendingBuildName(job);
         if (StringUtils.isNotBlank(buildName)) {
             GitLabClient client =
                     job.getProperty(GitLabConnectionProperty.class).getClient();

…er/handler/PendingBuildsHandlerTest.java …andler/MergeRequestBuildHandlerTest.javasrc/test/java/com/dabsquared/gitlabjenkins/trigger/handler/PendingBuildsHandlerTest.java renamed to src/test/java/com/dabsquared/gitlabjenkins/trigger/handler/MergeRequestBuildHandlerTest.java src/test/java/com/dabsquared/gitlabjenkins/trigger/handler/PendingBuildsHandlerTest.java renamed to src/test/java/com/dabsquared/gitlabjenkins/trigger/handler/MergeRequestBuildHandlerTest.java

@@ -60,7 +60,7 @@
 
 @WithJenkins
 @ExtendWith(MockitoExtension.class)
-class PendingBuildsHandlerTest {
+class MergeRequestBuildHandlerTest {
 
     private static final String GITLAB_BUILD_NAME = "Jenkins";
 
@@ -202,12 +202,12 @@ void cancelRunningBuildsAbortsOnlyBuildsMatchingSourceProjectIdAndSourceBranch()
                 RunList.fromRuns(Arrays.asList(match1, match2, otherBranch, otherProject, finished, manualBuild));
         doReturn(runs).when(job).getBuilds();
 
-        new PendingBuildsHandler().cancelRunningBuilds(job, 1, "feature-branch");
+        new MergeRequestBuildHandler().cancelRunningBuilds(job, 1, "feature-branch");
 
         verify(matchExec1)
-                .interrupt(eq(Result.ABORTED), any(PendingBuildsHandler.SupersededByMergeRequestUpdate.class));
+                .interrupt(eq(Result.ABORTED), any(MergeRequestBuildHandler.SupersededByMergeRequestUpdate.class));
         verify(matchExec2)
-                .interrupt(eq(Result.ABORTED), any(PendingBuildsHandler.SupersededByMergeRequestUpdate.class));
+                .interrupt(eq(Result.ABORTED), any(MergeRequestBuildHandler.SupersededByMergeRequestUpdate.class));
         verify(otherBranchExec, never()).interrupt(any(), any());
         verify(otherProjectExec, never()).interrupt(any(), any());
     }
@@ -221,7 +221,7 @@ void cancelRunningBuildsAbortsOnlyBuildsMatchingSourceProjectIdAndSourceBranch()
 
         CauseData causeData = mock(CauseData.class);
         when(causeData.getSourceProjectId()).thenReturn(sourceProjectId);
-        // Branch is only read after project id matches (see PendingBuildsHandler.cancelRunningBuilds).
+        // Branch is only read after project id matches (see MergeRequestBuildHandler.cancelRunningBuilds).
         lenient().when(causeData.getSourceBranch()).thenReturn(sourceBranch);
 
         GitLabWebHookCause cause = mock(GitLabWebHookCause.class);