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

- we need to maintain the binary compatibility, so I reverted
  getPullRequests and added listPullRequests that exposes PagedIterable.

- Made PagedIterator expose asList.

README

@@ -1,3 +1,3 @@
 Java API for GitHub
 
-See http://kohsuke.org/github-api/ for more details
+See http://github-api.kohsuke.org/ for more details

pom.xml

@@ -3,11 +3,11 @@
   <parent>
     <groupId>org.kohsuke</groupId>
     <artifactId>pom</artifactId>
-    <version>1</version>
+    <version>3</version>
   </parent>
 
   <artifactId>github-api</artifactId>
-  <version>1.18</version>
+  <version>1.30</version>
   <name>GitHub API for Java</name>
   <url>http://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>

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

@@ -1,24 +0,0 @@
-package org.kohsuke.github;
-
-/**
- * Different API versions.
- *
- * @author Kohsuke Kawaguchi
- */
-enum ApiVersion {
-	
-    V2("https://?/api/v2/json"),
-    V3("https://api.?");
-
-    final String templateUrl;
-
-    ApiVersion(String templateUrl) {
-        this.templateUrl = templateUrl;
-    }
-    
-    public String getApiVersionBaseUrl(String githubServer) {
-    	
-    	return templateUrl.replaceFirst("\\?", githubServer);
-    		
-    }
-}

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

