[FIXED JENKINS-40833] Report primary branch

jenkinsci · Jan 5, 2017 · e2d92c2 · e2d92c2
1 parent 5cf69ca
commit e2d92c2
Show file tree

Hide file tree

Showing 3 changed files with 118 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>scm-api</artifactId>
-            <version>2.0.1-beta-1</version>
+            <version>2.0.1-20170105.115402-8</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubDefaultBranch.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubDefaultBranch.java
@@ -0,0 +1,102 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2017 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 org.jenkinsci.plugins.github_branch_source;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import hudson.model.InvisibleAction;
+import java.io.Serializable;
+
+/**
+ * @author Stephen Connolly
+ */
+public class GitHubDefaultBranch extends InvisibleAction implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @NonNull
+    private final String repoOwner;
+    @NonNull
+    private final String repository;
+    @NonNull
+    private final String defaultBranch;
+
+    public GitHubDefaultBranch(@NonNull String repoOwner, @NonNull String repository, @NonNull String defaultBranch) {
+        this.repoOwner = repoOwner;
+        this.repository = repository;
+        this.defaultBranch = defaultBranch;
+    }
+
+    @NonNull
+    public String getRepoOwner() {
+        return repoOwner;
+    }
+
+    @NonNull
+    public String getRepository() {
+        return repository;
+    }
+
+    @NonNull
+    public String getDefaultBranch() {
+        return defaultBranch;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        GitHubDefaultBranch that = (GitHubDefaultBranch) o;
+
+        if (!repoOwner.equals(that.repoOwner)) {
+            return false;
+        }
+        if (!repository.equals(that.repository)) {
+            return false;
+        }
+        return defaultBranch.equals(that.defaultBranch);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = repoOwner.hashCode();
+        result = 31 * result + repository.hashCode();
+        result = 31 * result + defaultBranch.hashCode();
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "GitHubDefaultBranch{" +
+                "repoOwner='" + repoOwner + '\'' +
+                ", repository='" + repository + '\'' +
+                ", defaultBranch='" + defaultBranch + '\'' +
+                '}';
+    }
+
+
+}
diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java
@@ -80,6 +80,7 @@
 import jenkins.scm.api.SCMSourceEvent;
 import jenkins.scm.api.SCMSourceOwner;
 import jenkins.scm.api.metadata.ObjectMetadataAction;
+import jenkins.scm.api.metadata.PrimaryInstanceMetadataAction;
 import jenkins.scm.impl.ChangeRequestSCMHeadCategory;
 import jenkins.scm.impl.UncategorizedSCMHeadCategory;
 import org.apache.commons.lang.StringUtils;
@@ -932,7 +933,7 @@ protected boolean isCategoryEnabled(@NonNull SCMHeadCategory category) {
     @Override
     protected List<Action> retrieveActions(@NonNull SCMHead head,
                                            @CheckForNull SCMHeadEvent event,
-                                           @NonNull TaskListener listener) throws IOException {
+                                           @NonNull TaskListener listener) throws IOException, InterruptedException {
         // TODO when we have support for trusted events, use the details from event if event was from trusted source
         List<Action> result = new ArrayList<>();
         SCMSourceOwner owner = getOwner();
@@ -949,6 +950,16 @@ protected List<Action> retrieveActions(@NonNull SCMHead head,
                 }
                 result.add(new GitHubLink("icon-github-branch", url));
             }
+            if (head instanceof BranchSCMHead) {
+                for (GitHubDefaultBranch p : ((Actionable) owner).getActions(GitHubDefaultBranch.class)) {
+                    if (StringUtils.equals(getRepoOwner(), p.getRepoOwner())
+                            && StringUtils.equals(repository, p.getRepository())
+                            && StringUtils.equals(p.getDefaultBranch(), head.getName())) {
+                        result.add(new PrimaryInstanceMetadataAction());
+                        break;
+                    }
+                }
+            }
         }
         return result;
     }
@@ -968,6 +979,9 @@ protected List<Action> retrieveActions(@CheckForNull SCMSourceEvent event,
         result.add(new ObjectMetadataAction(null, repo.getDescription(), Util.fixEmpty(repo.getHomepage())));
         result.add(new GitHubRepoMetadataAction());
         result.add(new GitHubLink("icon-github-repo", repo.getHtmlUrl()));
+        if (StringUtils.isNotBlank(repo.getDefaultBranch())) {
+            result.add(new GitHubDefaultBranch(getRepoOwner(), repository, repo.getDefaultBranch()));
+        }
         return result;
     }