Use repo and owner names from JSON object instead of URL regex

kevinsawicki · kevinsawicki · commit 2e65faf2cacd · 2011-11-04T09:30:54.000+01:00
diff --git a/src/main/java/com/cloudbees/jenkins/GitHubWebHook.java b/src/main/java/com/cloudbees/jenkins/GitHubWebHook.java
@@ -145,12 +145,14 @@ public void doIndex(StaplerRequest req) {
         JSONObject o = JSONObject.fromObject(req.getParameter("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
+        String ownerName = repository.getJSONObject("owner").getString("name"); // 'kohsuke' portion of the above URL
 
         LOGGER.info("Received POST for "+repoUrl);
         LOGGER.fine("Full details of the POST was "+o.toString());
         Matcher matcher = REPOSITORY_NAME_PATTERN.matcher(repoUrl);
         if (matcher.matches()) {
-            GitHubRepositoryName changedRepository = new GitHubRepositoryName(matcher.group(1),matcher.group(2),matcher.group(3));
+            GitHubRepositoryName changedRepository = new GitHubRepositoryName(matcher.group(1), ownerName, repoName);
             for (AbstractProject<?,?> job : Hudson.getInstance().getItems(AbstractProject.class)) {
                 GitHubPushTrigger trigger = job.getTrigger(GitHubPushTrigger.class);
                 if (trigger!=null) {