@@ -0,0 +1,51 @@
+package org.kohsuke.github;
+
+/**
+ * A branch in a repository.
+ * 
+ * @author Yusuke Kokubo
+ */
+public class GHBranch {
+    private GitHub root;
+    private GHRepository owner;
+
+    private String name;
+    private Commit commit;
+
+    public static class Commit {
+        String sha,url;
+    }
+
+    public GitHub getRoot() {
+        return root;
+    }
+
+    /**
+     * Repository that this branch is in.
+     */
+    public GHRepository getOwner() {
+        return owner;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * The commit that this branch currently points to.
+     */
+    public String getSHA1() {
+        return commit.sha;
+    }
+
+    @Override
+    public String toString() {
+        return "Branch:" + name + " in " + owner.getUrl();
+    }
+
+    /*package*/ GHBranch wrap(GHRepository repo) {
+        this.owner = repo;
+        this.root = repo.root;
+        return this;
+    }
+}

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

@@ -0,0 +1,241 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A commit in a repository.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHRepository#getCommit(String)
+ * @see GHCommitComment#getCommit()
+ */
+public class GHCommit {
+    private GHRepository owner;
+
+    public static class Stats {
+        int total,additions,deletions;
+    }
+
+    /**
+     * A file that was modified.
+     */
+    public static class File {
+        String status;
+        int changes,additions,deletions;
+        String raw_url, blob_url, filename, sha, patch;
+
+        /**
+         * Number of lines added + removed.
+         */
+        public int getLinesChanged() {
+            return changes;
+        }
+
+        /**
+         * Number of lines added.
+         */
+        public int getLinesAdded() {
+            return additions;
+        }
+
+        /**
+         * Number of lines removed.
+         */
+        public int getLinesDeleted() {
+            return deletions;
+        }
+
+        /**
+         * "modified", "added", or "deleted"
+         */
+        public String getStatus() {
+            return status;
+        }
+
+        /**
+         * Just the base name and the extension without any directory name.
+         */
+        public String getFileName() {
+            return filename;
+        }
+
+        /**
+         * The actual change.
+         */
+        public String getPatch() {
+            return patch;
+        }
+
+        /**
+         * URL like 'https://raw.github.com/jenkinsci/jenkins/4eb17c197dfdcf8ef7ff87eb160f24f6a20b7f0e/core/pom.xml'
+         * that resolves to the actual content of the file.
+         */
+        public URL getRawUrl() {
+            return GitHub.parseURL(raw_url);
+        }
+
+        /**
+         * URL like 'https://github.com/jenkinsci/jenkins/blob/1182e2ebb1734d0653142bd422ad33c21437f7cf/core/pom.xml'
+         * that resolves to the HTML page that describes this file.
+         */
+        public URL getBlobUrl() {
+            return GitHub.parseURL(blob_url);
+        }
+
+        /**
+         * [0-9a-f]{40} SHA1 checksum.
+         */
+        public String getSha() {
+            return sha;
+        }
+    }
+
+    public static class Parent {
+        String url,sha;
+    }
+
+    static class User {
+        // TODO: what if someone who doesn't have an account on GitHub makes a commit?
+        String url,avatar_url,login,gravatar_id;
+        int id;
+    }
+
+    String url,sha;
+    List<File> files;
+    Stats stats;
+    List<Parent> parents;
+    User author,committer;
+
+    /**
+     * The repository that contains the commit.
+     */
+    public GHRepository getOwner() {
+        return owner;
+    }
+
+    /**
+     * Number of lines added + removed.
+     */
+    public int getLinesChanged() {
+        return stats.total;
+    }
+
+    /**
+     * Number of lines added.
+     */
+    public int getLinesAdded() {
+        return stats.additions;
+    }
+
+    /**
+     * Number of lines removed.
+     */
+    public int getLinesDeleted() {
+        return stats.deletions;
+    }
+
+    /**
+     * [0-9a-f]{40} SHA1 checksum.
+     */
+    public String getSHA1() {
+        return sha;
+    }
+
+    /**
+     * List of files changed/added/removed in this commit.
+     *
+     * @return
+     *      Can be empty but never null.
+     */
+    public List<File> getFiles() {
+        return files!=null ? Collections.unmodifiableList(files) : Collections.<File>emptyList();
+    }
+
+    /**
+     * Returns the SHA1 of parent commit objects.
+     */
+    public List<String> getParentSHA1s() {
+        if (parents==null)  return Collections.emptyList();
+        return new AbstractList<String>() {
+            @Override
+            public String get(int index) {
+                return parents.get(index).sha;
+            }
+
+            @Override
+            public int size() {
+                return parents.size();
+            }
+        };
+    }
+
+    /**
+     * Resolves the parent commit objects and return them.
+     */
+    public List<GHCommit> getParents() throws IOException {
+        List<GHCommit> r = new ArrayList<GHCommit>();
+        for (String sha1 : getParentSHA1s())
+            r.add(owner.getCommit(sha1));
+        return r;
+    }
+
+    public GHUser getAuthor() throws IOException {
+        return resolveUser(author);
+    }
+
+    public GHUser getCommitter() throws IOException {
+        return resolveUser(committer);
+    }
+
+    private GHUser resolveUser(User author) throws IOException {
+        if (author==null || author.login==null) return null;
+        return owner.root.getUser(author.login);
+    }
+
+    /**
+     * Lists up all the commit comments in this repository.
+     */
+    public PagedIterable<GHCommitComment> listComments() {
+        return new PagedIterable<GHCommitComment>() {
+            public PagedIterator<GHCommitComment> iterator() {
+                return new PagedIterator<GHCommitComment>(owner.root.retrievePaged(String.format("/repos/%s/%s/commits/%s/comments",owner.getOwnerName(),owner.getName(),sha),GHCommitComment[].class,false)) {
+                    @Override
+                    protected void wrapUp(GHCommitComment[] page) {
+                        for (GHCommitComment c : page)
+                            c.wrap(owner);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Creates a commit comment.
+     *
+     * I'm not sure how path/line/position parameters interact with each other.
+     */
+    public GHCommitComment createComment(String body, String path, Integer line, Integer position) throws IOException {
+        GHCommitComment r = new Poster(owner.root)
+                .with("body",body)
+                .with("path",path)
+                .with("line",line)
+                .with("position",position)
+                .withCredential()
+                .to(String.format("/repos/%s/%s/commits/%s/comments",owner.getOwnerName(),owner.getName(),sha),GHCommitComment.class);
+        return r.wrap(owner);
+    }
+
+    public GHCommitComment createComment(String body) throws IOException {
+        return createComment(body,null,null,null);
+    }
+
+    GHCommit wrapUp(GHRepository owner) {
+        this.owner = owner;
+        return this;
+    }
+}

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

@@ -0,0 +1,123 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * A comment attached to a commit (or a specific line in a specific file of a commit.)
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHRepository#listCommitComments()
+ * @see GHCommit#listComments()
+ * @see GHCommit#createComment(String, String, Integer, Integer)
+ */
+public class GHCommitComment {
+    private GHRepository owner;
+
+    String updated_at, created_at;
+    String body, url, html_url, commit_id;
+    Integer line;
+    int id;
+    String path;
+    User user;
+
+    static class User {
+        // TODO: what if someone who doesn't have an account on GitHub makes a commit?
+        String url,avatar_url,login,gravatar_id;
+        int id;
+    }
+
+    public GHRepository getOwner() {
+        return owner;
+    }
+
+    public Date getCreatedAt() {
+        return GitHub.parseDate(created_at);
+    }
+
+    public Date getUpdatedAt() {
+        return GitHub.parseDate(updated_at);
+    }
+
+    /**
+     * URL like 'https://github.com/kohsuke/sandbox-ant/commit/8ae38db0ea5837313ab5f39d43a6f73de3bd9000#commitcomment-1252827' to
+     * show this commit comment in a browser.
+     */
+    public URL getHtmlUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
+    public String getSHA1() {
+        return commit_id;
+    }
+
+    /**
+     * Commit comment in the GitHub flavored markdown format.
+     */
+    public String getBody() {
+        return body;
+    }
+
+    /**
+     * A commit comment can be on a specific line of a specific file, if so, this field points to a file.
+     * Otherwise null.
+     */
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * A commit comment can be on a specific line of a specific file, if so, this field points to the line number in the file.
+     * Otherwise -1.
+     */
+    public int getLine() {
+        return line!=null ? line : -1;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * Gets the user who put this comment.
+     */
+    public GHUser getUser() throws IOException {
+        return owner.root.getUser(user.login);
+    }
+
+    /**
+     * Gets the commit to which this comment is associated with.
+     */
+    public GHCommit getCommit() throws IOException {
+        return getOwner().getCommit(getSHA1());
+    }
+
+    /**
+     * Updates the body of the commit message.
+     */
+    public void update(String body) throws IOException {
+        GHCommitComment r = new Poster(owner.root)
+                .with("body",body)
+                .withCredential()
+                .to(getApiTail(),GHCommitComment.class,"PATCH");
+        this.body = body;
+    }
+
+    /**
+     * Deletes this comment.
+     */
+    public void delete() throws IOException {
+        new Poster(owner.root).withCredential().to(getApiTail(),null,"DELETE");
+    }
+
+    private String getApiTail() {
+        return String.format("/repos/%s/%s/comments/%s",owner.getOwnerName(),owner.getName(),id);
+    }
+
+
+    GHCommitComment wrap(GHRepository owner) {
+        this.owner = owner;
+        return this;
+    }
+}

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

@@ -54,7 +54,7 @@ public final class GHHook {
      * Deletes this hook.
      */
     public void delete() throws IOException {
-        new Poster(repository.root,ApiVersion.V3).withCredential()
+        new Poster(repository.root).withCredential()
                 .to(String.format("/repos/%s/%s/hooks/%d",repository.getOwnerName(),repository.getName(),id),null,"DELETE");
     }
 }

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

@@ -26,6 +26,7 @@ package org.kohsuke.github;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -46,6 +47,18 @@ public class GHIssue {
     private int number,votes,comments;
     private int position;
 
+    /*package*/ GHIssue wrap(GHRepository owner) {
+        this.owner = owner;
+        this.root = owner.root;
+        return this;
+    }
+
+    /*package*/ static GHIssue[] wrap(GHIssue[] issues, GHRepository owner) {
+        for (GHIssue i : issues)
+            i.wrap(owner);
+        return issues;
+    }
+
     /**
      * Repository to which the issue belongs.
      */
@@ -99,31 +112,55 @@ public class GHIssue {
      * Updates the issue by adding a comment.
      */
     public void comment(String message) throws IOException {
-        new Poster(root).withCredential().with("comment",message).to(getApiRoute("comment"));
+        new Poster(root).withCredential().with("body",message).to(getApiRoute()+"/comments",null,"POST");
+    }
+
+    private void edit(String key, Object value) throws IOException {
+        new Poster(root).withCredential()._with(key, value)
+                .to(getApiRoute(),null,"PATCH");
     }
 
     /**
      * Closes this issue.
      */
     public void close() throws IOException {
-        new Poster(root).withCredential().to(getApiRoute("close"));
+        edit("state", "closed");
     }
 
     /**
      * Reopens this issue.
      */
     public void reopen() throws IOException {
-        new Poster(root).withCredential().to(getApiRoute("reopen"));
+        edit("state", "open");
+    }
+
+    public void setTitle(String title) throws IOException {
+        edit("title",title);
+    }
+
+    public void setBody(String body) throws IOException {
+        edit("body",body);
+    }
+
+    public void assignTo(GHUser user) throws IOException {
+        edit("assignee",user.getLogin());
+    }
+
+    public void setLabels(String... labels) throws IOException {
+        edit("assignee",labels);
     }
 
     /**
      * Obtains all the comments associated with this issue.
      */
     public List<GHIssueComment> getComments() throws IOException {
-        return root.retrieve(getApiRoute("comments"), JsonIssueComments.class).wrap(this);
+        GHIssueComment[] r = root.retrieve(getApiRoute() + "/comments", GHIssueComment[].class);
+        for (GHIssueComment c : r)
+            c.wrapUp(this);
+        return Arrays.asList(r);
     }
 
-    private String getApiRoute(String verb) {
+    private String getApiRoute() {
-        return "/issues/"+verb+"/"+owner.getOwnerName()+"/"+owner.getName()+"/"+number;
+        return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/issues/"+number;
     }
 }

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

@@ -37,6 +37,11 @@ public class GHIssueComment {
     private String body, gravatar_id, user, created_at, updated_at;
     private int id;
 
+    /*package*/ GHIssueComment wrapUp(GHIssue owner) {
+        this.owner = owner;
+        return this;
+    }
+
     /**
      * Gets the issue to which this comment is associated.
      */

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

@@ -0,0 +1,48 @@
+package org.kohsuke.github;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+/**
+ * SSH public key.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class GHKey {
+    /*package almost final*/ GitHub root;
+
+    private String url, key, title;
+    private boolean verified;
+    private int id;
+
+    public int getId() {
+        return id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Something like "https://api.github.com/user/keys/73593"
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    public boolean isVerified() {
+        return verified;
+    }
+
+    /*package*/ GHKey wrap(GitHub root) {
+        this.root = root;
+        return this;
+    }
+
+    public String toString() {
+        return new ToStringBuilder(this).append("title",title).append("id",id).append("key",key).toString();
+    }
+}

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

@@ -2,7 +2,6 @@ package org.kohsuke.github;
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -23,9 +22,19 @@ public class GHMyself extends GHUser {
      *      Always non-null.
      */
     public List<String> getEmails() throws IOException {
-        String[] addresses = root.retrieveWithAuth3("/user/emails",String[].class);
+        String[] addresses = root.retrieveWithAuth("/user/emails", String[].class);
         return Collections.unmodifiableList(Arrays.asList(addresses));
     }
+
+    /**
+     * Returns the read-only list of all the pulic keys of the current user.
+     *
+     * @return
+     *      Always non-null.
+     */
+    public List<GHKey> getPublicKeys() throws IOException {
+        return Collections.unmodifiableList(Arrays.asList(root.retrieveWithAuth("/user/keys", GHKey[].class)));
+    }
     
 //    public void addEmails(Collection<String> emails) throws IOException {
 ////        new Poster(root,ApiVersion.V3).withCredential().to("/user/emails");

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

@@ -4,7 +4,6 @@ import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.AbstractList;
 import java.util.ArrayList;
@@ -12,13 +11,16 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-
+import java.util.TreeMap;
-import static org.kohsuke.github.ApiVersion.*;
 
 /**
  * @author Kohsuke Kawaguchi
  */
 public class GHOrganization extends GHPerson {
+    /*package*/ GHOrganization wrapUp(GitHub root) {
+        return (GHOrganization)super.wrapUp(root);
+    }
+
     /**
      * Creates a new repository.
      *
@@ -31,7 +33,7 @@ public class GHOrganization extends GHPerson {
 
     public GHRepository createRepository(String name, String description, String homepage, GHTeam team, boolean isPublic) throws IOException {
         // such API doesn't exist, so fall back to HTML scraping
-        return new Poster(root,V3).withCredential()
+        return new Poster(root).withCredential()
                 .with("name", name).with("description", description).with("homepage", homepage)
                 .with("public", isPublic).with("team_id",team.getId()).to("/orgs/"+login+"/repos", GHRepository.class).wrap(root);
     }
@@ -40,23 +42,19 @@ public class GHOrganization extends GHPerson {
      * Teams by their names.
      */
     public Map<String,GHTeam> getTeams() throws IOException {
-        return root.retrieveWithAuth("/organizations/"+login+"/teams",JsonTeams.class).toMap(this);
+        GHTeam[] teams = root.retrieveWithAuth("/orgs/" + login + "/teams", GHTeam[].class);
-    }
+        Map<String,GHTeam> r = new TreeMap<String, GHTeam>();
-
+        for (GHTeam t : teams) {
-    @Override
+            r.put(t.getName(),t.wrapUp(this));
-    public GHRepository getRepository(String name) throws IOException {
-        try {
-            return root.retrieveWithAuth3("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
-        } catch (FileNotFoundException e) {
-            return null;
         }
+        return r;
     }
 
     /**
      * Publicizes the membership.
      */
     public void publicize(GHUser u) throws IOException {
-        root.retrieveWithAuth3("/orgs/" + login + "/public_members/" + u.getLogin(), null, "PUT");
+        root.retrieveWithAuth("/orgs/" + login + "/public_members/" + u.getLogin(), null, "PUT");
     }
 
     /**
@@ -66,7 +64,7 @@ public class GHOrganization extends GHPerson {
         return new AbstractList<GHUser>() {
             // these are shallow objects with only some limited values filled out
             // TODO: it's better to allow objects to fill themselves in later when missing values are requested
-            final GHUser[] shallow = root.retrieveWithAuth3("/orgs/" + login + "/members", GHUser[].class);
+            final GHUser[] shallow = root.retrieveWithAuth("/orgs/" + login + "/members", GHUser[].class);
 
             @Override
             public GHUser get(int index) {
@@ -88,7 +86,7 @@ public class GHOrganization extends GHPerson {
      * Conceals the membership.
      */
     public void conceal(GHUser u) throws IOException {
-        root.retrieveWithAuth3("/orgs/" + login + "/public_members/" + u.getLogin(), null, "DELETE");
+        root.retrieveWithAuth("/orgs/" + login + "/public_members/" + u.getLogin(), null, "DELETE");
     }
 
     public enum Permission { ADMIN, PUSH, PULL }
@@ -97,11 +95,13 @@ public class GHOrganization extends GHPerson {
      * Creates a new team and assigns the repositories.
      */
     public GHTeam createTeam(String name, Permission p, Collection<GHRepository> repositories) throws IOException {
-        Poster post = new Poster(root).withCredential().with("team[name]", name).with("team[permission]", p.name().toLowerCase());
+        Poster post = new Poster(root).withCredential().with("name", name).with("permission", p.name().toLowerCase());
+        List<String> repo_names = new ArrayList<String>();
         for (GHRepository r : repositories) {
-            post.with("team[repo_names][]",r.getOwnerName()+'/'+r.getName());
+            repo_names.add(r.getName());
         }
-        return post.to("/organizations/"+login+"/teams",JsonTeam.class).wrap(this);
+        post.with("repo_names",repo_names);
+        return post.to("/orgs/"+login+"/teams",GHTeam.class,"POST").wrapUp(this);
     }
 
     public GHTeam createTeam(String name, Permission p, GHRepository... repositories) throws IOException {

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

@@ -2,7 +2,10 @@ package org.kohsuke.github;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -19,30 +22,62 @@ public abstract class GHPerson {
     protected int id;
     protected String gravatar_id; // appears in V3 as well but presumably subsumed by avatar_url?
 
-    // V2
-    protected int public_gist_count,public_repo_count,followers_count,following_count;
-
     // V3
     protected String avatar_url,html_url;
     protected int followers,following,public_repos,public_gists;
 
+    /*package*/ GHPerson wrapUp(GitHub root) {
+        this.root = root;
+        return this;
+    }
+
     /**
      * Gets the repositories this user owns.
      */
     public synchronized Map<String,GHRepository> getRepositories() throws IOException {
         Map<String,GHRepository> repositories = new TreeMap<String, GHRepository>();
-        for (int i=1; ; i++) {
+        for (List<GHRepository> batch : iterateRepositories(100)) {
-            GHRepository[] array = root.retrieve3("/users/" + login + "/repos?per_page=100&page=" + i, GHRepository[].class);
+            for (GHRepository r : batch)
-            for (GHRepository r : array) {
-                r.root = root;
                 repositories.put(r.getName(),r);
-            }
-            if (array.length==0)  break;
         }
-
         return Collections.unmodifiableMap(repositories);
     }
 
+    /**
+     * Loads repository list in a pagenated fashion.
+     * 
+     * <p>
+     * For a person with a lot of repositories, GitHub returns the list of repositories in a pagenated fashion.
+     * Unlike {@link #getRepositories()}, this method allows the caller to start processing data as it arrives.
+     * 
+     * Every {@link Iterator#next()} call results in I/O. Exceptions that occur during the processing is wrapped
+     * into {@link Error}.
+     */
+    public synchronized Iterable<List<GHRepository>> iterateRepositories(final int pageSize) {
+        return new Iterable<List<GHRepository>>() {
+            public Iterator<List<GHRepository>> iterator() {
+                final Iterator<GHRepository[]> pager = root.retrievePaged("/users/" + login + "/repos?per_page="+pageSize,GHRepository[].class,false);
+
+                return new Iterator<List<GHRepository>>() {
+                    public boolean hasNext() {
+                        return pager.hasNext();
+                    }
+
+                    public List<GHRepository> next() {
+                        GHRepository[] batch = pager.next();
+                        for (GHRepository r : batch)
+                            r.root = root;
+                        return Arrays.asList(batch);
+                    }
+
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        };
+    }
+
     /**
      *
      * @return
@@ -50,7 +85,7 @@ public abstract class GHPerson {
      */
     public GHRepository getRepository(String name) throws IOException {
         try {
-            return root.retrieve3("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
+            return root.retrieveWithAuth("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
         } catch (FileNotFoundException e) {
             return null;
         }
@@ -58,11 +93,26 @@ public abstract class GHPerson {
 
     /**
      * Gravatar ID of this user, like 0cb9832a01c22c083390f3c5dcb64105
+     *
+     * @deprecated
+     *      No longer available in the v3 API.
      */
     public String getGravatarId() {
         return gravatar_id;
     }
 
+    /**
+     * Returns a string like 'https://secure.gravatar.com/avatar/0cb9832a01c22c083390f3c5dcb64105'
+     * that indicates the avatar image URL.
+     */
+    public String getAvatarUrl() {
+        if (avatar_url!=null)
+            return avatar_url;
+        if (gravatar_id!=null)
+            return "https://secure.gravatar.com/avatar/"+gravatar_id;
+        return null;
+    }
+
     /**
      * Gets the login ID of this user, like 'kohsuke'
      */
@@ -110,15 +160,15 @@ public abstract class GHPerson {
     }
 
     public int getPublicGistCount() {
-        return Math.max(public_gist_count,public_gists);
+        return public_gists;
     }
 
     public int getPublicRepoCount() {
-        return Math.max(public_repo_count,public_repos);
+        return public_repos;
     }
 
     public int getFollowingCount() {
-        return Math.max(following_count,following);
+        return following;
     }
 
     /**
@@ -129,7 +179,7 @@ public abstract class GHPerson {
     }
 
     public int getFollowersCount() {
-        return Math.max(followers_count,followers);
+        return followers;
     }
 
 }

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

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 
@@ -16,6 +17,10 @@ public final class GHPersonSet<T extends GHPerson> extends HashSet<T> {
         super(c);
     }
 
+    public GHPersonSet(T... c) {
+        super(Arrays.asList(c));
+    }
+
     public GHPersonSet(int initialCapacity, float loadFactor) {
         super(initialCapacity, loadFactor);
     }

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

@@ -0,0 +1,21 @@
+package org.kohsuke.github;
+
+/**
+ * Rate limit.
+ * @author Kohsuke Kawaguchi
+ */
+public class GHRateLimit {
+    /**
+     * Remaining calls that can be made.
+     */
+    public int remaining;
+    /**
+     * Alotted API call per hour.
+     */
+    public int limit;
+
+    @Override
+    public String toString() {
+        return remaining+"/"+limit;
+    }
+}

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

@@ -23,7 +23,6 @@
  */
 package org.kohsuke.github;
 
-import com.gargoylesoftware.htmlunit.ElementNotFoundException;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
@@ -33,8 +32,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
+import java.io.InterruptedIOException;
-import java.lang.reflect.Modifier;
 import java.net.URL;
 import java.util.AbstractSet;
 import java.util.ArrayList;
@@ -52,7 +50,6 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import static java.util.Arrays.*;
-import static org.kohsuke.github.ApiVersion.V3;
 
 /**
  * A repository on GitHub.
@@ -68,9 +65,19 @@ public class GHRepository {
     private String html_url;    // this is the UI
     private GHUser owner;   // not fully populated. beware.
     private boolean has_issues, has_wiki, fork, _private, has_downloads;
-    private int watchers,forks,open_issues;
+    private int watchers,forks,open_issues,size;
     private String created_at, pushed_at;
     private Map<Integer,GHMilestone> milestones = new HashMap<Integer, GHMilestone>();
+    
+    private String master_branch,language;
+    private Map<String,GHCommit> commits = new HashMap<String, GHCommit>();
+
+    private GHRepoPermission permissions;
+
+    private static class GHRepoPermission {
+        boolean pull,push,admin;
+    }
+
 
     public String getDescription() {
         return description;
@@ -110,12 +117,31 @@ public class GHRepository {
         return name;
     }
 
+    public boolean hasPullAccess() {
+        return permissions!=null && permissions.pull;
+    }
+
+    public boolean hasPushAccess() {
+        return permissions!=null && permissions.push;
+    }
+
+    public boolean hasAdminAccess() {
+        return permissions!=null && permissions.admin;
+    }
+
+    /**
+     * Gets the primary programming language.
+     */
+    public String getLanguage() {
+        return language;
+    }
+
     public GHUser getOwner() throws IOException {
         return root.getUser(owner.login);   // because 'owner' isn't fully populated
     }
 
     public List<GHIssue> getIssues(GHIssueState state) throws IOException {
-       return root.retrieve("/issues/list/" + owner.login + "/" + name + "/" + state.toString().toLowerCase(), JsonIssues.class).wrap(this);
+       return Arrays.asList(GHIssue.wrap(root.retrieve("/repos/" + owner.login + "/" + name + "/issues?state=" + state.toString().toLowerCase(), GHIssue[].class), this));
     }
 
     protected String getOwnerName() {
@@ -154,6 +180,11 @@ public class GHRepository {
         return open_issues;
     }
 
+    /**
+     *
+     * @return
+     *      null if the repository was never pushed at.
+     */
     public Date getPushedAt() {
         return GitHub.parseDate(pushed_at);
     }
@@ -162,6 +193,19 @@ public class GHRepository {
         return GitHub.parseDate(created_at);
     }
 
+    /**
+     * Returns the primary branch you'll configure in the "Admin > Options" config page.
+     *
+     * @return
+     *      This field is null until the user explicitly configures the master branch.
+     */
+    public String getMasterBranch() {
+        return master_branch;
+    }
+
+    public int getSize() {
+        return size;
+    }
 
     /**
      * Gets the collaborators on this repository.
@@ -169,10 +213,7 @@ public class GHRepository {
      */
     @WithBridgeMethods(Set.class)
     public GHPersonSet<GHUser> getCollaborators() throws IOException {
-        GHPersonSet<GHUser> r = new GHPersonSet<GHUser>();
+        return new GHPersonSet<GHUser>(GHUser.wrap(root.retrieve("/repos/" + owner.login + "/" + name + "/collaborators", GHUser[].class),root));
-        for (String u : root.retrieve("/repos/show/"+owner.login+"/"+name+"/collaborators",JsonCollaborators.class).collaborators)
-            r.add(root.getUser(u));
-        return r;
     }
 
     /**
@@ -180,16 +221,17 @@ public class GHRepository {
      * This method deviates from the principle of this library but it works a lot faster than {@link #getCollaborators()}.
      */
     public Set<String> getCollaboratorNames() throws IOException {
-        Set<String> r = new HashSet<String>(root.retrieve("/repos/show/"+owner.login+"/"+name+"/collaborators",JsonCollaborators.class).collaborators);
+        Set<String> r = new HashSet<String>();
-        return Collections.unmodifiableSet(r);
+        for (GHUser u : GHUser.wrap(root.retrieve("/repos/" + owner.login + "/" + name + "/collaborators", GHUser[].class),root))
+            r.add(u.login);
+        return r;
     }
 
     /**
      * If this repository belongs to an organization, return a set of teams.
      */
     public Set<GHTeam> getTeams() throws IOException {
-        return Collections.unmodifiableSet(root.retrieveWithAuth("/repos/show/"+owner.login+"/"+name+"/teams",JsonTeams.class).toSet(
+        return Collections.unmodifiableSet(new HashSet<GHTeam>(Arrays.asList(GHTeam.wrapUp(root.retrieveWithAuth("/repos/" + owner.login + "/" + name + "/teams", GHTeam[].class), root.getOrganization(owner.login)))));
-                root.getOrganization(owner.login)));
     }
 
     public void addCollaborators(GHUser... users) throws IOException {
@@ -197,7 +239,7 @@ public class GHRepository {
     }
 
     public void addCollaborators(Collection<GHUser> users) throws IOException {
-        modifyCollaborators(users, "/add/");
+        modifyCollaborators(users, "PUT");
     }
 
     public void removeCollaborators(GHUser... users) throws IOException {
@@ -205,13 +247,13 @@ public class GHRepository {
     }
 
     public void removeCollaborators(Collection<GHUser> users) throws IOException {
-        modifyCollaborators(users, "/remove/");
+        modifyCollaborators(users, "DELETE");
     }
 
-    private void modifyCollaborators(Collection<GHUser> users, String op) throws IOException {
+    private void modifyCollaborators(Collection<GHUser> users, String method) throws IOException {
         verifyMine();
         for (GHUser user : users) {
-            new Poster(root).withCredential().to("/repos/collaborators/"+name+ op +user.getLogin());
+            new Poster(root).withCredential().to("/repos/"+owner.login+"/"+name+"/collaborators/"+user.getLogin(),null,method);
         }
     }
 
@@ -227,31 +269,52 @@ public class GHRepository {
         f.submit((HtmlButton) f.getElementsByTagName("button").get(0));
     }
 
+    private void edit(String key, String value) throws IOException {
+        Poster poster = new Poster(root).withCredential();
+        if (!key.equals("name"))
+            poster.with("name", name);   // even when we don't change the name, we need to send it in
+        poster.with(key, value)
+                .to("/repos/" + owner.login + "/" + name, null, "PATCH");
+    }
+
     /**
      * Enables or disables the issue tracker for this repository.
      */
     public void enableIssueTracker(boolean v) throws IOException {
-        new Poster(root).withCredential().with("values[has_issues]",String.valueOf(v))
+        edit("has_issues", String.valueOf(v));
-                .to("/repos/show/" + owner.login + "/" + name);
     }
 
     /**
      * Enables or disables Wiki for this repository.
      */
     public void enableWiki(boolean v) throws IOException {
-        new Poster(root).withCredential().with("values[has_wiki]",String.valueOf(v))
+        edit("has_wiki", String.valueOf(v));
-                .to("/repos/show/" + owner.login + "/" + name);
+    }
+
+    public void enableDownloads(boolean v) throws IOException {
+        edit("has_downloads",String.valueOf(v));
+    }
+
+    /**
+     * Rename this repository.
+     */
+    public void renameTo(String name) throws IOException {
+        edit("name",name);
+    }
+
+    public void setDescription(String value) throws IOException {
+        edit("description",value);
+    }
+
+    public void setHomepage(String value) throws IOException {
+        edit("homepage",value);
     }
 
     /**
      * Deletes this repository.
      */
     public void delete() throws IOException {
-        Poster poster = new Poster(root).withCredential();
+        new Poster(root).withCredential().to("/repos/" + owner.login +"/"+name, null, "DELETE");
-        String url = "/repos/delete/" + owner.login +"/"+name;
-
-        DeleteToken token = poster.to(url, DeleteToken.class);
-        poster.with("delete_token",token.delete_token).to(url);
     }
 
     /**
@@ -261,7 +324,7 @@ public class GHRepository {
      *      Newly forked repository that belong to you.
      */
     public GHRepository fork() throws IOException {
-        return new Poster(root,V3).withCredential().to("/repos/" + owner.login + "/" + name + "/forks", GHRepository.class, "POST").wrap(root);
+        return new Poster(root).withCredential().to("/repos/" + owner.login + "/" + name + "/forks", GHRepository.class, "POST").wrap(root);
     }
 
     /**
@@ -271,58 +334,52 @@ public class GHRepository {
      *      Newly forked repository that belong to you.
      */
     public GHRepository forkTo(GHOrganization org) throws IOException {
-        new Poster(root, V3).withCredential().to(String.format("/repos/%s/%s/forks?org=%s",owner.login,name,org.getLogin()));
+        new Poster(root).withCredential().to(String.format("/repos/%s/%s/forks?org=%s",owner.login,name,org.getLogin()));
-        return org.getRepository(name);
-    }
 
-    /**
+        // this API is asynchronous. we need to wait for a bit
-     * Rename this repository.
+        for (int i=0; i<10; i++) {
-     */
+            GHRepository r = org.getRepository(name);
-    public void renameTo(String newName) throws IOException {
+            if (r!=null)    return r;
-        WebClient wc = root.createWebClient();
-        HtmlPage pg = (HtmlPage)wc.getPage(getUrl()+"/admin");
-        for (HtmlForm f : pg.getForms()) {
-            if (!f.getActionAttribute().endsWith("/rename"))  continue;
             try {
-                f.getInputByName("name").setValueAttribute(newName);
+                Thread.sleep(3000);
-                f.submit((HtmlButton)f.getElementsByTagName("button").get(0));
+            } catch (InterruptedException e) {
-
+                throw (IOException)new InterruptedIOException().initCause(e);
-                // overwrite fields
-                final GHRepository r = getOwner().getRepository(newName);
-                for (Field fi : getClass().getDeclaredFields()) {
-                    if (Modifier.isStatic(fi.getModifiers()))   continue;
-                    fi.setAccessible(true);
-                    try {
-                        fi.set(this,fi.get(r));
-                    } catch (IllegalAccessException e) {
-                        throw (IllegalAccessError)new IllegalAccessError().initCause(e);
-                    }
-                }
-
-                return;
-            } catch (ElementNotFoundException e) {
-                // continue
             }
         }
-
+        throw new IOException(this+" was forked into "+org.getLogin()+" but can't find the new repository");
-        throw new IllegalArgumentException("Either you don't have the privilege to rename "+owner.login+'/'+name+" or there's a bug in HTML scraping");
     }
 
     /**
      * Retrieves a specified pull request.
      */
     public GHPullRequest getPullRequest(int i) throws IOException {
-        return root.retrieveWithAuth3("/repos/" + owner.login + '/' + name + "/pulls/" + i, GHPullRequest.class).wrapUp(this);
+        return root.retrieveWithAuth("/repos/" + owner.login + '/' + name + "/pulls/" + i, GHPullRequest.class).wrapUp(this);
+    }
+
+    /**
+     * Retrieves all the pull requests of a particular state.
+     *
+     * @see #listPullRequests(GHIssueState)
+     */
+    public List<GHPullRequest> getPullRequests(GHIssueState state) throws IOException {
+        return listPullRequests(state).asList();
     }
 
     /**
      * Retrieves all the pull requests of a particular state.
      */
-    public List<GHPullRequest> getPullRequests(GHIssueState state) throws IOException {
+    public PagedIterable<GHPullRequest> listPullRequests(final GHIssueState state) {
-        GHPullRequest[] r = root.retrieveWithAuth3("/repos/" + owner.login + '/' + name + "/pulls?state=" + state.name().toLowerCase(Locale.ENGLISH), GHPullRequest[].class);
+        return new PagedIterable<GHPullRequest>() {
-        for (GHPullRequest p : r)
+            public PagedIterator<GHPullRequest> iterator() {
-            p.wrapUp(this);
+                return new PagedIterator<GHPullRequest>(root.retrievePaged(String.format("/repos/%s/%s/pulls?state=%s", owner.login,name,state.name().toLowerCase(Locale.ENGLISH)), GHPullRequest[].class, false)) {
-        return new ArrayList<GHPullRequest>(Arrays.asList(r));
+                    @Override
+                    protected void wrapUp(GHPullRequest[] page) {
+                        for (GHPullRequest pr : page)
+                            pr.wrap(GHRepository.this);
+                    }
+                };
+            }
+        };
     }
 
     /**
@@ -330,14 +387,59 @@ public class GHRepository {
      */
     public List<GHHook> getHooks() throws IOException {
         List<GHHook> list = new ArrayList<GHHook>(Arrays.asList(
-                root.retrieveWithAuth3(String.format("/repos/%s/%s/hooks",owner.login,name),GHHook[].class)));
+                root.retrieveWithAuth(String.format("/repos/%s/%s/hooks", owner.login, name), GHHook[].class)));
         for (GHHook h : list)
             h.wrap(this);
         return list;
     }
 
     public GHHook getHook(int id) throws IOException {
-        return root.retrieveWithAuth3(String.format("/repos/%s/%s/hooks/%d",owner.login,name,id),GHHook.class).wrap(this);
+        return root.retrieveWithAuth(String.format("/repos/%s/%s/hooks/%d", owner.login, name, id), GHHook.class).wrap(this);
+    }
+
+    /**
+     * Gets a commit object in this repository.
+     */
+    public GHCommit getCommit(String sha1) throws IOException {
+        GHCommit c = commits.get(sha1);
+        if (c==null) {
+            c = root.retrieve(String.format("/repos/%s/%s/commits/%s", owner.login, name, sha1), GHCommit.class).wrapUp(this);
+            commits.put(sha1,c);
+        }
+        return c;
+    }
+
+    /**
+     * Lists all the commits.
+     */
+    public PagedIterable<GHCommit> listCommits() {
+        return new PagedIterable<GHCommit>() {
+            public PagedIterator<GHCommit> iterator() {
+                return new PagedIterator<GHCommit>(root.retrievePaged(String.format("/repos/%s/%s/commits",owner.login,name),GHCommit[].class,false)) {
+                    protected void wrapUp(GHCommit[] page) {
+                        for (GHCommit c : page)
+                            c.wrapUp(GHRepository.this);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Lists up all the commit comments in this repository.
+     */
+    public PagedIterable<GHCommitComment> listCommitComments() {
+        return new PagedIterable<GHCommitComment>() {
+            public PagedIterator<GHCommitComment> iterator() {
+                return new PagedIterator<GHCommitComment>(root.retrievePaged(String.format("/repos/%s/%s/comments",owner.login,name),GHCommitComment[].class,false)) {
+                    @Override
+                    protected void wrapUp(GHCommitComment[] page) {
+                        for (GHCommitComment c : page)
+                            c.wrap(GHRepository.this);
+                    }
+                };
+            }
+        };
     }
 
     /**
@@ -360,7 +462,7 @@ public class GHRepository {
                 ea.add(e.name().toLowerCase(Locale.ENGLISH));
         }
 
-        return new Poster(root,ApiVersion.V3)
+        return new Poster(root)
                 .withCredential()
                 .with("name",name)
                 .with("active", active)
@@ -461,9 +563,21 @@ public class GHRepository {
         return this;
     }
 
+    /**
+     * Gets branches by {@linkplain GHBranch#getName() their names}.
+     */
+    public Map<String,GHBranch> getBranches() throws IOException {
+        Map<String,GHBranch> r = new TreeMap<String,GHBranch>();
+        for (GHBranch p : root.retrieve("/repos/" + owner.login + "/" + name + "/branches", GHBranch[].class)) {
+            p.wrap(this);
+            r.put(p.getName(),p);
+        }
+        return r;
+    }
+
     public Map<Integer, GHMilestone> getMilestones() throws IOException {
         Map<Integer,GHMilestone> milestones = new TreeMap<Integer, GHMilestone>();
-    	GHMilestone[] ms = root.retrieve3("/repos/"+owner.login+"/"+name+"/milestones", GHMilestone[].class);
+    	GHMilestone[] ms = root.retrieve("/repos/" + owner.login + "/" + name + "/milestones", GHMilestone[].class);
     	for (GHMilestone m : ms) {
     		m.owner = this;
     		m.root = root;
@@ -475,7 +589,7 @@ public class GHRepository {
 	public GHMilestone getMilestone(int number) throws IOException {
 		GHMilestone m = milestones.get(number);
 		if (m == null) {
-			m = root.retrieve3("/repos/"+owner.login+"/"+name+"/milestones/"+number, GHMilestone.class);
+			m = root.retrieve("/repos/" + owner.login + "/" + name + "/milestones/" + number, GHMilestone.class);
     		m.owner = this;
     		m.root = root;
 			milestones.put(m.getNumber(), m);
@@ -484,7 +598,7 @@ public class GHRepository {
 	}
 	
 	public GHMilestone createMilestone(String title, String description) throws IOException {
-        return new Poster(root,V3).withCredential()
+        return new Poster(root).withCredential()
                 .with("title", title).with("description", description)
                 .to("/repos/"+owner.login+"/"+name+"/milestones", GHMilestone.class,"POST").wrap(this);
 	}

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

@@ -1,8 +1,11 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 /**
  * A team in GitHub organization.
@@ -15,6 +18,18 @@ public class GHTeam {
 
     protected /*final*/ GHOrganization org;
 
+    /*package*/ GHTeam wrapUp(GHOrganization owner) {
+        this.org = owner;
+        return this;
+    }
+
+    /*package*/ static GHTeam[] wrapUp(GHTeam[] teams, GHOrganization owner) {
+        for (GHTeam t : teams) {
+            t.wrapUp(owner);
+        }
+        return teams;
+    }
+
     public String getName() {
         return name;
     }
@@ -31,33 +46,38 @@ public class GHTeam {
      * Retrieves the current members.
      */
     public Set<GHUser> getMembers() throws IOException {
-        return org.root.retrieveWithAuth(api("/members"),JsonUsersWithDetails.class).toSet(org.root);
+        return new HashSet<GHUser>(Arrays.asList(GHUser.wrap(org.root.retrieveWithAuth(api("/members"), GHUser[].class), org.root)));
     }
 
     public Map<String,GHRepository> getRepositories() throws IOException {
-        return org.root.retrieveWithAuth3(api("/repos"),JsonRepositories.class).wrap(org.root);
+        GHRepository[] repos = org.root.retrieveWithAuth(api("/repos"), GHRepository[].class);
+        Map<String,GHRepository> m = new TreeMap<String, GHRepository>();
+        for (GHRepository r : repos) {
+            m.put(r.getName(),r.wrap(org.root));
+        }
+        return m;
     }
 
     /**
      * Adds a member to the team.
      */
     public void add(GHUser u) throws IOException {
-        org.root.retrieveWithAuth(api("/members?name="+u.getLogin()),null, "POST");
+        org.root.retrieveWithAuth(api("/members/" + u.getLogin()), null, "PUT");
     }
 
     /**
      * Removes a member to the team.
      */
     public void remove(GHUser u) throws IOException {
-        org.root.retrieveWithAuth(api("/members?name="+u.getLogin()),null, "DELETE");
+        org.root.retrieveWithAuth(api("/members/" + u.getLogin()), null, "DELETE");
     }
 
     public void add(GHRepository r) throws IOException {
-        org.root.retrieveWithAuth(api("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "POST");
+        org.root.retrieveWithAuth(api("/repos/" + r.getOwnerName() + '/' + r.getName()), null, "PUT");
     }
 
     public void remove(GHRepository r) throws IOException {
-        org.root.retrieveWithAuth(api("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "DELETE");
+        org.root.retrieveWithAuth(api("/repos/" + r.getOwnerName() + '/' + r.getName()), null, "DELETE");
     }
 
     private String api(String tail) {

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

@@ -23,12 +23,11 @@
  */
 package org.kohsuke.github;
 
-import com.infradna.tool.bridge_method_injector.BridgeMethodsAdded;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -42,14 +41,14 @@ public class GHUser extends GHPerson {
      * Follow this user.
      */
     public void follow() throws IOException {
-        new Poster(root).withCredential().to("/user/follow/"+login);
+        new Poster(root).withCredential().to("/user/following/"+login,null,"PUT");
     }
 
     /**
      * Unfollow this user.
      */
     public void unfollow() throws IOException {
-        new Poster(root).withCredential().to("/user/unfollow/"+login);
+        new Poster(root).withCredential().to("/user/following/"+login,null,"DELETE");
     }
 
     /**
@@ -57,7 +56,8 @@ public class GHUser extends GHPerson {
      */
     @WithBridgeMethods(Set.class)
     public GHPersonSet<GHUser> getFollows() throws IOException {
-        return root.retrieve("/user/show/"+login+"/following",JsonUsers.class).toSet(root);
+        GHUser[] followers = root.retrieve("/users/" + login + "/following", GHUser[].class);
+        return new GHPersonSet<GHUser>(Arrays.asList(wrap(followers,root)));
     }
 
     /**
@@ -65,7 +65,14 @@ public class GHUser extends GHPerson {
      */
     @WithBridgeMethods(Set.class)
     public GHPersonSet<GHUser> getFollowers() throws IOException {
-        return root.retrieve("/user/show/"+login+"/followers",JsonUsers.class).toSet(root);
+        GHUser[] followers = root.retrieve("/users/" + login + "/followers", GHUser[].class);
+        return new GHPersonSet<GHUser>(Arrays.asList(wrap(followers,root)));
+    }
+
+    /*package*/ static GHUser[] wrap(GHUser[] users, GitHub root) {
+        for (GHUser f : users)
+            f.root = root;
+        return users;
     }
 
     /**
@@ -75,7 +82,7 @@ public class GHUser extends GHPerson {
     public GHPersonSet<GHOrganization> getOrganizations() throws IOException {
         GHPersonSet<GHOrganization> orgs = new GHPersonSet<GHOrganization>();
         Set<String> names = new HashSet<String>();
-        for (GHOrganization o : root.retrieve3("/users/"+login+"/orgs",GHOrganization[].class)) {
+        for (GHOrganization o : root.retrieve("/users/" + login + "/orgs", GHOrganization[].class)) {
             if (names.add(o.getLogin()))    // I've seen some duplicates in the data
                 orgs.add(root.getOrganization(o.getLogin()));
         }

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

@@ -25,8 +25,6 @@ package org.kohsuke.github;
 
 import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.ANY;
 import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import static org.kohsuke.github.ApiVersion.V2;
-import static org.kohsuke.github.ApiVersion.V3;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -44,10 +42,13 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.TimeZone;
+import java.util.zip.GZIPInputStream;
 
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import org.apache.commons.io.IOUtils;
@@ -81,7 +82,12 @@ public class GitHub {
 	private GitHub(String login, String apiToken, String password) {
 		this ("github.com", login, apiToken, password);
 	}
-	
+
+    /**
+     *
+     * @param githubServer
+     *      The host name of the GitHub (or GitHub enterprise) server, such as "github.com".
+     */
     private GitHub(String githubServer, String login, String apiToken, String password) {
         this.githubServer = githubServer;
 		this.login = login;
@@ -152,67 +158,167 @@ public class GitHub {
             throw new IllegalStateException("This operation requires a credential but none is given to the GitHub constructor");
     }
 
-    /*package*/ URL getApiURL(ApiVersion v, String tailApiUrl) throws IOException {
+    /*package*/ URL getApiURL(String tailApiUrl) throws IOException {
     	if (oauthAccessToken != null) {
     		// append the access token
     		tailApiUrl = tailApiUrl +  (tailApiUrl.indexOf('?')>=0 ?'&':'?') + "access_token=" + oauthAccessToken;
     	}
     	
-        return new URL(v.getApiVersionBaseUrl(githubServer)+tailApiUrl);
+        return new URL("https://api."+githubServer+tailApiUrl);
     }
 
     /*package*/ <T> T retrieve(String tailApiUrl, Class<T> type) throws IOException {
-        return _retrieve(tailApiUrl, type, "GET", false, V2);
+        return _retrieve(tailApiUrl, type, "GET", false);
-    }
-
-    /*package*/ <T> T retrieve3(String tailApiUrl, Class<T> type) throws IOException {
-        return _retrieve(tailApiUrl, type, "GET", false, V3);
     }
 
     /*package*/ <T> T retrieveWithAuth(String tailApiUrl, Class<T> type) throws IOException {
-        return retrieveWithAuth(tailApiUrl,type,"GET");
+        return _retrieve(tailApiUrl, type, "GET", true);
-    }
-
-    /*package*/ <T> T retrieveWithAuth3(String tailApiUrl, Class<T> type) throws IOException {
-        return _retrieve(tailApiUrl, type, "GET", true, V3);
     }
 
     /*package*/ <T> T retrieveWithAuth(String tailApiUrl, Class<T> type, String method) throws IOException {
-        return _retrieve(tailApiUrl, type, method, true, V2);
+        return _retrieve(tailApiUrl, type, method, true);
     }
 
-    /*package*/ <T> T retrieveWithAuth3(String tailApiUrl, Class<T> type, String method) throws IOException {
+    private <T> T _retrieve(String tailApiUrl, Class<T> type, String method, boolean withAuth) throws IOException {
-        return _retrieve(tailApiUrl, type, method, true, V3);
-    }
-
-    private <T> T _retrieve(String tailApiUrl, Class<T> type, String method, boolean withAuth, ApiVersion v) throws IOException {
         while (true) {// loop while API rate limit is hit
-        	
+            HttpURLConnection uc = setupConnection(method, withAuth, getApiURL(tailApiUrl));
-            HttpURLConnection uc = (HttpURLConnection) getApiURL(v,tailApiUrl).openConnection();
-
-            if (withAuth && this.oauthAccessToken == null)
-                uc.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
-            
-            uc.setRequestMethod(method);
-            if (method.equals("PUT")) {
-                uc.setDoOutput(true);
-                uc.setRequestProperty("Content-Length","0");
-                uc.getOutputStream().close();
-            }
-
             try {
-                InputStreamReader r = new InputStreamReader(uc.getInputStream(), "UTF-8");
+                return parse(uc,type);
-                if (type==null) {
-                    String data = IOUtils.toString(r);
-                    return null;
-                }
-                return MAPPER.readValue(r,type);
             } catch (IOException e) {
                 handleApiError(e,uc);
             }
         }
     }
 
+    /**
+     * Loads pagenated resources.
+     *
+     * Every iterator call reports a new batch.
+     */
+    /*package*/ <T> Iterator<T> retrievePaged(final String tailApiUrl, final Class<T> type, final boolean withAuth) {
+        return new Iterator<T>() {
+            /**
+             * The next batch to be returned from {@link #next()}.
+             */
+            T next;
+            /**
+             * URL of the next resource to be retrieved, or null if no more data is available.
+             */
+            URL url;
+
+            {
+                try {
+                    url = getApiURL(tailApiUrl);
+                } catch (IOException e) {
+                    throw new Error(e);
+                }
+            }
+
+            public boolean hasNext() {
+                fetch();
+                return next!=null;
+            }
+
+            public T next() {
+                fetch();
+                T r = next;
+                if (r==null)    throw new NoSuchElementException();
+                next = null;
+                return r;
+            }
+
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+
+            private void fetch() {
+                if (next!=null) return; // already fetched
+                if (url==null)  return; // no more data to fetch
+
+                try {
+                    while (true) {// loop while API rate limit is hit
+                        HttpURLConnection uc = setupConnection("GET", withAuth, url);
+                        try {
+                            next = parse(uc,type);
+                            assert next!=null;
+                            findNextURL(uc);
+                            return;
+                        } catch (IOException e) {
+                            handleApiError(e,uc);
+                        }
+                    }
+                } catch (IOException e) {
+                    throw new Error(e);
+                }
+            }
+
+            /**
+             * Locate the next page from the pagination "Link" tag.
+             */
+            private void findNextURL(HttpURLConnection uc) throws MalformedURLException {
+                url = null; // start defensively
+                String link = uc.getHeaderField("Link");
+                if (link==null) return;
+
+                for (String token : link.split(", ")) {
+                    if (token.endsWith("rel=\"next\"")) {
+                        // found the next page. This should look something like
+                        // <https://api.github.com/repos?page=3&per_page=100>; rel="next"
+                        int idx = token.indexOf('>');
+                        url = new URL(token.substring(1,idx));
+                        return;
+                    }
+                }
+
+                // no more "next" link. we are done.
+            }
+        };
+    }
+
+    private HttpURLConnection setupConnection(String method, boolean withAuth, URL url) throws IOException {
+        HttpURLConnection uc = (HttpURLConnection) url.openConnection();
+
+        // if the authentication is needed but no credential is given, try it anyway (so that some calls
+        // that do work with anonymous access in the reduced form should still work.)
+        // if OAuth token is present, it'll be set in the URL, so need to set the Authorization header
+        if (withAuth && encodedAuthorization!=null && this.oauthAccessToken == null)
+            uc.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
+
+        uc.setRequestMethod(method);
+        uc.setRequestProperty("Accept-Encoding", "gzip");
+        if (method.equals("PUT")) {
+            uc.setDoOutput(true);
+            uc.setRequestProperty("Content-Length","0");
+            uc.getOutputStream().close();
+        }
+        return uc;
+    }
+
+    private <T> T parse(HttpURLConnection uc, Class<T> type) throws IOException {
+        InputStreamReader r = null;
+        try {
+            r = new InputStreamReader(wrapStream(uc, uc.getInputStream()), "UTF-8");
+            if (type==null) {
+                String data = IOUtils.toString(r);
+                return null;
+            }
+            return MAPPER.readValue(r,type);
+        } finally {
+            IOUtils.closeQuietly(r);
+        }
+    }
+
+    /**
+     * Handles the "Content-Encoding" header.
+     */
+    private InputStream wrapStream(HttpURLConnection uc, InputStream in) throws IOException {
+        String encoding = uc.getContentEncoding();
+        if (encoding==null || in==null) return in;
+        if (encoding.equals("gzip"))    return new GZIPInputStream(in);
+
+        throw new UnsupportedOperationException("Unexpected Content-Encoding: "+encoding);
+    }
+
     /**
      * If the error is because of the API limit, wait 10 sec and return normally.
      * Otherwise throw an exception reporting an error.
@@ -231,11 +337,22 @@ public class GitHub {
         if (e instanceof FileNotFoundException)
             throw e;    // pass through 404 Not Found to allow the caller to handle it intelligently
 
-        InputStream es = uc.getErrorStream();
+        InputStream es = wrapStream(uc, uc.getErrorStream());
-        if (es!=null)
+        try {
-            throw (IOException)new IOException(IOUtils.toString(es,"UTF-8")).initCause(e);
+            if (es!=null)
-        else
+                throw (IOException)new IOException(IOUtils.toString(es,"UTF-8")).initCause(e);
-            throw e;
+            else
+                throw e;
+        } finally {
+            IOUtils.closeQuietly(es);
+        }
+    }
+
+    /**
+     * Gets the current rate limit.
+     */
+    public GHRateLimit getRateLimit() throws IOException {
+        return retrieveWithAuth("/rate_limit", JsonRateLimit.class).rate;
     }
 
     /**
@@ -245,7 +362,7 @@ public class GitHub {
 	public GHMyself getMyself() throws IOException {
 		requireCredential();
 
-        GHMyself u = retrieveWithAuth("/user/show", JsonMyself.class).user;
+        GHMyself u = retrieveWithAuth("/user", GHMyself.class);
 
         u.root = this;
         users.put(u.getLogin(), u);
@@ -259,17 +376,9 @@ public class GitHub {
 	public GHUser getUser(String login) throws IOException {
 		GHUser u = users.get(login);
 		if (u == null) {
-
+            u = retrieve("/users/" + login, GHUser.class);
-			if (oauthAccessToken != null) {
+            u.root = this;
-				u = retrieve("/user/show/" + login, JsonUser.class).user;
+            users.put(u.getLogin(), u);
-				u.root = this;
-				users.put(u.getLogin(), u);
-			} else {
-				u = retrieve("/user/show/" + login, JsonUser.class).user;
-				u.root = this;
-				users.put(login, u);
-			}
-
 		}
 		return u;
 	}
@@ -290,8 +399,7 @@ public class GitHub {
     public GHOrganization getOrganization(String name) throws IOException {
         GHOrganization o = orgs.get(name);
         if (o==null) {
-            o = retrieve("/organizations/"+name,JsonOrganization.class).organization;
+            o = retrieve("/orgs/" + name, GHOrganization.class).wrapUp(this);
-            o.root = this;
             orgs.put(name,o);
         }
         return o;
@@ -307,8 +415,20 @@ public class GitHub {
         return getUser(tokens[0]).getRepository(tokens[1]);
     }
 
+    /**
+     * This method returns a shallowly populated organizations.
+     *
+     * To retrieve full organization details, you need to call {@link #getOrganization(String)}
+     * TODO: make this automatic.
+     */
     public Map<String, GHOrganization> getMyOrganizations() throws IOException {
-    	 return retrieveWithAuth("/organizations",JsonOrganizations.class).wrap(this);
+        GHOrganization[] orgs = retrieveWithAuth("/user/orgs", GHOrganization[].class);
+        Map<String, GHOrganization> r = new HashMap<String, GHOrganization>();
+        for (GHOrganization o : orgs) {
+            // don't put 'o' into orgs because they are shallow
+            r.put(o.getLogin(),o.wrapUp(this));
+        }
+        return r;
     }
 
     /**
@@ -316,7 +436,7 @@ public class GitHub {
      */
     public List<GHEventInfo> getEvents() throws IOException {
         // TODO: pagenation
-        GHEventInfo[] events = retrieve3("/events", GHEventInfo[].class);
+        GHEventInfo[] events = retrieve("/events", GHEventInfo[].class);
         for (GHEventInfo e : events)
             e.wrapUp(this);
         return Arrays.asList(events);
@@ -342,7 +462,7 @@ public class GitHub {
      *      Newly created repository.
      */
     public GHRepository createRepository(String name, String description, String homepage, boolean isPublic) throws IOException {
-        return new Poster(this,V3).withCredential()
+        return new Poster(this).withCredential()
                 .with("name", name).with("description", description).with("homepage", homepage)
                 .with("public", isPublic ? 1 : 0).to("/user/repos", GHRepository.class,"POST").wrap(this);
     }
@@ -352,7 +472,7 @@ public class GitHub {
      */
     public boolean isCredentialValid() throws IOException {
         try {
-            retrieveWithAuth("/user/show",JsonUser.class);
+            retrieveWithAuth("/user", GHUser.class);
             return true;
         } catch (IOException e) {
             return false;
@@ -380,6 +500,7 @@ public class GitHub {
     }
 
     /*package*/ static Date parseDate(String timestamp) {
+        if (timestamp==null)    return null;
         for (String f : TIME_FORMATS) {
             try {
                 SimpleDateFormat df = new SimpleDateFormat(f);

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

@@ -1,33 +0,0 @@
-/*
- * 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.util.List;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonCollaborators {
-    List<String> collaborators;
-}

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

@@ -1,38 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2011, Eric Maupin
- *
- * 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;
-
-/**
- * @author Eric Maupin
- */
-class JsonIssue {
-    GHIssue issue;
-
-    GHIssue wrap(GHRepository r) {
-        issue.owner = r;
-        issue.root = r.root;
-        return issue;
-    }
-}

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

@@ -1,16 +0,0 @@
-package org.kohsuke.github;
-
-import java.util.List;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonIssueComments {
-    List<GHIssueComment> comments;
-
-    List<GHIssueComment> wrap(GHIssue owner) {
-        for (GHIssueComment c : comments)
-            c.owner = owner;
-        return comments;
-    }
-}

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

@@ -1,38 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2011, Eric Maupin
- *
- * 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.util.List;
-
-class JsonIssues {
-    List<GHIssue> issues;
-
-    public List<GHIssue> wrap(GHRepository owner) {
-        for (GHIssue issue : issues) {
-            issue.owner = owner;
-            issue.root = owner.root;
-        }
-        return issues;
-    }
-}

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

@@ -1,8 +0,0 @@
-package org.kohsuke.github;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonOrganization {
-    public GHOrganization organization;
-}

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

@@ -1,44 +0,0 @@
-/*
- * 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.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * 
- */
-class JsonOrganizations {
-    public List<GHOrganization> organizations;
-
-    public Map<String,GHOrganization> wrap(GitHub root) {
-        Map<String,GHOrganization> map = new TreeMap<String, GHOrganization>();
-        for (GHOrganization o : organizations) {
-            o.root = root;
-            map.put(o.getLogin(),o);
-        }
-        return map;
-    }
-}

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

@@ -3,6 +3,6 @@ package org.kohsuke.github;
 /**
  * @author Kohsuke Kawaguchi
  */
-class JsonMyself {
+class JsonRateLimit {
-    GHMyself user;
+    GHRateLimit rate;
 }

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

@@ -1,44 +0,0 @@
-/*
- * 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.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonRepositories {
-    public List<GHRepository> repositories;
-
-    public Map<String,GHRepository> wrap(GitHub root) {
-        Map<String,GHRepository> map = new TreeMap<String, GHRepository>();
-        for (GHRepository r : repositories) {
-            r.root = root;
-            map.put(r.getName(),r);
-        }
-        return map;
-    }
-}

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

@@ -1,13 +0,0 @@
-package org.kohsuke.github;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonTeam {
-    public GHTeam team;
-
-    GHTeam wrap(GHOrganization org) {
-        team.org = org;
-        return team;
-    }
-}

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

@@ -1,32 +0,0 @@
-package org.kohsuke.github;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonTeams {
-    public List<GHTeam> teams;
-
-    Map<String, GHTeam> toMap(GHOrganization org) {
-        Map<String, GHTeam> r = new TreeMap<String, GHTeam>();
-        for (GHTeam t : teams) {
-            t.org = org;
-            r.put(t.getName(),t);
-        }
-        return r;
-    }
-
-    Set<GHTeam> toSet(GHOrganization org) {
-        Set<GHTeam> r = new HashSet<GHTeam>();
-        for (GHTeam t : teams) {
-            t.org = org;
-            r.add(t);
-        }
-        return r;
-    }
-}

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

@@ -1,31 +0,0 @@
-/*
- * 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;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonUser {
-    public GHUser user;
-}

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

@@ -1,43 +0,0 @@
-/*
- * 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.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonUsers {
-    public List<String> users;
-
-    public GHPersonSet<GHUser> toSet(GitHub root) throws IOException {
-        GHPersonSet<GHUser> r = new GHPersonSet<GHUser>();
-        for (String u : users)
-            r.add(root.getUser(u));
-        return r;
-    }
-}

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

@@ -1,20 +0,0 @@
-package org.kohsuke.github;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-class JsonUsersWithDetails {
-    public List<GHUser> users;
-
-    public Set<GHUser> toSet(GitHub root) throws IOException {
-        Set<GHUser> r = new HashSet<GHUser>();
-        for (GHUser u : users)
-            r.add(root.getUser(u));
-        return r;
-    }
-}

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

@@ -0,0 +1,24 @@
+package org.kohsuke.github;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * {@link Iterable} that returns {@link PagedIterator}
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class PagedIterable<T> implements Iterable<T> {
+    public abstract PagedIterator<T> iterator();
+
+    /**
+     * Eagerly walk {@link Iterable} and return the result in a list.
+     */
+    public List<T> asList() {
+        List<T> r = new ArrayList<T>();
+        for(PagedIterator<T> i = iterator(); i.hasNext();) {
+            r.addAll(i.nextPage());
+        }
+        return r;
+    }
+}

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

@@ -0,0 +1,64 @@
+package org.kohsuke.github;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Iterator over a pagenated data source.
+ *
+ * Aside from the normal iterator operation, this method exposes {@link #nextPage()}
+ * that allows the caller to retrieve items per page.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class PagedIterator<T> implements Iterator<T> {
+    private final Iterator<T[]> base;
+
+    /**
+     * Current batch that we retrieved but haven't returned to the caller.
+     */
+    private T[] current;
+    private int pos;
+
+    /*package*/ PagedIterator(Iterator<T[]> base) {
+        this.base = base;
+    }
+
+    protected abstract void wrapUp(T[] page);
+
+    public boolean hasNext() {
+        return (current!=null && pos<current.length) || base.hasNext();
+    }
+
+    public T next() {
+        fetch();
+
+        return current[pos++];
+    }
+
+    private void fetch() {
+        while (current==null || current.length<=pos) {
+            current = base.next();
+            wrapUp(current);
+            pos = 0;
+        }
+        // invariant at the end: there's some data to retrieve
+    }
+
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Gets the next page worth of data.
+     */
+    public List<T> nextPage() {
+        fetch();
+        List<T> r = Arrays.asList(current);
+        r = r.subList(pos,r.size());
+        current = null;
+        pos = 0;
+        return r;
+    }
+}

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

@@ -24,18 +24,15 @@
 package org.kohsuke.github;
 
 import org.apache.commons.io.IOUtils;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.impl.WriterBasedGenerator;
-import org.codehaus.jackson.node.ObjectNode;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
-import java.net.URLEncoder;
+import java.net.ProtocolException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,8 +48,6 @@ class Poster {
     private final List<Entry> args = new ArrayList<Entry>();
     private boolean authenticate;
 
-    private final ApiVersion v;
-
     private static class Entry {
         String key;
         Object value;
@@ -61,19 +56,10 @@ class Poster {
             this.key = key;
             this.value = value;
         }
-
-        public String toFormArg() throws UnsupportedEncodingException {
-            return URLEncoder.encode(key,"UTF-8")+'='+URLEncoder.encode(value.toString(),"UTF-8");
-        }
-    }
-
-    Poster(GitHub root, ApiVersion v) {
-        this.root = root;
-        this.v = v;
     }
 
     Poster(GitHub root) {
-        this(root,ApiVersion.V2);
+        this.root = root;
     }
 
     public Poster withCredential() {
@@ -86,6 +72,12 @@ class Poster {
         return _with(key, value);
     }
 
+    public Poster with(String key, Integer value) {
+        if (value!=null)
+            _with(key, value.intValue());
+        return this;
+    }
+
     public Poster with(String key, boolean value) {
         return _with(key, value);
     }
@@ -94,6 +86,10 @@ class Poster {
         return _with(key, value);
     }
 
+    public Poster with(String key, Collection<String> value) {
+        return _with(key, value);
+    }
+
     public Poster _with(String key, Object value) {
         if (value!=null) {
             args.add(new Entry(key,value));
@@ -119,44 +115,39 @@ class Poster {
 
     public <T> T to(String tailApiUrl, Class<T> type, String method) throws IOException {
         while (true) {// loop while API rate limit is hit
-            HttpURLConnection uc = (HttpURLConnection) root.getApiURL(v,tailApiUrl).openConnection();
+            HttpURLConnection uc = (HttpURLConnection) root.getApiURL(tailApiUrl).openConnection();
 
             uc.setDoOutput(true);
             uc.setRequestProperty("Content-type","application/x-www-form-urlencoded");
             if (authenticate) {
-                if (v==ApiVersion.V3) {
+                if (root.oauthAccessToken!=null) {
-                    if (root.oauthAccessToken!=null) {
+                    uc.setRequestProperty("Authorization", "token " + root.oauthAccessToken);
-                        uc.setRequestProperty("Authorization", "token " + root.oauthAccessToken);
-                    } else {
-                        if (root.password==null)
-                            throw new IllegalArgumentException("V3 API doesn't support API token");
-                        uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
-                    }
                 } else {
+                    if (root.password==null)
+                        throw new IllegalArgumentException("V3 API doesn't support API token");
                     uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
                 }
             }
-            uc.setRequestMethod(method);
+            try {
-
+                uc.setRequestMethod(method);
-
+            } catch (ProtocolException e) {
-            if (v==ApiVersion.V2) {
+                // JDK only allows one of the fixed set of verbs. Try to override that
-                StringBuilder body = new StringBuilder();
+                try {
-                for (Entry e : args) {
+                    Field $method = HttpURLConnection.class.getDeclaredField("method");
-                    if (body.length()>0)    body.append('&');
+                    $method.setAccessible(true);
-                    body.append(e.toFormArg());
+                    $method.set(uc,method);
+                } catch (Exception x) {
+                    throw (IOException)new IOException("Failed to set the custom verb").initCause(x);
                 }
-
-                OutputStreamWriter o = new OutputStreamWriter(uc.getOutputStream(), "UTF-8");
-                o.write(body.toString());
-                o.close();
-            } else {
-                Map json = new HashMap();
-                for (Entry e : args) {
-                    json.put(e.key, e.value);
-                }
-                MAPPER.writeValue(uc.getOutputStream(),json);
             }
 
+
+            Map json = new HashMap();
+            for (Entry e : args) {
+                json.put(e.key, e.value);
+            }
+            MAPPER.writeValue(uc.getOutputStream(),json);
+
             try {
                 InputStreamReader r = new InputStreamReader(uc.getInputStream(), "UTF-8");
                 String data = IOUtils.toString(r);

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

@@ -1,37 +1,109 @@
 package org.kohsuke;
 
 import junit.framework.TestCase;
+import org.kohsuke.github.GHCommit;
+import org.kohsuke.github.GHCommit.File;
+import org.kohsuke.github.GHCommitComment;
 import org.kohsuke.github.GHEvent;
 import org.kohsuke.github.GHEventInfo;
 import org.kohsuke.github.GHEventPayload;
 import org.kohsuke.github.GHHook;
+import org.kohsuke.github.GHBranch;
 import org.kohsuke.github.GHIssueState;
+import org.kohsuke.github.GHKey;
+import org.kohsuke.github.GHMyself;
 import org.kohsuke.github.GHOrganization;
 import org.kohsuke.github.GHOrganization.Permission;
+import org.kohsuke.github.GHPullRequest;
 import org.kohsuke.github.GHRepository;
 import org.kohsuke.github.GHTeam;
+import org.kohsuke.github.GHUser;
 import org.kohsuke.github.GitHub;
+import org.kohsuke.github.PagedIterable;
+import org.kohsuke.github.PagedIterator;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Map;
 import java.util.Set;
+import java.util.List;
 
 /**
  * Unit test for simple App.
  */
 public class AppTest extends TestCase {
+    public void testRepoCRUD() throws Exception {
+        GitHub hub = GitHub.connect();
+        GHRepository r = hub.createRepository("github-api-test", "a test repository", "http://github-api.kohsuke.org/", true);
+        r.enableIssueTracker(false);
+        r.enableDownloads(false);
+        r.enableWiki(false);
+        r.renameTo("github-api-test2");
+        hub.getMyself().getRepository("github-api-test2").delete();
+    }
+
     public void testCredentialValid() throws IOException {
         assertTrue(GitHub.connect().isCredentialValid());
         assertFalse(GitHub.connect("totally","bogus").isCredentialValid());
     }
 
+    public void testRateLimit() throws IOException {
+        System.out.println(GitHub.connect().getRateLimit());
+    }
+
+    public void testMyOrganizations() throws IOException {
+        Map<String, GHOrganization> org = GitHub.connect().getMyOrganizations();
+        assertFalse(org.keySet().contains(null));
+        System.out.println(org);
+    }
+
     public void testFetchPullRequest() throws Exception {
         GitHub gh = GitHub.connect();
         GHRepository r = gh.getOrganization("jenkinsci").getRepository("jenkins");
+        assertEquals("master",r.getMasterBranch());
         r.getPullRequest(1);
         r.getPullRequests(GHIssueState.OPEN);
     }
 
+    public void testFetchPullRequestAsList() throws Exception {
+        GitHub gh = GitHub.connect();
+        GHRepository r = gh.getOrganization("symfony").getRepository("symfony-docs");
+        assertEquals("master", r.getMasterBranch());
+        PagedIterable<GHPullRequest> i = r.listPullRequests(GHIssueState.CLOSED);
+        List<GHPullRequest> prs = i.asList();
+        assertNotNull(prs);
+        assertTrue(prs.size() > 0);
+    }
+
+    public void testRepoPermissions() throws Exception {
+        GitHub gh = GitHub.connect();
+        GHRepository r = gh.getOrganization("jenkinsci").getRepository("jenkins");
+        assertTrue(r.hasPullAccess());
+
+        r = gh.getOrganization("github").getRepository("tire");
+        assertFalse(r.hasAdminAccess());
+    }
+    
+    public void tryGetMyself() throws Exception {
+        GitHub hub = GitHub.connect();
+        GHMyself me = hub.getMyself();
+        System.out.println(me);
+        GHUser u = hub.getUser("kohsuke2");
+        System.out.println(u);
+        for (List<GHRepository> lst : me.iterateRepositories(100)) {
+            for (GHRepository r : lst) {
+                System.out.println(r.getPushedAt());
+            }
+        }
+    }
+
+    public void testPublicKeys() throws Exception {
+        GitHub gh = GitHub.connect();
+        List<GHKey> keys = gh.getMyself().getPublicKeys();
+        System.out.println(keys);
+    }
+
     public void tryOrgFork() throws Exception {
         GitHub gh = GitHub.connect();
         gh.getUser("kohsuke").getRepository("rubywm").forkTo(gh.getOrganization("jenkinsci"));
@@ -55,6 +127,58 @@ public class AppTest extends TestCase {
         System.out.println(o);
     }
 
+    public void testCommit() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        GHCommit commit = gitHub.getUser("jenkinsci").getRepository("jenkins").getCommit("08c1c9970af4d609ae754fbe803e06186e3206f7");
+        System.out.println(commit);
+        assertEquals(1, commit.getParents().size());
+        assertEquals(1,commit.getFiles().size());
+
+        File f = commit.getFiles().get(0);
+        assertEquals(48,f.getLinesChanged());
+        assertEquals("modified",f.getStatus());
+        assertEquals("changelog.html",f.getFileName());
+    }
+
+    public void testListCommits() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        List<String> sha1 = new ArrayList<String>();
+        for (GHCommit c : gitHub.getUser("kohsuke").getRepository("empty-commit").listCommits()) {
+            System.out.println(c.getSHA1());
+            sha1.add(c.getSHA1());
+        }
+        assertEquals("fdfad6be4db6f96faea1f153fb447b479a7a9cb7",sha1.get(0));
+        assertEquals(1,sha1.size());
+    }
+
+    public void testBranches() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        Map<String,GHBranch> b =
+                gitHub.getUser("jenkinsci").getRepository("jenkins").getBranches();
+        System.out.println(b);
+    }
+
+    public void testCommitComment() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        GHRepository r = gitHub.getUser("jenkinsci").getRepository("jenkins");
+        PagedIterable<GHCommitComment> comments = r.listCommitComments();
+        List<GHCommitComment> batch = comments.iterator().nextPage();
+        for (GHCommitComment comment : batch) {
+            System.out.println(comment.getBody());
+            assertSame(comment.getOwner(), r);
+        }
+    }
+
+    public void testCreateCommitComment() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        GHCommit commit = gitHub.getUser("kohsuke").getRepository("sandbox-ant").getCommit("8ae38db0ea5837313ab5f39d43a6f73de3bd9000");
+        GHCommitComment c = commit.createComment("[testing](http://kohsuse.org/)");
+        System.out.println(c);
+        c.update("updated text");
+        System.out.println(c);
+        c.delete();
+    }
+
     public void tryHook() throws Exception {
         GitHub gitHub = GitHub.connect();
         GHRepository r = gitHub.getMyself().getRepository("test2");
@@ -151,11 +275,6 @@ public class AppTest extends TestCase {
         gitHub.getUser("kohsuke").getRepository("test").renameTo("test2");
     }
 
-    private void tryOrgFork(GitHub gitHub) throws IOException {
-        GHOrganization o = gitHub.getOrganization("HudsonLabs");
-        System.out.println(gitHub.getUser("rtyler").getRepository("memcache-ada").forkTo(o).getUrl());
-    }
-
     private void tryTeamCreation(GitHub gitHub) throws IOException {
         GHOrganization o = gitHub.getOrganization("HudsonLabs");
         GHTeam t = o.createTeam("auto team", Permission.PUSH);
@@ -171,6 +290,15 @@ public class AppTest extends TestCase {
         System.out.println(hooks);
     }
 
+    public void testOrgRepositories() throws IOException {
+        GitHub gitHub = GitHub.connect();
+        GHOrganization j = gitHub.getOrganization("jenkinsci");
+        long start = System.currentTimeMillis();
+        Map<String, GHRepository> repos = j.getRepositories();
+        long end = System.currentTimeMillis();
+        System.out.printf("%d repositories in %dms\n",repos.size(),end-start);
+    }
+    
     public void testOrganization() throws IOException {
         GitHub gitHub = GitHub.connect();
         GHOrganization j = gitHub.getOrganization("jenkinsci");