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

Add basic support for tag objects

.gitignore

@@ -1,4 +1,9 @@
 target
+.idea/
 *.iml
 *.ipr
 *.iws
+.classpath
+.project
+.settings/
+.DS_Store

LICENSE.txt

@@ -0,0 +1,22 @@
+ Copyright (c) 2011- Kohsuke Kawaguchi and other contributors
+
+ 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.

pom.xml

@@ -3,11 +3,11 @@
   <parent>
     <groupId>org.kohsuke</groupId>
     <artifactId>pom</artifactId>
-    <version>3</version>
+    <version>17</version>
   </parent>
 
   <artifactId>github-api</artifactId>
-  <version>1.25</version>
+  <version>1.87</version>
   <name>GitHub API for Java</name>
   <url>http://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
@@ -16,6 +16,7 @@
     <connection>scm:git:git@github.com/kohsuke/${project.artifactId}.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git</developerConnection>
     <url>http://${project.artifactId}.kohsuke.org/</url>
+    <tag>github-api-1.87</tag>
   </scm>
 
   <distributionManagement>
@@ -25,12 +26,45 @@
     </site>
   </distributionManagement>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <findbugs-maven-plugin.version>3.0.2</findbugs-maven-plugin.version>
+    <findbugs-maven-plugin.failOnError>true</findbugs-maven-plugin.failOnError>
+  </properties>
+
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <rerunFailingTestsCount>2</rerunFailingTestsCount>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <version>1.15</version>
+        <configuration>
+          <signature>
+            <groupId>org.codehaus.mojo.signature</groupId>
+            <artifactId>java15</artifactId>
+            <version>1.0</version>
+          </signature>
+        </configuration>
+        <executions>
+          <execution>
+            <id>ensure-java-1.5-class-library</id>
+            <phase>test</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>com.infradna.tool</groupId>
         <artifactId>bridge-method-injector</artifactId>
-        <version>1.2</version>
+        <version>1.14</version>
         <executions>
           <execution>
             <goals>
@@ -39,32 +73,48 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>${findbugs-maven-plugin.version}</version>
+        <configuration>
+          <xmlOutput>true</xmlOutput>
+          <failOnError>${findbugs-maven-plugin.failOnError}</failOnError>
+        </configuration>
+        <executions>
+          <execution>
+            <id>run-findbugs</id>
+            <phase>verify</phase> 
+            <goals>
+              <goal>check</goal> 
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
   <dependencies>
     <dependency>
-      <groupId>org.jvnet.hudson</groupId>
+      <groupId>commons-lang</groupId>
-      <artifactId>htmlunit</artifactId>
+      <artifactId>commons-lang</artifactId>
-      <version>2.6-hudson-2</version>
+      <version>2.6</version>
-      <exclusions>
+    </dependency>
-        <exclusion>
+    <dependency>
-                <!--  hides JDK DOM classes in Eclipse -->
+      <groupId>commons-codec</groupId>
-                <groupId>xml-apis</groupId>
+      <artifactId>commons-codec</artifactId>
-                <artifactId>xml-apis</artifactId>
+      <version>1.7</version>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
+      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
+      <artifactId>jackson-databind</artifactId>
-      <version>1.5.0</version>
+      <version>2.2.3</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -74,8 +124,7 @@
     <dependency>
       <groupId>com.infradna.tool</groupId>
       <artifactId>bridge-method-annotation</artifactId>
-      <version>1.4</version>
+      <version>1.14</version>
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
@@ -83,7 +132,49 @@
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit</artifactId>
+      <version>3.1.0.201310021548-r</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp</groupId>
+      <artifactId>okhttp-urlconnection</artifactId>
+      <version>2.7.5</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.kohsuke</groupId>
+      <artifactId>wordnet-random-name</artifactId>
+      <version>1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>annotations</artifactId>
+      <version>3.0.0</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>repo.jenkins-ci.org</id>
+      <url>http://repo.jenkins-ci.org/public/</url>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>repo.jenkins-ci.org</id>
+      <url>http://repo.jenkins-ci.org/public/</url>
+    </pluginRepository>
+  </pluginRepositories>
 
   <reporting>
     <plugins>
@@ -93,4 +184,20 @@
       </plugin>
     </plugins>
   </reporting>
+
+  <licenses>
+    <license>
+      <name>The MIT license</name>
+      <url>http://www.opensource.org/licenses/mit-license.php</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <mailingLists>
+    <mailingList>
+      <name>User List</name>
+      <post>github-api@googlegroups.com</post>
+      <archive>https://groups.google.com/forum/#!forum/github-api</archive>
+    </mailingList>
+  </mailingLists>
 </project>

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

@@ -0,0 +1,63 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.HttpURLConnection;
+
+/**
+ * Pluggable strategy to determine what to do when the API abuse limit is hit.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GitHubBuilder#withAbuseLimitHandler(AbuseLimitHandler)
+ * @see <a href="https://developer.github.com/v3/#abuse-rate-limits">documentation</a>
+ * @see RateLimitHandler
+ */
+public abstract class AbuseLimitHandler {
+    /**
+     * Called when the library encounters HTTP error indicating that the API abuse limit is reached.
+     *
+     * <p>
+     * Any exception thrown from this method will cause the request to fail, and the caller of github-api
+     * will receive an exception. If this method returns normally, another request will be attempted.
+     * For that to make sense, the implementation needs to wait for some time.
+     *
+     * @see <a href="https://developer.github.com/v3/#abuse-rate-limits">API documentation from GitHub</a>
+     * @param e
+     *      Exception from Java I/O layer. If you decide to fail the processing, you can throw
+     *      this exception (or wrap this exception into another exception and throw it.)
+     * @param uc
+     *      Connection that resulted in an error. Useful for accessing other response headers.
+     */
+    public abstract void onError(IOException e, HttpURLConnection uc) throws IOException;
+
+    /**
+     * Wait until the API abuse "wait time" is passed.
+     */
+    public static final AbuseLimitHandler WAIT = new AbuseLimitHandler() {
+        @Override
+        public void onError(IOException e, HttpURLConnection uc) throws IOException {
+            try {
+                Thread.sleep(parseWaitTime(uc));
+            } catch (InterruptedException _) {
+                throw (InterruptedIOException)new InterruptedIOException().initCause(e);
+            }
+        }
+
+        private long parseWaitTime(HttpURLConnection uc) {
+            String v = uc.getHeaderField("Retry-After");
+            if (v==null)    return 60 * 1000;   // can't tell, return 1 min
+
+            return Math.max(1000, Long.parseLong(v)*1000);
+        }
+    };
+
+    /**
+     * Fail immediately.
+     */
+    public static final AbuseLimitHandler FAIL = new AbuseLimitHandler() {
+        @Override
+        public void onError(IOException e, HttpURLConnection uc) throws IOException {
+            throw (IOException)new IOException("Abust limit reached").initCause(e);
+        }
+    };
+}

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/DeleteToken.java

@@ -23,9 +23,13 @@
  */
 package org.kohsuke.github;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * @author Kohsuke Kawaguchi
  */
+@SuppressFBWarnings(value = "UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD", 
+        justification = "Being constructed by JSON deserialization")
 class DeleteToken {
     public String delete_token;
 }

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

