Merge branch 'master' into coverage-lines

Author: Kelly Johnson

src/main/java/org/jenkinsci/plugins/ghprb/GhprbBuilds.java

@@ -11,7 +11,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbBuildStep;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbCommentAppender;
-import org.jenkinsci.plugins.ghprb.extensions.GhprbCommitStatus;
+import org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbCommitStatusException;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtension;
 import org.kohsuke.github.GHCommitState;
@@ -76,10 +76,10 @@ public void build(GhprbPullRequest pr, GHUser triggerSender, String commentBody)
                 repo.getName(),
                 trigger.getGitHubApiAuth().getCredentialsId());
 
-        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbCommitStatus.class)) {
-            if (ext instanceof GhprbCommitStatus) {
+        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbSimpleStatus.class)) {
+            if (ext instanceof GhprbSimpleStatus) {
                 try {
-                    ((GhprbCommitStatus) ext).onBuildTriggered(
+                    ((GhprbSimpleStatus) ext).onBuildTriggered(
                             trigger.getActualProject(),
                             pr.getHead(),
                             pr.isMergeable(),
@@ -138,10 +138,10 @@ public void onStarted(Run<?, ?> build, TaskListener listener) {
             e.printStackTrace(logger);
         }
 
-        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbCommitStatus.class)) {
-            if (ext instanceof GhprbCommitStatus) {
+        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbSimpleStatus.class)) {
+            if (ext instanceof GhprbSimpleStatus) {
                 try {
-                    ((GhprbCommitStatus) ext).onBuildStart(build, listener, repo.getGitHubRepo());
+                    ((GhprbSimpleStatus) ext).onBuildStart(build, listener, repo.getGitHubRepo());
                 } catch (GhprbCommitStatusException e) {
                     repo.commentOnFailure(build, listener, e);
                 }
@@ -199,10 +199,10 @@ public void onCompleted(Run<?, ?> build, TaskListener listener) {
             }
         }
 
-        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbCommitStatus.class)) {
-            if (ext instanceof GhprbCommitStatus) {
+        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbSimpleStatus.class)) {
+            if (ext instanceof GhprbSimpleStatus) {
                 try {
-                    ((GhprbCommitStatus) ext).onBuildComplete(build, listener, repo.getGitHubRepo());
+                    ((GhprbSimpleStatus) ext).onBuildComplete(build, listener, repo.getGitHubRepo());
                 } catch (GhprbCommitStatusException e) {
                     repo.commentOnFailure(build, listener, e);
                 }
@@ -260,10 +260,10 @@ public void onEnvironmentSetup(@SuppressWarnings("rawtypes") Run build, Launcher
 
         LOGGER.log(Level.FINE, "Job: " + build.getFullDisplayName() + " Attempting to send GitHub commit status");
 
-        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbCommitStatus.class)) {
-            if (ext instanceof GhprbCommitStatus) {
+        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbSimpleStatus.class)) {
+            if (ext instanceof GhprbSimpleStatus) {
                 try {
-                    ((GhprbCommitStatus) ext).onEnvironmentSetup(build, listener, repo.getGitHubRepo());
+                    ((GhprbSimpleStatus) ext).onEnvironmentSetup(build, listener, repo.getGitHubRepo());
                 } catch (GhprbCommitStatusException e) {
                     repo.commentOnFailure(build, listener, e);
                 }

src/main/java/org/jenkinsci/plugins/ghprb/GhprbPullRequest.java

@@ -4,7 +4,7 @@
 import hudson.model.Job;
 import hudson.model.Run;
 import org.apache.commons.lang.StringUtils;
-import org.jenkinsci.plugins.ghprb.extensions.GhprbCommitStatus;
+import org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbCommitStatusException;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtension;
 import org.kohsuke.github.GHCommitPointer;
@@ -710,10 +710,10 @@ public void createCommitStatus(GHCommitState state, String message) {
         GHRepository ghRepository = repo.getGitHubRepo();
         GhprbTrigger trigger = helper.getTrigger();
         Job<?, ?> actualProject = trigger.getActualProject();
-        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbCommitStatus.class)) {
-            if (ext instanceof GhprbCommitStatus) {
+        for (GhprbExtension ext : Ghprb.getJobExtensions(trigger, GhprbSimpleStatus.class)) {
+            if (ext instanceof GhprbSimpleStatus) {
                 try {
-                    ((GhprbCommitStatus) ext).createCommitStatus(actualProject, id, head, state, ghRepository, message);
+                    ((GhprbSimpleStatus) ext).createCommitStatus(actualProject, id, head, state, ghRepository, message);
                 } catch (GhprbCommitStatusException e) {
                     repo.commentOnFailure(null, null, e);
                 }

src/main/java/org/jenkinsci/plugins/ghprb/GhprbTrigger.java

@@ -28,7 +28,6 @@
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbBuildStep;
-import org.jenkinsci.plugins.ghprb.extensions.GhprbCommitStatus;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtension;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtensionDescriptor;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbGlobalDefault;
@@ -163,7 +162,7 @@ private void setExtensions(List<GhprbExtension> extensions) {
 
         // Filter out items that we only want one of, like the status updater.
         this.extensions = Ghprb.onlyOneEntry(rawList,
-                GhprbCommitStatus.class
+                GhprbSimpleStatus.class
         );
 
         // Make sure we have at least one of the types we need one of.
@@ -931,8 +930,7 @@ public boolean configure(StaplerRequest req, JSONObject formData) throws FormExc
 
             try {
                 extensions.rebuildHetero(req, formData, getGlobalExtensionDescriptors(), "extensions");
-                // Now make sure we have at least one of the types we need one of.
-                Ghprb.addIfMissing(this.extensions, new GhprbSimpleStatus(), GhprbCommitStatus.class);
+                Ghprb.addIfMissing(this.extensions, new GhprbSimpleStatus(), GhprbSimpleStatus.class);
             } catch (IOException e) {
                 e.printStackTrace();
             }

src/main/java/org/jenkinsci/plugins/ghprb/extensions/GhprbCommitStatus.java

@@ -11,7 +11,6 @@
 import org.jenkinsci.plugins.ghprb.Ghprb;
 import org.jenkinsci.plugins.ghprb.GhprbCause;
 import org.jenkinsci.plugins.ghprb.GhprbTrigger;
-import org.jenkinsci.plugins.ghprb.extensions.GhprbCommitStatus;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbCommitStatusException;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtension;
 import org.jenkinsci.plugins.ghprb.extensions.GhprbExtensionDescriptor;
@@ -32,7 +31,7 @@
 import java.util.Map;
 
 public class GhprbSimpleStatus extends GhprbExtension implements
-        GhprbCommitStatus, GhprbGlobalExtension, GhprbProjectExtension, GhprbGlobalDefault {
+        GhprbGlobalExtension, GhprbProjectExtension, GhprbGlobalDefault {
 
     @Extension
     public static final DescriptorImpl /*GhprbSimpleStatusDescriptor*/ DESCRIPTOR = new DescriptorImpl();
@@ -116,7 +115,6 @@ public boolean addIfMissing() {
         return true;
     }
 
-    @Override
     public void onBuildTriggered(Job<?, ?> project,
                                  String commitSha,
                                  boolean isMergeable,
@@ -146,15 +144,13 @@ public void onBuildTriggered(Job<?, ?> project,
         createCommitStatus(project, prId, commitSha, state, ghRepository, message);
     }
 
-    @Override
     public void onEnvironmentSetup(Run<?, ?> build,
                                    TaskListener listener,
                                    GHRepository repo) throws GhprbCommitStatusException {
         // no need to create a commit here -- the onBuildStart() event will fire
         // soon and will respect's the user's settings for startedStatus.
     }
 
-    @Override
     public void onBuildStart(Run<?, ?> build,
                              TaskListener listener,
                              GHRepository repo) throws GhprbCommitStatusException {