Merge branches 'use-additional-info-from-clone-links' and 'native-webhooks' into HEAD

Author: twz123

README.adoc

@@ -8,4 +8,4 @@ This means that when you have a private repository, or a private fork of a publi
 === How-to run and test with Bitbucket Server locally
 
 * https://developer.atlassian.com/server/framework/atlassian-sdk/install-the-atlassian-sdk-on-a-linux-or-mac-system/[Install the Atlassian SDK on Linux or Mac] or https://developer.atlassian.com/server/framework/atlassian-sdk/install-the-atlassian-sdk-on-a-windows-system/[on Windows]
-* To run 5.2.0 server: atlas-run-standalone -u 6.3.0 --product bitbucket --version 5.2.0 --data-version 5.2.0
+* To run 5.2.0 server: `atlas-run-standalone -u 6.3.0 --product bitbucket --version 5.2.0 --data-version 5.2.0`

pom.xml

@@ -33,7 +33,7 @@
   </parent>
 
   <artifactId>cloudbees-bitbucket-branch-source</artifactId>
-  <version>2.2.11-SNAPSHOT</version>
+  <version>2.2.13-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>Bitbucket Branch Source Plugin</name>
@@ -52,8 +52,23 @@
     <jenkins.version>1.642.3</jenkins.version>
     <java.level>7</java.level>
     <scm-api.version>2.2.0</scm-api.version>
-    <git.version>3.5.0</git.version>
+    <git.version>3.6.0</git.version>
   </properties>
+ 
+ <developers>
+     <developer>
+       <id>amuniz</id>
+       <name>Antonio Muniz</name>
+     </developer>
+     <developer>
+       <id>rsandell</id>
+       <name>Bobby Sandell</name>
+     </developer>
+     <developer>
+       <id>vivek</id>
+       <name>Vivek Pandey</name>
+     </developer>
+ </developers>
 
   <scm>
     <connection>scm:git:git://github.com/jenkinsci/bitbucket-branch-source-plugin.git</connection>
@@ -95,7 +110,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>structs</artifactId>
-      <version>1.9</version>
+      <version>1.10</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>

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

@@ -227,9 +227,11 @@ public void setCredentialsId(@CheckForNull String credentialsId) {
         this.credentialsId = Util.fixEmpty(credentialsId);
     }
 
+    @SuppressWarnings("unchecked")
     @DataBoundSetter
-    public void setTraits(@NonNull List<SCMTrait<? extends SCMTrait<?>>> traits) {
-        this.traits = new ArrayList<>(/*defensive*/Util.fixNull(traits));
+    public void setTraits(@NonNull List<SCMTrait> traits) {
+        // the reduced generics in the method signature are a workaround for JENKINS-26535
+        this.traits = new ArrayList<>((List)/*defensive*/Util.fixNull(traits));
     }
 
     public String getServerUrl() {
@@ -594,10 +596,11 @@ public String getIconClassName() {
             return "icon-bitbucket-scmnavigator";
         }
 
+        @SuppressWarnings("unchecked")
         @Override
         public SCMNavigator newInstance(String name) {
             BitbucketSCMNavigator instance = new BitbucketSCMNavigator(StringUtils.defaultString(name));
-            instance.setTraits(getTraitsDefaults());
+            instance.setTraits((List) getTraitsDefaults());
             return instance;
         }
 

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

@@ -86,6 +86,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jenkins.plugins.git.AbstractGitSCMSource.SCMRevisionImpl;
+import jenkins.plugins.git.GitTagSCMRevision;
 import jenkins.plugins.git.traits.GitBrowserSCMSourceTrait;
 import jenkins.scm.api.SCMHead;
 import jenkins.scm.api.SCMHeadCategory;
@@ -106,6 +107,7 @@
 import jenkins.scm.api.trait.SCMSourceTrait;
 import jenkins.scm.api.trait.SCMSourceTraitDescriptor;
 import jenkins.scm.impl.ChangeRequestSCMHeadCategory;
+import jenkins.scm.impl.TagSCMHeadCategory;
 import jenkins.scm.impl.UncategorizedSCMHeadCategory;
 import jenkins.scm.impl.form.NamedArrayList;
 import jenkins.scm.impl.trait.Discovery;
@@ -506,11 +508,15 @@ public BitbucketRepositoryType getRepositoryType() throws IOException, Interrupt
     }
 
     public BitbucketApi buildBitbucketClient() {
-        return BitbucketApiFactory.newInstance(getServerUrl(), credentials(), repoOwner, repository);
+        return buildBitbucketClient(repoOwner, repository);
     }
 
     public BitbucketApi buildBitbucketClient(PullRequestSCMHead head) {
-        return BitbucketApiFactory.newInstance(getServerUrl(), credentials(), head.getRepoOwner(), head.getRepository());
+        return buildBitbucketClient(head.getRepoOwner(), head.getRepository());
+    }
+
+    public BitbucketApi buildBitbucketClient(String repoOwner, String repository) {
+        return BitbucketApiFactory.newInstance(getServerUrl(), credentials(), repoOwner, repository);
     }
 
     @Override
@@ -566,7 +572,16 @@ protected Iterable<BitbucketBranch> create() {
                 });
             }
             if (request.isFetchTags()) {
-                // TODO request.setTags(...);
+                request.setTags(new LazyIterable<BitbucketBranch>() {
+                    @Override
+                    protected Iterable<BitbucketBranch> create() {
+                        try {
+                            return (Iterable<BitbucketBranch>) buildBitbucketClient().getTags();
+                        } catch (IOException | InterruptedException e) {
+                            throw new BitbucketSCMSource.WrappedException(e);
+                        }
+                    }
+                });
             }
 
             // now server the request
