Extract event anonymous inner classes from webhook processor.

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketSCMSource.java

@@ -1047,7 +1047,8 @@ private void setPrimaryCloneLinks(List<BitbucketHref> links) {
         links.forEach(link -> {
             if (StringUtils.startsWithIgnoreCase(link.getName(), "http")) {
                 // Remove the username from URL because it will be set into the GIT_URL variable
-                // credentials used to clone or for push/pull could be different than this will cause a failure
+                // credentials used to git clone or push/pull operation could be different than this (for example SSH)
+                // and will run into a failure
                 // Restore the behaviour before mirror link feature.
                 link.setHref(URLUtils.removeAuthority(link.getHref()));
             }

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/NativeServerHeadEvent.java → src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/AbstractNativeServerSCMHeadEvent.java

@@ -27,91 +27,88 @@
 import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSource;
 import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMSourceContext;
 import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository;
-import com.cloudbees.jenkins.plugins.bitbucket.endpoints.BitbucketCloudEndpoint;
+import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils;
 import com.cloudbees.jenkins.plugins.bitbucket.server.client.repository.BitbucketServerRepository;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.scm.SCM;
 import java.util.Collections;
 import java.util.Map;
-import java.util.logging.Logger;
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMHeadEvent;
 import jenkins.scm.api.SCMHeadObserver;
 import jenkins.scm.api.SCMNavigator;
 import jenkins.scm.api.SCMRevision;
 import jenkins.scm.api.SCMSource;
 
-abstract class NativeServerHeadEvent<P> extends SCMHeadEvent<P> {
-    private static final Logger LOGGER = Logger.getLogger(NativeServerHeadEvent.class.getName());
-
+abstract class AbstractNativeServerSCMHeadEvent<P> extends SCMHeadEvent<P> {
     @NonNull
-    private final String serverUrl;
+    private final String serverURL;
 
-    NativeServerHeadEvent(String serverUrl, Type type, P payload, String origin) {
+    AbstractNativeServerSCMHeadEvent(String serverURL, Type type, P payload, String origin) {
         super(type, payload, origin);
-        this.serverUrl = serverUrl;
+        this.serverURL = serverURL;
     }
 
     @NonNull
     @Override
     public String getSourceName() {
         return getRepository().getRepositoryName();
     }
 
     @Override
     public boolean isMatch(@NonNull SCMNavigator navigator) {
         if (!(navigator instanceof BitbucketSCMNavigator)) {
             return false;
         }
 
         final BitbucketSCMNavigator bbNav = (BitbucketSCMNavigator) navigator;
 
-        return isServerUrlMatch(bbNav.getServerUrl()) && bbNav.getRepoOwner().equalsIgnoreCase(getRepository().getOwnerName());
+        return isServerURLMatch(bbNav.getServerUrl()) && bbNav.getRepoOwner().equalsIgnoreCase(getRepository().getOwnerName());
     }
 
     @Override
     public boolean isMatch(@NonNull SCM scm) {
         // TODO
         return false;
     }
 
     @NonNull
     @Override
     public Map<SCMHead, SCMRevision> heads(@NonNull SCMSource source) {
         final BitbucketSCMSource src = getMatchingBitbucketSource(source);
         return src == null ? Collections.<SCMHead, SCMRevision> emptyMap() : heads(src);
     }
 
     protected abstract BitbucketServerRepository getRepository();
 
     @NonNull
     protected abstract Map<SCMHead, SCMRevision> heads(@NonNull BitbucketSCMSource source);
 
-    protected boolean isServerUrlMatch(String serverUrl) {
-        if (serverUrl == null || BitbucketCloudEndpoint.SERVER_URL.equals(serverUrl)) {
+    protected boolean isServerURLMatch(String serverURL) {
+        if (serverURL == null || BitbucketApiUtils.isCloud(serverURL)) {
             return false; // this is Bitbucket Cloud, which is not handled by this processor
         }
 
-        return serverUrl.equals(this.serverUrl);
+        return serverURL.equals(this.serverURL);
     }
 
     protected boolean eventMatchesRepo(BitbucketSCMSource source) {
         final BitbucketRepository repo = getRepository();
         return repo.getOwnerName().equalsIgnoreCase(source.getRepoOwner())
             && repo.getRepositoryName().equalsIgnoreCase(source.getRepository());
     }
 
     protected BitbucketSCMSourceContext contextOf(BitbucketSCMSource source) {
         return new BitbucketSCMSourceContext(null, SCMHeadObserver.none()).withTraits(source.getTraits());
     }
 
     private BitbucketSCMSource getMatchingBitbucketSource(SCMSource source) {
         if (!(source instanceof BitbucketSCMSource)) {
             return null;
         }
 
         final BitbucketSCMSource src = (BitbucketSCMSource) source;
-        if (!isServerUrlMatch(src.getServerUrl())) {
+        if (!isServerURLMatch(src.getServerUrl())) {
             return null;
         }
 

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

@@ -0,0 +1,113 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.cloudbees.jenkins.plugins.bitbucket.hooks;
+
+import com.cloudbees.jenkins.plugins.bitbucket.BitbucketSCMNavigator;
+import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketHref;
+import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepository;
+import com.cloudbees.jenkins.plugins.bitbucket.client.events.BitbucketCloudPullRequestEvent;
+import com.cloudbees.jenkins.plugins.bitbucket.impl.util.BitbucketApiUtils;
+import com.cloudbees.jenkins.plugins.bitbucket.server.events.BitbucketServerPullRequestEvent;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.scm.SCM;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
+import jenkins.scm.api.SCMHeadEvent;
+import jenkins.scm.api.SCMNavigator;
+import org.apache.commons.lang.StringUtils;
+
+abstract class AbstractSCMHeadEvent<P> extends SCMHeadEvent<P> {
+
+    protected AbstractSCMHeadEvent(Type type, P payload, String origin) {
+        super(type, payload, origin);
+    }
+
+    @Override
+    public boolean isMatch(@NonNull SCMNavigator navigator) {
+        if (!(navigator instanceof BitbucketSCMNavigator)) {
+            return false;
+        }
+        BitbucketSCMNavigator bbNav = (BitbucketSCMNavigator) navigator;
+        if (!isProjectKeyMatch(bbNav.getProjectKey())) {
+            return false;
+        }
+
+        if (!isServerURLMatch(bbNav.getServerUrl())) {
+            return false;
+        }
+        return bbNav.getRepoOwner().equalsIgnoreCase(getRepository().getOwnerName());
+    }
+
+    protected abstract BitbucketRepository getRepository();
+
+    private boolean isProjectKeyMatch(String projectKey) {
+        if (StringUtils.isBlank(projectKey)) {
+            return true;
+        }
+        BitbucketRepository repository = getRepository();
+        if (repository.getProject() != null) {
+            return projectKey.equals(repository.getProject().getKey());
+        }
+        return true;
+    }
+
+    protected boolean isServerURLMatch(String serverURL) {
+        if (serverURL == null || BitbucketApiUtils.isCloud(serverURL)) {
+            // this is a Bitbucket cloud navigator
+            if (getPayload() instanceof BitbucketServerPullRequestEvent) {
+                return false;
+            }
+        } else {
+            // this is a Bitbucket server navigator
+            if (getPayload() instanceof BitbucketCloudPullRequestEvent) {
+                return false;
+            }
+            Map<String, List<BitbucketHref>> links = getRepository().getLinks();
+            if (links != null && links.containsKey("self")) {
+                boolean matches = false;
+                for (BitbucketHref link: links.get("self")) {
+                    try {
+                        URI navUri = new URI(serverURL);
+                        URI evtUri = new URI(link.getHref());
+                        if (navUri.getHost().equalsIgnoreCase(evtUri.getHost())) {
+                            matches = true;
+                            break;
+                        }
+                    } catch (URISyntaxException e) {
+                        // ignore
+                    }
+                }
+                return matches;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean isMatch(@NonNull SCM scm) {
+        return false;
+    }
+}

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

@@ -102,14 +102,20 @@
             LOGGER.log(Level.FINE, "X-Bitbucket-Type header / server_url request parameter not found. Bitbucket Cloud webhook incoming.");
         }
 
+        HookProcessor hookProcessor = getHookProcessor(type);
         try {
-            type.getProcessor().process(type, body, instanceType, origin, serverUrl);
+            hookProcessor.process(type, body, instanceType, origin, serverUrl);
         } catch (AbstractMethodError e) {
-            type.getProcessor().process(body, instanceType);
+            hookProcessor.process(body, instanceType);
         }
         return HttpResponses.ok();
     }
 
+    /* For test purpose */
+    HookProcessor getHookProcessor(HookEventType type) {
+        return type.getProcessor();
+    }
+
     @Override
     public String getIconFileName() {
         return null;

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

@@ -126,7 +126,7 @@
     /**
      * Sent when hitting the {@literal "Test connection"} button in Bitbucket Server. Apparently undocumented.
      */
-    SERVER_PING("diagnostics:ping", PingHookProcessor.class);
+    SERVER_PING("diagnostics:ping", NativeServerPingHookProcessor.class);
 
 
     private final String key;
@@ -149,8 +149,8 @@
 
     public HookProcessor getProcessor() {
         try {
-            return (HookProcessor) clazz.newInstance();
-        } catch (InstantiationException | IllegalAccessException e) {
+            return (HookProcessor) clazz.getDeclaredConstructor().newInstance();
+        } catch (ReflectiveOperationException e) {
             throw new AssertionError("Can not instantiate hook payload processor: " + e.getMessage());
         }
     }

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

@@ -90,14 +90,15 @@
      * @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)) {
+        try (ACLContext context = ACL.as2(ACL.SYSTEM2)) {
             boolean reindexed = false;
             for (SCMSourceOwner scmOwner : SCMSourceOwners.all()) {
                 List<SCMSource> sources = scmOwner.getSCMSources();
                 for (SCMSource source : sources) {
                     // Search for the correct SCM source
-                    if (source instanceof BitbucketSCMSource && ((BitbucketSCMSource) source).getRepoOwner().equalsIgnoreCase(owner)
-                            && ((BitbucketSCMSource) source).getRepository().equals(repository)) {
+                    if (source instanceof BitbucketSCMSource scmSource
+                            && scmSource.getRepoOwner().equalsIgnoreCase(owner)
+                            && scmSource.getRepository().equals(repository)) {
                         LOGGER.log(Level.INFO, "Multibranch project found, reindexing " + scmOwner.getName());
                         scmOwner.onSCMSourceUpdated(source);
                         reindexed = true;

src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/PingHookProcessor.java → src/main/java/com/cloudbees/jenkins/plugins/bitbucket/hooks/NativeServerPingHookProcessor.java

@@ -23,12 +23,17 @@
  */
 package com.cloudbees.jenkins.plugins.bitbucket.hooks;
 
+import hudson.RestrictedSince;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 
-public class PingHookProcessor extends HookProcessor {
+@Restricted(NoExternalUse.class)
+@RestrictedSince("933.3.0")
+public class NativeServerPingHookProcessor extends HookProcessor {
 
-    private static final Logger LOGGER = Logger.getLogger(PingHookProcessor.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(NativeServerPingHookProcessor.class.getName());
 
     @Override
     public void process(HookEventType hookEvent, String payload, BitbucketType instanceType, String origin) {