[maven-release-plugin] prepare release github-api-1.69

I think what's going on is that GitHub takes some non-zero amount of time to compute this value, and our test runs too fast sometimes and try to fetch a PR before its mergeability is computed

pom.xml

@@ -7,7 +7,7 @@
   </parent>
 
   <artifactId>github-api</artifactId>
-  <version>1.67</version>
+  <version>1.69</version>
   <name>GitHub API for Java</name>
   <url>http://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
@@ -16,7 +16,7 @@
     <connection>scm:git:git@github.com/kohsuke/${project.artifactId}.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git</developerConnection>
     <url>http://${project.artifactId}.kohsuke.org/</url>
-    <tag>github-api-1.67</tag>
+    <tag>github-api-1.69</tag>
   </scm>
 
   <distributionManagement>
@@ -44,6 +44,25 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>3.0.1</version>
+        <configuration>
+          <xmlOutput>true</xmlOutput>
+          <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+          <failOnError>false</failOnError>
+        </configuration>
+        <executions>
+          <execution>
+            <id>run-findbugs</id>
+            <phase>verify</phase> 
+            <goals>
+              <goal>check</goal> 
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -109,6 +128,12 @@
       <version>1.9.5</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>

src/main/java/org/kohsuke/github/GHBranch.java

@@ -40,7 +40,8 @@ public class GHBranch {
 
     @Override
     public String toString() {
-        return "Branch:" + name + " in " + owner.getUrl();
+        final String url = owner != null ? owner.getUrl().toString() : "unknown";
+        return "Branch:" + name + " in " + url;
     }
 
     /*package*/ GHBranch wrap(GHRepository repo) {

src/main/java/org/kohsuke/github/GHCommit.java

@@ -70,7 +70,8 @@ public class GHCommit {
     public static class File {
         String status;
         int changes,additions,deletions;
-        String raw_url, blob_url, filename, sha, patch;
+        String raw_url, blob_url, sha, patch;
+        String filename, previous_filename;
 
         /**
          * Number of lines added + removed.
@@ -101,12 +102,19 @@ public class GHCommit {
         }
 
         /**
-         * Just the base name and the extension without any directory name.
+         * Full path in the repository.
          */
         public String getFileName() {
             return filename;
         }
 
+        /**
+         * Previous path, in case file has moved.
+         */
+        public String getPreviousFilename() {
+            return previous_filename;
+        }
+
         /**
          * The actual change.
          */

src/main/java/org/kohsuke/github/GHCommitPointer.java

@@ -23,6 +23,8 @@
  */
 package org.kohsuke.github;
 
+import java.io.IOException;
+
 /**
  * Identifies a commit in {@link GHPullRequest}.
  *
@@ -69,6 +71,13 @@ public class GHCommitPointer {
         return label;
     }
 
+    /**
+     * Obtains the commit that this pointer is referring to.
+     */
+    public GHCommit getCommit() throws IOException {
+        return getRepository().getCommit(getSha());
+    }
+
     void wrapUp(GitHub root) {
         if (user!=null) user.root = root;
         if (repo!=null) repo.wrap(root);

src/main/java/org/kohsuke/github/GHEvent.java

@@ -23,12 +23,15 @@ public enum GHEvent {
     ISSUE_COMMENT,
     ISSUES,
     MEMBER,
+    PAGE_BUILD,
     PUBLIC,
     PULL_REQUEST,
     PULL_REQUEST_REVIEW_COMMENT,
     PUSH,
     RELEASE,
+    REPOSITORY, // only valid for org hooks
     STATUS,
     TEAM_ADD,
-    WATCH
+    WATCH,
+    PING
 }

src/main/java/org/kohsuke/github/GHEventPayload.java

@@ -104,8 +104,12 @@ public abstract class GHEventPayload {
         @Override
         void wrapUp(GitHub root) {
             super.wrapUp(root);
-            repository.wrap(root);
-            issue.wrap(repository);
+            if (repository != null) {
+                repository.wrap(root);
+                issue.wrap(repository);
+            } else {
+                issue.wrap(root);
+            }
             comment.wrapUp(issue);
         }
     }

src/main/java/org/kohsuke/github/GHHook.java

@@ -11,22 +11,12 @@ import java.util.Map;
 /**
  * @author Kohsuke Kawaguchi
  */
-public class GHHook extends GHObject {
-    /**
-     * Repository that the hook belongs to.
-     */
-    /*package*/ transient GHRepository repository;
-    
+public abstract class GHHook extends GHObject {
     String name;
     List<String> events;
     boolean active;
     Map<String,String> config;
 
-    /*package*/ GHHook wrap(GHRepository owner) {
-        this.repository = owner;
-        return this;
-    }
-
     public String getName() {
         return name;
     }
@@ -50,7 +40,7 @@ public class GHHook extends GHObject {
      * Deletes this hook.
      */
     public void delete() throws IOException {
-        new Requester(repository.root).method("DELETE").to(String.format("/repos/%s/%s/hooks/%d", repository.getOwnerName(), repository.getName(), id));
+        new Requester(getRoot()).method("DELETE").to(getApiRoute());
     }
 
     /**
@@ -60,4 +50,8 @@ public class GHHook extends GHObject {
     public URL getHtmlUrl() {
         return null;
     }
+
+    abstract GitHub getRoot();
+
+    abstract String getApiRoute();
 }

src/main/java/org/kohsuke/github/GHHooks.java

@@ -0,0 +1,130 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Utility class for creating and retrieving webhooks; removes duplication between GHOrganization and GHRepository
+ * functionality
+ */
+class GHHooks {
+    static abstract class Context {
+        private final GitHub root;
+
+        private Context(GitHub root) {
+          this.root = root;
+        }
+
+        public List<GHHook> getHooks() throws IOException {
+            List<GHHook> list = new ArrayList<GHHook>(Arrays.asList(
+                root.retrieve().to(collection(), collectionClass())));
+            for (GHHook h : list)
+              wrap(h);
+            return list;
+        }
+
+        public GHHook getHook(int id) throws IOException {
+            GHHook hook = root.retrieve().to(collection() + "/" + id, clazz());
+            return wrap(hook);
+        }
+
+        public GHHook createHook(String name, Map<String, String> config, Collection<GHEvent> events, boolean active) throws IOException {
+            List<String> ea = null;
+            if (events!=null) {
+              ea = new ArrayList<String>();
+              for (GHEvent e : events)
+                ea.add(e.name().toLowerCase(Locale.ENGLISH));
+            }
+
+            GHHook hook = new Requester(root)
+                .with("name", name)
+                .with("active", active)
+                ._with("config", config)
+                ._with("events", ea)
+                .to(collection(), clazz());
+
+            return wrap(hook);
+        }
+
+        abstract String collection();
+
+        abstract Class<? extends GHHook[]> collectionClass();
+
+        abstract Class<? extends GHHook> clazz();
+
+        abstract GHHook wrap(GHHook hook);
+    }
+
+    private static class RepoContext extends Context {
+        private final GHRepository repository;
+        private final GHUser owner;
+
+        private RepoContext(GHRepository repository, GHUser owner) {
+            super(repository.root);
+            this.repository = repository;
+            this.owner = owner;
+        }
+
+        @Override
+        String collection() {
+            return String.format("/repos/%s/%s/hooks", owner.getLogin(), repository.getName());
+        }
+
+        @Override
+        Class<? extends GHHook[]> collectionClass() {
+            return GHRepoHook[].class;
+        }
+
+        @Override
+        Class<? extends GHHook> clazz() {
+            return GHRepoHook.class;
+        }
+
+        @Override
+        GHHook wrap(GHHook hook) {
+            return ((GHRepoHook)hook).wrap(repository);
+        }
+    }
+
+    private static class OrgContext extends Context {
+        private final GHOrganization organization;
+
+        private OrgContext(GHOrganization organization) {
+            super(organization.root);
+            this.organization = organization;
+        }
+
+        @Override
+        String collection() {
+            return String.format("/orgs/%s/hooks", organization.getLogin());
+        }
+
+        @Override
+        Class<? extends GHHook[]> collectionClass() {
+            return GHOrgHook[].class;
+        }
+
+        @Override
+        Class<? extends GHHook> clazz() {
+            return GHOrgHook.class;
+        }
+
+        @Override
+        GHHook wrap(GHHook hook) {
+            return ((GHOrgHook)hook).wrap(organization);
+        }
+    }
+
+      static Context repoContext(GHRepository repository, GHUser owner) {
+          return new RepoContext(repository, owner);
+      }
+
+      static Context orgContext(GHOrganization organization) {
+          return new OrgContext(organization);
+      }
+}

src/main/java/org/kohsuke/github/GHIssue.java

@@ -24,6 +24,8 @@
 
 package org.kohsuke.github;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collection;
@@ -140,9 +142,14 @@ public class GHIssue extends GHObject {
 
     /**
      * Updates the issue by adding a comment.
+     *
+     * @return
+     *      Newly posted comment.
      */
-    public void comment(String message) throws IOException {
-        new Requester(root).with("body",message).to(getIssuesApiRoute() + "/comments");
+    @WithBridgeMethods(void.class)
+    public GHIssueComment comment(String message) throws IOException {
+        GHIssueComment r = new Requester(root).with("body",message).to(getIssuesApiRoute() + "/comments", GHIssueComment.class);
+        return r.wrapUp(this);
     }
 
     private void edit(String key, Object value) throws IOException {
@@ -176,7 +183,7 @@ public class GHIssue extends GHObject {
     }
 
     public void assignTo(GHUser user) throws IOException {
-        editIssue("assignee",user.getLogin());
+        editIssue("assignee", user.getLogin());
     }
 
     public void setLabels(String... labels) throws IOException {

src/main/java/org/kohsuke/github/GHIssueComment.java

@@ -25,7 +25,6 @@ package org.kohsuke.github;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.Date;
 
 /**
  * Comment to the issue
@@ -79,4 +78,23 @@ public class GHIssueComment extends GHObject {
     public URL getHtmlUrl() {
         return null;
     }
+    
+    /**
+     * Updates the body of the issue comment.
+     */
+    public void update(String body) throws IOException {
+        new Requester(owner.root).with("body", body).method("PATCH").to(getApiRoute(), GHIssueComment.class);
+        this.body = body;
+    }
+
+    /**
+     * Deletes this issue comment.
+     */
+    public void delete() throws IOException {
+        new Requester(owner.root).method("DELETE").to(getApiRoute());
+    }
+    
+    private String getApiRoute() {
+        return "/repos/"+owner.getRepository().getOwnerName()+"/"+owner.getRepository().getName()+"/issues/comments/" + id;
+    }
 }

src/main/java/org/kohsuke/github/GHMyself.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -17,6 +16,33 @@ import java.util.TreeMap;
  * @author Kohsuke Kawaguchi
  */
 public class GHMyself extends GHUser {
+
+    /**
+     * Type of repositories returned during listing.
+     */
+    public enum RepositoryListFilter {
+        /**
+         * All public and private repositories that current user has access or collaborates to
+         */
+        ALL,
+        /**
+         * Public and private repositories owned by current user
+         */
+        OWNER,
+        /**
+         * Public repositories that current user has access or collaborates to
+         */
+        PUBLIC,
+        /**
+         * Private repositories that current user has access or collaborates to
+         */
+        PRIVATE,
+        /**
+         * Public and private repositories that current user is a member
+         */
+        MEMBER;
+    }
+
     /**
      * @deprecated
      *      Use {@link #getEmails2()}
@@ -109,16 +135,31 @@ public class GHMyself extends GHUser {
     }
 
     /**
-     * Lists up all the repositories this user owns (public and private) using the specified page size.
+     * List repositories that are accessible to the authenticated user (public and private) using the specified page size.
+     *
+     * This includes repositories owned by the authenticated user, repositories that belong to other users
+     * where the authenticated user is a collaborator, and other organizations' repositories that the authenticated
+     * user has access to through an organization membership.
      *
      * @param pageSize size for each page of items returned by GitHub. Maximum page size is 100.
      *
      * Unlike {@link #getRepositories()}, this does not wait until all the repositories are returned.
      */
     public PagedIterable<GHRepository> listRepositories(final int pageSize) {
+        return listRepositories(pageSize, RepositoryListFilter.ALL);
+    }
+
+    /**
+     * List repositories of a certain type that are accessible by current authenticated user using the specified page size.
+     *
+     * @param pageSize size for each page of items returned by GitHub. Maximum page size is 100.
+     * @param repoType type of repository returned in the listing
+     */
+    public PagedIterable<GHRepository> listRepositories(final int pageSize, final RepositoryListFilter repoType) {
         return new PagedIterable<GHRepository>() {
             public PagedIterator<GHRepository> iterator() {
-                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/user/repos?per_page=" + pageSize, GHRepository[].class)) {
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/user/repos?per_page=" + pageSize +
+                    "&type=" + repoType.name().toLowerCase(), GHRepository[].class)) {
                     @Override
                     protected void wrapUp(GHRepository[] page) {
                         for (GHRepository c : page)

src/main/java/org/kohsuke/github/GHOrgHook.java

@@ -0,0 +1,27 @@
+/*
+ * © Copyright 2015 -  SourceClear Inc
+ */
+
+package org.kohsuke.github;
+
+class GHOrgHook extends GHHook {
+    /**
+     * Organization that the hook belongs to.
+     */
+    /*package*/ transient GHOrganization organization;
+
+    /*package*/ GHOrgHook wrap(GHOrganization owner) {
+        this.organization = owner;
+        return this;
+    }
+
+    @Override
+    GitHub getRoot() {
+        return organization.root;
+    }
+
+    @Override
+    String getApiRoute() {
+        return String.format("/orgs/%s/hooks/%d", organization.getLogin(), id);
+    }
+}

src/main/java/org/kohsuke/github/GHOrganization.java

@@ -1,10 +1,13 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -26,7 +29,7 @@ public class GHOrganization extends GHPerson {
         GHTeam t = getTeams().get(team);
         if (t==null)
             throw new IllegalArgumentException("No such team: "+team);
-        return createRepository(name,description,homepage,t,isPublic);
+        return createRepository(name, description, homepage, t, isPublic);
     }
 
     public GHRepository createRepository(String name, String description, String homepage, GHTeam team, boolean isPublic) throws IOException {
@@ -252,4 +255,39 @@ public class GHOrganization extends GHPerson {
             }
         };
     }
+
+    /**
+     * Retrieves the currently configured hooks.
+     */
+    public List<GHHook> getHooks() throws IOException {
+        return GHHooks.orgContext(this).getHooks();
+    }
+
+    public GHHook getHook(int id) throws IOException {
+        return GHHooks.orgContext(this).getHook(id);
+    }
+
+    /**
+     *
+     * See https://api.github.com/hooks for possible names and their configuration scheme.
+     * TODO: produce type-safe binding
+     *
+     * @param name
+     *      Type of the hook to be created. See https://api.github.com/hooks for possible names.
+     * @param config
+     *      The configuration hash.
+     * @param events
+     *      Can be null. Types of events to hook into.
+     */
+    public GHHook createHook(String name, Map<String,String> config, Collection<GHEvent> events, boolean active) throws IOException {
+        return GHHooks.orgContext(this).createHook(name, config, events, active);
+    }
+
+    public GHHook createWebHook(URL url, Collection<GHEvent> events) throws IOException {
+        return createHook("web", Collections.singletonMap("url", url.toExternalForm()),events,true);
+    }
+
+    public GHHook createWebHook(URL url) throws IOException {
+        return createWebHook(url, null);
+    }
 }

src/main/java/org/kohsuke/github/GHPullRequest.java

@@ -27,7 +27,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Locale;
 
 /**
  * A pull request.
@@ -197,6 +196,39 @@ public class GHPullRequest extends GHIssue {
         root.retrieve().to(url, this).wrapUp(owner);
     }
 
+    /**
+     * Retrieves all the commits associated to this pull request.
+     */
+    public PagedIterable<GHPullRequestFileDetail> listFiles() {
+        return new PagedIterable<GHPullRequestFileDetail>() {
+            public PagedIterator<GHPullRequestFileDetail> iterator() {
+                return new PagedIterator<GHPullRequestFileDetail>(root.retrieve().asIterator(String.format("%s/files", getApiURL()),
+                        GHPullRequestFileDetail[].class)) {
+                    @Override
+                    protected void wrapUp(GHPullRequestFileDetail[] page) {
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Obtains all the review comments associated with this pull request.
+     */
+    public PagedIterable<GHPullRequestReviewComment> listReviewComments() throws IOException {
+        return new PagedIterable<GHPullRequestReviewComment>() {
+            public PagedIterator<GHPullRequestReviewComment> iterator() {
+                return new PagedIterator<GHPullRequestReviewComment>(root.retrieve().asIterator(getApiRoute() + "/comments",
+                        GHPullRequestReviewComment[].class)) {
+                    protected void wrapUp(GHPullRequestReviewComment[] page) {
+                        for (GHPullRequestReviewComment c : page)
+                            c.wrapUp(GHPullRequest.this);
+                    }
+                };
+            }
+        };
+    }
+
     /**
      * Retrieves all the commits associated to this pull request.
      */
@@ -208,12 +240,23 @@ public class GHPullRequest extends GHIssue {
                         GHPullRequestCommitDetail[].class)) {
                     @Override
                     protected void wrapUp(GHPullRequestCommitDetail[] page) {
+                        for (GHPullRequestCommitDetail c : page)
+                            c.wrapUp(GHPullRequest.this);
                     }
                 };
             }
         };
     }
 
+    public GHPullRequestReviewComment createReviewComment(String body, String sha, String path, int position) throws IOException {
+        return new Requester(root).method("POST")
+                .with("body", body)
+                .with("commit_id", sha)
+                .with("path", path)
+                .with("position", position)
+                .to(getApiRoute() + "/comments", GHPullRequestReviewComment.class).wrapUp(this);
+    }
+
     /**
      * Merge this pull request.
      *
@@ -223,7 +266,21 @@ public class GHPullRequest extends GHIssue {
      *      Commit message. If null, the default one will be used.
      */
     public void merge(String msg) throws IOException {
-        new Requester(root).method("PUT").with("commit_message",msg).to(getApiRoute()+"/merge");
+        merge(msg,null);
+    }
+
+    /**
+     * Merge this pull request.
+     *
+     * The equivalent of the big green "Merge pull request" button.
+     *
+     * @param msg
+     *      Commit message. If null, the default one will be used.
+     * @param sha
+     *      SHA that pull request head must match to allow merge.
+     */
+    public void merge(String msg, String sha) throws IOException {
+        new Requester(root).method("PUT").with("commit_message",msg).with("sha",sha).to(getApiRoute()+"/merge");
     }
 
     private void fetchIssue() throws IOException {

src/main/java/org/kohsuke/github/GHPullRequestCommitDetail.java

@@ -31,99 +31,111 @@ import java.net.URL;
  * Commit detail inside a {@link GHPullRequest}.
  * 
  * @author Luca Milanesio
+ * @see GHPullRequest#listCommits()
  */
 public class GHPullRequestCommitDetail {
+    private GHPullRequest owner;
+
+    /*package*/ void wrapUp(GHPullRequest owner) {
+        this.owner = owner;
+    }
 
     /**
      * @deprecated Use {@link GitUser}
      */
-    public static class Authorship extends GitUser {}
+    public static class Authorship extends GitUser {
+    }
 
     public static class Tree {
+        String sha;
+        String url;
+
+        public String getSha() {
+            return sha;
+        }
+
+        public URL getUrl() {
+            return GitHub.parseURL(url);
+        }
+    }
+
+    public static class Commit {
+        Authorship author;
+        Authorship committer;
+        String message;
+        Tree tree;
+        String url;
+        int comment_count;
+
+        @WithBridgeMethods(value = Authorship.class, castRequired = true)
+        public GitUser getAuthor() {
+            return author;
+        }
+
+        @WithBridgeMethods(value = Authorship.class, castRequired = true)
+        public GitUser getCommitter() {
+            return committer;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public URL getUrl() {
+            return GitHub.parseURL(url);
+        }
+
+        public int getComment_count() {
+            return comment_count;
+        }
+    }
+
+    public static class CommitPointer {
+        String sha;
+        String url;
+        String html_url;
+
+        public URL getUrl() {
+            return GitHub.parseURL(url);
+        }
+
+        public URL getHtml_url() {
+            return GitHub.parseURL(html_url);
+        }
+
+        public String getSha() {
+            return sha;
+        }
+    }
+
     String sha;
-    String url;
-
-    public String getSha() {
-      return sha;
-    }
-
-    public URL getUrl() {
-      return GitHub.parseURL(url);
-    }
-  }
-
-  public static class Commit {
-    Authorship author;
-    Authorship committer;
-    String message;
-    Tree tree;
-    String url;
-    int comment_count;
-
-    @WithBridgeMethods(value=Authorship.class,castRequired=true)
-    public GitUser getAuthor() {
-      return author;
-    }
-
-    @WithBridgeMethods(value=Authorship.class,castRequired=true)
-    public GitUser getCommitter() {
-      return committer;
-    }
-
-    public String getMessage() {
-      return message;
-    }
-
-    public URL getUrl() {
-      return GitHub.parseURL(url);
-    }
-
-    public int getComment_count() {
-      return comment_count;
-    }
-  }
-
-  public static class CommitPointer {
-    String sha;
+    Commit commit;
     String url;
     String html_url;
-
-    public URL getUrl() {
-      return GitHub.parseURL(url);
-    }
-
-    public URL getHtml_url() {
-      return GitHub.parseURL(html_url);
-    }
+    String comments_url;
+    CommitPointer[] parents;
 
     public String getSha() {
-      return sha;
+        return sha;
     }
-  }
 
-  String sha;
-  Commit commit;
-  String url;
-  String html_url;
-  String comments_url;
-  CommitPointer[] parents;
-  
-  public String getSha() {
-    return sha;
-  }
-  public Commit getCommit() {
-    return commit;
-  }
-  public URL getApiUrl() {
-    return GitHub.parseURL(url);
-  }
-  public URL getUrl() {
-    return GitHub.parseURL(html_url);
-  }
-  public URL getCommentsUrl() {
-    return GitHub.parseURL(comments_url);
-  }
-  public CommitPointer[] getParents() {
-    return parents;
-  }
+    public Commit getCommit() {
+        return commit;
+    }
+
+    public URL getApiUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    public URL getUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
+    public URL getCommentsUrl() {
+        return GitHub.parseURL(comments_url);
+    }
+
+    public CommitPointer[] getParents() {
+        return parents;
+    }
 }

src/main/java/org/kohsuke/github/GHPullRequestFileDetail.java

@@ -0,0 +1,86 @@
+/*
+ * The MIT License
+ * 
+ * Copyright (c) 2015, Julien Henry
+ * 
+ * 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.kohsuke.github;
+
+import java.net.URL;
+
+/**
+ * File detail inside a {@link GHPullRequest}.
+ * 
+ * @author Julien Henry
+ * @see GHPullRequest#listFiles()
+ */
+public class GHPullRequestFileDetail {
+
+    String sha;
+    String filename;
+    String status;
+    int additions;
+    int deletions;
+    int changes;
+    String blob_url;
+    String raw_url;
+    String contents_url;
+    String patch;
+
+    public String getSha() {
+        return sha;
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public int getAdditions() {
+        return additions;
+    }
+
+    public int getDeletions() {
+        return deletions;
+    }
+
+    public int getChanges() {
+        return changes;
+    }
+
+    public URL getBlobUrl() {
+        return GitHub.parseURL(blob_url);
+    }
+
+    public URL getRawUrl() {
+        return GitHub.parseURL(raw_url);
+    }
+
+    public URL getContentsUrl() {
+        return GitHub.parseURL(contents_url);
+    }
+
+    public String getPatch() {
+        return patch;
+    }
+}

src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java

@@ -0,0 +1,106 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2010, Kohsuke Kawaguchi
+ *
+ * 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.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Review comment to the pull request
+ *
+ * @author Julien Henry
+ * @see GHPullRequest#listReviewComments()
+ * @see GHPullRequest#createReviewComment(String, String, String, int)
+ */
+public class GHPullRequestReviewComment extends GHObject {
+    GHPullRequest owner;
+
+    private String body;
+    private GHUser user;
+    private String path;
+    private int position;
+    private int originalPosition;
+
+    /*package*/ GHPullRequestReviewComment wrapUp(GHPullRequest owner) {
+        this.owner = owner;
+        return this;
+    }
+
+    /**
+     * Gets the pull request to which this review comment is associated.
+     */
+    public GHPullRequest getParent() {
+        return owner;
+    }
+
+    /**
+     * The comment itself.
+     */
+    public String getBody() {
+        return body;
+    }
+
+    /**
+     * Gets the user who posted this comment.
+     */
+    public GHUser getUser() throws IOException {
+        return owner.root.getUser(user.getLogin());
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public int getOriginalPosition() {
+        return originalPosition;
+    }
+
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    protected String getApiRoute() {
+        return "/repos/"+owner.getRepository().getFullName()+"/pulls/comments/"+id;
+    }
+
+    /**
+     * Updates the comment.
+     */
+    public void update(String body) throws IOException {
+        new Requester(owner.root).method("PATCH").with("body", body).to(getApiRoute(),this);
+        this.body = body;
+    }
+
+    /**
+     * Deletes this review comment.
+     */
+    public void delete() throws IOException {
+        new Requester(owner.root).method("DELETE").to(getApiRoute());
+    }
+}

src/main/java/org/kohsuke/github/GHRepoHook.java

@@ -0,0 +1,23 @@
+package org.kohsuke.github;
+
+class GHRepoHook extends GHHook {
+    /**
+     * Repository that the hook belongs to.
+     */
+    /*package*/ transient GHRepository repository;
+
+    /*package*/ GHRepoHook wrap(GHRepository owner) {
+        this.repository = owner;
+        return this;
+    }
+
+    @Override
+    GitHub getRoot() {
+        return repository.root;
+    }
+
+    @Override
+    String getApiRoute() {
+        return String.format("/repos/%s/%s/hooks/%d", repository.getOwnerName(), repository.getName(), id);
+    }
+}

src/main/java/org/kohsuke/github/GHRepository.java

@@ -40,7 +40,7 @@ import static java.util.Arrays.asList;
 
 /**
  * A repository on GitHub.
- * 
+ *
  * @author Kohsuke Kawaguchi
  */
 @SuppressWarnings({"UnusedDeclaration"})
@@ -57,14 +57,14 @@ public class GHRepository extends GHObject {
     private int watchers,forks,open_issues,size,network_count,subscribers_count;
     private String pushed_at;
     private Map<Integer,GHMilestone> milestones = new HashMap<Integer, GHMilestone>();
-    
+
     private String default_branch,language;
     private Map<String,GHCommit> commits = new HashMap<String, GHCommit>();
 
     private GHRepoPermission permissions;
 
     private GHRepository source, parent;
-    
+
     public GHDeploymentBuilder createDeployment(String ref) {
         return new GHDeploymentBuilder(this,ref);
     }
@@ -164,7 +164,7 @@ public class GHRepository extends GHObject {
     public URL getHtmlUrl() {
         return GitHub.parseURL(html_url);
     }
-    
+
     /**
      * Short repository name without the owner. For example 'jenkins' in case of http://github.com/jenkinsci/jenkins
      */
@@ -321,6 +321,10 @@ public class GHRepository extends GHObject {
         return fork;
     }
 
+    /**
+     * Returns the number of all forks of this repository.
+     * This not only counts direct forks, but also forks of forks, and so on.
+     */
     public int getForks() {
         return forks;
     }
@@ -364,6 +368,14 @@ public class GHRepository extends GHObject {
      * @return
      *      This field is null until the user explicitly configures the master branch.
      */
+    public String getDefaultBranch() {
+        return default_branch;
+    }
+
+    /**
+     * @deprecated
+     *      Renamed to {@link #getDefaultBranch()}
+     */
     public String getMasterBranch() {
         return default_branch;
     }
@@ -494,6 +506,10 @@ public class GHRepository extends GHObject {
         edit("homepage",value);
     }
 
+    public void setDefaultBranch(String value) throws IOException {
+        edit("default_branch", value);
+    }
+
     /**
      * Deletes this repository.
      */
@@ -505,6 +521,43 @@ public class GHRepository extends GHObject {
         }
     }
 
+    /**
+     * Sort orders for listing forks
+     */
+    public static enum ForkSort { NEWEST, OLDEST, STARGAZERS }
+
+    /**
+     * Lists all the direct forks of this repository, sorted by
+     * github api default, currently {@link ForkSort#NEWEST ForkSort.NEWEST}.
+     */
+    public PagedIterable<GHRepository> listForks() {
+      return listForks(null);
+    }
+
+    /**
+     * Lists all the direct forks of this repository, sorted by the given sort order.
+     * @param sort the sort order. If null, defaults to github api default,
+     * currently {@link ForkSort#NEWEST ForkSort.NEWEST}.
+     */
+    public PagedIterable<GHRepository> listForks(final ForkSort sort) {
+        return new PagedIterable<GHRepository>() {
+            public PagedIterator<GHRepository> iterator() {
+                String sortParam = "";
+                if (sort != null) {
+                    sortParam = "?sort=" + sort.toString().toLowerCase(Locale.ENGLISH);
+                }
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator(getApiTailUrl("forks" + sortParam), GHRepository[].class)) {
+                    @Override
+                    protected void wrapUp(GHRepository[] page) {
+                        for (GHRepository c : page) {
+                            c.wrap(root);
+                        }
+                    }
+                };
+            }
+        };
+    }
+
     /**
      * Forks this repository as your repository.
      *
@@ -597,15 +650,11 @@ public class GHRepository extends GHObject {
      * Retrieves the currently configured hooks.
      */
     public List<GHHook> getHooks() throws IOException {
-        List<GHHook> list = new ArrayList<GHHook>(Arrays.asList(
-                root.retrieve().to(getApiTailUrl("hooks"), GHHook[].class)));
-        for (GHHook h : list)
-            h.wrap(this);
-        return list;
+        return GHHooks.repoContext(this, owner).getHooks();
     }
 
     public GHHook getHook(int id) throws IOException {
-        return root.retrieve().to(getApiTailUrl("hooks/" + id), GHHook.class).wrap(this);
+        return GHHooks.repoContext(this, owner).getHook(id);
     }
 
     /**
@@ -649,7 +698,7 @@ public class GHRepository extends GHObject {
     }
     /**
      * Retrive a ref of the given type for the current GitHub repository.
-     * 
+     *
      * @param refName
      *            eg: heads/branch
      * @return refs matching the request type
@@ -662,7 +711,7 @@ public class GHRepository extends GHObject {
     }
     /**
      * Retrive a tree of the given type for the current GitHub repository.
-     * 
+     *
      * @param sha - sha number or branch name ex: "master"
      * @return refs matching the request type
      * @throws IOException
@@ -673,11 +722,11 @@ public class GHRepository extends GHObject {
         String url = String.format("/repos/%s/%s/git/trees/%s", owner.login, name, sha);
         return root.retrieve().to(url, GHTree.class).wrap(root);
     }
-    
+
     /**
      * Retrieves the tree for the current GitHub repository, recursively as described in here:
      * https://developer.github.com/v3/git/trees/#get-a-tree-recursively
-     * 
+     *
      * @param sha - sha number or branch name ex: "master"
      * @param recursive use 1
      * @throws IOException
@@ -774,7 +823,7 @@ public class GHRepository extends GHObject {
      * @param description
      *      Optional short description.
      *  @param context
-     *      Optinal commit status context.    
+     *      Optinal commit status context.
      */
     public GHCommitStatus createCommitStatus(String sha1, GHCommitState state, String targetUrl, String description, String context) throws IOException {
         return new Requester(root)
@@ -784,7 +833,7 @@ public class GHRepository extends GHObject {
                 .with("context", context)
                 .to(String.format("/repos/%s/%s/statuses/%s",owner.login,this.name,sha1),GHCommitStatus.class).wrapUp(root);
     }
-    
+
     /**
      *  @see #createCommitStatus(String, GHCommitState,String,String,String)
      */
@@ -858,10 +907,10 @@ public class GHRepository extends GHObject {
     }
 
     /**
-     * 
+     *
      * See https://api.github.com/hooks for possible names and their configuration scheme.
      * TODO: produce type-safe binding
-     * 
+     *
      * @param name
      *      Type of the hook to be created. See https://api.github.com/hooks for possible names.
      * @param config
@@ -870,21 +919,9 @@ public class GHRepository extends GHObject {
      *      Can be null. Types of events to hook into.
      */
     public GHHook createHook(String name, Map<String,String> config, Collection<GHEvent> events, boolean active) throws IOException {
-        List<String> ea = null;
-        if (events!=null) {
-            ea = new ArrayList<String>();
-            for (GHEvent e : events)
-                ea.add(e.name().toLowerCase(Locale.ENGLISH));
-        }
-
-        return new Requester(root)
-                .with("name", name)
-                .with("active", active)
-                ._with("config", config)
-                ._with("events",ea)
-                .to(String.format("/repos/%s/%s/hooks",owner.login,this.name),GHHook.class).wrap(this);
+        return GHHooks.repoContext(this, owner).createHook(name, config, events, active);
     }
-    
+
     public GHHook createWebHook(URL url, Collection<GHEvent> events) throws IOException {
         return createHook("web",Collections.singletonMap("url",url.toExternalForm()),events,true);
     }
@@ -909,8 +946,8 @@ public class GHRepository extends GHObject {
     /**
      * Returns a set that represents the post-commit hook URLs.
      * The returned set is live, and changes made to them are reflected to GitHub.
-     * 
-     * @deprecated 
+     *
+     * @deprecated
      *      Use {@link #getHooks()} and {@link #createHook(String, Map, Collection, boolean)}
      */
     public Set<URL> getPostCommitHooks() {
@@ -1098,19 +1135,19 @@ public class GHRepository extends GHObject {
         return new Requester(root)
                 .with("title", title).with("description", description).method("POST").to(getApiTailUrl("milestones"), GHMilestone.class).wrap(this);
     }
-    
+
     public GHDeployKey addDeployKey(String title,String key) throws IOException {
          return new Requester(root)
          .with("title", title).with("key", key).method("POST").to(getApiTailUrl("keys"), GHDeployKey.class).wrap(this);
-        
+
     }
-    
+
     public List<GHDeployKey> getDeployKeys() throws IOException{
          List<GHDeployKey> list = new ArrayList<GHDeployKey>(Arrays.asList(
                     root.retrieve().to(getApiTailUrl("keys"), GHDeployKey[].class)));
             for (GHDeployKey h : list)
                 h.wrap(this);
-            return list;    
+            return list;
     }
 
     /**
@@ -1119,7 +1156,7 @@ public class GHRepository extends GHObject {
      * @return
      *      {@link GHRepository} that points to the root repository where this repository is forked
      *      (indirectly or directly) from. Otherwise null.
-     * @see #getParent()       
+     * @see #getParent()
      */
     public GHRepository getSource() throws IOException {
         if (source == null) return null;
@@ -1136,7 +1173,7 @@ public class GHRepository extends GHObject {
      * @return
      *      {@link GHRepository} that points to the repository where this repository is forked
      *      directly from. Otherwise null.
-     * @see #getSource()      
+     * @see #getSource()
      */
     public GHRepository getParent() throws IOException {
         if (parent == null) return null;
@@ -1144,7 +1181,7 @@ public class GHRepository extends GHObject {
             parent = root.getRepository(parent.getFullName());
         return parent;
     }
-    
+
     /**
      * Subscribes to this repository to get notifications.
      */
@@ -1162,7 +1199,7 @@ public class GHRepository extends GHObject {
      */
     public GHSubscription getSubscription() throws IOException {
         try {
-            return new Requester(root).to(getApiTailUrl("subscription"), GHSubscription.class).wrapUp(this);
+            return root.retrieve().to(getApiTailUrl("subscription"), GHSubscription.class).wrapUp(this);
         } catch (FileNotFoundException e) {
             return null;
         }

src/main/java/org/kohsuke/github/GitHub.java

@@ -45,6 +45,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.codec.binary.Base64;
 
@@ -133,10 +134,11 @@ public class GitHub {
             }
         }
 
+        this.rateLimitHandler = rateLimitHandler;
+
         if (login==null && encodedAuthorization!=null)
             login = getMyself().getLogin();
         this.login = login;
-        this.rateLimitHandler = rateLimitHandler;
     }
 
     /**
@@ -247,6 +249,7 @@ public class GitHub {
             // see issue #78
             GHRateLimit r = new GHRateLimit();
             r.limit = r.remaining = 1000000;
+            r.reset = new Date(System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1));
             return r;
         }
     }

src/main/java/org/kohsuke/github/Requester.java

@@ -53,6 +53,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
+import static java.util.Arrays.asList;
 import static org.kohsuke.github.GitHub.*;
 
 /**
@@ -61,6 +62,8 @@ import static org.kohsuke.github.GitHub.*;
  * @author Kohsuke Kawaguchi
  */
 class Requester {
+    private static final List<String> METHODS_WITHOUT_BODY = asList("GET", "DELETE");
+    
     private final GitHub root;
     private final List<Entry> args = new ArrayList<Entry>();
     private final Map<String,String> headers = new LinkedHashMap<String, String>();
@@ -208,7 +211,7 @@ class Requester {
 
     private <T> T _to(String tailApiUrl, Class<T> type, T instance) throws IOException {
         while (true) {// loop while API rate limit is hit
-            if (method.equals("GET") && !args.isEmpty()) {
+            if (METHODS_WITHOUT_BODY.contains(method) && !args.isEmpty()) {
                 StringBuilder qs=new StringBuilder();
                 for (Entry arg : args) {
                     qs.append(qs.length()==0 ? '?' : '&');
@@ -287,7 +290,7 @@ class Requester {
      * Set up the request parameters or POST payload.
      */
     private void buildRequest() throws IOException {
-        if (!method.equals("GET")) {
+        if (isMethodWithBody()) {
             uc.setDoOutput(true);
             uc.setRequestProperty("Content-type", contentType);
 
@@ -311,6 +314,10 @@ class Requester {
         }
     }
 
+    private boolean isMethodWithBody() {
+        return !METHODS_WITHOUT_BODY.contains(method);
+    }
+
     /**
      * Loads pagenated resources.
      *

src/test/java/org/kohsuke/github/AppTest.java

@@ -351,7 +351,7 @@ public class AppTest extends AbstractGitHubApiTestBase {
             sha1.add(c.getSHA1());
         }
         assertEquals("1cccddb22e305397151b2b7b87b4b47d74ca337b",sha1.get(0));
-        assertEquals(29,sha1.size());
+        assertEquals(29, sha1.size());
     }
 
     @Test
@@ -618,7 +618,7 @@ public class AppTest extends AbstractGitHubApiTestBase {
     
     @Test
     public void testAddDeployKey() throws IOException {
-        GHRepository myRepository = Iterables.get(gitHub.getMyself().getRepositories().values(),0);
+        GHRepository myRepository = getTestRepository();
         final GHDeployKey newDeployKey = myRepository.addDeployKey("test", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUt0RAycC5cS42JKh6SecfFZBR1RrF+2hYMctz4mk74/arBE+wFb7fnSHGzdGKX2h5CFOWODifRCJVhB7hlVxodxe+QkQQYAEL/x1WVCJnGgTGQGOrhOMj95V3UE5pQKhsKD608C+u5tSofcWXLToP1/wZ7U4/AHjqYi08OLsWToHCax55TZkvdt2jo0hbIoYU+XI9Q8Uv4ONDN1oabiOdgeKi8+crvHAuvNleiBhWVBzFh8KdfzaH5uNdw7ihhFjEd1vzqACsjCINCjdMfzl6jD9ExuWuE92nZJnucls2cEoNC6k2aPmrZDg9hA32FXVpyseY+bDUWFU6LO2LG6PB kohsuke@atlas");
         try {
             assertNotNull(newDeployKey.getId());
@@ -636,7 +636,7 @@ public class AppTest extends AbstractGitHubApiTestBase {
     
     @Test
     public void testCommitStatusContext() throws IOException {
-        GHRepository myRepository = Iterables.get(gitHub.getMyself().getRepositories().values(), 0);
+        GHRepository myRepository = getTestRepository();
         GHRef masterRef = myRepository.getRef("heads/master");
         GHCommitStatus commitStatus = myRepository.createCommitStatus(masterRef.getObject().getSha(), GHCommitState.SUCCESS, "http://www.example.com", "test", "test/context");
         assertEquals("test/context", commitStatus.getContext());

src/test/java/org/kohsuke/github/GitHubTest.java

@@ -1,34 +1,40 @@
 package org.kohsuke.github;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
-import junit.framework.TestCase;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit test for {@link GitHub}.
  */
-public class GitHubTest extends TestCase {
-
+public class GitHubTest {
+    @Test
     public void testGitHubServerWithHttp() throws Exception {
         GitHub hub = GitHub.connectToEnterprise("http://enterprise.kohsuke.org/api/v3", "bogus","bogus");
         assertEquals("http://enterprise.kohsuke.org/api/v3/test", hub.getApiURL("/test").toString());
     }
-
+    @Test
     public void testGitHubServerWithHttps() throws Exception {
         GitHub hub = GitHub.connectToEnterprise("https://enterprise.kohsuke.org/api/v3", "bogus","bogus");
         assertEquals("https://enterprise.kohsuke.org/api/v3/test", hub.getApiURL("/test").toString());
     }
-
+    @Test
     public void testGitHubServerWithoutServer() throws Exception {
         GitHub hub = GitHub.connectUsingPassword("kohsuke", "bogus");
         assertEquals("https://api.github.com/test", hub.getApiURL("/test").toString());
     }
-    
+    @Test
     public void testGitHubBuilderFromEnvironment() throws IOException {
         
         Map<String, String>props = new HashMap<String, String>();
@@ -86,7 +92,7 @@ public class GitHubTest extends TestCase {
             e1.printStackTrace();
         }
     }
-
+    @Test
     public void testGitHubBuilderFromCustomEnvironment() throws IOException {
         Map<String, String> props = new HashMap<String, String>();
 
@@ -105,4 +111,12 @@ public class GitHubTest extends TestCase {
         assertEquals("bogusEndpoint", builder.endpoint);
     }
 
+    @Test
+    public void testGitHubEnterpriseDoesNotHaveRateLimit() throws IOException {
+        GitHub github = spy(new GitHubBuilder().build());
+        when(github.retrieve()).thenThrow(FileNotFoundException.class);
+
+        GHRateLimit rateLimit = github.getRateLimit();
+        assertThat(rateLimit.getResetDate(), notNullValue());
+    }
 }

src/test/java/org/kohsuke/github/PullRequestTest.java

@@ -5,6 +5,7 @@ import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -18,7 +19,38 @@ public class PullRequestTest extends AbstractGitHubApiTestBase {
         assertEquals(name, p.getTitle());
     }
 
-    @Test // Requires push access to the test repo to pass
+    @Test
+    public void createPullRequestComment() throws Exception {
+        String name = rnd.next();
+        GHPullRequest p = getRepository().createPullRequest(name, "stable", "master", "## test");
+        p.comment("Some comment");
+    }
+
+    @Test
+    public void testPullRequestReviewComments() throws Exception {
+        String name = rnd.next();
+        GHPullRequest p = getRepository().createPullRequest(name, "stable", "master", "## test");
+        System.out.println(p.getUrl());
+        assertTrue(p.listReviewComments().asList().isEmpty());
+        p.createReviewComment("Sample review comment", p.getHead().getSha(), "cli/pom.xml", 5);
+        List<GHPullRequestReviewComment> comments = p.listReviewComments().asList();
+        assertEquals(1, comments.size());
+        GHPullRequestReviewComment comment = comments.get(0);
+        assertEquals("Sample review comment", comment.getBody());
+
+        comment.update("Updated review comment");
+        comments = p.listReviewComments().asList();
+        assertEquals(1, comments.size());
+        comment = comments.get(0);
+        assertEquals("Updated review comment", comment.getBody());
+
+        comment.delete();
+        comments = p.listReviewComments().asList();
+        assertTrue(comments.isEmpty());
+    }
+
+    @Test
+    // Requires push access to the test repo to pass
     public void setLabels() throws Exception {
         GHPullRequest p = getRepository().createPullRequest(rnd.next(), "stable", "master", "## test");
         String label = rnd.next();
@@ -29,7 +61,8 @@ public class PullRequestTest extends AbstractGitHubApiTestBase {
         assertEquals(label, labels.iterator().next().getName());
     }
 
-    @Test // Requires push access to the test repo to pass
+    @Test
+    // Requires push access to the test repo to pass
     public void setAssignee() throws Exception {
         GHPullRequest p = getRepository().createPullRequest(rnd.next(), "stable", "master", "## test");
         GHMyself user = gitHub.getMyself();
@@ -49,7 +82,7 @@ public class PullRequestTest extends AbstractGitHubApiTestBase {
         PagedIterable<GHPullRequest> ghPullRequests = getRepository().listPullRequests(GHIssueState.OPEN);
         for (GHPullRequest pr : ghPullRequests) {
             assertNotNull(pr.getUser().root);
-            assertFalse(pr.getMergeable());
+            pr.getMergeable();
             assertNotNull(pr.getUser().root);
         }
     }