@@ -0,0 +1,17 @@
+package org.kohsuke.github;
+
+import java.util.Locale;
+
+/**
+ * This was added during preview API period but it has changed since then.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@Deprecated
+public enum EnforcementLevel {
+    OFF, NON_ADMINS, EVERYONE;
+
+    public String toString() {
+        return name().toLowerCase(Locale.ENGLISH);
+    }
+}

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

@@ -0,0 +1,101 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Asset in a release.
+ *
+ * @see GHRelease#getAssets()
+ */
+public class GHAsset extends GHObject {
+    GitHub root;
+    GHRepository owner;
+    private String name;
+    private String label;
+    private String state;
+    private String content_type;
+    private long size;
+    private long download_count;
+    private String browser_download_url;
+
+    public String getContentType() {
+        return content_type;
+    }
+
+    public void setContentType(String contentType) throws IOException {
+        edit("content_type", contentType);
+        this.content_type = contentType;
+    }
+
+    public long getDownloadCount() {
+        return download_count;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) throws IOException {
+        edit("label", label);
+        this.label = label;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public GHRepository getOwner() {
+        return owner;
+    }
+
+    public GitHub getRoot() {
+        return root;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    public String getBrowserDownloadUrl() {
+        return browser_download_url;
+    }
+
+    private void edit(String key, Object value) throws IOException {
+        new Requester(root)._with(key, value).method("PATCH").to(getApiRoute());
+    }
+
+    public void delete() throws IOException {
+        new Requester(root).method("DELETE").to(getApiRoute());
+    }
+
+
+    private String getApiRoute() {
+        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + id;
+    }
+
+    GHAsset wrap(GHRelease release) {
+        this.owner = release.getOwner();
+        this.root = owner.root;
+        return this;
+    }
+
+    public static GHAsset[] wrap(GHAsset[] assets, GHRelease release) {
+        for (GHAsset aTo : assets) {
+            aTo.wrap(release);
+        }
+        return assets;
+    }
+}

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

@@ -0,0 +1,114 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Generated OAuth token
+ *
+ * @author janinko
+ * @see GitHub#createToken(Collection, String, String)
+ * @see <a href="http://developer.github.com/v3/oauth/#create-a-new-authorization">API documentation</a>
+ */
+public class GHAuthorization extends GHObject {
+    public static final String USER = "user";
+    public static final String USER_EMAIL = "user:email";
+    public static final String USER_FOLLOW = "user:follow";
+    public static final String PUBLIC_REPO = "public_repo";
+    public static final String REPO = "repo";
+    public static final String REPO_STATUS = "repo:status";
+    public static final String DELETE_REPO = "delete_repo";
+    public static final String NOTIFICATIONS = "notifications";
+    public static final String GIST = "gist";
+    public static final String READ_HOOK = "read:repo_hook";
+    public static final String WRITE_HOOK = "write:repo_hook";
+    public static final String AMIN_HOOK = "admin:repo_hook";
+    public static final String READ_ORG = "read:org";
+    public static final String WRITE_ORG = "write:org";
+    public static final String ADMIN_ORG = "admin:org";
+    public static final String READ_KEY = "read:public_key";
+    public static final String WRITE_KEY = "write:public_key";
+    public static final String ADMIN_KEY = "admin:public_key";
+
+    private GitHub root;
+    private List<String> scopes;
+    private String token;
+    private String token_last_eight;
+    private String hashed_token;
+    private App app;
+    private String note;
+    private String note_url;
+    private String fingerprint;
+    //TODO add some user class for https://developer.github.com/v3/oauth_authorizations/#check-an-authorization ?
+    //private GHUser user;
+
+    public GitHub getRoot() {
+        return root;
+    }
+
+    public List<String> getScopes() {
+        return scopes;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public String getTokenLastEight() {
+        return token_last_eight;
+    }
+
+    public String getHashedToken() {
+        return hashed_token;
+    }
+
+    public URL getAppUrl() {
+        return GitHub.parseURL(app.url);
+    }
+
+    public String getAppName() {
+        return app.name;
+    }
+
+    @SuppressFBWarnings(value = "NM_CONFUSING", 
+            justification = "It's a part of the library API, cannot be changed")
+    public URL getApiURL() {
+        return GitHub.parseURL(url);
+    }
+
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public URL getNoteUrl() {
+        return GitHub.parseURL(note_url);
+    }
+
+    public String getFingerprint() {
+        return fingerprint;
+    }
+
+    /*package*/ GHAuthorization wrap(GitHub root) {
+        this.root = root;
+        return this;
+    }
+
+    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD"}, 
+        justification = "JSON API")
+    private static class App {
+        private String url;
+        private String name;
+        // private String client_id; not yet used
+    }
+}

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

@@ -0,0 +1,64 @@
+package org.kohsuke.github;
+
+import org.apache.commons.codec.binary.Base64InputStream;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+
+/**
+ * @author Kanstantsin Shautsou
+ * @author Kohsuke Kawaguchi
+ * @see GHTreeEntry#asBlob()
+ * @see GHRepository#getBlob(String)
+ * @see <a href="https://developer.github.com/v3/git/blobs/#get-a-blob">Get a blob</a>
+ */
+public class GHBlob {
+    private String content, encoding, url, sha;
+    private long size;
+
+    /**
+     * API URL of this blob.
+     */
+    public URL getUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    public String getSha() {
+        return sha;
+    }
+
+    /**
+     * Number of bytes in this blob.
+     */
+    public long getSize() {
+        return size;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+    /**
+     * Encoded content. You probably want {@link #read()}
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * Retrieves the actual bytes of the blob.
+     */
+    public InputStream read() {
+        if (encoding.equals("base64")) {
+            try {
+                return new Base64InputStream(new ByteArrayInputStream(content.getBytes("US-ASCII")), false);
+            } catch (UnsupportedEncodingException e) {
+                throw new AssertionError(e);    // US-ASCII is mandatory
+            }
+        }
+
+        throw new UnsupportedOperationException("Unrecognized encoding: "+encoding);
+    }
+}

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

@@ -1,19 +1,38 @@
 package org.kohsuke.github;
 
+import static org.kohsuke.github.Previews.LOKI;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * A branch in a repository.
- * 
+ *
  * @author Yusuke Kokubo
  */
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD",
+    "NP_UNWRITTEN_FIELD", "URF_UNREAD_FIELD"}, justification = "JSON API")
 public class GHBranch {
     private GitHub root;
     private GHRepository owner;
 
     private String name;
     private Commit commit;
+    @JsonProperty("protected")
+    private boolean protection;
+    private String protection_url;
+
 
     public static class Commit {
-        String sha,url;
+        String sha;
+
+        @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
+        String url;
     }
 
     public GitHub getRoot() {
@@ -31,6 +50,27 @@ public class GHBranch {
         return name;
     }
 
+    /**
+     * Returns true if the push to this branch is restricted via branch protection.
+     */
+    @Preview @Deprecated
+    public boolean isProtected() {
+        return protection;
+    }
+
+    /**
+     * Returns API URL that deals with the protection of this branch.
+     */
+    @Preview @Deprecated
+    public URL getProtectionUrl() {
+        return GitHub.parseURL(protection_url);
+    }
+
+    @Preview @Deprecated
+    public GHBranchProtection getProtection() throws IOException {
+        return root.retrieve().withPreview(LOKI).to(protection_url, GHBranchProtection.class);
+    }
+
     /**
      * The commit that this branch currently points to.
      */
@@ -38,9 +78,49 @@ public class GHBranch {
         return commit.sha;
     }
 
+    /**
+     * Disables branch protection and allows anyone with push access to push changes.
+     */
+    @Preview @Deprecated
+    public void disableProtection() throws IOException {
+        new Requester(root).method("DELETE").withPreview(LOKI).to(protection_url);
+    }
+
+    /**
+     * Enables branch protection to control what commit statuses are required to push.
+     *
+     * @see GHCommitStatus#getContext()
+     */
+    @Preview @Deprecated
+    public GHBranchProtectionBuilder enableProtection() {
+        return new GHBranchProtectionBuilder(this);
+    }
+
+    // backward compatibility with previous signature
+    @Deprecated
+    public void enableProtection(EnforcementLevel level, Collection<String> contexts) throws IOException {
+        switch (level) {
+        case OFF:
+            disableProtection();
+            break;
+        case NON_ADMINS:
+        case EVERYONE:
+            enableProtection()
+                .addRequiredChecks(contexts)
+                .includeAdmins(level==EnforcementLevel.EVERYONE)
+                .enable();
+            break;
+        }
+    }
+
+    String getApiRoute() {
+        return owner.getApiTailUrl("/branches/"+name);
+    }
+
     @Override
     public String toString() {
-        return "Branch:" + name + " in " + owner.getUrl();
+        final String url = owner != null ? owner.getUrl().toString() : "unknown";
+        return "Branch:" + name + " in " + url;
     }
 
     /*package*/ GHBranch wrap(GHRepository repo) {

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

@@ -0,0 +1,152 @@
+package org.kohsuke.github;
+
+import java.util.Collection;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+@SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
+		"URF_UNREAD_FIELD" }, justification = "JSON API")
+public class GHBranchProtection {
+	@JsonProperty("enforce_admins")
+	private EnforceAdmins enforceAdmins;
+
+	@JsonProperty("required_pull_request_reviews")
+	private RequiredReviews requiredReviews;
+
+	@JsonProperty("required_status_checks")
+	private RequiredStatusChecks requiredStatusChecks;
+
+	@JsonProperty
+	private Restrictions restrictions;
+
+	@JsonProperty
+	private String url;
+	
+	public EnforceAdmins getEnforceAdmins() {
+        return enforceAdmins;
+    }
+
+    public RequiredReviews getRequiredReviews() {
+        return requiredReviews;
+    }
+
+    public RequiredStatusChecks getRequiredStatusChecks() {
+        return requiredStatusChecks;
+    }
+
+    public Restrictions getRestrictions() {
+        return restrictions;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public static class EnforceAdmins {
+		@JsonProperty
+		private boolean enabled;
+
+		@JsonProperty
+		private String url;
+
+        public String getUrl() {
+            return url;
+        }
+
+        public boolean isEnabled() {
+            return enabled;
+        }
+	}
+
+	public static class RequiredReviews {
+		@JsonProperty("dismissal_restrictions")
+		private Restrictions dismissalRestriction; 
+
+		@JsonProperty("dismiss_stale_reviews")
+		private boolean dismissStaleReviews;
+
+		@JsonProperty("require_code_owner_reviews")
+		private boolean requireCodeOwnerReviews;
+
+		@JsonProperty
+		private String url;
+
+        public Restrictions getDismissalRestrictions() {
+            return dismissalRestriction;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public boolean isDismissStaleReviews() {
+            return dismissStaleReviews;
+        }
+
+        public boolean isRequireCodeOwnerReviews() {
+            return requireCodeOwnerReviews;
+        }
+	}
+
+	public static class RequiredStatusChecks {
+		@JsonProperty
+		private Collection<String> contexts;
+
+		@JsonProperty
+		private boolean strict;
+
+		@JsonProperty
+		private String url;
+
+        public Collection<String> getContexts() {
+            return contexts;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public boolean isRequiresBranchUpToDate() {
+            return strict;
+        }
+	}
+
+	public static class Restrictions {
+		@JsonProperty
+		private Collection<GHTeam> teams;
+
+		@JsonProperty("teams_url")
+		private String teamsUrl;
+
+		@JsonProperty
+		private String url;
+
+		@JsonProperty
+		private Collection<GHUser> users;
+
+		@JsonProperty("users_url")
+		private String usersUrl;
+
+        public Collection<GHTeam> getTeams() {
+            return teams;
+        }
+
+        public String getTeamsUrl() {
+            return teamsUrl;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public Collection<GHUser> getUsers() {
+            return users;
+        }
+
+        public String getUsersUrl() {
+            return usersUrl;
+        }
+	}
+}

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

@@ -0,0 +1,203 @@
+package org.kohsuke.github;
+
+import static org.kohsuke.github.Previews.LOKI;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Builder to configure the branch protection settings.
+ *
+ * @see GHBranch#enableProtection()
+ */
+@SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
+        "URF_UNREAD_FIELD" }, justification = "JSON API")
+public class GHBranchProtectionBuilder {
+    private final GHBranch branch;
+
+    private boolean enforceAdmins;
+    private Map<String, Object> prReviews;
+    private Restrictions restrictions;
+    private StatusChecks statusChecks;
+
+    GHBranchProtectionBuilder(GHBranch branch) {
+        this.branch = branch;
+    }
+
+    public GHBranchProtectionBuilder addRequiredChecks(Collection<String> checks) {
+        getStatusChecks().contexts.addAll(checks);
+        return this;
+    }
+    
+    public GHBranchProtectionBuilder addRequiredChecks(String... checks) {
+        addRequiredChecks(Arrays.asList(checks));
+        return this;
+    }
+
+    public GHBranchProtectionBuilder dismissStaleReviews() {
+        getPrReviews().put("dismiss_stale_reviews", true);
+        return this;
+    }
+
+    public GHBranchProtection enable() throws IOException {
+        return requester().method("PUT")
+                .withNullable("required_status_checks", statusChecks)
+                .withNullable("required_pull_request_reviews", prReviews)
+                .withNullable("restrictions", restrictions)
+                .withNullable("enforce_admins", enforceAdmins)
+                .to(branch.getProtectionUrl().toString(), GHBranchProtection.class);
+    }
+
+    public GHBranchProtectionBuilder includeAdmins() {
+        return includeAdmins(true);
+    }
+
+    public GHBranchProtectionBuilder includeAdmins(boolean v) {
+        enforceAdmins = v;
+        return this;
+    }
+
+    public GHBranchProtectionBuilder requireBranchIsUpToDate() {
+        return requireBranchIsUpToDate(true);
+    }
+
+    public GHBranchProtectionBuilder requireBranchIsUpToDate(boolean v) {
+        getStatusChecks().strict = v;
+        return this;
+    }
+
+    public GHBranchProtectionBuilder requireCodeOwnReviews() {
+        return requireCodeOwnReviews(true);
+    }
+
+    public GHBranchProtectionBuilder requireCodeOwnReviews(boolean v) {
+        getPrReviews().put("require_code_owner_reviews", v);
+        return this;
+    }
+
+    public GHBranchProtectionBuilder requireReviews() {
+        getPrReviews();
+        return this;
+    }
+
+    public GHBranchProtectionBuilder restrictPushAccess() {
+        getRestrictions();
+        return this;
+    }
+
+    public GHBranchProtectionBuilder teamPushAccess(Collection<GHTeam> teams) {
+        for (GHTeam team : teams) {
+            teamPushAccess(team);
+        }
+        return this;
+    }
+
+    public GHBranchProtectionBuilder teamPushAccess(GHTeam... teams) {
+        for (GHTeam team : teams) {
+            getRestrictions().teams.add(team.getSlug());
+        }
+        return this;
+    }
+
+    public GHBranchProtectionBuilder teamReviewDismissals(Collection<GHTeam> teams) {
+        for (GHTeam team : teams) {
+            teamReviewDismissals(team);
+        }
+        return this;
+    }
+
+    public GHBranchProtectionBuilder teamReviewDismissals(GHTeam... teams) {
+        for (GHTeam team : teams) {
+            addReviewRestriction(team.getSlug(), true);
+        }
+        return this;
+    }
+
+    public GHBranchProtectionBuilder userPushAccess(Collection<GHUser> users) {
+        for (GHUser user : users) {
+            userPushAccess(user);
+        }
+        return this;
+    }
+    
+    public GHBranchProtectionBuilder userPushAccess(GHUser... users) {
+        for (GHUser user : users) {
+            getRestrictions().users.add(user.getLogin());
+        }
+        return this;
+    }
+
+    public GHBranchProtectionBuilder userReviewDismissals(Collection<GHUser> users) {
+        for (GHUser team : users) {
+            userReviewDismissals(team);
+        }
+        return this;
+    }
+
+    public GHBranchProtectionBuilder userReviewDismissals(GHUser... users) {
+        for (GHUser user : users) {
+            addReviewRestriction(user.getLogin(), false);
+        }
+        return this;
+    }
+
+    private void addReviewRestriction(String restriction, boolean isTeam) {
+        getPrReviews();
+        
+        if (!prReviews.containsKey("dismissal_restrictions")) {
+            prReviews.put("dismissal_restrictions", new Restrictions());
+        }
+        
+        Restrictions restrictions = (Restrictions) prReviews.get("dismissal_restrictions");
+        
+        if (isTeam) {
+            restrictions.teams.add(restriction);
+        } else {
+            restrictions.users.add(restriction);
+        }
+    }
+
+    private Map<String, Object> getPrReviews() {
+        if (prReviews == null) {
+            prReviews = new HashMap<String, Object>();
+        }
+        return prReviews;
+    }
+
+    private Restrictions getRestrictions() {
+        if (restrictions == null) {
+            restrictions = new Restrictions();
+        }
+        return restrictions;
+    }
+
+    private StatusChecks getStatusChecks() {
+        if (statusChecks == null) {
+            statusChecks = new StatusChecks();
+        }
+        return statusChecks;
+    }
+
+    private Requester requester() {
+        return new Requester(branch.getRoot()).withPreview(LOKI);
+    }
+
+    private static class Restrictions {
+        private Set<String> teams = new HashSet<String>();
+        private Set<String> users = new HashSet<String>();
+    }
+
+    private static class StatusChecks {
+        final List<String> contexts = new ArrayList<String>();
+        boolean strict;
+    }
+}

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

@@ -1,14 +1,15 @@
 package org.kohsuke.github;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.net.URL;
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
-import static org.kohsuke.github.ApiVersion.V3;
-
 /**
  * A commit in a repository.
  *
@@ -16,8 +17,68 @@ import static org.kohsuke.github.ApiVersion.V3;
  * @see GHRepository#getCommit(String)
  * @see GHCommitComment#getCommit()
  */
+@SuppressFBWarnings(value = {"NP_UNWRITTEN_FIELD", "UWF_UNWRITTEN_FIELD"}, 
+        justification = "JSON API")
 public class GHCommit {
     private GHRepository owner;
+    
+    private ShortInfo commit;
+
+    /**
+     * Short summary of this commit.
+     */
+    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD", "UWF_UNWRITTEN_FIELD"}, justification = "JSON API")
+    public static class ShortInfo {
+        private GHAuthor author;
+        private GHAuthor committer;
+        
+        private String message;
+        
+        private int comment_count;
+
+        static class Tree {
+            String sha;
+        }
+
+        private Tree tree;
+
+        @WithBridgeMethods(value = GHAuthor.class, castRequired = true)
+        public GitUser getAuthor() {
+            return author;
+        }
+
+        public Date getAuthoredDate() {
+            return GitHub.parseDate(author.date);
+        }
+
+        @WithBridgeMethods(value = GHAuthor.class, castRequired = true)
+        public GitUser getCommitter() {
+            return committer;
+        }
+
+        public Date getCommitDate() {
+            return GitHub.parseDate(committer.date);
+        }
+
+        /**
+         * Commit message.
+         */
+        public String getMessage() {
+            return message;
+        }
+
+        public int getCommentCount() {
+            return comment_count;
+        }
+    }
+
+    /**
+     * @deprecated Use {@link GitUser} instead.
+     */
+    public static class GHAuthor extends GitUser {
+        private String date;
+    }
 
     public static class Stats {
         int total,additions,deletions;
@@ -26,10 +87,13 @@ public class GHCommit {
     /**
      * A file that was modified.
      */
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", 
+            justification = "It's being initilized by JSON deserialization")
     public static class File {
         String status;
         int changes,additions,deletions;
-        String raw_url, blob_url, filename, sha, patch;
+        String raw_url, blob_url, sha, patch;
+        String filename, previous_filename;
 
         /**
          * Number of lines added + removed.
@@ -53,19 +117,28 @@ public class GHCommit {
         }
 
         /**
-         * "modified", "added", or "deleted"
+         * "modified", "added", or "removed"
          */
         public String getStatus() {
             return status;
         }
 
         /**
-         * Just the base name and the extension without any directory name.
+         * Full path in the repository.
          */
+        @SuppressFBWarnings(value = "NM_CONFUSING",
+                justification = "It's a part of the library's API and cannot be renamed")
         public String getFileName() {
             return filename;
         }
 
+        /**
+         * Previous path, in case file has moved.
+         */
+        public String getPreviousFilename() {
+            return previous_filename;
+        }
+
         /**
          * The actual change.
          */
@@ -98,21 +171,34 @@ public class GHCommit {
     }
 
     public static class Parent {
-        String url,sha;
+        @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
+        String url;  
+        String 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;
+        @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
+        String url,avatar_url,gravatar_id;
+        @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
         int id;
+        
+        String login;
     }
 
-    String url,sha;
+    String url,html_url,sha;
     List<File> files;
     Stats stats;
     List<Parent> parents;
     User author,committer;
 
+
+    public ShortInfo getCommitShortInfo() throws IOException {
+        if (commit==null)
+            populate();
+        return commit;
+    }
+
     /**
      * The repository that contains the commit.
      */
@@ -123,24 +209,41 @@ public class GHCommit {
     /**
      * Number of lines added + removed.
      */
-    public int getLinesChanged() {
+    public int getLinesChanged() throws IOException {
+        populate();
         return stats.total;
     }
 
     /**
      * Number of lines added.
      */
-    public int getLinesAdded() {
+    public int getLinesAdded() throws IOException {
+        populate();
         return stats.additions;
     }
 
     /**
      * Number of lines removed.
      */
-    public int getLinesDeleted() {
+    public int getLinesDeleted() throws IOException {
+        populate();
         return stats.deletions;
     }
 
+    /**
+     * Use this method to walk the tree
+     */
+    public GHTree getTree() throws IOException {
+        return owner.getTree(getCommitShortInfo().tree.sha);
+    }
+
+    /**
+     *  URL of this commit like "https://github.com/kohsuke/sandbox-ant/commit/8ae38db0ea5837313ab5f39d43a6f73de3bd9000"
+     */
+    public URL getHtmlUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
     /**
      * [0-9a-f]{40} SHA1 checksum.
      */
@@ -154,7 +257,8 @@ public class GHCommit {
      * @return
      *      Can be empty but never null.
      */
-    public List<File> getFiles() {
+    public List<File> getFiles() throws IOException {
+        populate();
         return files!=null ? Collections.unmodifiableList(files) : Collections.<File>emptyList();
     }
 
@@ -190,10 +294,29 @@ public class GHCommit {
         return resolveUser(author);
     }
 
+    /**
+     * Gets the date the change was authored on.
+     * @return the date the change was authored on.
+     * @throws IOException if the information was not already fetched and an attempt at fetching the information failed.
+     */
+    public Date getAuthoredDate() throws IOException {
+        return getCommitShortInfo().getAuthoredDate();
+    }
+
     public GHUser getCommitter() throws IOException {
         return resolveUser(committer);
     }
 
+    /**
+     * Gets the date the change was committed on.
+     *
+     * @return the date the change was committed on.
+     * @throws IOException if the information was not already fetched and an attempt at fetching the information failed.
+     */
+    public Date getCommitDate() throws IOException {
+        return getCommitShortInfo().getCommitDate();
+    }
+
     private GHUser resolveUser(User author) throws IOException {
         if (author==null || author.login==null) return null;
         return owner.root.getUser(author.login);
@@ -204,8 +327,8 @@ public class GHCommit {
      */
     public PagedIterable<GHCommitComment> listComments() {
         return new PagedIterable<GHCommitComment>() {
-            public PagedIterator<GHCommitComment> iterator() {
+            public PagedIterator<GHCommitComment> _iterator(int pageSize) {
-                return new PagedIterator<GHCommitComment>(owner.root.retrievePaged(String.format("/repos/%s/%s/commits/%s/comments",owner.getOwnerName(),owner.getName(),sha),GHCommitComment[].class,false,V3)) {
+                return new PagedIterator<GHCommitComment>(owner.root.retrieve().asIterator(String.format("/repos/%s/%s/commits/%s/comments", owner.getOwnerName(), owner.getName(), sha), GHCommitComment[].class, pageSize)) {
                     @Override
                     protected void wrapUp(GHCommitComment[] page) {
                         for (GHCommitComment c : page)
@@ -222,18 +345,39 @@ public class GHCommit {
      * 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,V3)
+        GHCommitComment r = new Requester(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);
+        return createComment(body, null, null, null);
+    }
+
+    /**
+     * Gets the status of this commit, newer ones first.
+     */
+    public PagedIterable<GHCommitStatus> listStatuses() throws IOException {
+        return owner.listCommitStatuses(sha);
+    }
+
+    /**
+     * Gets the last status of this commit, which is what gets shown in the UI.
+     */
+    public GHCommitStatus getLastStatus() throws IOException {
+        return owner.getLastCommitStatus(sha);
+    }
+
+    /**
+     * Some of the fields are not always filled in when this object is retrieved as a part of another API call.
+     */
+    void populate() throws IOException {
+        if (files==null && stats==null)
+            owner.root.retrieve().to(owner.getApiTailUrl("commits/" + sha), this);
     }
 
     GHCommit wrapUp(GHRepository owner) {

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

@@ -1,10 +1,11 @@
 package org.kohsuke.github;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Date;
 
-import static org.kohsuke.github.ApiVersion.V3;
+import static org.kohsuke.github.Previews.SQUIRREL_GIRL;
 
 /**
  * A comment attached to a commit (or a specific line in a specific file of a commit.)
@@ -14,34 +15,20 @@ import static org.kohsuke.github.ApiVersion.V3;
  * @see GHCommit#listComments()
  * @see GHCommit#createComment(String, String, Integer, Integer)
  */
-public class GHCommitComment {
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+public class GHCommitComment extends GHObject implements Reactable {
     private GHRepository owner;
 
-    String updated_at, created_at;
+    String body, html_url, commit_id;
-    String body, url, html_url, commit_id;
     Integer line;
-    int id;
     String path;
-    User user;
+    GHUser user;  // not fully populated. beware.
-
-    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.
@@ -77,15 +64,11 @@ public class GHCommitComment {
         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);
+        return owner == null || owner.root.isOffline() ? user : owner.root.getUser(user.login);
     }
 
     /**
@@ -99,18 +82,40 @@ public class GHCommitComment {
      * Updates the body of the commit message.
      */
     public void update(String body) throws IOException {
-        GHCommitComment r = new Poster(owner.root,V3)
+        new Requester(owner.root)
-                .with("body",body)
+                .with("body", body)
-                .withCredential()
+                .method("PATCH").to(getApiTail(), GHCommitComment.class);
-                .to(getApiTail(),GHCommitComment.class,"PATCH");
         this.body = body;
     }
 
+    @Preview @Deprecated
+    public GHReaction createReaction(ReactionContent content) throws IOException {
+        return new Requester(owner.root)
+                .withPreview(SQUIRREL_GIRL)
+                .with("content", content.getContent())
+                .to(getApiTail()+"/reactions", GHReaction.class).wrap(owner.root);
+    }
+
+    @Preview @Deprecated
+    public PagedIterable<GHReaction> listReactions() {
+        return new PagedIterable<GHReaction>() {
+            public PagedIterator<GHReaction> _iterator(int pageSize) {
+                return new PagedIterator<GHReaction>(owner.root.retrieve().withPreview(SQUIRREL_GIRL).asIterator(getApiTail()+"/reactions", GHReaction[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHReaction[] page) {
+                        for (GHReaction c : page)
+                            c.wrap(owner.root);
+                    }
+                };
+            }
+        };
+    }
+
     /**
      * Deletes this comment.
      */
     public void delete() throws IOException {
-        new Poster(owner.root,V3).withCredential().to(getApiTail(),null,"DELETE");
+        new Requester(owner.root).method("DELETE").to(getApiTail());
     }
 
     private String getApiTail() {
@@ -120,6 +125,9 @@ public class GHCommitComment {
 
     GHCommitComment wrap(GHRepository owner) {
         this.owner = owner;
+        if (owner.root.isOffline()) {
+            user.wrapUp(owner.root);
+        }
         return this;
     }
 }

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

@@ -23,6 +23,8 @@
  */
 package org.kohsuke.github;
 
+import java.io.IOException;
+
 /**
  * Identifies a commit in {@link GHPullRequest}.
  *
@@ -31,11 +33,11 @@ package org.kohsuke.github;
 public class GHCommitPointer {
     private String ref, sha, label;
     private GHUser user;
-    private GHRepository repository/*V2*/,repo/*V3*/;
+    private GHRepository repo;
 
     /**
      * This points to the user who owns
-     * the {@link #repository}.
+     * the {@link #getRepository()}.
      */
     public GHUser getUser() {
         return user;
@@ -45,7 +47,7 @@ public class GHCommitPointer {
      * The repository that contains the commit.
      */
     public GHRepository getRepository() {
-        return repo!=null ? repo : repository;
+        return repo;
     }
 
     /**
@@ -69,9 +71,15 @@ public class GHCommitPointer {
         return label;
     }
 
+    /**
+     * Obtains the commit that this pointer is referring to.
+     */
+    public GHCommit getCommit() throws IOException {
+        return getRepository().getCommit(getSha());
+    }
+
     void wrapUp(GitHub root) {
         if (user!=null) user.root = root;
         if (repo!=null) repo.wrap(root);
-        if (repository!=null) repository.wrap(root);
     }
 }

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

@@ -0,0 +1,105 @@
+package org.kohsuke.github;
+
+import java.util.Date;
+
+/**
+ * Builds up query for listing commits.
+ *
+ * <p>
+ * Call various methods that set the filter criteria, then {@link #list()} method to actually list up the commit.
+ *
+ * <pre>
+ * GHRepository r = ...;
+ * for (GHCommit c : r.queryCommits().since(x).until(y).author("kohsuke")) {
+ *     ...
+ * }
+ * </pre>
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHRepository#queryCommits()
+*/
+public class GHCommitQueryBuilder {
+    private final Requester req;
+    private final GHRepository repo;
+
+    /*package*/ GHCommitQueryBuilder(GHRepository repo) {
+        this.repo = repo;
+        this.req = repo.root.retrieve();    // requester to build up
+    }
+
+    /**
+     * GItHub login or email address by which to filter by commit author.
+     */
+    public GHCommitQueryBuilder author(String author) {
+        req.with("author",author);
+        return this;
+    }
+
+    /**
+     * Only commits containing this file path will be returned.
+     */
+    public GHCommitQueryBuilder path(String path) {
+        req.with("path",path);
+        return this;
+    }
+
+    /**
+     * Specifies the SHA1 commit / tag / branch / etc to start listing commits from.
+     *
+     */
+    public GHCommitQueryBuilder from(String ref) {
+        req.with("sha",ref);
+        return this;
+    }
+
+    public GHCommitQueryBuilder pageSize(int pageSize) {
+        req.with("per_page",pageSize);
+        return this;
+    }
+
+    /**
+     * Only commits after this date will be returned
+     */
+    public GHCommitQueryBuilder since(Date dt) {
+        req.with("since",GitHub.printDate(dt));
+        return this;
+    }
+
+    /**
+     * Only commits after this date will be returned
+     */
+    public GHCommitQueryBuilder since(long timestamp) {
+        return since(new Date(timestamp));
+    }
+
+    /**
+     * Only commits before this date will be returned
+     */
+    public GHCommitQueryBuilder until(Date dt) {
+        req.with("until",GitHub.printDate(dt));
+        return this;
+    }
+
+    /**
+     * Only commits before this date will be returned
+     */
+    public GHCommitQueryBuilder until(long timestamp) {
+        return until(new Date(timestamp));
+    }
+
+    /**
+     * Lists up the commits with the criteria built so far.
+     */
+    public PagedIterable<GHCommit> list() {
+        return new PagedIterable<GHCommit>() {
+            public PagedIterator<GHCommit> _iterator(int pageSize) {
+                return new PagedIterator<GHCommit>(req.asIterator(repo.getApiTailUrl("commits"), GHCommit[].class, pageSize)) {
+                    protected void wrapUp(GHCommit[] page) {
+                        for (GHCommit c : page)
+                            c.wrapUp(repo);
+                    }
+                };
+            }
+        };
+    }
+}

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

@@ -0,0 +1,137 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Search commits.
+ *
+ * @author Marc de Verdelhan
+ * @see GitHub#searchCommits()
+ */
+@Preview @Deprecated
+public class GHCommitSearchBuilder extends GHSearchBuilder<GHCommit> {
+    /*package*/ GHCommitSearchBuilder(GitHub root) {
+        super(root,CommitSearchResult.class);
+        req.withPreview(Previews.CLOAK);
+    }
+
+    /**
+     * Search terms.
+     */
+    public GHCommitSearchBuilder q(String term) {
+        super.q(term);
+        return this;
+    }
+
+    public GHCommitSearchBuilder author(String v) {
+        return q("author:"+v);
+    }
+
+    public GHCommitSearchBuilder committer(String v) {
+        return q("committer:"+v);
+    }
+
+    public GHCommitSearchBuilder authorName(String v) {
+        return q("author-name:"+v);
+    }
+
+    public GHCommitSearchBuilder committerName(String v) {
+        return q("committer-name:"+v);
+    }
+
+    public GHCommitSearchBuilder authorEmail(String v) {
+        return q("author-email:"+v);
+    }
+
+    public GHCommitSearchBuilder committerEmail(String v) {
+        return q("committer-email:"+v);
+    }
+
+    public GHCommitSearchBuilder authorDate(String v) {
+        return q("author-date:"+v);
+    }
+
+    public GHCommitSearchBuilder committerDate(String v) {
+        return q("committer-date:"+v);
+    }
+
+    public GHCommitSearchBuilder merge(boolean merge) {
+        return q("merge:"+Boolean.valueOf(merge).toString().toLowerCase());
+    }
+
+    public GHCommitSearchBuilder hash(String v) {
+        return q("hash:"+v);
+    }
+
+    public GHCommitSearchBuilder parent(String v) {
+        return q("parent:"+v);
+    }
+
+    public GHCommitSearchBuilder tree(String v) {
+        return q("tree:"+v);
+    }
+
+    public GHCommitSearchBuilder is(String v) {
+        return q("is:"+v);
+    }
+
+    public GHCommitSearchBuilder user(String v) {
+        return q("user:"+v);
+    }
+
+    public GHCommitSearchBuilder org(String v) {
+        return q("org:"+v);
+    }
+
+    public GHCommitSearchBuilder repo(String v) {
+        return q("repo:"+v);
+    }
+
+    public GHCommitSearchBuilder order(GHDirection v) {
+        req.with("order",v);
+        return this;
+    }
+
+    public GHCommitSearchBuilder sort(Sort sort) {
+        req.with("sort",sort);
+        return this;
+    }
+
+    public enum Sort { AUTHOR_DATE, COMMITTER_DATE }
+
+    private static class CommitSearchResult extends SearchResult<GHCommit> {
+        private GHCommit[] items;
+
+        @Override
+        /*package*/ GHCommit[] getItems(GitHub root) {
+            for (GHCommit commit : items) {
+                String repoName = getRepoName(commit.url);
+                try {
+                    GHRepository repo = root.getRepository(repoName);
+                    commit.wrapUp(repo);
+                } catch (IOException ioe) {}
+            }
+            return items;
+        }
+    }
+    
+    /**
+     * @param commitUrl a commit URL
+     * @return the repo name ("username/reponame")
+     */
+    private static String getRepoName(String commitUrl) {
+        if (StringUtils.isBlank(commitUrl)) {
+            return null;
+        }
+        int indexOfUsername = (GitHub.GITHUB_URL + "/repos/").length();
+        String[] tokens = commitUrl.substring(indexOfUsername).split("/", 3);
+        return tokens[0] + '/' + tokens[1];
+    }
+
+    @Override
+    protected String getApiUrl() {
+        return "/search/commits";
+    }
+}

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

@@ -0,0 +1,11 @@
+package org.kohsuke.github;
+
+/**
+ * Represents the state of commit
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHCommitStatus
+ */
+public enum GHCommitState {
+    PENDING, SUCCESS, ERROR, FAILURE
+}

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

@@ -0,0 +1,63 @@
+package org.kohsuke.github;
+
+import java.net.URL;
+
+/**
+ * Represents a status of a commit.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHRepository#getLastCommitStatus(String)
+ * @see GHCommit#getLastStatus()
+ * @see GHRepository#createCommitStatus(String, GHCommitState, String, String)
+ */
+public class GHCommitStatus extends GHObject {
+    String state;
+    String target_url,description;
+    String context;
+    GHUser creator;
+
+    private GitHub root;
+
+    /*package*/ GHCommitStatus wrapUp(GitHub root) {
+        if (creator!=null)  creator.wrapUp(root);
+        this.root = root;
+        return this;
+    }
+
+    public GHCommitState getState() {
+        for (GHCommitState s : GHCommitState.values()) {
+            if (s.name().equalsIgnoreCase(state))
+                return s;
+        }
+        throw new IllegalStateException("Unexpected state: "+state);
+    }
+
+    /**
+     * The URL that this status is linked to.
+     *
+     * This is the URL specified when creating a commit status.
+     */
+    public String getTargetUrl() {
+        return target_url;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public GHUser getCreator() {
+        return creator;
+    }
+
+    public String getContext() {
+        return context;
+    }
+
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+}

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

@@ -0,0 +1,167 @@
+package org.kohsuke.github;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.net.URL;
+
+/**
+ * The model user for comparing 2 commits in the GitHub API.
+ *
+ * @author Michael Clarke
+ */
+public class GHCompare {
+
+    private String url, html_url, permalink_url, diff_url, patch_url;
+    public Status status;
+    private int ahead_by, behind_by, total_commits;
+    private Commit base_commit, merge_base_commit;
+    private Commit[] commits;
+    private GHCommit.File[] files;
+
+    private GHRepository owner;
+
+    public URL getUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    public URL getHtmlUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
+    public URL getPermalinkUrl() {
+        return GitHub.parseURL(permalink_url);
+    }
+
+    public URL getDiffUrl() {
+        return GitHub.parseURL(diff_url);
+    }
+
+    public URL getPatchUrl() {
+        return GitHub.parseURL(patch_url);
+    }
+
+    public Status getStatus() {
+        return status;
+    }
+
+    public int getAheadBy() {
+        return ahead_by;
+    }
+
+    public int getBehindBy() {
+        return behind_by;
+    }
+
+    public int getTotalCommits() {
+        return total_commits;
+    }
+
+    public Commit getBaseCommit() {
+        return base_commit;
+    }
+
+    public Commit getMergeBaseCommit() {
+        return merge_base_commit;
+    }
+
+    /**
+     * Gets an array of commits.
+     * @return A copy of the array being stored in the class.
+     */
+    public Commit[] getCommits() {
+        Commit[] newValue = new Commit[commits.length];
+        System.arraycopy(commits, 0, newValue, 0, commits.length);
+        return newValue;
+    }
+    
+    /**
+     * Gets an array of commits.
+     * @return A copy of the array being stored in the class.
+     */
+    public GHCommit.File[] getFiles() {
+        GHCommit.File[] newValue = new GHCommit.File[files.length];
+        System.arraycopy(files, 0, newValue, 0, files.length);
+        return newValue;
+    }
+
+    public GHCompare wrap(GHRepository owner) {
+        this.owner = owner;
+        for (Commit commit : commits) {
+            commit.wrapUp(owner);
+        }
+        merge_base_commit.wrapUp(owner);
+        base_commit.wrapUp(owner);
+        return this;
+    }
+
+    /**
+     * Compare commits had a child commit element with additional details we want to capture.
+     * This extenstion of GHCommit provides that.
+     */
+    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD"}, 
+            justification = "JSON API")
+    public static class Commit extends GHCommit {
+
+        private InnerCommit commit;
+
+        public InnerCommit getCommit() {
+            return commit;
+        }
+    }
+
+
+    public static class InnerCommit {
+        private String url, sha, message;
+        private User author, committer;
+        private Tree tree;
+
+        public String getUrl() {
+            return url;
+        }
+
+        public String getSha() {
+            return sha;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        @WithBridgeMethods(value=User.class,castRequired=true)
+        public GitUser getAuthor() {
+            return author;
+        }
+
+        @WithBridgeMethods(value=User.class,castRequired=true)
+        public GitUser getCommitter() {
+            return committer;
+        }
+
+        public Tree getTree() {
+            return tree;
+        }
+    }
+
+    public static class Tree {
+        private String url, sha;
+
+        public String getUrl() {
+            return url;
+        }
+
+        public String getSha() {
+            return sha;
+        }
+    }
+
+    /**
+     * @deprecated use {@link GitUser} instead.
+     */
+    public static class User extends GitUser {
+    }
+
+    public static enum Status {
+        behind, ahead, identical, diverged
+    }
+}

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

@@ -0,0 +1,248 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.bind.DatatypeConverter;
+
+/**
+ * A Content of a repository.
+ *
+ * @author Alexandre COLLIGNON
+ * @see GHRepository#getFileContent(String)
+ */
+@SuppressWarnings({"UnusedDeclaration"})
+public class GHContent {
+    /*
+        In normal use of this class, repository field is set via wrap(),
+        but in the code search API, there's a nested 'repository' field that gets populated from JSON.
+     */
+    private GHRepository repository;
+
+    private GitHub root;
+
+    private String type;
+    private String encoding;
+    private long size;
+    private String sha;
+    private String name;
+    private String path;
+    private String content;
+    private String url; // this is the API url
+    private String git_url;    // this is the Blob url
+    private String html_url;    // this is the UI
+    private String download_url;
+
+    public GHRepository getOwner() {
+        return repository;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public String getSha() {
+        return sha;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Retrieve the decoded content that is stored at this location.
+     *
+     * <p>
+     * Due to the nature of GitHub's API, you're not guaranteed that
+     * the content will already be populated, so this may trigger
+     * network activity, and can throw an IOException.
+     *
+     * @deprecated
+     *      Use {@link #read()}
+     */
+    @SuppressFBWarnings("DM_DEFAULT_ENCODING")
+    public String getContent() throws IOException {
+        return new String(Base64.decodeBase64(getEncodedContent()));
+    }
+
+    /**
+     * Retrieve the base64-encoded content that is stored at this location.
+     *
+     * <p>
+     * Due to the nature of GitHub's API, you're not guaranteed that
+     * the content will already be populated, so this may trigger
+     * network activity, and can throw an IOException.
+     *
+     * @deprecated
+     *      Use {@link #read()}
+     */
+    public String getEncodedContent() throws IOException {
+        if (content!=null)
+            return content;
+        else
+            return Base64.encodeBase64String(IOUtils.toByteArray(read()));
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getGitUrl() {
+        return git_url;
+    }
+
+    public String getHtmlUrl() {
+        return html_url;
+    }
+
+    /**
+     * Retrieves the actual content stored here.
+     */
+    public InputStream read() throws IOException {
+        // if the download link is encoded with a token on the query string, the default behavior of POST will fail
+        return new Requester(root).method("GET").asStream(getDownloadUrl());
+    }
+
+    /**
+     * URL to retrieve the raw content of the file. Null if this is a directory.
+     */
+    public String getDownloadUrl() throws IOException {
+        populate();
+        return download_url;
+    }
+
+    public boolean isFile() {
+        return "file".equals(type);
+    }
+
+    public boolean isDirectory() {
+        return "dir".equals(type);
+    }
+
+    /**
+     * Fully populate the data by retrieving missing data.
+     *
+     * Depending on the original API call where this object is created, it may not contain everything.
+     */
+    protected synchronized void populate() throws IOException {
+        if (download_url!=null)    return; // already populated
+        root.retrieve().to(url, this);
+    }
+
+    /**
+     * List immediate children of this directory.
+     */
+    public PagedIterable<GHContent> listDirectoryContent() throws IOException {
+        if (!isDirectory())
+            throw new IllegalStateException(path+" is not a directory");
+
+        return new PagedIterable<GHContent>() {
+            public PagedIterator<GHContent> _iterator(int pageSize) {
+                return new PagedIterator<GHContent>(root.retrieve().asIterator(url, GHContent[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHContent[] page) {
+                        GHContent.wrap(page, repository);
+                    }
+                };
+            }
+        };
+    }
+
+    @SuppressFBWarnings("DM_DEFAULT_ENCODING")
+    public GHContentUpdateResponse update(String newContent, String commitMessage) throws IOException {
+        return update(newContent.getBytes(), commitMessage, null);
+    }
+
+    @SuppressFBWarnings("DM_DEFAULT_ENCODING")
+    public GHContentUpdateResponse update(String newContent, String commitMessage, String branch) throws IOException {
+        return update(newContent.getBytes(), commitMessage, branch);
+    }
+
+    public GHContentUpdateResponse update(byte[] newContentBytes, String commitMessage) throws IOException {
+        return update(newContentBytes, commitMessage, null);
+    }
+
+    public GHContentUpdateResponse update(byte[] newContentBytes, String commitMessage, String branch) throws IOException {
+        String encodedContent = Base64.encodeBase64String(newContentBytes);
+
+        Requester requester = new Requester(root)
+            .with("path", path)
+            .with("message", commitMessage)
+            .with("sha", sha)
+            .with("content", encodedContent)
+            .method("PUT");
+
+        if (branch != null) {
+            requester.with("branch", branch);
+        }
+
+        GHContentUpdateResponse response = requester.to(getApiRoute(), GHContentUpdateResponse.class);
+
+        response.getContent().wrap(repository);
+        response.getCommit().wrapUp(repository);
+
+        this.content = encodedContent;
+        return response;
+    }
+
+    public GHContentUpdateResponse delete(String message) throws IOException {
+        return delete(message, null);
+    }
+
+    public GHContentUpdateResponse delete(String commitMessage, String branch) throws IOException {
+        Requester requester = new Requester(root)
+            .with("path", path)
+            .with("message", commitMessage)
+            .with("sha", sha)
+            .method("DELETE");
+
+        if (branch != null) {
+            requester.with("branch", branch);
+        }
+
+        GHContentUpdateResponse response = requester.to(getApiRoute(), GHContentUpdateResponse.class);
+
+        response.getCommit().wrapUp(repository);
+        return response;
+    }
+
+    private String getApiRoute() {
+        return "/repos/" + repository.getOwnerName() + "/" + repository.getName() + "/contents/" + path;
+    }
+
+    GHContent wrap(GHRepository owner) {
+        this.repository = owner;
+        this.root = owner.root;
+        return this;
+    }
+    GHContent wrap(GitHub root) {
+        this.root = root;
+        if (repository!=null)
+            repository.wrap(root);
+        return this;
+    }
+
+
+    public static GHContent[] wrap(GHContent[] contents, GHRepository repository) {
+        for (GHContent unwrappedContent : contents) {
+            unwrappedContent.wrap(repository);
+        }
+        return contents;
+    }
+}

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

@@ -0,0 +1,74 @@
+package org.kohsuke.github;
+
+/**
+ * Search code for {@link GHContent}.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GitHub#searchContent()
+ */
+public class GHContentSearchBuilder extends GHSearchBuilder<GHContent> {
+    /*package*/ GHContentSearchBuilder(GitHub root) {
+        super(root,ContentSearchResult.class);
+    }
+
+    /**
+     * Search terms.
+     */
+    public GHContentSearchBuilder q(String term) {
+        super.q(term);
+        return this;
+    }
+
+    public GHContentSearchBuilder in(String v) {
+        return q("in:"+v);
+    }
+
+    public GHContentSearchBuilder language(String v) {
+        return q("language:"+v);
+    }
+
+    public GHContentSearchBuilder fork(String v) {
+        return q("fork:"+v);
+    }
+
+    public GHContentSearchBuilder size(String v) {
+        return q("size:"+v);
+    }
+
+    public GHContentSearchBuilder path(String v) {
+        return q("path:"+v);
+    }
+
+    public GHContentSearchBuilder filename(String v) {
+        return q("filename:"+v);
+    }
+
+    public GHContentSearchBuilder extension(String v) {
+        return q("extension:"+v);
+    }
+
+    public GHContentSearchBuilder user(String v) {
+        return q("user:"+v);
+    }
+
+
+    public GHContentSearchBuilder repo(String v) {
+        return q("repo:"+v);
+    }
+
+    private static class ContentSearchResult extends SearchResult<GHContent> {
+        private GHContent[] items;
+
+        @Override
+        /*package*/ GHContent[] getItems(GitHub root) {
+            for (GHContent item : items)
+                item.wrap(root);
+            return items;
+        }
+    }
+
+    @Override
+    protected String getApiUrl() {
+        return "/search/code";
+    }
+}

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

@@ -0,0 +1,18 @@
+package org.kohsuke.github;
+
+/**
+ * The response that is returned when updating
+ * repository content.
+**/
+public class GHContentUpdateResponse {
+    private GHContent content;
+    private GHCommit commit;
+
+    public GHContent getContent() {
+        return content;
+    }
+
+    public GHCommit getCommit() {
+        return commit;
+    }
+}

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

@@ -0,0 +1,21 @@
+package org.kohsuke.github;
+
+/**
+ * {@link GHContent} with license information.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see <a href="https://developer.github.com/v3/licenses/#get-a-repositorys-license">documentation</a>
+ * @see GHRepository#getLicense()
+ */
+@Preview @Deprecated
+class GHContentWithLicense extends GHContent {
+    GHLicense license;
+
+    @Override
+    GHContentWithLicense wrap(GHRepository owner) {
+        super.wrap(owner);
+        if (license!=null)
+            license.wrap(owner.root);
+        return this;
+    }
+}

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

@@ -0,0 +1,114 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Creates a repository
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class GHCreateRepositoryBuilder {
+    private final GitHub root;
+    protected final Requester builder;
+    private final String apiUrlTail;
+
+    /*package*/ GHCreateRepositoryBuilder(GitHub root, String apiUrlTail, String name) {
+        this.root = root;
+        this.apiUrlTail = apiUrlTail;
+        this.builder = new Requester(root);
+        this.builder.with("name",name);
+    }
+
+    public GHCreateRepositoryBuilder description(String description) {
+      this.builder.with("description",description);
+      return this;
+    }
+
+    public GHCreateRepositoryBuilder homepage(URL homepage) {
+        return homepage(homepage.toExternalForm());
+    }
+
+    public GHCreateRepositoryBuilder homepage(String homepage) {
+        this.builder.with("homepage",homepage);
+        return this;
+    }
+
+    /**
+     * Creates a private repository
+     */
+    public GHCreateRepositoryBuilder private_(boolean b) {
+        this.builder.with("private",b);
+        return this;
+    }
+
+    /**
+     * Enables issue tracker
+     */
+    public GHCreateRepositoryBuilder issues(boolean b) {
+        this.builder.with("has_issues",b);
+        return this;
+    }
+
+    /**
+     * Enables wiki
+     */
+    public GHCreateRepositoryBuilder wiki(boolean b) {
+        this.builder.with("has_wiki",b);
+        return this;
+    }
+
+    /**
+     * Enables downloads
+     */
+    public GHCreateRepositoryBuilder downloads(boolean b) {
+        this.builder.with("has_downloads",b);
+        return this;
+    }
+
+    /**
+     * If true, create an initial commit with empty README.
+     */
+    public GHCreateRepositoryBuilder autoInit(boolean b) {
+        this.builder.with("auto_init",b);
+        return this;
+    }
+
+    /**
+     * Creates a default .gitignore
+     *
+     * See https://developer.github.com/v3/repos/#create
+     */
+    public GHCreateRepositoryBuilder gitignoreTemplate(String language) {
+        this.builder.with("gitignore_template",language);
+        return this;
+    }
+
+    /**
+     * Desired license template to apply
+     *
+     * See https://developer.github.com/v3/repos/#create
+     */
+    public GHCreateRepositoryBuilder licenseTemplate(String license) {
+        this.builder.with("license_template",license);
+        return this;
+    }
+
+    /**
+     * The team that gets granted access to this repository. Only valid for creating a repository in
+     * an organization.
+     */
+    public GHCreateRepositoryBuilder team(GHTeam team) {
+        if (team!=null)
+            this.builder.with("team_id",team.getId());
+        return this;
+    }
+
+    /**
+     * Creates a repository with all the parameters.
+     */
+    public GHRepository create() throws IOException {
+        return builder.method("POST").to(apiUrlTail, GHRepository.class).wrap(root);
+    }
+
+}

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

@@ -0,0 +1,46 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+public class GHDeployKey {
+
+    protected String url, key, title;
+    protected boolean verified;
+    protected int id;
+    private GHRepository owner;
+
+    public int getId() {
+        return id;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public boolean isVerified() {
+        return verified;
+    }
+
+    public GHDeployKey wrap(GHRepository repo) {
+        this.owner = repo;
+        return this;
+    }
+
+    public String toString() {
+        return new ToStringBuilder(this).append("title",title).append("id",id).append("key",key).toString();
+    }
+    
+    public void delete() throws IOException {
+        new Requester(owner.root).method("DELETE").to(String.format("/repos/%s/%s/keys/%d", owner.getOwnerName(), owner.getName(), id));
+    }
+}

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

@@ -0,0 +1,61 @@
+package org.kohsuke.github;
+
+
+import java.net.URL;
+
+public class GHDeployment extends GHObject {
+    private GHRepository owner;
+    private GitHub root;
+    protected String sha;
+    protected String ref;
+    protected String task;
+    protected Object payload;
+    protected String environment;
+    protected String description;
+    protected String statuses_url;
+    protected String repository_url;
+    protected GHUser creator;
+
+
+    GHDeployment wrap(GHRepository owner) {
+        this.owner = owner;
+        this.root = owner.root;
+        if(creator != null) creator.wrapUp(root);
+        return this;
+    }
+
+    public URL getStatusesUrl() {
+        return GitHub.parseURL(statuses_url);
+    }
+
+    public URL getRepositoryUrl() {
+        return GitHub.parseURL(repository_url);
+    }
+
+    public String getTask() {
+        return task;
+    }
+    public String getPayload() {
+        return (String) payload;
+    }
+    public String getEnvironment() {
+        return environment;
+    }
+    public GHUser getCreator() {
+        return creator;
+    }
+    public String getRef() {
+        return ref;
+    }
+    public String getSha(){
+        return sha;
+    }
+
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+}

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

@@ -0,0 +1,55 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.List;
+
+//Based on https://developer.github.com/v3/repos/deployments/#create-a-deployment
+public class GHDeploymentBuilder {
+    private final GHRepository repo;
+    private final Requester builder;
+
+    public GHDeploymentBuilder(GHRepository repo) {
+        this.repo = repo;
+        this.builder = new Requester(repo.root);
+    }
+
+    public GHDeploymentBuilder(GHRepository repo, String ref) {
+        this(repo);
+        ref(ref);
+    }
+
+    public GHDeploymentBuilder ref(String branch) {
+        builder.with("ref",branch);
+        return this;
+    }
+    public GHDeploymentBuilder task(String task) {
+        builder.with("task",task);
+        return this;
+    }
+    public GHDeploymentBuilder autoMerge(boolean autoMerge) {
+        builder.with("auto_merge",autoMerge);
+        return this;
+    }
+
+    public GHDeploymentBuilder requiredContexts(List<String> requiredContexts) {
+        builder.with("required_contexts",requiredContexts);
+        return this;
+    }
+    public GHDeploymentBuilder payload(String payload) {
+        builder.with("payload",payload);
+        return this;
+    }
+
+    public GHDeploymentBuilder environment(String environment) {
+        builder.with("environment",environment);
+        return this;
+    }
+    public GHDeploymentBuilder description(String description) {
+        builder.with("description",description);
+        return this;
+    }
+
+    public GHDeployment create() throws IOException {
+        return builder.to(repo.getApiTailUrl("deployments"),GHDeployment.class).wrap(repo);
+    }
+}

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

@@ -0,0 +1,8 @@
+package org.kohsuke.github;
+
+/**
+ * Represents the state of deployment
+ */
+public enum GHDeploymentState {
+    PENDING, SUCCESS, ERROR, FAILURE
+}

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

@@ -0,0 +1,44 @@
+package org.kohsuke.github;
+
+import java.net.URL;
+import java.util.Locale;
+
+public class GHDeploymentStatus extends GHObject {
+    private GHRepository owner;
+    private GitHub root;
+    protected GHUser creator;
+    protected String state;
+    protected String description;
+    protected String target_url;
+    protected String deployment_url;
+    protected String repository_url;
+    public GHDeploymentStatus wrap(GHRepository owner) {
+        this.owner = owner;
+        this.root = owner.root;
+        if(creator != null) creator.wrapUp(root);
+        return this;
+    }
+    public URL getTargetUrl() {
+        return GitHub.parseURL(target_url);
+    }
+
+    public URL getDeploymentUrl() {
+        return GitHub.parseURL(deployment_url);
+    }
+
+    public URL getRepositoryUrl() {
+        return GitHub.parseURL(repository_url);
+    }
+    
+    public GHDeploymentState getState() {
+        return GHDeploymentState.valueOf(state.toUpperCase(Locale.ENGLISH));
+    }
+
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+}

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

@@ -0,0 +1,31 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.Locale;
+
+public class GHDeploymentStatusBuilder {
+    private final Requester builder;
+    private GHRepository repo;
+    private int deploymentId;
+
+    public GHDeploymentStatusBuilder(GHRepository repo, int deploymentId, GHDeploymentState state) {
+        this.repo = repo;
+        this.deploymentId = deploymentId;
+        this.builder = new Requester(repo.root);
+        this.builder.with("state",state);
+    }
+
+    public GHDeploymentStatusBuilder description(String description) {
+      this.builder.with("description",description);
+      return this;
+    }
+
+    public GHDeploymentStatusBuilder targetUrl(String targetUrl) {
+        this.builder.with("target_url",targetUrl);
+        return this;
+    }
+
+    public GHDeploymentStatus create() throws IOException {
+        return builder.to(repo.getApiTailUrl("deployments")+"/"+deploymentId+"/statuses",GHDeploymentStatus.class).wrap(repo);
+    }
+}

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

@@ -1,8 +1,10 @@
 package org.kohsuke.github;
 
 /**
+ * Sort direction
+ *
  * @author Kohsuke Kawaguchi
  */
-class JsonOrganization {
+public enum GHDirection {
-    public GHOrganization organization;
+    ASC, DESC
 }

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

@@ -23,22 +23,51 @@
  */
 package org.kohsuke.github;
 
-import java.util.List;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Map;
+
-import java.util.TreeMap;
 
 /**
- * @author Kohsuke Kawaguchi
+ * Represents an email of GitHub.
+ *
+ * @author Kelly Campbell
  */
-class JsonRepositories {
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
-    public List<GHRepository> repositories;
+    "NP_UNWRITTEN_FIELD", "NP_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD"}, justification = "JSON API")
+public class GHEmail {
 
-    public Map<String,GHRepository> wrap(GitHub root) {
+    protected String email;
-        Map<String,GHRepository> map = new TreeMap<String, GHRepository>();
+    protected boolean primary;
-        for (GHRepository r : repositories) {
+    protected boolean verified;
-            r.root = root;
+
-            map.put(r.getName(),r);
+    public String getEmail() {
+        return email;
+    }
+
+    public boolean isPrimary() {
+        return primary;
+    }
+
+    public boolean isVerified() {
+        return verified;
+    }
+
+
+    @Override
+    public String toString() {
+        return "Email:"+email;
+    }
+
+    @Override
+    public int hashCode() {
+        return email.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof GHEmail) {
+            GHEmail that = (GHEmail) obj;
+            return this.email.equals(that.email);
         }
-        return map;
+        return false;
     }
 }

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

@@ -1,28 +1,64 @@
 package org.kohsuke.github;
 
+import java.util.Locale;
+
 /**
  * Hook event type.
  *
- * See http://developer.github.com/v3/events/types/
- *
  * @author Kohsuke Kawaguchi
+ * @see GHEventInfo
+ * @see <a href="https://developer.github.com/v3/activity/events/types/">Event type reference</a>
  */
 public enum GHEvent {
     COMMIT_COMMENT,
     CREATE,
     DELETE,
+    DEPLOYMENT,
+    DEPLOYMENT_STATUS,
     DOWNLOAD,
     FOLLOW,
     FORK,
     FORK_APPLY,
     GIST,
     GOLLUM,
+    INSTALLATION,
+    INSTALLATION_REPOSITORIES,
     ISSUE_COMMENT,
     ISSUES,
+    LABEL,
+    MARKETPLACE_PURCHASE,
     MEMBER,
+    MEMBERSHIP,
+    MILESTONE,
+    ORGANIZATION,
+    ORG_BLOCK,
+    PAGE_BUILD,
+    PROJECT_CARD,
+    PROJECT_COLUMN,
+    PROJECT,
     PUBLIC,
     PULL_REQUEST,
+    PULL_REQUEST_REVIEW,
+    PULL_REQUEST_REVIEW_COMMENT,
     PUSH,
+    RELEASE,
+    REPOSITORY, // only valid for org hooks
+    STATUS,
+    TEAM,
     TEAM_ADD,
-    WATCH
+    WATCH,
+    PING,
+    /**
+     * Special event type that means "every possible event"
+     */
+    ALL;
+
+
+    /**
+     * Returns GitHub's internal representation of this event.
+     */
+    String symbol() {
+        if (this==ALL)  return "*";
+        return name().toLowerCase(Locale.ENGLISH);
+    }
 }

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

@@ -1,21 +1,24 @@
 package org.kohsuke.github;
 
-import org.codehaus.jackson.node.ObjectNode;
-
 import java.io.IOException;
 import java.util.Date;
 
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Represents an event.
  *
  * @author Kohsuke Kawaguchi
  */
+@SuppressFBWarnings(value = "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", justification = "JSON API")
 public class GHEventInfo {
     private GitHub root;
 
     // we don't want to expose Jackson dependency to the user. This needs databinding
     private ObjectNode payload;
 
+    private long id;
     private String created_at;
     private String type;
 
@@ -27,8 +30,12 @@ public class GHEventInfo {
     /**
      * Inside the event JSON model, GitHub uses a slightly different format.
      */
+    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD",
+        "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" }, justification = "JSON API")
     public static class GHEventRepository {
+        @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
         private int id;
+        @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
         private String url;     // repository API URL
         private String name;    // owner/repo
     }
@@ -48,6 +55,10 @@ public class GHEventInfo {
         return this;
     }
 
+    public long getId() {
+        return id;
+    }
+
     public Date getCreatedAt() {
         return GitHub.parseDate(created_at);
     }
@@ -55,14 +66,27 @@ public class GHEventInfo {
     /**
      * Repository where the change was made.
      */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" }, 
+            justification = "The field comes from JSON deserialization")
     public GHRepository getRepository() throws IOException {
         return root.getRepository(repo.name);
     }
     
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" }, 
+            justification = "The field comes from JSON deserialization")
     public GHUser getActor() throws IOException {
         return root.getUser(actor.getLogin());
     }
 
+    /**
+     * Quick way to just get the actor of the login.
+     */
+    public String getActorLogin() throws IOException {
+        return actor.getLogin();
+    }
+
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" }, 
+            justification = "The field comes from JSON deserialization")
     public GHOrganization getOrganization() throws IOException {
         return (org==null || org.getLogin()==null) ? null : root.getOrganization(org.getLogin());
     }

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

@@ -1,6 +1,10 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonSetter;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Reader;
+import java.util.List;
 
 /**
  * Base type for types used in databinding of the event payload.
@@ -8,20 +12,46 @@ import java.io.Reader;
  * @see GitHub#parseEventPayload(Reader, Class)
  * @see GHEventInfo#getPayload(Class)
  */
+@SuppressWarnings("UnusedDeclaration")
 public abstract class GHEventPayload {
     protected GitHub root;
 
+    private GHUser sender;
+
     /*package*/ GHEventPayload() {
     }
 
-    /*package*/ void wrapUp(GitHub root) {
+    /**
-        this.root = root;
+     * Gets the sender or {@code null} if accessed via the events API.
+     * @return the sender or {@code null} if accessed via the events API.
+     */
+    public GHUser getSender() {
+        return sender;
     }
 
+    public void setSender(GHUser sender) {
+        this.sender = sender;
+    }
+
+    /*package*/ void wrapUp(GitHub root) {
+        this.root = root;
+        if (sender != null) {
+            sender.wrapUp(root);
+        }
+    }
+
+    /**
+     * A pull request status has changed.
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#pullrequestevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
     public static class PullRequest extends GHEventPayload {
         private String action;
         private int number;
-        GHPullRequest pull_request;
+        private GHPullRequest pull_request;
+        private GHRepository repository;
 
         public String getAction() {
             return action;
@@ -36,11 +66,606 @@ public abstract class GHEventPayload {
             return pull_request;
         }
 
+        public GHRepository getRepository() {
+            return repository;
+        }
+
         @Override
         void wrapUp(GitHub root) {
             super.wrapUp(root);
-            pull_request.wrapUp(root);
+            if (pull_request==null)
+                throw new IllegalStateException("Expected pull_request payload, but got something else. Maybe we've got another type of event?");
+            if (repository!=null) {
+                repository.wrap(root);
+                pull_request.wrap(repository);
+            } else {
+                pull_request.wrapUp(root);
+            }
         }
     }
 
+    /**
+     * A comment was added to an issue
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#issuecommentevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD" }, 
+            justification = "Constructed by JSON deserialization")
+    public static class IssueComment extends GHEventPayload {
+        private String action;
+        private GHIssueComment comment;
+        private GHIssue issue;
+        private GHRepository repository;
+
+        @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Comes from JSON deserialization")
+        public String getAction() {
+            return action;
+        }
+
+        public GHIssueComment getComment() {
+            return comment;
+        }
+
+        public void setComment(GHIssueComment comment) {
+            this.comment = comment;
+        }
+
+        public GHIssue getIssue() {
+            return issue;
+        }
+
+        public void setIssue(GHIssue issue) {
+            this.issue = issue;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository != null) {
+                repository.wrap(root);
+                issue.wrap(repository);
+            } else {
+                issue.wrap(root);
+            }
+            comment.wrapUp(issue);
+        }
+    }
+
+    /**
+     * A comment was added to a commit
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#commitcommentevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD" },
+            justification = "Constructed by JSON deserialization")
+    public static class CommitComment extends GHEventPayload {
+        private String action;
+        private GHCommitComment comment;
+        private GHRepository repository;
+
+        @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Comes from JSON deserialization")
+        public String getAction() {
+            return action;
+        }
+
+        public GHCommitComment getComment() {
+            return comment;
+        }
+
+        public void setComment(GHCommitComment comment) {
+            this.comment = comment;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository != null) {
+                repository.wrap(root);
+                comment.wrap(repository);
+            }
+        }
+    }
+
+    /**
+     * A repository, branch, or tag was created
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#createevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD" },
+            justification = "Constructed by JSON deserialization")
+    public static class Create extends GHEventPayload {
+        private String ref;
+        @JsonProperty("ref_type")
+        private String refType;
+        @JsonProperty("master_branch")
+        private String masterBranch;
+        private String description;
+        private GHRepository repository;
+
+        @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Comes from JSON deserialization")
+        public String getRef() {
+            return ref;
+        }
+
+        @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Comes from JSON deserialization")
+        public String getRefType() {
+            return refType;
+        }
+
+        @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Comes from JSON deserialization")
+        public String getMasterBranch() {
+            return masterBranch;
+        }
+
+        @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Comes from JSON deserialization")
+        public String getDescription() {
+            return description;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository != null) {
+                repository.wrap(root);
+            }
+        }
+    }
+
+    /**
+     * A branch, or tag was deleted
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#deleteevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD" },
+            justification = "Constructed by JSON deserialization")
+    public static class Delete extends GHEventPayload {
+        private String ref;
+        @JsonProperty("ref_type")
+        private String refType;
+        private GHRepository repository;
+
+        @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Comes from JSON deserialization")
+        public String getRef() {
+            return ref;
+        }
+
+        @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Comes from JSON deserialization")
+        public String getRefType() {
+            return refType;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository != null) {
+                repository.wrap(root);
+            }
+        }
+    }
+
+    /**
+     * A deployment
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#deploymentevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD" },
+            justification = "Constructed by JSON deserialization")
+    public static class Deployment extends GHEventPayload {
+        private GHDeployment deployment;
+        private GHRepository repository;
+
+        public GHDeployment getDeployment() {
+            return deployment;
+        }
+
+        public void setDeployment(GHDeployment deployment) {
+            this.deployment = deployment;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository != null) {
+                repository.wrap(root);
+                deployment.wrap(repository);
+            }
+        }
+    }
+
+    /**
+     * A deployment
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#deploymentstatusevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD" },
+            justification = "Constructed by JSON deserialization")
+    public static class DeploymentStatus extends GHEventPayload {
+        @JsonProperty("deployment_status")
+        private GHDeploymentStatus deploymentStatus;
+        private GHDeployment deployment;
+        private GHRepository repository;
+
+        public GHDeploymentStatus getDeploymentStatus() {
+            return deploymentStatus;
+        }
+
+        public void setDeploymentStatus(GHDeploymentStatus deploymentStatus) {
+            this.deploymentStatus = deploymentStatus;
+        }
+
+        public GHDeployment getDeployment() {
+            return deployment;
+        }
+
+        public void setDeployment(GHDeployment deployment) {
+            this.deployment = deployment;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository != null) {
+                repository.wrap(root);
+                deployment.wrap(repository);
+                deploymentStatus.wrap(repository);
+            }
+        }
+    }
+
+    /**
+     * A user forked a repository
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#forkevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD" },
+            justification = "Constructed by JSON deserialization")
+    public static class Fork extends GHEventPayload {
+        private GHRepository forkee;
+        private GHRepository repository;
+
+
+        public GHRepository getForkee() {
+            return forkee;
+        }
+
+        public void setForkee(GHRepository forkee) {
+            this.forkee = forkee;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            forkee.wrap(root);
+            if (repository != null) {
+                repository.wrap(root);
+            }
+        }
+    }
+
+    /**
+     * A ping.
+     */
+    public static class Ping extends GHEventPayload {
+        private GHRepository repository;
+        private GHOrganization organization;
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public GHOrganization getOrganization() {
+            return organization;
+        }
+
+        public void setOrganization(GHOrganization organization) {
+            this.organization = organization;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository!=null)
+                repository.wrap(root);
+            if (organization != null) {
+                organization.wrapUp(root);
+            }
+        }
+
+    }
+
+    /**
+     * A repository was made public.
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#publicevent">authoritative source</a>
+     */
+    public static class Public extends GHEventPayload {
+        private GHRepository repository;
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository!=null)
+                repository.wrap(root);
+        }
+
+    }
+
+    /**
+     * A commit was pushed.
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#pushevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD", "UUF_UNUSED_FIELD"},
+                        justification = "Constructed by JSON deserialization")
+    public static class Push extends GHEventPayload {
+        private String head, before;
+        private boolean created, deleted, forced;
+        private String ref;
+        private int size;
+        private List<PushCommit> commits;
+        private GHRepository repository;
+        private Pusher pusher;
+
+        /**
+         * The SHA of the HEAD commit on the repository
+         */
+        public String getHead() {
+            return head;
+        }
+
+        /**
+         * This is undocumented, but it looks like this captures the commit that the ref was pointing to
+         * before the push.
+         */
+        public String getBefore() {
+            return before;
+        }
+
+        @JsonSetter // alias
+        private void setAfter(String after) {
+            head = after;
+        }
+
+        /**
+         * The full Git ref that was pushed. Example: “refs/heads/master”
+         */
+        public String getRef() {
+            return ref;
+        }
+
+        /**
+         * The number of commits in the push.
+         * Is this always the same as {@code getCommits().size()}?
+         */
+        public int getSize() {
+            return size;
+        }
+
+        public boolean isCreated() {
+            return created;
+        }
+
+        public boolean isDeleted() {
+            return deleted;
+        }
+
+        public boolean isForced() {
+            return forced;
+        }
+
+        /**
+         * The list of pushed commits.
+         */
+        public List<PushCommit> getCommits() {
+            return commits;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public Pusher getPusher() {
+            return pusher;
+        }
+
+        public void setPusher(Pusher pusher) {
+            this.pusher = pusher;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (repository!=null)
+                repository.wrap(root);
+        }
+
+        public static class Pusher {
+            private String name, email;
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+
+            public String getEmail() {
+                return email;
+            }
+
+            public void setEmail(String email) {
+                this.email = email;
+            }
+        }
+
+        /**
+         * Commit in a push
+         */
+        public static class PushCommit {
+            private GitUser author;
+            private GitUser committer;
+            private String url, sha, message;
+            private boolean distinct;
+            private List<String> added, removed, modified;
+
+            public GitUser getAuthor() {
+                return author;
+            }
+
+            public GitUser getCommitter() {
+                return committer;
+            }
+
+            /**
+             * Points to the commit API resource.
+             */
+            public String getUrl() {
+                return url;
+            }
+
+            public String getSha() {
+                return sha;
+            }
+
+            @JsonSetter
+            private void setId(String id) {
+                sha = id;
+            }
+
+            public String getMessage() {
+                return message;
+            }
+
+            /**
+             * Whether this commit is distinct from any that have been pushed before.
+             */
+            public boolean isDistinct() {
+                return distinct;
+            }
+
+            public List<String> getAdded() {
+                return added;
+            }
+
+            public List<String> getRemoved() {
+                return removed;
+            }
+
+            public List<String> getModified() {
+                return modified;
+            }
+        }
+    }
+
+    /**
+     * A repository was created, deleted, made public, or made private.
+     *
+     * @see <a href="http://developer.github.com/v3/activity/events/types/#repositoryevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", "NP_UNWRITTEN_FIELD", "UWF_UNWRITTEN_FIELD"},
+                        justification = "Constructed by JSON deserialization")
+    public static class Repository extends GHEventPayload {
+        private String action;
+        private GHRepository repository;
+        private GHOrganization organization;
+
+        public String getAction() {
+            return action;
+        }
+
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        public GHOrganization getOrganization() {
+            return organization;
+        }
+
+        public void setOrganization(GHOrganization organization) {
+            this.organization = organization;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            repository.wrap(root);
+            if (organization != null) {
+                organization.wrapUp(root);
+            }
+        }
+
+    }
 }

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

@@ -0,0 +1,179 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * Gist
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHUser#listGists()
+ * @see GitHub#getGist(String)
+ * @see GitHub#createGist()
+ * @see <a href="https://developer.github.com/v3/gists/">documentation</a>
+ */
+public class GHGist extends GHObject {
+    /*package almost final*/ GHUser owner;
+    /*package almost final*/ GitHub root;
+
+    private String forks_url, commits_url, id, git_pull_url, git_push_url, html_url;
+
+    @JsonProperty("public")
+    private boolean _public;
+
+    private String description;
+
+    private int comments;
+
+    private String comments_url;
+
+    private Map<String,GHGistFile> files = new HashMap<String, GHGistFile>();
+
+    /**
+     * User that owns this Gist.
+     */
+    public GHUser getOwner() {
+        return owner;
+    }
+
+    public String getForksUrl() {
+        return forks_url;
+    }
+
+    public String getCommitsUrl() {
+        return commits_url;
+    }
+
+    /**
+     * URL like https://gist.github.com/gists/12345.git
+     */
+    public String getGitPullUrl() {
+        return git_pull_url;
+    }
+
+    public String getGitPushUrl() {
+        return git_push_url;
+    }
+
+    public URL getHtmlUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
+    public boolean isPublic() {
+        return _public;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public int getCommentCount() {
+        return comments;
+    }
+
+    /**
+     * API URL of listing comments.
+     */
+    public String getCommentsUrl() {
+        return comments_url;
+    }
+
+    public GHGistFile getFile(String name) {
+        return files.get(name);
+    }
+
+    public Map<String,GHGistFile> getFiles() {
+        return Collections.unmodifiableMap(files);
+    }
+
+    /*package*/ GHGist wrapUp(GHUser owner) {
+        this.owner = owner;
+        this.root = owner.root;
+        wrapUp();
+        return this;
+    }
+
+    /**
+     * Used when caller obtains {@link GHGist} without knowing its owner.
+     * A partially constructed owner object is interned.
+     */
+    /*package*/ GHGist wrapUp(GitHub root) throws IOException {
+        this.owner = root.getUser(owner);
+        this.root = root;
+        wrapUp();
+        return this;
+    }
+
+    private void wrapUp() {
+        for (Entry<String, GHGistFile> e : files.entrySet()) {
+            e.getValue().fileName = e.getKey();
+        }
+    }
+    String getApiTailUrl(String tail) {
+        return "/gists/" + id + '/' + tail;
+    }
+
+    public void star() throws IOException {
+        new Requester(root).method("PUT").to(getApiTailUrl("star"));
+    }
+
+    public void unstar() throws IOException {
+        new Requester(root).method("DELETE").to(getApiTailUrl("star"));
+    }
+
+    public boolean isStarred() throws IOException {
+        return root.retrieve().asHttpStatusCode(getApiTailUrl("star"))/100==2;
+    }
+
+    /**
+     * Forks this gist into your own.
+     */
+    public GHGist fork() throws IOException {
+        return new Requester(root).to(getApiTailUrl("forks"),GHGist.class).wrapUp(root);
+    }
+
+    public PagedIterable<GHGist> listForks() {
+        return new PagedIterable<GHGist>() {
+            public PagedIterator<GHGist> _iterator(int pageSize) {
+                return new PagedIterator<GHGist>(root.retrieve().asIterator(getApiTailUrl("forks"), GHGist[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHGist[] page) {
+                        try {
+                            for (GHGist c : page)
+                                c.wrapUp(root);
+                        } catch (IOException e) {
+                            throw new Error(e);
+                        }
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Deletes this gist.
+     */
+    public void delete() throws IOException {
+        new Requester(root).method("DELETE").to("/gists/" + id);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        GHGist ghGist = (GHGist) o;
+        return id.equals(ghGist.id);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return id.hashCode();
+    }
+}

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

@@ -0,0 +1,48 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+
+/**
+ * Builder pattern for creating a new Gist.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GitHub#createGist()
+ */
+public class GHGistBuilder {
+    private final GitHub root;
+    private final Requester req;
+    private final LinkedHashMap<String,Object> files = new LinkedHashMap<String, Object>();
+
+    public GHGistBuilder(GitHub root) {
+        this.root = root;
+        req = new Requester(root);
+    }
+
+    public GHGistBuilder description(String desc) {
+        req.with("description",desc);
+        return this;
+    }
+
+    public GHGistBuilder public_(boolean v) {
+        req.with("public",v);
+        return this;
+    }
+
+    /**
+     * Adds a new file.
+     */
+    public GHGistBuilder file(String fileName, String content) {
+        files.put(fileName, Collections.singletonMap("content", content));
+        return this;
+    }
+
+    /**
+     * Creates a Gist based on the parameters specified thus far.
+     */
+    public GHGist create() throws IOException {
+        req._with("files",files);
+        return req.to("/gists",GHGist.class).wrapUp(root);
+    }
+}

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

@@ -0,0 +1,60 @@
+package org.kohsuke.github;
+
+/**
+ * A file inside {@link GHGist}
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHGist#getFile(String)
+ * @see GHGist#getFiles()
+ */
+public class GHGistFile {
+    /*package almost final*/ String fileName;
+
+    private int size;
+    private String raw_url, type, language, content;
+    private boolean truncated;
+
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    /**
+     * File size in bytes.
+     */
+    public int getSize() {
+        return size;
+    }
+
+    /**
+     * URL that serves this file as-is.
+     */
+    public String getRawUrl() {
+        return raw_url;
+    }
+
+    /**
+     * Content type of this Gist, such as "text/plain"
+     */
+    public String getType() {
+        return type;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    /**
+     * Content of this file.
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * (?) indicates if {@link #getContent()} contains a truncated content.
+     */
+    public boolean isTruncated() {
+        return truncated;
+    }
+}

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

@@ -1,6 +1,8 @@
 package org.kohsuke.github;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
@@ -10,22 +12,13 @@ import java.util.Map;
 /**
  * @author Kohsuke Kawaguchi
  */
-public final class GHHook {
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
-    /**
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
-     * Repository that the hook belongs to.
+public abstract class GHHook extends GHObject {
-     */
+    String name;
-    /*package*/ transient GHRepository repository;
-    
-    String created_at, updated_at, name;
     List<String> events;
     boolean active;
     Map<String,String> config;
-    int id;
-    
-    /*package*/ GHHook wrap(GHRepository owner) {
-        this.repository = owner;
-        return this;
-    }
 
     public String getName() {
         return name;
@@ -33,8 +26,10 @@ public final class GHHook {
 
     public EnumSet<GHEvent> getEvents() {
         EnumSet<GHEvent> s = EnumSet.noneOf(GHEvent.class);
-        for (String e : events)
+        for (String e : events) {
-            Enum.valueOf(GHEvent.class,e.toUpperCase(Locale.ENGLISH));
+            if (e.equals("*"))  s.add(GHEvent.ALL);
+            else                s.add(Enum.valueOf(GHEvent.class, e.toUpperCase(Locale.ENGLISH)));
+        }
         return s;
     }
 
@@ -46,15 +41,29 @@ public final class GHHook {
         return Collections.unmodifiableMap(config);
     }
 
-    public int getId() {
+    /**
-        return id;
+     * @see <a href="https://developer.github.com/v3/repos/hooks/#ping-a-hook">Ping hook</a>
+     */
+    public void ping() throws IOException {
+        new Requester(getRoot()).method("POST").to(getApiRoute() + "/pings");
     }
 
     /**
      * Deletes this hook.
      */
     public void delete() throws IOException {
-        new Poster(repository.root,ApiVersion.V3).withCredential()
+        new Requester(getRoot()).method("DELETE").to(getApiRoute());
-                .to(String.format("/repos/%s/%s/hooks/%d",repository.getOwnerName(),repository.getName(),id),null,"DELETE");
     }
+
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    abstract GitHub getRoot();
+
+    abstract String getApiRoute();
 }

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

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

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

@@ -24,27 +24,77 @@
 
 package org.kohsuke.github;
 
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
+
+import static org.kohsuke.github.Previews.*;
 
 /**
  * Represents an issue on GitHub.
  *
  * @author Eric Maupin
  * @author Kohsuke Kawaguchi
+ * @see GHRepository#getIssue(int)
+ * @see GitHub#searchIssues()
+ * @see GHIssueSearchBuilder
  */
-public class GHIssue {
+public class GHIssue extends GHObject implements Reactable{
     GitHub root;
     GHRepository owner;
+    
+    // API v3
+    protected GHUser assignee;  // not sure what this field is now that 'assignees' exist
+    protected GHUser[] assignees;
+    protected String state;
+    protected int number;
+    protected String closed_at;
+    protected int comments;
+    @SkipFromToString
+    protected String body;
+    // for backward compatibility with < 1.63, this collection needs to hold instances of Label, not GHLabel
+    protected List<Label> labels;
+    protected GHUser user;
+    protected String title, html_url;
+    protected GHIssue.PullRequest pull_request;
+    protected GHMilestone milestone;
+    protected GHUser closed_by;
 
-    private String gravatar_id,body,title,state,created_at,updated_at,html_url;
+    /**
-    private List<String> labels;
+     * @deprecated use {@link GHLabel}
-    private int number,votes,comments;
+     */
-    private int position;
+    public static class Label extends GHLabel {
+    }
+    
+    /*package*/ GHIssue wrap(GHRepository owner) {
+        this.owner = owner;
+        if(milestone != null) milestone.wrap(owner);
+        return wrap(owner.root);
+    }
+
+    /*package*/ GHIssue wrap(GitHub root) {
+        this.root = root;
+        if(assignee != null) assignee.wrapUp(root);
+        if(assignees!=null)    GHUser.wrap(assignees,root);
+        if(user != null) user.wrapUp(root);
+        if(closed_by != null) closed_by.wrapUp(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.
@@ -71,7 +121,7 @@ public class GHIssue {
      * The HTML page of this issue,
      * like https://github.com/jenkinsci/jenkins/issues/100
      */
-    public URL getUrl() {
+    public URL getHtmlUrl() {
         return GitHub.parseURL(html_url);
     }
 
@@ -80,50 +130,229 @@ public class GHIssue {
     }
 
     public GHIssueState getState() {
-        return Enum.valueOf(GHIssueState.class, state);
+        return Enum.valueOf(GHIssueState.class, state.toUpperCase(Locale.ENGLISH));
     }
 
-    public Collection<String> getLabels() {
+    public Collection<GHLabel> getLabels() throws IOException {
-        return Collections.unmodifiableList(labels);
+        if(labels == null){
+            return Collections.emptyList();
+        }
+        return Collections.<GHLabel>unmodifiableList(labels);
     }
 
-    public Date getCreatedAt() {
+    public Date getClosedAt() {
-        return GitHub.parseDate(created_at);
+        return GitHub.parseDate(closed_at);
     }
 
-    public Date getUpdatedAt() {
+    public URL getApiURL(){
-        return GitHub.parseDate(updated_at);
+        return GitHub.parseURL(url);
     }
 
     /**
      * Updates the issue by adding a comment.
+     *
+     * @return
+     *      Newly posted comment.
      */
-    public void comment(String message) throws IOException {
+    @WithBridgeMethods(void.class)
-        new Poster(root).withCredential().with("comment",message).to(getApiRoute("comment"));
+    public GHIssueComment comment(String message) throws IOException {
+        GHIssueComment r = new Requester(root).with("body",message).to(getIssuesApiRoute() + "/comments", GHIssueComment.class);
+        return r.wrapUp(this);
+    }
+
+    private void edit(String key, Object value) throws IOException {
+        new Requester(root)._with(key, value).method("PATCH").to(getApiRoute());
+    }
+
+    private void editIssue(String key, Object value) throws IOException {
+        new Requester(root)._with(key, value).method("PATCH").to(getIssuesApiRoute());
     }
 
     /**
      * 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 {
+        setAssignees(user);
+    }
+
+    public void setLabels(String... labels) throws IOException {
+        editIssue("labels",labels);
     }
 
     /**
      * Obtains all the comments associated with this issue.
+     * 
+     * @see #listComments() 
      */
     public List<GHIssueComment> getComments() throws IOException {
-        return root.retrieve(getApiRoute("comments"), JsonIssueComments.class).wrap(this);
+        return listComments().asList();
+    }
+    
+    /**
+     * Obtains all the comments associated with this issue.
+     */
+    public PagedIterable<GHIssueComment> listComments() throws IOException {
+        return new PagedIterable<GHIssueComment>() {
+            public PagedIterator<GHIssueComment> _iterator(int pageSize) {
+                return new PagedIterator<GHIssueComment>(root.retrieve().asIterator(getIssuesApiRoute() + "/comments", GHIssueComment[].class, pageSize)) {
+                    protected void wrapUp(GHIssueComment[] page) {
+                        for (GHIssueComment c : page)
+                            c.wrapUp(GHIssue.this);
+                    }
+                };
+            }
+        };
     }
 
-    private String getApiRoute(String verb) {
+    @Preview @Deprecated
-        return "/issues/"+verb+"/"+owner.getOwnerName()+"/"+owner.getName()+"/"+number;
+    public GHReaction createReaction(ReactionContent content) throws IOException {
+        return new Requester(owner.root)
+                .withPreview(SQUIRREL_GIRL)
+                .with("content", content.getContent())
+                .to(getApiRoute()+"/reactions", GHReaction.class).wrap(root);
     }
-}
+
+    @Preview @Deprecated
+    public PagedIterable<GHReaction> listReactions() {
+        return new PagedIterable<GHReaction>() {
+            public PagedIterator<GHReaction> _iterator(int pageSize) {
+                return new PagedIterator<GHReaction>(owner.root.retrieve().withPreview(SQUIRREL_GIRL).asIterator(getApiRoute()+"/reactions", GHReaction[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHReaction[] page) {
+                        for (GHReaction c : page)
+                            c.wrap(owner.root);
+                    }
+                };
+            }
+        };
+    }
+
+    public void addAssignees(GHUser... assignees) throws IOException {
+        addAssignees(Arrays.asList(assignees));
+    }
+
+    public void addAssignees(Collection<GHUser> assignees) throws IOException {
+        List<String> names = toLogins(assignees);
+        root.retrieve().method("POST").with("assignees",names).to(getIssuesApiRoute()+"/assignees",this);
+    }
+
+    public void setAssignees(GHUser... assignees) throws IOException {
+        setAssignees(Arrays.asList(assignees));
+    }
+
+    public void setAssignees(Collection<GHUser> assignees) throws IOException {
+        editIssue("assignees",toLogins(assignees));
+    }
+
+    public void removeAssignees(GHUser... assignees) throws IOException {
+        removeAssignees(Arrays.asList(assignees));
+    }
+
+    public void removeAssignees(Collection<GHUser> assignees) throws IOException {
+        List<String> names = toLogins(assignees);
+        root.retrieve().method("DELETE").with("assignees",names).inBody().to(getIssuesApiRoute()+"/assignees",this);
+    }
+
+    private List<String> toLogins(Collection<GHUser> assignees) {
+        List<String> names = new ArrayList<String>(assignees.size());
+        for (GHUser a : assignees) {
+            names.add(a.getLogin());
+        }
+        return names;
+    }
+
+    protected String getApiRoute() {
+        return getIssuesApiRoute();
+    }
+
+    protected String getIssuesApiRoute() {
+        return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/issues/"+number;
+    }
+
+    public GHUser getAssignee() {
+        return assignee;
+    }
+
+    public List<GHUser> getAssignees() {
+        return Collections.unmodifiableList(Arrays.asList(assignees));
+    }
+
+    /**
+     * User who submitted the issue.
+     */
+    public GHUser getUser() {
+        return user;
+    }
+
+    /**
+     * Reports who has closed the issue.
+     *
+     * <p>
+     * Note that GitHub doesn't always seem to report this information
+     * even for an issue that's already closed. See
+     * https://github.com/kohsuke/github-api/issues/60.
+     */
+    public GHUser getClosedBy() {
+        if(!"closed".equals(state)) return null;
+        if(closed_by != null) return closed_by;
+        
+        //TODO closed_by = owner.getIssue(number).getClosed_by();
+        return closed_by;
+    }
+    
+    public int getCommentsCount(){
+        return comments;
+    }
+
+    /**
+     * Returns non-null if this issue is a shadow of a pull request.
+     */
+    public PullRequest getPullRequest() {
+        return pull_request;
+    }
+
+    public boolean isPullRequest() {
+        return pull_request!=null;
+    }
+
+    public GHMilestone getMilestone() {
+        return milestone;
+    }
+
+    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD"}, 
+        justification = "JSON API")
+    public static class PullRequest{
+        private String diff_url, patch_url, html_url;
+        
+        public URL getDiffUrl() {
+            return GitHub.parseURL(diff_url);
+        }
+        
+        public URL getPatchUrl() {
+            return GitHub.parseURL(patch_url);
+        }
+        
+        public URL getUrl() {
+            return GitHub.parseURL(html_url);
+        }
+    }
+}

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

@@ -0,0 +1,60 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class GHIssueBuilder {
+    private final GHRepository repo;
+    private final Requester builder;
+    private List<String> labels = new ArrayList<String>();
+    private List<String> assignees = new ArrayList<String>();
+
+    GHIssueBuilder(GHRepository repo, String title) {
+        this.repo = repo;
+        this.builder = new Requester(repo.root);
+        builder.with("title",title);
+    }
+
+    /**
+     * Sets the main text of an issue, which is arbitrary multi-line text.
+     */
+    public GHIssueBuilder body(String str) {
+        builder.with("body",str);
+        return this;
+    }
+
+    public GHIssueBuilder assignee(GHUser user) {
+        if (user!=null)
+            assignees.add(user.getLogin());
+        return this;
+    }
+
+    public GHIssueBuilder assignee(String user) {
+        if (user!=null)
+            assignees.add(user);
+        return this;
+    }
+
+    public GHIssueBuilder milestone(GHMilestone milestone) {
+        if (milestone!=null)
+            builder.with("milestone",milestone.getNumber());
+        return this;
+    }
+
+    public GHIssueBuilder label(String label) {
+        if (label!=null)
+            labels.add(label);
+        return this;
+    }
+
+    /**
+     * Creates a new issue.
+     */
+    public GHIssue create() throws IOException {
+        return builder.with("labels",labels).with("assignees",assignees).to(repo.getApiTailUrl("issues"),GHIssue.class).wrap(repo);
+    }
+}

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

@@ -24,18 +24,25 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.util.Date;
+import java.net.URL;
+
+import static org.kohsuke.github.Previews.SQUIRREL_GIRL;
 
 /**
  * Comment to the issue
  *
  * @author Kohsuke Kawaguchi
  */
-public class GHIssueComment {
+public class GHIssueComment extends GHObject implements Reactable {
     GHIssue owner;
 
-    private String body, gravatar_id, user, created_at, updated_at;
+    private String body, gravatar_id;
-    private int id;
+    private GHUser user; // not fully populated. beware.
+
+    /*package*/ GHIssueComment wrapUp(GHIssue owner) {
+        this.owner = owner;
+        return this;
+    }
 
     /**
      * Gets the issue to which this comment is associated.
@@ -51,29 +58,68 @@ public class GHIssueComment {
         return body;
     }
 
-    public Date getCreatedAt() {
-        return GitHub.parseDate(created_at);
-    }
-
-    public Date getUpdatedAt() {
-        return GitHub.parseDate(updated_at);
-    }
-
-    public int getId() {
-        return id;
-    }
-
     /**
      * Gets the ID of the user who posted this comment.
      */
+    @Deprecated
     public String getUserName() {
-        return user;
+        return user.getLogin();
     }
 
     /**
      * Gets the user who posted this comment.
      */
     public GHUser getUser() throws IOException {
-        return owner.root.getUser(user);
+        return owner == null || owner.root.isOffline() ? user : owner.root.getUser(user.getLogin());
+    }
+    
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+    
+    /**
+     * Updates the body of the issue comment.
+     */
+    public void update(String body) throws IOException {
+        new Requester(owner.root).with("body", body).method("PATCH").to(getApiRoute(), GHIssueComment.class);
+        this.body = body;
+    }
+
+    /**
+     * Deletes this issue comment.
+     */
+    public void delete() throws IOException {
+        new Requester(owner.root).method("DELETE").to(getApiRoute());
+    }
+
+    @Preview @Deprecated
+    public GHReaction createReaction(ReactionContent content) throws IOException {
+        return new Requester(owner.root)
+                .withPreview(SQUIRREL_GIRL)
+                .with("content", content.getContent())
+                .to(getApiRoute()+"/reactions", GHReaction.class).wrap(owner.root);
+    }
+
+    @Preview @Deprecated
+    public PagedIterable<GHReaction> listReactions() {
+        return new PagedIterable<GHReaction>() {
+            public PagedIterator<GHReaction> _iterator(int pageSize) {
+                return new PagedIterator<GHReaction>(owner.root.retrieve().withPreview(SQUIRREL_GIRL).asIterator(getApiRoute()+"/reactions", GHReaction[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHReaction[] page) {
+                        for (GHReaction c : page)
+                            c.wrap(owner.root);
+                    }
+                };
+            }
+        };
+    }
+
+    private String getApiRoute() {
+        return "/repos/"+owner.getRepository().getOwnerName()+"/"+owner.getRepository().getName()+"/issues/comments/" + id;
     }
 }

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

@@ -0,0 +1,71 @@
+package org.kohsuke.github;
+
+import java.util.Locale;
+
+/**
+ * Search issues.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GitHub#searchIssues()
+ */
+public class GHIssueSearchBuilder extends GHSearchBuilder<GHIssue> {
+    /*package*/ GHIssueSearchBuilder(GitHub root) {
+        super(root,IssueSearchResult.class);
+    }
+
+    /**
+     * Search terms.
+     */
+    public GHIssueSearchBuilder q(String term) {
+        super.q(term);
+        return this;
+    }
+
+    public GHIssueSearchBuilder mentions(GHUser u) {
+        return mentions(u.getLogin());
+    }
+
+    public GHIssueSearchBuilder mentions(String login) {
+        return q("mentions:"+login);
+    }
+
+    public GHIssueSearchBuilder isOpen() {
+        return q("is:open");
+    }
+
+    public GHIssueSearchBuilder isClosed() {
+        return q("is:closed");
+    }
+
+    public GHIssueSearchBuilder isMerged() {
+        return q("is:merged");
+    }
+
+    public GHIssueSearchBuilder order(GHDirection v) {
+        req.with("order",v);
+        return this;
+    }
+
+    public GHIssueSearchBuilder sort(Sort sort) {
+        req.with("sort",sort);
+        return this;
+    }
+
+    public enum Sort { COMMENTS, CREATED, UPDATED }
+
+    private static class IssueSearchResult extends SearchResult<GHIssue> {
+        private GHIssue[] items;
+
+        @Override
+        /*package*/ GHIssue[] getItems(GitHub root) {
+            for (GHIssue i : items)
+                i.wrap(root);
+            return items;
+        }
+    }
+
+    @Override
+    protected String getApiUrl() {
+        return "/search/issues";
+    }
+}

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

@@ -24,7 +24,11 @@
 
 package org.kohsuke.github;
 
+/**
+ * @see GHPullRequestQueryBuilder#state(GHIssueState)
+ */
 public enum GHIssueState {
     OPEN,
-    CLOSED
+    CLOSED,
+    ALL
 }

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

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
@@ -7,12 +8,13 @@ import org.apache.commons.lang.builder.ToStringBuilder;
  *
  * @author Kohsuke Kawaguchi
  */
+@SuppressFBWarnings(value = "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", justification = "JSON API")
 public class GHKey {
     /*package almost final*/ GitHub root;
 
-    private String url, key, title;
+    protected String url, key, title;
-    private boolean verified;
+    protected boolean verified;
-    private int id;
+    protected int id;
 
     public int getId() {
         return id;
@@ -33,6 +35,10 @@ public class GHKey {
         return url;
     }
 
+    public GitHub getRoot() {
+        return root;
+    }
+    
     public boolean isVerified() {
         return verified;
     }

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

@@ -0,0 +1,37 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+/**
+ * @author Kohsuke Kawaguchi
+ * @see GHIssue#getLabels()
+ * @see GHRepository#listLabels()
+ */
+public class GHLabel {
+    private String url, name, color;
+    private GHRepository repo;
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Color code without leading '#', such as 'f29513'
+     */
+    public String getColor() {
+        return color;
+    }
+
+    /*package*/ GHLabel wrapUp(GHRepository repo) {
+        this.repo = repo;
+        return this;
+    }
+
+    public void delete() throws IOException {
+        repo.root.retrieve().method("DELETE").to(url);
+    }
+}

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

@@ -0,0 +1,168 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016, Duncan Dickinson
+ *
+ * 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 com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.kohsuke.github.Previews.DRAX;
+
+/**
+ * The GitHub Preview API's license information
+ * <p>
+ * WARNING: This uses a PREVIEW API - subject to change.
+ *
+ * @author Duncan Dickinson
+ * @see GitHub#getLicense(String)
+ * @see GHRepository#getLicense()
+ * @see <a href="https://developer.github.com/v3/licenses/">https://developer.github.com/v3/licenses/</a>
+ */
+@Preview @Deprecated
+@SuppressWarnings({"UnusedDeclaration"})
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD",
+        "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+public class GHLicense extends GHObject {
+    @SuppressFBWarnings("IS2_INCONSISTENT_SYNC") // root is set before the object is returned to the app
+    /*package almost final*/ GitHub root;
+
+    // these fields are always present, even in the short form
+    protected String key, name;
+
+    // the rest is only after populated
+    protected Boolean featured;
+
+    protected String html_url, description, category, implementation, body;
+
+    protected List<String> required = new ArrayList<String>();
+    protected List<String> permitted = new ArrayList<String>();
+    protected List<String> forbidden = new ArrayList<String>();
+
+    /**
+     * @return a mnemonic for the license
+     */
+    public String getKey() {
+        return key;
+    }
+
+    /**
+     * @return the license name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @return API URL of this object.
+     */
+    @WithBridgeMethods(value = String.class, adapterMethod = "urlToString")
+    public URL getUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    /**
+     * Featured licenses are bold in the new repository drop-down
+     *
+     * @return True if the license is featured, false otherwise
+     */
+    public Boolean isFeatured() throws IOException {
+        populate();
+        return featured;
+    }
+
+    public URL getHtmlUrl() throws IOException {
+        populate();
+        return GitHub.parseURL(html_url);
+    }
+
+    public String getDescription() throws IOException {
+        populate();
+        return description;
+    }
+
+    public String getCategory() throws IOException {
+        populate();
+        return category;
+    }
+
+    public String getImplementation() throws IOException {
+        populate();
+        return implementation;
+    }
+
+    public List<String> getRequired() throws IOException {
+        populate();
+        return required;
+    }
+
+    public List<String> getPermitted() throws IOException {
+        populate();
+        return permitted;
+    }
+
+    public List<String> getForbidden() throws IOException {
+        populate();
+        return forbidden;
+    }
+
+    public String getBody() throws IOException {
+        populate();
+        return body;
+    }
+
+    /**
+     * Fully populate the data by retrieving missing data.
+     *
+     * Depending on the original API call where this object is created, it may not contain everything.
+     */
+    protected synchronized void populate() throws IOException {
+        if (description!=null)    return; // already populated
+
+        root.retrieve().withPreview(DRAX).to(url, this);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof GHLicense)) return false;
+
+        GHLicense that = (GHLicense) o;
+        return this.url.equals(that.url);
+    }
+
+    @Override
+    public int hashCode() {
+        return url.hashCode();
+    }
+
+    /*package*/ GHLicense wrap(GitHub root) {
+        this.root = root;
+        return this;
+    }
+}

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

@@ -0,0 +1,84 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Locale;
+
+/**
+ * Represents a membership of a user in an organization.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHMyself#listOrgMemberships()
+ */
+public class GHMembership /* extends GHObject --- but it doesn't have id, created_at, etc. */ {
+    GitHub root;
+
+    String url;
+    String state;
+    String role;
+    GHUser user;
+    GHOrganization organization;
+
+    public URL getUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    public State getState() {
+        return Enum.valueOf(State.class, state.toUpperCase(Locale.ENGLISH));
+    }
+
+    public Role getRole() {
+        return Enum.valueOf(Role.class, role.toUpperCase(Locale.ENGLISH));
+    }
+
+    public GHUser getUser() {
+        return user;
+    }
+
+    public GHOrganization getOrganization() {
+        return organization;
+    }
+
+    /**
+     * Accepts a pending invitation to an organization.
+     *
+     * @see GHMyself#getMembership(GHOrganization)
+     */
+    public void activate() throws IOException {
+        root.retrieve().method("PATCH").with("state",State.ACTIVE).to(url,this);
+    }
+
+    /*package*/ GHMembership wrap(GitHub root) {
+        this.root = root;
+        if (user!=null)     user = root.getUser(user.wrapUp(root));
+        if (organization!=null) organization.wrapUp(root);
+        return this;
+    }
+
+    /*package*/ static void wrap(GHMembership[] page, GitHub root) {
+        for (GHMembership m : page)
+            m.wrap(root);
+    }
+
+    /**
+     * Role of a user in an organization.
+     */
+    public enum Role {
+        /**
+         * Organization owner.
+         */
+        ADMIN,
+        /**
+         * Non-owner organization member.
+         */
+        MEMBER;
+    }
+
+    /**
+     * Whether a role is currently active or waiting for acceptance (pending)
+     */
+    public enum State {
+        ACTIVE,
+        PENDING;
+    }
+}

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

@@ -1,5 +1,7 @@
 package org.kohsuke.github;
 
+import java.io.IOException;
+import java.net.URL;
 import java.util.Date;
 import java.util.Locale;
 
@@ -8,66 +10,92 @@ import java.util.Locale;
  * @author Yusuke Kokubo
  *
  */
-public class GHMilestone {
+public class GHMilestone extends GHObject {
     GitHub root;
-	GHRepository owner;
+    GHRepository owner;
 
-	GHUser creator;
+    GHUser creator;
-	private String state, due_on, title, url, created_at, description;
+    private String state, due_on, title, description, html_url;
-	private int closed_issues, open_issues, number;
+    private int closed_issues, open_issues, number;
+    protected String closed_at;
 
-	public GitHub getRoot() {
+    public GitHub getRoot() {
-		return root;
+        return root;
-	}
+    }
-	
+    
-	public GHRepository getOwner() {
+    public GHRepository getOwner() {
-		return owner;
+        return owner;
-	}
+    }
-	
+    
-	public GHUser getCreator() {
+    public GHUser getCreator() {
-		return creator;
+        return creator;
-	}
+    }
-	
+    
-	public Date getDueOn() {
+    public Date getDueOn() {
-		if (due_on == null) return null;
+        if (due_on == null) return null;
-		return GitHub.parseDate(due_on);
+        return GitHub.parseDate(due_on);
-	}
+    }
-	
-	public String getTitle() {
-		return title;
-	}
-	
-	public String getUrl() {
-		return url;
-	}
-	
-	public Date getCreatedAt() {
-		return GitHub.parseDate(created_at);
-	}
-	
-	public String getDescription() {
-		return description;
-	}
-	
-	public int getClosedIssues() {
-		return closed_issues;
-	}
-	
-	public int getOpenIssues() {
-		return open_issues;
-	}
-	
-	public int getNumber() {
-		return number;
-	}
-	
-	public GHMilestoneState getState() {
-		return Enum.valueOf(GHMilestoneState.class, state.toUpperCase(Locale.ENGLISH));
-	}
 
-	public GHMilestone wrap(GHRepository repo) {
+    /**
-		this.owner = repo;
+     * When was this milestone closed?
-		this.root = repo.root;
+     */
-		return this;
+    public Date getClosedAt() throws IOException {
-	}
+        return GitHub.parseDate(closed_at);
+    }
+
+    public String getTitle() {
+        return title;
+    }
+    
+    public String getDescription() {
+        return description;
+    }
+    
+    public int getClosedIssues() {
+        return closed_issues;
+    }
+    
+    public int getOpenIssues() {
+        return open_issues;
+    }
+    
+    public int getNumber() {
+        return number;
+    }
+
+    public URL getHtmlUrl() {
+        return GitHub.parseURL(html_url);
+    }
+    
+    public GHMilestoneState getState() {
+        return Enum.valueOf(GHMilestoneState.class, state.toUpperCase(Locale.ENGLISH));
+    }
+
+    /**
+     * Closes this milestone.
+     */
+    public void close() throws IOException {
+        edit("state", "closed");
+    }
+
+    /**
+     * Reopens this milestone.
+     */
+    public void reopen() throws IOException {
+        edit("state", "open");
+    }
+
+    private void edit(String key, Object value) throws IOException {
+        new Requester(root)._with(key, value).method("PATCH").to(getApiRoute());
+    }
+
+    protected String getApiRoute() {
+        return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/milestones/"+number;
+    }
+
+    public GHMilestone wrap(GHRepository repo) {
+        this.owner = repo;
+        this.root = repo.root;
+        return this;
+    }
 }

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

@@ -1,10 +1,15 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 /**
  * Represents the account that's logging into GitHub.
@@ -12,33 +17,202 @@ import java.util.List;
  * @author Kohsuke Kawaguchi
  */
 public class GHMyself extends GHUser {
+
+    /**
+     * Type of repositories returned during listing.
+     */
+    public enum RepositoryListFilter {
+        /**
+         * All public and private repositories that current user has access or collaborates to
+         */
+        ALL,
+        /**
+         * Public and private repositories owned by current user
+         */
+        OWNER,
+        /**
+         * Public repositories that current user has access or collaborates to
+         */
+        PUBLIC,
+        /**
+         * Private repositories that current user has access or collaborates to
+         */
+        PRIVATE,
+        /**
+         * Public and private repositories that current user is a member
+         */
+        MEMBER;
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #getEmails2()}
+     */
+    public List<String> getEmails() throws IOException {
+        List<GHEmail> src = getEmails2();
+        List<String> r = new ArrayList<String>(src.size());
+        for (GHEmail e : src) {
+            r.add(e.getEmail());
+        }
+        return r;
+    }
+
     /**
      * Returns the read-only list of e-mail addresses configured for you.
      *
      * This corresponds to the stuff you configure in https://github.com/settings/emails,
      * and not to be confused with {@link #getEmail()} that shows your public e-mail address
      * set in https://github.com/settings/profile
-     * 
+     *
      * @return
      *      Always non-null.
      */
-    public List<String> getEmails() throws IOException {
+    public List<GHEmail> getEmails2() throws IOException {
-        String[] addresses = root.retrieveWithAuth3("/user/emails",String[].class);
+        GHEmail[] addresses = root.retrieve().to("/user/emails", GHEmail[].class);
         return Collections.unmodifiableList(Arrays.asList(addresses));
     }
 
     /**
      * Returns the read-only list of all the pulic keys of the current user.
      *
+     * NOTE: When using OAuth authenticaiton, the READ/WRITE User scope is
+     * required by the GitHub APIs, otherwise you will get a 404 NOT FOUND.
+     *
      * @return
      *      Always non-null.
      */
     public List<GHKey> getPublicKeys() throws IOException {
-        return Collections.unmodifiableList(Arrays.asList(root.retrieveWithAuth3("/user/keys",GHKey[].class)));
+        return Collections.unmodifiableList(Arrays.asList(root.retrieve().to("/user/keys", GHKey[].class)));
     }
-    
+
+    /**
+     * Returns the read-only list of all the public verified keys of the current user.
+     *
+     * Differently from the getPublicKeys() method, the retrieval of the user's
+     * verified public keys does not require any READ/WRITE OAuth Scope to the
+     * user's profile.
+     *
+     * @return
+     *      Always non-null.
+     */
+  public List<GHVerifiedKey> getPublicVerifiedKeys() throws IOException {
+    return Collections.unmodifiableList(Arrays.asList(root.retrieve().to(
+        "/users/" + getLogin() + "/keys", GHVerifiedKey[].class)));
+  }
+
+    /**
+     * Gets the organization that this user belongs to.
+     */
+    public GHPersonSet<GHOrganization> getAllOrganizations() throws IOException {
+        GHPersonSet<GHOrganization> orgs = new GHPersonSet<GHOrganization>();
+        Set<String> names = new HashSet<String>();
+        for (GHOrganization o : root.retrieve().to("/user/orgs", GHOrganization[].class)) {
+            if (names.add(o.getLogin()))    // in case of rumoured duplicates in the data
+                orgs.add(root.getOrganization(o.getLogin()));
+        }
+        return orgs;
+    }
+
+    /**
+     * Gets the all repositories this user owns (public and private).
+     */
+    public synchronized Map<String,GHRepository> getAllRepositories() throws IOException {
+        Map<String,GHRepository> repositories = new TreeMap<String, GHRepository>();
+        for (GHRepository r : listAllRepositories()) {
+            repositories.put(r.getName(),r);
+        }
+        return Collections.unmodifiableMap(repositories);
+    }
+
+    /**
+     * Lists up all repositories this user owns (public and private).
+     *
+     * Unlike {@link #getAllRepositories()}, this does not wait until all the repositories are returned.
+     * Repositories are returned by GitHub API with a 30 items per page.
+     */
+    @Override
+    public PagedIterable<GHRepository> listRepositories() {
+      return listRepositories(30);
+    }
+
+    /**
+     * List repositories that are accessible to the authenticated user (public and private) using the specified page size.
+     *
+     * This includes repositories owned by the authenticated user, repositories that belong to other users
+     * where the authenticated user is a collaborator, and other organizations' repositories that the authenticated
+     * user has access to through an organization membership.
+     *
+     * @param pageSize size for each page of items returned by GitHub. Maximum page size is 100.
+     *
+     * Unlike {@link #getRepositories()}, this does not wait until all the repositories are returned.
+     */
+    public PagedIterable<GHRepository> listRepositories(final int pageSize) {
+        return listRepositories(pageSize, RepositoryListFilter.ALL);
+    }
+
+    /**
+     * List repositories of a certain type that are accessible by current authenticated user using the specified page size.
+     *
+     * @param pageSize size for each page of items returned by GitHub. Maximum page size is 100.
+     * @param repoType type of repository returned in the listing
+     */
+    public PagedIterable<GHRepository> listRepositories(final int pageSize, final RepositoryListFilter repoType) {
+        return new PagedIterable<GHRepository>() {
+            public PagedIterator<GHRepository> _iterator(int pageSize) {
+                return new PagedIterator<GHRepository>(root.retrieve().with("type",repoType).asIterator("/user/repos", GHRepository[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHRepository[] page) {
+                        for (GHRepository c : page)
+                            c.wrap(root);
+                    }
+                };
+            }
+        }.withPageSize(pageSize);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #listRepositories()}
+     */
+    public PagedIterable<GHRepository> listAllRepositories() {
+        return listRepositories();
+    }
+
+    /**
+     * List your organization memberships
+     */
+    public PagedIterable<GHMembership> listOrgMemberships() {
+        return listOrgMemberships(null);
+    }
+
+    /**
+     * List your organization memberships
+     *
+     * @param state
+     *      Filter by a specific state
+     */
+    public PagedIterable<GHMembership> listOrgMemberships(final GHMembership.State state) {
+        return new PagedIterable<GHMembership>() {
+            public PagedIterator<GHMembership> _iterator(int pageSize) {
+                return new PagedIterator<GHMembership>(root.retrieve().with("state",state).asIterator("/user/memberships/orgs", GHMembership[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHMembership[] page) {
+                        GHMembership.wrap(page,root);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Gets your membership in a specific organization.
+     */
+    public GHMembership getMembership(GHOrganization o) throws IOException {
+        return root.retrieve().to("/user/memberships/orgs/"+o.getLogin(),GHMembership.class).wrap(root);
+    }
+
 //    public void addEmails(Collection<String> emails) throws IOException {
-////        new Poster(root,ApiVersion.V3).withCredential().to("/user/emails");
+////        new Requester(root,ApiVersion.V3).withCredential().to("/user/emails");
 //        root.retrieveWithAuth3()
 //    }
 }

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

@@ -0,0 +1,208 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+/**
+ * Listens to GitHub notification stream.
+ *
+ * <p>
+ * This class supports two modes of retrieving notifications that can
+ * be controlled via {@link #nonBlocking(boolean)}.
+ *
+ * <p>
+ * In the blocking mode, which is the default, iterator will be infinite.
+ * The call to {@link Iterator#next()} will block until a new notification
+ * arrives. This is useful for application that runs perpetually and reacts
+ * to notifications.
+ *
+ * <p>
+ * In the non-blocking mode, the iterator will only report the set of
+ * notifications initially retrieved from GitHub, then quit. This is useful
+ * for a batch application to process the current set of notifications.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GitHub#listNotifications()
+ * @see GHRepository#listNotifications()
+ */
+public class GHNotificationStream implements Iterable<GHThread> {
+    private final GitHub root;
+
+    private Boolean all, participating;
+    private String since;
+    private String apiUrl;
+    private boolean nonBlocking = false;
+
+    /*package*/ GHNotificationStream(GitHub root, String apiUrl) {
+        this.root = root;
+        this.apiUrl = apiUrl;
+    }
+
+    /**
+     * Should the stream include notifications that are already read?
+     */
+    public GHNotificationStream read(boolean v) {
+        all = v;
+        return this;
+    }
+
+    /**
+     * Should the stream be restricted to notifications in which the user
+     * is directly participating or mentioned?
+     */
+    public GHNotificationStream participating(boolean v) {
+        participating = v;
+        return this;
+    }
+
+    public GHNotificationStream since(long timestamp) {
+        return since(new Date(timestamp));
+    }
+
+    public GHNotificationStream since(Date dt) {
+        since = GitHub.printDate(dt);
+        return this;
+    }
+
+    /**
+     * If set to true, {@link #iterator()} will stop iterating instead of blocking and
+     * waiting for the updates to arrive.
+     */
+    public GHNotificationStream nonBlocking(boolean v) {
+        this.nonBlocking = v;
+        return this;
+    }
+
+    /**
+     * Returns an infinite blocking {@link Iterator} that returns
+     * {@link GHThread} as notifications arrive.
+     */
+    public Iterator<GHThread> iterator() {
+        // capture the configuration setting here
+        final Requester req = new Requester(root).method("GET")
+                .with("all", all).with("participating", participating).with("since", since);
+
+        return new Iterator<GHThread>() {
+            /**
+             * Stuff we've fetched but haven't returned to the caller.
+             * Newer ones first.
+             */
+            private GHThread[] threads = EMPTY_ARRAY;
+
+            /**
+             * Next element in {@link #threads} to return. This counts down.
+             */
+            private int idx=-1;
+
+            /**
+             * threads whose updated_at is older than this should be ignored.
+             */
+            private long lastUpdated = -1;
+
+            /**
+             * Next request should have "If-Modified-Since" header with this value.
+             */
+            private String lastModified;
+
+            /**
+             * When is the next polling allowed?
+             */
+            private long nextCheckTime = -1;
+
+            private GHThread next;
+
+            public GHThread next() {
+                if (next==null) {
+                    next = fetch();
+                    if (next==null)
+                        throw new NoSuchElementException();
+                }
+
+                GHThread r = next;
+                next = null;
+                return r;
+            }
+
+            public boolean hasNext() {
+                if (next==null)
+                    next = fetch();
+                return next!=null;
+            }
+
+            GHThread fetch() {
+                try {
+                    while (true) {// loop until we get new threads to return
+
+                        // if we have fetched un-returned threads, use them first
+                        while (idx>=0) {
+                            GHThread n = threads[idx--];
+                            long nt = n.getUpdatedAt().getTime();
+                            if (nt >= lastUpdated) {
+                                lastUpdated = nt;
+                                return n.wrap(root);
+                            }
+                        }
+
+                        if (nonBlocking && nextCheckTime>=0)
+                            return null;    // nothing more to report, and we aren't blocking
+
+                        // observe the polling interval before making the call
+                        while (true) {
+                            long now = System.currentTimeMillis();
+                            if (nextCheckTime < now) break;
+                            long waitTime = Math.min(Math.max(nextCheckTime - now, 1000), 60 * 1000);
+                            Thread.sleep(waitTime);
+                        }
+
+                        req.setHeader("If-Modified-Since", lastModified);
+
+                        threads = req.to(apiUrl, GHThread[].class);
+                        if (threads==null) {
+                            threads = EMPTY_ARRAY;  // if unmodified, we get empty array
+                        } else {
+                            // we get a new batch, but we want to ignore the ones that we've seen
+                            lastUpdated++;
+                        }
+                        idx = threads.length-1;
+
+                        nextCheckTime = calcNextCheckTime();
+                        lastModified = req.getResponseHeader("Last-Modified");
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
+            private long calcNextCheckTime() {
+                String v = req.getResponseHeader("X-Poll-Interval");
+                if (v==null)    v="60";
+                long seconds = Integer.parseInt(v);
+                return System.currentTimeMillis() + seconds*1000;
+            }
+
+            public void remove() {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
+
+    public void markAsRead() throws IOException {
+        markAsRead(-1);
+    }
+
+    /**
+     * Marks all the notifications as read.
+     */
+    public void markAsRead(long timestamp) throws IOException {
+        final Requester req = new Requester(root).method("PUT");
+        if (timestamp>=0)
+            req.with("last_read_at", GitHub.printDate(new Date(timestamp)));
+        req.asHttpStatusCode(apiUrl);
+    }
+
+    private static final GHThread[] EMPTY_ARRAY = new GHThread[0];
+}

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

@@ -0,0 +1,115 @@
+package org.kohsuke.github;
+
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.lang.reflect.FieldUtils;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * Most (all?) domain objects in GitHub seems to have these 4 properties.
+ */
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+public abstract class GHObject {
+    protected String url;
+    protected int id;
+    protected String created_at;
+    protected String updated_at;
+
+    /*package*/ GHObject() {
+    }
+
+    /**
+     * When was this resource created?
+     */
+    @WithBridgeMethods(value=String.class, adapterMethod="createdAtStr")
+    public Date getCreatedAt() throws IOException {
+        return GitHub.parseDate(created_at);
+    }
+
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getCreatedAt")
+    private Object createdAtStr(Date id, Class type) {
+        return created_at;
+    }
+
+    /**
+     * API URL of this object.
+     */
+    @WithBridgeMethods(value=String.class, adapterMethod="urlToString")
+    public URL getUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    /**
+     * URL of this object for humans, which renders some HTML.
+     */
+    @WithBridgeMethods(value=String.class, adapterMethod="urlToString")
+    public abstract URL getHtmlUrl() throws IOException;
+
+    /**
+     * When was this resource last updated?
+     */
+    public Date getUpdatedAt() throws IOException {
+        return GitHub.parseDate(updated_at);
+    }
+
+    /**
+     * Unique ID number of this resource.
+     */
+    @WithBridgeMethods(value=String.class, adapterMethod="intToString")
+    public int getId() {
+        return id;
+    }
+
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getId")
+    private Object intToString(int id, Class type) {
+        return String.valueOf(id);
+    }
+
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getHtmlUrl")
+    private Object urlToString(URL url, Class type) {
+        return url==null ? null : url.toString();
+    }
+
+    /**
+     * String representation to assist debugging and inspection. The output format of this string
+     * is not a committed part of the API and is subject to change.
+     */
+    @Override
+    public String toString() {
+        return new ReflectionToStringBuilder(this, TOSTRING_STYLE, null, null, false, false) {
+            @Override
+            protected boolean accept(Field field) {
+                return super.accept(field) && !field.isAnnotationPresent(SkipFromToString.class);
+            }
+        }.toString();
+    }
+
+    private static final ToStringStyle TOSTRING_STYLE = new ToStringStyle() {
+        {
+            this.setUseShortClassName(true);
+        }
+
+        @Override
+        public void append(StringBuffer buffer, String fieldName, Object value, Boolean fullDetail) {
+            // skip unimportant properties. '_' is a heuristics as important properties tend to have short names
+            if (fieldName.contains("_"))
+                return;
+            // avoid recursing other GHObject
+            if (value instanceof GHObject)
+                return;
+            // likewise no point in showing root
+            if (value instanceof GitHub)
+                return;
+
+            super.append(buffer,fieldName,value,fullDetail);
+        }
+    };
+}

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

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

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

@@ -1,76 +1,187 @@
 package org.kohsuke.github;
 
-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.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.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.
      *
      * @return
      *      Newly created repository.
+     * @deprecated
+     *      Use {@link #createRepository(String)} that uses a builder pattern to let you control every aspect.
      */
     public GHRepository createRepository(String name, String description, String homepage, String team, boolean isPublic) throws IOException {
-        return createRepository(name,description,homepage,getTeams().get(team),isPublic);
+        GHTeam t = getTeams().get(team);
+        if (t==null)
+            throw new IllegalArgumentException("No such team: "+team);
+        return createRepository(name, description, homepage, t, isPublic);
     }
 
+    /**
+     * @deprecated
+     *      Use {@link #createRepository(String)} that uses a builder pattern to let you control every aspect.
+     */
     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
+        if (team==null)
-        return new Poster(root,V3).withCredential()
+            throw new IllegalArgumentException("Invalid team");
-                .with("name", name).with("description", description).with("homepage", homepage)
+        return createRepository(name).description(description).homepage(homepage).private_(!isPublic).team(team).create();
-                .with("public", isPublic).with("team_id",team.getId()).to("/orgs/"+login+"/repos", GHRepository.class).wrap(root);
+    }
+
+    /**
+     * Starts a builder that creates a new repository.
+     *
+     * <p>
+     * You use the returned builder to set various properties, then call {@link GHCreateRepositoryBuilder#create()}
+     * to finally createa repository.
+     */
+    public GHCreateRepositoryBuilder createRepository(String name) throws IOException {
+        return new GHCreateRepositoryBuilder(root,"/orgs/"+login+"/repos",name);
     }
 
     /**
      * Teams by their names.
      */
     public Map<String,GHTeam> getTeams() throws IOException {
-        return root.retrieveWithAuth("/organizations/"+login+"/teams",JsonTeams.class).toMap(this);
+        Map<String,GHTeam> r = new TreeMap<String, GHTeam>();
+        for (GHTeam t : listTeams()) {
+            r.put(t.getName(),t);
+        }
+        return r;
+    }
+
+    /**
+     * List up all the teams.
+     */
+    public PagedIterable<GHTeam> listTeams() throws IOException {
+        return new PagedIterable<GHTeam>() {
+            public PagedIterator<GHTeam> _iterator(int pageSize) {
+                return new PagedIterator<GHTeam>(root.retrieve().asIterator(String.format("/orgs/%s/teams", login), GHTeam[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHTeam[] page) {
+                        for (GHTeam c : page)
+                            c.wrapUp(GHOrganization.this);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Finds a team that has the given name in its {@link GHTeam#getName()}
+     */
+    public GHTeam getTeamByName(String name) throws IOException {
+        for (GHTeam t : listTeams()) {
+            if(t.getName().equals(name))
+                return t;
+        }
+        return null;
+    }
+
+    /**
+     * Finds a team that has the given slug in its {@link GHTeam#getSlug()}
+     */
+    public GHTeam getTeamBySlug(String slug) throws IOException {
+        for (GHTeam t : listTeams()) {
+            if(t.getSlug().equals(slug))
+                return t;
+        }
+        return null;
+    }
+
+    /**
+     * Checks if this organization has the specified user as a member.
+     */
+    public boolean hasMember(GHUser user) {
+        try {
+            root.retrieve().to("/orgs/" + login + "/members/"  + user.getLogin());
+            return true;
+        } catch (IOException ignore) {
+            return false;
+        }
+    }
+
+    /**
+     * Remove a member of the organisation - which will remove them from
+     * all teams, and remove their access to the organization’s repositories.
+     */
+    public void remove(GHUser user) throws IOException {
+        root.retrieve().method("DELETE").to("/orgs/" + login + "/members/"  + user.getLogin());
+    }
+
+    /**
+     * Checks if this organization has the specified user as a public member.
+     */
+    public boolean hasPublicMember(GHUser user) {
+        try {
+            root.retrieve().to("/orgs/" + login + "/public_members/" + user.getLogin());
+            return true;
+        } catch (IOException ignore) {
+            return false;
+        }
     }
 
     /**
      * Publicizes the membership.
      */
     public void publicize(GHUser u) throws IOException {
-        root.retrieveWithAuth3("/orgs/" + login + "/public_members/" + u.getLogin(), null, "PUT");
+        root.retrieve().method("PUT").to("/orgs/" + login + "/public_members/" + u.getLogin(), null);
+    }
+
+    /**
+     * @deprecated use {@link #listMembers()}
+     */
+    public List<GHUser> getMembers() throws IOException {
+        return listMembers().asList();
     }
 
     /**
      * All the members of this organization.
      */
-    public List<GHUser> getMembers() throws IOException {
+    public PagedIterable<GHUser> listMembers() throws IOException {
-        return new AbstractList<GHUser>() {
+        return listMembers("members");
-            // 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);
 
-            @Override
+    /**
-            public GHUser get(int index) {
+     * All the public members of this organization.
-                try {
+     */
-                    return root.getUser(shallow[index].getLogin());
+    public PagedIterable<GHUser> listPublicMembers() throws IOException {
-                } catch (IOException e) {
+        return listMembers("public_members");
-                    throw new RuntimeException(e);
+    }
-                }
-            }
 
-            @Override
+    private PagedIterable<GHUser> listMembers(String suffix) throws IOException {
-            public int size() {
+        return listMembers(suffix, null);
-                return shallow.length;
+    }
+
+    public PagedIterable<GHUser> listMembersWithFilter(String filter) throws IOException {
+        return listMembers("members", filter);
+    }
+
+    private PagedIterable<GHUser> listMembers(final String suffix, final String filter) throws IOException {
+        return new PagedIterable<GHUser>() {
+            public PagedIterator<GHUser> _iterator(int pageSize) {
+                String filterParams = (filter == null) ? "" : ("?filter=" + filter);
+                return new PagedIterator<GHUser>(root.retrieve().asIterator(String.format("/orgs/%s/%s%s", login, suffix, filterParams), GHUser[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHUser[] users) {
+                        GHUser.wrap(users, root);
+                    }
+                };
             }
         };
     }
@@ -79,7 +190,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.retrieve().method("DELETE").to("/orgs/" + login + "/public_members/" + u.getLogin(), null);
     }
 
     public enum Permission { ADMIN, PUSH, PULL }
@@ -88,28 +199,33 @@ 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());
+        Requester post = new Requester(root).with("name", name).with("permission", p);
+        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.method("POST").to("/orgs/" + login + "/teams", GHTeam.class).wrapUp(this);
     }
 
     public GHTeam createTeam(String name, Permission p, GHRepository... repositories) throws IOException {
-        return createTeam(name,p, Arrays.asList(repositories));
+        return createTeam(name, p, Arrays.asList(repositories));
     }
 
     /**
      * List up repositories that has some open pull requests.
+     *
+     * This used to be an efficient method that didn't involve traversing every repository, but now
+     * it doesn't do any optimization.
      */
     public List<GHRepository> getRepositoriesWithOpenPullRequests() throws IOException {
-        WebClient wc = root.createWebClient();
-        HtmlPage pg = (HtmlPage)wc.getPage("https://github.com/organizations/"+login+"/dashboard/pulls");
         List<GHRepository> r = new ArrayList<GHRepository>();
-        for (HtmlAnchor e : pg.getElementById("js-issue-list").<HtmlAnchor>selectNodes(".//UL[@class='smallnav']/LI[not(@class='zeroed')]/A")) {
+        for (GHRepository repository : listRepositories(100)) {
-            String a = e.getHrefAttribute();
+            repository.wrap(root);
-            String name = a.substring(a.lastIndexOf('/')+1);
+            List<GHPullRequest> pullRequests = repository.getPullRequests(GHIssueState.OPEN);
-            r.add(getRepository(name));
+            if (pullRequests.size() > 0) {
+                r.add(repository);
+            }
         }
         return r;
     }
@@ -124,4 +240,78 @@ public class GHOrganization extends GHPerson {
         }
         return all;
     }
+
+    /**
+     * Lists events performed by a user (this includes private events if the caller is authenticated.
+     */
+    public PagedIterable<GHEventInfo> listEvents() throws IOException {
+        return new PagedIterable<GHEventInfo>() {
+            public PagedIterator<GHEventInfo> _iterator(int pageSize) {
+                return new PagedIterator<GHEventInfo>(root.retrieve().asIterator(String.format("/orgs/%s/events", login), GHEventInfo[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHEventInfo[] page) {
+                        for (GHEventInfo c : page)
+                            c.wrapUp(root);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Lists up all the repositories using the specified page size.
+     *
+     * @param pageSize size for each page of items returned by GitHub. Maximum page size is 100.
+     *
+     * Unlike {@link #getRepositories()}, this does not wait until all the repositories are returned.
+     */
+    @Override
+    public PagedIterable<GHRepository> listRepositories(final int pageSize) {
+        return new PagedIterable<GHRepository>() {
+            public PagedIterator<GHRepository> _iterator(int pageSize) {
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/orgs/" + login + "/repos?per_page=" + pageSize, GHRepository[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHRepository[] page) {
+                        for (GHRepository c : page)
+                            c.wrap(root);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Retrieves the currently configured hooks.
+     */
+    public List<GHHook> getHooks() throws IOException {
+        return GHHooks.orgContext(this).getHooks();
+    }
+
+    public GHHook getHook(int id) throws IOException {
+        return GHHooks.orgContext(this).getHook(id);
+    }
+
+    /**
+     *
+     * See https://api.github.com/hooks for possible names and their configuration scheme.
+     * TODO: produce type-safe binding
+     *
+     * @param name
+     *      Type of the hook to be created. See https://api.github.com/hooks for possible names.
+     * @param config
+     *      The configuration hash.
+     * @param events
+     *      Can be null. Types of events to hook into.
+     */
+    public GHHook createHook(String name, Map<String,String> config, Collection<GHEvent> events, boolean active) throws IOException {
+        return GHHooks.orgContext(this).createHook(name, config, events, active);
+    }
+
+    public GHHook createWebHook(URL url, Collection<GHEvent> events) throws IOException {
+        return createHook("web", Collections.singletonMap("url", url.toExternalForm()),events,true);
+    }
+
+    public GHHook createWebHook(URL url) throws IOException {
+        return createWebHook(url, null);
+    }
 }

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

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2010, Kohsuke Kawaguchi
+ * Copyright 2016 CloudBees, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,24 +21,39 @@
  * 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.Locale;
-import java.util.Map;
-import java.util.TreeMap;
 
 /**
- * 
+ * Permission for a user in a repository.
+ * @see <a href="https://developer.github.com/v3/repos/collaborators/#review-a-users-permission-level">API</a>
  */
-class JsonOrganizations {
+/*package*/ class GHPermission {
-    public List<GHOrganization> organizations;
 
-    public Map<String,GHOrganization> wrap(GitHub root) {
+    private String permission;
-        Map<String,GHOrganization> map = new TreeMap<String, GHOrganization>();
+    private GHUser user;
-        for (GHOrganization o : organizations) {
+
-            o.root = root;
+    /**
-            map.put(o.getLogin(),o);
+     * @return one of {@code admin}, {@code write}, {@code read}, or {@code none}
-        }
+     */
-        return map;
+    public String getPermission() {
+        return permission;
     }
+
+    public GHPermissionType getPermissionType() {
+        return Enum.valueOf(GHPermissionType.class, permission.toUpperCase(Locale.ENGLISH));
+    }
+
+    public GHUser getUser() {
+        return user;
+    }
+
+    void wrapUp(GitHub root) {
+        if (user != null) {
+            user.root = root;
+        }
+    }
+
 }

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

@@ -0,0 +1,11 @@
+package org.kohsuke.github;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public enum GHPermissionType {
+    ADMIN,
+    WRITE,
+    READ,
+    NONE
+}

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

@@ -1,64 +1,114 @@
 package org.kohsuke.github;
 
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static org.kohsuke.github.ApiVersion.*;
-
 /**
  * Common part of {@link GHUser} and {@link GHOrganization}.
  * 
  * @author Kohsuke Kawaguchi
  */
-public abstract class GHPerson {
+public abstract class GHPerson extends GHObject {
     /*package almost final*/ GitHub root;
 
-    // common
+    // core data fields that exist even for "small" user data (such as the user info in pull request)
-    protected String login,location,blog,email,name,created_at,company;
+    protected String login, avatar_url, gravatar_id;
-    protected int id;
-    protected String gravatar_id; // appears in V3 as well but presumably subsumed by avatar_url?
 
-    // V2
+    // other fields (that only show up in full data)
-    protected int public_gist_count,public_repo_count,followers_count,following_count;
+    protected String location,blog,email,name,company;
-
+    protected String html_url;
-    // 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.
+     * Fully populate the data by retrieving missing data.
+     *
+     * Depending on the original API call where this object is created, it may not contain everything.
+     */
+    protected synchronized void populate() throws IOException {
+        if (created_at!=null) {
+            return; // already populated
+        }
+        if (root.isOffline()) {
+            return; // cannot populate, will have to live with what we have
+        }
+        root.retrieve().to(url, this);
+    }
+
+    /**
+     * Gets the public repositories this user owns.
+     *
+     * <p>
+     * To list your own repositories, including private repositories,
+     * use {@link GHMyself#listRepositories()}
      */
     public synchronized Map<String,GHRepository> getRepositories() throws IOException {
         Map<String,GHRepository> repositories = new TreeMap<String, GHRepository>();
-        for (List<GHRepository> batch : iterateRepositories(100)) {
+        for (GHRepository r : listRepositories(100)) {
-            for (GHRepository r : batch)
+            repositories.put(r.getName(),r);
-                repositories.put(r.getName(),r);
         }
         return Collections.unmodifiableMap(repositories);
     }
 
     /**
-     * Loads repository list in a pagenated fashion.
+     * Lists up all the repositories using a 30 items page size.
+     *
+     * Unlike {@link #getRepositories()}, this does not wait until all the repositories are returned.
+     */
+    public PagedIterable<GHRepository> listRepositories() {
+      return listRepositories(30);
+    }
+
+    /**
+     * Lists up all the repositories using the specified page size.
+     *
+     * @param pageSize size for each page of items returned by GitHub. Maximum page size is 100.
+     *
+     * Unlike {@link #getRepositories()}, this does not wait until all the repositories are returned.
+     */
+    public PagedIterable<GHRepository> listRepositories(final int pageSize) {
+        return new PagedIterable<GHRepository>() {
+            public PagedIterator<GHRepository> _iterator(int pageSize) {
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator("/users/" + login + "/repos?per_page=" + pageSize, GHRepository[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHRepository[] page) {
+                        for (GHRepository c : page)
+                            c.wrap(root);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Loads repository list in a paginated fashion.
      * 
      * <p>
-     * For a person with a lot of repositories, GitHub returns the list of repositories in a pagenated fashion.
+     * For a person with a lot of repositories, GitHub returns the list of repositories in a paginated 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}.
+     *
+     * @deprecated
+     *      Use {@link #listRepositories()}
      */
     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, V3);
+                final Iterator<GHRepository[]> pager = root.retrieve().asIterator("/users/" + login + "/repos?per_page="+pageSize,GHRepository[].class, pageSize);
 
                 return new Iterator<List<GHRepository>>() {
                     public boolean hasNext() {
@@ -87,12 +137,17 @@ public abstract class GHPerson {
      */
     public GHRepository getRepository(String name) throws IOException {
         try {
-            return root.retrieveWithAuth3("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
+            return root.retrieve().to("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
         } catch (FileNotFoundException e) {
             return null;
         }
     }
 
+    /**
+     * Lists events for an organization or an user.
+     */
+    public abstract PagedIterable<GHEventInfo> listEvents() throws IOException;
+
     /**
      * Gravatar ID of this user, like 0cb9832a01c22c083390f3c5dcb64105
      *
@@ -125,63 +180,75 @@ public abstract class GHPerson {
     /**
      * Gets the human-readable name of the user, like "Kohsuke Kawaguchi"
      */
-    public String getName() {
+    public String getName() throws IOException {
+        populate();
         return name;
     }
 
     /**
      * Gets the company name of this user, like "Sun Microsystems, Inc."
      */
-    public String getCompany() {
+    public String getCompany() throws IOException {
+        populate();
         return company;
     }
 
     /**
      * Gets the location of this user, like "Santa Clara, California"
      */
-    public String getLocation() {
+    public String getLocation() throws IOException {
+        populate();
         return location;
     }
 
-    public String getCreatedAt() {
+    public Date getCreatedAt() throws IOException {
-        return created_at;
+        populate();
+        return super.getCreatedAt();
+    }
+
+    public Date getUpdatedAt() throws IOException {
+        populate();
+        return super.getUpdatedAt();
     }
 
     /**
      * Gets the blog URL of this user.
      */
-    public String getBlog() {
+    public String getBlog() throws IOException {
+        populate();
         return blog;
     }
 
+    @Override
+    public URL getHtmlUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
     /**
      * Gets the e-mail address of the user.
      */
-    public String getEmail() {
+    public String getEmail() throws IOException {
+        populate();
         return email;
     }
 
-    public int getPublicGistCount() {
+    public int getPublicGistCount() throws IOException {
-        return Math.max(public_gist_count,public_gists);
+        populate();
+        return public_gists;
     }
 
-    public int getPublicRepoCount() {
+    public int getPublicRepoCount() throws IOException {
-        return Math.max(public_repo_count,public_repos);
+        populate();
+        return public_repos;
     }
 
-    public int getFollowingCount() {
+    public int getFollowingCount() throws IOException {
-        return Math.max(following_count,following);
+        populate();
+        return following;
     }
 
-    /**
+    public int getFollowersCount() throws IOException {
-     * What appears to be a GitHub internal unique number that identifies this user.
+        populate();
-     */
+        return followers;
-    public int getId() {
-        return id;
     }
-
-    public int getFollowersCount() {
-        return Math.max(followers_count,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;
 
@@ -8,7 +9,9 @@ import java.util.HashSet;
  * 
  * @author Kohsuke Kawaguchi
  */
-public final class GHPersonSet<T extends GHPerson> extends HashSet<T> {
+public class GHPersonSet<T extends GHPerson> extends HashSet<T> {
+    private static final long serialVersionUID = 1L;
+ 
     public GHPersonSet() {
     }
 
@@ -16,6 +19,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/GHPullRequest.java

@@ -23,21 +23,66 @@
  */
 package org.kohsuke.github;
 
+import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
+import java.util.List;
+import javax.annotation.CheckForNull;
+
+import static org.kohsuke.github.Previews.BLACK_CAT;
 
 /**
  * A pull request.
  * 
  * @author Kohsuke Kawaguchi
+ * @see GHRepository#getPullRequest(int)
  */
 @SuppressWarnings({"UnusedDeclaration"})
 public class GHPullRequest extends GHIssue {
-    private String closed_at, patch_url, issue_updated_at;
+
-    private GHUser issue_user, user;
+    private String patch_url, diff_url, issue_url;
-    // labels??
+    private GHCommitPointer base;
-    private GHCommitPointer base, head;
+    private String merged_at;
-    private String mergeable, diff_url;
+    private GHCommitPointer head;
+
+    // details that are only available when obtained from ID
+    private GHUser merged_by;
+    private int review_comments, additions;
+    private boolean merged;
+    private Boolean mergeable;
+    private int deletions;
+    private String mergeable_state;
+    private int changed_files;
+    private String merge_commit_sha;
+
+    /**
+     * GitHub doesn't return some properties of {@link GHIssue} when requesting the GET on the 'pulls' API
+     * route as opposed to 'issues' API route. This flag remembers whether we made the GET call on the 'issues' route
+     * on this object to fill in those missing details
+     */
+    private transient boolean fetchedIssueDetails;
+
+
+    GHPullRequest wrapUp(GHRepository owner) {
+        this.wrap(owner);
+        return wrapUp(owner.root);
+    }
+
+    GHPullRequest wrapUp(GitHub root) {
+        if (owner != null) owner.wrap(root);
+        if (base != null) base.wrapUp(root);
+        if (head != null) head.wrapUp(root);
+        if (merged_by != null) merged_by.wrapUp(root);
+        return this;
+    }
+
+    @Override
+    protected String getApiRoute() {
+        return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/pulls/"+number;
+    }
 
     /**
      * The URL of the patch file.
@@ -46,12 +91,13 @@ public class GHPullRequest extends GHIssue {
     public URL getPatchUrl() {
         return GitHub.parseURL(patch_url);
     }
-
+    
     /**
-     * User who submitted a pull request.
+     * The URL of the patch file.
+     * like https://github.com/jenkinsci/jenkins/pull/100.patch
      */
-    public GHUser getUser() {
+    public URL getIssueUrl() {
-        return user;
+        return GitHub.parseURL(issue_url);
     }
 
     /**
@@ -68,17 +114,10 @@ public class GHPullRequest extends GHIssue {
     public GHCommitPointer getHead() {
         return head;
     }
-
+    
-    public Date getIssueUpdatedAt() {
+    @Deprecated
-        return GitHub.parseDate(issue_updated_at);
+    public Date getIssueUpdatedAt() throws IOException {
-    }
+        return super.getUpdatedAt();
-
-    /**
-     * The HTML page of this pull request,
-     * like https://github.com/jenkinsci/jenkins/pull/100
-     */
-    public URL getUrl() {
-        return super.getUrl();
     }
 
     /**
@@ -89,22 +128,255 @@ public class GHPullRequest extends GHIssue {
         return GitHub.parseURL(diff_url);
     }
 
-    public Date getClosedAt() {
+    public Date getMergedAt() {
-        return GitHub.parseDate(closed_at);
+        return GitHub.parseDate(merged_at);
     }
 
-    GHPullRequest wrapUp(GHRepository owner) {
+    @Override
-        this.owner = owner;
+    public Collection<GHLabel> getLabels() throws IOException {
-        return wrapUp(owner.root);
+        fetchIssue();
+        return super.getLabels();
     }
 
-    GHPullRequest wrapUp(GitHub root) {
+    @Override
-        this.root = root;
+    public GHUser getClosedBy() {
-        if (owner!=null)    owner.wrap(root);
+        return null;
-        if (issue_user!=null)   issue_user.root=root;
+    }
-        if (user!=null)     user.root=root;
+
-        if (base!=null)     base.wrapUp(root);
+    @Override
-        if (head!=null)     head.wrapUp(root);
+    public PullRequest getPullRequest() {
-        return this;
+        return null;
+    }
+
+    //
+    // details that are only available via get with ID
+    //
+
+    public GHUser getMergedBy() throws IOException {
+        populate();
+        return merged_by;
+    }
+
+    public int getReviewComments() throws IOException {
+        populate();
+        return review_comments;
+    }
+
+    public int getAdditions() throws IOException {
+        populate();
+        return additions;
+    }
+
+    public boolean isMerged() throws IOException {
+        populate();
+        return merged;
+    }
+
+    public Boolean getMergeable() throws IOException {
+        populate();
+        return mergeable;
+    }
+
+    public int getDeletions() throws IOException {
+        populate();
+        return deletions;
+    }
+
+    public String getMergeableState() throws IOException {
+        populate();
+        return mergeable_state;
+    }
+
+    public int getChangedFiles() throws IOException {
+        populate();
+        return changed_files;
+    }
+
+    /**
+     * See <a href="https://developer.github.com/changes/2013-04-25-deprecating-merge-commit-sha">GitHub blog post</a>
+     */
+    public String getMergeCommitSha() throws IOException {
+        populate();
+        return merge_commit_sha;
+    }
+
+    /**
+     * Fully populate the data by retrieving missing data.
+     *
+     * Depending on the original API call where this object is created, it may not contain everything.
+     */
+    private void populate() throws IOException {
+        if (merged_by!=null)    return; // already populated
+        if (root.isOffline()) {
+            return; // cannot populate, will have to live with what we have
+        }
+        root.retrieve().to(url, this).wrapUp(owner);
+    }
+
+    /**
+     * Retrieves all the files associated to this pull request.
+     */
+    public PagedIterable<GHPullRequestFileDetail> listFiles() {
+        return new PagedIterable<GHPullRequestFileDetail>() {
+            public PagedIterator<GHPullRequestFileDetail> _iterator(int pageSize) {
+                return new PagedIterator<GHPullRequestFileDetail>(root.retrieve().asIterator(String.format("%s/files", getApiRoute()),
+                        GHPullRequestFileDetail[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHPullRequestFileDetail[] page) {
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Retrieves all the reviews associated to this pull request.
+     */
+    public PagedIterable<GHPullRequestReview> listReviews() {
+        return new PagedIterable<GHPullRequestReview>() {
+            public PagedIterator<GHPullRequestReview> _iterator(int pageSize) {
+                return new PagedIterator<GHPullRequestReview>(root.retrieve()
+                        .withPreview(BLACK_CAT)
+                        .asIterator(String.format("%s/reviews", getApiRoute()),
+                        GHPullRequestReview[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHPullRequestReview[] page) {
+                        for (GHPullRequestReview r: page) {
+                            r.wrapUp(GHPullRequest.this);
+                        }
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Obtains all the review comments associated with this pull request.
+     */
+    public PagedIterable<GHPullRequestReviewComment> listReviewComments() throws IOException {
+        return new PagedIterable<GHPullRequestReviewComment>() {
+            public PagedIterator<GHPullRequestReviewComment> _iterator(int pageSize) {
+                return new PagedIterator<GHPullRequestReviewComment>(root.retrieve().asIterator(getApiRoute() + "/comments",
+                        GHPullRequestReviewComment[].class, pageSize)) {
+                    protected void wrapUp(GHPullRequestReviewComment[] page) {
+                        for (GHPullRequestReviewComment c : page)
+                            c.wrapUp(GHPullRequest.this);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Retrieves all the commits associated to this pull request.
+     */
+    public PagedIterable<GHPullRequestCommitDetail> listCommits() {
+        return new PagedIterable<GHPullRequestCommitDetail>() {
+            public PagedIterator<GHPullRequestCommitDetail> _iterator(int pageSize) {
+                return new PagedIterator<GHPullRequestCommitDetail>(root.retrieve().asIterator(
+                        String.format("%s/commits", getApiRoute()),
+                        GHPullRequestCommitDetail[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHPullRequestCommitDetail[] page) {
+                        for (GHPullRequestCommitDetail c : page)
+                            c.wrapUp(GHPullRequest.this);
+                    }
+                };
+            }
+        };
+    }
+
+    @Preview
+    @Deprecated
+    public GHPullRequestReview createReview(String body, @CheckForNull GHPullRequestReviewState event,
+                                            GHPullRequestReviewComment... comments)
+            throws IOException {
+        return createReview(body, event, Arrays.asList(comments));
+    }
+
+    @Preview
+    @Deprecated
+    public GHPullRequestReview createReview(String body, @CheckForNull GHPullRequestReviewState event,
+                                            List<GHPullRequestReviewComment> comments)
+            throws IOException {
+//        if (event == null) {
+//            event = GHPullRequestReviewState.PENDING;
+//        }
+        List<DraftReviewComment> draftComments = new ArrayList<DraftReviewComment>(comments.size());
+        for (GHPullRequestReviewComment c : comments) {
+            draftComments.add(new DraftReviewComment(c.getBody(), c.getPath(), c.getPosition()));
+        }
+        return new Requester(root).method("POST")
+                .with("body", body)
+                //.with("event", event.name())
+                ._with("comments", draftComments)
+                .withPreview(BLACK_CAT)
+                .to(getApiRoute() + "/reviews", GHPullRequestReview.class).wrapUp(this);
+    }
+
+    public GHPullRequestReviewComment createReviewComment(String body, String sha, String path, int position) throws IOException {
+        return new Requester(root).method("POST")
+                .with("body", body)
+                .with("commit_id", sha)
+                .with("path", path)
+                .with("position", position)
+                .to(getApiRoute() + "/comments", GHPullRequestReviewComment.class).wrapUp(this);
+    }
+
+    /**
+     * Merge this pull request.
+     *
+     * The equivalent of the big green "Merge pull request" button.
+     *
+     * @param msg
+     *      Commit message. If null, the default one will be used.
+     */
+    public void merge(String msg) throws IOException {
+        merge(msg,null);
+    }
+
+    /**
+     * Merge this pull request.
+     *
+     * The equivalent of the big green "Merge pull request" button.
+     *
+     * @param msg
+     *      Commit message. If null, the default one will be used.
+     * @param sha
+     *      SHA that pull request head must match to allow merge.
+     */
+    public void merge(String msg, String sha) throws IOException {
+        new Requester(root).method("PUT").with("commit_message",msg).with("sha",sha).to(getApiRoute()+"/merge");
+    }
+
+    private void fetchIssue() throws IOException {
+        if (!fetchedIssueDetails) {
+            new Requester(root).to(getIssuesApiRoute(), this);
+            fetchedIssueDetails = true;
+        }
+    }
+
+    private static class DraftReviewComment {
+        private String body;
+        private String path;
+        private int position;
+
+        public DraftReviewComment(String body, String path, int position) {
+            this.body = body;
+            this.path = path;
+            this.position = position;
+        }
+
+        public String getBody() {
+            return body;
+        }
+
+        public String getPath() {
+            return path;
+        }
+
+        public int getPosition() {
+            return position;
+        }
     }
 }

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

@@ -0,0 +1,150 @@
+/*
+ * The MIT License
+ * 
+ * Copyright (c) 2013, Luca Milanesio
+ * 
+ * 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 com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.net.URL;
+
+/**
+ * Commit detail inside a {@link GHPullRequest}.
+ * 
+ * @author Luca Milanesio
+ * @see GHPullRequest#listCommits()
+ */
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD", "URF_UNREAD_FIELD"}, justification = "JSON API")
+public class GHPullRequestCommitDetail {
+    private GHPullRequest owner;
+
+    /*package*/ void wrapUp(GHPullRequest owner) {
+        this.owner = owner;
+    }
+
+    /**
+     * @deprecated Use {@link GitUser}
+     */
+    public static class Authorship extends GitUser {
+    }
+
+    public static class Tree {
+        String sha;
+        String url;
+
+        public String getSha() {
+            return sha;
+        }
+
+        public URL getUrl() {
+            return GitHub.parseURL(url);
+        }
+    }
+
+    public static class Commit {
+        Authorship author;
+        Authorship committer;
+        String message;
+        Tree tree;
+        String url;
+        int comment_count;
+
+        @WithBridgeMethods(value = Authorship.class, castRequired = true)
+        public GitUser getAuthor() {
+            return author;
+        }
+
+        @WithBridgeMethods(value = Authorship.class, castRequired = true)
+        public GitUser getCommitter() {
+            return committer;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public URL getUrl() {
+            return GitHub.parseURL(url);
+        }
+
+        public int getComment_count() {
+            return comment_count;
+        }
+
+        public Tree getTree() {
+            return tree;
+        }
+    }
+
+    public static class CommitPointer {
+        String sha;
+        String url;
+        String html_url;
+
+        public URL getUrl() {
+            return GitHub.parseURL(url);
+        }
+
+        public URL getHtml_url() {
+            return GitHub.parseURL(html_url);
+        }
+
+        public String getSha() {
+            return sha;
+        }
+    }
+
+    String sha;
+    Commit commit;
+    String url;
+    String html_url;
+    String comments_url;
+    CommitPointer[] parents;
+
+    public String getSha() {
+        return sha;
+    }
+
+    public Commit getCommit() {
+        return commit;
+    }
+
+    public URL getApiUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    public URL getUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
+    public URL getCommentsUrl() {
+        return GitHub.parseURL(comments_url);
+    }
+
+    public CommitPointer[] getParents() {
+        CommitPointer[] newValue = new CommitPointer[parents.length];
+        System.arraycopy(parents, 0, newValue, 0, parents.length);
+        return newValue;
+    }
+}

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

@@ -0,0 +1,86 @@
+/*
+ * The MIT License
+ * 
+ * Copyright (c) 2015, Julien Henry
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.kohsuke.github;
+
+import java.net.URL;
+
+/**
+ * File detail inside a {@link GHPullRequest}.
+ * 
+ * @author Julien Henry
+ * @see GHPullRequest#listFiles()
+ */
+public class GHPullRequestFileDetail {
+
+    String sha;
+    String filename;
+    String status;
+    int additions;
+    int deletions;
+    int changes;
+    String blob_url;
+    String raw_url;
+    String contents_url;
+    String patch;
+
+    public String getSha() {
+        return sha;
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public int getAdditions() {
+        return additions;
+    }
+
+    public int getDeletions() {
+        return deletions;
+    }
+
+    public int getChanges() {
+        return changes;
+    }
+
+    public URL getBlobUrl() {
+        return GitHub.parseURL(blob_url);
+    }
+
+    public URL getRawUrl() {
+        return GitHub.parseURL(raw_url);
+    }
+
+    public URL getContentsUrl() {
+        return GitHub.parseURL(contents_url);
+    }
+
+    public String getPatch() {
+        return patch;
+    }
+}

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

@@ -0,0 +1,58 @@
+package org.kohsuke.github;
+
+/**
+ * Lists up pull requests with some filtering and sorting.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHRepository#queryPullRequests()
+ */
+public class GHPullRequestQueryBuilder extends GHQueryBuilder<GHPullRequest> {
+    private final GHRepository repo;
+
+    /*package*/ GHPullRequestQueryBuilder(GHRepository repo) {
+        super(repo.root);
+        this.repo = repo;
+    }
+
+    public GHPullRequestQueryBuilder state(GHIssueState state) {
+        req.with("state",state);
+        return this;
+    }
+
+    public GHPullRequestQueryBuilder head(String head) {
+        req.with("head",head);
+        return this;
+    }
+
+    public GHPullRequestQueryBuilder base(String base) {
+        req.with("base",base);
+        return this;
+    }
+
+    public GHPullRequestQueryBuilder sort(Sort sort) {
+        req.with("sort",sort);
+        return this;
+    }
+
+    public enum Sort { CREATED, UPDATED, POPULARITY, LONG_RUNNING }
+
+    public GHPullRequestQueryBuilder direction(GHDirection d) {
+        req.with("direction",d);
+        return this;
+    }
+
+    @Override
+    public PagedIterable<GHPullRequest> list() {
+        return new PagedIterable<GHPullRequest>() {
+            public PagedIterator<GHPullRequest> _iterator(int pageSize) {
+                return new PagedIterator<GHPullRequest>(req.asIterator(repo.getApiTailUrl("pulls"), GHPullRequest[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHPullRequest[] page) {
+                        for (GHPullRequest pr : page)
+                            pr.wrapUp(repo);
+                    }
+                };
+            }
+        };
+    }
+}

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

@@ -0,0 +1,149 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+
+import static org.kohsuke.github.Previews.BLACK_CAT;
+
+/**
+ * Review to the pull request
+ *
+ * @see GHPullRequest#listReviews()
+ * @see GHPullRequest#createReview(String, GHPullRequestReviewState, GHPullRequestReviewComment...)
+ */
+public class GHPullRequestReview extends GHObject {
+    GHPullRequest owner;
+
+    private String body;
+    private GHUser user;
+    private String commit_id;
+    private GHPullRequestReviewState state;
+
+    /*package*/ GHPullRequestReview wrapUp(GHPullRequest owner) {
+        this.owner = owner;
+        return this;
+    }
+
+    /**
+     * Gets the pull request to which this review is associated.
+     */
+    public GHPullRequest getParent() {
+        return owner;
+    }
+
+    /**
+     * The comment itself.
+     */
+    public String getBody() {
+        return body;
+    }
+
+    /**
+     * Gets the user who posted this review.
+     */
+    public GHUser getUser() throws IOException {
+        return owner.root.getUser(user.getLogin());
+    }
+
+    public String getCommitId() {
+        return commit_id;
+    }
+
+    public GHPullRequestReviewState getState() {
+        return state;
+    }
+
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    protected String getApiRoute() {
+        return owner.getApiRoute()+"/reviews/"+id;
+    }
+
+    /**
+     * Updates the comment.
+     */
+    @Preview
+    @Deprecated
+    public void submit(String body, GHPullRequestReviewState event) throws IOException {
+        new Requester(owner.root).method("POST")
+                .with("body", body)
+                .with("event", event.action())
+                .withPreview("application/vnd.github.black-cat-preview+json")
+                .to(getApiRoute()+"/events",this);
+        this.body = body;
+        this.state = event;
+    }
+
+    /**
+     * Deletes this review.
+     */
+    @Preview
+    @Deprecated
+    public void delete() throws IOException {
+        new Requester(owner.root).method("DELETE")
+                .withPreview(BLACK_CAT)
+                .to(getApiRoute());
+    }
+
+    /**
+     * Dismisses this review.
+     */
+    @Preview
+    @Deprecated
+    public void dismiss(String message) throws IOException {
+        new Requester(owner.root).method("PUT")
+                .with("message", message)
+                .withPreview(BLACK_CAT)
+                .to(getApiRoute()+"/dismissals");
+        state = GHPullRequestReviewState.DISMISSED;
+    }
+
+    /**
+     * Obtains all the review comments associated with this pull request review.
+     */
+    @Preview
+    @Deprecated
+    public PagedIterable<GHPullRequestReviewComment> listReviewComments() throws IOException {
+        return new PagedIterable<GHPullRequestReviewComment>() {
+            public PagedIterator<GHPullRequestReviewComment> _iterator(int pageSize) {
+                return new PagedIterator<GHPullRequestReviewComment>(
+                        owner.root.retrieve()
+                                .withPreview(BLACK_CAT)
+                                .asIterator(getApiRoute() + "/comments",
+                                GHPullRequestReviewComment[].class, pageSize)) {
+                    protected void wrapUp(GHPullRequestReviewComment[] page) {
+                        for (GHPullRequestReviewComment c : page)
+                            c.wrapUp(owner);
+                    }
+                };
+            }
+        };
+    }
+
+}

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

@@ -0,0 +1,139 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2010, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+
+import static org.kohsuke.github.Previews.*;
+
+/**
+ * Review comment to the pull request
+ *
+ * @author Julien Henry
+ * @see GHPullRequest#listReviewComments()
+ * @see GHPullRequest#createReviewComment(String, String, String, int)
+ */
+public class GHPullRequestReviewComment extends GHObject implements Reactable {
+    GHPullRequest owner;
+
+    private String body;
+    private GHUser user;
+    private String path;
+    private int position;
+    private int originalPosition;
+
+    public static GHPullRequestReviewComment draft(String body, String path, int position) {
+        GHPullRequestReviewComment result = new GHPullRequestReviewComment();
+        result.body = body;
+        result.path = path;
+        result.position = position;
+        return result;
+    }
+
+    /*package*/ GHPullRequestReviewComment wrapUp(GHPullRequest owner) {
+        this.owner = owner;
+        return this;
+    }
+
+    /**
+     * Gets the pull request to which this review comment is associated.
+     */
+    public GHPullRequest getParent() {
+        return owner;
+    }
+
+    /**
+     * The comment itself.
+     */
+    public String getBody() {
+        return body;
+    }
+
+    /**
+     * Gets the user who posted this comment.
+     */
+    public GHUser getUser() throws IOException {
+        return owner.root.getUser(user.getLogin());
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public int getOriginalPosition() {
+        return originalPosition;
+    }
+
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    protected String getApiRoute() {
+        return "/repos/"+owner.getRepository().getFullName()+"/pulls/comments/"+id;
+    }
+
+    /**
+     * Updates the comment.
+     */
+    public void update(String body) throws IOException {
+        new Requester(owner.root).method("PATCH").with("body", body).to(getApiRoute(),this);
+        this.body = body;
+    }
+
+    /**
+     * Deletes this review comment.
+     */
+    public void delete() throws IOException {
+        new Requester(owner.root).method("DELETE").to(getApiRoute());
+    }
+
+    @Preview @Deprecated
+    public GHReaction createReaction(ReactionContent content) throws IOException {
+        return new Requester(owner.root)
+                .withPreview(SQUIRREL_GIRL)
+                .with("content", content.getContent())
+                .to(getApiRoute()+"/reactions", GHReaction.class).wrap(owner.root);
+    }
+
+    @Preview @Deprecated
+    public PagedIterable<GHReaction> listReactions() {
+        return new PagedIterable<GHReaction>() {
+            public PagedIterator<GHReaction> _iterator(int pageSize) {
+                return new PagedIterator<GHReaction>(owner.root.retrieve().withPreview(SQUIRREL_GIRL).asIterator(getApiRoute()+"/reactions", GHReaction[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHReaction[] page) {
+                        for (GHReaction c : page)
+                            c.wrap(owner.root);
+                    }
+                };
+            }
+        };
+    }
+}

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

@@ -0,0 +1,19 @@
+package org.kohsuke.github;
+
+public enum GHPullRequestReviewState {
+    PENDING(null),
+    APPROVED("APPROVE"),
+    REQUEST_CHANGES("REQUEST_CHANGES"),
+    COMMENTED("COMMENT"),
+    DISMISSED(null);
+
+    private final String _action;
+
+    GHPullRequestReviewState(String action) {
+        _action = action;
+    }
+
+    public String action() {
+        return _action;
+    }
+}

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

@@ -0,0 +1,21 @@
+package org.kohsuke.github;
+
+/**
+ * Used to specify filters, sort order, etc for listing items in a collection.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class GHQueryBuilder<T> {
+    protected final GitHub root;
+    protected final Requester req;
+
+    /*package*/ GHQueryBuilder(GitHub root) {
+        this.root = root;
+        this.req = root.retrieve();
+    }
+
+    /**
+     * Start listing items by using the settings built up on this object.
+     */
+    public abstract PagedIterable<T> list();
+}

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

@@ -0,0 +1,42 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.Date;
+
+/**
+ * Rate limit.
+ * @author Kohsuke Kawaguchi
+ */
+public class GHRateLimit {
+    /**
+     * Remaining calls that can be made.
+     */
+    public int remaining;
+    /**
+     * Allotted API call per hour.
+     */
+    public int limit;
+
+    /**
+     * The time at which the current rate limit window resets in UTC epoch seconds.
+     */
+    public Date reset;
+
+    /**
+     * Non-epoch date
+     */
+    @SuppressFBWarnings(value = "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR", 
+            justification = "The value comes from JSON deserialization")
+    public Date getResetDate() {
+        return new Date(reset.getTime() * 1000);
+    }
+
+    @Override
+    public String toString() {
+        return "GHRateLimit{" +
+                "remaining=" + remaining +
+                ", limit=" + limit +
+                ", resetDate=" + getResetDate() +
+                '}';
+    }
+}

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

@@ -0,0 +1,55 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+
+import static org.kohsuke.github.Previews.SQUIRREL_GIRL;
+
+/**
+ * Reaction to issue, comment, PR, and so on.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see Reactable
+ */
+@Preview @Deprecated
+public class GHReaction extends GHObject {
+    private GitHub root;
+
+    private GHUser user;
+    private ReactionContent content;
+
+    /*package*/ GHReaction wrap(GitHub root) {
+        this.root = root;
+        user.wrapUp(root);
+        return this;
+    }
+
+    /**
+     * The kind of reaction left.
+     */
+    public ReactionContent getContent() {
+        return content;
+    }
+
+    /**
+     * User who left the reaction.
+     */
+    public GHUser getUser() {
+        return user;
+    }
+
+    /**
+     * Reaction has no HTML URL. Don't call this method.
+     */
+    @Deprecated
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    /**
+     * Removes this reaction.
+     */
+    public void delete() throws IOException {
+        new Requester(root).method("DELETE").withPreview(SQUIRREL_GIRL).to("/reactions/"+id);
+    }
+}

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

@@ -0,0 +1,107 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.IOException;
+import java.net.URL;
+
+/**
+ * Provides information on a Git ref from GitHub.
+ *
+ * @author Michael Clarke
+ */
+public class GHRef {
+    /*package almost final*/ GitHub root;
+
+    private String ref, url;
+    private GHObject object;
+
+    /**
+     * Name of the ref, such as "refs/tags/abc"
+     */
+    public String getRef() {
+        return ref;
+    }
+
+    /**
+     * The API URL of this tag, such as https://api.github.com/repos/jenkinsci/jenkins/git/refs/tags/1.312
+     */
+    public URL getUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    /**
+     * The object that this ref points to.
+     */
+    public GHObject getObject() {
+        return object;
+    }
+
+    /**
+     * Updates this ref to the specified commit.
+     *
+     * @param sha
+     *      The SHA1 value to set this reference to
+     */
+    public void updateTo(String sha) throws IOException {
+      updateTo(sha, false);
+    }
+
+    /**
+     * Updates this ref to the specified commit.
+     *
+     * @param sha
+     *      The SHA1 value to set this reference to
+     * @param force
+     *      Whether or not to force this ref update.
+     */
+    public void updateTo(String sha, Boolean force) throws IOException {
+      new Requester(root)
+          .with("sha", sha).with("force", force).method("PATCH").to(url, GHRef.class).wrap(root);
+    }
+
+    /**
+     * Deletes this ref from the repository using the GitHub API.
+     */
+    public void delete() throws IOException {
+      new Requester(root).method("DELETE").to(url);
+    }
+
+    /*package*/ GHRef wrap(GitHub root) {
+        this.root = root;
+        return this;
+    }
+
+    /*package*/ static GHRef[] wrap(GHRef[] in, GitHub root) {
+        for (GHRef r : in) {
+            r.wrap(root);
+        }
+        return in;
+    }
+
+    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+    public static class GHObject {
+         private String type, sha, url;
+
+        /**
+         * Type of the object, such as "commit"
+         */
+        public String getType() {
+            return type;
+        }
+
+        /**
+         * SHA1 of this object.
+         */
+        public String getSha() {
+            return sha;
+        }
+
+        /**
+         * API URL to this Git data, such as https://api.github.com/repos/jenkinsci/jenkins/git/commits/b72322675eb0114363a9a86e9ad5a170d1d07ac0
+         */
+        public URL getUrl() {
+            return GitHub.parseURL(url);
+        }
+    }
+}

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

@@ -0,0 +1,161 @@
+package org.kohsuke.github;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import static java.lang.String.format;
+
+/**
+ * Release in a github repository.
+ *
+ * @see GHRepository#getReleases()
+ * @see GHRepository#createRelease(String)
+ */
+public class GHRelease extends GHObject {
+    GitHub root;
+    GHRepository owner;
+
+    private String html_url;
+    private String assets_url;
+    private String upload_url;
+    private String tag_name;
+    private String target_commitish;
+    private String name;
+    private String body;
+    private boolean draft;
+    private boolean prerelease;
+    private Date published_at;
+    private String tarball_url;
+    private String zipball_url;
+
+    public String getAssetsUrl() {
+        return assets_url;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public boolean isDraft() {
+        return draft;
+    }
+
+    public GHRelease setDraft(boolean draft) throws IOException {
+      edit("draft", draft);
+      this.draft = draft;
+      return this;
+    }
+
+    public URL getHtmlUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public GHRepository getOwner() {
+        return owner;
+    }
+
+    public void setOwner(GHRepository owner) {
+        this.owner = owner;
+    }
+
+    public boolean isPrerelease() {
+        return prerelease;
+    }
+
+    public Date getPublished_at() {
+        return new Date(published_at.getTime());
+    }
+
+    public GitHub getRoot() {
+        return root;
+    }
+
+    public String getTagName() {
+        return tag_name;
+    }
+
+    public String getTargetCommitish() {
+        return target_commitish;
+    }
+
+    public String getUploadUrl() {
+        return upload_url;
+    }
+
+    public String getZipballUrl() {
+        return zipball_url;
+    }
+
+    public String getTarballUrl() {
+        return tarball_url;
+    }
+
+    GHRelease wrap(GHRepository owner) {
+        this.owner = owner;
+        this.root = owner.root;
+        return this;
+    }
+
+    static GHRelease[] wrap(GHRelease[] releases, GHRepository owner) {
+        for (GHRelease release : releases) {
+            release.wrap(owner);
+        }
+        return releases;
+    }
+
+    /**
+     * Because github relies on SNI (http://en.wikipedia.org/wiki/Server_Name_Indication) this method will only work on
+     * Java 7 or greater.  Options for fixing this for earlier JVMs can be found here
+     * http://stackoverflow.com/questions/12361090/server-name-indication-sni-on-java but involve more complicated
+     * handling of the HTTP requests to github's API.
+         */
+    public GHAsset uploadAsset(File file, String contentType) throws IOException {
+        Requester builder = new Requester(owner.root);
+
+        String url = format("https://uploads.github.com%s/releases/%d/assets?name=%s",
+                owner.getApiTailUrl(""), getId(), file.getName());
+        return builder.contentType(contentType)
+                .with(new FileInputStream(file))
+                .to(url, GHAsset.class).wrap(this);
+    }
+
+    public List<GHAsset> getAssets() throws IOException {
+        Requester builder = new Requester(owner.root);
+
+        GHAsset[] assets = builder
+                .method("GET")
+                .to(getApiTailUrl("assets"), GHAsset[].class);
+        return Arrays.asList(GHAsset.wrap(assets, this));
+    }
+
+    /**
+     * Deletes this release.
+     */
+    public void delete() throws IOException {
+        new Requester(root).method("DELETE").to(owner.getApiTailUrl("releases/"+id));
+    }
+
+    /**
+     * Edit this release.
+     */
+    private void edit(String key, Object value) throws IOException {
+        new Requester(root)._with(key, value).method("PATCH").to(owner.getApiTailUrl("releases/"+id));
+    }
+
+    private String getApiTailUrl(String end) {
+        return owner.getApiTailUrl(format("releases/%s/%s",id,end));
+    }
+}

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

@@ -0,0 +1,79 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+/**
+ * Builder pattern for creating a {@link GHRelease}
+ *
+ * @see GHRepository#createRelease(String)
+ */
+public class GHReleaseBuilder {
+    private final GHRepository repo;
+    private final Requester builder;
+
+    public GHReleaseBuilder(GHRepository ghRepository, String tag) {
+        this.repo = ghRepository;
+        this.builder = new Requester(repo.root);
+        builder.with("tag_name", tag);
+    }
+
+    /**
+     * @param body The release notes body.
+     */
+    public GHReleaseBuilder body(String body) {
+        if (body != null) {
+            builder.with("body", body);
+        }
+        return this;
+    }
+
+    /**
+     * Specifies the commitish value that determines where the Git tag is created from. Can be any branch or
+     * commit SHA.
+     *
+     * @param commitish Defaults to the repository’s default branch (usually "master"). Unused if the Git tag
+     *                  already exists.
+     */
+    public GHReleaseBuilder commitish(String commitish) {
+        if (commitish != null) {
+            builder.with("target_commitish", commitish);
+        }
+        return this;
+    }
+
+    /**
+     * Optional.
+     *
+     * @param draft {@code true} to create a draft (unpublished) release, {@code false} to create a published one.
+     *                          Default is {@code false}.
+     */
+    public GHReleaseBuilder draft(boolean draft) {
+        builder.with("draft", draft);
+        return this;
+    }
+
+    /**
+     * @param name the name of the release
+     */
+    public GHReleaseBuilder name(String name) {
+        if (name != null) {
+            builder.with("name", name);
+        }
+        return this;
+    }
+
+    /**
+     * Optional
+     *
+     * @param prerelease {@code true} to identify the release as a prerelease. {@code false} to identify the release
+     *                               as a full release. Default is {@code false}.
+     */
+    public GHReleaseBuilder prerelease(boolean prerelease) {
+        builder.with("prerelease", prerelease);
+        return this;
+    }
+
+    public GHRelease create() throws IOException {
+        return builder.to(repo.getApiTailUrl("releases"), GHRelease.class).wrap(repo);
+    }
+}

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

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

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

@@ -0,0 +1,87 @@
+package org.kohsuke.github;
+
+import java.util.Locale;
+
+/**
+ * Search repositories.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GitHub#searchRepositories()
+ */
+public class GHRepositorySearchBuilder extends GHSearchBuilder<GHRepository> {
+    /*package*/ GHRepositorySearchBuilder(GitHub root) {
+        super(root,RepositorySearchResult.class);
+    }
+
+    /**
+     * Search terms.
+     */
+    public GHRepositorySearchBuilder q(String term) {
+        super.q(term);
+        return this;
+    }
+
+    public GHRepositorySearchBuilder in(String v) {
+        return q("in:"+v);
+    }
+
+    public GHRepositorySearchBuilder size(String v) {
+        return q("size:"+v);
+    }
+
+    public GHRepositorySearchBuilder forks(String v) {
+        return q("forks:"+v);
+    }
+
+    public GHRepositorySearchBuilder created(String v) {
+        return q("created:"+v);
+    }
+
+    public GHRepositorySearchBuilder pushed(String v) {
+        return q("pushed:"+v);
+    }
+
+    public GHRepositorySearchBuilder user(String v) {
+        return q("user:"+v);
+    }
+
+    public GHRepositorySearchBuilder repo(String v) {
+        return q("repo:"+v);
+    }
+
+    public GHRepositorySearchBuilder language(String v) {
+        return q("language:"+v);
+    }
+
+    public GHRepositorySearchBuilder stars(String v) {
+        return q("stars:"+v);
+    }
+
+    public GHRepositorySearchBuilder order(GHDirection v) {
+        req.with("order",v);
+        return this;
+    }
+
+    public GHRepositorySearchBuilder sort(Sort sort) {
+        req.with("sort",sort);
+        return this;
+    }
+
+    public enum Sort { STARS, FORKS, UPDATED }
+
+    private static class RepositorySearchResult extends SearchResult<GHRepository> {
+        private GHRepository[] items;
+
+        @Override
+        /*package*/ GHRepository[] getItems(GitHub root) {
+            for (GHRepository item : items)
+                item.wrap(root);
+            return items;
+        }
+    }
+
+    @Override
+    protected String getApiUrl() {
+        return "/search/repositories";
+    }
+}

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

@@ -0,0 +1,52 @@
+package org.kohsuke.github;
+
+import org.apache.commons.lang.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Base class for various search builders.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public abstract class GHSearchBuilder<T> extends GHQueryBuilder<T> {
+    protected final List<String> terms = new ArrayList<String>();
+
+    /**
+     * Data transfer object that receives the result of search.
+     */
+    private final Class<? extends SearchResult<T>> receiverType;
+
+    /*package*/ GHSearchBuilder(GitHub root, Class<? extends SearchResult<T>> receiverType) {
+        super(root);
+        this.receiverType = receiverType;
+    }
+
+    /**
+     * Search terms.
+     */
+    public GHQueryBuilder<T> q(String term) {
+        terms.add(term);
+        return this;
+    }
+
+    /**
+     * Performs the search.
+     */
+    @Override
+    public PagedSearchIterable<T> list() {
+        return new PagedSearchIterable<T>(root) {
+            public PagedIterator<T> _iterator(int pageSize) {
+                req.set("q", StringUtils.join(terms, " "));
+                return new PagedIterator<T>(adapt(req.asIterator(getApiUrl(), receiverType, pageSize))) {
+                    protected void wrapUp(T[] page) {
+                        // SearchResult.getItems() should do it
+                    }
+                };
+            }
+        };
+    }
+
+    protected abstract String getApiUrl();
+}

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

@@ -0,0 +1,51 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.util.Date;
+
+/**
+ * A stargazer at a repository on GitHub.
+ *
+ * @author noctarius
+ */
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+public class GHStargazer {
+
+    private GHRepository repository;
+    private String starred_at;
+    private GHUser user;
+
+    /**
+     * Gets the repository that is stargazed
+     *
+     * @return the starred repository
+     */
+    public GHRepository getRepository() {
+        return repository;
+    }
+
+    /**
+     * Gets the date when the repository was starred, however old stars before
+     * August 2012, will all show the date the API was changed to support starred_at.
+     *
+     * @return the date the stargazer was added
+     */
+    public Date getStarredAt() {
+        return GitHub.parseDate(starred_at);
+    }
+
+    /**
+     * Gets the user that starred the repository
+     *
+     * @return the stargazer user
+     */
+    public GHUser getUser() {
+        return user;
+    }
+
+    void wrapUp(GHRepository repository) {
+        this.repository = repository;
+        user.wrapUp(repository.root);
+    }
+}

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

@@ -0,0 +1,64 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * Represents your subscribing to a repository / conversation thread..
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GHRepository#getSubscription()
+ * @see GHThread#getSubscription()
+ */
+public class GHSubscription {
+    private String created_at, url, repository_url, reason;
+    private boolean subscribed, ignored;
+
+    private GitHub root;
+    private GHRepository repo;
+
+    public Date getCreatedAt() {
+        return GitHub.parseDate(created_at);
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getRepositoryUrl() {
+        return repository_url;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public boolean isSubscribed() {
+        return subscribed;
+    }
+
+    public boolean isIgnored() {
+        return ignored;
+    }
+
+    public GHRepository getRepository() {
+        return repo;
+    }
+
+    /**
+     * Removes this subscription.
+     */
+    public void delete() throws IOException {
+        new Requester(root).method("DELETE").to(url);
+    }
+
+    GHSubscription wrapUp(GHRepository repo) {
+        this.repo = repo;
+        return wrapUp(repo.root);
+    }
+
+    GHSubscription wrapUp(GitHub root) {
+        this.root = root;
+        return this;
+    }
+}

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

@@ -0,0 +1,42 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Represents a tag in {@link GHRepository}
+ *
+ * @see GHRepository#listTags()
+ */
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+public class GHTag {
+    private GHRepository owner;
+    private GitHub root;
+
+    private String name;
+    private GHCommit commit;
+
+    /*package*/ GHTag wrap(GHRepository owner) {
+        this.owner = owner;
+        this.root = owner.root;
+        if (commit!=null)
+            commit.wrapUp(owner);
+        return this;
+    }
+
+    public GHRepository getOwner() {
+        return owner;
+    }
+
+    public GitHub getRoot() {
+        return root;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public GHCommit getCommit() {
+        return commit;
+    }
+}

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

@@ -0,0 +1,60 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Represents an annotated tag in a {@link GHRepository}
+ *
+ * @see GHRepository#getAnnotatedTag()
+ */
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+public class GHTagObject {
+    private GHRepository owner;
+    private GitHub root;
+
+    private String tag;
+    private String sha;
+    private String url;
+    private String message;
+    private GitUser tagger;
+    private GHRef.GHObject object;
+
+    /*package*/ GHTagObject wrap(GHRepository owner) {
+        this.owner = owner;
+        this.root = owner.root;
+        return this;
+    }
+
+    public GHRepository getOwner() {
+        return owner;
+    }
+
+    public GitHub getRoot() {
+        return root;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public String getSha() {
+        return sha;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public GitUser getTagger() {
+        return tagger;
+    }
+
+    public GHRef.GHObject getObject() {
+        return object;
+    }
+}

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

@@ -1,8 +1,10 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 /**
  * A team in GitHub organization.
@@ -10,11 +12,29 @@ import java.util.Set;
  * @author Kohsuke Kawaguchi
  */
 public class GHTeam {
-    private String name,permission;
+    private String name,permission,slug;
     private int id;
+    private GHOrganization organization; // populated by GET /user/teams where Teams+Orgs are returned together
 
     protected /*final*/ GHOrganization org;
 
+    /*package*/ GHTeam wrapUp(GHOrganization owner) {
+        this.org = owner;
+        return this;
+    }
+
+    /*package*/ GHTeam wrapUp(GitHub root) { // auto-wrapUp when organization is known from GET /user/teams
+      this.organization.wrapUp(root);
+      return wrapUp(organization);
+    }
+
+    /*package*/ static GHTeam[] wrapUp(GHTeam[] teams, GHOrganization owner) {
+        for (GHTeam t : teams) {
+            t.wrapUp(owner);
+        }
+        return teams;
+    }
+
     public String getName() {
         return name;
     }
@@ -23,6 +43,10 @@ public class GHTeam {
         return permission;
     }
 
+    public String getSlug() {
+        return slug;
+    }
+
     public int getId() {
         return id;
     }
@@ -30,37 +54,101 @@ public class GHTeam {
     /**
      * Retrieves the current members.
      */
+    public PagedIterable<GHUser> listMembers() throws IOException {
+        return new PagedIterable<GHUser>() {
+            public PagedIterator<GHUser> _iterator(int pageSize) {
+                return new PagedIterator<GHUser>(org.root.retrieve().asIterator(api("/members"), GHUser[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHUser[] page) {
+                        GHUser.wrap(page, org.root);
+                    }
+                };
+            }
+        };
+    }
+
     public Set<GHUser> getMembers() throws IOException {
-        return org.root.retrieveWithAuth(api("/members"),JsonUsersWithDetails.class).toSet(org.root);
+        return Collections.unmodifiableSet(listMembers().asSet());
+    }
+
+    /**
+     * Checks if this team has the specified user as a member.
+     */
+    public boolean hasMember(GHUser user) {
+        try {
+            org.root.retrieve().to("/teams/" + id + "/members/"  + user.getLogin());
+            return true;
+        } catch (IOException ignore) {
+            return false;
+        }
     }
 
     public Map<String,GHRepository> getRepositories() throws IOException {
-        return org.root.retrieveWithAuth3(api("/repos"),JsonRepositories.class).wrap(org.root);
+        Map<String,GHRepository> m = new TreeMap<String, GHRepository>();
+        for (GHRepository r : listRepositories()) {
+            m.put(r.getName(), r);
+        }
+        return m;
+    }
+
+    public PagedIterable<GHRepository> listRepositories() {
+        return new PagedIterable<GHRepository>() {
+            public PagedIterator<GHRepository> _iterator(int pageSize) {
+                return new PagedIterator<GHRepository>(org.root.retrieve().asIterator(api("/repos"), GHRepository[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHRepository[] page) {
+                        for (GHRepository r : page)
+                            r.wrap(org.root);
+                    }
+                };
+            }
+        };
     }
 
     /**
      * Adds a member to the team.
+     *
+     * The user will be invited to the organization if required.
+     *
+     * @since 1.59
      */
     public void add(GHUser u) throws IOException {
-        org.root.retrieveWithAuth(api("/members?name="+u.getLogin()),null, "POST");
+        org.root.retrieve().method("PUT").to(api("/memberships/" + u.getLogin()), null);
     }
 
     /**
      * 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.retrieve().method("DELETE").to(api("/members/" + u.getLogin()), null);
     }
 
     public void add(GHRepository r) throws IOException {
-        org.root.retrieveWithAuth(api("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "POST");
+        add(r,null);
+    }
+
+    public void add(GHRepository r, GHOrganization.Permission permission) throws IOException {
+        org.root.retrieve().method("PUT")
+                .with("permission",permission)
+                .to(api("/repos/" + r.getOwnerName() + '/' + r.getName()), null);
     }
 
     public void remove(GHRepository r) throws IOException {
-        org.root.retrieveWithAuth(api("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "DELETE");
+        org.root.retrieve().method("DELETE").to(api("/repos/" + r.getOwnerName() + '/' + r.getName()), null);
+    }
+    
+    /**
+     * Deletes this team.
+     */
+    public void delete() throws IOException {
+        org.root.retrieve().method("DELETE").to(api(""));
     }
 
     private String api(String tail) {
         return "/teams/"+id+tail;
     }
+
+    public GHOrganization getOrganization() {
+      return org;
+    }
 }

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

@@ -0,0 +1,149 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * A conversation in the notification API.
+ *
+ * @see <a href="https://developer.github.com/v3/activity/notifications/">documentation</a>
+ * @see GHNotificationStream
+ * @author Kohsuke Kawaguchi
+ */
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+public class GHThread extends GHObject {
+    private GitHub root;
+    private GHRepository repository;
+    private Subject subject;
+    private String reason;
+    private boolean unread;
+    private String last_read_at;
+    private String url,subscription_url;
+
+    static class Subject {
+        String title;
+        String url;
+        String latest_comment_url;
+        String type;
+    }
+
+    private GHThread() {// no external construction allowed
+    }
+
+    /**
+     * Returns null if the entire thread has never been read.
+     */
+    public Date getLastReadAt() {
+        return GitHub.parseDate(last_read_at);
+    }
+
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public GHRepository getRepository() {
+        return repository;
+    }
+
+    // TODO: how to expose the subject?
+
+    public boolean isRead() {
+        return !unread;
+    }
+
+    public String getTitle() {
+        return subject.title;
+    }
+
+    public String getType() {
+        return subject.type;
+    }
+    
+    public String getLastCommentUrl() {
+        return subject.latest_comment_url;
+    }
+
+    /**
+     * If this thread is about an issue, return that issue.
+     * 
+     * @return null if this thread is not about an issue.
+     */
+    public GHIssue getBoundIssue() throws IOException {
+        if (!"Issue".equals(subject.type) && "PullRequest".equals(subject.type))
+            return null;
+        return repository.getIssue(
+                Integer.parseInt(subject.url.substring(subject.url.lastIndexOf('/') + 1)));
+    }
+
+    /**
+     * If this thread is about a pull request, return that pull request.
+     *
+     * @return null if this thread is not about a pull request.
+     */
+    public GHPullRequest getBoundPullRequest() throws IOException {
+        if (!"PullRequest".equals(subject.type))
+            return null;
+        return repository.getPullRequest(
+                Integer.parseInt(subject.url.substring(subject.url.lastIndexOf('/') + 1)));
+    }
+
+    /**
+     * If this thread is about a commit, return that commit.
+     *
+     * @return null if this thread is not about a commit.
+     */
+    public GHCommit getBoundCommit() throws IOException {
+        if (!"Commit".equals(subject.type))
+            return null;
+        return repository.getCommit(subject.url.substring(subject.url.lastIndexOf('/') + 1));
+    }
+
+    /*package*/ GHThread wrap(GitHub root) {
+        this.root = root;
+        if (this.repository!=null)
+            this.repository.wrap(root);
+        return this;
+    }
+
+    /**
+     * Marks this thread as read.
+     */
+    public void markAsRead() throws IOException {
+        new Requester(root).method("PATCH").to(url);
+    }
+
+    /**
+     * Subscribes to this conversation to get notifications.
+     */
+    public GHSubscription subscribe(boolean subscribed, boolean ignored) throws IOException {
+        return new Requester(root)
+            .with("subscribed", subscribed)
+            .with("ignored", ignored)
+            .method("PUT").to(subscription_url, GHSubscription.class).wrapUp(root);
+    }
+
+    /**
+     * Returns the current subscription for this thread.
+     *
+     * @return null if no subscription exists.
+     */
+    public GHSubscription getSubscription() throws IOException {
+        try {
+            return new Requester(root).to(subscription_url, GHSubscription.class).wrapUp(root);
+        } catch (FileNotFoundException e) {
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+package org.kohsuke.github;
+
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Provides information for Git Trees
+ * https://developer.github.com/v3/git/trees/
+ *
+ * @author Daniel Teixeira - https://github.com/ddtxra
+ * @see GHCommit#getTree()
+ * @see GHRepository#getTree(String)
+ * @see GHTreeEntry#asTree()
+ */
+public class GHTree {
+    /* package almost final */GHRepository repo;
+
+    private boolean truncated;
+    private String sha, url;
+    private GHTreeEntry[] tree;
+
+    /**
+     * The SHA for this trees
+     */
+    public String getSha() {
+        return sha;
+    }
+
+    /**
+     * Return an array of entries of the trees
+     */
+    public List<GHTreeEntry> getTree() {
+        return Collections.unmodifiableList(Arrays.asList(tree));
+    }
+
+    /**
+     * Finds a tree entry by its name.
+     *
+     * IOW, find a directory entry by a file name.
+     */
+    public GHTreeEntry getEntry(String path) {
+        for (GHTreeEntry e : tree) {
+            if (e.getPath().equals(path))
+                return e;
+        }
+        return null;
+    }
+
+    /**
+     * Returns true if the number of items in the tree array exceeded the GitHub maximum limit. 
+     * @return true true if the number of items in the tree array exceeded the GitHub maximum limit otherwise false.
+     */
+    public boolean isTruncated() {
+        return truncated;
+    }
+
+    /**
+     * The API URL of this tag, such as
+     * "url": "https://api.github.com/repos/octocat/Hello-World/trees/fc6274d15fa3ae2ab983129fb037999f264ba9a7",
+     */
+    public URL getUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    /* package */GHTree wrap(GHRepository repo) {
+        this.repo = repo;
+        for (GHTreeEntry e : tree) {
+            e.tree = this;
+        }
+        return this;
+    }
+
+}

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

@@ -0,0 +1,108 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * Provides information for Git Trees
+ * https://developer.github.com/v3/git/trees/
+ *
+ * @author Daniel Teixeira - https://github.com/ddtxra
+ * @see GHTree
+ */
+public class GHTreeEntry {
+    /* package almost final */GHTree tree;
+
+    private String path, mode, type, sha, url;
+    private long size;
+
+    /**
+     * Get the path such as
+     * "subdir/file.txt"
+     *
+     * @return the path
+     */
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Get mode such as
+     * 100644
+     *
+     * @return the mode
+     */
+    public String getMode() {
+        return mode;
+    }
+
+    /**
+     * Gets the size of the file, such as
+     * 132
+     * @return The size of the path or 0 if it is a directory
+     */
+    public long getSize() {
+        return size;
+    }
+
+    /**
+     * Gets the type such as:
+     * "blob", "tree", etc.
+     *
+     * @return The type
+     */
+    public String getType() {
+        return type;
+    }
+
+
+    /**
+     * SHA1 of this object.
+     */
+    public String getSha() {
+        return sha;
+    }
+
+    /**
+     * API URL to this Git data, such as
+     * https://api.github.com/repos/jenkinsci
+     * /jenkins/git/commits/b72322675eb0114363a9a86e9ad5a170d1d07ac0
+     */
+    public URL getUrl() {
+        return GitHub.parseURL(url);
+    }
+
+    /**
+     * If this tree entry represents a file, then return its information.
+     * Otherwise null.
+     */
+    public GHBlob asBlob() throws IOException {
+        if (type.equals("blob"))
+            return tree.repo.getBlob(sha);
+        else
+            return null;
+    }
+
+    /**
+     * If this tree entry represents a file, then return its content.
+     * Otherwise null.
+     */
+    public InputStream readAsBlob() throws IOException {
+        if (type.equals("blob"))
+            return tree.repo.readBlob(sha);
+        else
+            return null;
+    }
+
+    /**
+     * If this tree entry represents a directory, then return it.
+     * Otherwise null.
+     */
+    public GHTree asTree() throws IOException {
+        if (type.equals("tree"))
+            return tree.repo.getTree(sha);
+        else
+            return null;
+    }
+}

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

@@ -23,12 +23,10 @@
  */
 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.HashSet;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -42,14 +40,14 @@ public class GHUser extends GHPerson {
      * Follow this user.
      */
     public void follow() throws IOException {
-        new Poster(root).withCredential().to("/user/follow/"+login);
+        new Requester(root).method("PUT").to("/user/following/" + login);
     }
 
     /**
      * Unfollow this user.
      */
     public void unfollow() throws IOException {
-        new Poster(root).withCredential().to("/user/unfollow/"+login);
+        new Requester(root).method("DELETE").to("/user/following/" + login);
     }
 
     /**
@@ -57,7 +55,14 @@ 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);
+        return new GHPersonSet<GHUser>(listFollows().asList());
+    }
+
+    /**
+     * Lists the users that this user is following
+     */
+    public PagedIterable<GHUser> listFollows() {
+        return listUser("following");
     }
 
     /**
@@ -65,7 +70,82 @@ 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);
+        return new GHPersonSet<GHUser>(listFollowers().asList());
+    }
+
+    /**
+     * Lists the users who are following this user.
+     */
+    public PagedIterable<GHUser> listFollowers() {
+        return listUser("followers");
+    }
+
+    private PagedIterable<GHUser> listUser(final String suffix) {
+        return new PagedIterable<GHUser>() {
+            public PagedIterator<GHUser> _iterator(int pageSize) {
+                return new PagedIterator<GHUser>(root.retrieve().asIterator(getApiTailUrl(suffix), GHUser[].class, pageSize)) {
+                    protected void wrapUp(GHUser[] page) {
+                        GHUser.wrap(page,root);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Lists all the subscribed (aka watched) repositories.
+     *
+     * https://developer.github.com/v3/activity/watching/
+     */
+    public PagedIterable<GHRepository> listSubscriptions() {
+        return listRepositories("subscriptions");
+    }
+
+    /**
+     * Lists all the repositories that this user has starred.
+     */
+    public PagedIterable<GHRepository> listStarredRepositories() {
+        return listRepositories("starred");
+    }
+
+    private PagedIterable<GHRepository> listRepositories(final String suffix) {
+        return new PagedIterable<GHRepository>() {
+            public PagedIterator<GHRepository> _iterator(int pageSize) {
+                return new PagedIterator<GHRepository>(root.retrieve().asIterator(getApiTailUrl(suffix), GHRepository[].class, pageSize)) {
+                    protected void wrapUp(GHRepository[] page) {
+                        for (GHRepository c : page)
+                            c.wrap(root);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Returns true if this user belongs to the specified organization.
+     */
+    public boolean isMemberOf(GHOrganization org) {
+        return org.hasMember(this);
+    }
+
+    /**
+     * Returns true if this user belongs to the specified team.
+     */
+    public boolean isMemberOf(GHTeam team) {
+        return team.hasMember(this);
+    }
+
+    /**
+     * Returns true if this user belongs to the specified organization as a public member.
+     */
+    public boolean isPublicMemberOf(GHOrganization org) {
+        return org.hasPublicMember(this);
+    }
+
+    /*package*/ static GHUser[] wrap(GHUser[] users, GitHub root) {
+        for (GHUser f : users)
+            f.root = root;
+        return users;
     }
 
     /**
@@ -75,16 +155,45 @@ 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().to("/users/" + login + "/orgs", GHOrganization[].class)) {
             if (names.add(o.getLogin()))    // I've seen some duplicates in the data
                 orgs.add(root.getOrganization(o.getLogin()));
         }
         return orgs;
     }
 
-    @Override
+    /**
-    public String toString() {
+     * Lists events performed by a user (this includes private events if the caller is authenticated.
-        return "User:"+login;
+     */
+    public PagedIterable<GHEventInfo> listEvents() throws IOException {
+        return new PagedIterable<GHEventInfo>() {
+            public PagedIterator<GHEventInfo> _iterator(int pageSize) {
+                return new PagedIterator<GHEventInfo>(root.retrieve().asIterator(String.format("/users/%s/events", login), GHEventInfo[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHEventInfo[] page) {
+                        for (GHEventInfo c : page)
+                            c.wrapUp(root);
+                    }
+                };
+            }
+        };
+    }
+
+    /**
+     * Lists Gists created by this user.
+     */
+    public PagedIterable<GHGist> listGists() throws IOException {
+        return new PagedIterable<GHGist>() {
+            public PagedIterator<GHGist> _iterator(int pageSize) {
+                return new PagedIterator<GHGist>(root.retrieve().asIterator(String.format("/users/%s/gists", login), GHGist[].class, pageSize)) {
+                    @Override
+                    protected void wrapUp(GHGist[] page) {
+                        for (GHGist c : page)
+                            c.wrapUp(GHUser.this);
+                    }
+                };
+            }
+        };
     }
 
     @Override
@@ -100,4 +209,14 @@ public class GHUser extends GHPerson {
         }
         return false;
     }
+
+    String getApiTailUrl(String tail) {
+        if (tail.length()>0 && !tail.startsWith("/"))    tail='/'+tail;
+        return "/users/" + login + tail;
+    }
+
+    /*package*/ GHUser wrapUp(GitHub root) {
+        super.wrapUp(root);
+        return this;
+    }
 }

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

@@ -0,0 +1,77 @@
+package org.kohsuke.github;
+
+import java.util.Locale;
+
+/**
+ * Search users.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see GitHub#searchUsers()
+ */
+public class GHUserSearchBuilder extends GHSearchBuilder<GHUser> {
+    /*package*/ GHUserSearchBuilder(GitHub root) {
+        super(root,UserSearchResult.class);
+    }
+
+    /**
+     * Search terms.
+     */
+    public GHUserSearchBuilder q(String term) {
+        super.q(term);
+        return this;
+    }
+
+    public GHUserSearchBuilder type(String v) {
+        return q("type:"+v);
+    }
+
+    public GHUserSearchBuilder in(String v) {
+        return q("in:"+v);
+    }
+
+    public GHUserSearchBuilder repos(String v) {
+        return q("repos:"+v);
+    }
+
+    public GHUserSearchBuilder location(String v) {
+        return q("location:"+v);
+    }
+
+    public GHUserSearchBuilder language(String v) {
+        return q("language:"+v);
+    }
+
+    public GHUserSearchBuilder created(String v) {
+        return q("created:"+v);
+    }
+
+    public GHUserSearchBuilder followers(String v) {
+        return q("followers:"+v);
+    }
+
+    public GHUserSearchBuilder order(GHDirection v) {
+        req.with("order",v);
+        return this;
+    }
+
+    public GHUserSearchBuilder sort(Sort sort) {
+        req.with("sort",sort);
+        return this;
+    }
+
+    public enum Sort { FOLLOWERS, REPOSITORIES, JOINED }
+
+    private static class UserSearchResult extends SearchResult<GHUser> {
+        private GHUser[] items;
+
+        @Override
+        /*package*/ GHUser[] getItems(GitHub root) {
+            return GHUser.wrap(items,root);
+        }
+    }
+
+    @Override
+    protected String getApiUrl() {
+        return "/search/users";
+    }
+}

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

@@ -0,0 +1,13 @@
+package org.kohsuke.github;
+
+public class GHVerifiedKey extends GHKey {
+
+  public GHVerifiedKey() {
+    this.verified = true;
+  }
+
+  @Override
+  public String getTitle() {
+    return (title == null ? "key-" + id : title);
+  }
+}

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

@@ -0,0 +1,203 @@
+package org.kohsuke.github;
+
+import org.apache.commons.io.IOUtils;
+import org.kohsuke.github.extras.ImpatientHttpConnector;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.Locale;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+/**
+ * Configures connection details and produces {@link GitHub}.
+ *
+ * @since 1.59
+ */
+public class GitHubBuilder {
+
+    // default scoped so unit tests can read them.
+    /* private */ String endpoint = GitHub.GITHUB_URL;
+    /* private */ String user;
+    /* private */ String password;
+    /* private */ String oauthToken;
+    
+    private HttpConnector connector;
+
+    private RateLimitHandler rateLimitHandler = RateLimitHandler.WAIT;
+    private AbuseLimitHandler abuseLimitHandler = AbuseLimitHandler.WAIT;
+
+    public GitHubBuilder() {
+    }
+
+    /**
+     * First check if the credentials are configured using the ~/.github properties file.
+     *
+     * If no user is specified it means there is no configuration present so check the environment instead.
+     *
+     * If there is still no user it means there are no credentials defined and throw an IOException.
+     *
+     * @return the configured Builder from credentials defined on the system or in the environment.
+     *
+     * @throws IOException If there are no credentials defined in the ~/.github properties file or the process environment.
+     */
+    public static GitHubBuilder fromCredentials() throws IOException {
+        Exception cause = null;
+        GitHubBuilder builder;
+
+        try {
+            builder = fromPropertyFile();
+
+            if (builder.oauthToken != null || builder.user != null)
+                return builder;
+        } catch (FileNotFoundException e) {
+            // fall through
+            cause = e;
+        }
+
+        builder = fromEnvironment();
+
+        if (builder.oauthToken != null || builder.user != null)
+            return builder;
+        else
+            throw (IOException)new IOException("Failed to resolve credentials from ~/.github or the environment.").initCause(cause);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #fromEnvironment()} to pick up standard set of environment variables, so that
+     *      different clients of this library will all recognize one consistent set of coordinates.
+     */
+    public static GitHubBuilder fromEnvironment(String loginVariableName, String passwordVariableName, String oauthVariableName) throws IOException {
+        return fromEnvironment(loginVariableName, passwordVariableName, oauthVariableName, "");
+    }
+
+    private static void loadIfSet(String envName, Properties p, String propName) {
+        String v = System.getenv(envName);
+           if (v != null)
+               p.put(propName, v);
+    }
+
+    /**
+     * @deprecated
+     *      Use {@link #fromEnvironment()} to pick up standard set of environment variables, so that
+     *      different clients of this library will all recognize one consistent set of coordinates.
+     */
+    public static GitHubBuilder fromEnvironment(String loginVariableName, String passwordVariableName, String oauthVariableName, String endpointVariableName) throws IOException {
+        Properties env = new Properties();
+        loadIfSet(loginVariableName,env,"login");
+        loadIfSet(passwordVariableName,env,"password");
+        loadIfSet(oauthVariableName,env,"oauth");
+        loadIfSet(endpointVariableName,env,"endpoint");
+        return fromProperties(env);
+    }
+
+    /**
+     * Creates {@link GitHubBuilder} by picking up coordinates from environment variables.
+     *
+     * <p>
+     * The following environment variables are recognized:
+     *
+     * <ul>
+     *     <li>GITHUB_LOGIN: username like 'kohsuke'
+     *     <li>GITHUB_PASSWORD: raw password
+     *     <li>GITHUB_OAUTH: OAuth token to login
+     *     <li>GITHUB_ENDPOINT: URL of the API endpoint
+     * </ul>
+     *
+     * <p>
+     * See class javadoc for the relationship between these coordinates.
+     *
+     * <p>
+     * For backward compatibility, the following environment variables are recognized but discouraged:
+     * login, password, oauth
+     */
+    public static GitHubBuilder fromEnvironment() throws IOException {
+        Properties props = new Properties();
+        for (Entry<String, String> e : System.getenv().entrySet()) {
+            String name = e.getKey().toLowerCase(Locale.ENGLISH);
+            if (name.startsWith("github_")) name=name.substring(7);
+            props.put(name,e.getValue());
+        }
+        return fromProperties(props);
+    }
+    
+    public static GitHubBuilder fromPropertyFile() throws IOException {
+        File homeDir = new File(System.getProperty("user.home"));
+        File propertyFile = new File(homeDir, ".github");
+        return fromPropertyFile(propertyFile.getPath());
+    }
+
+    public static GitHubBuilder fromPropertyFile(String propertyFileName) throws IOException {
+        Properties props = new Properties();
+        FileInputStream in = null;
+        try {
+            in = new FileInputStream(propertyFileName);
+            props.load(in);
+        } finally {
+            IOUtils.closeQuietly(in);
+        }
+     
+        return fromProperties(props);
+    }
+    
+    public static GitHubBuilder fromProperties(Properties props) {
+        GitHubBuilder self = new GitHubBuilder();
+        self.withOAuthToken(props.getProperty("oauth"), props.getProperty("login"));
+        self.withPassword(props.getProperty("login"), props.getProperty("password"));
+        self.withEndpoint(props.getProperty("endpoint", GitHub.GITHUB_URL));
+        return self;
+    }
+
+    public GitHubBuilder withEndpoint(String endpoint) {
+        this.endpoint = endpoint;
+        return this;
+    }
+    public GitHubBuilder withPassword(String user, String password) {
+        this.user = user;
+        this.password = password;
+        return this;
+    }
+    public GitHubBuilder withOAuthToken(String oauthToken) {
+        return withOAuthToken(oauthToken, null);
+    }
+    public GitHubBuilder withOAuthToken(String oauthToken, String user) {
+        this.oauthToken = oauthToken;
+        this.user = user;
+        return this;
+    }
+    public GitHubBuilder withConnector(HttpConnector connector) {
+        this.connector = connector;
+        return this;
+    }
+    public GitHubBuilder withRateLimitHandler(RateLimitHandler handler) {
+        this.rateLimitHandler = handler;
+        return this;
+    }
+    public GitHubBuilder withAbuseLimitHandler(AbuseLimitHandler handler) {
+        this.abuseLimitHandler = handler;
+        return this;
+    }
+
+    /**
+     * Configures {@linkplain #withConnector(HttpConnector) connector}
+     * that uses HTTP library in JRE but use a specific proxy, instead of
+     * the system default one.
+     */
+    public GitHubBuilder withProxy(final Proxy p) {
+        return withConnector(new ImpatientHttpConnector(new HttpConnector() {
+            public HttpURLConnection connect(URL url) throws IOException {
+                return (HttpURLConnection) url.openConnection(p);
+            }
+        }));
+    }
+
+    public GitHub build() throws IOException {
+        return new GitHub(endpoint, user, oauthToken, password, connector, rateLimitHandler, abuseLimitHandler);
+    }
+}

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

@@ -0,0 +1,41 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.Date;
+
+/**
+ * Represents a user in Git who authors/commits a commit.
+ *
+ * In contrast, {@link GHUser} is an user of GitHub. Because Git allows a person to
+ * use multiple e-mail addresses and names when creating a commit, there's generally
+ * no meaningful mapping between {@link GHUser} and {@link GitUser}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
+    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+public class GitUser {
+    private String name, email, date;
+
+    /**
+     * Human readable name of the user, such as "Kohsuke Kawaguchi"
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * E-mail address, such as "foo@example.com"
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    /**
+     * This field doesn't appear to be consistently available in all the situations where this class
+     * is used.
+     */
+    public Date getDate() {
+        return GitHub.parseDate(date);
+    }
+}

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

@@ -0,0 +1,41 @@
+package org.kohsuke.github;
+
+import org.kohsuke.github.extras.ImpatientHttpConnector;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Pluggability for customizing HTTP request behaviors or using altogether different library.
+ *
+ * <p>
+ * For example, you can implement this to st custom timeouts.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public interface HttpConnector {
+    /**
+     * Opens a connection to the given URL.
+     */
+    HttpURLConnection connect(URL url) throws IOException;
+
+    /**
+     * Default implementation that uses {@link URL#openConnection()}.
+     */
+    HttpConnector DEFAULT = new ImpatientHttpConnector(new HttpConnector() {
+        public HttpURLConnection connect(URL url) throws IOException {
+            return (HttpURLConnection) url.openConnection();
+        }
+    });
+
+    /**
+     * Stub implementation that is always off-line.
+     */
+    HttpConnector OFFLINE = new HttpConnector() {
+        public HttpURLConnection connect(URL url) throws IOException {
+            throw new IOException("Offline");
+        }
+    };
+}

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

@@ -0,0 +1,118 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import javax.annotation.CheckForNull;
+
+/**
+ * {@link IOException} for http exceptions because {@link HttpURLConnection} throws un-discerned
+ * {@link IOException} and it can help to know the http response code to decide how to handle an
+ * http exceptions.
+ *
+ * @author <a href="mailto:cleclerc@cloudbees.com">Cyrille Le Clerc</a>
+ */
+public class HttpException extends IOException {
+    static final long serialVersionUID = 1L;
+
+    private final int responseCode;
+    private final String responseMessage;
+    private final String url;
+
+    /**
+     * @param message         The detail message (which is saved for later retrieval
+     *                        by the {@link #getMessage()} method)
+     * @param responseCode    Http response code. {@code -1} if no code can be discerned.
+     * @param responseMessage Http response message
+     * @param url             The url that was invoked
+     * @see HttpURLConnection#getResponseCode()
+     * @see HttpURLConnection#getResponseMessage()
+     */
+    public HttpException(String message, int responseCode, String responseMessage, String url) {
+        super(message);
+        this.responseCode = responseCode;
+        this.responseMessage = responseMessage;
+        this.url = url;
+    }
+
+    /**
+     * @param message         The detail message (which is saved for later retrieval
+     *                        by the {@link #getMessage()} method)
+     * @param responseCode    Http response code. {@code -1} if no code can be discerned.
+     * @param responseMessage Http response message
+     * @param url             The url that was invoked
+     * @param cause           The cause (which is saved for later retrieval by the
+     *                        {@link #getCause()} method).  (A null value is permitted,
+     *                        and indicates that the cause is nonexistent or unknown.)
+     * @see HttpURLConnection#getResponseCode()
+     * @see HttpURLConnection#getResponseMessage()
+     */
+    public HttpException(String message, int responseCode, String responseMessage, String url, Throwable cause) {
+        super(message);
+        initCause(cause);
+        this.responseCode = responseCode;
+        this.responseMessage = responseMessage;
+        this.url = url;
+    }
+
+    /**
+     * @param responseCode    Http response code. {@code -1} if no code can be discerned.
+     * @param responseMessage Http response message
+     * @param url             The url that was invoked
+     * @param cause           The cause (which is saved for later retrieval by the
+     *                        {@link #getCause()} method).  (A null value is permitted,
+     *                        and indicates that the cause is nonexistent or unknown.)
+     * @see HttpURLConnection#getResponseCode()
+     * @see HttpURLConnection#getResponseMessage()
+     */
+    public HttpException(int responseCode, String responseMessage, String url, Throwable cause) {
+        super("Server returned HTTP response code: " + responseCode + ", message: '" + responseMessage + "'" +
+                " for URL: " + url);
+        initCause(cause);
+        this.responseCode = responseCode;
+        this.responseMessage = responseMessage;
+        this.url = url;
+    }
+
+    /**
+     * @param responseCode    Http response code. {@code -1} if no code can be discerned.
+     * @param responseMessage Http response message
+     * @param url             The url that was invoked
+     * @param cause           The cause (which is saved for later retrieval by the
+     *                        {@link #getCause()} method).  (A null value is permitted,
+     *                        and indicates that the cause is nonexistent or unknown.)
+     * @see HttpURLConnection#getResponseCode()
+     * @see HttpURLConnection#getResponseMessage()
+     */
+    public HttpException(int responseCode, String responseMessage, @CheckForNull URL url, Throwable cause) {
+        this(responseCode, responseMessage, url == null ? null : url.toString(), cause);
+    }
+
+    /**
+     * Http response code of the request that cause the exception
+     *
+     * @return {@code -1} if no code can be discerned.
+     */
+    public int getResponseCode() {
+        return responseCode;
+    }
+
+    /**
+     * Http response message of the request that cause the exception
+     *
+     * @return {@code null} if no response message can be discerned.
+     */
+    public String getResponseMessage() {
+        return responseMessage;
+    }
+
+    /**
+     * The http URL that caused the exception
+     *
+     * @return url
+     */
+    public String getUrl() {
+        return url;
+    }
+}

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

@@ -1,36 +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 JsonBranch {
-    GHBranch branch;
-
-    GHBranch wrap(GHRepository r) {
-        return branch.wrap(r);
-    }
-}

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

@@ -1,40 +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;
-
-/**
- * @author Eric Maupin
- */
-class JsonBranches {
-    List<GHBranch> branches;
-
-    public List<GHBranch> wrap(GHRepository owner) {
-        for (GHBranch branch : branches)
-            branch.wrap(owner);
-        return branches;
-    }
-}

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;
-    }
-}