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

Modify getRef() changes to be compatible with older GHE versions

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,4 +7,10 @@ We love getting PRs, but we hate asking people for the same basic changes every
 - [ ] Push your changes to a branch other than `master`. Create your PR from that branch.    
 - [ ] Add JavaDocs and other comments
 - [ ] Write tests that run and pass in CI. See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to capture snapshot data.
-- [ ] Run `mvn -P ci install site` locally. This may reformat your code, commit those changes. If this command doesn't succeed, your change will not pass CI.
+- [ ] Run `mvn clean compile` locally. This may reformat your code, commit those changes.
+- [ ] Run `mvn -D enable-ci clean install site` locally. If this command doesn't succeed, your change will not pass CI.
+
+# When creating a PR: 
+
+- [ ] Fill in the "Description" above. 
+- [ ] Enable "Allow edits from maintainers". 

.github/workflows/maven-build.yml

@@ -1,22 +1,72 @@
-name: Java CI Build and Test
+name: CI
 
 on: [push, pull_request]
 
 
 jobs:
   build:
-
+    name: build-only (Java ${{ matrix.java }})
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '1.8.0', '11.0.x', '13.0.x' ]
+        java: [ 13 ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - name: Cached .m2
+        uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Maven Install (skipTests)
+        run: mvn -B install -DskipTests -D enable-ci --file pom.xml
+  site:
+    name: site (Java ${{ matrix.java }})
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 8, 11 ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{ matrix.java }}
+      - uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Maven Site
+        run: mvn -B site -D enable-ci --file pom.xml
+  test:
+    name: test (${{ matrix.os }}, Java ${{ matrix.java }})
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      matrix:
+        os: [ ubuntu, windows ]
+        java: [ 8, 11, 13, 15-ea ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.java }}
-    - name: Maven Download all dependencies
-      run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:go-offline -P ci
-    - name: Maven Build
-      run: mvn -B install site -P ci --file pom.xml
+    - uses: actions/cache@v1
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Maven Install without Code Coverage
+      if: matrix.os == 'windows'
+      run: mvn -B install --file pom.xml
+    - name: Maven Install with Code Coverage
+      if: matrix.os != 'windows'
+      run: mvn -B install -D enable-ci --file pom.xml

.gitignore

@@ -9,3 +9,5 @@ target
 .DS_Store
 
 dependency-reduced-pom.xml
+.factorypath
+.vscode/settings.json

README.md

