refactored plugin to support triggering from different sources such as the github-sqs-plugin

aaronwalker · aaronwalker · commit 1e3be7db7434 · 2012-03-08T21:07:28.000+11:00
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ target
 *.iml
 *.ipr
 *.iws
+.idea/
diff --git a/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java b/src/main/java/com/cloudbees/jenkins/GitHubPushTrigger.java
@@ -48,7 +48,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
-public class GitHubPushTrigger extends Trigger<AbstractProject> implements Runnable {
+public class GitHubPushTrigger extends Trigger<AbstractProject> implements GitHubTrigger, Runnable {
     @DataBoundConstructor
     public GitHubPushTrigger() {
     }
diff --git a/src/main/java/com/cloudbees/jenkins/GitHubTrigger.java b/src/main/java/com/cloudbees/jenkins/GitHubTrigger.java
@@ -0,0 +1,17 @@
+package com.cloudbees.jenkins;
+
+import hudson.model.AbstractProject;
+import hudson.triggers.Trigger;
+
+import java.util.Set;
+
+/**
+ * Used to trigger builds that use github repos
+ *
+ * @author aaronwalker
+ */
+public interface GitHubTrigger  {
+
+    public void onPost();
+    public Set<GitHubRepositoryName> getGitHubRepositories();
+}
diff --git a/src/main/java/com/cloudbees/jenkins/GitHubWebHook.java b/src/main/java/com/cloudbees/jenkins/GitHubWebHook.java
@@ -8,6 +8,7 @@
 import hudson.model.RootAction;
 import hudson.model.UnprotectedRootAction;
 import hudson.security.ACL;
+import hudson.triggers.Trigger;
 import hudson.util.AdaptedIterator;
 import hudson.util.Iterators.FilterIterator;
 import net.sf.json.JSONObject;
@@ -145,7 +146,11 @@ protected boolean filter(GitHub g) {
      * 1 push to 2 branches will result in 2 pushes.
      */
     public void doIndex(StaplerRequest req) {
-        JSONObject o = JSONObject.fromObject(req.getParameter("payload"));
+        processGitHubPayload(req.getParameter("payload"),GitHubPushTrigger.class);
+    }
+    
+    public void processGitHubPayload(String payload, Class<? extends Trigger> triggerClass) {
+        JSONObject o = JSONObject.fromObject(payload);
         JSONObject repository = o.getJSONObject("repository");
         String repoUrl = repository.getString("url"); // something like 'https://github.com/kohsuke/foo'
         String repoName = repository.getString("name"); // 'foo' portion of the above URL
@@ -163,9 +168,9 @@ public void doIndex(StaplerRequest req) {
             try {
                 GitHubRepositoryName changedRepository = new GitHubRepositoryName(matcher.group(1), ownerName, repoName);
                 for (AbstractProject<?,?> job : Hudson.getInstance().getAllItems(AbstractProject.class)) {
-                    GitHubPushTrigger trigger = job.getTrigger(GitHubPushTrigger.class);
+                    GitHubTrigger trigger = (GitHubTrigger) job.getTrigger(triggerClass);
                     if (trigger!=null) {
-                        LOGGER.fine("Considering to poke "+job.getFullDisplayName());
+                        LOGGER.info("Considering to poke "+job.getFullDisplayName());
                         if (trigger.getGitHubRepositories().contains(changedRepository))
                             trigger.onPost();
                         else

-Original file line number
+Diff line change
 *.iml
 *.ipr
 *.iws
 +.idea/
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`*`
`49`	`49`	`* @author Kohsuke Kawaguchi`
`50`	`50`	`*/`
`51`		`-public class GitHubPushTrigger extends Trigger<AbstractProject> implements Runnable {`
	`51`	`+public class GitHubPushTrigger extends Trigger<AbstractProject> implements GitHubTrigger, Runnable {`
`52`	`52`	`@DataBoundConstructor`
`53`	`53`	`public GitHubPushTrigger() {`
`54`	`54`	`}`