[JENKINS-55927] Hook event should not trigger Branch Indexing

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/HookProcessor.java

@@ -39,8 +39,7 @@
  * Abstract hook processor.
  *
  * Add new hook processors by extending this class and implement {@link #process(HookEventType, String, BitbucketType, String)},
- * extract owner and repository name from the hook payload and then call {@link #scmSourceReIndex(String, String)}
- * to launch a branch/PR reindexing on the matching SCMSource.
+ * extract details from the hook payload and then fire an {@link jenkins.scm.api.SCMEvent} to dispatch it to the SCM API.
  */
 public abstract class HookProcessor {
 
@@ -86,10 +85,11 @@
     /**
      * To be called by implementations once the owner and the repository have been extracted from the payload.
      *
+     * @deprecated Branch Indexing should not be triggered directly. But through {@link jenkins.scm.api.SCMSourceEvent}.
      * @param owner the repository owner as configured in the SCMSource
      * @param repository the repository name as configured in the SCMSource
      */
     protected void scmSourceReIndex(final String owner, final String repository) {
         try (ACLContext context = ACL.as(ACL.SYSTEM)) {
             boolean reindexed = false;
             for (SCMSourceOwner scmOwner : SCMSourceOwners.all()) {

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/NativeServerPushHookProcessor.java

@@ -66,6 +66,9 @@
 
 public class NativeServerPushHookProcessor extends HookProcessor {
 
+    private static final boolean SCAN_ON_PUSH_WITH_EMPTY_CHANGES = Boolean.getBoolean(
+        NativeServerPushHookProcessor.class.getName()+".scanOnPushWithEmptyChanges");
+
     private static final Logger LOGGER = Logger.getLogger(NativeServerPushHookProcessor.class.getName());
 
     @Override
@@ -102,10 +105,10 @@ public void process(HookEventType hookEvent, String payload, BitbucketType insta
             return;
         }
 
-        if (changes.isEmpty()) {
+        if (SCAN_ON_PUSH_WITH_EMPTY_CHANGES && changes.isEmpty()) {
             final String owner = repository.getOwnerName();
             final String repositoryName = repository.getRepositoryName();
-            LOGGER.log(Level.INFO, "Received hook from Bitbucket. Processing push event on {0}/{1}",
+            LOGGER.log(Level.INFO, "Received push hook with empty changes from Bitbucket. Processing push event on {0}/{1}",
                 new Object[] { owner, repositoryName });
             scmSourceReIndex(owner, repositoryName);
             return;

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/PushHookProcessor.java

@@ -59,6 +59,9 @@
 
 public class PushHookProcessor extends HookProcessor {
 
+    private static final boolean SCAN_ON_PUSH_WITH_EMPTY_CHANGES = Boolean.getBoolean(
+        PushHookProcessor.class.getName()+".scanOnPushWithEmptyChanges");
+
     private static final Logger LOGGER = Logger.getLogger(PushHookProcessor.class.getName());
 
     @Override
@@ -71,15 +74,15 @@
                 push = BitbucketCloudWebhookPayload.pushEventFromPayload(payload);
             }
             if (push != null) {
-                String owner = push.getRepository().getOwnerName();
-                final String repository = push.getRepository().getRepositoryName();
-                if (push.getChanges().isEmpty()) {
-                    LOGGER.log(Level.INFO, "Received hook from Bitbucket. Processing push event on {0}/{1}",
-                            new Object[]{owner, repository});
+                if (SCAN_ON_PUSH_WITH_EMPTY_CHANGES && push.getChanges().isEmpty()) {
+                    final String owner = push.getRepository().getOwnerName();
+                    final String repository = push.getRepository().getRepositoryName();
+                    LOGGER.log(Level.INFO, "Received push hook with empty changes from Bitbucket. Processing push event on {0}/{1}",
+                        new Object[]{owner, repository});
                     scmSourceReIndex(owner, repository);
                 } else {
                     SCMHeadEvent.Type type = null;
-                    for (BitbucketPushEvent.Change change: push.getChanges()) {
+                    for (BitbucketPushEvent.Change change : push.getChanges()) {
                         if ((type == null || type == SCMEvent.Type.CREATED) && change.isCreated()) {
                             type = SCMEvent.Type.CREATED;
                         } else if ((type == null || type == SCMEvent.Type.REMOVED) && change.isClosed()) {
@@ -170,7 +173,7 @@
                             }
 
                             Map<SCMHead, SCMRevision> result = new HashMap<>();
-                            for (BitbucketPushEvent.Change change: getPayload().getChanges()) {
+                            for (BitbucketPushEvent.Change change : getPayload().getChanges()) {
                                 if (change.isClosed()) {
                                     result.put(new BranchSCMHead(change.getOld().getName()), null);
                                 } else {
@@ -199,7 +202,7 @@
 
                         @Override
                         public boolean isMatch(@NonNull SCM scm) {
                             // TODO
                             return false;
                         }
                     }, BitbucketSCMSource.getEventDelaySeconds(), TimeUnit.SECONDS);