@@ -579,7 +594,8 @@ protected Iterable<BitbucketBranch> create() {
                 retrievePullRequests(request);
             }
             if (request.isFetchTags() && !request.isComplete()) {
-                // TODO
+                //Search tags
+                retrieveTags(request);
             }
         } catch (WrappedException e) {
             e.unwrap();
@@ -778,6 +794,38 @@ public String create() {
         request.listener().getLogger().format("%n  %d branches were processed%n", count);
     }
 
+
+    private void retrieveTags(final BitbucketSCMSourceRequest request)
+            throws IOException, InterruptedException {
+        String fullName = repoOwner + "/" + repository;
+        request.listener().getLogger().println("Looking up " + fullName + " for tags");
+
+        final BitbucketApi bitbucket = buildBitbucketClient();
+        Map<String, List<BitbucketHref>> links = bitbucket.getRepository().getLinks();
+        if (links != null && links.containsKey("clone")) {
+            cloneLinks = links.get("clone");
+        }
+        int count = 0;
+        for (final BitbucketBranch tag : request.getTags()) {
+            request.listener().getLogger().println("Checking tag " + tag.getName() + " from " + fullName);
+            count++;
+            if (request.process(new BitbucketTagSCMHead(tag.getName(), tag.getDateMillis(), repositoryType),
+                    new SCMSourceRequest.IntermediateLambda<String>() {
+                        @Nullable
+                        @Override
+                        public String create() {
+                            return tag.getRawNode();
+                        }
+                    }, new BitbucketProbeFactory(bitbucket, request), new BitbucketRevisionFactory(),
+                    new CriteriaWitness(request)
+            )) {
+                request.listener().getLogger().format("%n  %d tags were processed (query completed)%n", count);
+                return;
+            }
+        }
+        request.listener().getLogger().format("%n  %d tags were processed%n", count);
+    }
+
     @Override
     protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOException, InterruptedException {
         final BitbucketApi bitbucket = buildBitbucketClient();
@@ -823,6 +871,19 @@ protected SCMRevision retrieve(SCMHead head, TaskListener listener) throws IOExc
                         new SCMRevisionImpl(h, sourceRevision)
                 );
             }
