Refactor: Prepare modularisation of triggerSCM method

jenkinsci · Sep 19, 2023 · 9aa388a · 9aa388a
1 parent 798cdae
commit 9aa388a
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/BitBucketPPRJobProbe.java b/src/main/java/io/jenkins/plugins/bitbucketpushandpullrequest/BitBucketPPRJobProbe.java
@@ -64,6 +64,14 @@
 public class BitBucketPPRJobProbe {
   private static final Logger logger = Logger.getLogger(BitBucketPPRJobProbe.class.getName());
 
+  private static final BitBucketPPRPluginConfig globalConfig =
+          BitBucketPPRPluginConfig.getInstance();
+  private final List<SCM> scmTriggered;
+
+  public BitBucketPPRJobProbe() {
+    scmTriggered = new ArrayList<>();
+  }
+
   public void triggerMatchingJobs(BitBucketPPRHookEvent bitbucketEvent,
       BitBucketPPRAction bitbucketAction, BitBucketPPRObservable observable) {
 
@@ -124,7 +132,7 @@ && mPJobShouldNotBeTriggered(job, bitbucketEvent, bitbucketAction)) {
         scmTriggered.add(scmTrigger);
 
         try {
-          bitbucketTrigger.onPost(bitbucketEvent, bitbucketAction, scmTrigger, observable);
+          trigger.bitbucketTrigger.onPost(bitbucketEvent, bitbucketAction, scmTrigger, observable);
           return;
 
         } catch (Throwable e) {
@@ -139,6 +147,16 @@ && mPJobShouldNotBeTriggered(job, bitbucketEvent, bitbucketAction)) {
     }));
   }
 
+  private static class Trigger {
+    public final BitBucketPPRTrigger bitbucketTrigger;
+    public final Optional<SCMTriggerItem> scmTriggerItem;
+
+    public Trigger(BitBucketPPRTrigger bitbucketTrigger, Optional<SCMTriggerItem> item) {
+      this.bitbucketTrigger = bitbucketTrigger;
+      this.scmTriggerItem = item;
+    }
+  }
+
   private boolean mPJobShouldNotBeTriggered(Job<?, ?> job, BitBucketPPRHookEvent bitbucketEvent,
       BitBucketPPRAction bitbucketAction) {