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

Bump maven-project-info-reports-plugin from 3.0.0 to 3.1.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,4 +7,6 @@ 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 -D enable-ci clean 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.
+

.github/workflows/maven-build.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 13 ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11 ]
+        java: [ 8, 11 ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK
@@ -51,7 +51,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu, windows ]
-        java: [ 8, 11, 13 ]
+        java: [ 8, 11, 13, 15-ea ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK

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.108</version>
+  <version>1.112</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://github.com/github-api/github-api/</url>
-    <tag>github-api-1.108</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.112</tag>
   </scm>
 
   <distributionManagement>
@@ -27,18 +27,18 @@
     </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>4.0.0</spotbugs.version>
+    <spotbugs-maven-plugin.version>4.0.0</spotbugs-maven-plugin.version>
+    <spotbugs.version>4.0.3</spotbugs.version>
     <spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
     <hamcrest.version>2.2</hamcrest.version>
-    <okhttp3.version>4.4.0</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. -->
@@ -209,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>
@@ -233,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>
@@ -253,7 +253,7 @@
       <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>
@@ -281,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>
@@ -333,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>
@@ -453,7 +457,7 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>5.6.1.202002131546-r</version>
+      <version>5.7.0.202003110725-r</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -491,7 +495,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.3.1</version>
+      <version>3.3.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -503,7 +507,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-jre8-standalone</artifactId>
-      <version>2.26.2</version>
+      <version>2.26.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -568,6 +572,10 @@
       </properties>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
@@ -617,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/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,7 +144,9 @@ 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;
     }
@@ -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/GHAppInstallation.java

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

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

@@ -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 GitHubClient.parseURL(url);
+        return getUrl();
     }
 
     /**

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

@@ -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

@@ -51,24 +51,33 @@ public class GHCheckRun extends GHObject {
     }
 
     /**
-     * Gets status of the check run. It can be one of "queue", "in_progress", or "completed"
+     * 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. It can be one of "success", "failure", "neutral", "cancelled",
-     * "time_out", or "action_required".
+     * 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.
      *
@@ -243,4 +252,8 @@ public class GHCheckRun extends GHObject {
         }
     }
 
+    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/GHCommit.java

@@ -39,6 +39,8 @@ public class GHCommit {
 
         private int comment_count;
 
+        private GHVerification verification;
+
         static class Tree {
             String sha;
         }
@@ -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;
+        }
     }
 
     /**
@@ -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

@@ -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/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

@@ -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/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/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
@@ -191,6 +192,167 @@ public abstract class GHEventPayload {
             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);
+                }
+            }
+        }
     }
 
     /**

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

@@ -50,6 +50,30 @@ public class GHGist extends GHObject {
         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.
      *
@@ -97,6 +121,11 @@ public class GHGist extends GHObject {
         return git_push_url;
     }
 
+    /**
+     * Get the html url.
+     * 
+     * @return the github html url
+     */
     public URL getHtmlUrl() {
         return GitHubClient.parseURL(html_url);
     }

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

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

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

@@ -37,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;
 
@@ -179,10 +180,12 @@ public class GHIssue extends GHObject implements Reactable {
     /**
      * Gets api url.
      *
-     * @return the api url
+     * @return API URL of this object.
+     * @deprecated use {@link #getUrl()}
      */
+    @Deprecated
     public URL getApiURL() {
-        return GitHubClient.parseURL(url);
+        return getUrl();
     }
 
     /**
@@ -228,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();
     }
@@ -277,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());
+        }
     }
 
     /**
@@ -559,7 +573,8 @@ public class GHIssue extends GHObject implements Reactable {
     protected String getIssuesApiRoute() {
         if (owner == null) {
             // Issues returned from search to do not have an owner. Attempt to use url.
-            return StringUtils.prependIfMissing(getUrl().toString().replace(root.getApiUrl(), ""), "/");
+            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;
     }

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

@@ -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;
 
@@ -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 GitHubClient.parseURL(url);
-    }
-
     /**
      * Featured licenses are bold in the new repository drop-down
      *
@@ -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/GHObject.java

@@ -24,12 +24,14 @@ 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() {
     }
@@ -74,12 +76,12 @@ public abstract class GHObject {
      */
     @WithBridgeMethods(value = String.class, adapterMethod = "createdAtStr")
     public Date getCreatedAt() throws IOException {
-        return GitHubClient.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;
     }
 
     /**
@@ -110,7 +112,18 @@ public abstract class GHObject {
      *             on error
      */
     public Date getUpdatedAt() throws IOException {
-        return GitHubClient.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

@@ -128,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()}
      *
@@ -147,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);
     }
 
     /**

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

@@ -46,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);
+        }
     }
 
     /**

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;
@@ -105,10 +104,12 @@ public class GHProject extends GHObject {
     /**
      * 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

@@ -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

@@ -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

@@ -33,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;
 
@@ -103,7 +104,9 @@ public class GHPullRequest extends GHIssue implements Refreshable {
     protected String getApiRoute() {
         if (owner == null) {
             // Issues returned from search to do not have an owner. Attempt to use url.
-            return StringUtils.prependIfMissing(getUrl().toString().replace(root.getApiUrl(), ""), "/");
+            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;
     }
@@ -387,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);
+        }
     }
 
     /**

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();
     }
 
     /**

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;
@@ -143,7 +144,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
 
     @Override
     public URL getHtmlUrl() {
-        return null;
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
@@ -152,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/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/GHRelease.java

@@ -270,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();
     }
 
     /**
@@ -283,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,6 +24,7 @@
 package org.kohsuke.github;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonParseException;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -47,6 +48,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;
@@ -63,9 +65,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.
@@ -76,7 +78,7 @@ 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;
@@ -185,6 +187,15 @@ public class GHRepository extends GHObject {
         boolean pull, push, admin;
     }
 
+    /**
+     * Gets node id
+     *
+     * @return the node id
+     */
+    public String getNodeId() {
+        return nodeId;
+    }
+
     /**
      * Gets description.
      *
@@ -221,6 +232,17 @@ public class GHRepository extends GHObject {
         return clone_url;
     }
 
+    /**
+     * Git http transport url string.
+     *
+     * @return the string
+     * @deprecated Typo of {@link #getHttpTransportUrl()}
+     */
+    @Deprecated
+    public String gitHttpTransportUrl() {
+        return clone_url;
+    }
+
     /**
      * Gets the Subversion URL to access this repository: https://github.com/rails/rails
      *
@@ -547,6 +569,15 @@ public class GHRepository extends GHObject {
         return has_issues;
     }
 
+    /**
+     * Has projects boolean.
+     *
+     * @return the boolean
+     */
+    public boolean hasProjects() {
+        return has_projects;
+    }
+
     /**
      * Has wiki boolean.
      *
@@ -988,6 +1019,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.
      *
@@ -1524,6 +1567,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));
     }
@@ -1538,8 +1584,13 @@ 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 {
+        // Also accept e.g. "refs/heads/branch" for consistency with createRef().
+        if (refName.startsWith("refs/")) {
+            refName = refName.replaceFirst("refs/", "");
+        }
+
         return root.createRequest()
-                .withUrlPath(getApiTailUrl(String.format("git/refs/%s", refName)))
+                .withUrlPath(getApiTailUrl(String.format("git/ref/%s", refName)))
                 .fetch(GHRef.class)
                 .wrap(root);
     }
@@ -1745,7 +1796,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
@@ -1773,6 +1824,27 @@ public class GHRepository extends GHObject {
         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
      *
@@ -1828,6 +1900,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.
      *
@@ -1851,9 +1938,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);
     }
 
     /**
@@ -1866,7 +1951,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);
     }
 
     /**
@@ -1881,7 +1966,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();
     }
 
     /**
@@ -1898,14 +1983,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();
     }
 
     /**
@@ -2082,9 +2160,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;
     }
 
@@ -2404,10 +2488,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;
     }
 
@@ -2422,10 +2509,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;
     }
 
@@ -2744,4 +2834,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/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,6 +1,7 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -10,14 +11,14 @@ import java.util.TreeMap;
  *
  * @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;
@@ -129,15 +130,6 @@ public class GHTeam implements Refreshable {
         root.createRequest().method("PATCH").with("privacy", privacy).withUrlPath(api("")).send();
     }
 
-    /**
-     * Gets id.
-     *
-     * @return the id
-     */
-    public int getId() {
-        return id;
-    }
-
     /**
      * Retrieves the current members.
      *
@@ -169,7 +161,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;
@@ -302,7 +294,7 @@ public class GHTeam implements Refreshable {
     }
 
     private String api(String tail) {
-        return "/teams/" + id + tail;
+        return "/teams/" + getId() + tail;
     }
 
     /**
@@ -321,4 +313,9 @@ 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);
+    }
 }

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,6 +23,8 @@
  */
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.ObjectWriter;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 
 import java.io.*;
@@ -411,7 +413,7 @@ public class GitHub {
      * @throws IOException
      *             the io exception
      */
-    @WithBridgeMethods(GHUser.class)
+    @WithBridgeMethods(value = GHUser.class)
     public GHMyself getMyself() throws IOException {
         client.requireCredential();
         synchronized (this) {
@@ -724,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);
     }
@@ -1186,6 +1192,32 @@ public class GitHub {
                 "UTF-8");
     }
 