@@ -1,7 +1,9 @@
 # Java API for GitHub
 
 [![Sonatype Nexus (Releases)](https://img.shields.io/nexus/r/org.kohsuke/github-api?server=https%3A%2F%2Foss.sonatype.org)](https://mvnrepository.com/artifact/org.kohsuke/github-api)
-[![Join the chat at https://gitter.im/github-api/github-api](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github-api/github-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/hub4j/github-api](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/hub4j/github-api?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+![CI](https://github.com/hub4j/github-api/workflows/CI/badge.svg?branch=master)
+
 
 
 See https://github-api.kohsuke.org/ for more details

pom.xml

@@ -2,16 +2,16 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.kohsuke</groupId>
   <artifactId>github-api</artifactId>
-  <version>1.106</version>
+  <version>1.114</version>
   <name>GitHub API for Java</name>
   <url>https://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
 
   <scm>
-    <connection>scm:git:git@github.com/github-api/${project.artifactId}.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/github-api/${project.artifactId}.git</developerConnection>
-    <url>https://${project.artifactId}.kohsuke.org/</url>
-    <tag>github-api-1.106</tag>
+    <connection>scm:git:git@github.com/hub4j/${project.artifactId}.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/hub4j/${project.artifactId}.git</developerConnection>
+    <url>https://github.com/hub4j/github-api/</url>
+    <tag>github-api-1.114</tag>
   </scm>
 
   <distributionManagement>
@@ -27,22 +27,22 @@
     </repository>
     <site>
       <id>github-pages</id>
-      <url>gitsite:git@github.com/github-api/${project.artifactId}.git</url>
+      <url>gitsite:git@github.com/hub4j/${project.artifactId}.git</url>
     </site>
   </distributionManagement>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spotbugs-maven-plugin.version>3.1.12.2</spotbugs-maven-plugin.version>
-    <spotbugs.version>3.1.12</spotbugs.version>
+    <spotbugs-maven-plugin.version>4.0.0</spotbugs-maven-plugin.version>
+    <spotbugs.version>4.0.4</spotbugs.version>
     <spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
     <hamcrest.version>2.2</hamcrest.version>
-    <okhttp3.version>4.3.1</okhttp3.version>
-    <okio.version>2.4.3</okio.version>
+    <okhttp3.version>4.4.1</okhttp3.version>
+    <okio.version>2.5.0</okio.version>
     <formatter-maven-plugin.goal>format</formatter-maven-plugin.goal>
     <impsort-maven-plugin.goal>sort</impsort-maven-plugin.goal>
     <!-- Using this as the minimum bar for code coverage.  Adding methods without covering them will fail this. -->
-    <jacoco.coverage.target.bundle.method>0.556</jacoco.coverage.target.bundle.method>
+    <jacoco.coverage.target.bundle.method>0.60</jacoco.coverage.target.bundle.method>
     <jacoco.coverage.target.class.method>0.25</jacoco.coverage.target.class.method>
     <!-- For non-ci builds we'd like the build to still complete if jacoco metrics aren't met. -->
     <jacoco.haltOnFailure>false</jacoco.haltOnFailure>
@@ -79,54 +79,6 @@
     </testResources>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>3.2.1</version>
-          <executions>
-            <execution>
-              <id>shaded-jar</id>
-              <phase>package</phase>
-              <goals>
-                <goal>shade</goal>
-              </goals>
-              <configuration>
-                <relocations>
-                  <relocation>
-                    <pattern>com.fasterxml.jackson</pattern>
-                    <shadedPattern>hidden.com.fasterxml.jackson</shadedPattern>
-                  </relocation>
-                  <relocation>
-                    <pattern>org.apache</pattern>
-                    <shadedPattern>hidden.org.apache</shadedPattern>
-                  </relocation>
-                </relocations>
-                <artifactSet>
-                  <excludes>
-                    <exclude>com.infradna.tool:bridge-method-annotation</exclude>
-                    <exclude>org.jenkins-ci:annotation-indexer</exclude>
-                    <exclude>com.squareup.*:*</exclude>
-                    <exclude>org.jetbrains*:*</exclude>
-                    <exclude>com.github.spotbugs:*</exclude>
-                    <exclude>com.google.code.findbugs:*</exclude>
-                  </excludes>
-                </artifactSet>
-                <shadedArtifactAttached>true</shadedArtifactAttached>
-                <filters>
-                  <filter>
-                    <artifact>*:*</artifact>
-                    <excludes>
-                      <exclude>module-info.class</exclude>
-                      <exclude>META-INF/*.SF</exclude>
-                      <exclude>META-INF/*.DSA</exclude>
-                      <exclude>META-INF/*.RSA</exclude>
-                    </excludes>
-                  </filter>
-                </filters>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
@@ -194,25 +146,24 @@
                       <exclude>org.kohsuke.github.example.*</exclude>
 
                       <!-- No methods -->
-                      <exclude>org.kohsuke.github.DeleteToken</exclude>
                       <exclude>org.kohsuke.github.Previews</exclude>
 
                       <!-- Deprecated -->
                       <exclude>org.kohsuke.github.extras.OkHttp3Connector</exclude>
                       <exclude>org.kohsuke.github.EnforcementLevel</exclude>
                       <exclude>org.kohsuke.github.GHPerson.1</exclude>
-                      <exclude>org.kohsuke.github.GHPerson.1.1</exclude>
+
+                      <!-- These fail coverage on windows because tests are disabled -->
+                      <exclude>org.kohsuke.github.GHAsset</exclude>
+                      <exclude>org.kohsuke.github.GHReleaseBuilder</exclude>
+                      <exclude>org.kohsuke.github.GHRelease</exclude>
 
                       <!-- TODO: These still need test coverage -->
-                      <exclude>org.kohsuke.github.GitHub.GHApiInfo</exclude>
                       <exclude>org.kohsuke.github.GHBranchProtection.RequiredSignatures</exclude>
                       <exclude>org.kohsuke.github.GHBranchProtectionBuilder.Restrictions</exclude>
                       <exclude>org.kohsuke.github.GHBranchProtection.Restrictions</exclude>
                       <exclude>org.kohsuke.github.GHCommentAuthorAssociation</exclude>
                       <exclude>org.kohsuke.github.GHCommitBuilder.UserInfo</exclude>
-                      <exclude>org.kohsuke.github.GHCommitSearchBuilder.CommitSearchResult</exclude>
-                      <exclude>org.kohsuke.github.GHCommitSearchBuilder.Sort</exclude>
-                      <exclude>org.kohsuke.github.GHCommitSearchBuilder</exclude>
                       <exclude>org.kohsuke.github.GHCommitState</exclude>
                       <exclude>org.kohsuke.github.GHCompare.Commit</exclude>
                       <exclude>org.kohsuke.github.GHCompare.InnerCommit</exclude>
@@ -230,9 +181,6 @@
                       <exclude>org.kohsuke.github.GHHook</exclude>
                       <exclude>org.kohsuke.github.GHHooks.OrgContext</exclude>
                       <exclude>org.kohsuke.github.GHInvitation</exclude>
-                      <exclude>org.kohsuke.github.GHIssueSearchBuilder.IssueSearchResult</exclude>
-                      <exclude>org.kohsuke.github.GHIssueSearchBuilder.Sort</exclude>
-                      <exclude>org.kohsuke.github.GHIssueSearchBuilder</exclude>
                       <exclude>org.kohsuke.github.GHMilestoneState</exclude>
                       <exclude>org.kohsuke.github.GHOrgHook</exclude>
                       <exclude>org.kohsuke.github.GHProject.ProjectStateFilter</exclude>
@@ -251,7 +199,6 @@
                       <exclude>org.kohsuke.github.GHTeam.Role</exclude>
                       <exclude>org.kohsuke.github.GHUserSearchBuilder.Sort</exclude>
                       <exclude>org.kohsuke.github.GHVerifiedKey</exclude>
-                      <exclude>org.kohsuke.github.GitHubBuilder.1</exclude>
                     </excludes>
                   </rule>
                 </rules>
@@ -262,7 +209,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.2.0</version>
           <configuration>
             <source>8</source>
             <failOnWarnings>true</failOnWarnings>
@@ -286,7 +233,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.8.2</version>
+        <version>3.9.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -306,12 +253,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.0</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.bcel</groupId>
             <artifactId>bcel</artifactId>
-            <version>6.4.1</version>
+            <version>6.5.0</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -334,6 +281,10 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.22.2</version>
+        <configuration>
+          <!-- SUREFIRE-1226 workaround -->
+          <trimStackTrace>false</trimStackTrace>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -386,7 +337,7 @@
       <plugin>
         <groupId>net.revelc.code</groupId>
         <artifactId>impsort-maven-plugin</artifactId>
-        <version>1.3.2</version>
+        <version>1.4.1</version>
         <configuration>
           <groups>*,java.,javax.</groups>
           <removeUnused>true</removeUnused>
@@ -494,7 +445,7 @@
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler</artifactId>
-      <version>1.258</version>
+      <version>1.259</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -506,7 +457,7 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>5.6.0.201912101111-r</version>
+      <version>5.7.0.202003110725-r</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -544,7 +495,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.2.4</version>
+      <version>3.3.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -556,7 +507,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-jre8-standalone</artifactId>
-      <version>2.25.1</version>
+      <version>2.26.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -580,23 +531,32 @@
   </pluginRepositories>
   <profiles>
     <profile>
-      <id>ci</id>
+      <id>ci-non-windows</id>
+      <activation>
+        <property>
+          <name>enable-ci</name>
+        </property>
+        <os>
+          <family>!windows</family>
+        </os>
+      </activation>
+      <properties>
+        <formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
+        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
+      </properties>
+    </profile>
+    <profile>
+      <id>ci-all</id>
       <activation>
         <property>
           <name>enable-ci</name>
         </property>
       </activation>
       <properties>
-        <formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
-        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
         <jacoco.haltOnFailure>true</jacoco.haltOnFailure>
       </properties>
       <build>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-          </plugin>
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
@@ -613,8 +573,8 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -665,6 +625,18 @@
   </profiles>
   <reporting>
     <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <!-- select non-aggregate reports -->
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>

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

@@ -0,0 +1,165 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * An abstract data object builder/updater.
+ *
+ * This class can be use to make a Builder that supports both batch and single property changes.
+ * <p>
+ * Batching looks like this:
+ * </p>
+ * 
+ * <pre>
+ * update().someName(value).otherName(value).done()
+ * </pre>
+ * <p>
+ * Single changes look like this:
+ * </p>
+ * 
+ * <pre>
+ * set().someName(value);
+ * set().otherName(value);
+ * </pre>
+ * <p>
+ * If {@link S} is the same as {@link R}, {@link #with(String, Object)} will commit changes after the first value change
+ * and return a {@link R} from {@link #done()}.
+ * </p>
+ * <p>
+ * If {@link S} is not the same as {@link R}, {@link #with(String, Object)} will batch together multiple changes and let
+ * the user call {@link #done()} when they are ready.
+ *
+ * @param <R>
+ *            Final return type built by this builder returned when {@link #done()}} is called.
+ * @param <S>
+ *            Intermediate return type for this builder returned by calls to {@link #with(String, Object)}. If {@link S}
+ *            the same as {@link R}, this builder will commit changes after each call to {@link #with(String, Object)}.
+ */
+abstract class AbstractBuilder<R, S> {
+
+    @Nonnull
+    private final Class<R> returnType;
+
+    private final boolean commitChangesImmediately;
+
+    @CheckForNull
+    private final R baseInstance;
+
+    @Nonnull
+    protected final Requester requester;
+
+    // TODO: Not sure how update-in-place behavior should be controlled
+    // However, it certainly can be controlled dynamically down to the instance level or inherited for all children of
+    // some
+    // connection.
+    protected boolean updateInPlace;
+
+    /**
+     * Creates a builder.
+     *
+     * @param root
+     *            the GitHub instance to connect to.
+     * @param intermediateReturnType
+     *            the intermediate return type of type {@link S} returned by calls to {@link #with(String, Object)}.
+     *            Must either be equal to {@code builtReturnType} or this instance must be castable to this class. If
+     *            not, the constructor will throw {@link IllegalArgumentException}.
+     * @param finalReturnType
+     *            the final return type for built by this builder returned when {@link #done()}} is called.
+     * @param baseInstance
+     *            optional instance on which to base this builder.
+     */
+    protected AbstractBuilder(@Nonnull Class<R> finalReturnType,
+            @Nonnull Class<S> intermediateReturnType,
+            @Nonnull GitHub root,
+            @CheckForNull R baseInstance) {
+        this.requester = root.createRequest();
+        this.returnType = finalReturnType;
+        this.commitChangesImmediately = returnType.equals(intermediateReturnType);
+        if (!commitChangesImmediately && !intermediateReturnType.isInstance(this)) {
+            throw new IllegalArgumentException(
+                    "Argument \"intermediateReturnType\": This instance must be castable to intermediateReturnType or finalReturnType must be equal to intermediateReturnType.");
+        }
+
+        this.baseInstance = baseInstance;
+        this.updateInPlace = false;
+    }
+
+    /**
+     * Finishes an update, committing changes.
+     *
+     * This method may update-in-place or not. Either way it returns the resulting instance.
+     *
+     * @return an instance with updated current data
+     * @throws IOException
+     *             if there is an I/O Exception
+     */
+    @Nonnull
+    @Preview
+    @Deprecated
+    public R done() throws IOException {
+        R result;
+        if (updateInPlace && baseInstance != null) {
+            result = requester.fetchInto(baseInstance);
+        } else {
+            result = requester.fetch(returnType);
+        }
+        return result;
+    }
+
+    /**
+     * Applies a value to a name for this builder.
+     *
+     * If {@link S} is the same as {@link R}, this method will commit changes after the first value change and return a
+     * {@link R} from {@link #done()}.
+     *
+     * If {@link S} is not the same as {@link R}, this method will return an {@link S} and letting the caller batch
+     * together multiple changes and call {@link #done()} when they are ready.
+     *
+     * @param name
+     *            the name of the field
+     * @param value
+     *            the value of the field
+     * @return either a continuing builder or an updated data record
+     * @throws IOException
+     *             if an I/O error occurs
+     */
+    @Nonnull
+    @Preview
+    @Deprecated
+    protected S with(@Nonnull String name, Object value) throws IOException {
+        requester.with(name, value);
+        return continueOrDone();
+    }
+
+    /**
+     * Chooses whether to return a continuing builder or an updated data record
+     *
+     * If {@link S} is the same as {@link R}, this method will commit changes after the first value change and return a
+     * {@link R} from {@link #done()}.
+     *
+     * If {@link S} is not the same as {@link R}, this method will return an {@link S} and letting the caller batch
+     * together multiple changes and call {@link #done()} when they are ready.
+     *
+     * @return either a continuing builder or an updated data record
+     * @throws IOException
+     *             if an I/O error occurs
+     */
+    @Nonnull
+    @Preview
+    @Deprecated
+    protected S continueOrDone() throws IOException {
+        // This little bit of roughness in this base class means all inheriting builders get to create Updater and
+        // Setter classes from almost identical code. Creator can often be implemented with significant code reuse as
+        // well.
+        if (commitChangesImmediately) {
+            // These casts look strange and risky, but they they're actually guaranteed safe due to the return path
+            // being based on the previous comparison of class instances passed to the constructor.
+            return (S) done();
+        } else {
+            return (S) this;
+        }
+    }
+}

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

@@ -29,6 +29,10 @@ public abstract class AbuseLimitHandler {
      * @throws IOException
      *             on failure
      * @see <a href="https://developer.github.com/v3/#abuse-rate-limits">API documentation from GitHub</a>
+     * @see <a href=
+     *      "https://developer.github.com/v3/guides/best-practices-for-integrators/#dealing-with-abuse-rate-limits">Dealing
+     *      with abuse rate limits</a>
+     *
      */
     public abstract void onError(IOException e, HttpURLConnection uc) throws IOException;
 

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

@@ -1,35 +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 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/GHApp.java

@@ -39,7 +39,9 @@ public class GHApp extends GHObject {
      *
      * @param owner
      *            the owner
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setOwner(GHUser owner) {
         this.owner = owner;
     }
@@ -58,7 +60,9 @@ public class GHApp extends GHObject {
      *
      * @param name
      *            the name
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setName(String name) {
         this.name = name;
     }
@@ -77,7 +81,9 @@ public class GHApp extends GHObject {
      *
      * @param description
      *            the description
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setDescription(String description) {
         this.description = description;
     }
@@ -96,7 +102,9 @@ public class GHApp extends GHObject {
      *
      * @param externalUrl
      *            the external url
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setExternalUrl(String externalUrl) {
         this.externalUrl = externalUrl;
     }
@@ -115,7 +123,9 @@ public class GHApp extends GHObject {
      *
      * @param events
      *            the events
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setEvents(List<GHEvent> events) {
         this.events = events;
     }
@@ -134,13 +144,15 @@ public class GHApp extends GHObject {
      *
      * @param installationsCount
      *            the installations count
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setInstallationsCount(long installationsCount) {
         this.installationsCount = installationsCount;
     }
 
     public URL getHtmlUrl() {
-        return GitHub.parseURL(htmlUrl);
+        return GitHubClient.parseURL(htmlUrl);
     }
 
     /**
@@ -157,7 +169,9 @@ public class GHApp extends GHObject {
      *
      * @param permissions
      *            the permissions
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setPermissions(Map<String, String> permissions) {
         this.permissions = permissions;
     }

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

@@ -63,7 +63,7 @@ public class GHAppCreateTokenBuilder {
     public GHAppCreateTokenBuilder permissions(Map<String, GHPermissionType> permissions) {
         Map<String, String> retMap = new HashMap<>();
         for (Map.Entry<String, GHPermissionType> entry : permissions.entrySet()) {
-            retMap.put(entry.getKey(), Requester.transformEnum(entry.getValue()));
+            retMap.put(entry.getKey(), GitHubRequest.transformEnum(entry.getValue()));
         }
         builder.with("permissions", retMap);
         return this;

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

@@ -42,7 +42,7 @@ public class GHAppInstallation extends GHObject {
     private String htmlUrl;
 
     public URL getHtmlUrl() {
-        return GitHub.parseURL(htmlUrl);
+        return GitHubClient.parseURL(htmlUrl);
     }
 
     /**
@@ -59,7 +59,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param root
      *            the root
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setRoot(GitHub root) {
         this.root = root;
     }
@@ -78,7 +80,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param account
      *            the account
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setAccount(GHUser account) {
         this.account = account;
     }
@@ -97,7 +101,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param accessTokenUrl
      *            the access token url
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setAccessTokenUrl(String accessTokenUrl) {
         this.accessTokenUrl = accessTokenUrl;
     }
@@ -116,7 +122,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param repositoriesUrl
      *            the repositories url
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setRepositoriesUrl(String repositoriesUrl) {
         this.repositoriesUrl = repositoriesUrl;
     }
@@ -135,7 +143,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param appId
      *            the app id
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setAppId(long appId) {
         this.appId = appId;
     }
@@ -154,7 +164,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param targetId
      *            the target id
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setTargetId(long targetId) {
         this.targetId = targetId;
     }
@@ -173,7 +185,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param targetType
      *            the target type
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setTargetType(GHTargetType targetType) {
         this.targetType = targetType;
     }
@@ -192,7 +206,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param permissions
      *            the permissions
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setPermissions(Map<String, GHPermissionType> permissions) {
         this.permissions = permissions;
     }
@@ -211,7 +227,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param events
      *            the events
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setEvents(List<GHEvent> events) {
         this.events = events;
     }
@@ -230,7 +248,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param singleFileName
      *            the single file name
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setSingleFileName(String singleFileName) {
         this.singleFileName = singleFileName;
     }
@@ -249,7 +269,9 @@ public class GHAppInstallation extends GHObject {
      *
      * @param repositorySelection
      *            the repository selection
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setRepositorySelection(GHRepositorySelection repositorySelection) {
         this.repositorySelection = repositorySelection;
     }
@@ -274,7 +296,7 @@ public class GHAppInstallation extends GHObject {
         root.createRequest()
                 .method("DELETE")
                 .withPreview(GAMBIT)
-                .withUrlPath(String.format("/app/installations/%d", id))
+                .withUrlPath(String.format("/app/installations/%d", getId()))
                 .send();
     }
 
@@ -293,7 +315,9 @@ public class GHAppInstallation extends GHObject {
     @Preview
     @Deprecated
     public GHAppCreateTokenBuilder createToken(Map<String, GHPermissionType> permissions) {
-        return new GHAppCreateTokenBuilder(root, String.format("/app/installations/%d/access_tokens", id), permissions);
+        return new GHAppCreateTokenBuilder(root,
+                String.format("/app/installations/%d/access_tokens", getId()),
+                permissions);
     }
 
     /**
@@ -308,6 +332,6 @@ public class GHAppInstallation extends GHObject {
     @Preview
     @Deprecated
     public GHAppCreateTokenBuilder createToken() {
-        return new GHAppCreateTokenBuilder(root, String.format("/app/installations/%d/access_tokens", id));
+        return new GHAppCreateTokenBuilder(root, String.format("/app/installations/%d/access_tokens", getId()));
     }
 }

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

@@ -37,7 +37,9 @@ public class GHAppInstallationToken {
      *
      * @param root
      *            the root
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setRoot(GitHub root) {
         this.root = root;
     }
@@ -56,7 +58,9 @@ public class GHAppInstallationToken {
      *
      * @param permissions
      *            the permissions
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setPermissions(Map<String, String> permissions) {
         this.permissions = permissions;
     }
@@ -75,7 +79,9 @@ public class GHAppInstallationToken {
      *
      * @param token
      *            the token
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setToken(String token) {
         this.token = token;
     }
@@ -94,7 +100,9 @@ public class GHAppInstallationToken {
      *
      * @param repositories
      *            the repositories
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setRepositories(List<GHRepository> repositories) {
         this.repositories = repositories;
     }
@@ -113,7 +121,9 @@ public class GHAppInstallationToken {
      *
      * @param repositorySelection
      *            the repository selection
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
      */
+    @Deprecated
     public void setRepositorySelection(GHRepositorySelection repositorySelection) {
         this.repositorySelection = repositorySelection;
     }
@@ -127,7 +137,7 @@ public class GHAppInstallationToken {
      */
     @WithBridgeMethods(value = String.class, adapterMethod = "expiresAtStr")
     public Date getExpiresAt() throws IOException {
-        return GitHub.parseDate(expires_at);
+        return GitHubClient.parseDate(expires_at);
     }
 
     @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getExpiresAt")

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

@@ -149,7 +149,7 @@ public class GHAsset extends GHObject {
     }
 
     private String getApiRoute() {
-        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + id;
+        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + getId();
     }
 
     GHAsset wrap(GHRelease release) {

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

@@ -96,7 +96,7 @@ public class GHAuthorization extends GHObject {
      * @return the app url
      */
     public URL getAppUrl() {
-        return GitHub.parseURL(app.url);
+        return GitHubClient.parseURL(app.url);
     }
 
     /**
@@ -112,10 +112,12 @@ public class GHAuthorization extends GHObject {
      * Gets api url.
      *
      * @return the api url
+     * @deprecated use {@link #getUrl()}
      */
+    @Deprecated
     @SuppressFBWarnings(value = "NM_CONFUSING", justification = "It's a part of the library API, cannot be changed")
     public URL getApiURL() {
-        return GitHub.parseURL(url);
+        return getUrl();
     }
 
     /**
@@ -141,7 +143,7 @@ public class GHAuthorization extends GHObject {
      * @return the note url
      */
     public URL getNoteUrl() {
-        return GitHub.parseURL(note_url);
+        return GitHubClient.parseURL(note_url);
     }
 
     /**

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

@@ -24,7 +24,7 @@ public class GHBlob {
      * @return API URL of this blob.
      */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**

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

@@ -90,7 +90,7 @@ public class GHBranch {
     @Preview
     @Deprecated
     public URL getProtectionUrl() {
-        return GitHub.parseURL(protection_url);
+        return GitHubClient.parseURL(protection_url);
     }
 
     /**
@@ -101,7 +101,7 @@ public class GHBranch {
      *             the io exception
      */
     public GHBranchProtection getProtection() throws IOException {
-        return root.createRequest().withUrlPath(protection_url).fetch(GHBranchProtection.class).wrap(this);
+        return root.createRequest().setRawUrlPath(protection_url).fetch(GHBranchProtection.class).wrap(this);
     }
 
     /**
@@ -120,7 +120,7 @@ public class GHBranch {
      *             if disabling protection fails
      */
     public void disableProtection() throws IOException {
-        root.createRequest().method("DELETE").withUrlPath(protection_url).send();
+        root.createRequest().method("DELETE").setRawUrlPath(protection_url).send();
     }
 
     /**

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

@@ -4,13 +4,13 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.Date;
 
 /**
- * Represents a deployment
+ * Represents a check run.
  *
  * @see <a href="https://developer.github.com/v3/checks/runs/">documentation</a>
  */
-
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD", "URF_UNREAD_FIELD" },
         justification = "JSON API")
 public class GHCheckRun extends GHObject {
@@ -20,7 +20,17 @@ public class GHCheckRun extends GHObject {
     private String status;
     private String conclusion;
     private String name;
+    private String headSha;
+    private String nodeId;
+    private String externalId;
+    private String startedAt;
+    private String completedAt;
+    private URL htmlUrl;
+    private URL detailsUrl;
+    private Output output;
+    private GHApp app;
     private GHPullRequest[] pullRequests;
+    private GHCheckSuite checkSuite;
 
     GHCheckRun wrap(GHRepository owner) {
         this.owner = owner;
@@ -40,18 +50,57 @@ public class GHCheckRun extends GHObject {
         return pullRequests;
     }
 
+    /**
+     * Gets status of the check run.
+     *
+     * @return Status of the check run
+     * @see Status
+     */
     public String getStatus() {
         return status;
     }
 
+    public static enum Status {
+        QUEUED, IN_PROGRESS, COMPLETED
+    }
+
+    /**
+     * Gets conclusion of a completed check run.
+     *
+     * @return Status of the check run
+     * @see Conclusion
+     */
     public String getConclusion() {
         return conclusion;
     }
 
+    public static enum Conclusion {
+        SUCCESS, FAILURE, NEUTRAL, CANCELLED, TIMED_OUT, ACTION_REQUIRED
+    }
+
+    /**
+     * Gets the custom name of this check run.
+     *
+     * @return Name of the check run
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Gets the HEAD SHA.
+     *
+     * @return sha for the HEAD commit
+     */
+    public String getHeadSha() {
+        return headSha;
+    }
+
+    /**
+     * Gets the pull requests participated in this check run.
+     *
+     * @return Pull requests of this check run
+     */
     GHPullRequest[] getPullRequests() throws IOException {
         if (pullRequests != null && pullRequests.length != 0) {
             for (GHPullRequest singlePull : pullRequests) {
@@ -62,11 +111,149 @@ public class GHCheckRun extends GHObject {
     }
 
     /**
-     * @deprecated This object has no HTML URL.
+     * Gets the HTML URL: https://github.com/[owner]/[repo-name]/runs/[check-run-id], usually an GitHub Action page of
+     * the check run.
+     *
+     * @return HTML URL
      */
     @Override
     public URL getHtmlUrl() {
-        return null;
+        return htmlUrl;
+    }
+
+    /**
+     * Gets the global node id to access most objects in GitHub.
+     *
+     * @see <a href="https://developer.github.com/v4/guides/using-global-node-ids/">documentation</a>
+     * @return Global node id
+     */
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    /**
+     * Gets a reference for the check run on the integrator's system.
+     *
+     * @return Reference id
+     */
+    public String getExternalId() {
+        return externalId;
+    }
+
+    /**
+     * Gets the details URL from which to find full details of the check run on the integrator's site.
+     *
+     * @return Details URL
+     */
+    public URL getDetailsUrl() {
+        return detailsUrl;
+    }
+
+    /**
+     * Gets the start time of the check run in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ.
+     *
+     * @return Timestamp of the start time
+     */
+    public Date getStartedAt() {
+        return GitHubClient.parseDate(startedAt);
+    }
+
+    /**
+     * Gets the completed time of the check run in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ.
+     *
+     * @return Timestamp of the completed time
+     */
+    public Date getCompletedAt() {
+        return GitHubClient.parseDate(completedAt);
+    }
+
+    /**
+     * Gets the GitHub app this check run belongs to, included in response.
+     *
+     * @return GitHub App
+     */
+    public GHApp getApp() {
+        return app;
+    }
+
+    /**
+     * Gets the check suite this check run belongs to
+     *
+     * @return Check suite
+     */
+    public GHCheckSuite getCheckSuite() {
+        return checkSuite;
+    }
+
+    /**
+     * Gets an output for a check run.
+     *
+     * @return Output of a check run
+     */
+    public Output getOutput() {
+        return output;
+    }
+
+    /**
+     * Represents an output in a check run to include summary and other results.
+     *
+     * @see <a href="https://developer.github.com/v3/checks/runs/#output-object">documentation</a>
+     */
+    public static class Output {
+        private String title;
+        private String summary;
+        private String text;
+        private int annotationsCount;
+        private URL annotationsUrl;
+
+        /**
+         * Gets the title of check run.
+         *
+         * @return title of check run
+         */
+        public String getTitle() {
+            return title;
+        }
+
+        /**
+         * Gets the summary of the check run, note that it supports Markdown.
+         *
+         * @return summary of check run
+         */
+        public String getSummary() {
+            return summary;
+        }
+
+        /**
+         * Gets the details of the check run, note that it supports Markdown.
+         *
+         * @return Details of the check run
+         */
+        public String getText() {
+            return text;
+        }
+
+        /**
+         * Gets the annotation count of a check run.
+         *
+         * @return annotation count of a check run
+         */
+        public int getAnnotationsCount() {
+            return annotationsCount;
+        }
+
+        /**
+         * Gets the URL of annotations.
+         *
+         * @return URL of annotations
+         */
+        public URL getAnnotationsUrl() {
+            return annotationsUrl;
+        }
+    }
+
+    public static enum AnnotationLevel {
+        NOTICE, WARNING, FAILURE
     }
 
 }

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

@@ -0,0 +1,291 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2020 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 com.fasterxml.jackson.annotation.JsonInclude;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Drafts a check run.
+ *
+ * @see GHCheckRun
+ * @see GHRepository#createCheckRun
+ * @see <a href="https://developer.github.com/v3/checks/runs/#create-a-check-run">documentation</a>
+ */
+@SuppressFBWarnings(value = "URF_UNREAD_FIELD", justification = "Jackson serializes these even without a getter")
+@Preview
+@Deprecated
+public final class GHCheckRunBuilder {
+
+    private final GHRepository repo;
+    private final Requester requester;
+    private Output output;
+    private List<Action> actions;
+
+    GHCheckRunBuilder(GHRepository repo, String name, String headSHA) {
+        this.repo = repo;
+        requester = repo.root.createRequest()
+                .withPreview(Previews.ANTIOPE)
+                .method("POST")
+                .with("name", name)
+                .with("head_sha", headSHA)
+                .withUrlPath(repo.getApiTailUrl("check-runs"));
+    }
+
+    public @NonNull GHCheckRunBuilder withDetailsURL(@CheckForNull String detailsURL) {
+        requester.with("details_url", detailsURL);
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withExternalID(@CheckForNull String externalID) {
+        requester.with("external_id", externalID);
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withStatus(@CheckForNull GHCheckRun.Status status) {
+        if (status != null) {
+            // Do *not* use the overload taking Enum, as that s/_/-/g which would be wrong here.
+            requester.with("status", status.toString().toLowerCase(Locale.ROOT));
+        }
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withConclusion(@CheckForNull GHCheckRun.Conclusion conclusion) {
+        if (conclusion != null) {
+            requester.with("conclusion", conclusion.toString().toLowerCase(Locale.ROOT));
+        }
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withStartedAt(@CheckForNull Date startedAt) {
+        if (startedAt != null) {
+            requester.with("started_at", GitHubClient.printDate(startedAt));
+        }
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withCompletedAt(@CheckForNull Date completedAt) {
+        if (completedAt != null) {
+            requester.with("completed_at", GitHubClient.printDate(completedAt));
+        }
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder add(@NonNull Output output) {
+        if (this.output != null) {
+            throw new IllegalStateException("cannot add Output twice");
+        }
+        this.output = output;
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder add(@NonNull Action action) {
+        if (actions == null) {
+            actions = new LinkedList<>();
+        }
+        actions.add(action);
+        return this;
+    }
+
+    private static final int MAX_ANNOTATIONS = 50;
+    /**
+     * Actually creates the check run. (If more than fifty annotations were requested, this is done in batches.)
+     *
+     * @return the resulting run
+     * @throws IOException
+     *             for the usual reasons
+     */
+    public @NonNull GHCheckRun create() throws IOException {
+        List<Annotation> extraAnnotations;
+        if (output != null && output.annotations != null && output.annotations.size() > MAX_ANNOTATIONS) {
+            extraAnnotations = output.annotations.subList(MAX_ANNOTATIONS, output.annotations.size());
+            output.annotations = output.annotations.subList(0, MAX_ANNOTATIONS);
+        } else {
+            extraAnnotations = Collections.emptyList();
+        }
+        GHCheckRun run = requester.with("output", output).with("actions", actions).fetch(GHCheckRun.class).wrap(repo);
+        while (!extraAnnotations.isEmpty()) {
+            Output output2 = new Output(output.title, output.summary);
+            int i = Math.min(extraAnnotations.size(), MAX_ANNOTATIONS);
+            output2.annotations = extraAnnotations.subList(0, i);
+            extraAnnotations = extraAnnotations.subList(i, extraAnnotations.size());
+            run = repo.root.createRequest()
+                    .withPreview(Previews.ANTIOPE)
+                    .method("PATCH")
+                    .with("output", output2)
+                    .withUrlPath(repo.getApiTailUrl("check-runs/" + run.getId()))
+                    .fetch(GHCheckRun.class)
+                    .wrap(repo);
+        }
+        return run;
+    }
+
+    /**
+     * @see <a href="https://developer.github.com/v3/checks/runs/#output-object">documentation</a>
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static final class Output {
+
+        private final String title;
+        private final String summary;
+        private String text;
+        private List<Annotation> annotations;
+        private List<Image> images;
+
+        public Output(@NonNull String title, @NonNull String summary) {
+            this.title = title;
+            this.summary = summary;
+        }
+
+        public @NonNull Output withText(@CheckForNull String text) {
+            this.text = text;
+            return this;
+        }
+
+        public @NonNull Output add(@NonNull Annotation annotation) {
+            if (annotations == null) {
+                annotations = new LinkedList<>();
+            }
+            annotations.add(annotation);
+            return this;
+        }
+
+        public @NonNull Output add(@NonNull Image image) {
+            if (images == null) {
+                images = new LinkedList<>();
+            }
+            images.add(image);
+            return this;
+        }
+
+    }
+
+    /**
+     * @see <a href="https://developer.github.com/v3/checks/runs/#annotations-object">documentation</a>
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static final class Annotation {
+
+        private final String path;
+        private final int start_line;
+        private final int end_line;
+        private final String annotation_level;
+        private final String message;
+        private Integer start_column;
+        private Integer end_column;
+        private String title;
+        private String raw_details;
+
+        public Annotation(@NonNull String path,
+                int line,
+                @NonNull GHCheckRun.AnnotationLevel annotationLevel,
+                @NonNull String message) {
+            this(path, line, line, annotationLevel, message);
+        }
+
+        public Annotation(@NonNull String path,
+                int startLine,
+                int endLine,
+                @NonNull GHCheckRun.AnnotationLevel annotationLevel,
+                @NonNull String message) {
+            this.path = path;
+            start_line = startLine;
+            end_line = endLine;
+            annotation_level = annotationLevel.toString().toLowerCase(Locale.ROOT);
+            this.message = message;
+        }
+
+        public @NonNull Annotation withStartColumn(@CheckForNull Integer startColumn) {
+            start_column = startColumn;
+            return this;
+        }
+
+        public @NonNull Annotation withEndColumn(@CheckForNull Integer endColumn) {
+            end_column = endColumn;
+            return this;
+        }
+
+        public @NonNull Annotation withTitle(@CheckForNull String title) {
+            this.title = title;
+            return this;
+        }
+
+        public @NonNull Annotation withRawDetails(@CheckForNull String rawDetails) {
+            raw_details = rawDetails;
+            return this;
+        }
+
+    }
+
+    /**
+     * @see <a href="https://developer.github.com/v3/checks/runs/#images-object">documentation</a>
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static final class Image {
+
+        private final String alt;
+        private final String image_url;
+        private String caption;
+
+        public Image(@NonNull String alt, @NonNull String imageURL) {
+            this.alt = alt;
+            image_url = imageURL;
+        }
+
+        public @NonNull Image withCaption(@CheckForNull String caption) {
+            this.caption = caption;
+            return this;
+        }
+
+    }
+
+    /**
+     * @see <a href="https://developer.github.com/v3/checks/runs/#actions-object">documentation</a>
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static final class Action {
+
+        private final String label;
+        private final String description;
+        private final String identifier;
+
+        public Action(@NonNull String label, @NonNull String description, @NonNull String identifier) {
+            this.label = label;
+            this.description = description;
+            this.identifier = identifier;
+        }
+
+    }
+
+}

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

@@ -0,0 +1,44 @@
+package org.kohsuke.github;
+
+import java.util.Iterator;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Iterable for check-runs listing.
+ */
+class GHCheckRunsIterable extends PagedIterable<GHCheckRun> {
+    private GitHub root;
+    private final GitHubRequest request;
+
+    private GHCheckRunsPage result;
+
+    public GHCheckRunsIterable(GitHub root, GitHubRequest request) {
+        this.root = root;
+        this.request = request;
+    }
+
+    @Nonnull
+    @Override
+    public PagedIterator<GHCheckRun> _iterator(int pageSize) {
+        return new PagedIterator<>(
+                adapt(GitHubPageIterator.create(root.getClient(), GHCheckRunsPage.class, request, pageSize)),
+                null);
+    }
+
+    protected Iterator<GHCheckRun[]> adapt(final Iterator<GHCheckRunsPage> base) {
+        return new Iterator<GHCheckRun[]>() {
+            public boolean hasNext() {
+                return base.hasNext();
+            }
+
+            public GHCheckRun[] next() {
+                GHCheckRunsPage v = base.next();
+                if (result == null) {
+                    result = v;
+                }
+                return v.getCheckRuns(root);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,20 @@
+package org.kohsuke.github;
+
+/**
+ * Represents the one page of check-runs result when listing check-runs.
+ */
+class GHCheckRunsPage {
+    private int total_count;
+    private GHCheckRun[] check_runs;
+
+    public int getTotalCount() {
+        return total_count;
+    }
+
+    GHCheckRun[] getCheckRuns(GitHub root) {
+        for (GHCheckRun check_run : check_runs) {
+            check_run.wrap(root);
+        }
+        return check_runs;
+    }
+}

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

@@ -0,0 +1,239 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * Represents a check suite.
+ *
+ * @see <a href="https://developer.github.com/v3/checks/suites/">documentation</a>
+ */
+@SuppressFBWarnings(value = { "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD", "URF_UNREAD_FIELD" },
+        justification = "JSON API")
+public class GHCheckSuite extends GHObject {
+    GHRepository owner;
+    GitHub root;
+
+    private String nodeId;
+    private String headBranch;
+    private String headSha;
+    private String status;
+    private String conclusion;
+    private String before;
+    private String after;
+    private int latestCheckRunsCount;
+    private URL checkRunsUrl;
+    private HeadCommit headCommit;
+    private GHApp app;
+    private GHPullRequest[] pullRequests;
+
+    GHCheckSuite wrap(GHRepository owner) {
+        this.owner = owner;
+        this.root = owner.root;
+        return this;
+    }
+
+    GHCheckSuite wrap(GitHub root) {
+        this.root = root;
+        if (owner != null) {
+            owner.wrap(root);
+        }
+        return this;
+    }
+
+    GHPullRequest[] wrap() {
+        return pullRequests;
+    }
+
+    /**
+     * Gets the global node id to access most objects in GitHub.
+     *
+     * @see <a href="https://developer.github.com/v4/guides/using-global-node-ids/">documentation</a>
+     * @return global node id
+     */
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    /**
+     * The head branch name the changes are on.
+     *
+     * @return head branch name
+     */
+    public String getHeadBranch() {
+        return headBranch;
+    }
+
+    /**
+     * Gets the HEAD SHA.
+     *
+     * @return sha for the HEAD commit
+     */
+    public String getHeadSha() {
+        return headSha;
+    }
+
+    /**
+     * Gets status of the check suite. It can be one of request, in_progress, or completed.
+     *
+     * @return status of the check suite
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * Gets conclusion of a completed check suite. It can be one of success, failure, neutral, cancelled, time_out,
+     * action_required, or stale. The check suite will report the highest priority check run conclusion in the check
+     * suite's conclusion.
+     *
+     * @return conclusion of the check suite
+     */
+    public String getConclusion() {
+        return conclusion;
+    }
+
+    /**
+     * The SHA of the most recent commit on ref before the push.
+     *
+     * @return sha of a commit
+     */
+    public String getBefore() {
+        return before;
+    }
+
+    /**
+     * The SHA of the most recent commit on ref after the push.
+     *
+     * @return sha of a commit
+     */
+    public String getAfter() {
+        return after;
+    }
+
+    /**
+     * The quantity of check runs that had run as part of the latest push.
+     *
+     * @return sha of the most recent commit
+     */
+    public int getLatestCheckRunsCount() {
+        return latestCheckRunsCount;
+    }
+
+    /**
+     * The url used to list all the check runs belonged to this suite.
+     *
+     * @return url containing all check runs
+     */
+    public URL getCheckRunsUrl() {
+        return checkRunsUrl;
+    }
+
+    /**
+     * The commit of current head.
+     *
+     * @return head commit
+     */
+    public HeadCommit getHeadCommit() {
+        return headCommit;
+    }
+
+    /**
+     * Gets the GitHub app this check suite belongs to, included in response.
+     *
+     * @return GitHub App
+     */
+    public GHApp getApp() {
+        return app;
+    }
+
+    /**
+     * Gets the pull requests participated in this check suite.
+     *
+     * @return Pull requests
+     */
+    GHPullRequest[] getPullRequests() throws IOException {
+        if (pullRequests != null && pullRequests.length != 0) {
+            for (GHPullRequest singlePull : pullRequests) {
+                singlePull.refresh();
+            }
+        }
+        return pullRequests;
+    }
+
+    /**
+     * Check suite doesn't have a HTML URL.
+     *
+     * @return null
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return null;
+    }
+
+    public static class HeadCommit {
+        private String id;
+        private String treeId;
+        private String message;
+        private String timestamp;
+        private GitUser author;
+        private GitUser committer;
+
+        /**
+         * Gets id of the commit, used by {@link GHCheckSuite} when a {@link GHEvent#CHECK_SUITE} comes
+         *
+         * @return id of the commit
+         */
+        public String getId() {
+            return id;
+        }
+
+        /**
+         * Gets id of the tree.
+         *
+         * @return id of the tree
+         */
+        public String getTreeId() {
+            return treeId;
+        }
+
+        /**
+         * Gets message.
+         *
+         * @return commit message.
+         */
+        public String getMessage() {
+            return message;
+        }
+
+        /**
+         * Gets timestamp of the commit.
+         *
+         * @return timestamp of the commit
+         */
+        public Date getTimestamp() {
+            return GitHubClient.parseDate(timestamp);
+        }
+
+        /**
+         * Gets author.
+         *
+         * @return the author
+         */
+        public GitUser getAuthor() {
+            return author;
+        }
+
+        /**
+         * Gets committer.
+         *
+         * @return the committer
+         */
+        public GitUser getCommitter() {
+            return committer;
+        }
+    }
+}

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

@@ -39,6 +39,8 @@ public class GHCommit {
 
         private int comment_count;
 
+        private GHVerification verification;
+
         static class Tree {
             String sha;
         }
@@ -61,7 +63,7 @@ public class GHCommit {
          * @return the authored date
          */
         public Date getAuthoredDate() {
-            return GitHub.parseDate(author.date);
+            return GitHubClient.parseDate(author.date);
         }
 
         /**
@@ -80,7 +82,7 @@ public class GHCommit {
          * @return the commit date
          */
         public Date getCommitDate() {
-            return GitHub.parseDate(committer.date);
+            return GitHubClient.parseDate(committer.date);
         }
 
         /**
@@ -100,6 +102,15 @@ public class GHCommit {
         public int getCommentCount() {
             return comment_count;
         }
+
+        /**
+         * Gets Verification Status.
+         *
+         * @return the Verification status
+         */
+        public GHVerification getVerification() {
+            return verification;
+        }
     }
 
     /**
@@ -201,7 +212,7 @@ public class GHCommit {
          *         resolves to the actual content of the file.
          */
         public URL getRawUrl() {
-            return GitHub.parseURL(raw_url);
+            return GitHubClient.parseURL(raw_url);
         }
 
         /**
@@ -212,7 +223,7 @@ public class GHCommit {
          *         that resolves to the HTML page that describes this file.
          */
         public URL getBlobUrl() {
-            return GitHub.parseURL(blob_url);
+            return GitHubClient.parseURL(blob_url);
         }
 
         /**
@@ -326,7 +337,7 @@ public class GHCommit {
      *         "https://github.com/kohsuke/sandbox-ant/commit/8ae38db0ea5837313ab5f39d43a6f73de3bd9000"
      */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -512,6 +523,19 @@ public class GHCommit {
         return owner.getLastCommitStatus(sha);
     }
 
+    /**
+     * Gets check-runs for given sha.
+     *
+     * @return check runs for given sha.
+     * @throws IOException
+     *             on error
+     */
+    @Preview
+    @Deprecated
+    public PagedIterable<GHCheckRun> getCheckRuns() throws IOException {
+        return owner.getCheckRuns(sha);
+    }
+
     /**
      * Some of the fields are not always filled in when this object is retrieved as a part of another API call.
      * 

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

@@ -41,7 +41,7 @@ public class GHCommitComment extends GHObject implements Reactable {
      * show this commit comment in a browser.
      */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -153,7 +153,7 @@ public class GHCommitComment extends GHObject implements Reactable {
     }
 
     private String getApiTail() {
-        return String.format("/repos/%s/%s/comments/%s", owner.getOwnerName(), owner.getName(), id);
+        return String.format("/repos/%s/%s/comments/%s", owner.getOwnerName(), owner.getName(), getId());
     }
 
     GHCommitComment wrap(GHRepository owner) {

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

@@ -83,7 +83,7 @@ public class GHCommitQueryBuilder {
      * @return the gh commit query builder
      */
     public GHCommitQueryBuilder since(Date dt) {
-        req.with("since", GitHub.printDate(dt));
+        req.with("since", GitHubClient.printDate(dt));
         return this;
     }
 
@@ -106,7 +106,7 @@ public class GHCommitQueryBuilder {
      * @return the gh commit query builder
      */
     public GHCommitQueryBuilder until(Date dt) {
-        req.with("until", GitHub.printDate(dt));
+        req.with("until", GitHubClient.printDate(dt));
         return this;
     }
 

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

@@ -259,7 +259,7 @@ public class GHCommitSearchBuilder extends GHSearchBuilder<GHCommit> {
         if (StringUtils.isBlank(commitUrl)) {
             return null;
         }
-        int indexOfUsername = (GitHub.GITHUB_URL + "/repos/").length();
+        int indexOfUsername = (GitHubClient.GITHUB_URL + "/repos/").length();
         String[] tokens = commitUrl.substring(indexOfUsername).split("/", 3);
         return tokens[0] + '/' + tokens[1];
     }

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

@@ -27,7 +27,7 @@ public class GHCompare {
      * @return the url
      */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**
@@ -36,7 +36,7 @@ public class GHCompare {
      * @return the html url
      */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -45,7 +45,7 @@ public class GHCompare {
      * @return the permalink url
      */
     public URL getPermalinkUrl() {
-        return GitHub.parseURL(permalink_url);
+        return GitHubClient.parseURL(permalink_url);
     }
 
     /**
@@ -54,7 +54,7 @@ public class GHCompare {
      * @return the diff url
      */
     public URL getDiffUrl() {
-        return GitHub.parseURL(diff_url);
+        return GitHubClient.parseURL(diff_url);
     }
 
     /**
@@ -63,7 +63,7 @@ public class GHCompare {
      * @return the patch url
      */
     public URL getPatchUrl() {
-        return GitHub.parseURL(patch_url);
+        return GitHubClient.parseURL(patch_url);
     }
 
     /**

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

@@ -388,22 +388,6 @@ public class GHContent implements Refreshable {
         return this;
     }
 
-    /**
-     * Wrap gh content [ ].
-     *
-     * @param contents
-     *            the contents
-     * @param repository
-     *            the repository
-     * @return the gh content [ ]
-     */
-    public static GHContent[] wrap(GHContent[] contents, GHRepository repository) {
-        for (GHContent unwrappedContent : contents) {
-            unwrappedContent.wrap(repository);
-        }
-        return contents;
-    }
-
     /**
      * Fully populate the data by retrieving missing data.
      *

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

@@ -79,6 +79,18 @@ public class GHCreateRepositoryBuilder {
         return this;
     }
 
+    /**
+     * Enables projects
+     *
+     * @param enabled
+     *            true if enabled
+     * @return a builder to continue with building
+     */
+    public GHCreateRepositoryBuilder projects(boolean enabled) {
+        this.builder.with("has_projects", enabled);
+        return this;
+    }
+
     /**
      * Enables wiki
      *

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

@@ -38,7 +38,7 @@ public class GHDeployment extends GHObject {
      * @return the statuses url
      */
     public URL getStatusesUrl() {
-        return GitHub.parseURL(statuses_url);
+        return GitHubClient.parseURL(statuses_url);
     }
 
     /**
@@ -47,7 +47,7 @@ public class GHDeployment extends GHObject {
      * @return the repository url
      */
     public URL getRepositoryUrl() {
-        return GitHub.parseURL(repository_url);
+        return GitHubClient.parseURL(repository_url);
     }
 
     /**
@@ -122,7 +122,7 @@ public class GHDeployment extends GHObject {
      * @return the gh deployment status builder
      */
     public GHDeploymentStatusBuilder createStatus(GHDeploymentState state) {
-        return new GHDeploymentStatusBuilder(owner, id, state);
+        return new GHDeploymentStatusBuilder(owner, getId(), state);
     }
 
     /**

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

@@ -37,7 +37,7 @@ public class GHDeploymentStatus extends GHObject {
      * @return the target url
      */
     public URL getTargetUrl() {
-        return GitHub.parseURL(target_url);
+        return GitHubClient.parseURL(target_url);
     }
 
     /**
@@ -46,7 +46,7 @@ public class GHDeploymentStatus extends GHObject {
      * @return the deployment url
      */
     public URL getDeploymentUrl() {
-        return GitHub.parseURL(deployment_url);
+        return GitHubClient.parseURL(deployment_url);
     }
 
     /**
@@ -55,7 +55,7 @@ public class GHDeploymentStatus extends GHObject {
      * @return the repository url
      */
     public URL getRepositoryUrl() {
-        return GitHub.parseURL(repository_url);
+        return GitHubClient.parseURL(repository_url);
     }
 
     /**

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

@@ -23,6 +23,7 @@ public class GHDeploymentStatusBuilder {
      *            the state
      * @deprecated Use {@link GHDeployment#createStatus(GHDeploymentState)}
      */
+    @Deprecated
     public GHDeploymentStatusBuilder(GHRepository repo, int deploymentId, GHDeploymentState state) {
         this(repo, (long) deploymentId, state);
     }

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

@@ -0,0 +1,232 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JacksonInject;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Objects;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * A discussion in GitHub Team.
+ *
+ * @author Charles Moulliard
+ * @see <a href="https://developer.github.com/v3/teams/discussions">GitHub Team Discussions</a>
+ */
+public class GHDiscussion extends GHObject {
+
+    @JacksonInject
+    private GitHub root;
+    private GHTeam team;
+    private long number;
+    private String body, title, htmlUrl;
+
+    @JsonProperty(value = "private")
+    private boolean isPrivate;
+
+    @Override
+    public URL getHtmlUrl() throws IOException {
+        return GitHubClient.parseURL(htmlUrl);
+    }
+
+    GHDiscussion wrapUp(GHTeam team) {
+        this.team = team;
+        return this;
+    }
+
+    /**
+     * Get the team to which this discussion belongs.
+     *
+     * @return the team for this discussion
+     */
+    @Nonnull
+    public GHTeam getTeam() {
+        return team;
+    }
+
+    /**
+     * Get the title of the discussion.
+     *
+     * @return the title
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * The description of this discussion.
+     *
+     * @return the body
+     */
+    public String getBody() {
+        return body;
+    }
+
+    /**
+     * The number of this discussion.
+     *
+     * @return the number
+     */
+    public long getNumber() {
+        return number;
+    }
+
+    /**
+     * The id number of this discussion. GitHub discussions have "number" instead of "id". This is provided for
+     * convenience.
+     *
+     * @return the id number for this discussion
+     * @see #getNumber()
+     */
+    @Override
+    public long getId() {
+        return getNumber();
+    }
+
+    /**
+     * Whether the discussion is private to the team.
+     *
+     * @return {@code true} if discussion is private.
+     */
+    public boolean isPrivate() {
+        return isPrivate;
+    }
+
+    /**
+     * Begins the creation of a new instance.
+     *
+     * Consumer must call {@link GHDiscussion.Creator#done()} to commit changes.
+     *
+     * @param team
+     *            the team in which the discussion will be created.
+     * @return a {@link GHLabel.Creator}
+     * @throws IOException
+     *             the io exception
+     */
+    static GHDiscussion.Creator create(GHTeam team) throws IOException {
+        return new GHDiscussion.Creator(team);
+    }
+
+    static GHDiscussion read(GHTeam team, long discussionNumber) throws IOException {
+        return team.root.createRequest()
+                .setRawUrlPath(getRawUrlPath(team, discussionNumber))
+                .fetch(GHDiscussion.class)
+                .wrapUp(team);
+    }
+
+    static PagedIterable<GHDiscussion> readAll(GHTeam team) throws IOException {
+        return team.root.createRequest()
+                .setRawUrlPath(getRawUrlPath(team, null))
+                .toIterable(GHDiscussion[].class, item -> item.wrapUp(team));
+    }
+
+    /**
+     * Begins a batch update
+     *
+     * Consumer must call {@link GHDiscussion.Updater#done()} to commit changes.
+     *
+     * @return a {@link GHDiscussion.Updater}
+     */
+    @Preview
+    @Deprecated
+    public GHDiscussion.Updater update() {
+        return new GHDiscussion.Updater(this);
+    }
+
+    /**
+     * Begins a single property update.
+     *
+     * @return a {@link GHDiscussion.Setter}
+     */
+    @Preview
+    @Deprecated
+    public GHDiscussion.Setter set() {
+        return new GHDiscussion.Setter(this);
+    }
+
+    /**
+     * Delete the discussion
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    public void delete() throws IOException {
+        team.root.createRequest().method("DELETE").setRawUrlPath(getRawUrlPath(team, number)).send();
+    }
+
+    private static String getRawUrlPath(@Nonnull GHTeam team, @CheckForNull Long discussionNumber) {
+        return team.getUrl().toString() + "/discussions" + (discussionNumber == null ? "" : "/" + discussionNumber);
+    }
+
+    /**
+     * A {@link GHLabelBuilder} that updates a single property per request
+     *
+     * {@link #done()} is called automatically after the property is set.
+     */
+    public static class Setter extends GHDiscussionBuilder<GHDiscussion> {
+        private Setter(@Nonnull GHDiscussion base) {
+            super(GHDiscussion.class, base.team, base);
+            requester.method("PATCH").setRawUrlPath(base.getUrl().toString());
+        }
+    }
+
+    /**
+     * A {@link GHLabelBuilder} that allows multiple properties to be updated per request.
+     *
+     * Consumer must call {@link #done()} to commit changes.
+     */
+    public static class Updater extends GHDiscussionBuilder<Updater> {
+        private Updater(@Nonnull GHDiscussion base) {
+            super(GHDiscussion.Updater.class, base.team, base);
+            requester.method("PATCH").setRawUrlPath(base.getUrl().toString());
+        }
+    }
+
+    /**
+     * A {@link GHLabelBuilder} that creates a new {@link GHLabel}
+     *
+     * Consumer must call {@link #done()} to create the new instance.
+     */
+    public static class Creator extends GHDiscussionBuilder<Creator> {
+
+        private Creator(@Nonnull GHTeam team) {
+            super(GHDiscussion.Creator.class, team, null);
+            requester.method("POST").setRawUrlPath(getRawUrlPath(team, null));
+        }
+
+        /**
+         * Sets whether this discussion is private to this team.
+         *
+         * @param value
+         *            privacy of this discussion
+         * @return either a continuing builder or an updated {@link GHDiscussion}
+         * @throws IOException
+         *             if there is an I/O Exception
+         */
+        @Nonnull
+        public Creator private_(boolean value) throws IOException {
+            return with("private", value);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        GHDiscussion that = (GHDiscussion) o;
+        return number == that.number && Objects.equals(getUrl(), that.getUrl()) && Objects.equals(team, that.team)
+                && Objects.equals(body, that.body) && Objects.equals(title, that.title);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(team, number, body, title);
+    }
+}

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

@@ -0,0 +1,80 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * Base class for creating or updating a discussion.
+ *
+ * @param <S>
+ *            Intermediate return type for this builder returned by calls to {@link #with(String, Object)}. If {@link S}
+ *            the same as {@link GHLabel}, this builder will commit changes after each call to
+ *            {@link #with(String, Object)}.
+ */
+class GHDiscussionBuilder<S> extends AbstractBuilder<GHDiscussion, S> {
+
+    private final GHTeam team;
+
+    /**
+     *
+     * @param intermediateReturnType
+     *            Intermediate return type for this builder returned by calls to {@link #with(String, Object)}. If
+     *            {@link S} the same as {@link GHDiscussion}, this builder will commit changes after each call to
+     *            {@link #with(String, Object)}.
+     * @param team
+     *            the GitHub team. Updates will be sent to the root of this team.
+     * @param baseInstance
+     *            instance on which to base this builder. If {@code null} a new instance will be created.
+     */
+    protected GHDiscussionBuilder(@Nonnull Class<S> intermediateReturnType,
+            @Nonnull GHTeam team,
+            @CheckForNull GHDiscussion baseInstance) {
+        super(GHDiscussion.class, intermediateReturnType, team.root, baseInstance);
+
+        this.team = team;
+
+        if (baseInstance != null) {
+            requester.with("title", baseInstance.getTitle());
+            requester.with("body", baseInstance.getBody());
+        }
+    }
+
+    /**
+     * Title for this discussion.
+     *
+     * @param value
+     *            title of discussion
+     * @return either a continuing builder or an updated {@link GHDiscussion}
+     * @throws IOException
+     *             if there is an I/O Exception
+     */
+    @Nonnull
+    public S title(String value) throws IOException {
+        return with("title", value);
+    }
+
+    /**
+     * Body content for this discussion.
+     *
+     * @param value
+     *            body of discussion*
+     * @return either a continuing builder or an updated {@link GHDiscussion}
+     * @throws IOException
+     *             if there is an I/O Exception
+     */
+    @Nonnull
+    public S body(String value) throws IOException {
+        return with("body", value);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Nonnull
+    @Override
+    public GHDiscussion done() throws IOException {
+        return super.done().wrapUp(team);
+    }
+}

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

@@ -50,6 +50,7 @@ public enum GHEvent {
     PULL_REQUEST_REVIEW,
     PULL_REQUEST_REVIEW_COMMENT,
     PUSH,
+    REGISTRY_PACKAGE,
     RELEASE,
     REPOSITORY_DISPATCH, // only valid for org hooks
     REPOSITORY,

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

@@ -78,7 +78,7 @@ public class GHEventInfo {
      * @return the created at
      */
     public Date getCreatedAt() {
-        return GitHub.parseDate(created_at);
+        return GitHubClient.parseDate(created_at);
     }
 
     /**
@@ -144,7 +144,7 @@ public class GHEventInfo {
      *             if payload cannot be parsed
      */
     public <T extends GHEventPayload> T getPayload(Class<T> type) throws IOException {
-        T v = GitHub.MAPPER.readValue(payload.traverse(), type);
+        T v = GitHubClient.getMappingObjectReader(root).readValue(payload.traverse(), type);
         v.wrapUp(root);
         return v;
     }

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

@@ -3,6 +3,7 @@ package org.kohsuke.github;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+import java.io.IOException;
 import java.io.Reader;
 import java.util.List;
 
@@ -48,7 +49,7 @@ public abstract class GHEventPayload {
     }
 
     // List of events that still need to be added:
-    // CheckRunEvent CheckSuiteEvent ContentReferenceEvent
+    // ContentReferenceEvent
     // DeployKeyEvent DownloadEvent FollowEvent ForkApplyEvent GitHubAppAuthorizationEvent GistEvent GollumEvent
     // InstallationEvent InstallationRepositoriesEvent IssuesEvent LabelEvent MarketplacePurchaseEvent MemberEvent
     // MembershipEvent MetaEvent MilestoneEvent OrganizationEvent OrgBlockEvent PackageEvent PageBuildEvent
@@ -132,6 +133,7 @@ public abstract class GHEventPayload {
          * @return the repository
          */
         public GHRepository getRepository() {
+            repository.root = root;
             return repository;
         }
 
@@ -150,6 +152,209 @@ public abstract class GHEventPayload {
         }
     }
 
+    /**
+     * A check suite event has been requested, rerequested or completed.
+     *
+     * @see <a href="https://developer.github.com/v3/activity/events/types/#checkrunevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(
+            value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
+            justification = "JSON API")
+    public static class CheckSuite extends GHEventPayload {
+        private String action;
+        private GHCheckSuite checkSuite;
+        private GHRepository repository;
+
+        /**
+         * Gets action.
+         *
+         * @return the action
+         */
+        public String getAction() {
+            return action;
+        }
+
+        /**
+         * Gets the Check Suite object
+         *
+         * @return the Check Suite object
+         */
+        public GHCheckSuite getCheckSuite() {
+            return checkSuite;
+        }
+
+        /**
+         * Gets repository.
+         *
+         * @return the repository
+         */
+        public GHRepository getRepository() {
+            repository.root = root;
+            return repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (checkSuite == null)
+                throw new IllegalStateException(
+                        "Expected check_suite payload, but got something else. Maybe we've got another type of event?");
+            if (repository != null) {
+                repository.wrap(root);
+                checkSuite.wrap(repository);
+            } else {
+                checkSuite.wrap(root);
+            }
+        }
+    }
+
+    /**
+     * An installation has been installed, uninstalled, or its permissions have been changed.
+     *
+     * @see <a href="https://developer.github.com/v3/activity/events/types/#installationevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = { "UWF_UNWRITTEN_FIELD" }, justification = "JSON API")
+    public static class Installation extends GHEventPayload {
+        private String action;
+        private GHAppInstallation installation;
+        private List<GHRepository> repositories;
+
+        /**
+         * Gets action
+         *
+         * @return the action
+         */
+        public String getAction() {
+            return action;
+        }
+
+        /**
+         * Gets installation
+         *
+         * @return the installation
+         */
+        public GHAppInstallation getInstallation() {
+            return installation;
+        }
+
+        /**
+         * Gets repositories
+         *
+         * @return the repositories
+         */
+        public List<GHRepository> getRepositories() {
+            return repositories;
+        };
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (installation == null)
+                throw new IllegalStateException(
+                        "Expected check_suite payload, but got something else. Maybe we've got another type of event?");
+            else
+                installation.wrapUp(root);
+
+            if (repositories != null && !repositories.isEmpty()) {
+                try {
+                    for (GHRepository singleRepo : repositories) { // warp each of the repository
+                        singleRepo.wrap(root);
+                        singleRepo.populate();
+                    }
+                } catch (IOException e) {
+                    throw new GHException("Failed to refresh repositories", e);
+                }
+            }
+        }
+    }
+
+    /**
+     * A repository has been added or removed from an installation.
+     *
+     * @see <a href="https://developer.github.com/v3/activity/events/types/#installationrepositoriesevent">authoritative
+     *      source</a>
+     */
+    @SuppressFBWarnings(value = { "UWF_UNWRITTEN_FIELD" }, justification = "JSON API")
+    public static class InstallationRepositories extends GHEventPayload {
+        private String action;
+        private GHAppInstallation installation;
+        private String repositorySelection;
+        private List<GHRepository> repositoriesAdded;
+        private List<GHRepository> repositoriesRemoved;
+
+        /**
+         * Gets action
+         *
+         * @return the action
+         */
+        public String getAction() {
+            return action;
+        }
+
+        /**
+         * Gets installation
+         *
+         * @return the installation
+         */
+        public GHAppInstallation getInstallation() {
+            return installation;
+        }
+
+        /**
+         * Gets installation selection
+         *
+         * @return the installation selection
+         */
+        public String getRepositorySelection() {
+            return repositorySelection;
+        }
+
+        /**
+         * Gets repositories added
+         *
+         * @return the repositories
+         */
+        public List<GHRepository> getRepositoriesAdded() {
+            return repositoriesAdded;
+        }
+
+        /**
+         * Gets repositories removed
+         *
+         * @return the repositories
+         */
+        public List<GHRepository> getRepositoriesRemoved() {
+            return repositoriesRemoved;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (installation == null)
+                throw new IllegalStateException(
+                        "Expected check_suite payload, but got something else. Maybe we've got another type of event?");
+            else
+                installation.wrapUp(root);
+
+            List<GHRepository> repositories;
+            if ("added".equals(action))
+                repositories = repositoriesAdded;
+            else // action == "removed"
+                repositories = repositoriesRemoved;
+
+            if (repositories != null && !repositories.isEmpty()) {
+                try {
+                    for (GHRepository singleRepo : repositories) { // warp each of the repository
+                        singleRepo.wrap(root);
+                        singleRepo.populate();
+                    }
+                } catch (IOException e) {
+                    throw new GHException("Failed to refresh repositories", e);
+                }
+            }
+        }
+    }
+
     /**
      * A pull request status has changed.
      *
@@ -1428,6 +1633,107 @@ public abstract class GHEventPayload {
                 organization.wrapUp(root);
             }
         }
+    }
 
+    /**
+     * A git commit status was changed.
+     *
+     * @see <a href="https://developer.github.com/v3/activity/events/types/#statusevent">authoritative source</a>
+     */
+    @SuppressFBWarnings(value = { "UWF_UNWRITTEN_FIELD" }, justification = "Constructed by JSON deserialization")
+    public static class Status extends GHEventPayload {
+        private String context;
+        private String description;
+        private GHCommitState state;
+        private GHCommit commit;
+        private GHRepository repository;
+
+        /**
+         * Gets the status content.
+         * 
+         * @return status content
+         */
+        public String getContext() {
+            return context;
+        }
+
+        /**
+         * Gets the status description.
+         * 
+         * @return status description
+         */
+        public String getDescription() {
+            return description;
+        }
+
+        /**
+         * Gets the status state.
+         * 
+         * @return status state
+         */
+        public GHCommitState getState() {
+            return state;
+        }
+
+        /**
+         * Sets the status stage.
+         * 
+         * @param state
+         *            status state
+         */
+        public void setState(GHCommitState state) {
+            this.state = state;
+        }
+
+        /**
+         * Gets the commit associated with the status event.
+         * 
+         * @return commit
+         */
+        public GHCommit getCommit() {
+            return commit;
+        }
+
+        /**
+         * Sets the commit associated with the status event.
+         * 
+         * @param commit
+         *            commit
+         */
+        public void setCommit(GHCommit commit) {
+            this.commit = commit;
+        }
+
+        /**
+         * Gets the repository associated with the status event.
+         * 
+         * @return repository
+         */
+        public GHRepository getRepository() {
+            return repository;
+        }
+
+        /**
+         * Sets the repository associated with the status event.
+         * 
+         * @param repository
+         *            repository
+         */
+        public void setRepository(GHRepository repository) {
+            this.repository = repository;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            if (state == null) {
+                throw new IllegalStateException(
+                        "Expected status payload, but got something else. Maybe we've got another type of event?");
+            }
+            if (repository != null) {
+                repository.wrap(root);
+                commit.wrapUp(repository);
+            }
+        }
     }
 }

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

@@ -1,11 +1,11 @@
 package org.kohsuke.github;
 
 import java.io.FileNotFoundException;
-import java.net.HttpURLConnection;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 /**
  * Request/responce contains useful metadata. Custom exception allows store info for next diagnostics.
@@ -24,11 +24,24 @@ public class GHFileNotFoundException extends FileNotFoundException {
     /**
      * Instantiates a new Gh file not found exception.
      *
-     * @param s
-     *            the s
+     * @param message
+     *            the message
      */
-    public GHFileNotFoundException(String s) {
-        super(s);
+    public GHFileNotFoundException(String message) {
+        super(message);
+    }
+
+    /**
+     * Instantiates a new Gh file not found exception.
+     *
+     * @param message
+     *            the message
+     * @param cause
+     *            the cause
+     */
+    public GHFileNotFoundException(String message, Throwable cause) {
+        super(message);
+        this.initCause(cause);
     }
 
     /**
@@ -41,8 +54,8 @@ public class GHFileNotFoundException extends FileNotFoundException {
         return responseHeaderFields;
     }
 
-    GHFileNotFoundException withResponseHeaderFields(HttpURLConnection urlConnection) {
-        this.responseHeaderFields = urlConnection.getHeaderFields();
+    GHFileNotFoundException withResponseHeaderFields(@Nonnull Map<String, List<String>> headerFields) {
+        this.responseHeaderFields = headerFields;
         return this;
     }
 }

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

@@ -1,12 +1,13 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.StringUtils;
 
 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;
 
@@ -20,8 +21,9 @@ import java.util.Map.Entry;
  * @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;
+
+    final GHUser owner;
+    final GitHub root;
 
     private String forks_url, commits_url, id, git_pull_url, git_push_url, html_url;
 
@@ -34,7 +36,43 @@ public class GHGist extends GHObject {
 
     private String comments_url;
 
-    private Map<String, GHGistFile> files = new HashMap<String, GHGistFile>();
+    private final Map<String, GHGistFile> files;
+
+    @JsonCreator
+    private GHGist(@JacksonInject GitHub root,
+            @JsonProperty("owner") GHUser owner,
+            @JsonProperty("files") Map<String, GHGistFile> files) {
+        this.root = root;
+        for (Entry<String, GHGistFile> e : files.entrySet()) {
+            e.getValue().fileName = e.getKey();
+        }
+        this.files = Collections.unmodifiableMap(files);
+        this.owner = root.getUser(owner);
+    }
+
+    /**
+     * Unlike most other GitHub objects, the id for Gists can be non-numeric, such as "aa5a315d61ae9438b18d". If the id
+     * is numeric, this method will get it. If id is not numeric, this will throw a runtime
+     * {@link NumberFormatException}.
+     *
+     * @return id of the Gist.
+     * @deprecated Use {@link #getGistId()} instead.
+     */
+    @Deprecated
+    @Override
+    public long getId() {
+        return Long.parseLong(getGistId());
+    }
+
+    /**
+     * Gets the id for this Gist. Unlike most other GitHub objects, the id for Gists can be non-numeric, such as
+     * "aa5a315d61ae9438b18d". This should be used instead of {@link #getId()}.
+     *
+     * @return id of this Gist
+     */
+    public String getGistId() {
+        return this.id;
+    }
 
     /**
      * Gets owner.
@@ -44,7 +82,7 @@ public class GHGist extends GHObject {
      *             the io exception
      */
     public GHUser getOwner() throws IOException {
-        return root.intern(owner);
+        return owner;
     }
 
     /**
@@ -83,8 +121,13 @@ public class GHGist extends GHObject {
         return git_push_url;
     }
 
+    /**
+     * Get the html url.
+     * 
+     * @return the github html url
+     */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -140,31 +183,7 @@ public class GHGist extends GHObject {
      * @return the files
      */
     public Map<String, GHGistFile> getFiles() {
-        return Collections.unmodifiableMap(files);
-    }
-
-    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.
-     */
-    GHGist wrapUp(GitHub root) {
-        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();
-        }
+        return files;
     }
 
     String getApiTailUrl(String tail) {
@@ -214,7 +233,7 @@ public class GHGist extends GHObject {
      *             the io exception
      */
     public GHGist fork() throws IOException {
-        return root.createRequest().method("POST").withUrlPath(getApiTailUrl("forks")).fetch(GHGist.class).wrapUp(root);
+        return root.createRequest().method("POST").withUrlPath(getApiTailUrl("forks")).fetch(GHGist.class);
     }
 
     /**
@@ -223,9 +242,7 @@ public class GHGist extends GHObject {
      * @return the paged iterable
      */
     public PagedIterable<GHGist> listForks() {
-        return root.createRequest()
-                .withUrlPath(getApiTailUrl("forks"))
-                .toIterable(GHGist[].class, item -> item.wrapUp(root));
+        return root.createRequest().withUrlPath(getApiTailUrl("forks")).toIterable(GHGist[].class, null);
     }
 
     /**
@@ -264,10 +281,4 @@ public class GHGist extends GHObject {
     public int hashCode() {
         return id.hashCode();
     }
-
-    GHGist wrap(GHUser owner) {
-        this.owner = owner;
-        this.root = owner.root;
-        return this;
-    }
 }

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

@@ -4,6 +4,8 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 
+import javax.annotation.Nonnull;
+
 /**
  * Builder pattern for creating a new Gist.
  *
@@ -59,7 +61,7 @@ public class GHGistBuilder {
      *            the content
      * @return Adds a new file.
      */
-    public GHGistBuilder file(String fileName, String content) {
+    public GHGistBuilder file(@Nonnull String fileName, @Nonnull String content) {
         files.put(fileName, Collections.singletonMap("content", content));
         return this;
     }
@@ -73,6 +75,6 @@ public class GHGistBuilder {
      */
     public GHGist create() throws IOException {
         req.with("files", files);
-        return req.withUrlPath("/gists").fetch(GHGist.class).wrapUp(root);
+        return req.withUrlPath("/gists").fetch(GHGist.class);
     }
 }

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

@@ -1,8 +1,11 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
 
 /**
  * Builder pattern for updating a Gist.
@@ -12,7 +15,7 @@ import java.util.LinkedHashMap;
 public class GHGistUpdater {
     private final GHGist base;
     private final Requester builder;
-    LinkedHashMap<String, Object> files;
+    LinkedHashMap<String, Map<String, String>> files;
 
     GHGistUpdater(GHGist base) {
         this.base = base;
@@ -32,16 +35,15 @@ public class GHGistUpdater {
      * @throws IOException
      *             the io exception
      */
-    public GHGistUpdater addFile(String fileName, String content) throws IOException {
+    public GHGistUpdater addFile(@Nonnull String fileName, @Nonnull String content) throws IOException {
         updateFile(fileName, content);
         return this;
     }
 
-    // // This method does not work.
-    // public GHGistUpdater deleteFile(String fileName) throws IOException {
-    // files.put(fileName, Collections.singletonMap("filename", null));
-    // return this;
-    // }
+    public GHGistUpdater deleteFile(@Nonnull String fileName) throws IOException {
+        files.put(fileName, null);
+        return this;
+    }
 
     /**
      * Rename file gh gist updater.
@@ -54,8 +56,9 @@ public class GHGistUpdater {
      * @throws IOException
      *             the io exception
      */
-    public GHGistUpdater renameFile(String fileName, String newFileName) throws IOException {
-        files.put(fileName, Collections.singletonMap("filename", newFileName));
+    public GHGistUpdater renameFile(@Nonnull String fileName, @Nonnull String newFileName) throws IOException {
+        Map<String, String> file = files.computeIfAbsent(fileName, d -> new HashMap<>());
+        file.put("filename", newFileName);
         return this;
     }
 
@@ -70,8 +73,31 @@ public class GHGistUpdater {
      * @throws IOException
      *             the io exception
      */
-    public GHGistUpdater updateFile(String fileName, String content) throws IOException {
-        files.put(fileName, Collections.singletonMap("content", content));
+    public GHGistUpdater updateFile(@Nonnull String fileName, @Nonnull String content) throws IOException {
+        Map<String, String> file = files.computeIfAbsent(fileName, d -> new HashMap<>());
+        file.put("content", content);
+        return this;
+    }
+
+    /**
+     * Update file name and content
+     *
+     * @param fileName
+     *            the file name
+     * @param newFileName
+     *            the new file name
+     * @param content
+     *            the content
+     * @return the gh gist updater
+     * @throws IOException
+     *             the io exception
+     */
+    public GHGistUpdater updateFile(@Nonnull String fileName, @Nonnull String newFileName, @Nonnull String content)
+            throws IOException {
+        Map<String, String> file = files.computeIfAbsent(fileName, d -> new HashMap<>());
+        file.put("content", content);
+        file.put("filename", newFileName);
+        files.put(fileName, file);
         return this;
     }
 
@@ -96,6 +122,6 @@ public class GHGistUpdater {
      */
     public GHGist update() throws IOException {
         builder.with("files", files);
-        return builder.method("PATCH").withUrlPath(base.getApiTailUrl("")).fetch(GHGist.class).wrap(base.owner);
+        return builder.method("PATCH").withUrlPath(base.getApiTailUrl("")).fetch(GHGist.class);
     }
 }

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

@@ -1,11 +1,11 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
 /**
  * Request/responce contains useful metadata. Custom exception allows store info for next diagnostics.
@@ -31,6 +31,20 @@ public class GHIOException extends IOException {
         super(message);
     }
 
+    /**
+     * Constructs a {@code GHIOException} with the specified detail message and cause.
+     *
+     * @param message
+     *            The detail message (which is saved for later retrieval by the {@link #getMessage()} method)
+     *
+     * @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.)
+     */
+    public GHIOException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
     /**
      * Gets response header fields.
      *
@@ -41,8 +55,8 @@ public class GHIOException extends IOException {
         return responseHeaderFields;
     }
 
-    GHIOException withResponseHeaderFields(HttpURLConnection urlConnection) {
-        this.responseHeaderFields = urlConnection.getHeaderFields();
+    GHIOException withResponseHeaderFields(@Nonnull Map<String, List<String>> headerFields) {
+        this.responseHeaderFields = headerFields;
         return this;
     }
 }

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

@@ -51,6 +51,6 @@ public class GHInvitation extends GHObject {
 
     @Override
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 }

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

@@ -26,6 +26,7 @@ package org.kohsuke.github;
 
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.net.URL;
@@ -36,6 +37,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import static org.kohsuke.github.Previews.SQUIRREL_GIRL;
 
@@ -63,8 +65,7 @@ public class GHIssue extends GHObject implements Reactable {
     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 List<GHLabel> labels;
     protected GHUser user;
     protected String title, html_url;
     protected GHIssue.PullRequest pull_request;
@@ -72,14 +73,6 @@ public class GHIssue extends GHObject implements Reactable {
     protected GHUser closed_by;
     protected boolean locked;
 
-    /**
-     * The type Label.
-     *
-     * @deprecated use {@link GHLabel}
-     */
-    public static class Label extends GHLabel {
-    }
-
     GHIssue wrap(GHRepository owner) {
         this.owner = owner;
         if (milestone != null)
@@ -100,12 +93,6 @@ public class GHIssue extends GHObject implements Reactable {
         return this;
     }
 
-    static GHIssue[] wrap(GHIssue[] issues, GHRepository owner) {
-        for (GHIssue i : issues)
-            i.wrap(owner);
-        return issues;
-    }
-
     /**
      * Repository to which the issue belongs.
      *
@@ -137,7 +124,7 @@ public class GHIssue extends GHObject implements Reactable {
      * The HTML page of this issue, like https://github.com/jenkinsci/jenkins/issues/100
      */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -178,7 +165,7 @@ public class GHIssue extends GHObject implements Reactable {
         if (labels == null) {
             return Collections.emptyList();
         }
-        return Collections.<GHLabel>unmodifiableList(labels);
+        return Collections.unmodifiableList(labels);
     }
 
     /**
@@ -187,16 +174,18 @@ public class GHIssue extends GHObject implements Reactable {
      * @return the closed at
      */
     public Date getClosedAt() {
-        return GitHub.parseDate(closed_at);
+        return GitHubClient.parseDate(closed_at);
     }
 
     /**
      * Gets api url.
      *
-     * @return the api url
+     * @return API URL of this object.
+     * @deprecated use {@link #getUrl()}
      */
+    @Deprecated
     public URL getApiURL() {
-        return GitHub.parseURL(url);
+        return getUrl();
     }
 
     /**
@@ -242,6 +231,13 @@ public class GHIssue extends GHObject implements Reactable {
         root.createRequest().with(key, value).method("PATCH").withUrlPath(getApiRoute()).send();
     }
 
+    /**
+     * Identical to edit(), but allows null for the value.
+     */
+    private void editNullable(String key, Object value) throws IOException {
+        root.createRequest().withNullable(key, value).method("PATCH").withUrlPath(getApiRoute()).send();
+    }
+
     private void editIssue(String key, Object value) throws IOException {
         root.createRequest().with(key, value).method("PATCH").withUrlPath(getIssuesApiRoute()).send();
     }
@@ -291,15 +287,19 @@ public class GHIssue extends GHObject implements Reactable {
     }
 
     /**
-     * Sets milestone.
+     * Sets the milestone for this issue.
      *
      * @param milestone
-     *            the milestone
+     *            The milestone to assign this issue to. Use null to remove the milestone for this issue.
      * @throws IOException
-     *             the io exception
+     *             The io exception
      */
     public void setMilestone(GHMilestone milestone) throws IOException {
-        edit("milestone", milestone.getNumber());
+        if (milestone == null) {
+            editNullable("milestone", null);
+        } else {
+            edit("milestone", milestone.getNumber());
+        }
     }
 
     /**
@@ -434,7 +434,7 @@ public class GHIssue extends GHObject implements Reactable {
      * @see #listComments() #listComments()
      */
     public List<GHIssueComment> getComments() throws IOException {
-        return listComments().asList();
+        return listComments().toList();
     }
 
     /**
@@ -453,7 +453,7 @@ public class GHIssue extends GHObject implements Reactable {
     @Preview
     @Deprecated
     public GHReaction createReaction(ReactionContent content) throws IOException {
-        return owner.root.createRequest()
+        return root.createRequest()
                 .method("POST")
                 .withPreview(SQUIRREL_GIRL)
                 .with("content", content.getContent())
@@ -465,10 +465,10 @@ public class GHIssue extends GHObject implements Reactable {
     @Preview
     @Deprecated
     public PagedIterable<GHReaction> listReactions() {
-        return owner.root.createRequest()
+        return root.createRequest()
                 .withPreview(SQUIRREL_GIRL)
                 .withUrlPath(getApiRoute() + "/reactions")
-                .toIterable(GHReaction[].class, item -> item.wrap(owner.root));
+                .toIterable(GHReaction[].class, item -> item.wrap(root));
     }
 
     /**
@@ -571,6 +571,11 @@ public class GHIssue extends GHObject implements Reactable {
      * @return the issues api route
      */
     protected String getIssuesApiRoute() {
+        if (owner == null) {
+            // Issues returned from search to do not have an owner. Attempt to use url.
+            final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
+            return StringUtils.prependIfMissing(url.toString().replace(root.getApiUrl(), ""), "/");
+        }
         return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/issues/" + number;
     }
 
@@ -677,7 +682,7 @@ public class GHIssue extends GHObject implements Reactable {
          * @return the diff url
          */
         public URL getDiffUrl() {
-            return GitHub.parseURL(diff_url);
+            return GitHubClient.parseURL(diff_url);
         }
 
         /**
@@ -686,7 +691,7 @@ public class GHIssue extends GHObject implements Reactable {
          * @return the patch url
          */
         public URL getPatchUrl() {
-            return GitHub.parseURL(patch_url);
+            return GitHubClient.parseURL(patch_url);
         }
 
         /**
@@ -695,7 +700,7 @@ public class GHIssue extends GHObject implements Reactable {
          * @return the url
          */
         public URL getUrl() {
-            return GitHub.parseURL(html_url);
+            return GitHubClient.parseURL(html_url);
         }
     }
 

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

@@ -87,7 +87,7 @@ public class GHIssueComment extends GHObject implements Reactable {
 
     @Override
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -149,6 +149,6 @@ public class GHIssueComment extends GHObject implements Reactable {
 
     private String getApiRoute() {
         return "/repos/" + owner.getRepository().getOwnerName() + "/" + owner.getRepository().getName()
-                + "/issues/comments/" + id;
+                + "/issues/comments/" + getId();
     }
 }

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

@@ -5,6 +5,8 @@ import java.util.Date;
 /**
  * The type GHIssueEvent.
  *
+ * @see <a href="https://developer.github.com/v3/issues/events/">Github documentation for issue events</a>
+ *
  * @author Martin van Zijl
  */
 public class GHIssueEvent {
@@ -18,6 +20,9 @@ public class GHIssueEvent {
     private String commit_id;
     private String commit_url;
     private String created_at;
+    private GHMilestone milestone;
+    private GHLabel label;
+    private GHUser assignee;
 
     private GHIssue issue;
 
@@ -90,7 +95,7 @@ public class GHIssueEvent {
      * @return the created at
      */
     public Date getCreatedAt() {
-        return GitHub.parseDate(created_at);
+        return GitHubClient.parseDate(created_at);
     }
 
     /**
@@ -111,6 +116,36 @@ public class GHIssueEvent {
         return issue;
     }
 
+    /**
+     * Get the {@link GHMilestone} that this issue was added to or removed from. Only present for events "milestoned"
+     * and "demilestoned", <code>null</code> otherwise.
+     *
+     * @return the milestone
+     */
+    public GHMilestone getMilestone() {
+        return milestone;
+    }
+
+    /**
+     * Get the {@link GHLabel} that was added to or removed from the issue. Only present for events "labeled" and
+     * "unlabeled", <code>null</code> otherwise.
+     *
+     * @return the label
+     */
+    public GHLabel getLabel() {
+        return label;
+    }
+
+    /**
+     * Get the {@link GHUser} that was assigned or unassigned from the issue. Only present for events "assigned" and
+     * "unassigned", <code>null</code> otherwise.
+     *
+     * @return the user
+     */
+    public GHUser getAssignee() {
+        return assignee;
+    }
+
     GHIssueEvent wrapUp(GitHub root) {
         this.root = root;
         return this;

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

@@ -1,27 +1,56 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 /**
  * The type GHLabel.
  *
  * @author Kohsuke Kawaguchi
+ * @see <a href="https://developer.github.com/v3/issues/labels/">Labels</a>
  * @see GHIssue#getLabels() GHIssue#getLabels()
  * @see GHRepository#listLabels() GHRepository#listLabels()
  */
 public class GHLabel {
-    private String url, name, color, description;
-    private GHRepository repo;
+
+    @Nonnull
+    private String url, name, color;
+
+    @CheckForNull
+    private String description;
+
+    @Nonnull
+    private final GitHub root;
+
+    @JsonCreator
+    private GHLabel(@JacksonInject @Nonnull GitHub root) {
+        this.root = root;
+        url = "";
+        name = "";
+        color = "";
+        description = null;
+    }
+
+    @Nonnull
+    GitHub getApiRoot() {
+        return Objects.requireNonNull(root);
+    }
 
     /**
      * Gets url.
      *
      * @return the url
      */
+    @Nonnull
     public String getUrl() {
         return url;
     }
@@ -31,6 +60,7 @@ public class GHLabel {
      *
      * @return the name
      */
+    @Nonnull
     public String getName() {
         return name;
     }
@@ -40,6 +70,7 @@ public class GHLabel {
      *
      * @return the color
      */
+    @Nonnull
     public String getColor() {
         return color;
     }
@@ -49,25 +80,11 @@ public class GHLabel {
      *
      * @return the description
      */
+    @CheckForNull
     public String getDescription() {
         return description;
     }
 
-    GHLabel wrapUp(GHRepository repo) {
-        this.repo = repo;
-        return this;
-    }
-
-    /**
-     * Delete.
-     *
-     * @throws IOException
-     *             the io exception
-     */
-    public void delete() throws IOException {
-        repo.root.createRequest().method("DELETE").setRawUrlPath(url).send();
-    }
-
     /**
      * Sets color.
      *
@@ -75,15 +92,11 @@ public class GHLabel {
      *            6-letter hex color code, like "f29513"
      * @throws IOException
      *             the io exception
+     * @deprecated use {@link #set()} or {@link #update()} instead
      */
+    @Deprecated
     public void setColor(String newColor) throws IOException {
-        repo.root.createRequest()
-                .method("PATCH")
-                .with("name", name)
-                .with("color", newColor)
-                .with("description", description)
-                .setRawUrlPath(url)
-                .send();
+        set().color(newColor);
     }
 
     /**
@@ -93,25 +106,106 @@ public class GHLabel {
      *            Description of label
      * @throws IOException
      *             the io exception
+     * @deprecated use {@link #set()} or {@link #update()} instead
      */
+    @Deprecated
     public void setDescription(String newDescription) throws IOException {
-        repo.root.createRequest()
-                .method("PATCH")
-                .with("name", name)
-                .with("color", color)
-                .with("description", newDescription)
-                .setRawUrlPath(url)
-                .send();
+        set().description(newDescription);
     }
 
     static Collection<String> toNames(Collection<GHLabel> labels) {
-        List<String> r = new ArrayList<String>();
+        List<String> r = new ArrayList<>();
         for (GHLabel l : labels) {
             r.add(l.getName());
         }
         return r;
     }
 
+    /**
+     * Begins the creation of a new instance.
+     *
+     * Consumer must call {@link Creator#done()} to commit changes.
+     *
+     * @param repository
+     *            the repository in which the label will be created.
+     * @return a {@link Creator}
+     * @throws IOException
+     *             the io exception
+     */
+    @Preview
+    @Deprecated
+    static Creator create(GHRepository repository) throws IOException {
+        return new Creator(repository);
+    }
+
+    /**
+     * Reads a label from a repository.
+     *
+     * @param repository
+     *            the repository to read from
+     * @param name
+     *            the name of the label
+     * @return a label
+     * @throws IOException
+     *             the io exception
+     */
+    static GHLabel read(@Nonnull GHRepository repository, @Nonnull String name) throws IOException {
+        return repository.root.createRequest()
+                .withUrlPath(repository.getApiTailUrl("labels"), name)
+                .fetch(GHLabel.class);
+
+    }
+
+    /**
+     * Reads all labels from a repository.
+     *
+     * @param repository
+     *            the repository to read from
+     * @return iterable of all labels
+     * @throws IOException
+     *             the io exception
+     */
+    static PagedIterable<GHLabel> readAll(@Nonnull final GHRepository repository) throws IOException {
+        return repository.root.createRequest()
+                .withUrlPath(repository.getApiTailUrl("labels"))
+                .toIterable(GHLabel[].class, null);
+
+    }
+
+    /**
+     * Begins a batch update
+     *
+     * Consumer must call {@link Updater#done()} to commit changes.
+     *
+     * @return a {@link Updater}
+     */
+    @Preview
+    @Deprecated
+    public Updater update() {
+        return new Updater(this);
+    }
+
+    /**
+     * Begins a single property update.
+     * 
+     * @return a {@link Setter}
+     */
+    @Preview
+    @Deprecated
+    public Setter set() {
+        return new Setter(this);
+    }
+
+    /**
+     * Delete this label from the repository.
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    public void delete() throws IOException {
+        root.createRequest().method("DELETE").setRawUrlPath(getUrl()).send();
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o)
@@ -120,11 +214,54 @@ public class GHLabel {
             return false;
         final GHLabel ghLabel = (GHLabel) o;
         return Objects.equals(url, ghLabel.url) && Objects.equals(name, ghLabel.name)
-                && Objects.equals(color, ghLabel.color) && Objects.equals(repo, ghLabel.repo);
+                && Objects.equals(color, ghLabel.color) && Objects.equals(description, ghLabel.description);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(url, name, color, repo);
+        return Objects.hash(url, name, color, description);
     }
+
+    /**
+     * A {@link GHLabelBuilder} that updates a single property per request
+     *
+     * {@link #done()} is called automatically after the property is set.
+     */
+    @Preview
+    @Deprecated
+    public static class Setter extends GHLabelBuilder<GHLabel> {
+        private Setter(@Nonnull GHLabel base) {
+            super(GHLabel.class, base.getApiRoot(), base);
+            requester.method("PATCH").setRawUrlPath(base.getUrl());
+        }
+    }
+
+    /**
+     * A {@link GHLabelBuilder} that allows multiple properties to be updated per request.
+     *
+     * Consumer must call {@link #done()} to commit changes.
+     */
+    @Preview
+    @Deprecated
+    public static class Updater extends GHLabelBuilder<Updater> {
+        private Updater(@Nonnull GHLabel base) {
+            super(Updater.class, base.getApiRoot(), base);
+            requester.method("PATCH").setRawUrlPath(base.getUrl());
+        }
+    }
+
+    /**
+     * A {@link GHLabelBuilder} that creates a new {@link GHLabel}
+     *
+     * Consumer must call {@link #done()} to create the new instance.
+     */
+    @Preview
+    @Deprecated
+    public static class Creator extends GHLabelBuilder<Creator> {
+        private Creator(@Nonnull GHRepository repository) {
+            super(Creator.class, repository.root, null);
+            requester.method("POST").withUrlPath(repository.getApiTailUrl("labels"));
+        }
+    }
+
 }

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

@@ -0,0 +1,60 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ *
+ * @param <S>
+ *            Intermediate return type for this builder returned by calls to {@link #with(String, Object)}. If {@link S}
+ *            the same as {@link GHLabel}, this builder will commit changes after each call to
+ *            {@link #with(String, Object)}.
+ */
+class GHLabelBuilder<S> extends AbstractBuilder<GHLabel, S> {
+
+    /**
+     *
+     * @param intermediateReturnType
+     *            Intermediate return type for this builder returned by calls to {@link #with(String, Object)}. If
+     *            {@link S} the same as {@link GHLabel}, this builder will commit changes after each call to
+     *            {@link #with(String, Object)}.
+     * @param root
+     *            the GitHub instance to which updates will be sent
+     * @param baseInstance
+     *            instance on which to base this builder. If {@code null} a new instance will be created.
+     */
+    protected GHLabelBuilder(@Nonnull Class<S> intermediateReturnType,
+            @Nonnull GitHub root,
+            @CheckForNull GHLabel baseInstance) {
+        super(GHLabel.class, intermediateReturnType, root, baseInstance);
+
+        if (baseInstance != null) {
+            requester.with("name", baseInstance.getName());
+            requester.with("color", baseInstance.getColor());
+            requester.with("description", baseInstance.getDescription());
+        }
+    }
+
+    @Nonnull
+    @Preview
+    @Deprecated
+    public S name(String value) throws IOException {
+        return with("name", value);
+    }
+
+    @Nonnull
+    @Preview
+    @Deprecated
+    public S color(String value) throws IOException {
+        return with("color", value);
+    }
+
+    @Nonnull
+    @Preview
+    @Deprecated
+    public S description(String value) throws IOException {
+        return with("description", value);
+    }
+}

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

@@ -24,13 +24,13 @@
 
 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 java.util.Objects;
 
 /**
  * The GitHub Preview API's license information
@@ -78,14 +78,6 @@ public class GHLicense extends GHObject {
         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
      *
@@ -100,7 +92,7 @@ public class GHLicense extends GHObject {
 
     public URL getHtmlUrl() throws IOException {
         populate();
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -199,7 +191,14 @@ public class GHLicense extends GHObject {
         if (description != null)
             return; // already populated
 
-        root.createRequest().withUrlPath(url).fetchInto(this);
+        if (root == null || root.isOffline()) {
+            return; // cannot populate, will have to live with what we have
+        }
+
+        URL url = getUrl();
+        if (url != null) {
+            root.createRequest().setRawUrlPath(url.toString()).fetchInto(this);
+        }
     }
 
     @Override
@@ -210,12 +209,12 @@ public class GHLicense extends GHObject {
             return false;
 
         GHLicense that = (GHLicense) o;
-        return this.url.equals(that.url);
+        return Objects.equals(getUrl(), that.getUrl());
     }
 
     @Override
     public int hashCode() {
-        return url.hashCode();
+        return Objects.hashCode(getUrl());
     }
 
     GHLicense wrap(GitHub root) {

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

@@ -37,7 +37,7 @@ public class GHMarketplaceAccount {
      * @return the url
      */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**

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

@@ -68,7 +68,7 @@ public class GHMarketplacePendingChange {
      * @return the effective date
      */
     public Date getEffectiveDate() {
-        return GitHub.parseDate(effectiveDate);
+        return GitHubClient.parseDate(effectiveDate);
     }
 
 }

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

@@ -47,7 +47,7 @@ public class GHMarketplacePlan {
      * @return the url
      */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**

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

@@ -52,7 +52,7 @@ public class GHMarketplacePurchase {
      * @return the next billing date
      */
     public Date getNextBillingDate() {
-        return GitHub.parseDate(nextBillingDate);
+        return GitHubClient.parseDate(nextBillingDate);
     }
 
     /**
@@ -70,7 +70,7 @@ public class GHMarketplacePurchase {
      * @return the free trial ends on
      */
     public Date getFreeTrialEndsOn() {
-        return GitHub.parseDate(freeTrialEndsOn);
+        return GitHubClient.parseDate(freeTrialEndsOn);
     }
 
     /**
@@ -88,7 +88,7 @@ public class GHMarketplacePurchase {
      * @return the updated at
      */
     public Date getUpdatedAt() {
-        return GitHub.parseDate(updatedAt);
+        return GitHubClient.parseDate(updatedAt);
     }
 
     /**

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

@@ -54,7 +54,7 @@ public class GHMarketplaceUserPurchase {
      * @return the next billing date
      */
     public Date getNextBillingDate() {
-        return GitHub.parseDate(nextBillingDate);
+        return GitHubClient.parseDate(nextBillingDate);
     }
 
     /**
@@ -72,7 +72,7 @@ public class GHMarketplaceUserPurchase {
      * @return the free trial ends on
      */
     public Date getFreeTrialEndsOn() {
-        return GitHub.parseDate(freeTrialEndsOn);
+        return GitHubClient.parseDate(freeTrialEndsOn);
     }
 
     /**
@@ -90,7 +90,7 @@ public class GHMarketplaceUserPurchase {
      * @return the updated at
      */
     public Date getUpdatedAt() {
-        return GitHub.parseDate(updatedAt);
+        return GitHubClient.parseDate(updatedAt);
     }
 
     /**

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

@@ -25,7 +25,7 @@ public class GHMembership /* extends GHObject --- but it doesn't have id, create
      * @return the url
      */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**
@@ -84,11 +84,6 @@ public class GHMembership /* extends GHObject --- but it doesn't have id, create
         return this;
     }
 
-    static void wrap(GHMembership[] page, GitHub root) {
-        for (GHMembership m : page)
-            m.wrap(root);
-    }
-
     /**
      * Role of a user in an organization.
      */

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

@@ -56,7 +56,7 @@ public class GHMilestone extends GHObject {
     public Date getDueOn() {
         if (due_on == null)
             return null;
-        return GitHub.parseDate(due_on);
+        return GitHubClient.parseDate(due_on);
     }
 
     /**
@@ -67,7 +67,7 @@ public class GHMilestone extends GHObject {
      *             the io exception
      */
     public Date getClosedAt() throws IOException {
-        return GitHub.parseDate(closed_at);
+        return GitHubClient.parseDate(closed_at);
     }
 
     /**
@@ -116,7 +116,7 @@ public class GHMilestone extends GHObject {
     }
 
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -195,7 +195,7 @@ public class GHMilestone extends GHObject {
      *             the io exception
      */
     public void setDueOn(Date dueOn) throws IOException {
-        edit("due_on", GitHub.printDate(dueOn));
+        edit("due_on", GitHubClient.printDate(dueOn));
     }
 
     /**

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

@@ -2,7 +2,6 @@ package org.kohsuke.github;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -71,8 +70,7 @@ public class GHMyself extends GHUser {
      *             the io exception
      */
     public List<GHEmail> getEmails2() throws IOException {
-        GHEmail[] addresses = root.createRequest().withUrlPath("/user/emails").fetchArray(GHEmail[].class);
-        return Collections.unmodifiableList(Arrays.asList(addresses));
+        return root.createRequest().withUrlPath("/user/emails").toIterable(GHEmail[].class, null).toList();
     }
 
     /**
@@ -86,8 +84,7 @@ public class GHMyself extends GHUser {
      *             the io exception
      */
     public List<GHKey> getPublicKeys() throws IOException {
-        return Collections.unmodifiableList(
-                Arrays.asList(root.createRequest().withUrlPath("/user/keys").fetchArray(GHKey[].class)));
+        return root.createRequest().withUrlPath("/user/keys").toIterable(GHKey[].class, null).toList();
     }
 
     /**
@@ -101,8 +98,10 @@ public class GHMyself extends GHUser {
      *             the io exception
      */
     public List<GHVerifiedKey> getPublicVerifiedKeys() throws IOException {
-        return Collections.unmodifiableList(Arrays.asList(
-                root.createRequest().withUrlPath("/users/" + getLogin() + "/keys").fetchArray(GHVerifiedKey[].class)));
+        return root.createRequest()
+                .withUrlPath("/users/" + getLogin() + "/keys")
+                .toIterable(GHVerifiedKey[].class, null)
+                .toList();
     }
 
     /**
@@ -115,7 +114,10 @@ public class GHMyself extends GHUser {
     public GHPersonSet<GHOrganization> getAllOrganizations() throws IOException {
         GHPersonSet<GHOrganization> orgs = new GHPersonSet<GHOrganization>();
         Set<String> names = new HashSet<String>();
-        for (GHOrganization o : root.createRequest().withUrlPath("/user/orgs").fetchArray(GHOrganization[].class)) {
+        for (GHOrganization o : root.createRequest()
+                .withUrlPath("/user/orgs")
+                .toIterable(GHOrganization[].class, null)
+                .toArray()) {
             if (names.add(o.getLogin())) // in case of rumoured duplicates in the data
                 orgs.add(root.getOrganization(o.getLogin()));
         }
@@ -189,6 +191,7 @@ public class GHMyself extends GHUser {
      * @return the paged iterable
      * @deprecated Use {@link #listRepositories()}
      */
+    @Deprecated
     public PagedIterable<GHRepository> listAllRepositories() {
         return listRepositories();
     }

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

@@ -79,7 +79,7 @@ public class GHNotificationStream implements Iterable<GHThread> {
      * @return the gh notification stream
      */
     public GHNotificationStream since(Date dt) {
-        since = GitHub.printDate(dt);
+        since = GitHubClient.printDate(dt);
         return this;
     }
 
@@ -180,7 +180,11 @@ public class GHNotificationStream implements Iterable<GHThread> {
 
                         req.setHeader("If-Modified-Since", lastModified);
 
-                        threads = req.withUrlPath(apiUrl).fetchArray(GHThread[].class);
+                        Requester requester = req.withUrlPath(apiUrl);
+                        GitHubResponse<GHThread[]> response = ((GitHubPageContentsIterable<GHThread>) requester
+                                .toIterable(GHThread[].class, null)).toResponse();
+                        threads = response.body();
+
                         if (threads == null) {
                             threads = EMPTY_ARRAY; // if unmodified, we get empty array
                         } else {
@@ -189,27 +193,21 @@ public class GHNotificationStream implements Iterable<GHThread> {
                         }
                         idx = threads.length - 1;
 
-                        nextCheckTime = calcNextCheckTime();
-                        lastModified = req.getResponseHeader("Last-Modified");
+                        nextCheckTime = calcNextCheckTime(response);
+                        lastModified = response.headerField("Last-Modified");
                     }
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                } catch (InterruptedException e) {
+                } catch (IOException | InterruptedException e) {
                     throw new RuntimeException(e);
                 }
             }
 
-            private long calcNextCheckTime() {
-                String v = req.getResponseHeader("X-Poll-Interval");
+            private long calcNextCheckTime(GitHubResponse<GHThread[]> response) {
+                String v = response.headerField("X-Poll-Interval");
                 if (v == null)
                     v = "60";
                 long seconds = Integer.parseInt(v);
                 return System.currentTimeMillis() + seconds * 1000;
             }
-
-            public void remove() {
-                throw new UnsupportedOperationException();
-            }
         };
     }
 
@@ -234,7 +232,7 @@ public class GHNotificationStream implements Iterable<GHThread> {
     public void markAsRead(long timestamp) throws IOException {
         final Requester req = root.createRequest();
         if (timestamp >= 0)
-            req.with("last_read_at", GitHub.printDate(new Date(timestamp)));
+            req.with("last_read_at", GitHubClient.printDate(new Date(timestamp)));
         req.withUrlPath(apiUrl).fetchHttpStatusCode();
     }
 

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

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
@@ -23,16 +24,31 @@ public abstract class GHObject {
     /**
      * Capture response HTTP headers on the state object.
      */
-    protected Map<String, List<String>> responseHeaderFields;
+    protected transient Map<String, List<String>> responseHeaderFields;
 
-    protected String url;
-    protected long id;
-    protected String created_at;
-    protected String updated_at;
+    private String url;
+
+    private long id;
+    private String nodeId;
+    private String createdAt;
+    private String updatedAt;
 
     GHObject() {
     }
 
+    /**
+     * Called by Jackson
+     * 
+     * @param responseInfo
+     *            the {@link GitHubResponse.ResponseInfo} to get headers from.
+     */
+    @JacksonInject
+    protected void setResponseHeaderFields(@CheckForNull GitHubResponse.ResponseInfo responseInfo) {
+        if (responseInfo != null) {
+            responseHeaderFields = responseInfo.headers();
+        }
+    }
+
     /**
      * Returns the HTTP response headers given along with the state of this object.
      *
@@ -60,12 +76,12 @@ public abstract class GHObject {
      */
     @WithBridgeMethods(value = String.class, adapterMethod = "createdAtStr")
     public Date getCreatedAt() throws IOException {
-        return GitHub.parseDate(created_at);
+        return GitHubClient.parseDate(createdAt);
     }
 
     @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getCreatedAt")
     private Object createdAtStr(Date id, Class type) {
-        return created_at;
+        return createdAt;
     }
 
     /**
@@ -75,7 +91,7 @@ public abstract class GHObject {
      */
     @WithBridgeMethods(value = String.class, adapterMethod = "urlToString")
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**
@@ -96,7 +112,18 @@ public abstract class GHObject {
      *             on error
      */
     public Date getUpdatedAt() throws IOException {
-        return GitHub.parseDate(updated_at);
+        return GitHubClient.parseDate(updatedAt);
+    }
+
+    /**
+     * Get Global node_id from Github object.
+     *
+     * @see <a href="https://developer.github.com/v4/guides/using-global-node-ids/">Using Global Node IDs</a>
+     *
+     * @return Global Node ID.
+     */
+    public String getNodeId() {
+        return nodeId;
     }
 
     /**

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

@@ -22,6 +22,6 @@ class GHOrgHook extends GHHook {
 
     @Override
     String getApiRoute() {
-        return String.format("/orgs/%s/hooks/%d", organization.getLogin(), id);
+        return String.format("/orgs/%s/hooks/%d", organization.getLogin(), getId());
     }
 }

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

@@ -40,6 +40,7 @@ public class GHOrganization extends GHPerson {
      *             the io exception
      * @deprecated Use {@link #createRepository(String)} that uses a builder pattern to let you control every aspect.
      */
+    @Deprecated
     public GHRepository createRepository(String name,
             String description,
             String homepage,
@@ -69,6 +70,7 @@ public class GHOrganization extends GHPerson {
      *             the io exception
      * @deprecated Use {@link #createRepository(String)} that uses a builder pattern to let you control every aspect.
      */
+    @Deprecated
     public GHRepository createRepository(String name,
             String description,
             String homepage,
@@ -126,6 +128,40 @@ public class GHOrganization extends GHPerson {
                 .toIterable(GHTeam[].class, item -> item.wrapUp(this));
     }
 
+    /**
+     * Gets a single team by ID.
+     *
+     * @param teamId
+     *            id of the team that we want to query for
+     * @return the team
+     * @throws IOException
+     *             the io exception
+     *
+     * @deprecated Use {@link GHOrganization#getTeam(long)}
+     */
+    @Deprecated
+    public GHTeam getTeam(int teamId) throws IOException {
+        return getTeam((long) teamId);
+    }
+
+    /**
+     * Gets a single team by ID.
+     *
+     * @param teamId
+     *            id of the team that we want to query for
+     * @return the team
+     * @throws IOException
+     *             the io exception
+     *
+     * @see <a href= "https://developer.github.com/v3/teams/#get-team-by-name">documentation</a>
+     */
+    public GHTeam getTeam(long teamId) throws IOException {
+        return root.createRequest()
+                .withUrlPath(String.format("/organizations/%d/team/%d", getId(), teamId))
+                .fetch(GHTeam.class)
+                .wrapUp(this);
+    }
+
     /**
      * Finds a team that has the given name in its {@link GHTeam#getName()}
      *
@@ -145,19 +181,19 @@ public class GHOrganization extends GHPerson {
 
     /**
      * Finds a team that has the given slug in its {@link GHTeam#getSlug()}
-     *
+     * 
      * @param slug
      *            the slug
      * @return the team by slug
      * @throws IOException
      *             the io exception
+     * @see <a href= "https://developer.github.com/v3/teams/#get-team-by-name">documentation</a>
      */
     public GHTeam getTeamBySlug(String slug) throws IOException {
-        for (GHTeam t : listTeams()) {
-            if (t.getSlug().equals(slug))
-                return t;
-        }
-        return null;
+        return root.createRequest()
+                .withUrlPath(String.format("/orgs/%s/teams/%s", login, slug))
+                .fetch(GHTeam.class)
+                .wrapUp(this);
     }
 
     /**
@@ -255,7 +291,7 @@ public class GHOrganization extends GHPerson {
      * @deprecated use {@link #listMembers()}
      */
     public List<GHUser> getMembers() throws IOException {
-        return listMembers().asList();
+        return listMembers().toList();
     }
 
     /**
@@ -281,7 +317,7 @@ public class GHOrganization extends GHPerson {
     }
 
     private PagedIterable<GHUser> listMembers(String suffix) throws IOException {
-        return listMembers(suffix, null);
+        return listMembers(suffix, null, null);
     }
 
     /**
@@ -294,13 +330,28 @@ public class GHOrganization extends GHPerson {
      *             the io exception
      */
     public PagedIterable<GHUser> listMembersWithFilter(String filter) throws IOException {
-        return listMembers("members", filter);
+        return listMembers("members", filter, null);
     }
 
-    private PagedIterable<GHUser> listMembers(final String suffix, final String filter) throws IOException {
-        String filterParams = (filter == null) ? "" : ("?filter=" + filter);
+    /**
+     * List members with specified role paged iterable.
+     *
+     * @param role
+     *            the role
+     * @return the paged iterable
+     * @throws IOException
+     *             the io exception
+     */
+    public PagedIterable<GHUser> listMembersWithRole(String role) throws IOException {
+        return listMembers("members", null, role);
+    }
+
+    private PagedIterable<GHUser> listMembers(final String suffix, final String filter, String role)
+            throws IOException {
         return root.createRequest()
-                .withUrlPath(String.format("/orgs/%s/%s%s", login, suffix, filterParams))
+                .withUrlPath(String.format("/orgs/%s/%s", login, suffix))
+                .with("filter", filter)
+                .with("role", role)
                 .toIterable(GHUser[].class, item -> item.wrapUp(root));
     }
 

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

@@ -2,13 +2,14 @@ package org.kohsuke.github;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.net.MalformedURLException;
 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.Optional;
 import java.util.TreeMap;
 
 /**
@@ -20,13 +21,16 @@ public abstract class GHPerson extends GHObject {
     /* package almost final */ GitHub root;
 
     // core data fields that exist even for "small" user data (such as the user info in pull request)
-    protected String login, avatar_url, gravatar_id;
+    protected String login, avatar_url;
 
     // other fields (that only show up in full data)
-    protected String location, blog, email, name, company, type;
+    protected String location, blog, email, bio, name, company, type, twitter_username;
     protected String html_url;
     protected int followers, following, public_repos, public_gists;
-    protected boolean site_admin;
+    protected boolean site_admin, hireable;
+
+    // other fields (that only show up in full data) that require privileged scope
+    protected Integer total_private_repos;
 
     GHPerson wrapUp(GitHub root) {
         this.root = root;
@@ -42,13 +46,16 @@ public abstract class GHPerson extends GHObject {
      *             the io exception
      */
     protected synchronized void populate() throws IOException {
-        if (created_at != null) {
+        if (super.getCreatedAt() != null) {
             return; // already populated
         }
         if (root == null || root.isOffline()) {
             return; // cannot populate, will have to live with what we have
         }
-        root.createRequest().withUrlPath(url).fetchInto(this);
+        URL url = getUrl();
+        if (url != null) {
+            root.createRequest().setRawUrlPath(url.toString()).fetchInto(this);
+        }
     }
 
     /**
@@ -112,29 +119,27 @@ public abstract class GHPerson extends GHObject {
      */
     @Deprecated
     public synchronized Iterable<List<GHRepository>> iterateRepositories(final int pageSize) {
-        return new Iterable<List<GHRepository>>() {
-            public Iterator<List<GHRepository>> iterator() {
-                final Iterator<GHRepository[]> pager = root.createRequest()
-                        .withUrlPath("users", login, "repos")
-                        .asIterator(GHRepository[].class, pageSize);
-
-                return new Iterator<List<GHRepository>>() {
-                    public boolean hasNext() {
-                        return pager.hasNext();
-                    }
-
-                    public List<GHRepository> next() {
-                        GHRepository[] batch = pager.next();
-                        for (GHRepository r : batch)
-                            r.root = root;
-                        return Arrays.asList(batch);
-                    }
-
-                    public void remove() {
-                        throw new UnsupportedOperationException();
-                    }
-                };
+        return () -> {
+            final PagedIterator<GHRepository> pager;
+            try {
+                GitHubPageIterator<GHRepository[]> iterator = GitHubPageIterator.create(root.getClient(),
+                        GHRepository[].class,
+                        root.createRequest().withUrlPath("users", login, "repos").build(),
+                        pageSize);
+                pager = new PagedIterator<>(iterator, item -> item.wrap(root));
+            } catch (MalformedURLException e) {
+                throw new GHException("Unable to build GitHub API URL", e);
             }
+
+            return new Iterator<List<GHRepository>>() {
+                public boolean hasNext() {
+                    return pager.hasNext();
+                }
+
+                public List<GHRepository> next() {
+                    return pager.nextPage();
+                }
+            };
         };
     }
 
@@ -173,22 +178,18 @@ public abstract class GHPerson extends GHObject {
      * @return the gravatar id
      * @deprecated No longer available in the v3 API.
      */
+    @Deprecated
     public String getGravatarId() {
-        return gravatar_id;
+        return "";
     }
 
     /**
-     * Returns a string like 'https://secure.gravatar.com/avatar/0cb9832a01c22c083390f3c5dcb64105' that indicates the
-     * avatar image URL.
+     * Returns a string of the avatar image URL.
      *
      * @return the avatar url
      */
     public String getAvatarUrl() {
-        if (avatar_url != null)
-            return avatar_url;
-        if (gravatar_id != null)
-            return "https://secure.gravatar.com/avatar/" + gravatar_id;
-        return null;
+        return avatar_url;
     }
 
     /**
@@ -236,6 +237,18 @@ public abstract class GHPerson extends GHObject {
         return location;
     }
 
+    /**
+     * Gets the Twitter Username of this user, like "GitHub"
+     * 
+     * @return the Twitter username
+     * @throws IOException
+     *             the io exception
+     */
+    public String getTwitterUsername() throws IOException {
+        populate();
+        return twitter_username;
+    }
+
     public Date getCreatedAt() throws IOException {
         populate();
         return super.getCreatedAt();
@@ -260,7 +273,7 @@ public abstract class GHPerson extends GHObject {
 
     @Override
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -346,4 +359,16 @@ public abstract class GHPerson extends GHObject {
         populate();
         return site_admin;
     }
+
+    /**
+     * Gets total private repo count.
+     *
+     * @return the total private repo count
+     * @throws IOException
+     *             the io exception
+     */
+    public Optional<Integer> getTotalPrivateRepoCount() throws IOException {
+        populate();
+        return Optional.ofNullable(total_private_repos);
+    }
 }

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

@@ -42,7 +42,6 @@ public class GHProject extends GHObject {
 
     private String owner_url;
     private String html_url;
-    private String node_id;
     private String name;
     private String body;
     private int number;
@@ -51,7 +50,7 @@ public class GHProject extends GHObject {
 
     @Override
     public URL getHtmlUrl() throws IOException {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -99,16 +98,18 @@ public class GHProject extends GHObject {
      * @return the owner url
      */
     public URL getOwnerUrl() {
-        return GitHub.parseURL(owner_url);
+        return GitHubClient.parseURL(owner_url);
     }
 
     /**
      * Gets node id.
      *
+     * @deprecated Use {@link GHObject#getNodeId()}
      * @return the node id
      */
+    @Deprecated
     public String getNode_id() {
-        return node_id;
+        return getNodeId();
     }
 
     /**
@@ -191,7 +192,7 @@ public class GHProject extends GHObject {
      * @return the api route
      */
     protected String getApiRoute() {
-        return "/projects/" + id;
+        return "/projects/" + getId();
     }
 
     /**
@@ -290,7 +291,7 @@ public class GHProject extends GHObject {
         final GHProject project = this;
         return root.createRequest()
                 .withPreview(INERTIA)
-                .withUrlPath(String.format("/projects/%d/columns", id))
+                .withUrlPath(String.format("/projects/%d/columns", getId()))
                 .toIterable(GHProjectColumn[].class, item -> item.wrap(project));
     }
 
@@ -308,7 +309,7 @@ public class GHProject extends GHObject {
                 .method("POST")
                 .withPreview(INERTIA)
                 .with("name", name)
-                .withUrlPath(String.format("/projects/%d/columns", id))
+                .withUrlPath(String.format("/projects/%d/columns", getId()))
                 .fetch(GHProjectColumn.class)
                 .wrap(this);
     }

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

@@ -149,7 +149,7 @@ public class GHProjectCard extends GHObject {
      * @return the content url
      */
     public URL getContentUrl() {
-        return GitHub.parseURL(content_url);
+        return GitHubClient.parseURL(content_url);
     }
 
     /**
@@ -158,7 +158,7 @@ public class GHProjectCard extends GHObject {
      * @return the project url
      */
     public URL getProjectUrl() {
-        return GitHub.parseURL(project_url);
+        return GitHubClient.parseURL(project_url);
     }
 
     /**
@@ -167,7 +167,7 @@ public class GHProjectCard extends GHObject {
      * @return the column url
      */
     public URL getColumnUrl() {
-        return GitHub.parseURL(column_url);
+        return GitHubClient.parseURL(column_url);
     }
 
     /**
@@ -213,7 +213,7 @@ public class GHProjectCard extends GHObject {
      * @return the api route
      */
     protected String getApiRoute() {
-        return String.format("/projects/columns/cards/%d", id);
+        return String.format("/projects/columns/cards/%d", getId());
     }
 
     /**

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

@@ -90,7 +90,7 @@ public class GHProjectColumn extends GHObject {
      * @return the project url
      */
     public URL getProjectUrl() {
-        return GitHub.parseURL(project_url);
+        return GitHubClient.parseURL(project_url);
     }
 
     /**
@@ -115,7 +115,7 @@ public class GHProjectColumn extends GHObject {
      * @return the api route
      */
     protected String getApiRoute() {
-        return String.format("/projects/columns/%d", id);
+        return String.format("/projects/columns/%d", getId());
     }
 
     /**
@@ -139,7 +139,7 @@ public class GHProjectColumn extends GHObject {
         final GHProjectColumn column = this;
         return root.createRequest()
                 .withPreview(INERTIA)
-                .withUrlPath(String.format("/projects/columns/%d/cards", id))
+                .withUrlPath(String.format("/projects/columns/%d/cards", getId()))
                 .toIterable(GHProjectCard[].class, item -> item.wrap(column));
     }
 
@@ -157,7 +157,7 @@ public class GHProjectColumn extends GHObject {
                 .method("POST")
                 .withPreview(INERTIA)
                 .with("note", note)
-                .withUrlPath(String.format("/projects/columns/%d/cards", id))
+                .withUrlPath(String.format("/projects/columns/%d/cards", getId()))
                 .fetch(GHProjectCard.class)
                 .wrap(this);
     }
@@ -177,7 +177,7 @@ public class GHProjectColumn extends GHObject {
                 .withPreview(INERTIA)
                 .with("content_type", issue instanceof GHPullRequest ? "PullRequest" : "Issue")
                 .with("content_id", issue.getId())
-                .withUrlPath(String.format("/projects/columns/%d/cards", id))
+                .withUrlPath(String.format("/projects/columns/%d/cards", getId()))
                 .fetch(GHProjectCard.class)
                 .wrap(this);
     }

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

@@ -23,6 +23,8 @@
  */
 package org.kohsuke.github;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -31,6 +33,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.CheckForNull;
 
@@ -99,6 +102,12 @@ public class GHPullRequest extends GHIssue implements Refreshable {
 
     @Override
     protected String getApiRoute() {
+        if (owner == null) {
+            // Issues returned from search to do not have an owner. Attempt to use url.
+            final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
+            return StringUtils.prependIfMissing(url.toString().replace(root.getApiUrl(), ""), "/");
+
+        }
         return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/pulls/" + number;
     }
 
@@ -108,7 +117,7 @@ public class GHPullRequest extends GHIssue implements Refreshable {
      * @return the patch url
      */
     public URL getPatchUrl() {
-        return GitHub.parseURL(patch_url);
+        return GitHubClient.parseURL(patch_url);
     }
 
     /**
@@ -117,7 +126,7 @@ public class GHPullRequest extends GHIssue implements Refreshable {
      * @return the issue url
      */
     public URL getIssueUrl() {
-        return GitHub.parseURL(issue_url);
+        return GitHubClient.parseURL(issue_url);
     }
 
     /**
@@ -156,7 +165,7 @@ public class GHPullRequest extends GHIssue implements Refreshable {
      * @return the diff url
      */
     public URL getDiffUrl() {
-        return GitHub.parseURL(diff_url);
+        return GitHubClient.parseURL(diff_url);
     }
 
     /**
@@ -165,7 +174,7 @@ public class GHPullRequest extends GHIssue implements Refreshable {
      * @return the merged at
      */
     public Date getMergedAt() {
-        return GitHub.parseDate(merged_at);
+        return GitHubClient.parseDate(merged_at);
     }
 
     @Override
@@ -381,10 +390,14 @@ public class GHPullRequest extends GHIssue implements Refreshable {
      * Repopulates this object.
      */
     public void refresh() throws IOException {
-        if (root.isOffline()) {
+        if (root == null || root.isOffline()) {
             return; // cannot populate, will have to live with what we have
         }
-        root.createRequest().withPreview(SHADOW_CAT).withUrlPath(url).fetchInto(this).wrapUp(owner);
+
+        URL url = getUrl();
+        if (url != null) {
+            root.createRequest().withPreview(SHADOW_CAT).setRawUrlPath(url.toString()).fetchInto(this).wrapUp(owner);
+        }
     }
 
     /**
@@ -447,6 +460,7 @@ public class GHPullRequest extends GHIssue implements Refreshable {
      *             the io exception
      * @deprecated Use {@link #createReview()}
      */
+    @Deprecated
     public GHPullRequestReview createReview(String body,
             @CheckForNull GHPullRequestReviewState event,
             GHPullRequestReviewComment... comments) throws IOException {
@@ -467,6 +481,7 @@ public class GHPullRequest extends GHIssue implements Refreshable {
      *             the io exception
      * @deprecated Use {@link #createReview()}
      */
+    @Deprecated
     public GHPullRequestReview createReview(String body,
             @CheckForNull GHPullRequestReviewState event,
             List<GHPullRequestReviewComment> comments) throws IOException {

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

@@ -75,7 +75,7 @@ public class GHPullRequestCommitDetail {
          * @return the url
          */
         public URL getUrl() {
-            return GitHub.parseURL(url);
+            return GitHubClient.parseURL(url);
         }
     }
 
@@ -125,7 +125,7 @@ public class GHPullRequestCommitDetail {
          * @return the url
          */
         public URL getUrl() {
-            return GitHub.parseURL(url);
+            return GitHubClient.parseURL(url);
         }
 
         /**
@@ -161,7 +161,7 @@ public class GHPullRequestCommitDetail {
          * @return the url
          */
         public URL getUrl() {
-            return GitHub.parseURL(url);
+            return GitHubClient.parseURL(url);
         }
 
         /**
@@ -170,7 +170,7 @@ public class GHPullRequestCommitDetail {
          * @return the html url
          */
         public URL getHtml_url() {
-            return GitHub.parseURL(html_url);
+            return GitHubClient.parseURL(html_url);
         }
 
         /**
@@ -214,7 +214,7 @@ public class GHPullRequestCommitDetail {
      * @return the api url
      */
     public URL getApiUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**
@@ -223,7 +223,7 @@ public class GHPullRequestCommitDetail {
      * @return the url
      */
     public URL getUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -232,7 +232,7 @@ public class GHPullRequestCommitDetail {
      * @return the comments url
      */
     public URL getCommentsUrl() {
-        return GitHub.parseURL(comments_url);
+        return GitHubClient.parseURL(comments_url);
     }
 
     /**

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

@@ -105,7 +105,7 @@ public class GHPullRequestFileDetail {
      * @return the blob url
      */
     public URL getBlobUrl() {
-        return GitHub.parseURL(blob_url);
+        return GitHubClient.parseURL(blob_url);
     }
 
     /**
@@ -114,7 +114,7 @@ public class GHPullRequestFileDetail {
      * @return the raw url
      */
     public URL getRawUrl() {
-        return GitHub.parseURL(raw_url);
+        return GitHubClient.parseURL(raw_url);
     }
 
     /**
@@ -123,7 +123,7 @@ public class GHPullRequestFileDetail {
      * @return the contents url
      */
     public URL getContentsUrl() {
-        return GitHub.parseURL(contents_url);
+        return GitHubClient.parseURL(contents_url);
     }
 
     /**

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

@@ -111,7 +111,7 @@ public class GHPullRequestReview extends GHObject {
      * @return the api route
      */
     protected String getApiRoute() {
-        return owner.getApiRoute() + "/reviews/" + id;
+        return owner.getApiRoute() + "/reviews/" + getId();
     }
 
     /**
@@ -122,7 +122,7 @@ public class GHPullRequestReview extends GHObject {
      *             the io exception
      */
     public Date getSubmittedAt() throws IOException {
-        return GitHub.parseDate(submitted_at);
+        return GitHubClient.parseDate(submitted_at);
     }
 
     /**
@@ -145,6 +145,7 @@ public class GHPullRequestReview extends GHObject {
      * @deprecated Former preview method that changed when it got public. Left here for backward compatibility. Use
      *             {@link #submit(String, GHPullRequestReviewEvent)}
      */
+    @Deprecated
     public void submit(String body, GHPullRequestReviewState state) throws IOException {
         submit(body, state.toEvent());
     }

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

@@ -44,6 +44,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
     private String body;
     private GHUser user;
     private String path;
+    private String html_url;
     private int position = -1;
     private int original_position = -1;
     private long in_reply_to_id = -1L;
@@ -60,6 +61,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
      * @return the gh pull request review comment
      * @deprecated You should be using {@link GHPullRequestReviewBuilder#comment(String, String, int)}
      */
+    @Deprecated
     public static GHPullRequestReviewComment draft(String body, String path, int position) {
         GHPullRequestReviewComment result = new GHPullRequestReviewComment();
         result.body = body;
@@ -142,7 +144,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
 
     @Override
     public URL getHtmlUrl() {
-        return null;
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -151,7 +153,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
      * @return the api route
      */
     protected String getApiRoute() {
-        return "/repos/" + owner.getRepository().getFullName() + "/pulls/comments/" + id;
+        return "/repos/" + owner.getRepository().getFullName() + "/pulls/comments/" + getId();
     }
 
     /**

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

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -219,6 +220,28 @@ public class GHRateLimit {
         return Objects.hash(getCore(), getSearch(), getGraphQL(), getIntegrationManifest());
     }
 
+    /**
+     * Gets the appropriate {@link Record} for a particular url path.
+     *
+     * @param urlPath
+     *            the url path of the request
+     * @return the {@link Record} for a url path.
+     */
+    @Nonnull
+    Record getRecordForUrlPath(@Nonnull String urlPath) {
+        if (urlPath.equals("/rate_limit")) {
+            return new UnknownLimitRecord();
+        } else if (urlPath.startsWith("/search")) {
+            return getSearch();
+        } else if (urlPath.startsWith("/graphql")) {
+            return getGraphQL();
+        } else if (urlPath.startsWith("/app-manifests")) {
+            return getIntegrationManifest();
+        } else {
+            return getCore();
+        }
+    }
+
     /**
      * A limit record used as a placeholder when the the actual limit is not known.
      * <p>
@@ -257,6 +280,8 @@ public class GHRateLimit {
 
         /**
          * The time at which the current rate limit window resets in UTC epoch seconds.
+         *
+         * This is the raw value returned by the server.
          */
         private final long resetEpochSeconds;
 
@@ -266,11 +291,12 @@ public class GHRateLimit {
         private final long createdAtEpochSeconds = System.currentTimeMillis() / 1000;
 
         /**
-         * The calculated time at which the rate limit will reset. Recalculated if {@link #recalculateResetDate} is
-         * called.
+         * The time at which the rate limit will reset. This value is calculated based on
+         * {@link #getResetEpochSeconds()} by calling {@link #calculateResetDate}. If the clock on the local machine not
+         * synchronized with the server clock, this time value will be adjusted to match the local machine's clock.
          */
         @Nonnull
-        private Date resetDate;
+        private final Date resetDate;
 
         /**
          * Instantiates a new Record.
@@ -282,7 +308,6 @@ public class GHRateLimit {
          * @param resetEpochSeconds
          *            the reset epoch seconds
          */
-        @JsonCreator
         public Record(@JsonProperty(value = "limit", required = true) int limit,
                 @JsonProperty(value = "remaining", required = true) int remaining,
                 @JsonProperty(value = "reset", required = true) long resetEpochSeconds) {
@@ -290,7 +315,7 @@ public class GHRateLimit {
         }
 
         /**
-         * Instantiates a new Record.
+         * Instantiates a new Record. Called by Jackson data binding or during header parsing.
          *
          * @param limit
          *            the limit
@@ -298,26 +323,53 @@ public class GHRateLimit {
          *            the remaining
          * @param resetEpochSeconds
          *            the reset epoch seconds
-         * @param updatedAt
-         *            the updated at
+         * @param responseInfo
+         *            the response info
          */
-        @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "Deprecated")
-        public Record(int limit, int remaining, long resetEpochSeconds, @CheckForNull String updatedAt) {
+        @JsonCreator
+        Record(@JsonProperty(value = "limit", required = true) int limit,
+                @JsonProperty(value = "remaining", required = true) int remaining,
+                @JsonProperty(value = "reset", required = true) long resetEpochSeconds,
+                @JacksonInject @CheckForNull GitHubResponse.ResponseInfo responseInfo) {
             this.limit = limit;
             this.remaining = remaining;
             this.resetEpochSeconds = resetEpochSeconds;
-            this.resetDate = recalculateResetDate(updatedAt);
+            String updatedAt = null;
+            if (responseInfo != null) {
+                updatedAt = responseInfo.headerField("Date");
+            }
+            this.resetDate = calculateResetDate(updatedAt);
         }
 
         /**
-         * Recalculates the reset date using the server response date to calculate a time duration and then add that to
-         * the local created time for this record.
+         * Recalculates the {@link #resetDate} relative to the local machine clock.
+         * <p>
+         * {@link RateLimitChecker}s and {@link RateLimitHandler}s use {@link #getResetDate()} to make decisions about
+         * how long to wait for until for the rate limit to reset. That means that {@link #getResetDate()} needs to be
+         * accurate to the local machine.
+         * </p>
+         * <p>
+         * When we say that the clock on two machines is "synchronized", we mean that the UTC time returned from
+         * {@link System#currentTimeMillis()} on each machine is basically the same. For the purposes of rate limits an
+         * differences of up to a second can be ignored.
+         * </p>
+         * <p>
+         * When the clock on the local machine is synchronized to the same time as the clock on the GitHub server (via a
+         * time service for example), the {@link #resetDate} generated directly from {@link #resetEpochSeconds} will be
+         * accurate for the local machine as well.
+         * </p>
+         * <p>
+         * When the clock on the local machine is not synchronized with the server, the {@link #resetDate} must be
+         * recalculated relative to the local machine clock. This is done by taking the number of seconds between the
+         * response "Date" header and {@link #resetEpochSeconds} and then adding that to this record's
+         * {@link #createdAtEpochSeconds}.
          *
          * @param updatedAt
          *            a string date in RFC 1123
          * @return reset date based on the passed date
          */
-        Date recalculateResetDate(@CheckForNull String updatedAt) {
+        @Nonnull
+        private Date calculateResetDate(@CheckForNull String updatedAt) {
             long updatedAtEpochSeconds = createdAtEpochSeconds;
             if (!StringUtils.isBlank(updatedAt)) {
                 try {
@@ -334,7 +386,7 @@ public class GHRateLimit {
             // This may seem odd but it results in an accurate or slightly pessimistic reset date
             // based on system time rather than assuming the system time synchronized with the server
             long calculatedSecondsUntilReset = resetEpochSeconds - updatedAtEpochSeconds;
-            return resetDate = new Date((createdAtEpochSeconds + calculatedSecondsUntilReset) * 1000);
+            return new Date((createdAtEpochSeconds + calculatedSecondsUntilReset) * 1000);
         }
 
         /**
@@ -358,7 +410,12 @@ public class GHRateLimit {
         /**
          * Gets the time in epoch seconds when the rate limit will reset.
          *
-         * @return a long
+         * This is the raw value returned by the server. This value is not adjusted if local machine time is not
+         * synchronized with server time. If attempting to check when the rate limit will reset, use
+         * {@link #getResetDate()} or implement a {@link RateLimitChecker} instead.
+         *
+         * @return a long representing the time in epoch seconds when the rate limit will reset
+         * @see #getResetDate() #getResetDate()
          */
         public long getResetEpochSeconds() {
             return resetEpochSeconds;
@@ -374,7 +431,10 @@ public class GHRateLimit {
         }
 
         /**
-         * Returns the date at which the rate limit will reset.
+         * Returns the date at which the rate limit will reset, adjusted to local machine time if the local machine's
+         * clock not synchronized with to the same clock as the GitHub server.
+         *
+         * If attempting to wait for the rate limit to reset, consider implementing a {@link RateLimitChecker} instead.
          *
          * @return the calculated date at which the rate limit has or will reset.
          */

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

@@ -58,6 +58,6 @@ public class GHReaction extends GHObject {
      *             the io exception
      */
     public void delete() throws IOException {
-        root.createRequest().method("DELETE").withPreview(SQUIRREL_GIRL).withUrlPath("/reactions/" + id).send();
+        root.createRequest().method("DELETE").withPreview(SQUIRREL_GIRL).withUrlPath("/reactions/" + getId()).send();
     }
 }

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

@@ -31,7 +31,7 @@ public class GHRef {
      * @return the url
      */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**
@@ -90,13 +90,6 @@ public class GHRef {
         return this;
     }
 
-    static GHRef[] wrap(GHRef[] in, GitHub root) {
-        for (GHRef r : in) {
-            r.wrap(root);
-        }
-        return in;
-    }
-
     /**
      * The type GHObject.
      */
@@ -131,7 +124,7 @@ public class GHRef {
          * @return the url
          */
         public URL getUrl() {
-            return GitHub.parseURL(url);
+            return GitHubClient.parseURL(url);
         }
     }
 }

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

@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -72,12 +71,13 @@ public class GHRelease extends GHObject {
      *             the io exception
      * @deprecated Use {@link #update()}
      */
+    @Deprecated
     public GHRelease setDraft(boolean draft) throws IOException {
         return update().draft(draft).update();
     }
 
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -258,8 +258,9 @@ public class GHRelease extends GHObject {
     public List<GHAsset> getAssets() throws IOException {
         Requester builder = owner.root.createRequest();
 
-        GHAsset[] assets = builder.withUrlPath(getApiTailUrl("assets")).fetchArray(GHAsset[].class);
-        return Arrays.asList(GHAsset.wrap(assets, this));
+        return builder.withUrlPath(getApiTailUrl("assets"))
+                .toIterable(GHAsset[].class, item -> item.wrap(this))
+                .toList();
     }
 
     /**
@@ -269,7 +270,7 @@ public class GHRelease extends GHObject {
      *             the io exception
      */
     public void delete() throws IOException {
-        root.createRequest().method("DELETE").withUrlPath(owner.getApiTailUrl("releases/" + id)).send();
+        root.createRequest().method("DELETE").withUrlPath(owner.getApiTailUrl("releases/" + getId())).send();
     }
 
     /**
@@ -282,6 +283,6 @@ public class GHRelease extends GHObject {
     }
 
     private String getApiTailUrl(String end) {
-        return owner.getApiTailUrl(format("releases/%s/%s", id, end));
+        return owner.getApiTailUrl(format("releases/%s/%s", getId(), end));
     }
 }

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

@@ -100,7 +100,7 @@ public class GHReleaseUpdater {
      */
     public GHRelease update() throws IOException {
         return builder.method("PATCH")
-                .withUrlPath(base.owner.getApiTailUrl("releases/" + base.id))
+                .withUrlPath(base.owner.getApiTailUrl("releases/" + base.getId()))
                 .fetch(GHRelease.class)
                 .wrap(base.owner);
     }

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

@@ -18,6 +18,6 @@ class GHRepoHook extends GHHook {
 
     @Override
     String getApiRoute() {
-        return String.format("/repos/%s/%s/hooks/%d", repository.getOwnerName(), repository.getName(), id);
+        return String.format("/repos/%s/%s/hooks/%d", repository.getOwnerName(), repository.getName(), getId());
     }
 }

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

@@ -24,7 +24,11 @@
 package org.kohsuke.github;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.lang3.StringUtils;
 
@@ -37,7 +41,6 @@ import java.io.Reader;
 import java.net.URL;
 import java.util.AbstractSet;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -46,6 +49,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.WeakHashMap;
@@ -62,9 +66,9 @@ import static org.kohsuke.github.Previews.*;
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
 public class GHRepository extends GHObject {
-    /* package almost final */ GitHub root;
+    /* package almost final */ transient GitHub root;
 
-    private String description, homepage, name, full_name;
+    private String nodeId, description, homepage, name, full_name;
     private String html_url; // this is the UI
     /*
      * The license information makes use of the preview API.
@@ -75,12 +79,14 @@ public class GHRepository extends GHObject {
 
     private String git_url, ssh_url, clone_url, svn_url, mirror_url;
     private GHUser owner; // not fully populated. beware.
-    private boolean has_issues, has_wiki, fork, has_downloads, has_pages, archived;
+    private boolean has_issues, has_wiki, fork, has_downloads, has_pages, archived, has_projects;
 
     private boolean allow_squash_merge;
     private boolean allow_merge_commit;
     private boolean allow_rebase_merge;
 
+    private boolean delete_branch_on_merge;
+
     @JsonProperty("private")
     private boolean _private;
     private int forks_count, stargazers_count, watchers_count, size, open_issues_count, subscribers_count;
@@ -116,6 +122,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      * @deprecated Use {@code getDeployment(id).listStatuses()}
      */
+    @Deprecated
     public PagedIterable<GHDeploymentStatus> getDeploymentStatuses(final int id) throws IOException {
         return getDeployment(id).listStatuses();
     }
@@ -171,6 +178,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      * @deprecated Use {@code getDeployment(deploymentId).createStatus(ghDeploymentState)}
      */
+    @Deprecated
     public GHDeploymentStatusBuilder createDeployStatus(int deploymentId, GHDeploymentState ghDeploymentState)
             throws IOException {
         return getDeployment(deploymentId).createStatus(ghDeploymentState);
@@ -180,6 +188,15 @@ public class GHRepository extends GHObject {
         boolean pull, push, admin;
     }
 
+    /**
+     * Gets node id
+     *
+     * @return the node id
+     */
+    public String getNodeId() {
+        return nodeId;
+    }
+
     /**
      * Gets description.
      *
@@ -222,6 +239,7 @@ public class GHRepository extends GHObject {
      * @return the string
      * @deprecated Typo of {@link #getHttpTransportUrl()}
      */
+    @Deprecated
     public String gitHttpTransportUrl() {
         return clone_url;
     }
@@ -255,7 +273,7 @@ public class GHRepository extends GHObject {
     }
 
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -358,7 +376,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public List<GHIssue> getIssues(GHIssueState state) throws IOException {
-        return listIssues(state).asList();
+        return listIssues(state).toList();
     }
 
     /**
@@ -376,8 +394,9 @@ public class GHRepository extends GHObject {
         Requester requester = root.createRequest()
                 .with("state", state)
                 .with("milestone", milestone == null ? "none" : "" + milestone.getNumber());
-        return Arrays
-                .asList(GHIssue.wrap(requester.withUrlPath(getApiTailUrl("issues")).fetchArray(GHIssue[].class), this));
+        return requester.withUrlPath(getApiTailUrl("issues"))
+                .toIterable(GHIssue[].class, item -> item.wrap(this))
+                .toList();
     }
 
     /**
@@ -436,7 +455,7 @@ public class GHRepository extends GHObject {
      * @deprecated use {@link #listReleases()}
      */
     public List<GHRelease> getReleases() throws IOException {
-        return listReleases().asList();
+        return listReleases().toList();
     }
 
     /**
@@ -551,6 +570,15 @@ public class GHRepository extends GHObject {
         return has_issues;
     }
 
+    /**
+     * Has projects boolean.
+     *
+     * @return the boolean
+     */
+    public boolean hasProjects() {
+        return has_projects;
+    }
+
     /**
      * Has wiki boolean.
      *
@@ -605,13 +633,34 @@ public class GHRepository extends GHObject {
         return allow_rebase_merge;
     }
 
+    /**
+     * Automatically deleting head branches when pull requests are merged
+     *
+     * @return the boolean
+     */
+    public boolean isDeleteBranchOnMerge() {
+        return delete_branch_on_merge;
+    }
+
+    /**
+     * Returns the number of all forks of this repository. This not only counts direct forks, but also forks of forks,
+     * and so on.
+     *
+     * @return the forks
+     * @deprecated use {@link #getForksCount()} instead
+     */
+    @Deprecated
+    public int getForks() {
+        return getForksCount();
+    }
+
     /**
      * Returns the number of all forks of this repository. This not only counts direct forks, but also forks of forks,
      * and so on.
      *
      * @return the forks
      */
-    public int getForks() {
+    public int getForksCount() {
         return forks_count;
     }
 
@@ -655,8 +704,19 @@ public class GHRepository extends GHObject {
      * Gets watchers.
      *
      * @return the watchers
+     * @deprecated use {@link #getWatchersCount()} instead
      */
+    @Deprecated
     public int getWatchers() {
+        return getWatchersCount();
+    }
+
+    /**
+     * Gets the count of watchers.
+     *
+     * @return the watchers
+     */
+    public int getWatchersCount() {
         return watchers_count;
     }
 
@@ -669,16 +729,6 @@ public class GHRepository extends GHObject {
         return open_issues_count;
     }
 
-    /**
-     * Gets network count.
-     *
-     * @return the network count
-     * @deprecated This no longer exists in the official API documentation. Use {@link #getForks()}
-     */
-    public int getNetworkCount() {
-        return forks_count;
-    }
-
     /**
      * Gets subscribers count.
      *
@@ -694,7 +744,7 @@ public class GHRepository extends GHObject {
      * @return null if the repository was never pushed at.
      */
     public Date getPushedAt() {
-        return GitHub.parseDate(pushed_at);
+        return GitHubClient.parseDate(pushed_at);
     }
 
     /**
@@ -712,6 +762,7 @@ public class GHRepository extends GHObject {
      * @return the master branch
      * @deprecated Renamed to {@link #getDefaultBranch()}
      */
+    @Deprecated
     public String getMasterBranch() {
         return default_branch;
     }
@@ -734,7 +785,7 @@ public class GHRepository extends GHObject {
      */
     @WithBridgeMethods(Set.class)
     public GHPersonSet<GHUser> getCollaborators() throws IOException {
-        return new GHPersonSet<GHUser>(listCollaborators().asList());
+        return new GHPersonSet<GHUser>(listCollaborators().toList());
     }
 
     /**
@@ -784,11 +835,14 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public Set<String> getCollaboratorNames() throws IOException {
-        Set<String> r = new HashSet<String>();
-        for (GHUser u : GHUser.wrap(
-                root.createRequest().withUrlPath(getApiTailUrl("collaborators")).fetchArray(GHUser[].class),
-                root))
+        Set<String> r = new HashSet<>();
+        // no initializer - we just want to the logins
+        PagedIterable<GHUser> users = root.createRequest()
+                .withUrlPath(getApiTailUrl("collaborators"))
+                .toIterable(GHUser[].class, null);
+        for (GHUser u : users.toArray()) {
             r.add(u.login);
+        }
         return r;
     }
 
@@ -813,7 +867,7 @@ public class GHRepository extends GHObject {
      * Obtain permission for a given user in this repository.
      *
      * @param u
-     *            the u
+     *            the user
      * @return the permission
      * @throws IOException
      *             the io exception
@@ -830,9 +884,25 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public Set<GHTeam> getTeams() throws IOException {
-        return Collections.unmodifiableSet(new HashSet<GHTeam>(Arrays.asList(
-                GHTeam.wrapUp(root.createRequest().withUrlPath(getApiTailUrl("teams")).fetchArray(GHTeam[].class),
-                        root.getOrganization(getOwnerName())))));
+        GHOrganization org = root.getOrganization(getOwnerName());
+        return root.createRequest()
+                .withUrlPath(getApiTailUrl("teams"))
+                .toIterable(GHTeam[].class, item -> item.wrapUp(org))
+                .toSet();
+    }
+
+    /**
+     * Add collaborators.
+     *
+     * @param users
+     *            the users
+     * @param permission
+     *            the permission level
+     * @throws IOException
+     *             the io exception
+     */
+    public void addCollaborators(GHOrganization.Permission permission, GHUser... users) throws IOException {
+        addCollaborators(asList(users), permission);
     }
 
     /**
@@ -856,7 +926,21 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void addCollaborators(Collection<GHUser> users) throws IOException {
-        modifyCollaborators(users, "PUT");
+        modifyCollaborators(users, "PUT", null);
+    }
+
+    /**
+     * Add collaborators.
+     *
+     * @param users
+     *            the users
+     * @param permission
+     *            the permission level
+     * @throws IOException
+     *             the io exception
+     */
+    public void addCollaborators(Collection<GHUser> users, GHOrganization.Permission permission) throws IOException {
+        modifyCollaborators(users, "PUT", permission);
     }
 
     /**
@@ -880,12 +964,20 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void removeCollaborators(Collection<GHUser> users) throws IOException {
-        modifyCollaborators(users, "DELETE");
+        modifyCollaborators(users, "DELETE", null);
     }
 
-    private void modifyCollaborators(Collection<GHUser> users, String method) throws IOException {
+    private void modifyCollaborators(@NonNull Collection<GHUser> users,
+            @NonNull String method,
+            @CheckForNull GHOrganization.Permission permission) throws IOException {
+        Requester requester = root.createRequest().method(method);
+
+        if (permission != null) {
+            requester = requester.with("permission", permission).inBody();
+        }
+
         for (GHUser user : users) {
-            root.createRequest().method(method).withUrlPath(getApiTailUrl("collaborators/" + user.getLogin())).send();
+            requester.withUrlPath(getApiTailUrl("collaborators/" + user.getLogin())).send();
         }
     }
 
@@ -928,6 +1020,18 @@ public class GHRepository extends GHObject {
         edit("has_issues", String.valueOf(v));
     }
 
+    /**
+     * Enables or disables projects for this repository.
+     *
+     * @param v
+     *            the v
+     * @throws IOException
+     *             the io exception
+     */
+    public void enableProjects(boolean v) throws IOException {
+        edit("has_projects", String.valueOf(v));
+    }
+
     /**
      * Enables or disables Wiki for this repository.
      *
@@ -1048,6 +1152,18 @@ public class GHRepository extends GHObject {
         edit("allow_rebase_merge", Boolean.toString(value));
     }
 
+    /**
+     * After pull requests are merged, you can have head branches deleted automatically.
+     *
+     * @param value
+     *            the value
+     * @throws IOException
+     *             the io exception
+     */
+    public void deleteBranchOnMerge(boolean value) throws IOException {
+        edit("delete_branch_on_merge", Boolean.toString(value));
+    }
+
     /**
      * Deletes this repository.
      *
@@ -1202,7 +1318,7 @@ public class GHRepository extends GHObject {
      * @see #listPullRequests(GHIssueState) #listPullRequests(GHIssueState)
      */
     public List<GHPullRequest> getPullRequests(GHIssueState state) throws IOException {
-        return queryPullRequests().state(state).list().asList();
+        return queryPullRequests().state(state).list().toList();
     }
 
     /**
@@ -1213,6 +1329,7 @@ public class GHRepository extends GHObject {
      * @return the paged iterable
      * @deprecated Use {@link #queryPullRequests()}
      */
+    @Deprecated
     public PagedIterable<GHPullRequest> listPullRequests(GHIssueState state) {
         return queryPullRequests().state(state).list();
     }
@@ -1413,9 +1530,7 @@ public class GHRepository extends GHObject {
      *             on failure communicating with GitHub
      */
     public GHRef[] getRefs() throws IOException {
-        return GHRef.wrap(root.createRequest()
-                .withUrlPath(String.format("/repos/%s/%s/git/refs", getOwnerName(), name))
-                .fetchArray(GHRef[].class), root);
+        return listRefs().toArray();
     }
 
     /**
@@ -1440,9 +1555,7 @@ public class GHRepository extends GHObject {
      *             on failure communicating with GitHub, potentially due to an invalid ref type being requested
      */
     public GHRef[] getRefs(String refType) throws IOException {
-        return GHRef.wrap(root.createRequest()
-                .withUrlPath(String.format("/repos/%s/%s/git/refs/%s", getOwnerName(), name, refType))
-                .fetchArray(GHRef[].class), root);
+        return listRefs(refType).toArray();
     }
 
     /**
@@ -1455,6 +1568,9 @@ public class GHRepository extends GHObject {
      *             on failure communicating with GitHub, potentially due to an invalid ref type being requested
      */
     public PagedIterable<GHRef> listRefs(String refType) throws IOException {
+        if (refType.startsWith("refs/")) {
+            refType = refType.replaceFirst("refs/", "");
+        }
         final String url = String.format("/repos/%s/%s/git/refs/%s", getOwnerName(), name, refType);
         return root.createRequest().withUrlPath(url).toIterable(GHRef[].class, item -> item.wrap(root));
     }
@@ -1469,10 +1585,34 @@ public class GHRepository extends GHObject {
      *             on failure communicating with GitHub, potentially due to an invalid ref type being requested
      */
     public GHRef getRef(String refName) throws IOException {
-        return root.createRequest()
-                .withUrlPath(getApiTailUrl(String.format("git/refs/%s", refName)))
-                .fetch(GHRef.class)
-                .wrap(root);
+        // Also accept e.g. "refs/heads/branch" for consistency with createRef().
+        if (refName.startsWith("refs/")) {
+            refName = refName.replaceFirst("refs/", "");
+        }
+
+        // We would expect this to use `git/ref/%s` but some versions of GHE seem to not support it
+        // Instead use `git/refs/%s` and check the result actually matches the ref
+        GHRef result = null;
+        try {
+            result = root.createRequest()
+                    .withUrlPath(getApiTailUrl(String.format("git/refs/%s", refName)))
+                    .fetch(GHRef.class)
+                    .wrap(root);
+        } catch (IOException e) {
+            // If the parse exception is due to the above returning an array instead of a single ref
+            // that means the individual ref did not exist
+            if (!(e.getCause() instanceof JsonMappingException)) {
+                throw e;
+            }
+        }
+
+        // Verify that the ref returned is the one requested
+        if (result == null || !result.getRef().equals("refs/" + refName)) {
+            throw new GHFileNotFoundException(String.format("git/refs/%s", refName)
+                    + " {\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-reference\"}");
+        }
+        return result;
+
     }
 
     /**
@@ -1676,7 +1816,7 @@ public class GHRepository extends GHObject {
     }
 
     /**
-     * /** Lists all the commit statues attached to the given commit, newer ones first.
+     * /** Lists all the commit statuses attached to the given commit, newer ones first.
      *
      * @param sha1
      *            the sha 1
@@ -1700,10 +1840,31 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public GHCommitStatus getLastCommitStatus(String sha1) throws IOException {
-        List<GHCommitStatus> v = listCommitStatuses(sha1).asList();
+        List<GHCommitStatus> v = listCommitStatuses(sha1).toList();
         return v.isEmpty() ? null : v.get(0);
     }
 
+    /**
+     * Gets check runs for given ref.
+     *
+     * @param ref
+     *            ref
+     * @return check runs for given ref
+     * @throws IOException
+     *             the io exception
+     * @see <a href="https://developer.github.com/v3/checks/runs/#list-check-runs-for-a-specific-ref">List check runs
+     *      for a specific ref</a>
+     */
+    @Preview
+    @Deprecated
+    public PagedIterable<GHCheckRun> getCheckRuns(String ref) throws IOException {
+        GitHubRequest request = root.createRequest()
+                .withUrlPath(String.format("/repos/%s/%s/commits/%s/check-runs", getOwnerName(), name, ref))
+                .withPreview(ANTIOPE)
+                .build();
+        return new GHCheckRunsIterable(root, request);
+    }
+
     /**
      * Creates a commit status
      *
@@ -1759,6 +1920,21 @@ public class GHRepository extends GHObject {
         return createCommitStatus(sha1, state, targetUrl, description, null);
     }
 
+    /**
+     * Creates a check run for a commit.
+     *
+     * @param name
+     *            an identifier for the run
+     * @param headSHA
+     *            the commit hash
+     * @return a builder which you should customize, then call {@link GHCheckRunBuilder#create}
+     */
+    @Preview
+    @Deprecated
+    public @NonNull GHCheckRunBuilder createCheckRun(@NonNull String name, @NonNull String headSHA) {
+        return new GHCheckRunBuilder(this, name, headSHA);
+    }
+
     /**
      * Lists repository events.
      *
@@ -1782,9 +1958,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public PagedIterable<GHLabel> listLabels() throws IOException {
-        return root.createRequest()
-                .withUrlPath(getApiTailUrl("labels"))
-                .toIterable(GHLabel[].class, item -> item.wrapUp(this));
+        return GHLabel.readAll(this);
     }
 
     /**
@@ -1797,7 +1971,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public GHLabel getLabel(String name) throws IOException {
-        return root.createRequest().withUrlPath(getApiTailUrl("labels/" + name)).fetch(GHLabel.class).wrapUp(this);
+        return GHLabel.read(this, name);
     }
 
     /**
@@ -1812,7 +1986,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public GHLabel createLabel(String name, String color) throws IOException {
-        return createLabel(name, color, "");
+        return GHLabel.create(this).name(name).color(color).description("").done();
     }
 
     /**
@@ -1829,14 +2003,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public GHLabel createLabel(String name, String color, String description) throws IOException {
-        return root.createRequest()
-                .method("POST")
-                .with("name", name)
-                .with("color", color)
-                .with("description", description)
-                .withUrlPath(getApiTailUrl("labels"))
-                .fetch(GHLabel.class)
-                .wrapUp(this);
+        return GHLabel.create(this).name(name).color(color).description(description).done();
     }
 
     /**
@@ -1939,14 +2106,6 @@ public class GHRepository extends GHObject {
         return createWebHook(url, null);
     }
 
-    // this is no different from getPullRequests(OPEN)
-    // /**
-    // * Retrieves all the pull requests.
-    // */
-    // public List<GHPullRequest> getPullRequests() throws IOException {
-    // return root.retrieveWithAuth("/pulls/"+owner+'/'+name,JsonPullRequests.class).wrap(root);
-    // }
-
     /**
      * Returns a set that represents the post-commit hook URLs. The returned set is live, and changes made to them are
      * reflected to GitHub.
@@ -1956,6 +2115,7 @@ public class GHRepository extends GHObject {
      */
     @SuppressFBWarnings(value = "DMI_COLLECTION_OF_URLS",
             justification = "It causes a performance degradation, but we have already exposed it to the API")
+    @Deprecated
     public Set<URL> getPostCommitHooks() {
         return postCommitHooks;
     }
@@ -1969,7 +2129,7 @@ public class GHRepository extends GHObject {
     private final Set<URL> postCommitHooks = new AbstractSet<URL>() {
         private List<URL> getPostCommitHooks() {
             try {
-                List<URL> r = new ArrayList<URL>();
+                List<URL> r = new ArrayList<>();
                 for (GHHook h : getHooks()) {
                     if (h.getName().equals("web")) {
                         r.add(new URL(h.getConfig().get("url")));
@@ -2020,9 +2180,15 @@ public class GHRepository extends GHObject {
 
     GHRepository wrap(GitHub root) {
         this.root = root;
-        if (root.isOffline()) {
+        if (root.isOffline() && owner != null) {
             owner.wrapUp(root);
         }
+        if (source != null) {
+            source.wrap(root);
+        }
+        if (parent != null) {
+            parent.wrap(root);
+        }
         return this;
     }
 
@@ -2035,8 +2201,10 @@ public class GHRepository extends GHObject {
      */
     public Map<String, GHBranch> getBranches() throws IOException {
         Map<String, GHBranch> r = new TreeMap<String, GHBranch>();
-        for (GHBranch p : root.createRequest().withUrlPath(getApiTailUrl("branches")).fetchArray(GHBranch[].class)) {
-            p.wrap(this);
+        for (GHBranch p : root.createRequest()
+                .withUrlPath(getApiTailUrl("branches"))
+                .toIterable(GHBranch[].class, item -> item.wrap(this))
+                .toArray()) {
             r.put(p.getName(), p);
         }
         return r;
@@ -2167,11 +2335,10 @@ public class GHRepository extends GHObject {
         }
         String target = getApiTailUrl("contents/" + path);
 
-        GHContent[] files = requester.with("ref", ref).withUrlPath(target).fetchArray(GHContent[].class);
-
-        GHContent.wrap(files, this);
-
-        return Arrays.asList(files);
+        return requester.with("ref", ref)
+                .withUrlPath(target)
+                .toIterable(GHContent[].class, item -> item.wrap(this))
+                .toList();
     }
 
     /**
@@ -2325,11 +2492,10 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public List<GHDeployKey> getDeployKeys() throws IOException {
-        List<GHDeployKey> list = new ArrayList<GHDeployKey>(
-                Arrays.asList(root.createRequest().withUrlPath(getApiTailUrl("keys")).fetchArray(GHDeployKey[].class)));
-        for (GHDeployKey h : list)
-            h.wrap(this);
-        return list;
+        return root.createRequest()
+                .withUrlPath(getApiTailUrl("keys"))
+                .toIterable(GHDeployKey[].class, item -> item.wrap(this))
+                .toList();
     }
 
     /**
@@ -2342,10 +2508,13 @@ public class GHRepository extends GHObject {
      * @see #getParent() #getParent()
      */
     public GHRepository getSource() throws IOException {
-        if (source == null)
+        if (fork && source == null) {
+            populate();
+        }
+        if (source == null) {
             return null;
-        if (source.root == null)
-            source = root.getRepository(source.getFullName());
+        }
+
         return source;
     }
 
@@ -2360,10 +2529,13 @@ public class GHRepository extends GHObject {
      * @see #getSource() #getSource()
      */
     public GHRepository getParent() throws IOException {
-        if (parent == null)
+        if (fork && parent == null) {
+            populate();
+        }
+
+        if (parent == null) {
             return null;
-        if (parent.root == null)
-            parent = root.getRepository(parent.getFullName());
+        }
         return parent;
     }
 
@@ -2682,4 +2854,31 @@ public class GHRepository extends GHObject {
                 .fetch(GHTagObject.class)
                 .wrap(this);
     }
+
+    /**
+     * Populate this object.
+     *
+     * @throws java.io.IOException
+     *             The IO exception
+     */
+    void populate() throws IOException {
+        if (root.isOffline())
+            return; // can't populate if the root is offline
+
+        final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
+
+        try {
+            // IMPORTANT: the url for repository records is does not reliably point to the API url.
+            // There is bug in Push event payloads that returns the wrong url.
+            // All other occurrences of "url" take the form "https://api.github.com/...".
+            // For Push event repository records, they take the form "https://github.com/{fullName}".
+            root.createRequest().setRawUrlPath(url.toString()).fetchInto(this).wrap(root);
+        } catch (HttpException e) {
+            if (e.getCause() instanceof JsonParseException) {
+                root.createRequest().withUrlPath("/repos/" + full_name).fetchInto(this).wrap(root);
+            } else {
+                throw e;
+            }
+        }
+    }
 }

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

@@ -1,12 +1,13 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 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.Collections;
 import java.util.List;
 import java.util.NoSuchElementException;
 
@@ -315,21 +316,12 @@ public class GHRepositoryStatistics {
      *             the io exception
      */
     public List<CodeFrequency> getCodeFrequency() throws IOException {
-        // Map to arrays first, since there are no field names in the
-        // returned JSON.
         try {
-            Integer[][] list = root.createRequest()
+            CodeFrequency[] list = root.createRequest()
                     .withUrlPath(getApiTailUrl("code_frequency"))
-                    .fetch(Integer[][].class);
+                    .fetch(CodeFrequency[].class);
 
-            // Convert to proper objects.
-            List<CodeFrequency> returnList = new ArrayList<>();
-            for (Integer[] item : list) {
-                CodeFrequency cf = new CodeFrequency(Arrays.asList(item));
-                returnList.add(cf);
-            }
-
-            return returnList;
+            return Arrays.asList(list);
         } catch (MismatchedInputException e) {
             // This sometimes happens when retrieving code frequency statistics
             // for a repository for the first time. It is probably still being
@@ -342,10 +334,12 @@ public class GHRepositoryStatistics {
      * The type CodeFrequency.
      */
     public static class CodeFrequency {
-        private int week;
-        private int additions;
-        private int deletions;
 
+        private final int week;
+        private final int additions;
+        private final int deletions;
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
         private CodeFrequency(List<Integer> item) {
             week = item.get(0);
             additions = item.get(1);
@@ -428,7 +422,7 @@ public class GHRepositoryStatistics {
          * @return The list of commit counts for everyone combined, for the last 52 weeks.
          */
         public List<Integer> getAllCommits() {
-            return all;
+            return Collections.unmodifiableList(all);
         }
 
         /**
@@ -437,7 +431,7 @@ public class GHRepositoryStatistics {
          * @return The list of commit counts for the owner, for the last 52 weeks.
          */
         public List<Integer> getOwnerCommits() {
-            return owner;
+            return Collections.unmodifiableList(owner);
         }
 
         Participation wrapUp(GitHub root) {
@@ -455,28 +449,22 @@ public class GHRepositoryStatistics {
      *             the io exception
      */
     public List<PunchCardItem> getPunchCard() throws IOException {
-        // Map to ArrayLists first, since there are no field names in the
-        // returned JSON.
-        Integer[][] list = root.createRequest().withUrlPath(getApiTailUrl("punch_card")).fetch(Integer[][].class);
-
-        // Convert to proper objects.
-        ArrayList<PunchCardItem> returnList = new ArrayList<>();
-        for (Integer[] item : list) {
-            PunchCardItem pci = new PunchCardItem(Arrays.asList(item));
-            returnList.add(pci);
-        }
-
-        return returnList;
+        PunchCardItem[] list = root.createRequest()
+                .withUrlPath(getApiTailUrl("punch_card"))
+                .fetch(PunchCardItem[].class);
+        return Arrays.asList(list);
     }
 
     /**
      * The type PunchCardItem.
      */
     public static class PunchCardItem {
-        private int dayOfWeek;
-        private int hourOfDay;
-        private int numberOfCommits;
 
+        private final int dayOfWeek;
+        private final int hourOfDay;
+        private final int numberOfCommits;
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
         private PunchCardItem(List<Integer> item) {
             dayOfWeek = item.get(0);
             hourOfDay = item.get(1);

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

@@ -47,7 +47,7 @@ public abstract class GHRepositoryTraffic implements TrafficInfo {
          * @return the timestamp
          */
         public Date getTimestamp() {
-            return GitHub.parseDate(timestamp);
+            return GitHubClient.parseDate(timestamp);
         }
 
         public int getCount() {

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

@@ -2,6 +2,7 @@ package org.kohsuke.github;
 
 import org.apache.commons.lang3.StringUtils;
 
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,6 +24,7 @@ public abstract class GHSearchBuilder<T> extends GHQueryBuilder<T> {
     GHSearchBuilder(GitHub root, Class<? extends SearchResult<T>> receiverType) {
         super(root);
         this.receiverType = receiverType;
+        req.withUrlPath(getApiUrl());
     }
 
     /**
@@ -42,16 +44,13 @@ public abstract class GHSearchBuilder<T> extends GHQueryBuilder<T> {
      */
     @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.withUrlPath(getApiUrl()).asIterator(receiverType, pageSize))) {
-                    protected void wrapUp(T[] page) {
-                        // SearchResult.getItems() should do it
-                    }
-                };
-            }
-        };
+
+        req.set("q", StringUtils.join(terms, " "));
+        try {
+            return new PagedSearchIterable<>(root, req.build(), receiverType);
+        } catch (MalformedURLException e) {
+            throw new GHException("", e);
+        }
     }
 
     /**

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

@@ -32,7 +32,7 @@ public class GHStargazer {
      * @return the date the stargazer was added
      */
     public Date getStarredAt() {
-        return GitHub.parseDate(starred_at);
+        return GitHubClient.parseDate(starred_at);
     }
 
     /**

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

@@ -23,7 +23,7 @@ public class GHSubscription {
      * @return the created at
      */
     public Date getCreatedAt() {
-        return GitHub.parseDate(created_at);
+        return GitHubClient.parseDate(created_at);
     }
 
     /**

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

@@ -19,6 +19,7 @@ public class GHTagObject {
     private String message;
     private GitUser tagger;
     private GHRef.GHObject object;
+    private GHVerification verification;
 
     GHTagObject wrap(GHRepository owner) {
         this.owner = owner;
@@ -97,4 +98,13 @@ public class GHTagObject {
     public GHRef.GHObject getObject() {
         return object;
     }
+
+    /**
+     * Gets Verification Status.
+     *
+     * @return the Verification status
+     */
+    public GHVerification getVerification() {
+        return verification;
+    }
 }

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

@@ -1,24 +1,27 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.util.Collections;
+import java.net.URL;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 
+import javax.annotation.Nonnull;
+
 /**
  * A team in GitHub organization.
  *
  * @author Kohsuke Kawaguchi
  */
-public class GHTeam implements Refreshable {
+public class GHTeam extends GHObject implements Refreshable {
+    private String html_url;
     private String name;
     private String permission;
     private String slug;
     private String description;
     private Privacy privacy;
 
-    private int id;
     private GHOrganization organization; // populated by GET /user/teams where Teams+Orgs are returned together
 
     protected /* final */ GitHub root;
@@ -54,13 +57,6 @@ public class GHTeam implements Refreshable {
         return wrapUp(organization);
     }
 
-    static GHTeam[] wrapUp(GHTeam[] teams, GHOrganization owner) {
-        for (GHTeam t : teams) {
-            t.wrapUp(owner);
-        }
-        return teams;
-    }
-
     static GHTeam[] wrapUp(GHTeam[] teams, GHPullRequest owner) {
         for (GHTeam t : teams) {
             t.root = owner.root;
@@ -138,12 +134,33 @@ public class GHTeam implements Refreshable {
     }
 
     /**
-     * Gets id.
+     * Retrieves the discussions.
      *
-     * @return the id
+     * @return the paged iterable
+     * @throws IOException
+     *             the io exception
      */
-    public int getId() {
-        return id;
+    @Nonnull
+    public PagedIterable<GHDiscussion> listDiscussions() throws IOException {
+        return GHDiscussion.readAll(this);
+    }
+
+    /**
+     * Gets a single discussion by ID.
+     *
+     * @param discussionNumber
+     *            id of the discussion that we want to query for
+     * @return the discussion
+     * @throws java.io.FileNotFoundException
+     *             if the discussion does not exist
+     * @throws IOException
+     *             the io exception
+     *
+     * @see <a href= "https://developer.github.com/v3/teams/discussions/#get-a-discussion">documentation</a>
+     */
+    @Nonnull
+    public GHDiscussion getDiscussion(long discussionNumber) throws IOException {
+        return GHDiscussion.read(this, discussionNumber);
     }
 
     /**
@@ -165,7 +182,7 @@ public class GHTeam implements Refreshable {
      *             the io exception
      */
     public Set<GHUser> getMembers() throws IOException {
-        return Collections.unmodifiableSet(listMembers().asSet());
+        return listMembers().toSet();
     }
 
     /**
@@ -177,7 +194,7 @@ public class GHTeam implements Refreshable {
      */
     public boolean hasMember(GHUser user) {
         try {
-            root.createRequest().withUrlPath("/teams/" + id + "/members/" + user.getLogin()).send();
+            root.createRequest().withUrlPath("/teams/" + getId() + "/members/" + user.getLogin()).send();
             return true;
         } catch (IOException ignore) {
             return false;
@@ -310,7 +327,22 @@ public class GHTeam implements Refreshable {
     }
 
     private String api(String tail) {
-        return "/teams/" + id + tail;
+        return "/teams/" + getId() + tail;
+    }
+
+    /**
+     * Begins the creation of a new instance.
+     *
+     * Consumer must call {@link GHDiscussion.Creator#done()} to commit changes.
+     *
+     * @param title
+     *            title of the discussion to be created
+     * @return a {@link GHDiscussion.Creator}
+     * @throws IOException
+     *             the io exception
+     */
+    public GHDiscussion.Creator createDiscussion(String title) throws IOException {
+        return GHDiscussion.create(this).title(title);
     }
 
     /**
@@ -329,4 +361,28 @@ public class GHTeam implements Refreshable {
     public void refresh() throws IOException {
         root.createRequest().withUrlPath(api("")).fetchInto(this).wrapUp(root);
     }
+
+    @Override
+    public URL getHtmlUrl() {
+        return GitHubClient.parseURL(html_url);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        GHTeam ghTeam = (GHTeam) o;
+        return Objects.equals(name, ghTeam.name) && Objects.equals(getUrl(), ghTeam.getUrl())
+                && Objects.equals(permission, ghTeam.permission) && Objects.equals(slug, ghTeam.slug)
+                && Objects.equals(description, ghTeam.description) && privacy == ghTeam.privacy;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, getUrl(), permission, slug, description, privacy);
+    }
 }

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

@@ -41,7 +41,7 @@ public class GHThread extends GHObject {
      * @return the last read at
      */
     public Date getLastReadAt() {
-        return GitHub.parseDate(last_read_at);
+        return GitHubClient.parseDate(last_read_at);
     }
 
     /**

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

@@ -71,7 +71,7 @@ public class GHTree {
      * @return the url
      */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     GHTree wrap(GHRepository repo) {

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

@@ -68,7 +68,7 @@ public class GHTreeEntry {
      * @return the url
      */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
     /**

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

@@ -43,8 +43,7 @@ public class GHUser extends GHPerson {
      *             the io exception
      */
     public List<GHKey> getKeys() throws IOException {
-        return Collections.unmodifiableList(
-                Arrays.asList(root.createRequest().withUrlPath(getApiTailUrl("keys")).fetchArray(GHKey[].class)));
+        return root.createRequest().withUrlPath(getApiTailUrl("keys")).toIterable(GHKey[].class, null).toList();
     }
 
     /**
@@ -76,7 +75,7 @@ public class GHUser extends GHPerson {
      */
     @WithBridgeMethods(Set.class)
     public GHPersonSet<GHUser> getFollows() throws IOException {
-        return new GHPersonSet<GHUser>(listFollows().asList());
+        return new GHPersonSet<GHUser>(listFollows().toList());
     }
 
     /**
@@ -97,7 +96,7 @@ public class GHUser extends GHPerson {
      */
     @WithBridgeMethods(Set.class)
     public GHPersonSet<GHUser> getFollowers() throws IOException {
-        return new GHPersonSet<GHUser>(listFollowers().asList());
+        return new GHPersonSet<GHUser>(listFollowers().toList());
     }
 
     /**
@@ -174,6 +173,19 @@ public class GHUser extends GHPerson {
         return org.hasPublicMember(this);
     }
 
+    /**
+     * Returns true if this user is marked as hireable, false otherwise
+     *
+     * @return if the user is marked as hireable
+     */
+    public boolean isHireable() {
+        return hireable;
+    }
+
+    public String getBio() {
+        return bio;
+    }
+
     static GHUser[] wrap(GHUser[] users, GitHub root) {
         for (GHUser f : users)
             f.root = root;
@@ -193,7 +205,8 @@ public class GHUser extends GHPerson {
         Set<String> names = new HashSet<String>();
         for (GHOrganization o : root.createRequest()
                 .withUrlPath("/users/" + login + "/orgs")
-                .fetchArray(GHOrganization[].class)) {
+                .toIterable(GHOrganization[].class, null)
+                .toArray()) {
             if (names.add(o.getLogin())) // I've seen some duplicates in the data
                 orgs.add(root.getOrganization(o.getLogin()));
         }
@@ -219,7 +232,7 @@ public class GHUser extends GHPerson {
     public PagedIterable<GHGist> listGists() throws IOException {
         return root.createRequest()
                 .withUrlPath(String.format("/users/%s/gists", login))
-                .toIterable(GHGist[].class, item -> item.wrapUp(this));
+                .toIterable(GHGist[].class, null);
     }
 
     @Override

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

@@ -0,0 +1,82 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * The commit/tag can be signed by user. This object holds the verification status. Whether the Commit/Tag is signed or
+ * not.
+ *
+ * @see <a href="https://developer.github.com/v3/git/tags/#signature-verification-object">tags signature
+ *      verificatiion</a>
+ * @see <a href="https://developer.github.com/v3/git/commits/#signature-verification-object">commits signature
+ *      verificatiion</a>
+ *
+ * @author Sourabh Sarvotham Parkala
+ */
+@SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
+        justification = "JSON API")
+public class GHVerification {
+    private String signature, payload;
+    private boolean verified;
+    private Reason reason;
+
+    /**
+     * Indicates whether GitHub considers the signature in this commit to be verified.
+     *
+     * @return true if the signature is valid else returns false.
+     */
+    public boolean isVerified() {
+        return verified;
+    }
+
+    /**
+     * Gets reason for verification value.
+     *
+     * @return return reason of type {@link Reason}, such as "valid" or "unsigned". The possible values can be found in
+     *         {@link Reason}}
+     */
+    public Reason getReason() {
+        return reason;
+    }
+
+    /**
+     * Gets signature used for the verification.
+     *
+     * @return null if not signed else encoded signature.
+     */
+    public String getSignature() {
+        return signature;
+    }
+
+    /**
+     * Gets the payload that was signed.
+     *
+     * @return null if not signed else encoded signature.
+     */
+    public String getPayload() {
+        return payload;
+    }
+
+    /**
+     * The possible values for reason in verification object from github.
+     *
+     * @see <a href="https://developer.github.com/v3/repos/commits/#signature-verification-object">List of possible
+     *      reason values</a>
+     * @author Sourabh Sarvotham Parkala
+     */
+    public enum Reason {
+        EXPIRED_KEY,
+        NOT_SIGNING_KEY,
+        GPGVERIFY_ERROR,
+        GPGVERIFY_UNAVAILABLE,
+        UNSIGNED,
+        UNKNOWN_SIGNATURE_TYPE,
+        NO_USER,
+        UNVERIFIED_EMAIL,
+        BAD_EMAIL,
+        UNKNOWN_KEY,
+        MALFORMED_SIGNATURE,
+        INVALID,
+        VALID
+    }
+}

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

@@ -23,23 +23,12 @@
  */
 package org.kohsuke.github;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker.Std;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.ObjectWriter;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import org.apache.commons.io.IOUtils;
 
 import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.Base64;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Supplier;
@@ -48,10 +37,6 @@ import java.util.logging.Logger;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY;
-import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
-import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
-import static java.util.logging.Level.FINE;
 import static org.kohsuke.github.Previews.INERTIA;
 import static org.kohsuke.github.Previews.MACHINE_MAN;
 
@@ -67,27 +52,15 @@ import static org.kohsuke.github.Previews.MACHINE_MAN;
  * @author Kohsuke Kawaguchi
  */
 public class GitHub {
-    final String login;
 
-    /**
-     * Value of the authorization header to be sent with the request.
-     */
-    final String encodedAuthorization;
+    @Nonnull
+    private final GitHubClient client;
+
+    @CheckForNull
+    private GHMyself myself;
 
     private final ConcurrentMap<String, GHUser> users;
     private final ConcurrentMap<String, GHOrganization> orgs;
-    // Cache of myself object.
-    private GHMyself myself;
-    private final String apiUrl;
-
-    final RateLimitHandler rateLimitHandler;
-    final AbuseLimitHandler abuseLimitHandler;
-
-    private HttpConnector connector = HttpConnector.DEFAULT;
-
-    private final Object headerRateLimitLock = new Object();
-    private GHRateLimit headerRateLimit = null;
-    private volatile GHRateLimit rateLimit = null;
 
     /**
      * Creates a client API root object.
@@ -137,36 +110,20 @@ public class GitHub {
             String password,
             HttpConnector connector,
             RateLimitHandler rateLimitHandler,
-            AbuseLimitHandler abuseLimitHandler) throws IOException {
-        if (apiUrl.endsWith("/"))
-            apiUrl = apiUrl.substring(0, apiUrl.length() - 1); // normalize
-        this.apiUrl = apiUrl;
-        if (null != connector)
-            this.connector = connector;
-
-        if (oauthAccessToken != null) {
-            encodedAuthorization = "token " + oauthAccessToken;
-        } else {
-            if (jwtToken != null) {
-                encodedAuthorization = "Bearer " + jwtToken;
-            } else if (password != null) {
-                String authorization = (login + ':' + password);
-                String charsetName = StandardCharsets.UTF_8.name();
-                encodedAuthorization = "Basic "
-                        + Base64.getEncoder().encodeToString(authorization.getBytes(charsetName));
-            } else {// anonymous access
-                encodedAuthorization = null;
-            }
-        }
-
-        users = new ConcurrentHashMap<String, GHUser>();
-        orgs = new ConcurrentHashMap<String, GHOrganization>();
-        this.rateLimitHandler = rateLimitHandler;
-        this.abuseLimitHandler = abuseLimitHandler;
-
-        if (login == null && encodedAuthorization != null && jwtToken == null)
-            login = getMyself().getLogin();
-        this.login = login;
+            AbuseLimitHandler abuseLimitHandler,
+            GitHubRateLimitChecker rateLimitChecker) throws IOException {
+        this.client = new GitHubHttpUrlConnectionClient(apiUrl,
+                login,
+                oauthAccessToken,
+                jwtToken,
+                password,
+                connector,
+                rateLimitHandler,
+                abuseLimitHandler,
+                rateLimitChecker,
+                (myself) -> setMyself(myself));
+        users = new ConcurrentHashMap<>();
+        orgs = new ConcurrentHashMap<>();
     }
 
     /**
@@ -184,7 +141,10 @@ public class GitHub {
      * Version that connects to GitHub Enterprise.
      *
      * @param apiUrl
-     *            the api url
+     *            The URL of GitHub (or GitHub Enterprise) API endpoint, such as "https://api.github.com" or
+     *            "http://ghe.acme.com/api/v3". Note that GitHub Enterprise has <code>/api/v3</code> in the URL. For
+     *            historical reasons, this parameter still accepts the bare domain name, but that's considered
+     *            deprecated.
      * @param oauthAccessToken
      *            the oauth access token
      * @return the git hub
@@ -264,8 +224,7 @@ public class GitHub {
      * @return the git hub
      * @throws IOException
      *             the io exception
-     * @deprecated Either OAuth token or password is sufficient, so there's no point in passing both. Use
-     *             {@link #connectUsingPassword(String, String)} or {@link #connectUsingOAuth(String)}.
+     * @deprecated Use {@link #connectUsingOAuth(String)}.
      */
     @Deprecated
     public static GitHub connect(String login, String oauthAccessToken, String password) throws IOException {
@@ -282,7 +241,12 @@ public class GitHub {
      * @return the git hub
      * @throws IOException
      *             the io exception
+     * @deprecated Use {@link #connectUsingOAuth(String)} instead.
+     * @see <a href=
+     *      "https://developer.github.com/changes/2020-02-14-deprecating-password-auth/#changes-to-make">Deprecating
+     *      password authentication and OAuth authorizations API</a>
      */
+    @Deprecated
     public static GitHub connectUsingPassword(String login, String password) throws IOException {
         return new GitHubBuilder().withPassword(login, password).build();
     }
@@ -366,7 +330,7 @@ public class GitHub {
      * @return {@code true} if operations that require authentication will fail.
      */
     public boolean isAnonymous() {
-        return login == null && encodedAuthorization == null;
+        return client.isAnonymous();
     }
 
     /**
@@ -375,7 +339,7 @@ public class GitHub {
      * @return {@code true} if this is an always offline "connection".
      */
     public boolean isOffline() {
-        return connector == HttpConnector.OFFLINE;
+        return client.isOffline();
     }
 
     /**
@@ -384,7 +348,19 @@ public class GitHub {
      * @return the connector
      */
     public HttpConnector getConnector() {
-        return connector;
+        return client.getConnector();
+    }
+
+    /**
+     * Sets the custom connector used to make requests to GitHub.
+     *
+     * @param connector
+     *            the connector
+     * @deprecated HttpConnector should not be changed. If you find yourself needing to do this, file an issue.
+     */
+    @Deprecated
+    public void setConnector(HttpConnector connector) {
+        client.setConnector(connector);
     }
 
     /**
@@ -393,39 +369,7 @@ public class GitHub {
      * @return the api url
      */
     public String getApiUrl() {
-        return apiUrl;
-    }
-
-    /**
-     * Sets the custom connector used to make requests to GitHub.
-     *
-     * @param connector
-     *            the connector
-     */
-    public void setConnector(HttpConnector connector) {
-        this.connector = connector;
-    }
-
-    void requireCredential() {
-        if (isAnonymous())
-            throw new IllegalStateException(
-                    "This operation requires a credential but none is given to the GitHub constructor");
-    }
-
-    URL getApiURL(String tailApiUrl) throws IOException {
-        if (tailApiUrl.startsWith("/")) {
-            if ("github.com".equals(apiUrl)) {// backward compatibility
-                return new URL(GITHUB_URL + tailApiUrl);
-            } else {
-                return new URL(apiUrl + tailApiUrl);
-            }
-        } else {
-            return new URL(tailApiUrl);
-        }
-    }
-
-    Requester createRequest() {
-        return new Requester(this);
+        return client.getApiUrl();
     }
 
     /**
@@ -436,64 +380,7 @@ public class GitHub {
      *             the io exception
      */
     public GHRateLimit getRateLimit() throws IOException {
-        GHRateLimit rateLimit;
-        try {
-            rateLimit = createRequest().withUrlPath("/rate_limit").fetch(JsonRateLimit.class).resources;
-        } catch (FileNotFoundException e) {
-            // GitHub Enterprise doesn't have the rate limit
-            // return a default rate limit that
-            rateLimit = GHRateLimit.Unknown();
-        }
-
-        return this.rateLimit = rateLimit;
-    }
-
-    /**
-     * Update the Rate Limit with the latest info from response header. Due to multi-threading requests might complete
-     * out of order, we want to pick the one with the most recent info from the server.
-     *
-     * @param observed
-     *            {@link GHRateLimit.Record} constructed from the response header information
-     */
-    void updateCoreRateLimit(@Nonnull GHRateLimit.Record observed) {
-        synchronized (headerRateLimitLock) {
-            if (headerRateLimit == null || shouldReplace(observed, headerRateLimit.getCore())) {
-                headerRateLimit = GHRateLimit.fromHeaderRecord(observed);
-                LOGGER.log(FINE, "Rate limit now: {0}", headerRateLimit);
-            }
-        }
-    }
-
-    /**
-     * Update the Rate Limit with the latest info from response header. Due to multi-threading requests might complete
-     * out of order, we want to pick the one with the most recent info from the server. Header date is only accurate to
-     * the second, so we look at the information in the record itself.
-     *
-     * {@link GHRateLimit.UnknownLimitRecord}s are always replaced by regular {@link GHRateLimit.Record}s. Regular
-     * {@link GHRateLimit.Record}s are never replaced by {@link GHRateLimit.UnknownLimitRecord}s. Candidates with
-     * resetEpochSeconds later than current record are more recent. Candidates with the same reset and a lower remaining
-     * count are more recent. Candidates with an earlier reset are older.
-     *
-     * @param candidate
-     *            {@link GHRateLimit.Record} constructed from the response header information
-     * @param current
-     *            the current {@link GHRateLimit.Record} record
-     */
-    static boolean shouldReplace(@Nonnull GHRateLimit.Record candidate, @Nonnull GHRateLimit.Record current) {
-        if (candidate instanceof GHRateLimit.UnknownLimitRecord
-                && !(current instanceof GHRateLimit.UnknownLimitRecord)) {
-            // Unknown candidate never replaces a regular record
-            return false;
-        } else if (current instanceof GHRateLimit.UnknownLimitRecord
-                && !(candidate instanceof GHRateLimit.UnknownLimitRecord)) {
-            // Any real record should replace an unknown Record.
-            return true;
-        } else {
-            // records of the same type compare to each other as normal.
-            return current.getResetEpochSeconds() < candidate.getResetEpochSeconds()
-                    || (current.getResetEpochSeconds() == candidate.getResetEpochSeconds()
-                            && current.getRemaining() > candidate.getRemaining());
-        }
+        return client.getRateLimit();
     }
 
     /**
@@ -504,9 +391,7 @@ public class GitHub {
      */
     @CheckForNull
     public GHRateLimit lastRateLimit() {
-        synchronized (headerRateLimitLock) {
-            return headerRateLimit;
-        }
+        return client.lastRateLimit();
     }
 
     /**
@@ -518,16 +403,7 @@ public class GitHub {
      */
     @Nonnull
     public GHRateLimit rateLimit() throws IOException {
-        synchronized (headerRateLimitLock) {
-            if (headerRateLimit != null && !headerRateLimit.isExpired()) {
-                return headerRateLimit;
-            }
-        }
-        GHRateLimit rateLimit = this.rateLimit;
-        if (rateLimit == null || rateLimit.isExpired()) {
-            rateLimit = getRateLimit();
-        }
-        return rateLimit;
+        return client.rateLimit();
     }
 
     /**
@@ -537,18 +413,22 @@ public class GitHub {
      * @throws IOException
      *             the io exception
      */
-    @WithBridgeMethods(GHUser.class)
+    @WithBridgeMethods(value = GHUser.class)
     public GHMyself getMyself() throws IOException {
-        requireCredential();
+        client.requireCredential();
         synchronized (this) {
-            if (this.myself != null)
-                return myself;
+            if (this.myself == null) {
+                GHMyself u = createRequest().withUrlPath("/user").fetch(GHMyself.class);
+                setMyself(u);
+            }
+            return myself;
+        }
+    }
 
-            GHMyself u = createRequest().withUrlPath("/user").fetch(GHMyself.class);
-
-            u.root = this;
-            this.myself = u;
-            return u;
+    private void setMyself(GHMyself myself) {
+        synchronized (this) {
+            myself.wrapUp(this);
+            this.myself = myself;
         }
     }
 
@@ -730,12 +610,9 @@ public class GitHub {
      *             the io exception
      */
     public List<GHInvitation> getMyInvitations() throws IOException {
-        GHInvitation[] invitations = createRequest().withUrlPath("/user/repository_invitations")
-                .fetchArray(GHInvitation[].class);
-        for (GHInvitation i : invitations) {
-            i.wrapUp(this);
-        }
-        return Arrays.asList(invitations);
+        return createRequest().withUrlPath("/user/repository_invitations")
+                .toIterable(GHInvitation[].class, item -> item.wrapUp(this))
+                .toList();
     }
 
     /**
@@ -749,11 +626,13 @@ public class GitHub {
      *             the io exception
      */
     public Map<String, GHOrganization> getMyOrganizations() throws IOException {
-        GHOrganization[] orgs = createRequest().withUrlPath("/user/orgs").fetchArray(GHOrganization[].class);
-        Map<String, GHOrganization> r = new HashMap<String, GHOrganization>();
+        GHOrganization[] orgs = createRequest().withUrlPath("/user/orgs")
+                .toIterable(GHOrganization[].class, item -> item.wrapUp(this))
+                .toArray();
+        Map<String, GHOrganization> r = new HashMap<>();
         for (GHOrganization o : orgs) {
             // don't put 'o' into orgs because they are shallow
-            r.put(o.getLogin(), o.wrapUp(this));
+            r.put(o.getLogin(), o);
         }
         return r;
     }
@@ -803,11 +682,12 @@ public class GitHub {
      */
     public Map<String, GHOrganization> getUserPublicOrganizations(String login) throws IOException {
         GHOrganization[] orgs = createRequest().withUrlPath("/users/" + login + "/orgs")
-                .fetchArray(GHOrganization[].class);
-        Map<String, GHOrganization> r = new HashMap<String, GHOrganization>();
+                .toIterable(GHOrganization[].class, item -> item.wrapUp(this))
+                .toArray();
+        Map<String, GHOrganization> r = new HashMap<>();
         for (GHOrganization o : orgs) {
-            // don't put 'o' into orgs because they are shallow
-            r.put(o.getLogin(), o.wrapUp(this));
+            // don't put 'o' into orgs cache because they are shallow records
+            r.put(o.getLogin(), o);
         }
         return r;
     }
@@ -823,13 +703,14 @@ public class GitHub {
      *             the io exception
      */
     public Map<String, Set<GHTeam>> getMyTeams() throws IOException {
-        Map<String, Set<GHTeam>> allMyTeams = new HashMap<String, Set<GHTeam>>();
-        for (GHTeam team : createRequest().withUrlPath("/user/teams").fetchArray(GHTeam[].class)) {
-            team.wrapUp(this);
+        Map<String, Set<GHTeam>> allMyTeams = new HashMap<>();
+        for (GHTeam team : createRequest().withUrlPath("/user/teams")
+                .toIterable(GHTeam[].class, item -> item.wrapUp(this))
+                .toArray()) {
             String orgLogin = team.getOrganization().getLogin();
             Set<GHTeam> teamsPerOrg = allMyTeams.get(orgLogin);
             if (teamsPerOrg == null) {
-                teamsPerOrg = new HashSet<GHTeam>();
+                teamsPerOrg = new HashSet<>();
             }
             teamsPerOrg.add(team);
             allMyTeams.put(orgLogin, teamsPerOrg);
@@ -845,7 +726,11 @@ public class GitHub {
      * @return the team
      * @throws IOException
      *             the io exception
+     * 
+     * @deprecated Use {@link GHOrganization#getTeam(long)}
+     * @see <a href= "https://developer.github.com/v3/teams/#get-team-legacy">deprecation notice</a>
      */
+    @Deprecated
     public GHTeam getTeam(int id) throws IOException {
         return createRequest().withUrlPath("/teams/" + id).fetch(GHTeam.class).wrapUp(this);
     }
@@ -858,10 +743,9 @@ public class GitHub {
      *             the io exception
      */
     public List<GHEventInfo> getEvents() throws IOException {
-        GHEventInfo[] events = createRequest().withUrlPath("/events").fetchArray(GHEventInfo[].class);
-        for (GHEventInfo e : events)
-            e.wrapUp(this);
-        return Arrays.asList(events);
+        return createRequest().withUrlPath("/events")
+                .toIterable(GHEventInfo[].class, item -> item.wrapUp(this))
+                .toList();
     }
 
     /**
@@ -874,7 +758,7 @@ public class GitHub {
      *             the io exception
      */
     public GHGist getGist(String id) throws IOException {
-        return createRequest().withUrlPath("/gists/" + id).fetch(GHGist.class).wrapUp(this);
+        return createRequest().withUrlPath("/gists/" + id).fetch(GHGist.class);
     }
 
     /**
@@ -903,7 +787,7 @@ public class GitHub {
      *             the io exception
      */
     public <T extends GHEventPayload> T parseEventPayload(Reader r, Class<T> type) throws IOException {
-        T t = MAPPER.readValue(r, type);
+        T t = GitHubClient.getMappingObjectReader(this).forType(type).readValue(r);
         t.wrapUp(this);
         return t;
     }
@@ -1126,16 +1010,7 @@ public class GitHub {
      * @return the boolean
      */
     public boolean isCredentialValid() {
-        try {
-            createRequest().withUrlPath("/user").fetch(GHUser.class);
-            return true;
-        } catch (IOException e) {
-            if (LOGGER.isLoggable(FINE))
-                LOGGER.log(FINE,
-                        "Exception validating credentials on " + this.apiUrl + " with login '" + this.login + "' " + e,
-                        e);
-            return false;
-        }
+        return client.isCredentialValid();
     }
 
     /**
@@ -1151,20 +1026,6 @@ public class GitHub {
         return createRequest().withUrlPath("/meta").fetch(GHMeta.class);
     }
 
-    GHUser intern(GHUser user) throws IOException {
-        if (user == null)
-            return user;
-
-        // if we already have this user in our map, use it
-        GHUser u = users.get(user.getLogin());
-        if (u != null)
-            return u;
-
-        // if not, remember this new user
-        users.putIfAbsent(user.getLogin(), user);
-        return user;
-    }
-
     /**
      * Gets project.
      *
@@ -1210,18 +1071,6 @@ public class GitHub {
                 .wrap(this);
     }
 
-    private static class GHApiInfo {
-        private String rate_limit_url;
-
-        void check(String apiUrl) throws IOException {
-            if (rate_limit_url == null)
-                throw new IOException(apiUrl + " doesn't look like GitHub API URL");
-
-            // make sure that the URL is legitimate
-            new URL(rate_limit_url);
-        }
-    }
-
     /**
      * Tests the connection.
      *
@@ -1236,62 +1085,7 @@ public class GitHub {
      *             the io exception
      */
     public void checkApiUrlValidity() throws IOException {
-        try {
-            createRequest().withUrlPath("/").fetch(GHApiInfo.class).check(apiUrl);
-        } catch (IOException e) {
-            if (isPrivateModeEnabled()) {
-                throw (IOException) new IOException(
-                        "GitHub Enterprise server (" + apiUrl + ") with private mode enabled").initCause(e);
-            }
-            throw e;
-        }
-    }
-
-    /**
-     * Checks if a GitHub Enterprise server is configured in private mode.
-     *
-     * In private mode response looks like:
-     *
-     * <pre>
-     *  $ curl -i https://github.mycompany.com/api/v3/
-     *     HTTP/1.1 401 Unauthorized
-     *     Server: GitHub.com
-     *     Date: Sat, 05 Mar 2016 19:45:01 GMT
-     *     Content-Type: application/json; charset=utf-8
-     *     Content-Length: 130
-     *     Status: 401 Unauthorized
-     *     X-GitHub-Media-Type: github.v3
-     *     X-XSS-Protection: 1; mode=block
-     *     X-Frame-Options: deny
-     *     Content-Security-Policy: default-src 'none'
-     *     Access-Control-Allow-Credentials: true
-     *     Access-Control-Expose-Headers: ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
-     *     Access-Control-Allow-Origin: *
-     *     X-GitHub-Request-Id: dbc70361-b11d-4131-9a7f-674b8edd0411
-     *     Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
-     *     X-Content-Type-Options: nosniff
-     * </pre>
-     *
-     * @return {@code true} if private mode is enabled. If it tries to use this method with GitHub, returns {@code
-     * false}.
-     */
-    private boolean isPrivateModeEnabled() {
-        try {
-            HttpURLConnection uc = getConnector().connect(getApiURL("/"));
-            try {
-                return uc.getResponseCode() == HTTP_UNAUTHORIZED && uc.getHeaderField("X-GitHub-Media-Type") != null;
-            } finally {
-                // ensure that the connection opened by getResponseCode gets closed
-                try {
-                    IOUtils.closeQuietly(uc.getInputStream());
-                } catch (IOException ignore) {
-                    // ignore
-                }
-                IOUtils.closeQuietly(uc.getErrorStream());
-            }
-        } catch (IOException e) {
-            return false;
-        }
+        client.checkApiUrlValidity();
     }
 
     /**
@@ -1398,49 +1192,55 @@ public class GitHub {
                 "UTF-8");
     }
 
-    static URL parseURL(String s) {
-        try {
-            return s == null ? null : new URL(s);
-        } catch (MalformedURLException e) {
-            throw new IllegalStateException("Invalid URL: " + s);
-        }
+    /**
+     * Do not use this method. This method will be removed and should never have been needed in the first place.
+     *
+     * @return an {@link ObjectWriter} instance that can be further configured.
+     * @deprecated DO NOT USE THIS METHOD. Provided for backward compatibility with projects that did their own jackson
+     *             mapping of this project's data objects, such as Jenkins Blue Ocean.
+     */
+    @Deprecated
+    @Nonnull
+    public static ObjectWriter getMappingObjectWriter() {
+        return GitHubClient.getMappingObjectWriter();
     }
 
-    static Date parseDate(String timestamp) {
-        if (timestamp == null)
-            return null;
-        for (String f : TIME_FORMATS) {
-            try {
-                SimpleDateFormat df = new SimpleDateFormat(f);
-                df.setTimeZone(TimeZone.getTimeZone("GMT"));
-                return df.parse(timestamp);
-            } catch (ParseException e) {
-                // try next
-            }
-        }
-        throw new IllegalStateException("Unable to parse the timestamp: " + timestamp);
+    /**
+     * Do not use this method. This method will be removed and should never have been needed in the first place.
+     *
+     * @return an {@link ObjectReader} instance that can be further configured.
+     * @deprecated DO NOT USE THIS METHOD. Provided for backward compatibility with projects that did their own jackson
+     *             mapping of this project's data objects, such as Jenkins Blue Ocean.
+     */
+    @Deprecated
+    @Nonnull
+    public static ObjectReader getMappingObjectReader() {
+        return GitHubClient.getMappingObjectReader(GitHub.offline());
     }
 
-    static String printDate(Date dt) {
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-        df.setTimeZone(TimeZone.getTimeZone("GMT"));
-        return df.format(dt);
+    @Nonnull
+    GitHubClient getClient() {
+        return client;
     }
 
-    static final ObjectMapper MAPPER = new ObjectMapper();
-
-    private static final String[] TIME_FORMATS = { "yyyy/MM/dd HH:mm:ss ZZZZ", "yyyy-MM-dd'T'HH:mm:ss'Z'",
-            "yyyy-MM-dd'T'HH:mm:ss.S'Z'" // GitHub App endpoints return a different date format
-    };
-
-    static {
-        MAPPER.setVisibility(new Std(NONE, NONE, NONE, NONE, ANY));
-        MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        MAPPER.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS, true);
-        MAPPER.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+    @Nonnull
+    Requester createRequest() {
+        return new Requester(client).injectMappingValue(this);
     }
 
-    static final String GITHUB_URL = "https://api.github.com";
+    GHUser intern(GHUser user) throws IOException {
+        if (user == null)
+            return user;
+
+        // if we already have this user in our map, use it
+        GHUser u = users.get(user.getLogin());
+        if (u != null)
+            return u;
+
+        // if not, remember this new user
+        users.putIfAbsent(user.getLogin(), user);
+        return user;
+    }
 
     private static final Logger LOGGER = Logger.getLogger(GitHub.class.getName());
 }

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

@@ -9,11 +9,12 @@ 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;
 
+import javax.annotation.Nonnull;
+
 /**
  * Configures connection details and produces {@link GitHub}.
  *
@@ -22,7 +23,7 @@ import java.util.Properties;
 public class GitHubBuilder implements Cloneable {
 
     // default scoped so unit tests can read them.
-    /* private */ String endpoint = GitHub.GITHUB_URL;
+    /* private */ String endpoint = GitHubClient.GITHUB_URL;
     /* private */ String user;
     /* private */ String password;
     /* private */ String oauthToken;
@@ -32,6 +33,7 @@ public class GitHubBuilder implements Cloneable {
 
     private RateLimitHandler rateLimitHandler = RateLimitHandler.WAIT;
     private AbuseLimitHandler abuseLimitHandler = AbuseLimitHandler.WAIT;
+    private GitHubRateLimitChecker rateLimitChecker = new GitHubRateLimitChecker();
 
     /**
      * Instantiates a new Git hub builder.
@@ -90,6 +92,7 @@ public class GitHubBuilder implements Cloneable {
      * @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.
      */
+    @Deprecated
     public static GitHubBuilder fromEnvironment(String loginVariableName,
             String passwordVariableName,
             String oauthVariableName) throws IOException {
@@ -119,6 +122,7 @@ public class GitHubBuilder implements Cloneable {
      * @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.
      */
+    @Deprecated
     public static GitHubBuilder fromEnvironment(String loginVariableName,
             String passwordVariableName,
             String oauthVariableName,
@@ -214,7 +218,7 @@ public class GitHubBuilder implements Cloneable {
         self.withOAuthToken(props.getProperty("oauth"), props.getProperty("login"));
         self.withJwtToken(props.getProperty("jwt"));
         self.withPassword(props.getProperty("login"), props.getProperty("password"));
-        self.withEndpoint(props.getProperty("endpoint", GitHub.GITHUB_URL));
+        self.withEndpoint(props.getProperty("endpoint", GitHubClient.GITHUB_URL));
         return self;
     }
 
@@ -311,11 +315,26 @@ public class GitHubBuilder implements Cloneable {
     }
 
     /**
-     * With rate limit handler git hub builder.
+     * Adds a {@link RateLimitHandler} to this {@link GitHubBuilder}.
+     * <p>
+     * GitHub allots a certain number of requests to each user or application per period of time (usually per hour). The
+     * number of requests remaining is returned in the response header and can also be requested using
+     * {@link GitHub#getRateLimit()}. This requests per interval is referred to as the "rate limit".
+     * </p>
+     * <p>
+     * When the remaining number of requests reaches zero, the next request will return an error. If this happens,
+     * {@link RateLimitHandler#onError(IOException, HttpURLConnection)} will be called.
+     * </p>
+     * <p>
+     * NOTE: GitHub treats clients that exceed their rate limit very harshly. If possible, clients should avoid
+     * exceeding their rate limit. Consider adding a {@link RateLimitChecker} to automatically check the rate limit for
+     * each request and wait if needed.
+     * </p>
      *
      * @param handler
      *            the handler
      * @return the git hub builder
+     * @see #withRateLimitChecker(RateLimitChecker)
      */
     public GitHubBuilder withRateLimitHandler(RateLimitHandler handler) {
         this.rateLimitHandler = handler;
@@ -323,7 +342,12 @@ public class GitHubBuilder implements Cloneable {
     }
 
     /**
-     * With abuse limit handler git hub builder.
+     * Adds a {@link AbuseLimitHandler} to this {@link GitHubBuilder}.
+     * <p>
+     * When a client sends too many requests in a short time span, GitHub may return an error and set a header telling
+     * the client to not make any more request for some period of time. If this happens,
+     * {@link AbuseLimitHandler#onError(IOException, HttpURLConnection)} will be called.
+     * </p>
      *
      * @param handler
      *            the handler
@@ -334,6 +358,36 @@ public class GitHubBuilder implements Cloneable {
         return this;
     }
 
+    /**
+     * Adds a {@link RateLimitChecker} to this {@link GitHubBuilder}.
+     * <p>
+     * GitHub allots a certain number of requests to each user or application per period of time (usually per hour). The
+     * number of requests remaining is returned in the response header and can also be requested using
+     * {@link GitHub#getRateLimit()}. This requests per interval is referred to as the "rate limit".
+     * </p>
+     * <p>
+     * GitHub prefers that clients stop before exceeding their rate limit rather than stopping after they exceed it. The
+     * {@link RateLimitChecker} is called before each request to check the rate limit and wait if the checker criteria
+     * are met.
+     * </p>
+     * <p>
+     * Checking your rate limit using {@link GitHub#getRateLimit()} does not effect your rate limit, but each
+     * {@link GitHub} instance will attempt to cache and reuse the last seen rate limit rather than making a new
+     * request.
+     * </p>
+     *
+     * @param coreRateLimitChecker
+     *            the {@link RateLimitChecker} for core GitHub API requests
+     * @return the git hub builder
+     */
+    public GitHubBuilder withRateLimitChecker(@Nonnull RateLimitChecker coreRateLimitChecker) {
+        this.rateLimitChecker = new GitHubRateLimitChecker(coreRateLimitChecker,
+                RateLimitChecker.NONE,
+                RateLimitChecker.NONE,
+                RateLimitChecker.NONE);
+        return this;
+    }
+
     /**
      * Configures {@linkplain #withConnector(HttpConnector) connector} that uses HTTP library in JRE but use a specific
      * proxy, instead of the system default one.
@@ -343,15 +397,11 @@ public class GitHubBuilder implements Cloneable {
      * @return the git hub builder
      */
     public GitHubBuilder withProxy(final Proxy p) {
-        return withConnector(new ImpatientHttpConnector(new HttpConnector() {
-            public HttpURLConnection connect(URL url) throws IOException {
-                return (HttpURLConnection) url.openConnection(p);
-            }
-        }));
+        return withConnector(new ImpatientHttpConnector(url -> (HttpURLConnection) url.openConnection(p)));
     }
 
     /**
-     * Build git hub.
+     * Builds a {@link GitHub} instance.
      *
      * @return the git hub
      * @throws IOException
@@ -365,7 +415,8 @@ public class GitHubBuilder implements Cloneable {
                 password,
                 connector,
                 rateLimitHandler,
-                abuseLimitHandler);
+                abuseLimitHandler,
+                rateLimitChecker);
     }
 
     @Override

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

@@ -0,0 +1,770 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.InjectableValues;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Base64;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TimeZone;
+import java.util.function.Consumer;
+import java.util.logging.Logger;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.net.ssl.SSLHandshakeException;
+
+import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY;
+import static com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.NONE;
+import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
+import static java.util.logging.Level.*;
+
+/**
+ * A GitHub API Client
+ * <p>
+ * A GitHubClient can be used to send requests and retrieve their responses. GitHubClient is thread-safe and can be used
+ * to send multiple requests. GitHubClient also track some GitHub API information such as {@link #rateLimit()}.
+ * </p>
+ */
+abstract class GitHubClient {
+
+    static final int CONNECTION_ERROR_RETRIES = 2;
+    /**
+     * If timeout issues let's retry after milliseconds.
+     */
+    static final int retryTimeoutMillis = 100;
+    /* private */ final String login;
+
+    /**
+     * Value of the authorization header to be sent with the request.
+     */
+    /* private */ final String encodedAuthorization;
+
+    // Cache of myself object.
+    private final String apiUrl;
+
+    protected final RateLimitHandler rateLimitHandler;
+    protected final AbuseLimitHandler abuseLimitHandler;
+    private final GitHubRateLimitChecker rateLimitChecker;
+
+    private HttpConnector connector;
+
+    private final Object headerRateLimitLock = new Object();
+    private GHRateLimit headerRateLimit = null;
+    private volatile GHRateLimit rateLimit = null;
+
+    private static final Logger LOGGER = Logger.getLogger(GitHubClient.class.getName());
+
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+    static final String GITHUB_URL = "https://api.github.com";
+
+    private static final String[] TIME_FORMATS = { "yyyy/MM/dd HH:mm:ss ZZZZ", "yyyy-MM-dd'T'HH:mm:ss'Z'",
+            "yyyy-MM-dd'T'HH:mm:ss.S'Z'" // GitHub App endpoints return a different date format
+    };
+
+    static {
+        MAPPER.setVisibility(new VisibilityChecker.Std(NONE, NONE, NONE, NONE, ANY));
+        MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        MAPPER.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS, true);
+        MAPPER.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
+    }
+
+    GitHubClient(String apiUrl,
+            String login,
+            String oauthAccessToken,
+            String jwtToken,
+            String password,
+            HttpConnector connector,
+            RateLimitHandler rateLimitHandler,
+            AbuseLimitHandler abuseLimitHandler,
+            GitHubRateLimitChecker rateLimitChecker,
+            Consumer<GHMyself> myselfConsumer) throws IOException {
+
+        if (apiUrl.endsWith("/")) {
+            apiUrl = apiUrl.substring(0, apiUrl.length() - 1); // normalize
+        }
+
+        if (null == connector) {
+            connector = HttpConnector.DEFAULT;
+        }
+        this.apiUrl = apiUrl;
+        this.connector = connector;
+
+        if (oauthAccessToken != null) {
+            encodedAuthorization = "token " + oauthAccessToken;
+        } else {
+            if (jwtToken != null) {
+                encodedAuthorization = "Bearer " + jwtToken;
+            } else if (password != null) {
+                String authorization = (login + ':' + password);
+                String charsetName = StandardCharsets.UTF_8.name();
+                encodedAuthorization = "Basic "
+                        + Base64.getEncoder().encodeToString(authorization.getBytes(charsetName));
+            } else {// anonymous access
+                encodedAuthorization = null;
+            }
+        }
+
+        this.rateLimitHandler = rateLimitHandler;
+        this.abuseLimitHandler = abuseLimitHandler;
+        this.rateLimitChecker = rateLimitChecker;
+
+        if (login == null && encodedAuthorization != null && jwtToken == null) {
+            GHMyself myself = fetch(GHMyself.class, "/user");
+            login = myself.getLogin();
+            if (myselfConsumer != null) {
+                myselfConsumer.accept(myself);
+            }
+        }
+        this.login = login;
+    }
+
+    private <T> T fetch(Class<T> type, String urlPath) throws IOException {
+        return this
+                .sendRequest(GitHubRequest.newBuilder().withApiUrl(getApiUrl()).withUrlPath(urlPath).build(),
+                        (responseInfo) -> GitHubResponse.parseBody(responseInfo, type))
+                .body();
+    }
+
+    /**
+     * Ensures that the credential for this client is valid.
+     *
+     * @return the boolean
+     */
+    public boolean isCredentialValid() {
+        try {
+            // If 404, ratelimit returns a default value.
+            // This works as credential test because invalid credentials returns 401, not 404
+            getRateLimit();
+            return true;
+        } catch (IOException e) {
+            if (LOGGER.isLoggable(FINE))
+                LOGGER.log(FINE,
+                        "Exception validating credentials on " + getApiUrl() + " with login '" + login + "' " + e,
+                        e);
+            return false;
+        }
+    }
+
+    /**
+     * Is this an always offline "connection".
+     *
+     * @return {@code true} if this is an always offline "connection".
+     */
+    public boolean isOffline() {
+        return getConnector() == HttpConnector.OFFLINE;
+    }
+
+    /**
+     * Gets connector.
+     *
+     * @return the connector
+     */
+    public HttpConnector getConnector() {
+        return connector;
+    }
+
+    /**
+     * Sets the custom connector used to make requests to GitHub.
+     *
+     * @param connector
+     *            the connector
+     * @deprecated HttpConnector should not be changed.
+     */
+    @Deprecated
+    public void setConnector(HttpConnector connector) {
+        LOGGER.warning("Connector should not be changed. Please file an issue describing your use case.");
+        this.connector = connector;
+    }
+
+    /**
+     * Is this an anonymous connection
+     *
+     * @return {@code true} if operations that require authentication will fail.
+     */
+    public boolean isAnonymous() {
+        return login == null && encodedAuthorization == null;
+    }
+
+    /**
+     * Gets the current rate limit from the server.
+     *
+     * For some versions of GitHub Enterprise, the {@code /rate_limit} endpoint returns a {@code 404 Not Found}. In
+     * that, if {@link #lastRateLimit()} is not {@code null} and is not expired, it will be returned. Otherwise, a
+     * placeholder {@link GHRateLimit} instance with {@link GHRateLimit.UnknownLimitRecord}s will be returned.
+     *
+     * @return the rate limit
+     * @throws IOException
+     *             the io exception
+     */
+    @Nonnull
+    public GHRateLimit getRateLimit() throws IOException {
+        GHRateLimit result;
+        try {
+            result = fetch(JsonRateLimit.class, "/rate_limit").resources;
+        } catch (FileNotFoundException e) {
+            // For some versions of GitHub Enterprise, the rate_limit endpoint returns a 404.
+            // However some newer versions of GHE include rate limit header information
+            // Use that if available
+            result = lastRateLimit();
+            if (result == null || result.isExpired()) {
+                // return a default rate limit
+                result = GHRateLimit.Unknown();
+            }
+        }
+
+        return rateLimit = result;
+    }
+
+    /**
+     * Returns the most recently observed rate limit data or {@code null} if either there is no rate limit (for example
+     * GitHub Enterprise) or if no requests have been made.
+     *
+     * @return the most recently observed rate limit data or {@code null}.
+     */
+    @CheckForNull
+    public GHRateLimit lastRateLimit() {
+        synchronized (headerRateLimitLock) {
+            return headerRateLimit;
+        }
+    }
+
+    /**
+     * Gets the current rate limit while trying not to actually make any remote requests unless absolutely necessary.
+     *
+     * If {@link #lastRateLimit()} is not {@code null} and is not expired, it will be returned. If the information
+     * returned from the last call to {@link #getRateLimit()} is not {@code null} and is not expired, then it will be
+     * returned. Otherwise, the result of a call to {@link #getRateLimit()} will be returned.
+     *
+     * @return the current rate limit data.
+     * @throws IOException
+     *             if there was an error getting current rate limit data.
+     */
+    @Nonnull
+    public GHRateLimit rateLimit() throws IOException {
+        synchronized (headerRateLimitLock) {
+            if (headerRateLimit != null && !headerRateLimit.isExpired()) {
+                return headerRateLimit;
+            }
+        }
+        GHRateLimit result = this.rateLimit;
+        if (result == null || result.isExpired()) {
+            result = getRateLimit();
+        }
+        return result;
+    }
+
+    /**
+     * Tests the connection.
+     *
+     * <p>
+     * Verify that the API URL and credentials are valid to access this GitHub.
+     *
+     * <p>
+     * This method returns normally if the endpoint is reachable and verified to be GitHub API URL. Otherwise this
+     * method throws {@link IOException} to indicate the problem.
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    public void checkApiUrlValidity() throws IOException {
+        try {
+            fetch(GHApiInfo.class, "/").check(getApiUrl());
+        } catch (IOException e) {
+            if (isPrivateModeEnabled()) {
+                throw (IOException) new IOException(
+                        "GitHub Enterprise server (" + getApiUrl() + ") with private mode enabled").initCause(e);
+            }
+            throw e;
+        }
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    /**
+     * Builds a {@link GitHubRequest}, sends the {@link GitHubRequest} to the server, and uses the
+     * {@link GitHubResponse.BodyHandler} to parse the response info and response body data into an instance of
+     * {@link T}.
+     *
+     * @param builder
+     *            used to build the request that will be sent to the server.
+     * @param handler
+     *            parse the response info and body data into a instance of {@link T}. If null, no parsing occurs and
+     *            {@link GitHubResponse#body()} will return null.
+     * @param <T>
+     *            the type of the parse body data.
+     * @return a {@link GitHubResponse} containing the parsed body data as a {@link T}. Parsed instance may be null.
+     * @throws IOException
+     *             if an I/O Exception occurs
+     */
+    @Nonnull
+    public <T> GitHubResponse<T> sendRequest(@Nonnull GitHubRequest.Builder<?> builder,
+            @CheckForNull GitHubResponse.BodyHandler<T> handler) throws IOException {
+        return sendRequest(builder.build(), handler);
+    }
+
+    /**
+     * Sends the {@link GitHubRequest} to the server, and uses the {@link GitHubResponse.BodyHandler} to parse the
+     * response info and response body data into an instance of {@link T}.
+     *
+     * @param request
+     *            the request that will be sent to the server.
+     * @param handler
+     *            parse the response info and body data into a instance of {@link T}. If null, no parsing occurs and
+     *            {@link GitHubResponse#body()} will return null.
+     * @param <T>
+     *            the type of the parse body data.
+     * @return a {@link GitHubResponse} containing the parsed body data as a {@link T}. Parsed instance may be null.
+     * @throws IOException
+     *             if an I/O Exception occurs
+     */
+    @Nonnull
+    public <T> GitHubResponse<T> sendRequest(GitHubRequest request, @CheckForNull GitHubResponse.BodyHandler<T> handler)
+            throws IOException {
+        int retries = CONNECTION_ERROR_RETRIES;
+
+        do {
+            // if we fail to create a connection we do not retry and we do not wrap
+
+            GitHubResponse.ResponseInfo responseInfo = null;
+            try {
+                try {
+                    if (LOGGER.isLoggable(FINE)) {
+                        LOGGER.log(FINE,
+                                "GitHub API request [" + (login == null ? "anonymous" : login) + "]: "
+                                        + request.method() + " " + request.url().toString());
+                    }
+
+                    rateLimitChecker.checkRateLimit(this, request);
+
+                    responseInfo = getResponseInfo(request);
+                    noteRateLimit(responseInfo);
+                    detectOTPRequired(responseInfo);
+
+                    if (isInvalidCached404Response(responseInfo)) {
+                        // Setting "Cache-Control" to "no-cache" stops the cache from supplying
+                        // "If-Modified-Since" or "If-None-Match" values.
+                        // This makes GitHub give us current data (not incorrectly cached data)
+                        request = request.toBuilder().withHeader("Cache-Control", "no-cache").build();
+                        continue;
+                    }
+                    if (!(isRateLimitResponse(responseInfo) || isAbuseLimitResponse(responseInfo))) {
+                        return createResponse(responseInfo, handler);
+                    }
+                } catch (IOException e) {
+                    // For transient errors, retry
+                    if (retryConnectionError(e, request.url(), retries)) {
+                        continue;
+                    }
+
+                    throw interpretApiError(e, request, responseInfo);
+                }
+
+                handleLimitingErrors(responseInfo);
+            } finally {
+                IOUtils.closeQuietly(responseInfo);
+            }
+
+        } while (--retries >= 0);
+
+        throw new GHIOException("Ran out of retries for URL: " + request.url().toString());
+    }
+
+    @Nonnull
+    protected abstract GitHubResponse.ResponseInfo getResponseInfo(GitHubRequest request) throws IOException;
+
+    protected abstract void handleLimitingErrors(@Nonnull GitHubResponse.ResponseInfo responseInfo) throws IOException;
+
+    @Nonnull
+    private static <T> GitHubResponse<T> createResponse(@Nonnull GitHubResponse.ResponseInfo responseInfo,
+            @CheckForNull GitHubResponse.BodyHandler<T> handler) throws IOException {
+        T body = null;
+        if (responseInfo.statusCode() == HttpURLConnection.HTTP_NOT_MODIFIED) {
+            // special case handling for 304 unmodified, as the content will be ""
+        } else if (responseInfo.statusCode() == HttpURLConnection.HTTP_ACCEPTED) {
+
+            // Response code 202 means data is being generated.
+            // This happens in specific cases:
+            // statistics - See https://developer.github.com/v3/repos/statistics/#a-word-about-caching
+            // fork creation - See https://developer.github.com/v3/repos/forks/#create-a-fork
+
+            if (responseInfo.url().toString().endsWith("/forks")) {
+                LOGGER.log(INFO, "The fork is being created. Please try again in 5 seconds.");
+            } else if (responseInfo.url().toString().endsWith("/statistics")) {
+                LOGGER.log(INFO, "The statistics are being generated. Please try again in 5 seconds.");
+            } else {
+                LOGGER.log(INFO,
+                        "Received 202 from " + responseInfo.url().toString() + " . Please try again in 5 seconds.");
+            }
+            // Maybe throw an exception instead?
+        } else if (handler != null) {
+            body = handler.apply(responseInfo);
+        }
+        return new GitHubResponse<>(responseInfo, body);
+    }
+
+    /**
+     * Handle API error by either throwing it or by returning normally to retry.
+     */
+    private static IOException interpretApiError(IOException e,
+            @Nonnull GitHubRequest request,
+            @CheckForNull GitHubResponse.ResponseInfo responseInfo) throws IOException {
+        // If we're already throwing a GHIOException, pass through
+        if (e instanceof GHIOException) {
+            return e;
+        }
+
+        int statusCode = -1;
+        String message = null;
+        Map<String, List<String>> headers = new HashMap<>();
+        String errorMessage = null;
+
+        if (responseInfo != null) {
+            statusCode = responseInfo.statusCode();
+            message = responseInfo.headerField("Status");
+            headers = responseInfo.headers();
+            errorMessage = responseInfo.errorMessage();
+        }
+
+        if (errorMessage != null) {
+            if (e instanceof FileNotFoundException) {
+                // pass through 404 Not Found to allow the caller to handle it intelligently
+                e = new GHFileNotFoundException(e.getMessage() + " " + errorMessage, e)
+                        .withResponseHeaderFields(headers);
+            } else if (statusCode >= 0) {
+                e = new HttpException(errorMessage, statusCode, message, request.url().toString(), e);
+            } else {
+                e = new GHIOException(errorMessage).withResponseHeaderFields(headers);
+            }
+        } else if (!(e instanceof FileNotFoundException)) {
+            e = new HttpException(statusCode, message, request.url().toString(), e);
+        }
+        return e;
+    }
+
+    protected static boolean isRateLimitResponse(@Nonnull GitHubResponse.ResponseInfo responseInfo) {
+        return responseInfo.statusCode() == HttpURLConnection.HTTP_FORBIDDEN
+                && "0".equals(responseInfo.headerField("X-RateLimit-Remaining"));
+    }
+
+    protected static boolean isAbuseLimitResponse(@Nonnull GitHubResponse.ResponseInfo responseInfo) {
+        return responseInfo.statusCode() == HttpURLConnection.HTTP_FORBIDDEN
+                && responseInfo.headerField("Retry-After") != null;
+    }
+
+    private static boolean retryConnectionError(IOException e, URL url, int retries) throws IOException {
+        // There are a range of connection errors where we want to wait a moment and just automatically retry
+        boolean connectionError = e instanceof SocketException || e instanceof SocketTimeoutException
+                || e instanceof SSLHandshakeException;
+        if (connectionError && retries > 0) {
+            LOGGER.log(INFO,
+                    e.getMessage() + " while connecting to " + url + ". Sleeping " + GitHubClient.retryTimeoutMillis
+                            + " milliseconds before retrying... ; will try " + retries + " more time(s)");
+            try {
+                Thread.sleep(GitHubClient.retryTimeoutMillis);
+            } catch (InterruptedException ie) {
+                throw (IOException) new InterruptedIOException().initCause(e);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private static boolean isInvalidCached404Response(GitHubResponse.ResponseInfo responseInfo) {
+        // WORKAROUND FOR ISSUE #669:
+        // When the Requester detects a 404 response with an ETag (only happpens when the server's 304
+        // is bogus and would cause cache corruption), try the query again with new request header
+        // that forces the server to not return 304 and return new data instead.
+        //
+        // This solution is transparent to users of this library and automatically handles a
+        // situation that was cause insidious and hard to debug bad responses in caching
+        // scenarios. If GitHub ever fixes their issue and/or begins providing accurate ETags to
+        // their 404 responses, this will result in at worst two requests being made for each 404
+        // responses. However, only the second request will count against rate limit.
+        if (responseInfo.statusCode() == 404 && Objects.equals(responseInfo.request().method(), "GET")
+                && responseInfo.headerField("ETag") != null
+                && !Objects.equals(responseInfo.request().headers().get("Cache-Control"), "no-cache")) {
+            LOGGER.log(FINE,
+                    "Encountered GitHub invalid cached 404 from " + responseInfo.url()
+                            + ". Retrying with \"Cache-Control\"=\"no-cache\"...");
+            return true;
+        }
+        return false;
+    }
+
+    private void noteRateLimit(@Nonnull GitHubResponse.ResponseInfo responseInfo) {
+        if (responseInfo.request().urlPath().startsWith("/search")) {
+            // the search API uses a different rate limit
+            return;
+        }
+
+        String limitString = responseInfo.headerField("X-RateLimit-Limit");
+        if (StringUtils.isBlank(limitString)) {
+            // if we are missing a header, return fast
+            return;
+        }
+        String remainingString = responseInfo.headerField("X-RateLimit-Remaining");
+        if (StringUtils.isBlank(remainingString)) {
+            // if we are missing a header, return fast
+            return;
+        }
+        String resetString = responseInfo.headerField("X-RateLimit-Reset");
+        if (StringUtils.isBlank(resetString)) {
+            // if we are missing a header, return fast
+            return;
+        }
+
+        int limit, remaining;
+        long reset;
+        try {
+            limit = Integer.parseInt(limitString);
+        } catch (NumberFormatException e) {
+            if (LOGGER.isLoggable(FINEST)) {
+                LOGGER.log(FINEST, "Malformed X-RateLimit-Limit header value " + limitString, e);
+            }
+            return;
+        }
+        try {
+
+            remaining = Integer.parseInt(remainingString);
+        } catch (NumberFormatException e) {
+            if (LOGGER.isLoggable(FINEST)) {
+                LOGGER.log(FINEST, "Malformed X-RateLimit-Remaining header value " + remainingString, e);
+            }
+            return;
+        }
+        try {
+            reset = Long.parseLong(resetString);
+        } catch (NumberFormatException e) {
+            if (LOGGER.isLoggable(FINEST)) {
+                LOGGER.log(FINEST, "Malformed X-RateLimit-Reset header value " + resetString, e);
+            }
+            return;
+        }
+
+        GHRateLimit.Record observed = new GHRateLimit.Record(limit, remaining, reset, responseInfo);
+
+        updateCoreRateLimit(observed);
+    }
+
+    private static void detectOTPRequired(@Nonnull GitHubResponse.ResponseInfo responseInfo) throws GHIOException {
+        // 401 Unauthorized == bad creds or OTP request
+        if (responseInfo.statusCode() == HTTP_UNAUTHORIZED) {
+            // In the case of a user with 2fa enabled, a header with X-GitHub-OTP
+            // will be returned indicating the user needs to respond with an otp
+            if (responseInfo.headerField("X-GitHub-OTP") != null) {
+                throw new GHOTPRequiredException().withResponseHeaderFields(responseInfo.headers());
+            }
+        }
+    }
+
+    void requireCredential() {
+        if (isAnonymous())
+            throw new IllegalStateException(
+                    "This operation requires a credential but none is given to the GitHub constructor");
+    }
+
+    /**
+     * Update the Rate Limit with the latest info from response header. Due to multi-threading requests might complete
+     * out of order, we want to pick the one with the most recent info from the server. Calls
+     * {@link #shouldReplace(GHRateLimit.Record, GHRateLimit.Record)}
+     *
+     * @param observed
+     *            {@link GHRateLimit.Record} constructed from the response header information
+     */
+    private void updateCoreRateLimit(@Nonnull GHRateLimit.Record observed) {
+        synchronized (headerRateLimitLock) {
+            if (headerRateLimit == null || shouldReplace(observed, headerRateLimit.getCore())) {
+                headerRateLimit = GHRateLimit.fromHeaderRecord(observed);
+                LOGGER.log(FINE, "Rate limit now: {0}", headerRateLimit);
+            }
+        }
+    }
+
+    private static class GHApiInfo {
+        private String rate_limit_url;
+
+        void check(String apiUrl) throws IOException {
+            if (rate_limit_url == null)
+                throw new IOException(apiUrl + " doesn't look like GitHub API URL");
+
+            // make sure that the URL is legitimate
+            new URL(rate_limit_url);
+        }
+    }
+
+    /**
+     * Checks if a GitHub Enterprise server is configured in private mode.
+     *
+     * In private mode response looks like:
+     *
+     * <pre>
+     *  $ curl -i https://github.mycompany.com/api/v3/
+     *     HTTP/1.1 401 Unauthorized
+     *     Server: GitHub.com
+     *     Date: Sat, 05 Mar 2016 19:45:01 GMT
+     *     Content-Type: application/json; charset=utf-8
+     *     Content-Length: 130
+     *     Status: 401 Unauthorized
+     *     X-GitHub-Media-Type: github.v3
+     *     X-XSS-Protection: 1; mode=block
+     *     X-Frame-Options: deny
+     *     Content-Security-Policy: default-src 'none'
+     *     Access-Control-Allow-Credentials: true
+     *     Access-Control-Expose-Headers: ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+     *     Access-Control-Allow-Origin: *
+     *     X-GitHub-Request-Id: dbc70361-b11d-4131-9a7f-674b8edd0411
+     *     Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+     *     X-Content-Type-Options: nosniff
+     * </pre>
+     *
+     * @return {@code true} if private mode is enabled. If it tries to use this method with GitHub, returns {@code
+     * false}.
+     */
+    private boolean isPrivateModeEnabled() {
+        try {
+            GitHubResponse<?> response = sendRequest(GitHubRequest.newBuilder().withApiUrl(getApiUrl()), null);
+            return response.statusCode() == HTTP_UNAUTHORIZED && response.headerField("X-GitHub-Media-Type") != null;
+        } catch (IOException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Determine if one {@link GHRateLimit.Record} should replace another. Header date is only accurate to the second,
+     * so we look at the information in the record itself.
+     *
+     * {@link GHRateLimit.UnknownLimitRecord}s are always replaced by regular {@link GHRateLimit.Record}s. Regular
+     * {@link GHRateLimit.Record}s are never replaced by {@link GHRateLimit.UnknownLimitRecord}s. Candidates with
+     * resetEpochSeconds later than current record are more recent. Candidates with the same reset and a lower remaining
+     * count are more recent. Candidates with an earlier reset are older.
+     *
+     * @param candidate
+     *            {@link GHRateLimit.Record} constructed from the response header information
+     * @param current
+     *            the current {@link GHRateLimit.Record} record
+     */
+    static boolean shouldReplace(@Nonnull GHRateLimit.Record candidate, @Nonnull GHRateLimit.Record current) {
+        if (candidate instanceof GHRateLimit.UnknownLimitRecord
+                && !(current instanceof GHRateLimit.UnknownLimitRecord)) {
+            // Unknown candidate never replaces a regular record
+            return false;
+        } else if (current instanceof GHRateLimit.UnknownLimitRecord
+                && !(candidate instanceof GHRateLimit.UnknownLimitRecord)) {
+            // Any real record should replace an unknown Record.
+            return true;
+        } else {
+            // records of the same type compare to each other as normal.
+            return current.getResetEpochSeconds() < candidate.getResetEpochSeconds()
+                    || (current.getResetEpochSeconds() == candidate.getResetEpochSeconds()
+                            && current.getRemaining() > candidate.getRemaining());
+        }
+    }
+
+    static URL parseURL(String s) {
+        try {
+            return s == null ? null : new URL(s);
+        } catch (MalformedURLException e) {
+            throw new IllegalStateException("Invalid URL: " + s);
+        }
+    }
+
+    static Date parseDate(String timestamp) {
+        if (timestamp == null)
+            return null;
+        for (String f : TIME_FORMATS) {
+            try {
+                SimpleDateFormat df = new SimpleDateFormat(f);
+                df.setTimeZone(TimeZone.getTimeZone("GMT"));
+                return df.parse(timestamp);
+            } catch (ParseException e) {
+                // try next
+            }
+        }
+        throw new IllegalStateException("Unable to parse the timestamp: " + timestamp);
+    }
+
+    static String printDate(Date dt) {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        df.setTimeZone(TimeZone.getTimeZone("GMT"));
+        return df.format(dt);
+    }
+
+    /**
+     * Gets an {@link ObjectWriter}.
+     *
+     * @return an {@link ObjectWriter} instance that can be further configured.
+     */
+    @Nonnull
+    static ObjectWriter getMappingObjectWriter() {
+        return MAPPER.writer();
+    }
+
+    /**
+     * Helper for {@link #getMappingObjectReader(GitHubResponse.ResponseInfo)}
+     *
+     * @param root
+     *            the root GitHub object for this reader
+     *
+     * @return an {@link ObjectReader} instance that can be further configured.
+     */
+    @Nonnull
+    static ObjectReader getMappingObjectReader(@Nonnull GitHub root) {
+        ObjectReader reader = getMappingObjectReader((GitHubResponse.ResponseInfo) null);
+        ((InjectableValues.Std) reader.getInjectableValues()).addValue(GitHub.class, root);
+        return reader;
+    }
+
+    /**
+     * Gets an {@link ObjectReader}.
+     *
+     * Members of {@link InjectableValues} must be present even if {@code null}, otherwise classes expecting those
+     * values will fail to read. This differs from regular JSONProperties which provide defaults instead of failing.
+     *
+     * Having one spot to create readers and having it take all injectable values is not a great long term solution but
+     * it is sufficient for this first cut.
+     *
+     * @param responseInfo
+     *            the {@link GitHubResponse.ResponseInfo} to inject for this reader.
+     *
+     * @return an {@link ObjectReader} instance that can be further configured.
+     */
+    @Nonnull
+    static ObjectReader getMappingObjectReader(@CheckForNull GitHubResponse.ResponseInfo responseInfo) {
+        Map<String, Object> injected = new HashMap<>();
+
+        // Required or many things break
+        injected.put(GitHubResponse.ResponseInfo.class.getName(), null);
+        injected.put(GitHub.class.getName(), null);
+
+        if (responseInfo != null) {
+            injected.put(GitHubResponse.ResponseInfo.class.getName(), responseInfo);
+            injected.putAll(responseInfo.request().injectedMappingValues());
+        }
+        return MAPPER.reader(new InjectableValues.Std(injected));
+    }
+}

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

@@ -0,0 +1,244 @@
+package org.kohsuke.github;
+
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.net.HttpURLConnection;
+import java.net.ProtocolException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.logging.Logger;
+import java.util.zip.GZIPInputStream;
+
+import javax.annotation.Nonnull;
+
+import static java.util.logging.Level.*;
+import static org.apache.commons.lang3.StringUtils.defaultString;
+
+/**
+ * A GitHub API Client for HttpUrlConnection
+ * <p>
+ * A GitHubClient can be used to send requests and retrieve their responses. GitHubClient is thread-safe and can be used
+ * to send multiple requests. GitHubClient also track some GitHub API information such as {@link #rateLimit()}.
+ * </p>
+ * <p>
+ * GitHubHttpUrlConnectionClient gets a new {@link HttpURLConnection} for each call to send.
+ * </p>
+ */
+class GitHubHttpUrlConnectionClient extends GitHubClient {
+
+    GitHubHttpUrlConnectionClient(String apiUrl,
+            String login,
+            String oauthAccessToken,
+            String jwtToken,
+            String password,
+            HttpConnector connector,
+            RateLimitHandler rateLimitHandler,
+            AbuseLimitHandler abuseLimitHandler,
+            GitHubRateLimitChecker rateLimitChecker,
+            Consumer<GHMyself> myselfConsumer) throws IOException {
+        super(apiUrl,
+                login,
+                oauthAccessToken,
+                jwtToken,
+                password,
+                connector,
+                rateLimitHandler,
+                abuseLimitHandler,
+                rateLimitChecker,
+                myselfConsumer);
+    }
+
+    @Nonnull
+    protected GitHubResponse.ResponseInfo getResponseInfo(GitHubRequest request) throws IOException {
+        HttpURLConnection connection;
+        try {
+            connection = HttpURLConnectionResponseInfo.setupConnection(this, request);
+        } catch (IOException e) {
+            // An error in here should be wrapped to bypass http exception wrapping.
+            throw new GHIOException(e.getMessage(), e);
+        }
+
+        // HttpUrlConnection is nuts. This call opens the connection and gets a response.
+        // Putting this on it's own line for ease of debugging if needed.
+        int statusCode = connection.getResponseCode();
+        Map<String, List<String>> headers = connection.getHeaderFields();
+
+        return new HttpURLConnectionResponseInfo(request, statusCode, headers, connection);
+    }
+
+    protected void handleLimitingErrors(@Nonnull GitHubResponse.ResponseInfo responseInfo) throws IOException {
+        if (isRateLimitResponse(responseInfo)) {
+            GHIOException e = new HttpException("Rate limit violation",
+                    responseInfo.statusCode(),
+                    responseInfo.headerField("Status"),
+                    responseInfo.url().toString()).withResponseHeaderFields(responseInfo.headers());
+            rateLimitHandler.onError(e, ((HttpURLConnectionResponseInfo) responseInfo).connection);
+        } else if (isAbuseLimitResponse(responseInfo)) {
+            GHIOException e = new HttpException("Abuse limit violation",
+                    responseInfo.statusCode(),
+                    responseInfo.headerField("Status"),
+                    responseInfo.url().toString()).withResponseHeaderFields(responseInfo.headers());
+            abuseLimitHandler.onError(e, ((HttpURLConnectionResponseInfo) responseInfo).connection);
+        }
+    }
+
+    /**
+     * Initial response information supplied to a {@link GitHubResponse.BodyHandler} when a response is initially
+     * received and before the body is processed.
+     *
+     * Implementation specific to {@link HttpURLConnection}.
+     */
+    static class HttpURLConnectionResponseInfo extends GitHubResponse.ResponseInfo {
+
+        @Nonnull
+        private final HttpURLConnection connection;
+
+        HttpURLConnectionResponseInfo(@Nonnull GitHubRequest request,
+                int statusCode,
+                @Nonnull Map<String, List<String>> headers,
+                @Nonnull HttpURLConnection connection) {
+            super(request, statusCode, headers);
+            this.connection = connection;
+        }
+
+        @Nonnull
+        static HttpURLConnection setupConnection(@Nonnull GitHubClient client, @Nonnull GitHubRequest request)
+                throws IOException {
+            HttpURLConnection connection = client.getConnector().connect(request.url());
+
+            // if the authentication is needed but no credential is given, try it anyway (so that some calls
+            // that do work with anonymous access in the reduced form should still work.)
+            if (client.encodedAuthorization != null)
+                connection.setRequestProperty("Authorization", client.encodedAuthorization);
+
+            setRequestMethod(request.method(), connection);
+            buildRequest(request, connection);
+
+            return connection;
+        }
+
+        /**
+         * Set up the request parameters or POST payload.
+         */
+        private static void buildRequest(GitHubRequest request, HttpURLConnection connection) throws IOException {
+            for (Map.Entry<String, String> e : request.headers().entrySet()) {
+                String v = e.getValue();
+                if (v != null)
+                    connection.setRequestProperty(e.getKey(), v);
+            }
+            connection.setRequestProperty("Accept-Encoding", "gzip");
+
+            if (request.inBody()) {
+                connection.setDoOutput(true);
+
+                try (InputStream body = request.body()) {
+                    if (body != null) {
+                        connection.setRequestProperty("Content-type",
+                                defaultString(request.contentType(), "application/x-www-form-urlencoded"));
+                        byte[] bytes = new byte[32768];
+                        int read;
+                        while ((read = body.read(bytes)) != -1) {
+                            connection.getOutputStream().write(bytes, 0, read);
+                        }
+                    } else {
+                        connection.setRequestProperty("Content-type",
+                                defaultString(request.contentType(), "application/json"));
+                        Map<String, Object> json = new HashMap<>();
+                        for (GitHubRequest.Entry e : request.args()) {
+                            json.put(e.key, e.value);
+                        }
+                        getMappingObjectWriter().writeValue(connection.getOutputStream(), json);
+                    }
+                }
+            }
+        }
+
+        private static void setRequestMethod(String method, HttpURLConnection connection) throws IOException {
+            try {
+                connection.setRequestMethod(method);
+            } catch (ProtocolException e) {
+                // JDK only allows one of the fixed set of verbs. Try to override that
+                try {
+                    Field $method = HttpURLConnection.class.getDeclaredField("method");
+                    $method.setAccessible(true);
+                    $method.set(connection, method);
+                } catch (Exception x) {
+                    throw (IOException) new IOException("Failed to set the custom verb").initCause(x);
+                }
+                // sun.net.www.protocol.https.DelegatingHttpsURLConnection delegates to another HttpURLConnection
+                try {
+                    Field $delegate = connection.getClass().getDeclaredField("delegate");
+                    $delegate.setAccessible(true);
+                    Object delegate = $delegate.get(connection);
+                    if (delegate instanceof HttpURLConnection) {
+                        HttpURLConnection nested = (HttpURLConnection) delegate;
+                        setRequestMethod(method, nested);
+                    }
+                } catch (NoSuchFieldException x) {
+                    // no problem
+                } catch (IllegalAccessException x) {
+                    throw (IOException) new IOException("Failed to set the custom verb").initCause(x);
+                }
+            }
+            if (!connection.getRequestMethod().equals(method))
+                throw new IllegalStateException("Failed to set the request method to " + method);
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        InputStream bodyStream() throws IOException {
+            return wrapStream(connection.getInputStream());
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        String errorMessage() {
+            String result = null;
+            InputStream stream = null;
+            try {
+                stream = connection.getErrorStream();
+                if (stream != null) {
+                    result = IOUtils.toString(wrapStream(stream), StandardCharsets.UTF_8);
+                }
+            } catch (Exception e) {
+                LOGGER.log(FINER, "Ignored exception get error message", e);
+            } finally {
+                IOUtils.closeQuietly(stream);
+            }
+            return result;
+        }
+
+        /**
+         * Handles the "Content-Encoding" header.
+         *
+         * @param stream
+         *            the stream to possibly wrap
+         *
+         */
+        private InputStream wrapStream(InputStream stream) throws IOException {
+            String encoding = headerField("Content-Encoding");
+            if (encoding == null || stream == null)
+                return stream;
+            if (encoding.equals("gzip"))
+                return new GZIPInputStream(stream);
+
+            throw new UnsupportedOperationException("Unexpected Content-Encoding: " + encoding);
+        }
+
+        private static final Logger LOGGER = Logger.getLogger(GitHubClient.class.getName());
+
+        @Override
+        public void close() throws IOException {
+            IOUtils.closeQuietly(connection.getInputStream());
+        }
+    }
+
+}

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

@@ -0,0 +1,79 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+import javax.annotation.Nonnull;
+
+/**
+ * {@link PagedIterable} implementation that take a {@link Consumer} that initializes all the items on each page as they
+ * are retrieved.
+ *
+ * {@link GitHubPageContentsIterable} is immutable and thread-safe, but the iterator returned from {@link #iterator()}
+ * is not. Any one instance of iterator should only be called from a single thread.
+ *
+ * @param <T>
+ *            the type of items on each page
+ */
+class GitHubPageContentsIterable<T> extends PagedIterable<T> {
+
+    private final GitHubClient client;
+    private final GitHubRequest request;
+    private final Class<T[]> receiverType;
+    private final Consumer<T> itemInitializer;
+
+    GitHubPageContentsIterable(GitHubClient client,
+            GitHubRequest request,
+            Class<T[]> receiverType,
+            Consumer<T> itemInitializer) {
+        this.client = client;
+        this.request = request;
+        this.receiverType = receiverType;
+        this.itemInitializer = itemInitializer;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    @Nonnull
+    public PagedIterator<T> _iterator(int pageSize) {
+        final GitHubPageIterator<T[]> iterator = GitHubPageIterator.create(client, receiverType, request, pageSize);
+        return new GitHubPageContentsIterator(iterator, itemInitializer);
+    }
+
+    /**
+     * Eagerly walk {@link Iterable} and return the result in a {@link GitHubResponse} containing an array of {@link T}
+     * items.
+     *
+     * @return the last response with an array containing all the results from all pages.
+     * @throws IOException
+     *             if an I/O exception occurs.
+     */
+    @Nonnull
+    GitHubResponse<T[]> toResponse() throws IOException {
+        GitHubPageContentsIterator iterator = (GitHubPageContentsIterator) iterator();
+        T[] items = toArray(iterator);
+        GitHubResponse<T[]> lastResponse = iterator.lastResponse();
+        return new GitHubResponse<>(lastResponse, items);
+    }
+
+    /**
+     * This class is not thread-safe. Any one instance should only be called from a single thread.
+     */
+    private class GitHubPageContentsIterator extends PagedIterator<T> {
+
+        public GitHubPageContentsIterator(GitHubPageIterator<T[]> iterator, Consumer<T> itemInitializer) {
+            super(iterator, itemInitializer);
+        }
+
+        /**
+         * Gets the {@link GitHubResponse} for the last page received.
+         *
+         * @return the {@link GitHubResponse} for the last page received.
+         */
+        private GitHubResponse<T[]> lastResponse() {
+            return ((GitHubPageIterator<T[]>) base).finalResponse();
+        }
+    }
+}

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

@@ -0,0 +1,179 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import javax.annotation.Nonnull;
+
+/**
+ * May be used for any item that has pagination information. Iterates over paginated {@link T} objects (not the items
+ * inside the page). Also exposes {@link #finalResponse()} to allow getting a full {@link GitHubResponse<T>} after
+ * iterating completes.
+ *
+ * Works for array responses, also works for search results which are single instances with an array of items inside.
+ *
+ * This class is not thread-safe. Any one instance should only be called from a single thread.
+ *
+ * @param <T>
+ *            type of each page (not the items in the page).
+ */
+class GitHubPageIterator<T> implements Iterator<T> {
+
+    private final GitHubClient client;
+    private final Class<T> type;
+
+    /**
+     * The page that will be returned when {@link #next()} is called.
+     *
+     * <p>
+     * Will be {@code null} after {@link #next()} is called.
+     * </p>
+     * <p>
+     * Will not be {@code null} after {@link #fetch()} is called if a new page was fetched.
+     * </p>
+     */
+    private T next;
+
+    /**
+     * The request that will be sent when to get a new response page if {@link #next} is {@code null}. Will be
+     * {@code null} when there are no more pages to fetch.
+     */
+    private GitHubRequest nextRequest;
+
+    /**
+     * When done iterating over pages, it is on rare occasions useful to be able to get information from the final
+     * response that was retrieved.
+     */
+    private GitHubResponse<T> finalResponse = null;
+
+    private GitHubPageIterator(GitHubClient client, Class<T> type, GitHubRequest request) {
+        if (!"GET".equals(request.method())) {
+            throw new IllegalStateException("Request method \"GET\" is required for page iterator.");
+        }
+
+        this.client = client;
+        this.type = type;
+        this.nextRequest = request;
+    }
+
+    /**
+     * Loads paginated resources.
+     *
+     * @param client
+     *            the {@link GitHubClient} from which to request responses
+     * @param type
+     *            type of each page (not the items in the page).
+     * @param <T>
+     *            type of each page (not the items in the page).
+     * @return iterator
+     */
+    static <T> GitHubPageIterator<T> create(GitHubClient client, Class<T> type, GitHubRequest request, int pageSize) {
+
+        try {
+            if (pageSize > 0) {
+                GitHubRequest.Builder<?> builder = request.toBuilder().with("per_page", pageSize);
+                request = builder.build();
+            }
+
+            return new GitHubPageIterator<>(client, type, request);
+        } catch (MalformedURLException e) {
+            throw new GHException("Unable to build GitHub API URL", e);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean hasNext() {
+        fetch();
+        return next != null;
+    }
+
+    /**
+     * Gets the next page.
+     *
+     * @return the next page.
+     */
+    @Nonnull
+    public T next() {
+        fetch();
+        T result = next;
+        if (result == null)
+            throw new NoSuchElementException();
+        // If this is the last page, keep the response
+        next = null;
+        return result;
+    }
+
+    /**
+     * On rare occasions the final response from iterating is needed.
+     *
+     * @return the final response of the iterator.
+     */
+    public GitHubResponse<T> finalResponse() {
+        if (hasNext()) {
+            throw new GHException("Final response is not available until after iterator is done.");
+        }
+        return finalResponse;
+    }
+
+    /**
+     * Fetch is called at the start of {@link #hasNext()} or {@link #next()} to fetch another page of data if it is
+     * needed.
+     * <p>
+     * If {@link #next} is not {@code null}, no further action is needed. If {@link #next} is {@code null} and
+     * {@link #nextRequest} is {@code null}, there are no more pages to fetch.
+     * </p>
+     * <p>
+     * Otherwise, a new response page is fetched using {@link #nextRequest}. The response is then checked to see if
+     * there is a page after it and {@link #nextRequest} is updated to point to it. If there are no pages available
+     * after the current response, {@link #nextRequest} is set to {@code null}.
+     * </p>
+     */
+    private void fetch() {
+        if (next != null)
+            return; // already fetched
+        if (nextRequest == null)
+            return; // no more data to fetch
+
+        URL url = nextRequest.url();
+        try {
+            GitHubResponse<T> nextResponse = client.sendRequest(nextRequest,
+                    (responseInfo) -> GitHubResponse.parseBody(responseInfo, type));
+            assert nextResponse.body() != null;
+            next = nextResponse.body();
+            nextRequest = findNextURL(nextResponse);
+            if (nextRequest == null) {
+                finalResponse = nextResponse;
+            }
+        } catch (IOException e) {
+            // Iterators do not throw IOExceptions, so we wrap any IOException
+            // in a runtime GHException to bubble out if needed.
+            throw new GHException("Failed to retrieve " + url, e);
+        }
+    }
+
+    /**
+     * Locate the next page from the pagination "Link" tag.
+     */
+    private GitHubRequest findNextURL(GitHubResponse<T> nextResponse) throws MalformedURLException {
+        GitHubRequest result = null;
+        String link = nextResponse.headerField("Link");
+        if (link != null) {
+            for (String token : link.split(", ")) {
+                if (token.endsWith("rel=\"next\"")) {
+                    // found the next page. This should look something like
+                    // <https://api.github.com/repos?page=3&per_page=100>; rel="next"
+                    int idx = token.indexOf('>');
+                    result = nextResponse.request().toBuilder().setRawUrlPath(token.substring(1, idx)).build();
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+}

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

@@ -0,0 +1,145 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A GitHub API Rate Limit Checker called before each request. This class provides the basic infrastructure for calling
+ * the appropriate {@link RateLimitChecker} for a request and retrying as many times as needed. This class supports more
+ * complex throttling strategies and polling, but leaves the specifics to the {@link RateLimitChecker} implementations.
+ * <p>
+ * GitHub allots a certain number of requests to each user or application per period of time (usually per hour). The
+ * number of requests remaining is returned in the response header and can also be requested using
+ * {@link GitHub#getRateLimit()}. This requests per interval is referred to as the "rate limit".
+ * </p>
+ * <p>
+ * GitHub prefers that clients stop before exceeding their rate limit rather than stopping after they exceed it. The
+ * {@link RateLimitChecker} is called before each request to check the rate limit and wait if the checker criteria are
+ * met.
+ * </p>
+ * <p>
+ * Checking your rate limit using {@link GitHub#getRateLimit()} does not effect your rate limit, but each {@link GitHub}
+ * instance will attempt to cache and reuse the last see rate limit rather than making a new request.
+ * </p>
+ */
+class GitHubRateLimitChecker {
+
+    @Nonnull
+    private final RateLimitChecker core;
+
+    @Nonnull
+    private final RateLimitChecker search;
+
+    @Nonnull
+    private final RateLimitChecker graphql;
+
+    @Nonnull
+    private final RateLimitChecker integrationManifest;
+
+    GitHubRateLimitChecker() {
+        this(RateLimitChecker.NONE, RateLimitChecker.NONE, RateLimitChecker.NONE, RateLimitChecker.NONE);
+    }
+
+    GitHubRateLimitChecker(@Nonnull RateLimitChecker core,
+            @Nonnull RateLimitChecker search,
+            @Nonnull RateLimitChecker graphql,
+            @Nonnull RateLimitChecker integrationManifest) {
+        this.core = Objects.requireNonNull(core);
+
+        // for now only support rate limiting on core
+        // remove these asserts when that changes
+        assert search == RateLimitChecker.NONE;
+        assert graphql == RateLimitChecker.NONE;
+        assert integrationManifest == RateLimitChecker.NONE;
+
+        this.search = Objects.requireNonNull(search);
+        this.graphql = Objects.requireNonNull(graphql);
+        this.integrationManifest = Objects.requireNonNull(integrationManifest);
+    }
+
+    /**
+     * Checks whether there is sufficient requests remaining within this client's rate limit quota to make the current
+     * request.
+     * <p>
+     * This method does not do the actual check. Instead it select the appropriate {@link RateLimitChecker} and
+     * {@link GHRateLimit.Record} for the current request's urlPath. If the {@link RateLimitChecker} for this the
+     * current request's urlPath is {@link RateLimitChecker#NONE} the rate limit is not checked. If not, it calls
+     * {@link RateLimitChecker#checkRateLimit(GHRateLimit.Record, long)}. which decides if the rate limit has been
+     * exceeded and then sleeps for as long is it choose.
+     * </p>
+     * <p>
+     * It is up to the {@link RateLimitChecker#checkRateLimit(GHRateLimit.Record, long)} which decide if the rate limit
+     * has been exceeded. If it has, that method will sleep for as long is it chooses and then return {@code true}. If
+     * not, that method will return {@code false}.
+     * </p>
+     * <p>
+     * As long as {@link RateLimitChecker#checkRateLimit(GHRateLimit.Record, long)} returns {@code true}, this method
+     * will request updated rate limit information and call
+     * {@link RateLimitChecker#checkRateLimit(GHRateLimit.Record, long)} again. This looping allows implementers of
+     * {@link RateLimitChecker#checkRateLimit(GHRateLimit.Record, long)} to apply any number of strategies to
+     * controlling the speed at which requests are made. When it returns {@code false} this method will return and the
+     * request will be sent.
+     * </p>
+     *
+     * @param client
+     *            the {@link GitHubClient} to check
+     * @param request
+     *            the {@link GitHubRequest} to check against
+     * @throws IOException
+     *             if there is an I/O error
+     */
+    void checkRateLimit(GitHubClient client, GitHubRequest request) throws IOException {
+        RateLimitChecker guard = selectChecker(request.urlPath());
+        if (guard == RateLimitChecker.NONE) {
+            return;
+        }
+
+        // For the first rate limit, accept the current limit if a valid one is already present.
+        GHRateLimit rateLimit = client.rateLimit();
+        GHRateLimit.Record rateLimitRecord = rateLimit.getRecordForUrlPath(request.urlPath());
+        long waitCount = 0;
+        try {
+            while (guard.checkRateLimit(rateLimitRecord, waitCount)) {
+                waitCount++;
+
+                // When rate limit is exceeded, sleep for one additional second beyond when the
+                // called {@link RateLimitChecker} sleeps.
+                // Reset time is only accurate to the second, so adding a one second buffer for safety is a good idea.
+                // This also keeps polling clients from querying too often.
+                Thread.sleep(1000);
+
+                // After the first wait, always request a new rate limit from the server.
+                rateLimit = client.getRateLimit();
+                rateLimitRecord = rateLimit.getRecordForUrlPath(request.urlPath());
+            }
+        } catch (InterruptedException e) {
+            throw (IOException) new InterruptedIOException(e.getMessage()).initCause(e);
+        }
+    }
+
+    /**
+     * Gets the appropriate {@link RateLimitChecker} for a particular url path. Similar to
+     * {@link GHRateLimit#getRecordForUrlPath(String)}.
+     *
+     * @param urlPath
+     *            the url path of the request
+     * @return the {@link RateLimitChecker} for a url path.
+     */
+    @Nonnull
+    private RateLimitChecker selectChecker(@Nonnull String urlPath) {
+        if (urlPath.equals("/rate_limit")) {
+            return RateLimitChecker.NONE;
+        } else if (urlPath.startsWith("/search")) {
+            return search;
+        } else if (urlPath.startsWith("/graphql")) {
+            return graphql;
+        } else if (urlPath.startsWith("/app-manifests")) {
+            return integrationManifest;
+        } else {
+            return core;
+        }
+    }
+}

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

@@ -0,0 +1,674 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.NonNull;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+import javax.annotation.WillClose;
+
+import static java.util.Arrays.asList;
+
+/**
+ * Class {@link GitHubRequest} represents an immutable instance used by the client to determine what information to
+ * retrieve from a GitHub server. Use the {@link Builder} construct a {@link GitHubRequest}.
+ * <p>
+ * NOTE: {@link GitHubRequest} should include the data type to be returned. Any use cases where the same request should
+ * be used to return different types of data could be handled in some other way. However, the return type is currently
+ * not specified until late in the building process, so this is still untyped.
+ * </p>
+ */
+class GitHubRequest {
+
+    private static final List<String> METHODS_WITHOUT_BODY = asList("GET", "DELETE");
+    private final List<Entry> args;
+    private final Map<String, String> headers;
+    private final Map<String, Object> injectedMappingValues;
+    private final String apiUrl;
+    private final String urlPath;
+    private final String method;
+    private final InputStream body;
+    private final boolean forceBody;
+
+    private final URL url;
+
+    private GitHubRequest(@Nonnull List<Entry> args,
+            @Nonnull Map<String, String> headers,
+            @Nonnull Map<String, Object> injectedMappingValues,
+            @Nonnull String apiUrl,
+            @Nonnull String urlPath,
+            @Nonnull String method,
+            @CheckForNull InputStream body,
+            boolean forceBody) throws MalformedURLException {
+        this.args = Collections.unmodifiableList(new ArrayList<>(args));
+        this.headers = Collections.unmodifiableMap(new LinkedHashMap<>(headers));
+        this.injectedMappingValues = Collections.unmodifiableMap(new LinkedHashMap<>(injectedMappingValues));
+        this.apiUrl = apiUrl;
+        this.urlPath = urlPath;
+        this.method = method;
+        this.body = body;
+        this.forceBody = forceBody;
+        String tailApiUrl = buildTailApiUrl();
+        url = getApiURL(apiUrl, tailApiUrl);
+    }
+
+    /**
+     * Create a new {@link Builder}.
+     * 
+     * @return a new {@link Builder}.
+     */
+    public static Builder<?> newBuilder() {
+        return new Builder<>();
+    }
+
+    /**
+     * Gets the final GitHub API URL.
+     */
+    @Nonnull
+    static URL getApiURL(String apiUrl, String tailApiUrl) throws MalformedURLException {
+        if (tailApiUrl.startsWith("/")) {
+            if ("github.com".equals(apiUrl)) {// backward compatibility
+                return new URL(GitHubClient.GITHUB_URL + tailApiUrl);
+            } else {
+                return new URL(apiUrl + tailApiUrl);
+            }
+        } else {
+            return new URL(tailApiUrl);
+        }
+    }
+
+    /**
+     * Transform Java Enum into Github constants given its conventions
+     *
+     * @param en
+     *            Enum to be transformed
+     * @return a String containing the value of a Github constant
+     */
+    static String transformEnum(Enum<?> en) {
+        // by convention Java constant names are upper cases, but github uses
+        // lower-case constants. GitHub also uses '-', which in Java we always
+        // replace with '_'
+        return en.toString().toLowerCase(Locale.ENGLISH).replace('_', '-');
+    }
+
+    /**
+     * The method for this request, such as "GET", "PATCH", or "DELETE".
+     *
+     * @return the request method.
+     */
+    @Nonnull
+    public String method() {
+        return method;
+    }
+
+    /**
+     * The arguments for this request. Depending on the {@link #method()} and {@code #inBody()} these maybe added to the
+     * url or to the request body.
+     *
+     * @return the {@link List<Entry>} of arguments
+     */
+    @Nonnull
+    public List<Entry> args() {
+        return args;
+    }
+
+    /**
+     * The headers for this request.
+     *
+     * @return the {@link Map} of headers
+     */
+    @Nonnull
+    public Map<String, String> headers() {
+        return headers;
+    }
+
+    /**
+     * The headers for this request.
+     *
+     * @return the {@link Map} of headers
+     */
+    @Nonnull
+    public Map<String, Object> injectedMappingValues() {
+        return injectedMappingValues;
+    }
+
+    /**
+     * The base GitHub API URL for this request represented as a {@link String}
+     * 
+     * @return the url string
+     */
+    @Nonnull
+    public String apiUrl() {
+        return apiUrl;
+    }
+
+    /**
+     * The url path to be added to the {@link #apiUrl()} for this request. If this does not start with a "/", it instead
+     * represents the full url string for this request.
+     * 
+     * @return a url path or full url string
+     */
+    @Nonnull
+    public String urlPath() {
+        return urlPath;
+    }
+
+    /**
+     * The content type to to be sent by this request.
+     * 
+     * @return the content type.
+     */
+    @Nonnull
+    public String contentType() {
+        return headers.get("Content-type");
+    }
+
+    /**
+     * The {@link InputStream} to be sent as the body of this request.
+     * 
+     * @return the {@link InputStream}.
+     */
+    @CheckForNull
+    public InputStream body() {
+        return body;
+    }
+
+    /**
+     * The {@link URL} for this request. This is the actual URL the {@link GitHubClient} will send this request to.
+     * 
+     * @return the request {@link URL}
+     */
+    @Nonnull
+    public URL url() {
+        return url;
+    }
+
+    /**
+     * Whether arguments for this request should be included in the URL or in the body of the request.
+     * 
+     * @return true if the arguements should be sent in the body of the request.
+     */
+    public boolean inBody() {
+        return forceBody || !METHODS_WITHOUT_BODY.contains(method);
+    }
+
+    /**
+     * Create a {@link Builder} from this request. Initial values of the builder will be the same as this
+     * {@link GitHubRequest}.
+     * 
+     * @return a {@link Builder} based on this request.
+     */
+    public Builder<?> toBuilder() {
+        return new Builder<>(args, headers, injectedMappingValues, apiUrl, urlPath, method, body, forceBody);
+    }
+
+    private String buildTailApiUrl() {
+        String tailApiUrl = urlPath;
+        if (!inBody() && !args.isEmpty() && tailApiUrl.startsWith("/")) {
+            try {
+                StringBuilder argString = new StringBuilder();
+                boolean questionMarkFound = tailApiUrl.indexOf('?') != -1;
+                argString.append(questionMarkFound ? '&' : '?');
+
+                for (Iterator<Entry> it = args.listIterator(); it.hasNext();) {
+                    Entry arg = it.next();
+                    argString.append(URLEncoder.encode(arg.key, StandardCharsets.UTF_8.name()));
+                    argString.append('=');
+                    argString.append(URLEncoder.encode(arg.value.toString(), StandardCharsets.UTF_8.name()));
+                    if (it.hasNext()) {
+                        argString.append('&');
+                    }
+                }
+                tailApiUrl += argString;
+            } catch (UnsupportedEncodingException e) {
+                throw new GHException("UTF-8 encoding required", e);
+            }
+        }
+        return tailApiUrl;
+    }
+
+    /**
+     * Class {@link Builder} follows the builder pattern for {@link GitHubRequest}.
+     *
+     * @param <B>
+     *            The type of {@link Builder} to return from the various "with*" methods.
+     */
+    static class Builder<B extends Builder<B>> {
+
+        @Nonnull
+        private final List<Entry> args;
+
+        /**
+         * The header values for this request.
+         */
+        @Nonnull
+        private final Map<String, String> headers;
+
+        /**
+         * Injected local data map
+         */
+        @Nonnull
+        private final Map<String, Object> injectedMappingValues;
+
+        /**
+         * The base GitHub API for this request.
+         */
+        @Nonnull
+        private String apiUrl;
+
+        @Nonnull
+        private String urlPath;
+        /**
+         * Request method.
+         */
+        @Nonnull
+        private String method;
+        private InputStream body;
+        private boolean forceBody;
+
+        /**
+         * Create a new {@link GitHubRequest.Builder}
+         */
+        protected Builder() {
+            this(new ArrayList<>(),
+                    new LinkedHashMap<>(),
+                    new LinkedHashMap<>(),
+                    GitHubClient.GITHUB_URL,
+                    "/",
+                    "GET",
+                    null,
+                    false);
+        }
+
+        private Builder(@Nonnull List<Entry> args,
+                @Nonnull Map<String, String> headers,
+                @Nonnull Map<String, Object> injectedMappingValues,
+                @Nonnull String apiUrl,
+                @Nonnull String urlPath,
+                @Nonnull String method,
+                @CheckForNull @WillClose InputStream body,
+                boolean forceBody) {
+            this.args = new ArrayList<>(args);
+            this.headers = new LinkedHashMap<>(headers);
+            this.injectedMappingValues = new LinkedHashMap<>(injectedMappingValues);
+            this.apiUrl = apiUrl;
+            this.urlPath = urlPath;
+            this.method = method;
+            this.body = body;
+            this.forceBody = forceBody;
+        }
+
+        /**
+         * Builds a {@link GitHubRequest} from this builder.
+         * 
+         * @return a {@link GitHubRequest}
+         * @throws MalformedURLException
+         *             if the GitHub API URL cannot be constructed
+         */
+        public GitHubRequest build() throws MalformedURLException {
+            return new GitHubRequest(args, headers, injectedMappingValues, apiUrl, urlPath, method, body, forceBody);
+        }
+
+        /**
+         * With header requester.
+         *
+         * @param url
+         *            the url
+         * @return the request builder
+         */
+        public B withApiUrl(String url) {
+            this.apiUrl = url;
+            return (B) this;
+        }
+
+        /**
+         * Sets the request HTTP header.
+         * <p>
+         * If a header of the same name is already set, this method overrides it.
+         *
+         * @param name
+         *            the name
+         * @param value
+         *            the value
+         */
+        public void setHeader(String name, String value) {
+            headers.put(name, value);
+        }
+
+        /**
+         * With header requester.
+         *
+         * @param name
+         *            the name
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B withHeader(String name, String value) {
+            setHeader(name, value);
+            return (B) this;
+        }
+
+        /**
+         * Object to inject into binding.
+         *
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B injectMappingValue(@NonNull Object value) {
+            return injectMappingValue(value.getClass().getName(), value);
+        }
+
+        /**
+         * Object to inject into binding.
+         *
+         * @param name
+         *            the name
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B injectMappingValue(@NonNull String name, Object value) {
+            this.injectedMappingValues.put(name, value);
+            return (B) this;
+        }
+
+        public B withPreview(String name) {
+            return withHeader("Accept", name);
+        }
+
+        /**
+         * With requester.
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B with(String key, int value) {
+            return with(key, (Object) value);
+        }
+
+        /**
+         * With requester.
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B with(String key, long value) {
+            return with(key, (Object) value);
+        }
+
+        /**
+         * With requester.
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B with(String key, boolean value) {
+            return with(key, (Object) value);
+        }
+
+        /**
+         * With requester.
+         *
+         * @param key
+         *            the key
+         * @param e
+         *            the e
+         * @return the request builder
+         */
+        public B with(String key, Enum<?> e) {
+            if (e == null)
+                return with(key, (Object) null);
+            return with(key, transformEnum(e));
+        }
+
+        /**
+         * With requester.
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B with(String key, String value) {
+            return with(key, (Object) value);
+        }
+
+        /**
+         * With requester.
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B with(String key, Collection<?> value) {
+            return with(key, (Object) value);
+        }
+
+        /**
+         * With requester.
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B with(String key, Map<?, ?> value) {
+            return with(key, (Object) value);
+        }
+
+        /**
+         * With requester.
+         *
+         * @param body
+         *            the body
+         * @return the request builder
+         */
+        public B with(@WillClose /* later */ InputStream body) {
+            this.body = body;
+            return (B) this;
+        }
+
+        /**
+         * With nullable requester.
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B withNullable(String key, Object value) {
+            args.add(new Entry(key, value));
+            return (B) this;
+        }
+
+        /**
+         * With requester.
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B with(String key, Object value) {
+            if (value != null) {
+                args.add(new Entry(key, value));
+            }
+            return (B) this;
+        }
+
+        /**
+         * Unlike {@link #with(String, String)}, overrides the existing value
+         *
+         * @param key
+         *            the key
+         * @param value
+         *            the value
+         * @return the request builder
+         */
+        public B set(String key, Object value) {
+            for (int index = 0; index < args.size(); index++) {
+                if (args.get(index).key.equals(key)) {
+                    args.set(index, new Entry(key, value));
+                    return (B) this;
+                }
+            }
+            return with(key, value);
+        }
+
+        /**
+         * Method requester.
+         *
+         * @param method
+         *            the method
+         * @return the request builder
+         */
+        public B method(@Nonnull String method) {
+            this.method = method;
+            return (B) this;
+        }
+
+        /**
+         * Content type requester.
+         *
+         * @param contentType
+         *            the content type
+         * @return the request builder
+         */
+        public B contentType(String contentType) {
+            this.headers.put("Content-type", contentType);
+            return (B) this;
+        }
+
+        /**
+         * NOT FOR PUBLIC USE. Do not make this method public.
+         * <p>
+         * Sets the path component of api URL without URI encoding.
+         * <p>
+         * Should only be used when passing a literal URL field from a GHObject, such as {@link GHContent#refresh()} or
+         * when needing to set query parameters on requests methods that don't usually have them, such as
+         * {@link GHRelease#uploadAsset(String, InputStream, String)}.
+         *
+         * @param rawUrlPath
+         *            the content type
+         * @return the request builder
+         */
+        B setRawUrlPath(@Nonnull String rawUrlPath) {
+            Objects.requireNonNull(rawUrlPath);
+            // This method should only work for full urls, which must start with "http"
+            if (!rawUrlPath.startsWith("http")) {
+                throw new GHException("Raw URL must start with 'http'");
+            }
+            this.urlPath = rawUrlPath;
+            return (B) this;
+        }
+
+        /**
+         * Path component of api URL. Appended to api url.
+         * <p>
+         * If urlPath starts with a slash, it will be URI encoded as a path. If it starts with anything else, it will be
+         * used as is.
+         *
+         * @param urlPathItems
+         *            the content type
+         * @return the request builder
+         */
+        public B withUrlPath(@Nonnull String urlPath, @Nonnull String... urlPathItems) {
+            // full url may be set and reset as needed
+            if (urlPathItems.length == 0 && !urlPath.startsWith("/")) {
+                return setRawUrlPath(urlPath);
+            }
+
+            // Once full url is set, do not allow path setting
+            if (!this.urlPath.startsWith("/")) {
+                throw new GHException("Cannot append to url path after setting a full url");
+            }
+
+            String tailUrlPath = urlPath;
+            if (urlPathItems.length != 0) {
+                tailUrlPath += "/" + String.join("/", urlPathItems);
+            }
+
+            if (this.urlPath.endsWith("/")) {
+                tailUrlPath = StringUtils.stripStart(tailUrlPath, "/");
+            } else {
+                tailUrlPath = StringUtils.prependIfMissing(tailUrlPath, "/");
+            }
+
+            this.urlPath += urlPathEncode(tailUrlPath);
+            return (B) this;
+        }
+
+        /**
+         * Small number of GitHub APIs use HTTP methods somewhat inconsistently, and use a body where it's not expected.
+         * Normally whether parameters go as query parameters or a body depends on the HTTP verb in use, but this method
+         * forces the parameters to be sent as a body.
+         *
+         * @return the request builder
+         */
+        public B inBody() {
+            forceBody = true;
+            return (B) this;
+        }
+    }
+
+    protected static class Entry {
+        final String key;
+        final Object value;
+
+        protected Entry(String key, Object value) {
+            this.key = key;
+            this.value = value;
+        }
+    }
+
+    /**
+     * Encode the path to url safe string.
+     *
+     * @param value
+     *            string to be path encoded.
+     * @return The encoded string.
+     */
+    private static String urlPathEncode(String value) {
+        try {
+            return new URI(null, null, value, null, null).toASCIIString();
+        } catch (URISyntaxException ex) {
+            throw new AssertionError(ex);
+        }
+    }
+
+}

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

@@ -0,0 +1,326 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.InjectableValues;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import org.apache.commons.io.IOUtils;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Array;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
+/**
+ * A GitHubResponse
+ * <p>
+ * A {@link GitHubResponse} generated by from sending a {@link GitHubRequest} to a {@link GitHubClient}.
+ * </p>
+ *
+ * @param <T>
+ *            the type of the data parsed from the body of a {@link ResponseInfo}.
+ */
+class GitHubResponse<T> {
+
+    private static final Logger LOGGER = Logger.getLogger(GitHubResponse.class.getName());
+
+    private final int statusCode;
+
+    @Nonnull
+    private final GitHubRequest request;
+
+    @Nonnull
+    private final Map<String, List<String>> headers;
+
+    @CheckForNull
+    private final T body;
+
+    GitHubResponse(GitHubResponse<T> response, @CheckForNull T body) {
+        this.statusCode = response.statusCode();
+        this.request = response.request();
+        this.headers = response.headers();
+        this.body = body;
+    }
+
+    GitHubResponse(ResponseInfo responseInfo, @CheckForNull T body) {
+        this.statusCode = responseInfo.statusCode();
+        this.request = responseInfo.request();
+        this.headers = responseInfo.headers();
+        this.body = body;
+    }
+
+    /**
+     * Parses a {@link ResponseInfo} body into a new instance of {@link T}.
+     *
+     * @param responseInfo
+     *            response info to parse.
+     * @param type
+     *            the type to be constructed.
+     * @param <T>
+     *            the type
+     * @return a new instance of {@link T}.
+     * @throws IOException
+     *             if there is an I/O Exception.
+     */
+    @CheckForNull
+    static <T> T parseBody(ResponseInfo responseInfo, Class<T> type) throws IOException {
+
+        if (responseInfo.statusCode() == HttpURLConnection.HTTP_NO_CONTENT && type != null && type.isArray()) {
+            // no content
+            return type.cast(Array.newInstance(type.getComponentType(), 0));
+        }
+
+        String data = responseInfo.getBodyAsString();
+        try {
+            InjectableValues.Std inject = new InjectableValues.Std();
+            inject.addValue(ResponseInfo.class, responseInfo);
+
+            return GitHubClient.getMappingObjectReader(responseInfo).forType(type).readValue(data);
+        } catch (JsonMappingException | JsonParseException e) {
+            String message = "Failed to deserialize: " + data;
+            LOGGER.log(Level.FINE, message);
+            throw e;
+        }
+    }
+
+    /**
+     * Parses a {@link ResponseInfo} body into a new instance of {@link T}.
+     *
+     * @param responseInfo
+     *            response info to parse.
+     * @param instance
+     *            the object to fill with data parsed from body
+     * @param <T>
+     *            the type
+     * @return a new instance of {@link T}.
+     * @throws IOException
+     *             if there is an I/O Exception.
+     */
+    @CheckForNull
+    static <T> T parseBody(ResponseInfo responseInfo, T instance) throws IOException {
+
+        String data = responseInfo.getBodyAsString();
+        try {
+            return GitHubClient.getMappingObjectReader(responseInfo).withValueToUpdate(instance).readValue(data);
+        } catch (JsonMappingException | JsonParseException e) {
+            String message = "Failed to deserialize: " + data;
+            LOGGER.log(Level.FINE, message);
+            throw e;
+        }
+    }
+
+    /**
+     * The {@link URL} for this response.
+     *
+     * @return the {@link URL} for this response.
+     */
+    @Nonnull
+    public URL url() {
+        return request.url();
+    }
+
+    /**
+     * The {@link GitHubRequest} for this response.
+     *
+     * @return the {@link GitHubRequest} for this response.
+     */
+    @Nonnull
+    public GitHubRequest request() {
+        return request;
+    }
+
+    /**
+     * The status code for this response.
+     *
+     * @return the status code for this response.
+     */
+    public int statusCode() {
+        return statusCode;
+    }
+
+    /**
+     * The headers for this response.
+     *
+     * @return the headers for this response.
+     */
+    @Nonnull
+    public Map<String, List<String>> headers() {
+        return headers;
+    }
+
+    /**
+     * Gets the value of a header field for this response.
+     *
+     * @param name
+     *            the name of the header field.
+     * @return the value of the header field, or {@code null} if the header isn't set.
+     */
+    @CheckForNull
+    public String headerField(String name) {
+        String result = null;
+        if (headers.containsKey(name)) {
+            result = headers.get(name).get(0);
+        }
+        return result;
+    }
+
+    /**
+     * The body of the response parsed as a {@link T}
+     *
+     * @return body of the response
+     */
+    public T body() {
+        return body;
+    }
+
+    /**
+     * Represents a supplier of results that can throw.
+     *
+     * <p>
+     * This is a <a href="package-summary.html">functional interface</a> whose functional method is
+     * {@link #apply(ResponseInfo)}.
+     *
+     * @param <T>
+     *            the type of results supplied by this supplier
+     */
+    @FunctionalInterface
+    interface BodyHandler<T> {
+
+        /**
+         * Gets a result.
+         *
+         * @return a result
+         * @throws IOException
+         *             if an I/O Exception occurs.
+         */
+        T apply(ResponseInfo input) throws IOException;
+    }
+
+    /**
+     * Initial response information supplied to a {@link BodyHandler} when a response is initially received and before
+     * the body is processed.
+     */
+    static abstract class ResponseInfo implements Closeable {
+
+        private static final Comparator<String> nullableCaseInsensitiveComparator = Comparator
+                .nullsFirst(String.CASE_INSENSITIVE_ORDER);
+
+        private final int statusCode;
+        @Nonnull
+        private final GitHubRequest request;
+        @Nonnull
+        private final Map<String, List<String>> headers;
+
+        protected ResponseInfo(@Nonnull GitHubRequest request,
+                int statusCode,
+                @Nonnull Map<String, List<String>> headers) {
+            this.request = request;
+            this.statusCode = statusCode;
+
+            // Response header field names must be case-insensitive.
+            TreeMap<String, List<String>> caseInsensitiveMap = new TreeMap<>(nullableCaseInsensitiveComparator);
+            caseInsensitiveMap.putAll(headers);
+
+            this.headers = Collections.unmodifiableMap(caseInsensitiveMap);
+        }
+
+        /**
+         * Gets the value of a header field for this response.
+         *
+         * @param name
+         *            the name of the header field.
+         * @return the value of the header field, or {@code null} if the header isn't set.
+         */
+        @CheckForNull
+        public String headerField(String name) {
+            String result = null;
+            if (headers.containsKey(name)) {
+                result = headers.get(name).get(0);
+            }
+            return result;
+        }
+
+        /**
+         * The response body as an {@link InputStream}.
+         *
+         * @return the response body
+         * @throws IOException
+         *             if an I/O Exception occurs.
+         */
+        abstract InputStream bodyStream() throws IOException;
+
+        /**
+         * The error message for this response.
+         *
+         * @return if there is an error with some error string, that is returned. If not, {@code null}.
+         */
+        abstract String errorMessage();
+
+        /**
+         * The {@link URL} for this response.
+         *
+         * @return the {@link URL} for this response.
+         */
+        @Nonnull
+        public URL url() {
+            return request.url();
+        }
+
+        /**
+         * Gets the {@link GitHubRequest} for this response.
+         *
+         * @return the {@link GitHubRequest} for this response.
+         */
+        @Nonnull
+        public GitHubRequest request() {
+            return request;
+        }
+
+        /**
+         * The status code for this response.
+         *
+         * @return the status code for this response.
+         */
+        public int statusCode() {
+            return statusCode;
+        }
+
+        /**
+         * The headers for this response.
+         *
+         * @return the headers for this response.
+         */
+        @Nonnull
+        public Map<String, List<String>> headers() {
+            return headers;
+        }
+
+        /**
+         * Gets the body of the response as a {@link String}.
+         *
+         * @return the body of the response as a {@link String}.
+         * @throws IOException
+         *             if an I/O Exception occurs.
+         */
+        @Nonnull
+        String getBodyAsString() throws IOException {
+            InputStreamReader r = null;
+            r = new InputStreamReader(this.bodyStream(), StandardCharsets.UTF_8);
+            return IOUtils.toString(r);
+        }
+    }
+
+}

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

@@ -41,6 +41,6 @@ public class GitUser {
      * @return 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);
+        return GitHubClient.parseDate(date);
     }
 }

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

@@ -14,6 +14,7 @@ import java.net.URL;
  *
  * @author Kohsuke Kawaguchi
  */
+@FunctionalInterface
 public interface HttpConnector {
     /**
      * Opens a connection to the given URL.
@@ -29,18 +30,12 @@ public interface HttpConnector {
     /**
      * Default implementation that uses {@link URL#openConnection()}.
      */
-    HttpConnector DEFAULT = new ImpatientHttpConnector(new HttpConnector() {
-        public HttpURLConnection connect(URL url) throws IOException {
-            return (HttpURLConnection) url.openConnection();
-        }
-    });
+    HttpConnector DEFAULT = new ImpatientHttpConnector(url -> (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");
-        }
+    HttpConnector OFFLINE = url -> {
+        throw new IOException("Offline");
     };
 }