+        } else if(head instanceof BitbucketTagSCMHead) {
+            BitbucketTagSCMHead tagHead = (BitbucketTagSCMHead) head;
+            List<? extends BitbucketBranch> tags = bitbucket.getTags();
+            String revision = findRawNode(head.getName(), tags, listener);
+            if (revision == null) {
+                LOGGER.log(Level.WARNING, "No tag found in {0}/{1} with name [{2}]", new Object[] { repoOwner, repository, head.getName() });
+                return null;
+            }
+            if (getRepositoryType() == BitbucketRepositoryType.MERCURIAL) {
+                return new MercurialRevision(head, revision);
+            } else {
+                return new GitTagSCMRevision(tagHead, revision);
+            }
         } else {
             String revision = findRawNode(head.getName(), branches, listener);
             if (revision == null) {
@@ -889,8 +950,10 @@ public SCM build(SCMHead head, SCMRevision revision) {
             type = ((PullRequestSCMHead) head).getRepositoryType();
         } else if (head instanceof BranchSCMHead) {
             type = ((BranchSCMHead) head).getRepositoryType();
+        } else if (head instanceof BitbucketTagSCMHead) {
+            type = ((BitbucketTagSCMHead) head).getRepositoryType();
         } else {
-            throw new IllegalArgumentException("Either PullRequestSCMHead or BranchSCMHead required as parameter");
+            throw new IllegalArgumentException("Either PullRequestSCMHead, BitbucketTagSCMHead or BranchSCMHead required as parameter");
         }
         if (type == null) {
             if (revision instanceof MercurialRevision) {
@@ -1260,8 +1323,9 @@ public ListBoxModel doFillCheckoutCredentialsIdItems(@AncestorInPath SCMSourceOw
         protected SCMHeadCategory[] createCategories() {
             return new SCMHeadCategory[]{
                     new UncategorizedSCMHeadCategory(Messages._BitbucketSCMSource_UncategorizedSCMHeadCategory_DisplayName()),
-                    new ChangeRequestSCMHeadCategory(Messages._BitbucketSCMSource_ChangeRequestSCMHeadCategory_DisplayName())
-                    // TODO add support for tags and maybe feature branch identification
+                    new ChangeRequestSCMHeadCategory(Messages._BitbucketSCMSource_ChangeRequestSCMHeadCategory_DisplayName()),
+                    new TagSCMHeadCategory(Messages._BitbucketSCMSource_TagSCMHeadCategory_DisplayName())
+                    // TODO add support for feature branch identification
             };
         }
 

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

@@ -114,7 +114,11 @@ public class BitbucketSCMSourceRequest extends SCMSourceRequest {
      */
     @CheckForNull
     private Iterable<BitbucketBranch> branches;
-    // TODO private Iterable<BitbucketTag> tags;
+    /**
+     * The tag details or {@code null} if not {@link #isFetchTags()}.
+     */
+    @CheckForNull
+    private Iterable<BitbucketBranch> tags;
 
     /**
      * Constructor.
@@ -363,7 +367,25 @@ public final Iterable<BitbucketBranch> getBranches() {
         return Util.fixNull(branches);
     }
 
-    // TODO Iterable<BitbucketTag> getTags() and setTags(...)
+    /**
+     * Provides the requests with the tag details.
+     *
+     * @param tags the tag details.
+     */
+    public final void setTags(@CheckForNull Iterable<BitbucketBranch> tags) {
+        this.tags = tags;
+    }
+
+    /**
+     * Returns the branch details or an empty list if either the request did not specify to {@link #isFetchTags()}
+     * or if the tag details have not been provided by {@link #setTags(Iterable)} yet.
+     *
+     * @return the tag details (may be empty)
+     */
+    @NonNull
+    public final Iterable<BitbucketBranch> getTags() {
+        return Util.fixNull(tags);
+    }
 
     /**
      * {@inheritDoc}

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

@@ -0,0 +1,91 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2018, 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;
+
+import com.cloudbees.jenkins.plugins.bitbucket.api.BitbucketRepositoryType;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import jenkins.plugins.git.GitTagSCMHead;
+import jenkins.scm.api.SCMHead;
+import jenkins.scm.api.mixin.TagSCMHead;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.DoNotUse;
+
+/**
+ * {@link SCMHead} for a BitBucket tags.
+ *
+ * @since 2.2.11
+ */
+public class BitbucketTagSCMHead extends GitTagSCMHead implements TagSCMHead {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Cache of the repository type.
+     *
+     * @since 2.2.11
+     */
+    // The repository type should be immutable for any SCMSource.
+    @CheckForNull
+    private final BitbucketRepositoryType repositoryType;
+
+    /**
+     * Constructor.
+     *
+     * @param tagName        the tag name
+     * @param timestamp      the timestamp of tag
+     */
+    public BitbucketTagSCMHead(@NonNull String tagName, long timestamp) {
+        this(tagName, timestamp, BitbucketRepositoryType.GIT);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param tagName        the tag name
+     * @param timestamp      the timestamp of tag
+     * @param repositoryType the repository type.
+     */
+    public BitbucketTagSCMHead(String tagName, long timestamp, BitbucketRepositoryType repositoryType) {
+        super(tagName, timestamp);
+        this.repositoryType = repositoryType;
+    }
+
+    /**
+     * Gets the repository type.
+     * @return the repository type or {@code null}
+     */
+    @CheckForNull
+    public BitbucketRepositoryType getRepositoryType() {
+        return repositoryType;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getPronoun() {
+        return Messages.BitBucketTagSCMHead_Pronoun();
+    }
+}