+    /**
+     * 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();
+    }
+
+    /**
+     * 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());
+    }
+
     @Nonnull
     GitHubClient getClient() {
         return client;

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

@@ -9,7 +9,6 @@ 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;

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

@@ -148,13 +148,15 @@ abstract class GitHubClient {
     }
 
     /**
-     * Ensures that the credential is valid.
+     * Ensures that the credential for this client is valid.
      *
      * @return the boolean
      */
     public boolean isCredentialValid() {
         try {
-            fetch(GHUser.class, "/user");
+            // 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))
@@ -208,21 +210,31 @@ abstract class GitHubClient {
     /**
      * 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 rateLimit;
+        GHRateLimit result;
         try {
-            rateLimit = fetch(JsonRateLimit.class, "/rate_limit").resources;
+            result = fetch(JsonRateLimit.class, "/rate_limit").resources;
         } catch (FileNotFoundException e) {
-            // GitHub Enterprise doesn't have the rate limit
-            // return a default rate limit that
-            rateLimit = GHRateLimit.Unknown();
+            // 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 this.rateLimit = rateLimit;
+        return rateLimit = result;
     }
 
     /**
@@ -241,9 +253,13 @@ abstract class GitHubClient {
     /**
      * 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 we couldn't get the current rate limit data.
+     *             if there was an error getting current rate limit data.
      */
     @Nonnull
     public GHRateLimit rateLimit() throws IOException {
@@ -252,11 +268,11 @@ abstract class GitHubClient {
                 return headerRateLimit;
             }
         }
-        GHRateLimit rateLimit = this.rateLimit;
-        if (rateLimit == null || rateLimit.isExpired()) {
-            rateLimit = getRateLimit();
+        GHRateLimit result = this.rateLimit;
+        if (result == null || result.isExpired()) {
+            result = getRateLimit();
         }
-        return rateLimit;
+        return result;
     }
 
     /**

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

@@ -583,13 +583,17 @@ class GitHubRequest {
          * when needing to set query parameters on requests methods that don't usually have them, such as
          * {@link GHRelease#uploadAsset(String, InputStream, String)}.
          *
-         * @param urlOrPath
+         * @param rawUrlPath
          *            the content type
          * @return the request builder
          */
-        B setRawUrlPath(String urlOrPath) {
-            Objects.requireNonNull(urlOrPath);
-            this.urlPath = urlOrPath;
+        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;
         }
 
@@ -603,10 +607,10 @@ class GitHubRequest {
          *            the content type
          * @return the request builder
          */
-        public B withUrlPath(String... urlPathItems) {
+        public B withUrlPath(@Nonnull String urlPath, @Nonnull String... urlPathItems) {
             // full url may be set and reset as needed
-            if (urlPathItems.length == 1 && !urlPathItems[0].startsWith("/")) {
-                return setRawUrlPath(urlPathItems[0]);
+            if (urlPathItems.length == 0 && !urlPath.startsWith("/")) {
+                return setRawUrlPath(urlPath);
             }
 
             // Once full url is set, do not allow path setting
@@ -614,7 +618,10 @@ class GitHubRequest {
                 throw new GHException("Cannot append to url path after setting a full url");
             }
 
-            String tailUrlPath = String.join("/", urlPathItems);
+            String tailUrlPath = urlPath;
+            if (urlPathItems.length != 0) {
+                tailUrlPath += "/" + String.join("/", urlPathItems);
+            }
 
             if (this.urlPath.endsWith("/")) {
                 tailUrlPath = StringUtils.stripStart(tailUrlPath, "/");
@@ -658,7 +665,7 @@ class GitHubRequest {
      */
     private static String urlPathEncode(String value) {
         try {
-            return new URI(null, null, value, null, null).toString();
+            return new URI(null, null, value, null, null).toASCIIString();
         } catch (URISyntaxException ex) {
             throw new AssertionError(ex);
         }

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

@@ -1,5 +1,6 @@
 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;
@@ -12,9 +13,12 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
-import java.util.HashMap;
+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;
@@ -30,6 +34,8 @@ import javax.annotation.Nonnull;
  */
 class GitHubResponse<T> {
 
+    private static final Logger LOGGER = Logger.getLogger(GitHubResponse.class.getName());
+
     private final int statusCode;
 
     @Nonnull
@@ -82,9 +88,10 @@ class GitHubResponse<T> {
             inject.addValue(ResponseInfo.class, responseInfo);
 
             return GitHubClient.getMappingObjectReader(responseInfo).forType(type).readValue(data);
-        } catch (JsonMappingException e) {
-            String message = "Failed to deserialize " + data;
-            throw new IOException(message, e);
+        } catch (JsonMappingException | JsonParseException e) {
+            String message = "Failed to deserialize: " + data;
+            LOGGER.log(Level.FINE, message);
+            throw e;
         }
     }
 
@@ -107,9 +114,10 @@ class GitHubResponse<T> {
         String data = responseInfo.getBodyAsString();
         try {
             return GitHubClient.getMappingObjectReader(responseInfo).withValueToUpdate(instance).readValue(data);
-        } catch (JsonMappingException e) {
-            String message = "Failed to deserialize " + data;
-            throw new IOException(message, e);
+        } catch (JsonMappingException | JsonParseException e) {
+            String message = "Failed to deserialize: " + data;
+            LOGGER.log(Level.FINE, message);
+            throw e;
         }
     }
 
@@ -206,6 +214,9 @@ class GitHubResponse<T> {
      */
     static abstract class ResponseInfo {
 
+        private static final Comparator<String> nullableCaseInsensitiveComparator = Comparator
+                .nullsFirst(String.CASE_INSENSITIVE_ORDER);
+
         private final int statusCode;
         @Nonnull
         private final GitHubRequest request;
@@ -217,7 +228,12 @@ class GitHubResponse<T> {
                 @Nonnull Map<String, List<String>> headers) {
             this.request = request;
             this.statusCode = statusCode;
-            this.headers = Collections.unmodifiableMap(new HashMap<>(headers));
+
+            // Response header field names must be case-insensitive.
+            TreeMap<String, List<String>> caseInsensitiveMap = new TreeMap<>(nullableCaseInsensitiveComparator);
+            caseInsensitiveMap.putAll(headers);
+
+            this.headers = Collections.unmodifiableMap(caseInsensitiveMap);
         }
 
         /**
@@ -298,6 +314,7 @@ class GitHubResponse<T> {
          * @throws IOException
          *             if an I/O Exception occurs.
          */
+        @Nonnull
         String getBodyAsString() throws IOException {
             InputStreamReader r = null;
             try {

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

@@ -5,7 +5,6 @@ import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;

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

@@ -8,6 +8,12 @@ package org.kohsuke.github;
  * @author Kohsuke Kawaguchi
  */
 class Previews {
+    /**
+     * Check-runs and check-suites
+     *
+     * @see <a href="https://developer.github.com/v3/previews/#check-runs-and-check-suites-api">GitHub API Previews</a>
+     */
+    static final String ANTIOPE = "application/vnd.github.antiope-preview+json";
 
     /**
      * Commit Search

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

@@ -1,7 +1,6 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.net.URL;
 
 /**
  * The interface Refreshable.

src/main/java/org/kohsuke/github/extras/okhttp3/ObsoleteUrlFactory.java

@@ -280,14 +280,15 @@ public final class ObsoleteUrlFactory implements URLStreamHandlerFactory, Clonea
             if (c > '\u001f' && c < '\u007f')
                 continue;
 
-            Buffer buffer = new Buffer();
-            buffer.writeUtf8(s, 0, i);
-            buffer.writeUtf8CodePoint('?');
-            for (int j = i + Character.charCount(c); j < length; j += Character.charCount(c)) {
-                c = s.codePointAt(j);
-                buffer.writeUtf8CodePoint(c > '\u001f' && c < '\u007f' ? c : '?');
+            try (Buffer buffer = new Buffer()) {
+                buffer.writeUtf8(s, 0, i);
+                buffer.writeUtf8CodePoint('?');
+                for (int j = i + Character.charCount(c); j < length; j += Character.charCount(c)) {
+                    c = s.codePointAt(j);
+                    buffer.writeUtf8CodePoint(c > '\u001f' && c < '\u007f' ? c : '?');
+                }
+                return buffer.readUtf8();
             }
-            return buffer.readUtf8();
         }
         return s;
     }

src/site/site.xml

@@ -14,7 +14,7 @@
     <menu name="Git Hub API for Java">
       <item name="Introduction" href="/index.html"/>
       <item name="Download" href="https://mvnrepository.com/artifact/${project.groupId}/${project.artifactId}"/>
-      <item name="Source code" href="https://github.com/github-api/${project.artifactId}"/>
+      <item name="Source code" href="https://github.com/hub4j/${project.artifactId}"/>
       <item name="Mailing List" href="https://groups.google.com/forum/#!forum/github-api"/>
     </menu>
 

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

@@ -31,7 +31,7 @@ public abstract class AbstractGitHubWireMockTest extends Assert {
 
     private final GitHubBuilder githubBuilder = createGitHubBuilder();
 
-    final static String GITHUB_API_TEST_ORG = "github-api-test-org";
+    final static String GITHUB_API_TEST_ORG = "hub4j-test-org";
 
     final static String STUBBED_USER_LOGIN = "placeholder-user";
     final static String STUBBED_USER_PASSWORD = "placeholder-password";
@@ -134,7 +134,7 @@ public abstract class AbstractGitHubWireMockTest extends Assert {
 
     protected void verifyAuthenticated(GitHub instance) {
         assertThat(
-                "GitHub connection believes it is anonymous.  Make sure you set GITHUB_OAUTH or both GITHUB_USER and GITHUB_PASSWORD environment variables",
+                "GitHub connection believes it is anonymous.  Make sure you set GITHUB_OAUTH or both GITHUB_LOGIN and GITHUB_PASSWORD environment variables",
                 instance.isAnonymous(),
                 Matchers.is(false));
     }

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

@@ -10,6 +10,7 @@ import org.junit.Test;
 import org.kohsuke.github.GHCommit.File;
 import org.kohsuke.github.GHOrganization.Permission;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -39,13 +40,40 @@ public class AppTest extends AbstractGitHubWireMockTest {
                 "a test repository",
                 "http://github-api.kohsuke.org/",
                 true);
+
         assertThat(r.hasIssues(), is(true));
+        assertThat(r.hasWiki(), is(true));
+        assertThat(r.hasDownloads(), is(true));
+        assertThat(r.hasProjects(), is(true));
 
         r.enableIssueTracker(false);
         r.enableDownloads(false);
         r.enableWiki(false);
+        r.enableProjects(false);
+
         r.renameTo(targetName);
-        getUser().getRepository(targetName).delete();
+
+        // local instance remains unchanged
+        assertThat(r.getName(), equalTo("github-api-test-rename"));
+        assertThat(r.hasIssues(), is(true));
+        assertThat(r.hasWiki(), is(true));
+        assertThat(r.hasDownloads(), is(true));
+        assertThat(r.hasProjects(), is(true));
+
+        r = gitHub.getMyself().getRepository(targetName);
+
+        // values are updated
+        assertThat(r.hasIssues(), is(false));
+        assertThat(r.hasWiki(), is(false));
+        assertThat(r.hasDownloads(), is(false));
+        assertThat(r.getName(), equalTo(targetName));
+
+        // ISSUE: #765
+        // From what I can tell this is a bug in GithHub.
+        // updating `has_projects` doesn't seem to do anything
+        assertThat(r.hasProjects(), is(true));
+
+        r.delete();
     }
 
     @Test
@@ -57,14 +85,12 @@ public class AppTest extends AbstractGitHubWireMockTest {
                 .homepage("http://github-api.kohsuke.org/")
                 .autoInit(true)
                 .create();
-        r.enableIssueTracker(false);
-        r.enableDownloads(false);
-        r.enableWiki(false);
         if (mockGitHub.isUseProxy()) {
             Thread.sleep(3000);
         }
         assertNotNull(r.getReadme());
-        getUser().getRepository(name).delete();
+
+        r.delete();
     }
 
     private void cleanupUserRepository(final String name) throws IOException {
@@ -76,8 +102,34 @@ public class AppTest extends AbstractGitHubWireMockTest {
     @Test
     public void testCredentialValid() throws IOException {
         assertTrue(gitHub.isCredentialValid());
-        GitHub connect = GitHub.connect("totally", "bogus");
-        assertFalse(connect.isCredentialValid());
+        assertThat(gitHub.lastRateLimit().getCore(), not(instanceOf(GHRateLimit.UnknownLimitRecord.class)));
+        assertThat(gitHub.lastRateLimit().getCore().getLimit(), equalTo(5000));
+
+        gitHub = getGitHubBuilder().withOAuthToken("bogus", "user")
+                .withEndpoint(mockGitHub.apiServer().baseUrl())
+                .build();
+        assertThat(gitHub.lastRateLimit(), nullValue());
+        assertFalse(gitHub.isCredentialValid());
+        // For invalid credentials, we get a 401 but it includes anonymous rate limit headers
+        assertThat(gitHub.lastRateLimit().getCore(), not(instanceOf(GHRateLimit.UnknownLimitRecord.class)));
+        assertThat(gitHub.lastRateLimit().getCore().getLimit(), equalTo(60));
+    }
+
+    @Test
+    public void testCredentialValidEnterprise() throws IOException {
+        // Simulated GHE: getRateLimit returns 404
+        assertThat(gitHub.lastRateLimit(), nullValue());
+        assertTrue(gitHub.isCredentialValid());
+        // lastRateLimit stays null when 404 is encountered
+        assertThat(gitHub.lastRateLimit(), nullValue());
+
+        gitHub = getGitHubBuilder().withOAuthToken("bogus", "user")
+                .withEndpoint(mockGitHub.apiServer().baseUrl())
+                .build();
+        assertThat(gitHub.lastRateLimit(), nullValue());
+        assertFalse(gitHub.isCredentialValid());
+        // Simulated GHE: For invalid credentials, we get a 401 that does not include ratelimit info
+        assertThat(gitHub.lastRateLimit(), nullValue());
     }
 
     @Test
@@ -146,7 +198,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void testGetIssues() throws Exception {
-        List<GHIssue> closedIssues = gitHub.getOrganization("github-api")
+        List<GHIssue> closedIssues = gitHub.getOrganization("hub4j")
                 .getRepository("github-api")
                 .getIssues(GHIssueState.CLOSED);
         // prior to using PagedIterable GHRepository.getIssues(GHIssueState) would only retrieve 30 issues
@@ -159,7 +211,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void testListIssues() throws IOException {
-        Iterable<GHIssue> closedIssues = gitHub.getOrganization("github-api")
+        Iterable<GHIssue> closedIssues = gitHub.getOrganization("hub4j")
                 .getRepository("github-api")
                 .listIssues(GHIssueState.CLOSED);
 
@@ -234,16 +286,35 @@ public class AppTest extends AbstractGitHubWireMockTest {
         return team.hasMember(gitHub.getMyself());
     }
 
-    @Ignore("Needs mocking check")
     @Test
     public void testShouldFetchTeam() throws Exception {
-        GHOrganization j = gitHub.getOrganization(GITHUB_API_TEST_ORG);
-        GHTeam teamByName = j.getTeams().get("Core Developers");
+        GHOrganization organization = gitHub.getOrganization(GITHUB_API_TEST_ORG);
+        GHTeam teamByName = organization.getTeams().get("Core Developers");
 
-        GHTeam teamById = gitHub.getTeam(teamByName.getId());
+        GHTeam teamById = gitHub.getTeam((int) teamByName.getId());
         assertNotNull(teamById);
 
-        assertEquals(teamByName, teamById);
+        assertEquals(teamByName.getId(), teamById.getId());
+        assertEquals(teamByName.getDescription(), teamById.getDescription());
+    }
+
+    @Test
+    public void testShouldFetchTeamFromOrganization() throws Exception {
+        GHOrganization organization = gitHub.getOrganization(GITHUB_API_TEST_ORG);
+        GHTeam teamByName = organization.getTeams().get("Core Developers");
+
+        GHTeam teamById = organization.getTeam(teamByName.getId());
+        assertNotNull(teamById);
+
+        assertEquals(teamByName.getId(), teamById.getId());
+        assertEquals(teamByName.getDescription(), teamById.getDescription());
+
+        GHTeam teamById2 = organization.getTeam((int) teamByName.getId());
+        assertNotNull(teamById2);
+
+        assertEquals(teamByName.getId(), teamById2.getId());
+        assertEquals(teamByName.getDescription(), teamById2.getDescription());
+
     }
 
     @Ignore("Needs mocking check")
@@ -258,7 +329,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
     @Ignore("Needs mocking check")
     @Test
     public void testFetchPullRequestAsList() throws Exception {
-        GHRepository r = gitHub.getRepository("github-api/github-api");
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
         assertEquals("master", r.getMasterBranch());
         PagedIterable<GHPullRequest> i = r.listPullRequests(GHIssueState.CLOSED);
         List<GHPullRequest> prs = i.toList();
@@ -564,7 +635,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void testCommitStatus() throws Exception {
-        GHRepository r = gitHub.getRepository("github-api/github-api");
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
 
         GHCommitStatus state;
 
@@ -580,10 +651,12 @@ public class AppTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void testCommitShortInfo() throws Exception {
-        GHRepository r = gitHub.getRepository("github-api/github-api");
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
         GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f23");
         assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Kohsuke Kawaguchi");
         assertEquals(commit.getCommitShortInfo().getMessage(), "doc");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.UNSIGNED);
     }
 
     @Ignore("Needs mocking check")
@@ -741,7 +814,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
 
     @Test // issue #99
     public void testReadme() throws IOException {
-        GHContent readme = gitHub.getRepository("github-api-test-org/test-readme").getReadme();
+        GHContent readme = gitHub.getRepository("hub4j-test-org/test-readme").getReadme();
         assertEquals(readme.getName(), "README.md");
         assertEquals(readme.getContent(), "This is a markdown readme.\n");
     }
@@ -749,7 +822,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
     @Ignore("Needs mocking check")
     @Test
     public void testTrees() throws IOException {
-        GHTree masterTree = gitHub.getRepository("github-api/github-api").getTree("master");
+        GHTree masterTree = gitHub.getRepository("hub4j/github-api").getTree("master");
         boolean foundReadme = false;
         for (GHTreeEntry e : masterTree.getTree()) {
             if ("readme".equalsIgnoreCase(e.getPath().replaceAll("\\.md", ""))) {
@@ -762,7 +835,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void testTreesRecursive() throws IOException {
-        GHTree masterTree = gitHub.getRepository("github-api/github-api").getTreeRecursive("master", 1);
+        GHTree masterTree = gitHub.getRepository("hub4j/github-api").getTreeRecursive("master", 1);
         boolean foundThisFile = false;
         for (GHTreeEntry e : masterTree.getTree()) {
             if (e.getPath().endsWith(AppTest.class.getSimpleName() + ".java")) {
@@ -778,10 +851,10 @@ public class AppTest extends AbstractGitHubWireMockTest {
         cleanupLabel("test");
         cleanupLabel("test2");
 
-        GHRepository r = gitHub.getRepository("github-api-test-org/test-labels");
+        GHRepository r = gitHub.getRepository("hub4j-test-org/test-labels");
         List<GHLabel> lst = r.listLabels().toList();
         for (GHLabel l : lst) {
-            // System.out.println(l.getName());
+            assertThat(l.getUrl(), containsString(l.getName().replace(" ", "%20")));
         }
         assertTrue(lst.size() > 5);
         GHLabel e = r.getLabel("enhancement");
@@ -791,9 +864,13 @@ public class AppTest extends AbstractGitHubWireMockTest {
 
         GHLabel t = null;
         GHLabel t2 = null;
+        GHLabel t3 = null;
         try {// CRUD
             t = r.createLabel("test", "123456");
             t2 = r.getLabel("test");
+            assertThat(t, not(sameInstance(t2)));
+            assertThat(t, equalTo(t2));
+
             assertEquals(t.getName(), t2.getName());
             assertEquals(t.getColor(), "123456");
             assertEquals(t.getColor(), t2.getColor());
@@ -801,28 +878,69 @@ public class AppTest extends AbstractGitHubWireMockTest {
             assertEquals(t.getDescription(), t2.getDescription());
             assertEquals(t.getUrl(), t2.getUrl());
 
-            t.setColor("000000");
+            // update works on multiple changes in one call
+            t3 = t.update().color("000000").description("It is dark!").done();
+
+            // instances behave as immutable by default. Update returns a new updated instance.
+            assertThat(t, not(sameInstance(t2)));
+            assertThat(t, equalTo(t2));
+
+            assertThat(t, not(sameInstance(t3)));
+            assertThat(t, not(equalTo(t3)));
 
-            // This is annoying behavior, but it is by design at this time.
-            // Verifying so we can know when it is fixed.
             assertEquals(t.getColor(), "123456");
+            assertEquals(t.getDescription(), "");
+            assertEquals(t3.getColor(), "000000");
+            assertEquals(t3.getDescription(), "It is dark!");
 
+            // Test deprecated methods
+            t.setDescription("Deprecated");
             t = r.getLabel("test");
-            t.setDescription("this is also a test");
 
-            GHLabel t3 = r.getLabel("test");
+            // By using the old instance t when calling setDescription it also sets color to the old value
+            // this is a bad behavior, but it is expected
+            assertEquals(t.getColor(), "123456");
+            assertEquals(t.getDescription(), "Deprecated");
+
+            t.setColor("000000");
+            t = r.getLabel("test");
+            assertEquals(t.getColor(), "000000");
+            assertEquals(t.getDescription(), "Deprecated");
+
+            // set() makes a single change
+            t3 = t.set().description("this is also a test");
+
+            // instances behave as immutable by default. Update returns a new updated instance.
+            assertThat(t, not(sameInstance(t3)));
+            assertThat(t, not(equalTo(t3)));
+
             assertEquals(t3.getColor(), "000000");
             assertEquals(t3.getDescription(), "this is also a test");
+
             t.delete();
+            try {
+                t = r.getLabel("test");
+                fail("Test label should be deleted.");
+            } catch (IOException ex) {
+                assertThat(ex, instanceOf(FileNotFoundException.class));
+            }
 
             t = r.createLabel("test2", "123457", "this is a different test");
             t2 = r.getLabel("test2");
+
             assertEquals(t.getName(), t2.getName());
             assertEquals(t.getColor(), "123457");
             assertEquals(t.getColor(), t2.getColor());
             assertEquals(t.getDescription(), "this is a different test");
             assertEquals(t.getDescription(), t2.getDescription());
             assertEquals(t.getUrl(), t2.getUrl());
+            t.delete();
+
+            // Allow null description
+            t = GHLabel.create(r).name("test2").color("123458").done();
+            assertThat(t.getName(), equalTo("test2"));
+            assertThat(t.getDescription(), is(nullValue()));
+
         } finally {
             cleanupLabel("test");
             cleanupLabel("test2");
@@ -832,7 +950,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
     void cleanupLabel(String name) {
         if (mockGitHub.isUseProxy()) {
             try {
-                GHLabel t = getGitHubBeforeAfter().getRepository("github-api-test-org/test-labels").getLabel("test");
+                GHLabel t = getGitHubBeforeAfter().getRepository("hub4j-test-org/test-labels").getLabel(name);
                 t.delete();
             } catch (IOException e) {
 
@@ -901,7 +1019,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void reactions() throws Exception {
-        GHIssue i = gitHub.getRepository("github-api/github-api").getIssue(311);
+        GHIssue i = gitHub.getRepository("hub4j/github-api").getIssue(311);
 
         List<GHReaction> l;
         // retrieval
@@ -973,7 +1091,7 @@ public class AppTest extends AbstractGitHubWireMockTest {
     public void blob() throws Exception {
         Assume.assumeFalse(SystemUtils.IS_OS_WINDOWS);
 
-        GHRepository r = gitHub.getRepository("github-api/github-api");
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
         String sha1 = "a12243f2fc5b8c2ba47dd677d0b0c7583539584d";
 
         assertBlobContent(r.readBlob(sha1));

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

@@ -5,12 +5,15 @@ import org.junit.Test;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.equalTo;
+import javax.annotation.Nonnull;
+
+import static org.hamcrest.Matchers.*;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -18,26 +21,50 @@ import static org.hamcrest.Matchers.equalTo;
 public class BridgeMethodTest extends Assert {
 
     @Test
-    public void lastStatus() throws IOException {
-        GHObject obj = new GHIssue();
+    public void testBridgeMethods() throws IOException {
 
-        List<Method> createdAtMethods = new ArrayList<>();
-        for (Method method : obj.getClass().getMethods()) {
-            if (method.getName().equalsIgnoreCase("getCreatedAt")) {
-                if (method.getReturnType() == Date.class) {
-                    createdAtMethods.add(0, method);
-                } else {
-                    createdAtMethods.add(method);
-                }
+        // Some would say this is redundant, given that bridge methods are so thin anyway
+        // In the interest of maintaining binary compatibility, we'll do this anyway for a sampling of methods
+
+        // Something odd here
+        // verifyBridgeMethods(new GHCommit(), "getAuthor", GHCommit.GHAuthor.class, GitUser.class);
+        // verifyBridgeMethods(new GHCommit(), "getCommitter", GHCommit.GHAuthor.class, GitUser.class);
+
+        verifyBridgeMethods(GHIssue.class, "getCreatedAt", Date.class, String.class);
+        verifyBridgeMethods(GHIssue.class, "getId", int.class, long.class, String.class);
+        verifyBridgeMethods(GHIssue.class, "getUrl", String.class, URL.class);
+
+        verifyBridgeMethods(GHOrganization.class, "getHtmlUrl", String.class, URL.class);
+        verifyBridgeMethods(GHOrganization.class, "getId", int.class, long.class, String.class);
+        verifyBridgeMethods(GHOrganization.class, "getUrl", String.class, URL.class);
+
+        verifyBridgeMethods(GHRepository.class, "getCollaborators", GHPersonSet.class, Set.class);
+        verifyBridgeMethods(GHRepository.class, "getHtmlUrl", String.class, URL.class);
+        verifyBridgeMethods(GHRepository.class, "getId", int.class, long.class, String.class);
+        verifyBridgeMethods(GHRepository.class, "getUrl", String.class, URL.class);
+
+        verifyBridgeMethods(GHUser.class, "getFollows", GHPersonSet.class, Set.class);
+        verifyBridgeMethods(GHUser.class, "getFollowers", GHPersonSet.class, Set.class);
+        verifyBridgeMethods(GHUser.class, "getOrganizations", GHPersonSet.class, Set.class);
+        verifyBridgeMethods(GHUser.class, "getId", int.class, long.class, String.class);
+
+        verifyBridgeMethods(GHTeam.class, "getId", int.class, long.class, String.class);
+
+        // verifyBridgeMethods(GitHub.class, "getMyself", GHMyself.class, GHUser.class);
+
+    }
+
+    void verifyBridgeMethods(@Nonnull Class<?> targetClass, @Nonnull String methodName, Class<?>... returnTypes) {
+        List<Class<?>> foundMethods = new ArrayList<>();
+        Method[] methods = targetClass.getMethods();
+        for (Method method : methods) {
+            if (method.getName().equalsIgnoreCase(methodName)) {
+                // Bridge methods are only
+                assertThat(method.getParameterCount(), equalTo(0));
+                foundMethods.add(method.getReturnType());
             }
         }
 
-        assertThat(createdAtMethods.size(), equalTo(2));
-
-        assertThat(createdAtMethods.get(0).getParameterCount(), equalTo(0));
-        assertThat(createdAtMethods.get(1).getParameterCount(), equalTo(0));
-
-        assertThat(createdAtMethods.get(0).getReturnType(), is(Date.class));
-        assertThat(createdAtMethods.get(1).getReturnType(), is(String.class));
+        assertThat(foundMethods, containsInAnyOrder(returnTypes));
     }
 }

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

@@ -24,4 +24,21 @@ public class CommitTest extends AbstractGitHubWireMockTest {
             assertEquals(expected.getFiles().size(), commit.getFiles().size());
         }
     }
+
+    @Test // issue 737
+    public void commitSignatureVerification() throws Exception {
+        GHRepository repo = gitHub.getRepository("stapler/stapler");
+        PagedIterable<GHCommit> commits = repo.queryCommits().path("pom.xml").list();
+        for (GHCommit commit : Iterables.limit(commits, 10)) {
+            GHCommit expected = repo.getCommit(commit.getSHA1());
+            assertEquals(expected.getCommitShortInfo().getVerification().isVerified(),
+                    commit.getCommitShortInfo().getVerification().isVerified());
+            assertEquals(expected.getCommitShortInfo().getVerification().getReason(),
+                    commit.getCommitShortInfo().getVerification().getReason());
+            assertEquals(expected.getCommitShortInfo().getVerification().getSignature(),
+                    commit.getCommitShortInfo().getVerification().getSignature());
+            assertEquals(expected.getCommitShortInfo().getVerification().getPayload(),
+                    commit.getCommitShortInfo().getVerification().getPayload());
+        }
+    }
 }

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

@@ -28,8 +28,8 @@ public class GHAppTest extends AbstractGitHubWireMockTest {
     @Test
     public void getGitHubApp() throws IOException {
         GHApp app = gitHub.getApp();
-        assertThat(app.id, is((long) 11111));
-        assertThat(app.getOwner().id, is((long) 111111111));
+        assertThat(app.getId(), is((long) 11111));
+        assertThat(app.getOwner().getId(), is((long) 111111111));
         assertThat(app.getOwner().login, is("bogus"));
         assertThat(app.getName(), is("Bogus-Development"));
         assertThat(app.getDescription(), is(""));
@@ -132,8 +132,8 @@ public class GHAppTest extends AbstractGitHubWireMockTest {
         Map<String, GHPermissionType> appPermissions = appInstallation.getPermissions();
         GHUser appAccount = appInstallation.getAccount();
 
-        assertThat(appInstallation.id, is((long) 11111111));
-        assertThat(appAccount.id, is((long) 111111111));
+        assertThat(appInstallation.getId(), is((long) 11111111));
+        assertThat(appAccount.getId(), is((long) 111111111));
         assertThat(appAccount.login, is("bogus"));
         assertThat(appInstallation.getRepositorySelection(), is(GHRepositorySelection.SELECTED));
         assertThat(appInstallation.getAccessTokenUrl(), endsWith("/app/installations/11111111/access_tokens"));

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

@@ -54,6 +54,14 @@ public class GHBranchProtectionTest extends AbstractGitHubWireMockTest {
         assertTrue(repo.getBranch(BRANCH).isProtected());
     }
 
+    @Test
+    public void testDisableProtectionOnly() throws Exception {
+        GHBranchProtection protection = branch.enableProtection().enable();
+        assertTrue(repo.getBranch(BRANCH).isProtected());
+        branch.disableProtection();
+        assertFalse(repo.getBranch(BRANCH).isProtected());
+    }
+
     @Test
     public void testEnableRequireReviewsOnly() throws Exception {
         GHBranchProtection protection = branch.enableProtection().requireReviews().enable();
@@ -73,4 +81,12 @@ public class GHBranchProtectionTest extends AbstractGitHubWireMockTest {
         protection.disableSignedCommits();
         assertFalse(protection.getRequiredSignatures());
     }
+
+    @Test
+    public void testGetProtection() throws Exception {
+        GHBranchProtection protection = branch.enableProtection().enable();
+        GHBranchProtection protectionTest = repo.getBranch(BRANCH).getProtection();
+        assertTrue(protectionTest instanceof GHBranchProtection);
+        assertTrue(repo.getBranch(BRANCH).isProtected());
+    }
 }

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

@@ -0,0 +1,117 @@
+/*
+ * 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 org.junit.Test;
+
+import java.util.Date;
+
+import static org.hamcrest.Matchers.containsString;
+
+@SuppressWarnings("deprecation") // preview
+public class GHCheckRunBuilderTest extends AbstractGitHubWireMockTest {
+
+    @Test
+    public void createCheckRun() throws Exception {
+        GHCheckRun checkRun = gitHub.getRepository("jglick/github-api-test")
+                .createCheckRun("foo", "4a929d464a2fae7ee899ce603250f7dab304bc4b")
+                .withStatus(GHCheckRun.Status.COMPLETED)
+                .withConclusion(GHCheckRun.Conclusion.SUCCESS)
+                .withDetailsURL("http://nowhere.net/stuff")
+                .withExternalID("whatever")
+                .withStartedAt(new Date(999_999_000))
+                .withCompletedAt(new Date(999_999_999))
+                .add(new GHCheckRunBuilder.Output("Some Title", "what happened…")
+                        .add(new GHCheckRunBuilder.Annotation("stuff.txt",
+                                1,
+                                GHCheckRun.AnnotationLevel.NOTICE,
+                                "hello to you too").withTitle("Look here"))
+                        .add(new GHCheckRunBuilder.Image("Unikitty",
+                                "https://i.pinimg.com/474x/9e/65/c0/9e65c0972294f1e10f648c9780a79fab.jpg")
+                                        .withCaption("Princess Unikitty")))
+                .add(new GHCheckRunBuilder.Action("Help", "what I need help with", "doit"))
+                .create();
+        assertEquals("completed", checkRun.getStatus());
+        assertEquals(1, checkRun.getOutput().getAnnotationsCount());
+        assertEquals(546384586, checkRun.getId());
+    }
+
+    @Test
+    public void createCheckRunManyAnnotations() throws Exception {
+        GHCheckRunBuilder.Output output = new GHCheckRunBuilder.Output("Big Run", "Lots of stuff here »");
+        for (int i = 0; i < 101; i++) {
+            output.add(
+                    new GHCheckRunBuilder.Annotation("stuff.txt", 1, GHCheckRun.AnnotationLevel.NOTICE, "hello #" + i));
+        }
+        GHCheckRun checkRun = gitHub.getRepository("jglick/github-api-test")
+                .createCheckRun("big", "4a929d464a2fae7ee899ce603250f7dab304bc4b")
+                .withConclusion(GHCheckRun.Conclusion.SUCCESS)
+                .add(output)
+                .create();
+        assertEquals("completed", checkRun.getStatus());
+        assertEquals("Big Run", checkRun.getOutput().getTitle());
+        assertEquals("Lots of stuff here »", checkRun.getOutput().getSummary());
+        assertEquals(101, checkRun.getOutput().getAnnotationsCount());
+        assertEquals(546384622, checkRun.getId());
+    }
+
+    @Test
+    public void createCheckRunNoAnnotations() throws Exception {
+        GHCheckRun checkRun = gitHub.getRepository("jglick/github-api-test")
+                .createCheckRun("quick", "4a929d464a2fae7ee899ce603250f7dab304bc4b")
+                .withConclusion(GHCheckRun.Conclusion.NEUTRAL)
+                .add(new GHCheckRunBuilder.Output("Quick note", "nothing more to see here"))
+                .create();
+        assertEquals("completed", checkRun.getStatus());
+        assertEquals(0, checkRun.getOutput().getAnnotationsCount());
+        assertEquals(546384705, checkRun.getId());
+    }
+
+    @Test
+    public void createPendingCheckRun() throws Exception {
+        GHCheckRun checkRun = gitHub.getRepository("jglick/github-api-test")
+                .createCheckRun("outstanding", "4a929d464a2fae7ee899ce603250f7dab304bc4b")
+                .withStatus(GHCheckRun.Status.IN_PROGRESS)
+                .create();
+        assertEquals("in_progress", checkRun.getStatus());
+        assertNull(checkRun.getConclusion());
+        assertEquals(546469053, checkRun.getId());
+    }
+
+    @Test
+    public void createCheckRunErrMissingConclusion() throws Exception {
+        try {
+            gitHub.getRepository("jglick/github-api-test")
+                    .createCheckRun("outstanding", "4a929d464a2fae7ee899ce603250f7dab304bc4b")
+                    .withStatus(GHCheckRun.Status.COMPLETED)
+                    .create();
+            fail("should have been rejected");
+        } catch (HttpException x) {
+            assertEquals(422, x.getResponseCode());
+            assertThat(x.getMessage(), containsString("\\\"conclusion\\\" wasn't supplied"));
+        }
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import org.apache.commons.io.IOUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -7,6 +8,7 @@ import org.junit.Test;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.*;
@@ -26,7 +28,7 @@ public class GHContentIntegrationTest extends AbstractGitHubWireMockTest {
     @After
     public void cleanup() throws Exception {
         if (mockGitHub.isUseProxy()) {
-            repo = getGitHubBeforeAfter().getRepository("github-api-test-org/GHContentIntegrationTest");
+            repo = getGitHubBeforeAfter().getRepository("hub4j-test-org/GHContentIntegrationTest");
             try {
                 GHContent content = repo.getFileContent(createdFilename);
                 if (content != null) {
@@ -39,12 +41,12 @@ public class GHContentIntegrationTest extends AbstractGitHubWireMockTest {
 
     @Before
     public void setUp() throws Exception {
-        repo = gitHub.getRepository("github-api-test-org/GHContentIntegrationTest");
+        repo = gitHub.getRepository("hub4j-test-org/GHContentIntegrationTest");
     }
 
     @Test
     public void testGetFileContent() throws Exception {
-        repo = gitHub.getRepository("github-api-test-org/GHContentIntegrationTest");
+        repo = gitHub.getRepository("hub4j-test-org/GHContentIntegrationTest");
         GHContent content = repo.getFileContent("ghcontent-ro/a-file-with-content");
 
         assertTrue(content.isFile());
@@ -123,7 +125,7 @@ public class GHContentIntegrationTest extends AbstractGitHubWireMockTest {
         } catch (GHFileNotFoundException e) {
             assertThat(e.getMessage(),
                     endsWith(
-                            "/repos/github-api-test-org/GHContentIntegrationTest/contents/test+directory%20%2350/test%20file-to+create-%231.txt {\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/repos/contents/#get-contents\"}"));
+                            "/repos/hub4j-test-org/GHContentIntegrationTest/contents/test+directory%20%2350/test%20file-to+create-%231.txt {\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/repos/contents/#get-contents\"}"));
         }
     }
 
@@ -158,4 +160,14 @@ public class GHContentIntegrationTest extends AbstractGitHubWireMockTest {
                 + "123456789012345678901234567890123456789012345678901234567890");
         ghContentBuilder.commit();
     }
+
+    @Test
+    public void testGetFileContentWithNonAsciiPath() throws Exception {
+        final GHRepository repo = gitHub.getRepository("hub4j-test-org/GHContentIntegrationTest");
+        final GHContent fileContent = repo.getFileContent("ghcontent-ro/a-file-with-\u00F6");
+        assertThat(IOUtils.readLines(fileContent.read(), StandardCharsets.UTF_8), hasItems("test"));
+
+        final GHContent fileContent2 = repo.getFileContent(fileContent.getPath());
+        assertThat(IOUtils.readLines(fileContent2.read(), StandardCharsets.UTF_8), hasItems("test"));
+    }
 }

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

@@ -21,6 +21,6 @@ public class GHDeploymentTest extends AbstractGitHubWireMockTest {
     }
 
     private GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 }

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

@@ -4,17 +4,20 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.TimeZone;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
 
-public class GHEventPayloadTest {
+public class GHEventPayloadTest extends AbstractGitHubWireMockTest {
 
     @Rule
     public final PayloadRule payload = new PayloadRule(".json");
 
+    public GHEventPayloadTest() {
+        useDefaultGitHub = false;
+    }
+
     @Test
     public void commit_comment() throws Exception {
         GHEventPayload.CommitComment event = GitHub.offline()
@@ -282,6 +285,70 @@ public class GHEventPayloadTest {
         assertThat(event.getSender().getLogin(), is("baxterthehacker"));
     }
 
+    @Test
+    @Payload("push.fork")
+    public void pushToFork() throws Exception {
+        gitHub = getGitHubBuilder().withEndpoint(mockGitHub.apiServer().baseUrl()).build();
+
+        GHEventPayload.Push event = GitHub.offline().parseEventPayload(payload.asReader(), GHEventPayload.Push.class);
+        assertThat(event.getRef(), is("refs/heads/changes"));
+        assertThat(event.getBefore(), is("85c44b352958bf6d81b74ab8b21920f1d313a287"));
+        assertThat(event.getHead(), is("1393706f1364742defbc28ba459082630ca979af"));
+        assertThat(event.isCreated(), is(false));
+        assertThat(event.isDeleted(), is(false));
+        assertThat(event.isForced(), is(false));
+        assertThat(event.getCommits().size(), is(1));
+        assertThat(event.getCommits().get(0).getSha(), is("1393706f1364742defbc28ba459082630ca979af"));
+        assertThat(event.getCommits().get(0).getAuthor().getEmail(), is("bitwiseman@gmail.com"));
+        assertThat(event.getCommits().get(0).getCommitter().getEmail(), is("bitwiseman@gmail.com"));
+        assertThat(event.getCommits().get(0).getAdded().size(), is(6));
+        assertThat(event.getCommits().get(0).getRemoved().size(), is(0));
+        assertThat(event.getCommits().get(0).getModified().size(), is(2));
+        assertThat(event.getCommits().get(0).getModified().get(0),
+                is("src/main/java/org/kohsuke/github/GHLicense.java"));
+        assertThat(event.getRepository().getName(), is("github-api"));
+        assertThat(event.getRepository().getOwnerName(), is("hub4j-test-org"));
+        assertThat(event.getRepository().getUrl().toExternalForm(), is("https://github.com/hub4j-test-org/github-api"));
+        assertThat(event.getPusher().getName(), is("bitwiseman"));
+        assertThat(event.getPusher().getEmail(), is("bitwiseman@gmail.com"));
+        assertThat(event.getSender().getLogin(), is("bitwiseman"));
+
+        assertThat(event.getRepository().isFork(), is(true));
+
+        // in offliine mode, we should not populate missing fields
+        assertThat(event.getRepository().getSource(), is(nullValue()));
+        assertThat(event.getRepository().getParent(), is(nullValue()));
+
+        assertThat(event.getRepository().getUrl().toString(), is("https://github.com/hub4j-test-org/github-api"));
+        assertThat(event.getRepository().getHttpTransportUrl().toString(),
+                is("https://github.com/hub4j-test-org/github-api.git"));
+
+        // Test repository populate
+        event = gitHub.parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), GHEventPayload.Push.class);
+        assertThat(event.getRepository().getUrl().toString(), is("https://github.com/hub4j-test-org/github-api"));
+        assertThat(event.getRepository().getHttpTransportUrl(), is("https://github.com/hub4j-test-org/github-api.git"));
+
+        event.getRepository().populate();
+
+        // After populate the url is fixed to point to the correct API endpoint
+        assertThat(event.getRepository().getUrl().toString(),
+                is(mockGitHub.apiServer().baseUrl() + "/repos/hub4j-test-org/github-api"));
+        assertThat(event.getRepository().getHttpTransportUrl(), is("https://github.com/hub4j-test-org/github-api.git"));
+
+        // ensure that root has been bound after populate
+        event.getRepository().getSource().getRef("heads/master");
+        event.getRepository().getParent().getRef("heads/master");
+
+        // Source
+        event = gitHub.parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), GHEventPayload.Push.class);
+        assertThat(event.getRepository().getSource().getFullName(), is("hub4j/github-api"));
+
+        // Parent
+        event = gitHub.parseEventPayload(payload.asReader(mockGitHub::mapToMockGitHub), GHEventPayload.Push.class);
+        assertThat(event.getRepository().getParent().getFullName(), is("hub4j/github-api"));
+
+    }
+
     // TODO implement support classes and write test
     // @Test
     // public void release() throws Exception {}
@@ -392,4 +459,43 @@ public class GHEventPayloadTest {
         assertThat(checkSuite.getApp().getId(), is(29310L));
     }
 
+    @Test
+    @Payload("installation_repositories")
+    public void InstallationRepositoriesEvent() throws Exception {
+        GHEventPayload.InstallationRepositories event = GitHub.offline()
+                .parseEventPayload(payload.asReader(), GHEventPayload.InstallationRepositories.class);
+
+        assertThat(event.getAction(), is("added"));
+        assertThat(event.getInstallation().getId(), is(957387L));
+        assertThat(event.getInstallation().getAccount().getLogin(), is("Codertocat"));
+        assertThat(event.getRepositorySelection(), is("selected"));
+
+        assertThat(event.getRepositoriesAdded().get(0).getId(), is(186853007L));
+        assertThat(event.getRepositoriesAdded().get(0).getNodeId(), is("MDEwOlJlcG9zaXRvcnkxODY4NTMwMDc="));
+        assertThat(event.getRepositoriesAdded().get(0).getName(), is("Space"));
+        assertThat(event.getRepositoriesAdded().get(0).getFullName(), is("Codertocat/Space"));
+        assertThat(event.getRepositoriesAdded().get(0).isPrivate(), is(false));
+
+        assertThat(event.getRepositoriesRemoved(), is(Collections.emptyList()));
+        assertThat(event.getSender().getLogin(), is("Codertocat"));
+    }
+
+    @Test
+    @Payload("installation")
+    public void InstallationEvent() throws Exception {
+        GHEventPayload.Installation event = GitHub.offline()
+                .parseEventPayload(payload.asReader(), GHEventPayload.Installation.class);
+
+        assertThat(event.getAction(), is("deleted"));
+        assertThat(event.getInstallation().getId(), is(2L));
+        assertThat(event.getInstallation().getAccount().getLogin(), is("octocat"));
+
+        assertThat(event.getRepositories().get(0).getId(), is(1296269L));
+        assertThat(event.getRepositories().get(0).getNodeId(), is("MDEwOlJlcG9zaXRvcnkxODY4NTMwMDc="));
+        assertThat(event.getRepositories().get(0).getName(), is("Hello-World"));
+        assertThat(event.getRepositories().get(0).getFullName(), is("octocat/Hello-World"));
+        assertThat(event.getRepositories().get(0).isPrivate(), is(false));
+
+        assertThat(event.getSender().getLogin(), is("octocat"));
+    }
 }

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

@@ -2,7 +2,9 @@ package org.kohsuke.github;
 
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.notNullValue;
+import java.io.FileNotFoundException;
+
+import static org.hamcrest.Matchers.*;
 import static org.hamcrest.core.Is.is;
 
 /**
@@ -17,9 +19,12 @@ public class GHGistTest extends AbstractGitHubWireMockTest {
                 .description("Test Gist")
                 .file("abc.txt", "abc")
                 .file("def.txt", "def")
+                .file("ghi.txt", "ghi")
                 .create();
 
         assertThat(gist.getCreatedAt(), is(notNullValue()));
+        assertThat(gist.getDescription(), equalTo("Test Gist"));
+        assertThat(gist.getFiles().size(), equalTo(3));
 
         assertNotNull(gist.getUpdatedAt());
         assertNotNull(gist.getCommentsUrl());
@@ -28,7 +33,66 @@ public class GHGistTest extends AbstractGitHubWireMockTest {
         assertNotNull(gist.getGitPushUrl());
         assertNotNull(gist.getHtmlUrl());
 
+        String id = gist.getGistId();
+
+        GHGist gistUpdate = gitHub.getGist(id);
+        assertThat(gistUpdate.getGistId(), equalTo(gist.getGistId()));
+        assertThat(gistUpdate.getDescription(), equalTo(gist.getDescription()));
+        assertThat(gistUpdate.getFiles().size(), equalTo(3));
+
+        gistUpdate = gistUpdate.update().description("Gist Test").addFile("jkl.txt", "jkl").update();
+
+        assertThat(gistUpdate.getGistId(), equalTo(gist.getGistId()));
+        assertThat(gistUpdate.getDescription(), equalTo("Gist Test"));
+        assertThat(gistUpdate.getFiles().size(), equalTo(4));
+
+        gistUpdate = gistUpdate.update()
+                .renameFile("abc.txt", "ab.txt")
+                .deleteFile("def.txt")
+                .updateFile("ghi.txt", "gh")
+                .updateFile("jkl.txt", "klm.txt", "nop")
+                .update();
+
+        assertThat(gistUpdate.getGistId(), equalTo(gist.getGistId()));
+        assertThat(gistUpdate.getDescription(), equalTo("Gist Test"));
+        assertThat(gistUpdate.getFiles().size(), equalTo(3));
+
+        // verify delete works
+        assertThat(gistUpdate.getFile("def.txt"), nullValue());
+
+        // verify rename
+        assertThat(gistUpdate.getFile("ab.txt").getContent(), equalTo("abc"));
+
+        // verify updates
+        assertThat(gistUpdate.getFile("ghi.txt").getContent(), equalTo("gh"));
+        assertThat(gistUpdate.getFile("klm.txt").getContent(), equalTo("nop"));
+
+        // rename and update on the same file in one update shoudl work.
+        gistUpdate = gistUpdate.update().renameFile("ab.txt", "a.txt").updateFile("ab.txt", "abcd").update();
+
+        assertThat(gistUpdate.getGistId(), equalTo(gist.getGistId()));
+        assertThat(gistUpdate.getFiles().size(), equalTo(3));
+
+        // verify rename and update
+        assertThat(gistUpdate.getFile("a.txt").getContent(), equalTo("abcd"));
+
+        try {
+            gist.getId();
+            fail("Newly created gists do not have numeric ids.");
+        } catch (NumberFormatException e) {
+            assertThat(e, notNullValue());
+        }
+
+        assertThat(gist.getGistId(), notNullValue());
+
         gist.delete();
+
+        try {
+            gitHub.getGist(id);
+            fail("Gist should be deleted.");
+        } catch (FileNotFoundException e) {
+            assertThat(e, notNullValue());
+        }
     }
 
     @Test
@@ -63,6 +127,8 @@ public class GHGistTest extends AbstractGitHubWireMockTest {
         GHGist gist = gitHub.getGist("9903708");
 
         assertTrue(gist.isPublic());
+        assertThat(gist.getId(), equalTo(9903708L));
+        assertThat(gist.getGistId(), equalTo("9903708"));
 
         assertEquals(1, gist.getFiles().size());
         GHGistFile f = gist.getFile("keybase.md");

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

@@ -0,0 +1,61 @@
+package org.kohsuke.github;
+
+import org.jetbrains.annotations.NotNull;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.StreamSupport;
+
+import static java.util.Arrays.asList;
+import static java.util.stream.Collectors.toList;
+import static org.hamcrest.Matchers.hasSize;
+
+public class GHIssueEventAttributeTest extends AbstractGitHubWireMockTest {
+
+    private enum Type implements Predicate<GHIssueEvent>, Consumer<GHIssueEvent> {
+        milestone(e -> assertNotNull(e.getMilestone()), "milestoned", "demilestoned"),
+        label(e -> assertNotNull(e.getLabel()), "labeled", "unlabeled"),
+        assignment(e -> assertNotNull(e.getAssignee()), "assigned", "unassigned");
+
+        private final Consumer<GHIssueEvent> assertion;
+        private final Set<String> subtypes;
+
+        Type(final Consumer<GHIssueEvent> assertion, final String... subtypes) {
+            this.assertion = assertion;
+            this.subtypes = new HashSet<>(asList(subtypes));
+        }
+
+        @Override
+        public boolean test(final GHIssueEvent event) {
+            return this.subtypes.contains(event.getEvent());
+        }
+
+        @Override
+        public void accept(final GHIssueEvent event) {
+            this.assertion.accept(event);
+        }
+    }
+
+    @NotNull
+    private List<GHIssueEvent> listEvents(final Type type) throws IOException {
+        return StreamSupport
+                .stream(gitHub.getRepository("chids/project-milestone-test").getIssue(1).listEvents().spliterator(),
+                        false)
+                .filter(type)
+                .collect(toList());
+    }
+
+    @Test
+    public void testEventSpecificAttributes() throws IOException {
+        for (Type type : Type.values()) {
+            final List<GHIssueEvent> events = listEvents(type);
+            assertThat(events, hasSize(2));
+            events.forEach(type);
+        }
+    }
+}

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

@@ -56,6 +56,6 @@ public class GHIssueEventTest extends AbstractGitHubWireMockTest {
     }
 
     private GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 }

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

@@ -30,6 +30,8 @@ import org.junit.Test;
 import java.io.IOException;
 import java.net.URL;
 
+import static org.hamcrest.Matchers.*;
+
 /**
  * @author Duncan Dickinson
  */
@@ -91,7 +93,7 @@ public class GHLicenseTest extends AbstractGitHubWireMockTest {
      */
     @Test
     public void checkRepositoryLicense() throws IOException {
-        GHRepository repo = gitHub.getRepository("github-api/github-api");
+        GHRepository repo = gitHub.getRepository("hub4j/github-api");
         GHLicense license = repo.getLicense();
         assertNotNull("The license is populated", license);
         assertTrue("The key is correct", license.getKey().equals("mit"));
@@ -157,7 +159,7 @@ public class GHLicenseTest extends AbstractGitHubWireMockTest {
      */
     @Test
     public void checkRepositoryFullLicense() throws IOException {
-        GHRepository repo = gitHub.getRepository("github-api/github-api");
+        GHRepository repo = gitHub.getRepository("hub4j/github-api");
         GHLicense license = repo.getLicense();
         assertNotNull("The license is populated", license);
         assertTrue("The key is correct", license.getKey().equals("mit"));
@@ -190,4 +192,21 @@ public class GHLicenseTest extends AbstractGitHubWireMockTest {
             fail("Expected the license to be Base64 encoded but instead it was " + content.getEncoding());
         }
     }
+
+    /**
+     * Accesses the 'bndtools/bnd' repo using {@link GitHub#getRepository(String)} and then calls
+     * {@link GHRepository#getLicense()}. The description is null due to multiple licences
+     *
+     * @throws IOException
+     *             if test fails
+     */
+    @Test
+    public void checkRepositoryLicenseForIndeterminate() throws IOException {
+        GHRepository repo = gitHub.getRepository("bndtools/bnd");
+        GHLicense license = repo.getLicense();
+        assertNotNull("The license is populated", license);
+        assertThat(license.getKey(), equalTo("other"));
+        assertThat(license.getDescription(), is(nullValue()));
+        assertThat(license.getUrl(), is(nullValue()));
+    }
 }

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

@@ -7,8 +7,6 @@ import org.junit.Test;
 import java.io.IOException;
 import java.util.Date;
 
-import static org.junit.Assert.assertEquals;
-
 /**
  * @author Martin van Zijl
  */
@@ -23,7 +21,8 @@ public class GHMilestoneTest extends AbstractGitHubWireMockTest {
         }
 
         for (GHMilestone milestone : getRepository(getGitHubBeforeAfter()).listMilestones(GHIssueState.ALL)) {
-            if ("Original Title".equals(milestone.getTitle()) || "Updated Title".equals(milestone.getTitle())) {
+            if ("Original Title".equals(milestone.getTitle()) || "Updated Title".equals(milestone.getTitle())
+                    || "Unset Test Milestone".equals(milestone.getTitle())) {
                 milestone.delete();
             }
         }
@@ -54,11 +53,28 @@ public class GHMilestoneTest extends AbstractGitHubWireMockTest {
         assertEquals(OUTPUT_DUE_DATE, milestone.getDueOn());
     }
 
+    @Test
+    public void testUnsetMilestone() throws IOException {
+        GHRepository repo = getRepository();
+        GHMilestone milestone = repo.createMilestone("Unset Test Milestone", "For testUnsetMilestone");
+        GHIssue issue = repo.createIssue("Issue for testUnsetMilestone").create();
+
+        // set the milestone
+        issue.setMilestone(milestone);
+        issue = repo.getIssue(issue.getNumber()); // force reload
+        assertEquals(milestone.getNumber(), issue.getMilestone().getNumber());
+
+        // remove the milestone
+        issue.setMilestone(null);
+        issue = repo.getIssue(issue.getNumber()); // force reload
+        assertEquals(null, issue.getMilestone());
+    }
+
     protected GHRepository getRepository() throws IOException {
         return getRepository(gitHub);
     }
 
     private GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 }

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

@@ -11,7 +11,7 @@ public class GHObjectTest extends org.kohsuke.github.AbstractGitHubWireMockTest
         GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
         assertThat(org.toString(),
                 containsString(
-                        "login=github-api-test-org,location=<null>,blog=<null>,email=<null>,name=<null>,company=<null>,type=Organization,followers=0,following=0"));
+                        "login=hub4j-test-org,location=<null>,blog=<null>,email=<null>,name=<null>,company=<null>,type=Organization,followers=0,following=0"));
 
         // getResponseHeaderFields is deprecated but we should not break it.
         assertThat(org.getResponseHeaderFields(), notNullValue());

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

@@ -28,6 +28,6 @@ public class GHPersonTest extends AbstractGitHubWireMockTest {
     }
 
     private GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 }

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

@@ -5,6 +5,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -119,6 +120,11 @@ public class GHPullRequestTest extends AbstractGitHubWireMockTest {
         GHPullRequestReviewComment comment = comments.get(0);
         assertEquals("Sample review comment", comment.getBody());
 
+        // Assert htmlUrl is not null
+        assertNotNull(comment.getHtmlUrl());
+        assertEquals(new URL("https://github.com/hub4j-test-org/github-api/pull/266#discussion_r321995146"),
+                comment.getHtmlUrl());
+
         comment.update("Updated review comment");
         comments = p.listReviewComments().toList();
         assertEquals(1, comments.size());
@@ -150,7 +156,7 @@ public class GHPullRequestTest extends AbstractGitHubWireMockTest {
         // System.out.println(p.getUrl());
         assertTrue(p.getRequestedReviewers().isEmpty());
 
-        GHOrganization testOrg = gitHub.getOrganization("github-api-test-org");
+        GHOrganization testOrg = gitHub.getOrganization("hub4j-test-org");
         GHTeam testTeam = testOrg.getTeamBySlug("dummy-team");
 
         p.requestTeamReviewers(Collections.singletonList(testTeam));
@@ -252,7 +258,7 @@ public class GHPullRequestTest extends AbstractGitHubWireMockTest {
         // Query by one of the heads and make sure we only get that branch's PR back.
         List<GHPullRequest> prs = repo.queryPullRequests()
                 .state(GHIssueState.OPEN)
-                .head("github-api-test-org:test/stable")
+                .head("hub4j-test-org:test/stable")
                 .base("master")
                 .list()
                 .toList();
@@ -323,6 +329,6 @@ public class GHPullRequestTest extends AbstractGitHubWireMockTest {
     }
 
     private GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 }

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

@@ -10,7 +10,7 @@ import java.io.IOException;
 import java.time.Duration;
 import java.util.Date;
 
-import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.*;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 
 /**
@@ -74,7 +74,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         GHRateLimit headerRateLimit = rateLimit;
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // ratelimit() uses headerRateLimit if available and headerRateLimit is not expired
         assertThat(gitHub.rateLimit(), equalTo(headerRateLimit));
@@ -82,7 +82,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         assertThat(mockGitHub.getRequestCount(), equalTo(1));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // Always requests new info
         rateLimit = gitHub.getRateLimit();
@@ -96,7 +96,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         previousLimit = rateLimit;
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // Always requests new info
         rateLimit = gitHub.getRateLimit();
@@ -163,16 +163,20 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
     }
 
     private void verifyRateLimitValues(GHRateLimit previousLimit, int remaining, boolean changedResetDate) {
-        // newer or unchange
-        int resetComparisionValue = changedResetDate ? 1 : 0;
-
         // Basic checks of values
         assertThat(rateLimit, notNullValue());
         assertThat(rateLimit.getLimit(), equalTo(previousLimit.getLimit()));
         assertThat(rateLimit.getRemaining(), equalTo(remaining));
 
         // Check that the reset date of the current limit is not older than the previous one
-        assertThat(rateLimit.getResetDate().compareTo(previousLimit.getResetDate()), equalTo(resetComparisionValue));
+        long diffMillis = rateLimit.getResetDate().getTime() - previousLimit.getResetDate().getTime();
+
+        assertThat(diffMillis, greaterThanOrEqualTo(0L));
+        if (changedResetDate) {
+            assertThat(diffMillis, greaterThan(1000L));
+        } else {
+            assertThat(diffMillis, lessThanOrEqualTo(1000L));
+        }
 
         // Additional checks for record values
         assertThat(rateLimit.getCore().getLimit(), equalTo(rateLimit.getLimit()));
@@ -196,7 +200,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         Date lastReset = new Date(System.currentTimeMillis() / 1000L);
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // -------------------------------------------------------------
         // Before any queries, rate limit starts as null but may be requested
@@ -220,10 +224,11 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         assertThat(mockGitHub.getRequestCount(), equalTo(1));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // -------------------------------------------------------------
-        // First call to /user gets response without rate limit information
+        // Some versions of GHE include header rate limit information, some do not
+        // This response mocks the behavior without header rate limit information
         gitHub = GitHub.connectToEnterprise(mockGitHub.apiServer().baseUrl(), "bogus", "bogus");
         gitHub.getMyself();
         assertThat(mockGitHub.getRequestCount(), equalTo(2));
@@ -240,8 +245,12 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         assertThat(mockGitHub.getRequestCount(), equalTo(3));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
+        // -------------------------------------------------------------
+        // GHE returns 404 from /rate_limit
+        // Some versions of GHE include header rate limit information, some do not
+        // This response mocks the behavior without header rate limit information
         // Always requests new info
         rateLimit = gitHub.getRateLimit();
         assertThat(mockGitHub.getRequestCount(), equalTo(4));
@@ -252,22 +261,23 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(1));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // last is still null, because it actually means lastHeaderRateLimit
         assertThat(gitHub.lastRateLimit(), CoreMatchers.nullValue());
 
         // ratelimit() tries not to make additional requests, uses queried rate limit since header not available
-        Thread.sleep(1000);
+        Thread.sleep(1500);
         assertThat(gitHub.rateLimit(), sameInstance(rateLimit));
 
         // -------------------------------------------------------------
-        // Second call to /user gets response with rate limit information
+        // Some versions of GHE include header rate limit information, some do not
+        // This response mocks the behavior with header rate limit information
         gitHub = GitHub.connectToEnterprise(mockGitHub.apiServer().baseUrl(), "bogus", "bogus");
         gitHub.getMyself();
         assertThat(mockGitHub.getRequestCount(), equalTo(5));
 
-        // Since we already had rate limit info these don't request again
+        // Since just got rate limit from header, these don't request again
         rateLimit = gitHub.lastRateLimit();
         assertThat(rateLimit, notNullValue());
         assertThat(rateLimit.getLimit(), equalTo(5000));
@@ -279,7 +289,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         GHRateLimit headerRateLimit = rateLimit;
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // ratelimit() uses headerRateLimit if available and headerRateLimit is not expired
         assertThat(gitHub.rateLimit(), sameInstance(headerRateLimit));
@@ -287,24 +297,37 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         assertThat(mockGitHub.getRequestCount(), equalTo(5));
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
+        // -------------------------------------------------------------
+        // GHE returns 404 from /rate_limit
+        // Some versions of GHE include header rate limit information, some do not
+        // This response mocks the behavior with header rate limit information
+        // Mocks that other requests come in since previous call
         // Always requests new info
         rateLimit = gitHub.getRateLimit();
         assertThat(mockGitHub.getRequestCount(), equalTo(6));
 
-        assertThat(rateLimit.getCore(), instanceOf(GHRateLimit.UnknownLimitRecord.class));
-        assertThat(rateLimit.getLimit(), equalTo(GHRateLimit.UnknownLimitRecord.unknownLimit));
-        assertThat(rateLimit.getRemaining(), equalTo(GHRateLimit.UnknownLimitRecord.unknownRemaining));
-        assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(1));
+        // getRateLimit() uses headerRateLimit if /rate_limit returns a 404
+        // and headerRateLimit is available and not expired
+        assertThat(rateLimit, notNullValue());
+        assertThat(rateLimit.getLimit(), equalTo(5000));
+        // 11 requests since previous api call
+        // This verifies that header rate limit info is recorded even for /rate_limit endpoint and 404 response
+        assertThat(rateLimit.getRemaining(), equalTo(4967));
+        assertThat(rateLimit.getResetDate().compareTo(lastReset), equalTo(0));
+
+        // getRateLimit() uses headerRateLimit if /rate_limit returns a 404
+        // and headerRateLimit is available and not expired
+        assertThat(rateLimit, sameInstance(gitHub.lastRateLimit()));
 
         // ratelimit() should prefer headerRateLimit when getRateLimit fails and headerRateLimit is not expired
-        assertThat(gitHub.rateLimit(), equalTo(headerRateLimit));
+        assertThat(gitHub.rateLimit(), sameInstance(rateLimit));
 
         assertThat(mockGitHub.getRequestCount(), equalTo(6));
 
         // Wait for the header
-        Thread.sleep(1000);
+        Thread.sleep(1500);
     }
 
     @Test
@@ -317,9 +340,8 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
             fail("Invalid rate limit missing some records should throw");
         } catch (Exception e) {
             assertThat(e, instanceOf(HttpException.class));
-            assertThat(e.getCause(), instanceOf(IOException.class));
-            assertThat(e.getCause().getCause(), instanceOf(ValueInstantiationException.class));
-            assertThat(e.getCause().getCause().getMessage(),
+            assertThat(e.getCause(), instanceOf(ValueInstantiationException.class));
+            assertThat(e.getCause().getMessage(),
                     containsString(
                             "Cannot construct instance of `org.kohsuke.github.GHRateLimit`, problem: `java.lang.NullPointerException`"));
         }
@@ -329,9 +351,8 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
             fail("Invalid rate limit record missing a value should throw");
         } catch (Exception e) {
             assertThat(e, instanceOf(HttpException.class));
-            assertThat(e.getCause(), instanceOf(IOException.class));
-            assertThat(e.getCause().getCause(), instanceOf(MismatchedInputException.class));
-            assertThat(e.getCause().getCause().getMessage(),
+            assertThat(e.getCause(), instanceOf(MismatchedInputException.class));
+            assertThat(e.getCause().getMessage(),
                     containsString("Missing required creator property 'reset' (index 2)"));
         }
 
@@ -357,7 +378,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         GHRateLimit headerRateLimit = null;
 
         // Give this a moment
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         // -------------------------------------------------------------
         // /user gets response with rate limit information
@@ -376,7 +397,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
                 sameInstance(headerRateLimit));
 
         // Nothing changes still valid
-        Thread.sleep(1000);
+        Thread.sleep(1500);
 
         assertThat("rateLimit() selects header instance when not expired, does not ask server",
                 gitHub.rateLimit(),
@@ -388,7 +409,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
         assertThat(mockGitHub.getRequestCount(), equalTo(1));
 
         // This time, rateLimit() should find an expired record and get a new one.
-        Thread.sleep(3000);
+        Thread.sleep(2500);
 
         assertThat("Header instance has expired", gitHub.lastRateLimit().isExpired(), is(true));
 
@@ -448,7 +469,7 @@ public class GHRateLimitTest extends AbstractGitHubWireMockTest {
     }
 
     private static GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 
 }

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

@@ -1,5 +1,6 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.databind.JsonMappingException;
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 
@@ -23,7 +24,32 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
     }
 
     private GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
+    }
+
+    @Test
+    public void testGetters() throws IOException {
+        GHRepository r = getTempRepository();
+
+        assertThat(r.hasAdminAccess(), is(true));
+        assertThat(r.hasDownloads(), is(true));
+        assertThat(r.hasIssues(), is(true));
+        assertThat(r.hasPages(), is(false));
+        assertThat(r.hasProjects(), is(true));
+        assertThat(r.hasPullAccess(), is(true));
+        assertThat(r.hasPushAccess(), is(true));
+        assertThat(r.hasWiki(), is(true));
+
+        assertThat(r.isAllowMergeCommit(), is(true));
+        assertThat(r.isAllowRebaseMerge(), is(true));
+        assertThat(r.isAllowSquashMerge(), is(true));
+
+        String httpTransport = "https://github.com/hub4j-test-org/temp-testGetters.git";
+        assertThat(r.getHttpTransportUrl(), equalTo(httpTransport));
+        assertThat(r.gitHttpTransportUrl(), equalTo(httpTransport));
+
+        assertThat(r.getName(), equalTo("temp-testGetters"));
+        assertThat(r.getFullName(), equalTo("hub4j-test-org/temp-testGetters"));
     }
 
     @Test
@@ -66,7 +92,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
             assertThat(e.getMessage(),
                     equalTo("Server returned HTTP response code: 200, message: '404 Not Found' for URL: "
                             + mockGitHub.apiServer().baseUrl()
-                            + "/repos/github-api-test-org/github-api/branches/test/NonExistent"));
+                            + "/repos/hub4j-test-org/github-api/branches/test/NonExistent"));
         }
     }
 
@@ -102,7 +128,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void listContributors() throws IOException {
-        GHRepository r = gitHub.getOrganization("github-api").getRepository("github-api");
+        GHRepository r = gitHub.getOrganization("hub4j").getRepository("github-api");
         int i = 0;
         boolean kohsuke = false;
 
@@ -122,7 +148,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
     @Test
     public void getPermission() throws Exception {
         kohsuke();
-        GHRepository r = gitHub.getRepository("github-api-test-org/test-permission");
+        GHRepository r = gitHub.getRepository("hub4j-test-org/test-permission");
         assertEquals(GHPermissionType.ADMIN, r.getPermission("kohsuke"));
         assertEquals(GHPermissionType.READ, r.getPermission("dude"));
         r = gitHub.getOrganization("apache").getRepository("groovy");
@@ -219,7 +245,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void listLanguages() throws IOException {
-        GHRepository r = gitHub.getRepository("github-api/github-api");
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
         String mainLanguage = r.getLanguage();
         assertTrue(r.listLanguages().containsKey(mainLanguage));
     }
@@ -248,7 +274,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
 
     @Test // issue #162
     public void testIssue162() throws Exception {
-        GHRepository r = gitHub.getRepository("github-api/github-api");
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
         List<GHContent> contents = r.getDirectoryContent("", "gh-pages");
         for (GHContent content : contents) {
             if (content.isFile()) {
@@ -264,27 +290,19 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
     public void markDown() throws Exception {
         assertEquals("<p><strong>Test日本語</strong></p>", IOUtils.toString(gitHub.renderMarkdown("**Test日本語**")).trim());
 
-        String actual = IOUtils.toString(gitHub.getRepository("github-api/github-api")
-                .renderMarkdown("@kohsuke to fix issue #1", MarkdownMode.GFM));
+        String actual = IOUtils.toString(
+                gitHub.getRepository("hub4j/github-api").renderMarkdown("@kohsuke to fix issue #1", MarkdownMode.GFM));
         // System.out.println(actual);
         assertTrue(actual.contains("href=\"https://github.com/kohsuke\""));
-        assertTrue(actual.contains("href=\"https://github.com/github-api/github-api/pull/1\""));
+        assertTrue(actual.contains("href=\"https://github.com/hub4j/github-api/pull/1\""));
         assertTrue(actual.contains("class=\"user-mention\""));
         assertTrue(actual.contains("class=\"issue-link "));
         assertTrue(actual.contains("to fix issue"));
     }
 
-    @Test
-    public void getMergeOptions() throws IOException {
-        GHRepository r = getTempRepository();
-        assertNotNull(r.isAllowMergeCommit());
-        assertNotNull(r.isAllowRebaseMerge());
-        assertNotNull(r.isAllowSquashMerge());
-    }
-
     @Test
     public void setMergeOptions() throws IOException {
-        // String repoName = "github-api-test-org/test-mergeoptions";
+        // String repoName = "hub4j-test-org/test-mergeoptions";
         GHRepository r = getTempRepository();
 
         // at least one merge option must be selected
@@ -417,11 +435,91 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
 
     @Test
     public void listRefs() throws Exception {
-        GHRepository repo = getTempRepository();
-        List<GHRef> refs = repo.listRefs().toList();
-        assertThat(refs, notNullValue());
-        assertThat(refs.size(), equalTo(1));
-        assertThat(refs.get(0).getRef(), equalTo("refs/heads/master"));
+        GHRepository repo = getRepository();
+
+        List<GHRef> ghRefs;
+
+        // handle refs/*
+        ghRefs = repo.listRefs("heads").toList();
+        List<GHRef> ghRefsWithPrefix = repo.listRefs("refs/heads").toList();
+
+        assertThat(ghRefs, notNullValue());
+        assertThat(ghRefs.size(), greaterThan(3));
+        assertThat(ghRefs.get(0).getRef(), equalTo("refs/heads/changes"));
+        assertThat(ghRefsWithPrefix.size(), equalTo(ghRefs.size()));
+        assertThat(ghRefsWithPrefix.get(0).getRef(), equalTo(ghRefs.get(0).getRef()));
+
+        // git/refs/heads/gh-pages
+        // passing a specific ref to listRefs will fail to parse due to returning a single item not an array
+        try {
+            ghRefs = repo.listRefs("heads/gh-pages").toList();
+            fail();
+        } catch (Exception e) {
+            assertThat(e, instanceOf(HttpException.class));
+            assertThat(e.getCause(), instanceOf(JsonMappingException.class));
+        }
+
+        // git/refs/heads/gh
+        ghRefs = repo.listRefs("heads/gh").toList();
+        assertThat(ghRefs, notNullValue());
+        assertThat(ghRefs.size(), equalTo(1));
+        assertThat(ghRefs.get(0).getRef(), equalTo("refs/heads/gh-pages"));
+
+        // git/refs/headz
+        try {
+            ghRefs = repo.listRefs("headz").toList();
+            fail();
+        } catch (Exception e) {
+            assertThat(e, instanceOf(GHFileNotFoundException.class));
+            assertThat(e.getMessage(),
+                    containsString(
+                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-reference\"}"));
+            assertThat(e.getCause(), instanceOf(FileNotFoundException.class));
+        }
+    }
+
+    @Test
+    public void getRef() throws Exception {
+        GHRepository repo = getRepository();
+
+        GHRef ghRef;
+
+        // handle refs/*
+        ghRef = repo.getRef("heads/gh-pages");
+        GHRef ghRefWithPrefix = repo.getRef("refs/heads/gh-pages");
+
+        assertThat(ghRef, notNullValue());
+        assertThat(ghRef.getRef(), equalTo("refs/heads/gh-pages"));
+        assertThat(ghRefWithPrefix.getRef(), equalTo(ghRef.getRef()));
+
+        // git/refs/heads/gh-pages
+        ghRef = repo.getRef("heads/gh-pages");
+        assertThat(ghRef, notNullValue());
+        assertThat(ghRef.getRef(), equalTo("refs/heads/gh-pages"));
+
+        // git/refs/heads/gh
+        try {
+            ghRef = repo.getRef("heads/gh");
+            fail();
+        } catch (Exception e) {
+            assertThat(e, instanceOf(GHFileNotFoundException.class));
+            assertThat(e.getMessage(),
+                    containsString(
+                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-single-reference\"}"));
+            assertThat(e.getCause(), instanceOf(FileNotFoundException.class));
+        }
+
+        // git/refs/headz
+        try {
+            ghRef = repo.getRef("headz");
+            fail();
+        } catch (Exception e) {
+            assertThat(e, instanceOf(GHFileNotFoundException.class));
+            assertThat(e.getMessage(),
+                    containsString(
+                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-single-reference\"}"));
+            assertThat(e.getCause(), instanceOf(FileNotFoundException.class));
+        }
     }
 
     @Test
@@ -441,8 +539,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
             fail();
         } catch (Exception e) {
             assertThat(e, instanceOf(GHFileNotFoundException.class));
-            assertThat(e.getMessage(),
-                    containsString("/repos/github-api-test-org/temp-listRefsEmptyTags/git/refs/tags"));
+            assertThat(e.getMessage(), containsString("/repos/hub4j-test-org/temp-listRefsEmptyTags/git/refs/tags"));
         }
 
         try {
@@ -452,8 +549,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
         } catch (Exception e) {
             assertThat(e, instanceOf(GHException.class));
             assertThat(e.getMessage(), containsString("Failed to retrieve "));
-            assertThat(e.getMessage(),
-                    containsString("/repos/github-api-test-org/temp-listRefsEmptyTags/git/refs/tags"));
+            assertThat(e.getMessage(), containsString("/repos/hub4j-test-org/temp-listRefsEmptyTags/git/refs/tags"));
             assertThat(e.getCause(), instanceOf(GHFileNotFoundException.class));
         }
     }
@@ -496,4 +592,31 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
         List<GHUser> collaborators = repo.listCollaborators().toList();
         assertThat(collaborators.size(), greaterThan(10));
     }
+
+    @Test
+    public void getCheckRuns() throws Exception {
+        final int expectedCount = 8;
+        // Use github-api repository as it has checks set up
+        PagedIterable<GHCheckRun> checkRuns = gitHub.getOrganization("hub4j")
+                .getRepository("github-api")
+                .getCheckRuns("78b9ff49d47daaa158eb373c4e2e040f739df8b9");
+        // Check if the paging works correctly
+        assertThat(checkRuns.withPageSize(2).iterator().nextPage(), hasSize(2));
+
+        // Check if the checkruns are all succeeded and if we got all of them
+        int checkRunsCount = 0;
+        for (GHCheckRun checkRun : checkRuns) {
+            assertThat(checkRun.getConclusion(), equalTo("success"));
+            checkRunsCount++;
+        }
+        assertThat(checkRunsCount, equalTo(expectedCount));
+    }
+
+    @Test
+    public void getLastCommitStatus() throws Exception {
+        GHCommitStatus status = getRepository().getLastCommitStatus("8051615eff597f4e49f4f47625e6fc2b49f26bfc");
+        assertThat(status.getId(), equalTo(9027542286L));
+        assertThat(status.getState(), equalTo(GHCommitState.SUCCESS));
+        assertThat(status.getContext(), equalTo("ci/circleci: build"));
+    }
 }

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

@@ -47,6 +47,8 @@ public class GHTagTest extends AbstractGitHubWireMockTest {
         assertEquals(tagName, tag.getTag());
         assertEquals(tagMessage, tag.getMessage());
         assertEquals(commitSha, tag.getObject().getSha());
+        assertFalse(tag.getVerification().isVerified());
+        assertEquals(tag.getVerification().getReason(), GHVerification.Reason.UNSIGNED);
 
         // Make a reference to the newly created tag.
         GHRef ref = repo.createRef("refs/tags/" + tagName, tag.getSha());
@@ -58,6 +60,6 @@ public class GHTagTest extends AbstractGitHubWireMockTest {
     }
 
     private GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 }

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

@@ -11,7 +11,7 @@ import java.util.Arrays;
 import static org.junit.Assert.assertEquals;
 
 public class GHTreeBuilderTest extends AbstractGitHubWireMockTest {
-    private static String REPO_NAME = "github-api-test-org/GHTreeBuilderTest";
+    private static String REPO_NAME = "hub4j-test-org/GHTreeBuilderTest";
 
     private static String PATH_SCRIPT = "app/run.sh";
     private static String CONTENT_SCRIPT = "#!/bin/bash\necho Hello\n";

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

@@ -0,0 +1,131 @@
+package org.kohsuke.github;
+
+import org.junit.Test;
+
+/**
+ * @author Sourabh Sarvotham Parkala
+ */
+public class GHVerificationReasonTest extends AbstractGitHubWireMockTest {
+    // Issue 737
+    @Test
+    public void testExpiredKey() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f01");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.EXPIRED_KEY);
+    }
+
+    @Test
+    public void testNotSigningKey() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f02");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.NOT_SIGNING_KEY);
+    }
+
+    @Test
+    public void testGpgverifyError() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f03");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.GPGVERIFY_ERROR);
+    }
+
+    @Test
+    public void testGpgverifyUnavailable() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f04");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(),
+                GHVerification.Reason.GPGVERIFY_UNAVAILABLE);
+    }
+
+    @Test
+    public void testUnsigned() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f05");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.UNSIGNED);
+    }
+
+    @Test
+    public void testUnknownSignatureType() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f06");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(),
+                GHVerification.Reason.UNKNOWN_SIGNATURE_TYPE);
+    }
+
+    @Test
+    public void testNoUser() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f07");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.NO_USER);
+    }
+
+    @Test
+    public void testUnverifiedEmail() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f08");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.UNVERIFIED_EMAIL);
+    }
+
+    @Test
+    public void testBadEmail() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f09");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.BAD_EMAIL);
+    }
+
+    @Test
+    public void testUnknownKey() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f10");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.UNKNOWN_KEY);
+    }
+
+    @Test
+    public void testMalformedSignature() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f11");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(),
+                GHVerification.Reason.MALFORMED_SIGNATURE);
+    }
+
+    @Test
+    public void testInvalid() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f12");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertFalse(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.INVALID);
+    }
+
+    @Test
+    public void testValid() throws Exception {
+        GHRepository r = gitHub.getRepository("hub4j/github-api");
+        GHCommit commit = r.getCommit("86a2e245aa6d71d54923655066049d9e21a15f13");
+        assertEquals(commit.getCommitShortInfo().getAuthor().getName(), "Sourabh Parkala");
+        assertTrue(commit.getCommitShortInfo().getVerification().isVerified());
+        assertEquals(commit.getCommitShortInfo().getVerification().getReason(), GHVerification.Reason.VALID);
+        assertNotNull(commit.getCommitShortInfo().getVerification().getPayload());
+        assertNotNull(commit.getCommitShortInfo().getVerification().getSignature());
+    }
+}

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

@@ -8,8 +8,7 @@ import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.TimeZone;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.core.Is.is;
 
 /**
@@ -131,6 +130,32 @@ public class GitHubStaticTest extends AbstractGitHubWireMockTest {
 
     }
 
+    @Test
+    public void testMappingReaderWriter() throws Exception {
+
+        // This test ensures that data objects can be written and read in a raw form from string.
+        // This behavior is completely unsupported and should not be used but given that some
+        // clients, such as Jenkins Blue Ocean, have already implemented their own Jackson
+        // Reader and Writer that bind this library's data objects from outside this library
+        // this makes sure they don't break.
+
+        GHRepository repo = getTempRepository();
+        assertThat(repo.root, not(nullValue()));
+
+        String repoString = GitHub.getMappingObjectWriter().writeValueAsString(repo);
+        assertThat(repoString, not(nullValue()));
+        assertThat(repoString, containsString("testMappingReaderWriter"));
+
+        GHRepository readRepo = GitHub.getMappingObjectReader().forType(GHRepository.class).readValue(repoString);
+
+        // This should never happen if these methods aren't used
+        assertThat(readRepo.root, nullValue());
+
+        String readRepoString = GitHub.getMappingObjectWriter().writeValueAsString(readRepo);
+        assertThat(readRepoString, equalTo(repoString));
+
+    }
+
     static String formatDate(Date dt, String format) {
         SimpleDateFormat df = new SimpleDateFormat(format);
         df.setTimeZone(TimeZone.getTimeZone("GMT"));

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

@@ -8,6 +8,8 @@ import java.io.IOException;
 import java.util.*;
 
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.kohsuke.github.GHMarketplaceAccountType.ORGANIZATION;
 
 /**
@@ -162,4 +164,47 @@ public class GitHubTest extends AbstractGitHubWireMockTest {
                 assertNull(account.getOrganizationBillingEmail());
         }
     }
+
+    @Test
+    public void gzip() throws Exception {
+
+        GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
+
+        // getResponseHeaderFields is deprecated but we'll use it for testing.
+        assertThat(org.getResponseHeaderFields(), notNullValue());
+
+        // WireMock should automatically gzip all responses
+        assertThat(org.getResponseHeaderFields().get("Content-Encoding").get(0), is("gzip"));
+        assertThat(org.getResponseHeaderFields().get("Content-eNcoding").get(0), is("gzip"));
+    }
+
+    @Test
+    public void testHeaderFieldName() throws Exception {
+
+        GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
+
+        // getResponseHeaderFields is deprecated but we'll use it for testing.
+        assertThat(org.getResponseHeaderFields(), notNullValue());
+
+        // Header field names must be case-insensitive
+        assertThat(org.getResponseHeaderFields().containsKey("CacHe-ContrOl"), is(true));
+
+        // The KeySet from header fields should also be case-insensitive
+        assertThat(org.getResponseHeaderFields().keySet().contains("CacHe-ControL"), is(true));
+        assertThat(org.getResponseHeaderFields().keySet().contains("CacHe-ControL"), is(true));
+
+        assertThat(org.getResponseHeaderFields().get("cachE-cOntrol").get(0), is("private, max-age=60, s-maxage=60"));
+
+        // GitHub has started changing their headers to all lowercase.
+        // For this test we want the field names to be with mixed-case (harder to do comparison).
+        // Ensure that it remains that way, if test resources are ever refreshed.
+        boolean found = false;
+        for (String key : org.getResponseHeaderFields().keySet()) {
+            if (Objects.equals("Cache-Control", key)) {
+                found = true;
+                break;
+            }
+        }
+        assertThat("Must have the literal expected string 'Cache-Control' for header field name", found);
+    }
 }

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

@@ -10,7 +10,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.io.StringReader;
 import java.nio.charset.Charset;
+import java.util.function.Function;
+
+import javax.annotation.Nonnull;
 
 /**
  * @author Stephen Connolly
@@ -79,6 +83,11 @@ public class PayloadRule implements TestRule {
         return new InputStreamReader(asInputStream(), Charset.defaultCharset());
     }
 
+    public Reader asReader(@Nonnull Function<String, String> transformer) throws IOException {
+        String payloadString = asString();
+        return new StringReader(transformer.apply(payloadString));
+    }
+
     public Reader asReader(String encoding) throws IOException {
         return new InputStreamReader(asInputStream(), encoding);
     }

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

@@ -55,7 +55,7 @@ public class RateLimitCheckerTest extends AbstractGitHubWireMockTest {
 
         // Should succeed without querying rate limit
         // Also due to earlier reset date, new value is ignored.
-        GHOrganization org = gitHub.getOrganization("github-api-test-org");
+        GHOrganization org = gitHub.getOrganization("hub4j-test-org");
         updateTestRateLimit();
         assertThat(mockGitHub.getRequestCount(), equalTo(3));
         assertThat(rateLimit.getCore().getRemaining(), equalTo(4501));
@@ -89,7 +89,7 @@ public class RateLimitCheckerTest extends AbstractGitHubWireMockTest {
     }
 
     private static GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 
 }

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

@@ -36,7 +36,7 @@ public class RepositoryTrafficTest extends AbstractGitHubWireMockTest {
     }
 
     private static GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api").getRepository("github-api");
+        return gitHub.getOrganization("hub4j").getRepository("github-api");
     }
 
     @Test

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

@@ -50,7 +50,7 @@ public class RequesterRetryTest extends AbstractGitHubWireMockTest {
     }
 
     private GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 
     @Before
@@ -113,7 +113,7 @@ public class RequesterRetryTest extends AbstractGitHubWireMockTest {
         try {
             // status code is a different code path that should also be covered by this.
             gitHub.createRequest()
-                    .withUrlPath("/repos/github-api-test-org/github-api/branches/test/timeout")
+                    .withUrlPath("/repos/hub4j-test-org/github-api/branches/test/timeout")
                     .fetchHttpStatusCode();
             fail();
         } catch (Exception e) {
@@ -260,7 +260,7 @@ public class RequesterRetryTest extends AbstractGitHubWireMockTest {
         } catch (Exception e) {
             assertThat(e, instanceOf(GHFileNotFoundException.class));
             assertThat(e.getCause(), instanceOf(FileNotFoundException.class));
-            assertThat(e.getCause().getMessage(), containsString("github-api-test-org-missing"));
+            assertThat(e.getCause().getMessage(), containsString("hub4j-test-org-missing"));
             String capturedLog = getTestCapturedLog();
             assertFalse(capturedLog.contains("will try 2 more time"));
             assertFalse(capturedLog.contains("will try 1 more time"));

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

@@ -4,12 +4,16 @@ import org.hamcrest.Matchers;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 /**
  * Tests in this class are meant to show the behavior of {@link AbstractGitHubWireMockTest} with proxying on or off.
+ *
  * <p>
  * The wiremock data for these tests should only be modified by hand - thus most are skipped when snapshotting.
  *
@@ -27,15 +31,16 @@ public class WireMockStatusReporterTest extends AbstractGitHubWireMockTest {
         assertThat(gitHub.getClient().login, not(equalTo(STUBBED_USER_LOGIN)));
 
         // If this user query fails, either the proxying config has broken (unlikely)
-        // or your auth settings are not being retrieved from the environemnt.
+        // or your auth settings are not being retrieved from the environment.
         // Check your settings.
         GHUser user = gitHub.getMyself();
         assertThat(user.getLogin(), notNullValue());
 
-        // System.out.println();
-        // System.out.println("WireMockStatusReporterTest: GitHub proxying and user auth correctly configured for user
-        // login: " + user.getLogin());
-        // System.out.println();
+        System.out.println();
+        System.out.println(
+                "WireMockStatusReporterTest: GitHub proxying and user auth correctly configured for user login: "
+                        + user.getLogin());
+        System.out.println();
     }
 
     @Test
@@ -66,7 +71,7 @@ public class WireMockStatusReporterTest extends AbstractGitHubWireMockTest {
         GHRepository repo = null;
 
         // Valid repository, stubbed
-        repo = gitHub.getRepository("github-api/github-api");
+        repo = gitHub.getRepository("hub4j/github-api");
         assertThat(repo.getDescription(), equalTo("this is a stubbed description"));
 
         // Invalid repository, without stub - fails 404 when not proxying
@@ -102,7 +107,7 @@ public class WireMockStatusReporterTest extends AbstractGitHubWireMockTest {
         GHRepository repo = null;
 
         // Valid repository, stubbed
-        repo = gitHub.getRepository("github-api/github-api");
+        repo = gitHub.getRepository("hub4j/github-api");
         assertThat(repo.getDescription(), equalTo("this is a stubbed description"));
 
         // Valid repository, without stub - succeeds when proxying
@@ -119,7 +124,8 @@ public class WireMockStatusReporterTest extends AbstractGitHubWireMockTest {
 
         assertThat(e, Matchers.<Exception>instanceOf(GHFileNotFoundException.class));
         assertThat(e.getMessage(),
-                equalTo("{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/repos/#get\"}"));
+                containsString(
+                        "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/repos/#get\"}"));
     }
 
     @Test

src/test/java/org/kohsuke/github/extras/GitHubCachingTest.java

@@ -179,7 +179,7 @@ public class GitHubCachingTest extends AbstractGitHubWireMockTest {
     }
 
     private static GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 
 }

src/test/java/org/kohsuke/github/extras/OkHttpConnectorTest.java

@@ -278,7 +278,7 @@ public class OkHttpConnectorTest extends AbstractGitHubWireMockTest {
     }
 
     private static GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 
 }

src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java

@@ -181,7 +181,7 @@ public class GitHubCachingTest extends AbstractGitHubWireMockTest {
     }
 
     private static GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 
 }

src/test/java/org/kohsuke/github/extras/okhttp3/OkHttpConnectorTest.java

@@ -287,7 +287,7 @@ public class OkHttpConnectorTest extends AbstractGitHubWireMockTest {
     }
 
     private static GHRepository getRepository(GitHub gitHub) throws IOException {
-        return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
+        return gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
     }
 
 }

src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java

@@ -1,14 +1,12 @@
 package org.kohsuke.github.junit;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.common.FileSource;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.extension.Parameters;
 import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
 import com.github.tomakehurst.wiremock.http.*;
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
-import com.github.tomakehurst.wiremock.verification.*;
 import com.google.gson.*;
 
 import java.io.File;
@@ -17,8 +15,11 @@ import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
+
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static com.github.tomakehurst.wiremock.common.Gzip.unGzipToString;
 
@@ -120,7 +121,7 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
                         .extractTextBodiesOver(255));
 
         // After taking the snapshot, format the output
-        formatJsonFiles(new File(this.apiServer().getOptions().filesRoot().getPath()).toPath());
+        formatTestResources(new File(this.apiServer().getOptions().filesRoot().getPath()).toPath(), false);
 
         if (this.rawServer() != null) {
             this.rawServer()
@@ -132,7 +133,7 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
                             .extractTextBodiesOver(255));
 
             // For raw server, only fix up mapping files
-            formatJsonFiles(new File(this.rawServer().getOptions().filesRoot().child("mappings").getPath()).toPath());
+            formatTestResources(new File(this.rawServer().getOptions().filesRoot().getPath()).toPath(), true);
         }
 
         if (this.uploadsServer() != null) {
@@ -144,7 +145,7 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
                             .captureHeader("Accept")
                             .extractTextBodiesOver(255));
 
-            formatJsonFiles(new File(this.uploadsServer().getOptions().filesRoot().getPath()).toPath());
+            formatTestResources(new File(this.uploadsServer().getOptions().filesRoot().getPath()).toPath(), false);
 
         }
     }
@@ -157,7 +158,7 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
         return server.countRequestsMatching(RequestPatternBuilder.allRequests().build()).getCount();
     }
 
-    private void formatJsonFiles(Path path) {
+    private void formatTestResources(Path path, boolean isRawServer) {
         // The more consistent we can make the json output the more meaningful it will be.
         Gson g = new Gson().newBuilder()
                 .serializeNulls()
@@ -176,8 +177,32 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
                 .create();
 
         try {
+            Map<String, String> idToIndex = new HashMap<>();
+
+            // Match all the ids to request indexes
             Files.walk(path).forEach(filePath -> {
                 try {
+                    if (filePath.toString().endsWith(".json") && filePath.toString().contains("/mappings/")) {
+                        String fileText = new String(Files.readAllBytes(filePath));
+                        Object parsedObject = g.fromJson(fileText, Object.class);
+                        addMappingId((Map<String, Object>) parsedObject, idToIndex);
+                    }
+                } catch (Exception e) {
+                    throw new RuntimeException("Files could not be read: " + filePath.toString(), e);
+                }
+            });
+
+            // Update all
+            Files.walk(path).forEach(filePath -> {
+                try {
+                    Map.Entry<String, String> entry = getId(filePath, idToIndex);
+                    if (entry != null) {
+                        filePath = renameFileToIndex(filePath, entry);
+                    }
+                    // For raw server, only fix up mapping files
+                    if (isRawServer && !filePath.toString().contains("mappings")) {
+                        return;
+                    }
                     if (filePath.toString().endsWith(".json")) {
                         String fileText = new String(Files.readAllBytes(filePath));
                         // while recording responses we replaced all github calls localhost
@@ -193,16 +218,18 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
                             fileText = fileText.replace(this.uploadsServer().baseUrl(), "https://uploads.github.com");
                         }
 
+                        // point bodyFile in the mapping to the renamed body file
+                        if (entry != null && filePath.toString().contains("mappings")) {
+                            fileText = fileText.replace("-" + entry.getKey(), "-" + entry.getValue());
+                        }
+
                         // Can be Array or Map
                         Object parsedObject = g.fromJson(fileText, Object.class);
-                        if (parsedObject instanceof Map && filePath.toString().contains("mappings")) {
-                            filePath = renameMappingFile(filePath, (Map<String, Object>) parsedObject);
-                        }
                         fileText = g.toJson(parsedObject);
                         Files.write(filePath, fileText.getBytes());
                     }
                 } catch (Exception e) {
-                    throw new RuntimeException("Files could not be written", e);
+                    throw new RuntimeException("Files could not be written: " + filePath.toString(), e);
                 }
             });
         } catch (IOException e) {
@@ -210,24 +237,51 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
         }
     }
 
-    private Path renameMappingFile(Path filePath, Map<String, Object> parsedObject) throws IOException {
-        // Shorten the file names
-        // For understandability, rename the files to include the response order
-        Path targetPath = filePath;
+    private void addMappingId(Map<String, Object> parsedObject, Map<String, String> idToIndex) {
         String id = (String) parsedObject.getOrDefault("id", null);
-        Long insertionIndex = ((Double) parsedObject.getOrDefault("insertionIndex", 0.0)).longValue();
+        long insertionIndex = ((Double) parsedObject.getOrDefault("insertionIndex", 0.0)).longValue();
         if (id != null && insertionIndex > 0) {
-            String filePathString = filePath.toString();
-            if (filePathString.contains(id)) {
-                targetPath = new File(filePathString.replace(id, insertionIndex.toString() + "-" + id.substring(0, 6)))
-                        .toPath();
-                Files.move(filePath, targetPath);
+            idToIndex.put(id, Long.toString(insertionIndex));
+        }
+    }
+
+    private Map.Entry<String, String> getId(Path filePath, Map<String, String> idToIndex) throws IOException {
+        Path targetPath = filePath;
+        String filePathString = filePath.toString();
+        for (Map.Entry<String, String> item : idToIndex.entrySet()) {
+            if (filePathString.contains(item.getKey())) {
+                return item;
             }
         }
+        return null;
+    }
+
+    private Path renameFileToIndex(Path filePath, Map.Entry<String, String> idToIndex) throws IOException {
+        String filePathString = filePath.toString();
+        Path targetPath = new File(filePathString.replace(idToIndex.getKey(), idToIndex.getValue())).toPath();
+        Files.move(filePath, targetPath);
 
         return targetPath;
     }
 
+    @Nonnull
+    public String mapToMockGitHub(String body) {
+        body = body.replace("https://api.github.com", this.apiServer().baseUrl());
+
+        if (this.rawServer() != null) {
+            body = body.replace("https://raw.githubusercontent.com", this.rawServer().baseUrl());
+        } else {
+            body = body.replace("https://raw.githubusercontent.com", this.apiServer().baseUrl() + "/raw");
+        }
+
+        if (this.uploadsServer() != null) {
+            body = body.replace("https://uploads.github.com", this.uploadsServer().baseUrl());
+        } else {
+            body = body.replace("https://uploads.github.com", this.apiServer().baseUrl() + "/uploads");
+        }
+        return body;
+    }
+
     /**
      * A number of modifications are needed as runtime to make responses target the WireMock server and not accidentally
      * switch to using the live github servers.
@@ -250,19 +304,7 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
 
                 String body;
                 body = getBodyAsString(response, headers);
-                body = body.replace("https://api.github.com", rule.apiServer().baseUrl());
-
-                if (rule.rawServer() != null) {
-                    body = body.replace("https://raw.githubusercontent.com", rule.rawServer().baseUrl());
-                } else {
-                    body = body.replace("https://raw.githubusercontent.com", rule.apiServer().baseUrl() + "/raw");
-                }
-
-                if (rule.uploadsServer() != null) {
-                    body = body.replace("https://uploads.github.com", rule.uploadsServer().baseUrl());
-                } else {
-                    body = body.replace("https://uploads.github.com", rule.apiServer().baseUrl() + "/uploads");
-                }
+                body = rule.mapToMockGitHub(body);
 
                 builder.body(body);
 

src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json

@@ -1,126 +0,0 @@
-{
-  "id": 238757196,
-  "node_id": "MDEwOlJlcG9zaXRvcnkyMzg3NTcxOTY=",
-  "name": "temp-testHandler_Fail",
-  "full_name": "github-api-test-org/temp-testHandler_Fail",
-  "private": false,
-  "owner": {
-    "login": "github-api-test-org",
-    "id": 7544739,
-    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
-    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
-    "gravatar_id": "",
-    "url": "https://api.github.com/users/github-api-test-org",
-    "html_url": "https://github.com/github-api-test-org",
-    "followers_url": "https://api.github.com/users/github-api-test-org/followers",
-    "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}",
-    "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}",
-    "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}",
-    "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions",
-    "organizations_url": "https://api.github.com/users/github-api-test-org/orgs",
-    "repos_url": "https://api.github.com/users/github-api-test-org/repos",
-    "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}",
-    "received_events_url": "https://api.github.com/users/github-api-test-org/received_events",
-    "type": "Organization",
-    "site_admin": false
-  },
-  "html_url": "https://github.com/github-api-test-org/temp-testHandler_Fail",
-  "description": "A test repository for testing the github-api project: temp-testHandler_Fail",
-  "fork": false,
-  "url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail",
-  "forks_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/forks",
-  "keys_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/keys{/key_id}",
-  "collaborators_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/collaborators{/collaborator}",
-  "teams_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/teams",
-  "hooks_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/hooks",
-  "issue_events_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/issues/events{/number}",
-  "events_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/events",
-  "assignees_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/assignees{/user}",
-  "branches_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/branches{/branch}",
-  "tags_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/tags",
-  "blobs_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/git/blobs{/sha}",
-  "git_tags_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/git/tags{/sha}",
-  "git_refs_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/git/refs{/sha}",
-  "trees_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/git/trees{/sha}",
-  "statuses_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/statuses/{sha}",
-  "languages_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/languages",
-  "stargazers_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/stargazers",
-  "contributors_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/contributors",
-  "subscribers_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/subscribers",
-  "subscription_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/subscription",
-  "commits_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/commits{/sha}",
-  "git_commits_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/git/commits{/sha}",
-  "comments_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/comments{/number}",
-  "issue_comment_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/issues/comments{/number}",
-  "contents_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/contents/{+path}",
-  "compare_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/compare/{base}...{head}",
-  "merges_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/merges",
-  "archive_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/{archive_format}{/ref}",
-  "downloads_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/downloads",
-  "issues_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/issues{/number}",
-  "pulls_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/pulls{/number}",
-  "milestones_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/milestones{/number}",
-  "notifications_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/notifications{?since,all,participating}",
-  "labels_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/labels{/name}",
-  "releases_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/releases{/id}",
-  "deployments_url": "https://api.github.com/repos/github-api-test-org/temp-testHandler_Fail/deployments",
-  "created_at": "2020-02-06T18:33:39Z",
-  "updated_at": "2020-02-06T18:33:43Z",
-  "pushed_at": "2020-02-06T18:33:41Z",
-  "git_url": "git://github.com/github-api-test-org/temp-testHandler_Fail.git",
-  "ssh_url": "git@github.com:github-api-test-org/temp-testHandler_Fail.git",
-  "clone_url": "https://github.com/github-api-test-org/temp-testHandler_Fail.git",
-  "svn_url": "https://github.com/github-api-test-org/temp-testHandler_Fail",
-  "homepage": "http://github-api.kohsuke.org/",
-  "size": 0,
-  "stargazers_count": 0,
-  "watchers_count": 0,
-  "language": null,
-  "has_issues": true,
-  "has_projects": true,
-  "has_downloads": true,
-  "has_wiki": true,
-  "has_pages": false,
-  "forks_count": 0,
-  "mirror_url": null,
-  "archived": false,
-  "disabled": false,
-  "open_issues_count": 0,
-  "license": null,
-  "forks": 0,
-  "open_issues": 0,
-  "watchers": 0,
-  "default_branch": "master",
-  "permissions": {
-    "admin": true,
-    "push": true,
-    "pull": true
-  },
-  "temp_clone_token": "",
-  "allow_squash_merge": true,
-  "allow_merge_commit": true,
-  "allow_rebase_merge": true,
-  "delete_branch_on_merge": false,
-  "organization": {
-    "login": "github-api-test-org",
-    "id": 7544739,
-    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
-    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
-    "gravatar_id": "",
-    "url": "https://api.github.com/users/github-api-test-org",
-    "html_url": "https://github.com/github-api-test-org",
-    "followers_url": "https://api.github.com/users/github-api-test-org/followers",
-    "following_url": "https://api.github.com/users/github-api-test-org/following{/other_user}",
-    "gists_url": "https://api.github.com/users/github-api-test-org/gists{/gist_id}",
-    "starred_url": "https://api.github.com/users/github-api-test-org/starred{/owner}{/repo}",
-    "subscriptions_url": "https://api.github.com/users/github-api-test-org/subscriptions",
-    "organizations_url": "https://api.github.com/users/github-api-test-org/orgs",
-    "repos_url": "https://api.github.com/users/github-api-test-org/repos",
-    "events_url": "https://api.github.com/users/github-api-test-org/events{/privacy}",
-    "received_events_url": "https://api.github.com/users/github-api-test-org/received_events",
-    "type": "Organization",
-    "site_admin": false
-  },
-  "network_count": 0,
-  "subscribers_count": 6
-}

src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/__files/repos_hub4j-test-org_temp-testratelimithandler_fail-3.json

@@ -0,0 +1,126 @@
+{
+  "id": 238757196,
+  "node_id": "MDEwOlJlcG9zaXRvcnkyMzg3NTcxOTY=",
+  "name": "temp-testHandler_Fail",
+  "full_name": "hub4j-test-org/temp-testHandler_Fail",
+  "private": false,
+  "owner": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/hub4j-test-org",
+    "html_url": "https://github.com/hub4j-test-org",
+    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
+    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
+    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
+    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
+    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
+    "type": "Organization",
+    "site_admin": false
+  },
+  "html_url": "https://github.com/hub4j-test-org/temp-testHandler_Fail",
+  "description": "A test repository for testing the github-api project: temp-testHandler_Fail",
+  "fork": false,
+  "url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail",
+  "forks_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/forks",
+  "keys_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/keys{/key_id}",
+  "collaborators_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/collaborators{/collaborator}",
+  "teams_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/teams",
+  "hooks_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/hooks",
+  "issue_events_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/issues/events{/number}",
+  "events_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/events",
+  "assignees_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/assignees{/user}",
+  "branches_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/branches{/branch}",
+  "tags_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/tags",
+  "blobs_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/git/blobs{/sha}",
+  "git_tags_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/git/tags{/sha}",
+  "git_refs_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/git/refs{/sha}",
+  "trees_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/git/trees{/sha}",
+  "statuses_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/statuses/{sha}",
+  "languages_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/languages",
+  "stargazers_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/stargazers",
+  "contributors_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/contributors",
+  "subscribers_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/subscribers",
+  "subscription_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/subscription",
+  "commits_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/commits{/sha}",
+  "git_commits_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/git/commits{/sha}",
+  "comments_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/comments{/number}",
+  "issue_comment_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/issues/comments{/number}",
+  "contents_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/contents/{+path}",
+  "compare_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/compare/{base}...{head}",
+  "merges_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/merges",
+  "archive_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/{archive_format}{/ref}",
+  "downloads_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/downloads",
+  "issues_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/issues{/number}",
+  "pulls_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/pulls{/number}",
+  "milestones_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/milestones{/number}",
+  "notifications_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/notifications{?since,all,participating}",
+  "labels_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/labels{/name}",
+  "releases_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/releases{/id}",
+  "deployments_url": "https://api.github.com/repos/hub4j-test-org/temp-testHandler_Fail/deployments",
+  "created_at": "2020-02-06T18:33:39Z",
+  "updated_at": "2020-02-06T18:33:43Z",
+  "pushed_at": "2020-02-06T18:33:41Z",
+  "git_url": "git://github.com/hub4j-test-org/temp-testHandler_Fail.git",
+  "ssh_url": "git@github.com:hub4j-test-org/temp-testHandler_Fail.git",
+  "clone_url": "https://github.com/hub4j-test-org/temp-testHandler_Fail.git",
+  "svn_url": "https://github.com/hub4j-test-org/temp-testHandler_Fail",
+  "homepage": "http://github-api.kohsuke.org/",
+  "size": 0,
+  "stargazers_count": 0,
+  "watchers_count": 0,
+  "language": null,
+  "has_issues": true,
+  "has_projects": true,
+  "has_downloads": true,
+  "has_wiki": true,
+  "has_pages": false,
+  "forks_count": 0,
+  "mirror_url": null,
+  "archived": false,
+  "disabled": false,
+  "open_issues_count": 0,
+  "license": null,
+  "forks": 0,
+  "open_issues": 0,
+  "watchers": 0,
+  "default_branch": "master",
+  "permissions": {
+    "admin": true,
+    "push": true,
+    "pull": true
+  },
+  "temp_clone_token": "",
+  "allow_squash_merge": true,
+  "allow_merge_commit": true,
+  "allow_rebase_merge": true,
+  "delete_branch_on_merge": false,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/hub4j-test-org",
+    "html_url": "https://github.com/hub4j-test-org",
+    "followers_url": "https://api.github.com/users/hub4j-test-org/followers",
+    "following_url": "https://api.github.com/users/hub4j-test-org/following{/other_user}",
+    "gists_url": "https://api.github.com/users/hub4j-test-org/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/hub4j-test-org/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/hub4j-test-org/subscriptions",
+    "organizations_url": "https://api.github.com/users/hub4j-test-org/orgs",
+    "repos_url": "https://api.github.com/users/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/users/hub4j-test-org/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/hub4j-test-org/received_events",
+    "type": "Organization",
+    "site_admin": false
+  },
+  "network_count": 0,
+  "subscribers_count": 6
+}

src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-2-79fb10.json

@@ -1,52 +0,0 @@
-{
-  "id": "79fb1092-8bf3-4274-bc8e-ca126c9d9261",
-  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 403,
-    "body": "{\"message\":\"Must have push access to repository\",\"documentation_url\":\"https://developer.github.com/\"}",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "403 Forbidden",
-      "Retry-After": "30",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4000",
-      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"7ff3c96399f7ddf6129622d675ca9935\"",
-      "Last-Modified": "Thu, 06 Feb 2020 18:33:37 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3F982:4E949:5E3C5BFC"
-    }
-  },
-  "uuid": "79fb1092-8bf3-4274-bc8e-ca126c9d9261",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
-  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
-  "insertionIndex": 2
-}

src/test/resources/org/kohsuke/github/AbuseLimitHandlerTest/wiremock/testHandler_Fail/mappings/repos_github-api-test-org_temp-testratelimithandler_fail-3-574da1.json

@@ -1,50 +0,0 @@
-{
-  "id": "574da117-6845-46d8-b2c1-4415546ca670",
-  "name": "repos_github-api-test-org_temp-testratelimithandler_fail",
-  "request": {
-    "url": "/repos/github-api-test-org/temp-testHandler_Fail",
-    "method": "GET",
-    "headers": {
-      "Accept": {
-        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
-      }
-    }
-  },
-  "response": {
-    "status": 200,
-    "bodyFileName": "repos_github-api-test-org_temp-testratelimithandler_fail-574da117-6845-46d8-b2c1-4415546ca670.json",
-    "headers": {
-      "Date": "{{now timezone='GMT' format='EEE, dd MMM yyyy HH:mm:ss z'}}",
-      "Content-Type": "application/json; charset=utf-8",
-      "Server": "GitHub.com",
-      "Status": "200 OK",
-      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4922",
-      "X-RateLimit-Reset": "{{testStartDate offset='3 seconds' format='unix'}}",
-      "Cache-Control": "private, max-age=60, s-maxage=60",
-      "Vary": [
-        "Accept, Authorization, Cookie, X-GitHub-OTP",
-        "Accept-Encoding"
-      ],
-      "ETag": "W/\"858224998ac7d1fd6dcd43f73d375297\"",
-      "Last-Modified": "Thu, 06 Feb 2020 18:33:43 GMT",
-      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
-      "X-Accepted-OAuth-Scopes": "repo",
-      "X-GitHub-Media-Type": "unknown, github.v3",
-      "Access-Control-Expose-Headers": "ETag, Link, Location, Retry-After, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval, X-GitHub-Media-Type",
-      "Access-Control-Allow-Origin": "*",
-      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
-      "X-Frame-Options": "deny",
-      "X-Content-Type-Options": "nosniff",
-      "X-XSS-Protection": "1; mode=block",
-      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
-      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "CC37:2605:3FADC:4EA8C:5E3C5C02"
-    }
-  },
-  "uuid": "574da117-6845-46d8-b2c1-4415546ca670",
-  "persistent": true,
-  "scenarioName": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail",
-  "requiredScenarioState": "scenario-1-repos-github-api-test-org-temp-testHandler_Fail-2",
-  "insertionIndex": 3
-}