Fix the wrapping of retrieved commits (owner/repository)

mdeverdelhan · mdeverdelhan · commit c9b5074bc40e · 2017-05-11T12:32:34.000+02:00
diff --git a/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java b/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java
@@ -1,7 +1,10 @@
 package org.kohsuke.github;
 
+import java.io.IOException;
 import java.util.Locale;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * Search commits.
  *
@@ -104,9 +107,29 @@ private static class CommitSearchResult extends SearchResult<GHCommit> {
 
         @Override
         /*package*/ GHCommit[] getItems(GitHub root) {
+            for (GHCommit commit : items) {
+                String repoName = getRepoName(commit.url);
+                try {
+                    GHRepository repo = root.getRepository(repoName);
+                    commit.wrapUp(repo);
+                } catch (IOException ioe) {}
+            }
             return items;
         }
     }
+    
+    /**
+     * @param commitUrl a commit URL
+     * @return the repo name ("username/reponame")
+     */
+    private static String getRepoName(String commitUrl) {
+        if (StringUtils.isBlank(commitUrl)) {
+            return null;
+        }
+        int indexOfUsername = (GitHub.GITHUB_URL + "/repos/").length();
+        String[] tokens = commitUrl.substring(indexOfUsername).split("/", 3);
+        return tokens[0] + '/' + tokens[1];
+    }
 
     @Override
     protected String getApiUrl() {
diff --git a/src/test/java/org/kohsuke/github/AppTest.java b/src/test/java/org/kohsuke/github/AppTest.java
@@ -689,6 +689,9 @@ public void testMemberPagenation() throws IOException {
     public void testCommitSearch() throws IOException {
         PagedSearchIterable<GHCommit> r = gitHub.searchCommits().author("kohsuke").list();
         assertTrue(r.getTotalCount() > 0);
+        
+        GHCommit firstCommit = r.iterator().next();
+        assertTrue(firstCommit.getFiles().size() > 0);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -689,6 +689,9 @@ public void testMemberPagenation() throws IOException {`
`689`	`689`	`public void testCommitSearch() throws IOException {`
`690`	`690`	`PagedSearchIterable<GHCommit> r = gitHub.searchCommits().author("kohsuke").list();`
`691`	`691`	`assertTrue(r.getTotalCount() > 0);`
	`692`	`+`
	`693`	`+ GHCommit firstCommit = r.iterator().next();`
	`694`	`+ assertTrue(firstCommit.getFiles().size() > 0);`
`692`	`695`	`}`
`693`	`696`
`694`	`697`	`@Test`