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

Fix mocking Previews

.github/dependabot.yml

@@ -3,10 +3,10 @@ updates:
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "monthly"
       time: "02:00"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "monthly"
       time: "02:00"

.github/release-drafter.yml

@@ -1,5 +1,6 @@
-name-template: 'v$NEXT_PATCH_VERSION 🌈'
+name-template: 'v$NEXT_MINOR_VERSION 🌈'
 tag-template: 'github-api-$NEXT_MINOR_VERSION'
+version-template: '$MAJOR.$MINOR'
 categories:
   - title: '🚀 Features'
     labels:

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+For changes after v1.101 see the [GitHub Releases page](https://github.com/hub4j/github-api/releases) for the project. 
+
 ## [github-api-1.101](https://github.com/hub4j/github-api/tree/github-api-1.101) (2019-11-27)
 
 [Full Changelog](https://github.com/hub4j/github-api/compare/github-api-1.100...github-api-1.101)

CONTRIBUTING.md

@@ -14,6 +14,10 @@ Example:
 
 This the default behavior.
 
+Example for a single test case:
+
+`mvn install -Dtest=WireMockStatusReporterTest#user_whenProxying_AuthCorrectlyConfigured`
+
 
 ### Setting up credential
 
@@ -27,21 +31,37 @@ This the default behavior.
 
     `WireMockStatusReporterTest: GitHub proxying and user auth correctly configured for user login: <your login>`
 
-Whenever you run tests with `-Dtest.github.useProxy`, they will try to get data from local files but will fallback to proxying to github if not found.
+Whenever you run tests with `-Dtest.github.useProxy`, they will try to get data from local files but will fallback to proxying to GitHub if not found.
-
 
 ### Writing a new test
 
 Once you have credentials setup, you add new test classes and test methods as you would normally.
-Keep `useProxy` enabled and iterate on your tests as needed. Remember, while proxying your tests are interacting with GitHub - you will need to clean up your state between runs.
 
-When you are ready to create a snapshot of your test data,
+#### Running tests using GitHub test proxy
-run your test with `test.github.takeSnapshot` ("-Dtest.github.takeSnapshot" as a Java VM option).  For example:
 
-    `mvn install -Dtest.github.takeSnapshot -Dtest=YourTestClassName`
+Keep `useProxy` enabled and iterate on your tests as needed. With `useProxy` enabled your tests will interact with 
+GitHub - you will need to clean up your server-state between runs. This can be done manually to start with.
+Once your test code is somewhat stable, use `getGitHubBeforeAfter()` to get a `GitHub` instance for test setup and cleanup.
+Interactions with that `GitHub` instance will not be recorded as part of the test, keeping the test data files to a minimum. 
 
-The above command would create snapshot WireMock data files under the path `src/test/resources/org/kohsuhke/github/YourTestClassName/wiremock`.
+#### Running tests against your personal GitHub user account
-Each method would get a separate director that would hold the data files for that test method.
+
+By default, test helper methods such as `getTempRepository()` target the `hub4j-test-org` GitHub organization.
+Please request access to this org to record your tests before submitting a PR.  This helps keep the project stable and nimble.
+Until you have access (or if you don't want access), you can set the following additional system property to target 
+your personal github account.
+
+    `mvn install -Dtest.github.org=false -Dtest=YourTestClassName`
+
+#### Taking a snapshot 
+
+When you are ready to create a snapshot of your test data, run your test with `test.github.takeSnapshot`  ("-Dtest.github.takeSnapshot" as 
+a Java VM option). For example:
+
+    `mvn install -Dtest.github.takeSnapshot -Dtest.github.org=false -Dtest=YourTestClassName`
+
+The above command will create snapshot WireMock data files under the path `src/test/resources/org/kohsuhke/github/YourTestClassName/wiremock`.
+Each method will get a separate directory that will hold the data files for that test method.
 
 Add all files including the generated data to your commit and submit a PR.
 

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.kohsuke</groupId>
   <artifactId>github-api</artifactId>
-  <version>1.116</version>
+  <version>1.119</version>
   <name>GitHub API for Java</name>
   <url>https://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
@@ -11,7 +11,7 @@
     <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.116</tag>
+    <tag>github-api-1.119</tag>
   </scm>
 
   <distributionManagement>
@@ -33,14 +33,13 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spotbugs-maven-plugin.version>4.0.4</spotbugs-maven-plugin.version>
+    <spotbugs-maven-plugin.version>4.1.4</spotbugs-maven-plugin.version>
-    <spotbugs.version>4.1.1</spotbugs.version>
+    <spotbugs.version>4.1.3</spotbugs.version>
     <spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
     <hamcrest.version>2.2</hamcrest.version>
     <okhttp3.version>4.4.1</okhttp3.version>
     <okio.version>2.5.0</okio.version>
-    <formatter-maven-plugin.goal>format</formatter-maven-plugin.goal>
+    <spotless-maven-plugin.goal>apply</spotless-maven-plugin.goal>
-    <impsort-maven-plugin.goal>sort</impsort-maven-plugin.goal>
     <!-- Using this as the minimum bar for code coverage.  Adding methods without covering them will fail this. -->
     <jacoco.coverage.target.bundle.method>0.60</jacoco.coverage.target.bundle.method>
     <jacoco.coverage.target.class.method>0.25</jacoco.coverage.target.class.method>
@@ -100,7 +99,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.5</version>
+          <version>0.8.6</version>
           <executions>
             <execution>
               <goals>
@@ -154,7 +153,7 @@
                       <exclude>org.kohsuke.github.example.*</exclude>
 
                       <!-- No methods -->
-                      <exclude>org.kohsuke.github.Previews</exclude>
+                      <exclude>org.kohsuke.github.internal.Previews</exclude>
 
                       <!-- Deprecated -->
                       <exclude>org.kohsuke.github.extras.OkHttp3Connector</exclude>
@@ -261,7 +260,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.bcel</groupId>
@@ -343,37 +342,34 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>net.revelc.code.formatter</groupId>
+        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>formatter-maven-plugin</artifactId>
+        <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.12.1</version>
+        <version>2.6.1</version>
         <executions>
           <execution>
+            <id>spotless-check</id>
+            <phase>process-sources</phase>
             <goals>
-              <goal>${formatter-maven-plugin.goal}</goal>
+              <goal>${spotless-maven-plugin.goal}</goal>
             </goals>
-            <configuration>
-              <configFile>src/main/resources/eclipse/formatter.xml</configFile>
-              <cachedir>${project.build.directory}/.cache</cachedir>
-            </configuration>
           </execution>
         </executions>
-      </plugin>
-      <plugin>
-        <groupId>net.revelc.code</groupId>
-        <artifactId>impsort-maven-plugin</artifactId>
-        <version>1.4.1</version>
         <configuration>
-          <groups>*,java.,javax.</groups>
+          <java>
-          <removeUnused>true</removeUnused>
+            <eclipse>
-          <staticAfter>true</staticAfter>
+              <file>${basedir}/src/build/eclipse/formatter.xml</file>
+            </eclipse>
+
+            <importOrder>
+              <file>${basedir}/src/build/eclipse/eclipse.importorder</file>
+            </importOrder>
+            <removeUnusedImports />
+
+            <trimTrailingWhitespace />
+            <endWithNewline />
+
+          </java>
         </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>${impsort-maven-plugin.goal}</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <plugin>
         <groupId>com.github.spotbugs</groupId>
@@ -410,6 +406,12 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.9</version>
     </dependency>
+    <dependency>
+      <groupId>com.tngtech.archunit</groupId>
+      <artifactId>archunit</artifactId>
+      <version>0.15.0</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
@@ -432,7 +434,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -469,7 +471,7 @@
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler</artifactId>
-      <version>1.260</version>
+      <version>1.262</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -481,7 +483,25 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>5.7.0.202003110725-r</version>
+      <version>5.10.0.202012080955-r</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt-api</artifactId>
+      <version>0.11.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt-impl</artifactId>
+      <version>0.11.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt-jackson</artifactId>
+      <version>0.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -519,7 +539,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.4.6</version>
+      <version>3.6.28</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -531,7 +551,7 @@
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-jre8-standalone</artifactId>
-      <version>2.27.1</version>
+      <version>2.27.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -540,6 +560,12 @@
       <version>2.8.6</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.30</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>
@@ -565,8 +591,7 @@
         </os>
       </activation>
       <properties>
-        <formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
+        <spotless-maven-plugin.goal>check</spotless-maven-plugin.goal>
-        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
       </properties>
     </profile>
     <profile>
@@ -591,8 +616,7 @@
     <profile>
       <id>release</id>
       <properties>
-        <formatter-maven-plugin.goal>validate</formatter-maven-plugin.goal>
+        <spotless-maven-plugin.goal>check</spotless-maven-plugin.goal>
-        <impsort-maven-plugin.goal>check</impsort-maven-plugin.goal>
       </properties>
       <build>
         <plugins>

src/build/eclipse/eclipse.importorder

@@ -0,0 +1,6 @@
+#Organize Import Order
+# Import this file in Window -> Preferences -> Java -> Code Style -> Organize Imports -> Import...
+0=
+1=java
+2=javax
+3=\#

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

@@ -12,14 +12,14 @@ import javax.annotation.Nonnull;
  * <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);
@@ -38,7 +38,7 @@ import javax.annotation.Nonnull;
  *            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> {
+abstract class AbstractBuilder<R, S> extends GitHubInteractiveObject {
 
     @Nonnull
     private final Class<R> returnType;
@@ -75,6 +75,7 @@ abstract class AbstractBuilder<R, S> {
             @Nonnull Class<S> intermediateReturnType,
             @Nonnull GitHub root,
             @CheckForNull R baseInstance) {
+        super(root);
         this.requester = root.createRequest();
         this.returnType = finalReturnType;
         this.commitChangesImmediately = returnType.equals(intermediateReturnType);
@@ -97,7 +98,7 @@ abstract class AbstractBuilder<R, S> {
      *             if there is an I/O Exception
      */
     @Nonnull
-    @Preview
+    @BetaApi
     @Deprecated
     public R done() throws IOException {
         R result;
@@ -127,7 +128,7 @@ abstract class AbstractBuilder<R, S> {
      *             if an I/O error occurs
      */
     @Nonnull
-    @Preview
+    @BetaApi
     @Deprecated
     protected S with(@Nonnull String name, Object value) throws IOException {
         requester.with(name, value);
@@ -148,7 +149,7 @@ abstract class AbstractBuilder<R, S> {
      *             if an I/O error occurs
      */
     @Nonnull
-    @Preview
+    @BetaApi
     @Deprecated
     protected S continueOrDone() throws IOException {
         // This little bit of roughness in this base class means all inheriting builders get to create Updater and

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

@@ -0,0 +1,18 @@
+package org.kohsuke.github;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Indicates that the method/class/etc marked is a beta implementation of an sdk feature.
+ * <p>
+ * These APIs are subject to change and not a part of the backward compatibility commitment. Always used in conjunction
+ * with 'deprecated' to raise awareness to clients.
+ * </p>
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface BetaApi {
+}

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

@@ -5,7 +5,7 @@ import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
-import static org.kohsuke.github.Previews.MACHINE_MAN;
+import static org.kohsuke.github.internal.Previews.MACHINE_MAN;
 
 /**
  * A Github App.
@@ -15,7 +15,6 @@ import static org.kohsuke.github.Previews.MACHINE_MAN;
  */
 public class GHApp extends GHObject {
 
-    private GitHub root;
     private GHUser owner;
     private String name;
     private String description;
@@ -189,7 +188,7 @@ public class GHApp extends GHObject {
      * @return a list of App installations
      * @see <a href="https://developer.github.com/v3/apps/#list-installations">List installations</a>
      */
-    @Preview
+    @Preview(MACHINE_MAN)
     @Deprecated
     public PagedIterable<GHAppInstallation> listInstallations() {
         return root.createRequest()
@@ -210,7 +209,7 @@ public class GHApp extends GHObject {
      *             on error
      * @see <a href="https://developer.github.com/v3/apps/#get-an-installation">Get an installation</a>
      */
-    @Preview
+    @Preview(MACHINE_MAN)
     @Deprecated
     public GHAppInstallation getInstallationById(long id) throws IOException {
         return root.createRequest()
@@ -233,7 +232,7 @@ public class GHApp extends GHObject {
      * @see <a href="https://developer.github.com/v3/apps/#get-an-organization-installation">Get an organization
      *      installation</a>
      */
-    @Preview
+    @Preview(MACHINE_MAN)
     @Deprecated
     public GHAppInstallation getInstallationByOrganization(String name) throws IOException {
         return root.createRequest()
@@ -258,7 +257,7 @@ public class GHApp extends GHObject {
      * @see <a href="https://developer.github.com/v3/apps/#get-a-repository-installation">Get a repository
      *      installation</a>
      */
-    @Preview
+    @Preview(MACHINE_MAN)
     @Deprecated
     public GHAppInstallation getInstallationByRepository(String ownerName, String repositoryName) throws IOException {
         return root.createRequest()
@@ -280,7 +279,7 @@ public class GHApp extends GHObject {
      *             on error
      * @see <a href="https://developer.github.com/v3/apps/#get-a-user-installation">Get a user installation</a>
      */
-    @Preview
+    @Preview(MACHINE_MAN)
     @Deprecated
     public GHAppInstallation getInstallationByUser(String name) throws IOException {
         return root.createRequest()

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

@@ -5,7 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.kohsuke.github.Previews.MACHINE_MAN;
+import static org.kohsuke.github.internal.Previews.MACHINE_MAN;
 
 /**
  * Creates a access token for a GitHub App Installation
@@ -14,12 +14,11 @@ import static org.kohsuke.github.Previews.MACHINE_MAN;
  * @see GHAppInstallation#createToken(Map) GHAppInstallation#createToken(Map)
  * @see GHAppInstallation#createToken() GHAppInstallation#createToken()
  */
-public class GHAppCreateTokenBuilder {
+public class GHAppCreateTokenBuilder extends GitHubInteractiveObject {
-    private final GitHub root;
     protected final Requester builder;
     private final String apiUrlTail;
 
-    @Preview
+    @BetaApi
     @Deprecated
     GHAppCreateTokenBuilder(GitHub root, String apiUrlTail) {
         this.root = root;
@@ -27,7 +26,7 @@ public class GHAppCreateTokenBuilder {
         this.builder = root.createRequest();
     }
 
-    @Preview
+    @BetaApi
     @Deprecated
     GHAppCreateTokenBuilder(GitHub root, String apiUrlTail, Map<String, GHPermissionType> permissions) {
         this(root, apiUrlTail);
@@ -43,7 +42,7 @@ public class GHAppCreateTokenBuilder {
      *            Array containing the repositories Ids
      * @return a GHAppCreateTokenBuilder
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public GHAppCreateTokenBuilder repositoryIds(List<Long> repositoryIds) {
         this.builder.with("repository_ids", repositoryIds);
@@ -58,7 +57,7 @@ public class GHAppCreateTokenBuilder {
      *            Map containing the permission names and types.
      * @return a GHAppCreateTokenBuilder
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public GHAppCreateTokenBuilder permissions(Map<String, GHPermissionType> permissions) {
         Map<String, String> retMap = new HashMap<>();
@@ -78,7 +77,7 @@ public class GHAppCreateTokenBuilder {
      * @throws IOException
      *             on error
      */
-    @Preview
+    @Preview(MACHINE_MAN)
     @Deprecated
     public GHAppInstallationToken create() throws IOException {
         return builder.method("POST")

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

@@ -3,11 +3,13 @@ package org.kohsuke.github;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
-import static org.kohsuke.github.Previews.GAMBIT;
+import static org.kohsuke.github.internal.Previews.GAMBIT;
+import static org.kohsuke.github.internal.Previews.MACHINE_MAN;
 
 /**
  * A Github App Installation.
@@ -20,7 +22,6 @@ import static org.kohsuke.github.Previews.GAMBIT;
  * @see GHApp#getInstallationByUser(String) GHApp#getInstallationByUser(String)
  */
 public class GHAppInstallation extends GHObject {
-    private GitHub root;
     private GHUser account;
 
     @JsonProperty("access_tokens_url")
@@ -117,6 +118,36 @@ public class GHAppInstallation extends GHObject {
         return repositoriesUrl;
     }
 
+    /**
+     * List repositories that this app installation can access.
+     *
+     * @return the paged iterable
+     */
+    @Preview(MACHINE_MAN)
+    @Deprecated
+    public PagedSearchIterable<GHRepository> listRepositories() {
+        GitHubRequest request;
+
+        try {
+            request = root.createRequest().withPreview(MACHINE_MAN).withUrlPath("/installation/repositories").build();
+        } catch (MalformedURLException e) {
+            throw new GHException("", e);
+        }
+
+        return new PagedSearchIterable<>(root, request, GHAppInstallationRepositoryResult.class);
+    }
+
+    private static class GHAppInstallationRepositoryResult extends SearchResult<GHRepository> {
+        private GHRepository[] repositories;
+
+        @Override
+        GHRepository[] getItems(GitHub root) {
+            for (GHRepository item : repositories)
+                item.wrap(root);
+            return repositories;
+        }
+    }
+
     /**
      * Sets repositories url.
      *
@@ -290,7 +321,7 @@ public class GHAppInstallation extends GHObject {
      *             on error
      * @see <a href="https://developer.github.com/v3/apps/#delete-an-installation">Delete an installation</a>
      */
-    @Preview
+    @Preview(GAMBIT)
     @Deprecated
     public void deleteInstallation() throws IOException {
         root.createRequest()
@@ -312,7 +343,7 @@ public class GHAppInstallation extends GHObject {
      * @return a GHAppCreateTokenBuilder instance
      * @deprecated Use {@link GHAppInstallation#createToken()} instead.
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public GHAppCreateTokenBuilder createToken(Map<String, GHPermissionType> permissions) {
         return new GHAppCreateTokenBuilder(root,
@@ -329,7 +360,7 @@ public class GHAppInstallation extends GHObject {
      *
      * @return a GHAppCreateTokenBuilder instance
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public GHAppCreateTokenBuilder createToken() {
         return new GHAppCreateTokenBuilder(root, String.format("/app/installations/%d/access_tokens", getId()));

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

@@ -14,9 +14,7 @@ import java.util.Map;
  * @author Paulo Miguel Almeida
  * @see GHAppInstallation#createToken(Map) GHAppInstallation#createToken(Map)
  */
-public class GHAppInstallationToken {
+public class GHAppInstallationToken extends GitHubInteractiveObject {
-    private GitHub root;
-
     private String token;
     protected String expires_at;
     private Map<String, String> permissions;

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

@@ -9,7 +9,6 @@ import java.net.URL;
  * @see GHRelease#getAssets() GHRelease#getAssets()
  */
 public class GHAsset extends GHObject {
-    GitHub root;
     GHRepository owner;
     private String name;
     private String label;

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

@@ -33,7 +33,6 @@ public class GHAuthorization extends GHObject {
     public static final String WRITE_KEY = "write:public_key";
     public static final String ADMIN_KEY = "admin:public_key";
 
-    private GitHub root;
     private List<String> scopes;
     private String token;
     private String token_last_eight;

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

@@ -3,6 +3,7 @@ package org.kohsuke.github;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.kohsuke.github.internal.Previews;
 
 import java.io.IOException;
 import java.net.URL;
@@ -20,8 +21,7 @@ import javax.annotation.CheckForNull;
         value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
                 "URF_UNREAD_FIELD" },
         justification = "JSON API")
-public class GHBranch {
+public class GHBranch extends GitHubInteractiveObject {
-    private GitHub root;
     private GHRepository owner;
 
     private String name;
@@ -78,7 +78,7 @@ public class GHBranch {
      *
      * @return true if the push to this branch is restricted via branch protection.
      */
-    @Preview
+    @Preview(Previews.LUKE_CAGE)
     @Deprecated
     public boolean isProtected() {
         return protection;
@@ -89,7 +89,7 @@ public class GHBranch {
      *
      * @return API URL that deals with the protection of this branch.
      */
-    @Preview
+    @Preview(Previews.LUKE_CAGE)
     @Deprecated
     public URL getProtectionUrl() {
         return GitHubClient.parseURL(protection_url);
@@ -102,6 +102,8 @@ public class GHBranch {
      * @throws IOException
      *             the io exception
      */
+    @Preview(Previews.LUKE_CAGE)
+    @Deprecated
     public GHBranchProtection getProtection() throws IOException {
         return root.createRequest()
                 .withPreview(Previews.LUKE_CAGE)
@@ -135,7 +137,7 @@ public class GHBranch {
      * @return GHBranchProtectionBuilder for enabling protection
      * @see GHCommitStatus#getContext() GHCommitStatus#getContext()
      */
-    @Preview
+    @Preview(Previews.LUKE_CAGE)
     @Deprecated
     public GHBranchProtectionBuilder enableProtection() {
         return new GHBranchProtectionBuilder(this);

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

@@ -6,7 +6,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.util.Collection;
 
-import static org.kohsuke.github.Previews.ZZZAX;
+import static org.kohsuke.github.internal.Previews.ZZZAX;
 
 /**
  * The type GHBranchProtection.
@@ -17,14 +17,12 @@ import static org.kohsuke.github.Previews.ZZZAX;
         value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
                 "URF_UNREAD_FIELD" },
         justification = "JSON API")
-public class GHBranchProtection {
+public class GHBranchProtection extends GitHubInteractiveObject {
     private static final String REQUIRE_SIGNATURES_URI = "/required_signatures";
 
     @JsonProperty
     private EnforceAdmins enforceAdmins;
 
-    private GitHub root;
-
     @JsonProperty("required_pull_request_reviews")
     private RequiredReviews requiredReviews;
 
@@ -43,7 +41,7 @@ public class GHBranchProtection {
      * @throws IOException
      *             the io exception
      */
-    @Preview
+    @Preview(ZZZAX)
     @Deprecated
     public void enabledSignedCommits() throws IOException {
         requester().method("POST").withUrlPath(url + REQUIRE_SIGNATURES_URI).fetch(RequiredSignatures.class);
@@ -55,7 +53,7 @@ public class GHBranchProtection {
      * @throws IOException
      *             the io exception
      */
-    @Preview
+    @Preview(ZZZAX)
     @Deprecated
     public void disableSignedCommits() throws IOException {
         requester().method("DELETE").withUrlPath(url + REQUIRE_SIGNATURES_URI).send();
@@ -86,7 +84,7 @@ public class GHBranchProtection {
      * @throws IOException
      *             the io exception
      */
-    @Preview
+    @Preview(ZZZAX)
     @Deprecated
     public boolean getRequiredSignatures() throws IOException {
         return requester().withUrlPath(url + REQUIRE_SIGNATURES_URI).fetch(RequiredSignatures.class).enabled;

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

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static org.kohsuke.github.Previews.*;
+import static org.kohsuke.github.internal.Previews.LUKE_CAGE;
 
 /**
  * Builder to configure the branch protection settings.

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

@@ -1,7 +1,9 @@
 package org.kohsuke.github;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.kohsuke.github.internal.Previews;
 
 import java.io.IOException;
 import java.net.URL;
@@ -21,7 +23,6 @@ public class GHCheckRun extends GHObject {
 
     @JsonProperty("repository")
     GHRepository owner;
-    GitHub root;
 
     private String status;
     private String conclusion;
@@ -292,4 +293,15 @@ public class GHCheckRun extends GHObject {
         NOTICE, WARNING, FAILURE
     }
 
+    /**
+     * Updates this check run.
+     *
+     * @return a builder which you should customize, then call {@link GHCheckRunBuilder#create}
+     */
+    @Preview(Previews.ANTIOPE)
+    @Deprecated
+    public @NonNull GHCheckRunBuilder update() {
+        return new GHCheckRunBuilder(owner, getId());
+    }
+
 }

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

@@ -28,6 +28,7 @@ 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 org.kohsuke.github.internal.Previews;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -37,30 +38,45 @@ import java.util.List;
 import java.util.Locale;
 
 /**
- * Drafts a check run.
+ * Drafts or updates a check run.
  *
  * @see GHCheckRun
  * @see GHRepository#createCheckRun
  * @see <a href="https://developer.github.com/v3/checks/runs/#create-a-check-run">documentation</a>
+ * @see GHCheckRun#update()
+ * @see <a href="https://developer.github.com/v3/checks/runs/#update-a-check-run">documentation</a>
  */
 @SuppressFBWarnings(value = "URF_UNREAD_FIELD", justification = "Jackson serializes these even without a getter")
-@Preview
+@Preview(Previews.ANTIOPE)
 @Deprecated
 public final class GHCheckRunBuilder {
 
-    private final GHRepository repo;
+    protected final GHRepository repo;
-    private final Requester requester;
+    protected final Requester requester;
     private Output output;
     private List<Action> actions;
 
-    GHCheckRunBuilder(GHRepository repo, String name, String headSHA) {
+    private GHCheckRunBuilder(GHRepository repo, Requester requester) {
         this.repo = repo;
-        requester = repo.root.createRequest()
+        this.requester = requester;
-                .withPreview(Previews.ANTIOPE)
+    }
-                .method("POST")
+
-                .with("name", name)
+    GHCheckRunBuilder(GHRepository repo, String name, String headSHA) {
-                .with("head_sha", headSHA)
+        this(repo,
-                .withUrlPath(repo.getApiTailUrl("check-runs"));
+                repo.root.createRequest()
+                        .withPreview(Previews.ANTIOPE)
+                        .method("POST")
+                        .with("name", name)
+                        .with("head_sha", headSHA)
+                        .withUrlPath(repo.getApiTailUrl("check-runs")));
+    }
+
+    GHCheckRunBuilder(GHRepository repo, long checkId) {
+        this(repo,
+                repo.root.createRequest()
+                        .withPreview(Previews.ANTIOPE)
+                        .method("PATCH")
+                        .withUrlPath(repo.getApiTailUrl("check-runs/" + checkId)));
     }
 
     public @NonNull GHCheckRunBuilder withDetailsURL(@CheckForNull String detailsURL) {

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

@@ -8,7 +8,7 @@ import javax.annotation.Nonnull;
  * Iterable for check-runs listing.
  */
 class GHCheckRunsIterable extends PagedIterable<GHCheckRun> {
-    private GitHub root;
+    private final transient GitHub root;
     private final GitHubRequest request;
 
     private GHCheckRunsPage result;

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

@@ -21,7 +21,6 @@ public class GHCheckSuite extends GHObject {
 
     @JsonProperty("repository")
     GHRepository owner;
-    GitHub root;
 
     private String nodeId;
     private String headBranch;

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

@@ -11,6 +11,9 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
+import static org.kohsuke.github.internal.Previews.ANTIOPE;
+import static org.kohsuke.github.internal.Previews.GROOT;
+
 /**
  * A commit in a repository.
  *
@@ -63,7 +66,7 @@ public class GHCommit {
          * @return the authored date
          */
         public Date getAuthoredDate() {
-            return GitHubClient.parseDate(author.date);
+            return author.getDate();
         }
 
         /**
@@ -82,7 +85,7 @@ public class GHCommit {
          * @return the commit date
          */
         public Date getCommitDate() {
-            return GitHubClient.parseDate(committer.date);
+            return committer.getDate();
         }
 
         /**
@@ -119,7 +122,6 @@ public class GHCommit {
      * @deprecated Use {@link GitUser} instead.
      */
     public static class GHAuthor extends GitUser {
-        private String date;
     }
 
     /**
@@ -446,6 +448,39 @@ public class GHCommit {
         return owner.root.getUser(author.login);
     }
 
+    /**
+     * Retrieves a list of pull requests which contain this commit.
+     *
+     * @return {@link PagedIterable} with the pull requests which contain this commit
+     */
+    @Preview(GROOT)
+    @Deprecated
+    public PagedIterable<GHPullRequest> listPullRequests() {
+        return owner.root.createRequest()
+                .withPreview(GROOT)
+                .withUrlPath(String.format("/repos/%s/%s/commits/%s/pulls", owner.getOwnerName(), owner.getName(), sha))
+                .toIterable(GHPullRequest[].class, item -> item.wrapUp(owner));
+    }
+
+    /**
+     * Retrieves a list of branches where this commit is the head commit.
+     *
+     * @return {@link PagedIterable} with the branches where the commit is the head commit
+     * @throws IOException
+     *             the io exception
+     */
+    @Preview(GROOT)
+    @Deprecated
+    public PagedIterable<GHBranch> listBranchesWhereHead() throws IOException {
+        return owner.root.createRequest()
+                .withPreview(GROOT)
+                .withUrlPath(String.format("/repos/%s/%s/commits/%s/branches-where-head",
+                        owner.getOwnerName(),
+                        owner.getName(),
+                        sha))
+                .toIterable(GHBranch[].class, item -> item.wrap(owner));
+    }
+
     /**
      * List comments paged iterable.
      *
@@ -530,7 +565,7 @@ public class GHCommit {
      * @throws IOException
      *             on error
      */
-    @Preview
+    @Preview(ANTIOPE)
     @Deprecated
     public PagedIterable<GHCheckRun> getCheckRuns() throws IOException {
         return owner.getCheckRuns(sha);
@@ -538,7 +573,7 @@ public class GHCommit {
 
     /**
      * Some of the fields are not always filled in when this object is retrieved as a part of another API call.
-     * 
+     *
      * @throws IOException
      *             on error
      */

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

@@ -89,6 +89,19 @@ public class GHCommitBuilder {
         return this;
     }
 
+    /**
+     * Configures the PGP signature of this commit.
+     *
+     * @param signature
+     *            the signature calculated from the commit
+     *
+     * @return the gh commit builder
+     */
+    public GHCommitBuilder withSignature(String signature) {
+        req.with("signature", signature);
+        return this;
+    }
+
     /**
      * Configures the committer of this commit.
      *

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

@@ -5,7 +5,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.net.URL;
 
-import static org.kohsuke.github.Previews.*;
+import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL;
 
 /**
  * A comment attached to a commit (or a specific line in a specific file of a commit.)
@@ -121,7 +121,7 @@ public class GHCommitComment extends GHObject implements Reactable {
         this.body = body;
     }
 
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     public GHReaction createReaction(ReactionContent content) throws IOException {
         return owner.root.createRequest()
@@ -133,7 +133,7 @@ public class GHCommitComment extends GHObject implements Reactable {
                 .wrap(owner.root);
     }
 
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     public PagedIterable<GHReaction> listReactions() {
         return owner.root.createRequest()

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

@@ -1,6 +1,7 @@
 package org.kohsuke.github;
 
 import org.apache.commons.lang3.StringUtils;
+import org.kohsuke.github.internal.Previews;
 
 import java.io.IOException;
 
@@ -10,7 +11,7 @@ import java.io.IOException;
  * @author Marc de Verdelhan
  * @see GitHub#searchCommits() GitHub#searchCommits()
  */
-@Preview
+@Preview(Previews.CLOAK)
 @Deprecated
 public class GHCommitSearchBuilder extends GHSearchBuilder<GHCommit> {
     GHCommitSearchBuilder(GitHub root) {

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

@@ -18,8 +18,6 @@ public class GHCommitStatus extends GHObject {
     String context;
     GHUser creator;
 
-    private GitHub root;
-
     GHCommitStatus wrapUp(GitHub root) {
         if (creator != null)
             creator.wrapUp(root);

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

@@ -15,15 +15,13 @@ import java.util.Base64;
  * @see GHRepository#getFileContent(String) GHRepository#getFileContent(String)
  */
 @SuppressWarnings({ "UnusedDeclaration" })
-public class GHContent implements Refreshable {
+public class GHContent extends GitHubInteractiveObject implements Refreshable {
     /*
      * In normal use of this class, repository field is set via wrap(), but in the code search API, there's a nested
      * 'repository' field that gets populated from JSON.
      */
     private GHRepository repository;
 
-    private GitHub root;
-
     private String type;
     private String encoding;
     private long size;
@@ -102,7 +100,7 @@ public class GHContent implements Refreshable {
 
     /**
      * Gets target of a symlink. This will only be set if {@code "symlink".equals(getType())}
-     * 
+     *
      * @return the target
      */
     public String getTarget() {

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

@@ -1,168 +1,25 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.net.URL;
 
-import static org.kohsuke.github.Previews.BAPTISE;
+import static org.kohsuke.github.internal.Previews.BAPTISTE;
 
 /**
  * Creates a repository
  *
  * @author Kohsuke Kawaguchi
  */
-public class GHCreateRepositoryBuilder {
+public class GHCreateRepositoryBuilder extends GHRepositoryBuilder<GHCreateRepositoryBuilder> {
-    private final GitHub root;
-    protected final Requester builder;
-    private String apiUrlTail;
 
-    GHCreateRepositoryBuilder(GitHub root, String apiUrlTail, String name) {
+    public GHCreateRepositoryBuilder(String name, GitHub root, String apiTail) {
-        this.root = root;
+        super(GHCreateRepositoryBuilder.class, root, null);
-        this.apiUrlTail = apiUrlTail;
+        requester.method("POST").withUrlPath(apiTail);
-        this.builder = root.createRequest();
-        this.builder.with("name", name);
-    }
 
-    /**
+        try {
-     * Description for repository
+            name(name);
-     *
+        } catch (IOException e) {
-     * @param description
+            // not going to happen here
-     *            description of repository
+        }
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder description(String description) {
-        this.builder.with("description", description);
-        return this;
-    }
-
-    /**
-     * Homepage for repository
-     *
-     * @param homepage
-     *            homepage of repository
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder homepage(URL homepage) {
-        return homepage(homepage.toExternalForm());
-    }
-
-    /**
-     * Homepage for repository
-     *
-     * @param homepage
-     *            homepage of repository
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder homepage(String homepage) {
-        this.builder.with("homepage", homepage);
-        return this;
-    }
-
-    /**
-     * Creates a private repository
-     *
-     * @param enabled
-     *            private if true
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder private_(boolean enabled) {
-        this.builder.with("private", enabled);
-        return this;
-    }
-
-    /**
-     * Enables issue tracker
-     *
-     * @param enabled
-     *            true if enabled
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder issues(boolean enabled) {
-        this.builder.with("has_issues", enabled);
-        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
-     *
-     * @param enabled
-     *            true if enabled
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder wiki(boolean enabled) {
-        this.builder.with("has_wiki", enabled);
-        return this;
-    }
-
-    /**
-     * Enables downloads
-     *
-     * @param enabled
-     *            true if enabled
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder downloads(boolean enabled) {
-        this.builder.with("has_downloads", enabled);
-        return this;
-    }
-
-    /**
-     * If true, create an initial commit with empty README.
-     *
-     * @param enabled
-     *            true if enabled
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder autoInit(boolean enabled) {
-        this.builder.with("auto_init", enabled);
-        return this;
-    }
-
-    /**
-     * Allow or disallow squash-merging pull requests.
-     *
-     * @param enabled
-     *            true if enabled
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder allowSquashMerge(boolean enabled) {
-        this.builder.with("allow_squash_merge", enabled);
-        return this;
-    }
-
-    /**
-     * Allow or disallow merging pull requests with a merge commit.
-     *
-     * @param enabled
-     *            true if enabled
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder allowMergeCommit(boolean enabled) {
-        this.builder.with("allow_merge_commit", enabled);
-        return this;
-    }
-
-    /**
-     * Allow or disallow rebase-merging pull requests.
-     *
-     * @param enabled
-     *            true if enabled
-     * @return a builder to continue with building
-     */
-    public GHCreateRepositoryBuilder allowRebaseMerge(boolean enabled) {
-        this.builder.with("allow_rebase_merge", enabled);
-        return this;
     }
 
     /**
@@ -171,10 +28,11 @@ public class GHCreateRepositoryBuilder {
      * @param language
      *            template to base the ignore file on
      * @return a builder to continue with building See https://developer.github.com/v3/repos/#create
+     * @throws IOException
+     *             In case of any networking error or error from the server.
      */
-    public GHCreateRepositoryBuilder gitignoreTemplate(String language) {
+    public GHCreateRepositoryBuilder gitignoreTemplate(String language) throws IOException {
-        this.builder.with("gitignore_template", language);
+        return with("gitignore_template", language);
-        return this;
     }
 
     /**
@@ -183,10 +41,24 @@ public class GHCreateRepositoryBuilder {
      * @param license
      *            template to base the license file on
      * @return a builder to continue with building See https://developer.github.com/v3/repos/#create
+     * @throws IOException
+     *             In case of any networking error or error from the server.
      */
-    public GHCreateRepositoryBuilder licenseTemplate(String license) {
+    public GHCreateRepositoryBuilder licenseTemplate(String license) throws IOException {
-        this.builder.with("license_template", license);
+        return with("license_template", license);
-        return this;
+    }
+
+    /**
+     * If true, create an initial commit with empty README.
+     *
+     * @param enabled
+     *            true if enabled
+     * @return a builder to continue with building
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public GHCreateRepositoryBuilder autoInit(boolean enabled) throws IOException {
+        return with("auto_init", enabled);
     }
 
     /**
@@ -195,10 +67,12 @@ public class GHCreateRepositoryBuilder {
      * @param team
      *            team to grant access to
      * @return a builder to continue with building
+     * @throws IOException
+     *             In case of any networking error or error from the server.
      */
-    public GHCreateRepositoryBuilder team(GHTeam team) {
+    public GHCreateRepositoryBuilder team(GHTeam team) throws IOException {
         if (team != null)
-            this.builder.with("team_id", team.getId());
+            return with("team_id", team.getId());
         return this;
     }
 
@@ -208,13 +82,13 @@ public class GHCreateRepositoryBuilder {
      * @param enabled
      *            true if enabled
      * @return a builder to continue with building
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     * @deprecated Use {@link #isTemplate(boolean)} method instead
      */
-    @Preview
     @Deprecated
-    public GHCreateRepositoryBuilder templateRepository(boolean enabled) {
+    public GHCreateRepositoryBuilder templateRepository(boolean enabled) throws IOException {
-        this.builder.withPreview(BAPTISE);
+        return isTemplate(enabled);
-        this.builder.with("is_template", enabled);
-        return this;
     }
 
     /**
@@ -223,14 +97,15 @@ public class GHCreateRepositoryBuilder {
      * @param owner
      *            organization or personage
      * @return a builder to continue with building
+     * @throws IOException
+     *             In case of any networking error or error from the server.
      */
-    public GHCreateRepositoryBuilder owner(String owner) {
+    public GHCreateRepositoryBuilder owner(String owner) throws IOException {
-        this.builder.with("owner", owner);
+        return with("owner", owner);
-        return this;
     }
 
     /**
-     * Create repository from template repository.
+     * Create repository from template repository
      *
      * @param templateOwner
      *            template repository owner
@@ -239,11 +114,10 @@ public class GHCreateRepositoryBuilder {
      * @return a builder to continue with building
      * @see <a href="https://developer.github.com/v3/previews/">GitHub API Previews</a>
      */
-    @Preview
+    @Preview(BAPTISTE)
     @Deprecated
     public GHCreateRepositoryBuilder fromTemplateRepository(String templateOwner, String templateRepo) {
-        this.builder.withPreview(BAPTISE);
+        requester.withPreview(BAPTISTE).withUrlPath("/repos/" + templateOwner + "/" + templateRepo + "/generate");
-        this.apiUrlTail = "/repos/" + templateOwner + "/" + templateRepo + "/generate";
         return this;
     }
 
@@ -252,10 +126,9 @@ public class GHCreateRepositoryBuilder {
      *
      * @return the gh repository
      * @throws IOException
-     *             if repsitory cannot be created
+     *             if repository cannot be created
      */
     public GHRepository create() throws IOException {
-        return builder.method("POST").withUrlPath(apiUrlTail).fetch(GHRepository.class).wrap(root);
+        return done();
     }
-
 }

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

@@ -1,5 +1,7 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
@@ -14,7 +16,6 @@ import java.util.Map;
  */
 public class GHDeployment extends GHObject {
     private GHRepository owner;
-    private GitHub root;
     protected String sha;
     protected String ref;
     protected String task;
@@ -24,6 +25,9 @@ public class GHDeployment extends GHObject {
     protected String statuses_url;
     protected String repository_url;
     protected GHUser creator;
+    protected String original_environment;
+    protected boolean transient_environment;
+    protected boolean production_environment;
 
     GHDeployment wrap(GHRepository owner) {
         this.owner = owner;
@@ -82,13 +86,26 @@ public class GHDeployment extends GHObject {
 
     /**
      * Gets payload without assuming its type. It could be a String or a Map.
-     * 
+     *
      * @return the payload
      */
     public Object getPayloadObject() {
         return payload;
     }
 
+    /**
+     * The environment defined when the deployment was first created.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @return the original deployment environment
+     */
+    @Deprecated
+    @Preview(Previews.FLASH)
+    public String getOriginalEnvironment() {
+        return original_environment;
+    }
+
     /**
      * Gets environment.
      *
@@ -98,6 +115,33 @@ public class GHDeployment extends GHObject {
         return environment;
     }
 
+    /**
+     * Specifies if the given environment is specific to the deployment and will no longer exist at some point in the
+     * future.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @return the environment is transient
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    public boolean isTransientEnvironment() {
+        return transient_environment;
+    }
+
+    /**
+     * Specifies if the given environment is one that end-users directly interact with.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @return the environment is used by end-users directly
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    public boolean isProductionEnvironment() {
+        return production_environment;
+    }
+
     /**
      * Gets creator.
      *
@@ -154,6 +198,8 @@ public class GHDeployment extends GHObject {
     public PagedIterable<GHDeploymentStatus> listStatuses() {
         return root.createRequest()
                 .withUrlPath(statuses_url)
+                .withPreview(Previews.ANT_MAN)
+                .withPreview(Previews.FLASH)
                 .toIterable(GHDeploymentStatus[].class, item -> item.wrap(owner));
     }
 

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

@@ -1,5 +1,7 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.io.IOException;
 import java.util.List;
 
@@ -19,7 +21,10 @@ public class GHDeploymentBuilder {
      */
     public GHDeploymentBuilder(GHRepository repo) {
         this.repo = repo;
-        this.builder = repo.root.createRequest().method("POST");
+        this.builder = repo.root.createRequest()
+                .withPreview(Previews.ANT_MAN)
+                .withPreview(Previews.FLASH)
+                .method("POST");
     }
 
     /**
@@ -40,6 +45,7 @@ public class GHDeploymentBuilder {
      *
      * @param branch
      *            the branch
+     *
      * @return the gh deployment builder
      */
     public GHDeploymentBuilder ref(String branch) {
@@ -52,6 +58,7 @@ public class GHDeploymentBuilder {
      *
      * @param task
      *            the task
+     *
      * @return the gh deployment builder
      */
     public GHDeploymentBuilder task(String task) {
@@ -64,6 +71,7 @@ public class GHDeploymentBuilder {
      *
      * @param autoMerge
      *            the auto merge
+     *
      * @return the gh deployment builder
      */
     public GHDeploymentBuilder autoMerge(boolean autoMerge) {
@@ -76,6 +84,7 @@ public class GHDeploymentBuilder {
      *
      * @param requiredContexts
      *            the required contexts
+     *
      * @return the gh deployment builder
      */
     public GHDeploymentBuilder requiredContexts(List<String> requiredContexts) {
@@ -88,6 +97,7 @@ public class GHDeploymentBuilder {
      *
      * @param payload
      *            the payload
+     *
      * @return the gh deployment builder
      */
     public GHDeploymentBuilder payload(String payload) {
@@ -100,6 +110,7 @@ public class GHDeploymentBuilder {
      *
      * @param environment
      *            the environment
+     *
      * @return the gh deployment builder
      */
     public GHDeploymentBuilder environment(String environment) {
@@ -107,11 +118,47 @@ public class GHDeploymentBuilder {
         return this;
     }
 
+    /**
+     * Specifies if the given environment is specific to the deployment and will no longer exist at some point in the
+     * future.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @param transientEnvironment
+     *            the environment is transient
+     *
+     * @return the gh deployment builder
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    public GHDeploymentBuilder transientEnvironment(boolean transientEnvironment) {
+        builder.with("transient_environment", transientEnvironment);
+        return this;
+    }
+
+    /**
+     * Specifies if the given environment is one that end-users directly interact with.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @param productionEnvironment
+     *            the environment is used by end-users directly
+     *
+     * @return the gh deployment builder
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    public GHDeploymentBuilder productionEnvironment(boolean productionEnvironment) {
+        builder.with("production_environment", productionEnvironment);
+        return this;
+    }
+
     /**
      * Description gh deployment builder.
      *
      * @param description
      *            the description
+     *
      * @return the gh deployment builder
      */
     public GHDeploymentBuilder description(String description) {
@@ -123,6 +170,7 @@ public class GHDeploymentBuilder {
      * Create gh deployment.
      *
      * @return the gh deployment
+     *
      * @throws IOException
      *             the io exception
      */

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

@@ -1,8 +1,40 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 /**
  * Represents the state of deployment
  */
 public enum GHDeploymentState {
-    PENDING, SUCCESS, ERROR, FAILURE
+    PENDING,
+    SUCCESS,
+    ERROR,
+    FAILURE,
+
+    /**
+     * The state of the deployment currently reflects it's in progress.
+     *
+     * @deprecated until preview feature has graduated to stable
+     */
+    @Deprecated
+    @Preview(Previews.FLASH)
+    IN_PROGRESS,
+
+    /**
+     * The state of the deployment currently reflects it's queued up for processing.
+     *
+     * @deprecated until preview feature has graduated to stable
+     */
+    @Deprecated
+    @Preview(Previews.FLASH)
+    QUEUED,
+
+    /**
+     * The state of the deployment currently reflects it's no longer active.
+     *
+     * @deprecated until preview feature has graduated to stable
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    INACTIVE
 }

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

@@ -1,5 +1,7 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.net.URL;
 import java.util.Locale;
 
@@ -8,19 +10,21 @@ import java.util.Locale;
  */
 public class GHDeploymentStatus extends GHObject {
     private GHRepository owner;
-    private GitHub root;
     protected GHUser creator;
     protected String state;
     protected String description;
     protected String target_url;
+    protected String log_url;
     protected String deployment_url;
     protected String repository_url;
+    protected String environment_url;
 
     /**
      * Wrap gh deployment status.
      *
      * @param owner
      *            the owner
+     *
      * @return the gh deployment status
      */
     public GHDeploymentStatus wrap(GHRepository owner) {
@@ -34,12 +38,30 @@ public class GHDeploymentStatus extends GHObject {
     /**
      * Gets target url.
      *
+     * @deprecated Target url is deprecated in favor of {@link #getLogUrl() getLogUrl}
+     *
      * @return the target url
      */
+    @Deprecated
     public URL getTargetUrl() {
         return GitHubClient.parseURL(target_url);
     }
 
+    /**
+     * Gets target url.
+     * <p>
+     * This method replaces {@link #getTargetUrl() getTargetUrl}}.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @return the target url
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    public URL getLogUrl() {
+        return GitHubClient.parseURL(log_url);
+    }
+
     /**
      * Gets deployment url.
      *
@@ -49,6 +71,19 @@ public class GHDeploymentStatus extends GHObject {
         return GitHubClient.parseURL(deployment_url);
     }
 
+    /**
+     * Gets deployment environment url.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @return the deployment environment url
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    public URL getEnvironmentUrl() {
+        return GitHubClient.parseURL(environment_url);
+    }
+
     /**
      * Gets repository url.
      *

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

@@ -1,5 +1,7 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.io.IOException;
 
 /**
@@ -21,6 +23,7 @@ public class GHDeploymentStatusBuilder {
      *            the deployment id
      * @param state
      *            the state
+     *
      * @deprecated Use {@link GHDeployment#createStatus(GHDeploymentState)}
      */
     @Deprecated
@@ -31,15 +34,38 @@ public class GHDeploymentStatusBuilder {
     GHDeploymentStatusBuilder(GHRepository repo, long deploymentId, GHDeploymentState state) {
         this.repo = repo;
         this.deploymentId = deploymentId;
-        this.builder = repo.root.createRequest().method("POST");
+        this.builder = repo.root.createRequest()
+                .withPreview(Previews.ANT_MAN)
+                .withPreview(Previews.FLASH)
+                .method("POST");
+
         this.builder.with("state", state);
     }
 
+    /**
+     * Add an inactive status to all prior non-transient, non-production environment deployments with the same
+     * repository and environment name as the created status's deployment.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @param autoInactive
+     *            Add inactive status flag
+     *
+     * @return the gh deployment status builder
+     */
+    @Deprecated
+    @Preview({ Previews.ANT_MAN, Previews.FLASH })
+    public GHDeploymentStatusBuilder autoInactive(boolean autoInactive) {
+        this.builder.with("auto_inactive", autoInactive);
+        return this;
+    }
+
     /**
      * Description gh deployment status builder.
      *
      * @param description
      *            the description
+     *
      * @return the gh deployment status builder
      */
     public GHDeploymentStatusBuilder description(String description) {
@@ -47,13 +73,70 @@ public class GHDeploymentStatusBuilder {
         return this;
     }
 
+    /**
+     * Name for the target deployment environment, which can be changed when setting a deploy status.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @param environment
+     *            the environment name
+     *
+     * @return the gh deployment status builder
+     */
+    @Deprecated
+    @Preview(Previews.FLASH)
+    public GHDeploymentStatusBuilder environment(String environment) {
+        this.builder.with("environment", environment);
+        return this;
+    }
+
+    /**
+     * The URL for accessing the environment
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @param environmentUrl
+     *            the environment url
+     *
+     * @return the gh deployment status builder
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    public GHDeploymentStatusBuilder environmentUrl(String environmentUrl) {
+        this.builder.with("environment_url", environmentUrl);
+        return this;
+    }
+
+    /**
+     * The full URL of the deployment's output.
+     * <p>
+     * This method replaces {@link #targetUrl(String) targetUrl}.
+     *
+     * @deprecated until preview feature has graduated to stable
+     *
+     * @param logUrl
+     *            the deployment output url
+     *
+     * @return the gh deployment status builder
+     */
+    @Deprecated
+    @Preview(Previews.ANT_MAN)
+    public GHDeploymentStatusBuilder logUrl(String logUrl) {
+        this.builder.with("log_url", logUrl);
+        return this;
+    }
+
     /**
      * Target url gh deployment status builder.
      *
+     * @deprecated Target url is deprecated in favor of {@link #logUrl(String) logUrl}
+     *
      * @param targetUrl
      *            the target url
+     *
      * @return the gh deployment status builder
      */
+    @Deprecated
     public GHDeploymentStatusBuilder targetUrl(String targetUrl) {
         this.builder.with("target_url", targetUrl);
         return this;
@@ -63,6 +146,7 @@ public class GHDeploymentStatusBuilder {
      * Create gh deployment status.
      *
      * @return the gh deployment status
+     *
      * @throws IOException
      *             the io exception
      */

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

@@ -1,7 +1,7 @@
 package org.kohsuke.github;
 
-import com.fasterxml.jackson.annotation.JacksonInject;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.kohsuke.github.internal.Previews;
 
 import java.io.IOException;
 import java.net.URL;
@@ -18,8 +18,6 @@ import javax.annotation.Nonnull;
  */
 public class GHDiscussion extends GHObject {
 
-    @JacksonInject
-    private GitHub root;
     private GHTeam team;
     private long number;
     private String body, title, htmlUrl;
@@ -130,7 +128,7 @@ public class GHDiscussion extends GHObject {
      *
      * @return a {@link GHDiscussion.Updater}
      */
-    @Preview
+    @Preview(Previews.SQUIRREL_GIRL)
     @Deprecated
     public GHDiscussion.Updater update() {
         return new GHDiscussion.Updater(this);
@@ -141,7 +139,7 @@ public class GHDiscussion extends GHObject {
      *
      * @return a {@link GHDiscussion.Setter}
      */
-    @Preview
+    @Preview(Previews.SQUIRREL_GIRL)
     @Deprecated
     public GHDiscussion.Setter set() {
         return new GHDiscussion.Setter(this);

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

@@ -12,9 +12,7 @@ import java.util.Date;
  * @author Kohsuke Kawaguchi
  */
 @SuppressFBWarnings(value = "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", justification = "JSON API")
-public class GHEventInfo {
+public class GHEventInfo extends GitHubInteractiveObject {
-    private GitHub root;
-
     // we don't want to expose Jackson dependency to the user. This needs databinding
     private ObjectNode payload;
 

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

@@ -23,7 +23,6 @@ import java.util.Map.Entry;
 public class GHGist extends GHObject {
 
     final GHUser owner;
-    final GitHub root;
 
     private String forks_url, commits_url, id, git_pull_url, git_push_url, html_url;
 
@@ -123,7 +122,7 @@ public class GHGist extends GHObject {
 
     /**
      * Get the html url.
-     * 
+     *
      * @return the github html url
      */
     public URL getHtmlUrl() {

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

@@ -13,7 +13,6 @@ import javax.annotation.Nonnull;
  * @see GitHub#createGist() GitHub#createGist()
  */
 public class GHGistBuilder {
-    private final GitHub root;
     private final Requester req;
     private final LinkedHashMap<String, Object> files = new LinkedHashMap<String, Object>();
 
@@ -24,7 +23,6 @@ public class GHGistBuilder {
      *            the root
      */
     public GHGistBuilder(GitHub root) {
-        this.root = root;
         req = root.createRequest().method("POST");
     }
 

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

@@ -12,8 +12,7 @@ import java.util.Map;
  * functionality
  */
 class GHHooks {
-    static abstract class Context {
+    static abstract class Context extends GitHubInteractiveObject {
-        private final GitHub root;
 
         private Context(GitHub root) {
             this.root = root;

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

@@ -16,7 +16,6 @@ import java.net.URL;
                 "UUF_UNUSED_FIELD" },
         justification = "JSON API")
 public class GHInvitation extends GHObject {
-    /* package almost final */ GitHub root;
 
     private int id;
     private GHRepository repository;

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

@@ -39,7 +39,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 
-import static org.kohsuke.github.Previews.SQUIRREL_GIRL;
+import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL;
 
 /**
  * Represents an issue on GitHub.
@@ -53,7 +53,6 @@ import static org.kohsuke.github.Previews.SQUIRREL_GIRL;
 public class GHIssue extends GHObject implements Reactable {
     private static final String ASSIGNEES = "assignees";
 
-    GitHub root;
     GHRepository owner;
 
     // API v3
@@ -158,10 +157,8 @@ public class GHIssue extends GHObject implements Reactable {
      * Gets labels.
      *
      * @return the labels
-     * @throws IOException
-     *             the io exception
      */
-    public Collection<GHLabel> getLabels() throws IOException {
+    public Collection<GHLabel> getLabels() {
         if (labels == null) {
             return Collections.emptyList();
         }
@@ -450,7 +447,7 @@ public class GHIssue extends GHObject implements Reactable {
                 .toIterable(GHIssueComment[].class, item -> item.wrapUp(this));
     }
 
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     public GHReaction createReaction(ReactionContent content) throws IOException {
         return root.createRequest()
@@ -462,7 +459,7 @@ public class GHIssue extends GHObject implements Reactable {
                 .wrap(root);
     }
 
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     public PagedIterable<GHReaction> listReactions() {
         return root.createRequest()

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

@@ -26,7 +26,7 @@ package org.kohsuke.github;
 import java.io.IOException;
 import java.net.URL;
 
-import static org.kohsuke.github.Previews.*;
+import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL;
 
 /**
  * Comment to the issue
@@ -126,7 +126,7 @@ public class GHIssueComment extends GHObject implements Reactable {
         owner.root.createRequest().method("DELETE").withUrlPath(getApiRoute()).send();
     }
 
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     public GHReaction createReaction(ReactionContent content) throws IOException {
         return owner.root.createRequest()
@@ -138,7 +138,7 @@ public class GHIssueComment extends GHObject implements Reactable {
                 .wrap(owner.root);
     }
 
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     public PagedIterable<GHReaction> listReactions() {
         return owner.root.createRequest()

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

@@ -9,9 +9,7 @@ import java.util.Date;
  *
  * @author Martin van Zijl
  */
-public class GHIssueEvent {
+public class GHIssueEvent extends GitHubInteractiveObject {
-    private GitHub root;
-
     private long id;
     private String node_id;
     private String url;

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

@@ -31,4 +31,4 @@ package org.kohsuke.github;
  */
 public enum GHIssueState {
     OPEN, CLOSED, ALL
-}
+}

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

@@ -9,9 +9,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  * @author Kohsuke Kawaguchi
  */
 @SuppressFBWarnings(value = "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", justification = "JSON API")
-public class GHKey {
+public class GHKey extends GitHubInteractiveObject {
-    /* package almost final */ GitHub root;
-
     protected String url, key, title;
     protected boolean verified;
     protected int id;

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

@@ -20,7 +20,7 @@ import javax.annotation.Nonnull;
  * @see GHIssue#getLabels() GHIssue#getLabels()
  * @see GHRepository#listLabels() GHRepository#listLabels()
  */
-public class GHLabel {
+public class GHLabel extends GitHubInteractiveObject {
 
     @Nonnull
     private String url, name, color;
@@ -28,9 +28,6 @@ public class GHLabel {
     @CheckForNull
     private String description;
 
-    @Nonnull
-    private final GitHub root;
-
     @JsonCreator
     private GHLabel(@JacksonInject @Nonnull GitHub root) {
         this.root = root;
@@ -132,7 +129,7 @@ public class GHLabel {
      * @throws IOException
      *             the io exception
      */
-    @Preview
+    @BetaApi
     @Deprecated
     static Creator create(GHRepository repository) throws IOException {
         return new Creator(repository);
@@ -179,7 +176,7 @@ public class GHLabel {
      *
      * @return a {@link Updater}
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public Updater update() {
         return new Updater(this);
@@ -187,10 +184,10 @@ public class GHLabel {
 
     /**
      * Begins a single property update.
-     * 
+     *
      * @return a {@link Setter}
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public Setter set() {
         return new Setter(this);
@@ -227,7 +224,7 @@ public class GHLabel {
      *
      * {@link #done()} is called automatically after the property is set.
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public static class Setter extends GHLabelBuilder<GHLabel> {
         private Setter(@Nonnull GHLabel base) {
@@ -241,7 +238,7 @@ public class GHLabel {
      *
      * Consumer must call {@link #done()} to commit changes.
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public static class Updater extends GHLabelBuilder<Updater> {
         private Updater(@Nonnull GHLabel base) {
@@ -255,7 +252,7 @@ public class GHLabel {
      *
      * Consumer must call {@link #done()} to create the new instance.
      */
-    @Preview
+    @BetaApi
     @Deprecated
     public static class Creator extends GHLabelBuilder<Creator> {
         private Creator(@Nonnull GHRepository repository) {

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

@@ -38,21 +38,21 @@ class GHLabelBuilder<S> extends AbstractBuilder<GHLabel, S> {
     }
 
     @Nonnull
-    @Preview
+    @BetaApi
     @Deprecated
     public S name(String value) throws IOException {
         return with("name", value);
     }
 
     @Nonnull
-    @Preview
+    @BetaApi
     @Deprecated
     public S color(String value) throws IOException {
         return with("color", value);
     }
 
     @Nonnull
-    @Preview
+    @BetaApi
     @Deprecated
     public S description(String value) throws IOException {
         return with("description", value);

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

@@ -44,9 +44,6 @@ import java.util.Objects;
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
 public class GHLicense extends GHObject {
-    @SuppressFBWarnings("IS2_INCONSISTENT_SYNC")
-    // root is set before the object is returned to the app
-    /* package almost final */ GitHub root;
 
     // these fields are always present, even in the short form
     protected String key, name;

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

@@ -9,9 +9,7 @@ import java.net.URL;
  * @see GitHub#getMyMarketplacePurchases()
  * @see GHMarketplaceListAccountBuilder#createRequest()
  */
-public class GHMarketplaceAccount {
+public class GHMarketplaceAccount extends GitHubInteractiveObject {
-
-    protected GitHub root;
     private String url;
     private long id;
     private String login;

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

@@ -8,8 +8,7 @@ import java.io.IOException;
  * @author Paulo Miguel Almeida
  * @see GHMarketplacePlan#listAccounts()
  */
-public class GHMarketplaceListAccountBuilder {
+public class GHMarketplaceListAccountBuilder extends GitHubInteractiveObject {
-    private final GitHub root;
     private final Requester builder;
     private final long planId;
 

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

@@ -10,8 +10,7 @@ import java.util.Date;
  * @author Paulo Miguel Almeida
  * @see GHMarketplaceListAccountBuilder#createRequest()
  */
-public class GHMarketplacePendingChange {
+public class GHMarketplacePendingChange extends GitHubInteractiveObject {
-    private GitHub root;
     private long id;
     @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
     private Long unitCount;

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

@@ -11,9 +11,7 @@ import java.util.List;
  * @author Paulo Miguel Almeida
  * @see GitHub#listMarketplacePlans()
  */
-public class GHMarketplacePlan {
+public class GHMarketplacePlan extends GitHubInteractiveObject {
-
-    private GitHub root;
     private String url;
     private String accountsUrl;
     private long id;

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

@@ -10,9 +10,8 @@ import java.util.Date;
  * @author Paulo Miguel Almeida
  * @see GHMarketplaceListAccountBuilder#createRequest() GHMarketplaceListAccountBuilder#createRequest()
  */
-public class GHMarketplacePurchase {
+public class GHMarketplacePurchase extends GitHubInteractiveObject {
 
-    private GitHub root;
     private String billingCycle;
     private String nextBillingDate;
     private boolean onFreeTrial;

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

@@ -10,8 +10,7 @@ import java.util.Date;
  * @author Paulo Miguel Almeida
  * @see GitHub#getMyMarketplacePurchases()
  */
-public class GHMarketplaceUserPurchase {
+public class GHMarketplaceUserPurchase extends GitHubInteractiveObject {
-    protected GitHub root;
     private String billingCycle;
     private String nextBillingDate;
     private boolean onFreeTrial;

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

@@ -10,9 +10,7 @@ import java.util.Locale;
  * @author Kohsuke Kawaguchi
  * @see GHMyself#listOrgMemberships() GHMyself#listOrgMemberships()
  */
-public class GHMembership /* extends GHObject --- but it doesn't have id, created_at, etc. */ {
+public class GHMembership extends GitHubInteractiveObject {
-    GitHub root;
-
     String url;
     String state;
     String role;

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

@@ -11,7 +11,6 @@ import java.util.Locale;
  * @author Yusuke Kokubo
  */
 public class GHMilestone extends GHObject {
-    GitHub root;
     GHRepository owner;
 
     GHUser creator;

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

@@ -7,4 +7,4 @@ package org.kohsuke.github;
  */
 public enum GHMilestoneState {
     OPEN, CLOSED
-}
+}

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

@@ -23,9 +23,7 @@ import java.util.NoSuchElementException;
  * @see GitHub#listNotifications() GitHub#listNotifications()
  * @see GHRepository#listNotifications() GHRepository#listNotifications()
  */
-public class GHNotificationStream implements Iterable<GHThread> {
+public class GHNotificationStream extends GitHubInteractiveObject implements Iterable<GHThread> {
-    private final GitHub root;
-
     private Boolean all, participating;
     private String since;
     private String apiUrl;

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

@@ -20,7 +20,7 @@ import javax.annotation.CheckForNull;
  */
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
-public abstract class GHObject {
+public abstract class GHObject extends GitHubInteractiveObject {
     /**
      * Capture response HTTP headers on the state object.
      */
@@ -38,7 +38,7 @@ public abstract class GHObject {
 
     /**
      * Called by Jackson
-     * 
+     *
      * @param responseInfo
      *            the {@link GitHubResponse.ResponseInfo} to get headers from.
      */

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

@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static org.kohsuke.github.Previews.INERTIA;
+import static org.kohsuke.github.internal.Previews.INERTIA;
 
 /**
  * The type GHOrganization.
@@ -97,7 +97,7 @@ public class GHOrganization extends GHPerson {
      * @return the gh create repository builder
      */
     public GHCreateRepositoryBuilder createRepository(String name) {
-        return new GHCreateRepositoryBuilder(root, "/orgs/" + login + "/repos", name);
+        return new GHCreateRepositoryBuilder(name, root, "/orgs/" + login + "/repos");
     }
 
     /**
@@ -181,7 +181,7 @@ 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

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

@@ -28,7 +28,7 @@ import java.util.Locale;
 
 /**
  * Permission for a user in a repository.
- * 
+ *
  * @see <a href="https://developer.github.com/v3/repos/collaborators/#review-a-users-permission-level">API</a>
  */
 class GHPermission {

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

@@ -18,7 +18,6 @@ import java.util.TreeMap;
  * @author Kohsuke Kawaguchi
  */
 public abstract class GHPerson extends GHObject {
-    /* package almost final */ GitHub root;
 
     // core data fields that exist even for "small" user data (such as the user info in pull request)
     protected String login, avatar_url;
@@ -236,7 +235,7 @@ public abstract class GHPerson extends GHObject {
 
     /**
      * Gets the Twitter Username of this user, like "GitHub"
-     * 
+     *
      * @return the Twitter username
      * @throws IOException
      *             the io exception

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

@@ -28,7 +28,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.Locale;
 
-import static org.kohsuke.github.Previews.INERTIA;
+import static org.kohsuke.github.internal.Previews.INERTIA;
 
 /**
  * A GitHub project.
@@ -37,7 +37,6 @@ import static org.kohsuke.github.Previews.INERTIA;
  * @see <a href="https://developer.github.com/v3/projects/">Projects</a>
  */
 public class GHProject extends GHObject {
-    protected GitHub root;
     protected GHObject owner;
 
     private String owner_url;
@@ -311,4 +310,4 @@ public class GHProject extends GHObject {
                 .fetch(GHProjectColumn.class)
                 .wrap(this);
     }
-}
+}

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

@@ -6,7 +6,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
 
-import static org.kohsuke.github.Previews.INERTIA;
+import static org.kohsuke.github.internal.Previews.INERTIA;
 
 /**
  * The type GHProjectCard.
@@ -14,7 +14,6 @@ import static org.kohsuke.github.Previews.INERTIA;
  * @author Gunnar Skjold
  */
 public class GHProjectCard extends GHObject {
-    private GitHub root;
     private GHProject project;
     private GHProjectColumn column;
 

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

@@ -4,7 +4,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
 
-import static org.kohsuke.github.Previews.INERTIA;
+import static org.kohsuke.github.internal.Previews.INERTIA;
 
 /**
  * The type GHProjectColumn.
@@ -12,7 +12,6 @@ import static org.kohsuke.github.Previews.INERTIA;
  * @author Gunnar Skjold
  */
 public class GHProjectColumn extends GHObject {
-    protected GitHub root;
     protected GHProject project;
 
     private String name;

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

@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -37,7 +36,8 @@ import java.util.Objects;
 
 import javax.annotation.CheckForNull;
 
-import static org.kohsuke.github.Previews.SHADOW_CAT;
+import static org.kohsuke.github.internal.Previews.LYDIAN;
+import static org.kohsuke.github.internal.Previews.SHADOW_CAT;
 
 /**
  * A pull request.
@@ -72,13 +72,6 @@ public class GHPullRequest extends GHIssue implements Refreshable {
     private GHUser[] requested_reviewers;
     private GHTeam[] requested_teams;
 
-    /**
-     * GitHub doesn't return some properties of {@link GHIssue} when requesting the GET on the 'pulls' API route as
-     * opposed to 'issues' API route. This flag remembers whether we made the GET call on the 'issues' route on this
-     * object to fill in those missing details
-     */
-    private transient boolean fetchedIssueDetails;
-
     GHPullRequest wrapUp(GHRepository owner) {
         this.wrap(owner);
         return wrapUp(owner.root);
@@ -177,12 +170,6 @@ public class GHPullRequest extends GHIssue implements Refreshable {
         return GitHubClient.parseDate(merged_at);
     }
 
-    @Override
-    public Collection<GHLabel> getLabels() throws IOException {
-        fetchIssue();
-        return super.getLabels();
-    }
-
     @Override
     public GHUser getClosedBy() {
         return null;
@@ -565,6 +552,41 @@ public class GHPullRequest extends GHIssue implements Refreshable {
                 .send();
     }
 
+    /**
+     * Set the base branch on the pull request
+     *
+     * @param newBaseBranch
+     *            the name of the new base branch
+     * @throws IOException
+     *             the io exception
+     * @return the updated pull request
+     */
+    public GHPullRequest setBaseBranch(String newBaseBranch) throws IOException {
+        return root.createRequest()
+                .method("PATCH")
+                .with("base", newBaseBranch)
+                .withUrlPath(getApiRoute())
+                .fetch(GHPullRequest.class)
+                .wrapUp(root);
+    }
+
+    /**
+     * Updates the branch. The same as pressing the button in the web GUI.
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    @Preview(LYDIAN)
+    @Deprecated
+    public void updateBranch() throws IOException {
+        root.createRequest()
+                .withPreview(LYDIAN)
+                .method("PUT")
+                .with("expected_head_sha", head.getSha())
+                .withUrlPath(getApiRoute() + "/update-branch")
+                .send();
+    }
+
     /**
      * Merge this pull request.
      * <p>
@@ -626,10 +648,4 @@ public class GHPullRequest extends GHIssue implements Refreshable {
         MERGE, SQUASH, REBASE
     }
 
-    private void fetchIssue() throws IOException {
-        if (!fetchedIssueDetails) {
-            root.createRequest().withUrlPath(getIssuesApiRoute()).fetchInto(this);
-            fetchedIssueDetails = true;
-        }
-    }
 }

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

@@ -0,0 +1,86 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Wrapper to define changed fields on pull_request action="edited"
+ *
+ * @see GHEventPayload.PullRequest
+ */
+@SuppressFBWarnings("UWF_UNWRITTEN_FIELD")
+public class GHPullRequestChanges {
+
+    private GHCommitPointer base;
+    private GHFrom title;
+    private GHFrom body;
+
+    /**
+     * Old target branch for pull request.
+     *
+     * @return old target branch info (or null if not changed)
+     */
+    public GHCommitPointer getBase() {
+        return base;
+    }
+
+    /**
+     * Old pull request title.
+     *
+     * @return old pull request title (or null if not changed)
+     */
+    public GHFrom getTitle() {
+        return title;
+    }
+
+    /**
+     * Old pull request body.
+     *
+     * @return old pull request body (or null if not changed)
+     */
+    public GHFrom getBody() {
+        return body;
+    }
+
+    /**
+     * @see org.kohsuke.github.GHCommitPointer
+     */
+    public static class GHCommitPointer {
+        private GHFrom ref;
+        private GHFrom sha;
+
+        /**
+         * Named ref to the commit. This (from value) appears to be a "short ref" that doesn't include "refs/heads/"
+         * portion.
+         *
+         * @return the ref
+         */
+        public GHFrom getRef() {
+            return ref;
+        }
+
+        /**
+         * SHA1 of the commit.
+         *
+         * @return sha
+         */
+        public GHFrom getSha() {
+            return sha;
+        }
+    }
+
+    /**
+     * Wrapper for changed values.
+     */
+    public static class GHFrom {
+        private String from;
+
+        /**
+         * Previous value that was changed.
+         *
+         * @return previous value
+         */
+        public String getFrom() {
+            return from;
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 package org.kohsuke.github;
 
-import static org.kohsuke.github.Previews.SHADOW_CAT;
+import static org.kohsuke.github.internal.Previews.SHADOW_CAT;
 
 /**
  * Lists up pull requests with some filtering and sorting.

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

@@ -46,6 +46,7 @@ public class GHPullRequestReview extends GHObject {
     private String commit_id;
     private GHPullRequestReviewState state;
     private String submitted_at;
+    private String html_url;
 
     GHPullRequestReview wrapUp(GHPullRequest owner) {
         this.owner = owner;
@@ -102,7 +103,7 @@ public class GHPullRequestReview extends GHObject {
 
     @Override
     public URL getHtmlUrl() {
-        return null;
+        return GitHubClient.parseURL(html_url);
     }
 
     /**

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

@@ -28,7 +28,7 @@ import java.net.URL;
 
 import javax.annotation.CheckForNull;
 
-import static org.kohsuke.github.Previews.*;
+import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL;
 
 /**
  * Review comment to the pull request
@@ -198,7 +198,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
                 .wrapUp(owner);
     }
 
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     public GHReaction createReaction(ReactionContent content) throws IOException {
         return owner.root.createRequest()
@@ -210,7 +210,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable {
                 .wrap(owner.root);
     }
 
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     public PagedIterable<GHReaction> listReactions() {
         return owner.root.createRequest()

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

@@ -7,8 +7,7 @@ package org.kohsuke.github;
  *            the type parameter
  * @author Kohsuke Kawaguchi
  */
-public abstract class GHQueryBuilder<T> {
+public abstract class GHQueryBuilder<T> extends GitHubInteractiveObject {
-    protected final GitHub root;
     protected final Requester req;
 
     GHQueryBuilder(GitHub root) {

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

@@ -266,7 +266,7 @@ public class GHRateLimit {
     /**
      * Merge a {@link GHRateLimit} with another one to create a new {@link GHRateLimit} keeping the latest
      * {@link Record}s from each.
-     * 
+     *
      * @param newLimit
      *            {@link GHRateLimit} with potentially updated {@link Record}s.
      * @return a merged {@link GHRateLimit} with the latest {@link Record}s from these two instances. If the merged
@@ -458,7 +458,7 @@ public class GHRateLimit {
          * {@link Record}s with earlier {@link #getResetEpochSeconds()} are replaced by those with later.
          * {@link Record}s with the same {@link #getResetEpochSeconds()} are replaced by those with less remaining
          * count.
-         * 
+         *
          * {@link UnknownLimitRecord}s compare with each other like regular {@link Record}s.
          *
          * {@link Record}s are replaced by {@link UnknownLimitRecord}s only when the current {@link Record} is expired

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

@@ -3,7 +3,7 @@ package org.kohsuke.github;
 import java.io.IOException;
 import java.net.URL;
 
-import static org.kohsuke.github.Previews.*;
+import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL;
 
 /**
  * Reaction to issue, comment, PR, and so on.
@@ -11,10 +11,9 @@ import static org.kohsuke.github.Previews.*;
  * @author Kohsuke Kawaguchi
  * @see Reactable
  */
-@Preview
+@Preview(SQUIRREL_GIRL)
 @Deprecated
 public class GHReaction extends GHObject {
-    private GitHub root;
 
     private GHUser user;
     private ReactionContent content;

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

@@ -11,9 +11,7 @@ import java.net.URL;
  *
  * @author Michael Clarke
  */
-public class GHRef {
+public class GHRef extends GitHubInteractiveObject {
-    /* package almost final */ GitHub root;
-
     private String ref, url;
     private GHObject object;
 

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

@@ -15,14 +15,15 @@ import static java.lang.String.*;
  * Release in a github repository.
  *
  * @see GHRepository#getReleases() GHRepository#getReleases()
+ * @see GHRepository#listReleases() () GHRepository#listReleases()
  * @see GHRepository#createRelease(String) GHRepository#createRelease(String)
  */
 public class GHRelease extends GHObject {
-    GitHub root;
     GHRepository owner;
 
     private String html_url;
     private String assets_url;
+    private List<GHAsset> assets;
     private String upload_url;
     private String tag_name;
     private String target_commitish;
@@ -249,18 +250,44 @@ public class GHRelease extends GHObject {
     }
 
     /**
-     * Gets assets.
+     * Get the cached assets.
+     *
+     * @return the assets
+     *
+     * @deprecated This should be the default behavior of {@link #getAssets()} in a future release. This method is
+     *             introduced in addition to enable a transition to using cached asset information while keeping the
+     *             existing logic in place for backwards compatibility.
+     */
+    @Deprecated
+    public List<GHAsset> assets() {
+        return assets;
+    }
+
+    /**
+     * Re-fetch the assets of this release.
+     *
+     * @return the assets
+     * @throws IOException
+     *             the io exception
+     * @deprecated The behavior of this method will change in a future release. It will then provide cached assets as
+     *             provided by {@link #assets()}. Use {@link #listAssets()} instead to fetch up-to-date information of
+     *             assets.
+     */
+    @Deprecated
+    public List<GHAsset> getAssets() throws IOException {
+        return listAssets().toList();
+    }
+
+    /**
+     * Re-fetch the assets of this release.
      *
      * @return the assets
      * @throws IOException
      *             the io exception
      */
-    public List<GHAsset> getAssets() throws IOException {
+    public PagedIterable<GHAsset> listAssets() throws IOException {
         Requester builder = owner.root.createRequest();
-
+        return builder.withUrlPath(getApiTailUrl("assets")).toIterable(GHAsset[].class, item -> item.wrap(this));
-        return builder.withUrlPath(getApiTailUrl("assets"))
-                .toIterable(GHAsset[].class, item -> item.wrap(this))
-                .toList();
     }
 
     /**

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

@@ -54,8 +54,16 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.WeakHashMap;
 
+import javax.annotation.Nonnull;
+
 import static java.util.Arrays.*;
-import static org.kohsuke.github.Previews.*;
+import static org.kohsuke.github.internal.Previews.ANTIOPE;
+import static org.kohsuke.github.internal.Previews.ANT_MAN;
+import static org.kohsuke.github.internal.Previews.BAPTISTE;
+import static org.kohsuke.github.internal.Previews.FLASH;
+import static org.kohsuke.github.internal.Previews.INERTIA;
+import static org.kohsuke.github.internal.Previews.MERCY;
+import static org.kohsuke.github.internal.Previews.SHADOW_CAT;
 
 /**
  * A repository on GitHub.
@@ -66,7 +74,6 @@ 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 */ transient GitHub root;
 
     private String nodeId, description, homepage, name, full_name;
 
@@ -163,6 +170,8 @@ public class GHRepository extends GHObject {
                 .with("task", task)
                 .with("environment", environment)
                 .withUrlPath(getApiTailUrl("deployments"))
+                .withPreview(ANT_MAN)
+                .withPreview(FLASH)
                 .toIterable(GHDeployment[].class, item -> item.wrap(this));
     }
 
@@ -178,6 +187,8 @@ public class GHRepository extends GHObject {
     public GHDeployment getDeployment(long id) throws IOException {
         return root.createRequest()
                 .withUrlPath(getApiTailUrl("deployments/" + id))
+                .withPreview(ANT_MAN)
+                .withPreview(FLASH)
                 .fetch(GHDeployment.class)
                 .wrap(this);
     }
@@ -704,7 +715,7 @@ public class GHRepository extends GHObject {
      * @return the boolean
      */
     @Deprecated
-    @Preview
+    @Preview(BAPTISTE)
     public boolean isTemplate() {
         // isTemplate is still in preview, we do not want to retrieve it unless needed.
         if (isTemplate == null) {
@@ -814,6 +825,13 @@ public class GHRepository extends GHObject {
         return size;
     }
 
+    /**
+     * Affiliation of a repository collaborator
+     */
+    public enum CollaboratorAffiliation {
+        ALL, DIRECT, OUTSIDE
+    }
+
     /**
      * Gets the collaborators on this repository. This set always appear to include the owner.
      *
@@ -837,6 +855,19 @@ public class GHRepository extends GHObject {
         return listUsers("collaborators");
     }
 
+    /**
+     * Lists up the collaborators on this repository.
+     *
+     * @param affiliation
+     *            Filter users by affiliation
+     * @return Users paged iterable
+     * @throws IOException
+     *             the io exception
+     */
+    public PagedIterable<GHUser> listCollaborators(CollaboratorAffiliation affiliation) throws IOException {
+        return listUsers(root.createRequest().with("affiliation", affiliation), "collaborators");
+    }
+
     /**
      * Lists all
      * <a href="https://help.github.com/articles/assigning-issues-and-pull-requests-to-other-github-users/">the
@@ -884,6 +915,29 @@ public class GHRepository extends GHObject {
         return r;
     }
 
+    /**
+     * Gets the names of the collaborators on this repository. This method deviates from the principle of this library
+     * but it works a lot faster than {@link #getCollaborators()}.
+     *
+     * @param affiliation
+     *            Filter users by affiliation
+     * @return the collaborator names
+     * @throws IOException
+     *             the io exception
+     */
+    public Set<String> getCollaboratorNames(CollaboratorAffiliation affiliation) throws IOException {
+        Set<String> r = new HashSet<>();
+        // no initializer - we just want to the logins
+        PagedIterable<GHUser> users = root.createRequest()
+                .withUrlPath(getApiTailUrl("collaborators"))
+                .with("affiliation", affiliation)
+                .toIterable(GHUser[].class, null);
+        for (GHUser u : users.toArray()) {
+            r.add(u.login);
+        }
+        return r;
+    }
+
     /**
      * Obtain permission for a given user in this repository.
      *
@@ -1039,14 +1093,6 @@ public class GHRepository extends GHObject {
                 .send();
     }
 
-    private void edit(String key, String value) throws IOException {
-        Requester requester = root.createRequest();
-        if (!key.equals("name")) {
-            requester.with("name", name); // even when we don't change the name, we need to send it in
-        }
-        requester.with(key, value).method("PATCH").withUrlPath(getApiTailUrl("")).send();
-    }
-
     /**
      * Enables or disables the issue tracker for this repository.
      *
@@ -1056,7 +1102,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void enableIssueTracker(boolean v) throws IOException {
-        edit("has_issues", String.valueOf(v));
+        set().issues(v);
     }
 
     /**
@@ -1068,7 +1114,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void enableProjects(boolean v) throws IOException {
-        edit("has_projects", String.valueOf(v));
+        set().projects(v);
     }
 
     /**
@@ -1080,7 +1126,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void enableWiki(boolean v) throws IOException {
-        edit("has_wiki", String.valueOf(v));
+        set().wiki(v);
     }
 
     /**
@@ -1092,7 +1138,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void enableDownloads(boolean v) throws IOException {
-        edit("has_downloads", String.valueOf(v));
+        set().downloads(v);
     }
 
     /**
@@ -1104,7 +1150,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void renameTo(String name) throws IOException {
-        edit("name", name);
+        set().name(name);
     }
 
     /**
@@ -1116,7 +1162,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void setDescription(String value) throws IOException {
-        edit("description", value);
+        set().description(value);
     }
 
     /**
@@ -1128,7 +1174,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void setHomepage(String value) throws IOException {
-        edit("homepage", value);
+        set().homepage(value);
     }
 
     /**
@@ -1140,7 +1186,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void setDefaultBranch(String value) throws IOException {
-        edit("default_branch", value);
+        set().defaultBranch(value);
     }
 
     /**
@@ -1152,7 +1198,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void setPrivate(boolean value) throws IOException {
-        edit("private", Boolean.toString(value));
+        set().private_(value);
     }
 
     /**
@@ -1164,7 +1210,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void allowSquashMerge(boolean value) throws IOException {
-        edit("allow_squash_merge", Boolean.toString(value));
+        set().allowSquashMerge(value);
     }
 
     /**
@@ -1176,7 +1222,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void allowMergeCommit(boolean value) throws IOException {
-        edit("allow_merge_commit", Boolean.toString(value));
+        set().allowMergeCommit(value);
     }
 
     /**
@@ -1188,7 +1234,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void allowRebaseMerge(boolean value) throws IOException {
-        edit("allow_rebase_merge", Boolean.toString(value));
+        set().allowRebaseMerge(value);
     }
 
     /**
@@ -1200,7 +1246,7 @@ public class GHRepository extends GHObject {
      *             the io exception
      */
     public void deleteBranchOnMerge(boolean value) throws IOException {
-        edit("delete_branch_on_merge", Boolean.toString(value));
+        set().deleteBranchOnMerge(value);
     }
 
     /**
@@ -1237,12 +1283,30 @@ public class GHRepository extends GHObject {
      *             In case of any networking error or error from the server.
      */
     public void archive() throws IOException {
-        edit("archived", "true");
+        set().archive();
-        // Generall would not update this record,
+        // Generally would not update this record,
-        // but do so here since this will result in any other update actions failing
+        // but doing so here since this will result in any other update actions failing
         archived = true;
     }
 
+    /**
+     * Creates a builder that can be used to bulk update repository settings.
+     *
+     * @return the repository updater
+     */
+    public Updater update() {
+        return new Updater(this);
+    }
+
+    /**
+     * Creates a builder that can be used to bulk update repository settings.
+     *
+     * @return the repository updater
+     */
+    public Setter set() {
+        return new Setter(this);
+    }
+
     /**
      * Sort orders for listing forks
      */
@@ -1788,6 +1852,20 @@ public class GHRepository extends GHObject {
                 .toIterable(GHCommitComment[].class, item -> item.wrap(this));
     }
 
+    /**
+     * Lists all comments on a specific commit.
+     *
+     * @param commitSha
+     *            the hash of the commit
+     *
+     * @return the paged iterable
+     */
+    public PagedIterable<GHCommitComment> listCommitComments(String commitSha) {
+        return root.createRequest()
+                .withUrlPath(String.format("/repos/%s/%s/commits/%s/comments", getOwnerName(), name, commitSha))
+                .toIterable(GHCommitComment[].class, item -> item.wrap(this));
+    }
+
     /**
      * Gets the basic license details for the repository.
      * <p>
@@ -1864,7 +1942,7 @@ public class GHRepository extends GHObject {
      * @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
+    @Preview(ANTIOPE)
     @Deprecated
     public PagedIterable<GHCheckRun> getCheckRuns(String ref) throws IOException {
         GitHubRequest request = root.createRequest()
@@ -1938,12 +2016,25 @@ public class GHRepository extends GHObject {
      *            the commit hash
      * @return a builder which you should customize, then call {@link GHCheckRunBuilder#create}
      */
-    @Preview
+    @Preview(ANTIOPE)
     @Deprecated
     public @NonNull GHCheckRunBuilder createCheckRun(@NonNull String name, @NonNull String headSHA) {
         return new GHCheckRunBuilder(this, name, headSHA);
     }
 
+    /**
+     * Updates an existing check run.
+     *
+     * @param checkId
+     *            the existing checkId
+     * @return a builder which you should customize, then call {@link GHCheckRunBuilder#create}
+     */
+    @Preview(BAPTISTE)
+    @Deprecated
+    public @NonNull GHCheckRunBuilder updateCheckRun(long checkId) {
+        return new GHCheckRunBuilder(this, checkId);
+    }
+
     /**
      * Lists repository events.
      *
@@ -2061,9 +2152,11 @@ public class GHRepository extends GHObject {
     }
 
     private PagedIterable<GHUser> listUsers(final String suffix) {
-        return root.createRequest()
+        return listUsers(root.createRequest(), suffix);
-                .withUrlPath(getApiTailUrl(suffix))
+    }
-                .toIterable(GHUser[].class, item -> item.wrapUp(root));
+
+    private PagedIterable<GHUser> listUsers(Requester requester, final String suffix) {
+        return requester.withUrlPath(getApiTailUrl(suffix)).toIterable(GHUser[].class, item -> item.wrapUp(root));
     }
 
     /**
@@ -2126,7 +2219,12 @@ public class GHRepository extends GHObject {
             justification = "It causes a performance degradation, but we have already exposed it to the API")
     @Deprecated
     public Set<URL> getPostCommitHooks() {
-        return postCommitHooks;
+        synchronized (this) {
+            if (postCommitHooks == null) {
+                postCommitHooks = setupPostCommitHooks();
+            }
+            return postCommitHooks;
+        }
     }
 
     /**
@@ -2135,57 +2233,63 @@ public class GHRepository extends GHObject {
     @SuppressFBWarnings(value = "DMI_COLLECTION_OF_URLS",
             justification = "It causes a performance degradation, but we have already exposed it to the API")
     @SkipFromToString
-    private final Set<URL> postCommitHooks = new AbstractSet<URL>() {
+    private /* final */ transient Set<URL> postCommitHooks;
-        private List<URL> getPostCommitHooks() {
+
-            try {
+    @SuppressFBWarnings(value = "DMI_COLLECTION_OF_URLS",
-                List<URL> r = new ArrayList<>();
+            justification = "It causes a performance degradation, but we have already exposed it to the API")
-                for (GHHook h : getHooks()) {
+    private Set<URL> setupPostCommitHooks() {
-                    if (h.getName().equals("web")) {
+        return new AbstractSet<URL>() {
-                        r.add(new URL(h.getConfig().get("url")));
+            private List<URL> getPostCommitHooks() {
+                try {
+                    List<URL> r = new ArrayList<>();
+                    for (GHHook h : getHooks()) {
+                        if (h.getName().equals("web")) {
+                            r.add(new URL(h.getConfig().get("url")));
+                        }
                     }
+                    return r;
+                } catch (IOException e) {
+                    throw new GHException("Failed to retrieve post-commit hooks", e);
                 }
-                return r;
-            } catch (IOException e) {
-                throw new GHException("Failed to retrieve post-commit hooks", e);
             }
-        }
 
-        @Override
+            @Override
-        public Iterator<URL> iterator() {
+            public Iterator<URL> iterator() {
-            return getPostCommitHooks().iterator();
+                return getPostCommitHooks().iterator();
-        }
-
-        @Override
-        public int size() {
-            return getPostCommitHooks().size();
-        }
-
-        @Override
-        public boolean add(URL url) {
-            try {
-                createWebHook(url);
-                return true;
-            } catch (IOException e) {
-                throw new GHException("Failed to update post-commit hooks", e);
             }
-        }
 
-        @Override
+            @Override
-        public boolean remove(Object url) {
+            public int size() {
-            try {
+                return getPostCommitHooks().size();
-                String _url = ((URL) url).toExternalForm();
+            }
-                for (GHHook h : getHooks()) {
+
-                    if (h.getName().equals("web") && h.getConfig().get("url").equals(_url)) {
+            @Override
-                        h.delete();
+            public boolean add(URL url) {
-                        return true;
+                try {
+                    createWebHook(url);
+                    return true;
+                } catch (IOException e) {
+                    throw new GHException("Failed to update post-commit hooks", e);
+                }
+            }
+
+            @Override
+            public boolean remove(Object url) {
+                try {
+                    String _url = ((URL) url).toExternalForm();
+                    for (GHHook h : getHooks()) {
+                        if (h.getName().equals("web") && h.getConfig().get("url").equals(_url)) {
+                            h.delete();
+                            return true;
+                        }
                     }
+                    return false;
+                } catch (IOException e) {
+                    throw new GHException("Failed to update post-commit hooks", e);
                 }
-                return false;
-            } catch (IOException e) {
-                throw new GHException("Failed to update post-commit hooks", e);
             }
-        }
+        };
-    };
+    }
 
     GHRepository wrap(GitHub root) {
         this.root = root;
@@ -2879,17 +2983,57 @@ public class GHRepository extends GHObject {
         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.
+            // IMPORTANT: the url for repository records 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().withPreview(BAPTISE).setRawUrlPath(url.toString()).fetchInto(this).wrap(root);
+            root.createRequest().withPreview(BAPTISTE).setRawUrlPath(url.toString()).fetchInto(this).wrap(root);
         } catch (HttpException e) {
             if (e.getCause() instanceof JsonParseException) {
-                root.createRequest().withPreview(BAPTISE).withUrlPath("/repos/" + full_name).fetchInto(this).wrap(root);
+                root.createRequest()
+                        .withPreview(BAPTISTE)
+                        .withUrlPath("/repos/" + full_name)
+                        .fetchInto(this)
+                        .wrap(root);
             } else {
                 throw e;
             }
         }
     }
+
+    /**
+     * A {@link GHRepositoryBuilder} that allows multiple properties to be updated per request.
+     *
+     * Consumer must call {@link #done()} to commit changes.
+     */
+    @BetaApi
+    @Deprecated
+    public static class Updater extends GHRepositoryBuilder<Updater> {
+        protected Updater(@Nonnull GHRepository repository) {
+            super(Updater.class, repository.root, null);
+            // even when we don't change the name, we need to send it in
+            // this requirement may be out-of-date, but we do not want to break it
+            requester.with("name", repository.name);
+
+            requester.method("PATCH").withUrlPath(repository.getApiTailUrl(""));
+        }
+    }
+
+    /**
+     * A {@link GHRepositoryBuilder} that allows multiple properties to be updated per request.
+     *
+     * Consumer must call {@link #done()} to commit changes.
+     */
+    @BetaApi
+    @Deprecated
+    public static class Setter extends GHRepositoryBuilder<GHRepository> {
+        protected Setter(@Nonnull GHRepository repository) {
+            super(GHRepository.class, repository.root, null);
+            // even when we don't change the name, we need to send it in
+            // this requirement may be out-of-date, but we do not want to break it
+            requester.with("name", repository.name);
+
+            requester.method("PATCH").withUrlPath(repository.getApiTailUrl(""));
+        }
+    }
 }

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

@@ -0,0 +1,235 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+
+import static org.kohsuke.github.internal.Previews.BAPTISTE;
+
+abstract class GHRepositoryBuilder<S> extends AbstractBuilder<GHRepository, S> {
+
+    protected GHRepositoryBuilder(Class<S> intermediateReturnType, GitHub root, GHRepository baseInstance) {
+        super(GHRepository.class, intermediateReturnType, root, baseInstance);
+    }
+
+    /**
+     * Allow or disallow squash-merging pull requests.
+     *
+     * @param enabled
+     *            true if enabled
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S allowSquashMerge(boolean enabled) throws IOException {
+        return with("allow_squash_merge", enabled);
+    }
+
+    /**
+     * Allow or disallow merging pull requests with a merge commit.
+     *
+     * @param enabled
+     *            true if enabled
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S allowMergeCommit(boolean enabled) throws IOException {
+        return with("allow_merge_commit", enabled);
+    }
+
+    /**
+     * Allow or disallow rebase-merging pull requests.
+     *
+     * @param enabled
+     *            true if enabled
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S allowRebaseMerge(boolean enabled) throws IOException {
+        return with("allow_rebase_merge", enabled);
+    }
+
+    /**
+     * After pull requests are merged, you can have head branches deleted automatically.
+     *
+     * @param enabled
+     *            true if enabled
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S deleteBranchOnMerge(boolean enabled) throws IOException {
+        return with("delete_branch_on_merge", enabled);
+    }
+
+    /**
+     * Default repository branch
+     *
+     * @param branch
+     *            branch name
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S defaultBranch(String branch) throws IOException {
+        return with("default_branch", branch);
+    }
+
+    /**
+     * Description for repository
+     *
+     * @param description
+     *            description of repository
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S description(String description) throws IOException {
+        return with("description", description);
+    }
+
+    /**
+     * Homepage for repository
+     *
+     * @param homepage
+     *            homepage of repository
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S homepage(URL homepage) throws IOException {
+        return homepage(homepage.toExternalForm());
+    }
+
+    /**
+     * Homepage for repository
+     *
+     * @param homepage
+     *            homepage of repository
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S homepage(String homepage) throws IOException {
+        return with("homepage", homepage);
+    }
+
+    /**
+     * Sets the repository to private
+     *
+     * @param enabled
+     *            private if true
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S private_(boolean enabled) throws IOException {
+        return with("private", enabled);
+    }
+
+    /**
+     * Enables issue tracker
+     *
+     * @param enabled
+     *            true if enabled
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S issues(boolean enabled) throws IOException {
+        return with("has_issues", enabled);
+    }
+
+    /**
+     * Enables projects
+     *
+     * @param enabled
+     *            true if enabled
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S projects(boolean enabled) throws IOException {
+        return with("has_projects", enabled);
+    }
+
+    /**
+     * Enables wiki
+     *
+     * @param enabled
+     *            true if enabled
+     * @return a builder to continue with building
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S wiki(boolean enabled) throws IOException {
+        return with("has_wiki", enabled);
+    }
+
+    /**
+     * Enables downloads
+     *
+     * @param enabled
+     *            true if enabled
+     *
+     * @return a builder to continue with building
+     *
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    public S downloads(boolean enabled) throws IOException {
+        return with("has_downloads", enabled);
+    }
+
+    /**
+     * Specifies whether the repository is a template.
+     *
+     * @param enabled
+     *            true if enabled
+     * @return a builder to continue with building
+     * @throws IOException
+     *             In case of any networking error or error from the server.
+     */
+    @Preview(BAPTISTE)
+    @Deprecated
+    public S isTemplate(boolean enabled) throws IOException {
+        requester.withPreview(BAPTISTE);
+        return with("is_template", enabled);
+    }
+
+    @Override
+    public GHRepository done() throws IOException {
+        return super.done().wrap(this.root);
+    }
+
+    S archive() throws IOException {
+        return with("archived", true);
+    }
+
+    S name(String name) throws IOException {
+        return with("name", name);
+    }
+}

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

@@ -16,10 +16,9 @@ import java.util.NoSuchElementException;
  *
  * @author Martin van Zijl
  */
-public class GHRepositoryStatistics {
+public class GHRepositoryStatistics extends GitHubInteractiveObject {
 
     private final GHRepository repo;
-    private final GitHub root;
 
     private static final int MAX_WAIT_ITERATIONS = 3;
     private static final int WAIT_SLEEP_INTERVAL = 5000;
@@ -60,7 +59,7 @@ public class GHRepositoryStatistics {
      * @throws InterruptedException
      *             the interrupted exception
      */
-    @Preview
+    @BetaApi
     @Deprecated
     @SuppressWarnings("SleepWhileInLoop")
     @SuppressFBWarnings(value = { "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" }, justification = "JSON API")
@@ -99,7 +98,6 @@ public class GHRepositoryStatistics {
                     "URF_UNREAD_FIELD" },
             justification = "JSON API")
     public static class ContributorStats extends GHObject {
-        /* package almost final */ private GitHub root;
         private GHUser author;
         private int total;
         private List<Week> weeks;
@@ -255,7 +253,6 @@ public class GHRepositoryStatistics {
             value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
             justification = "JSON API")
     public static class CommitActivity extends GHObject {
-        /* package almost final */ private GitHub root;
         private List<Integer> days;
         private int total;
         private long week;
@@ -398,7 +395,6 @@ public class GHRepositoryStatistics {
      * The type Participation.
      */
     public static class Participation extends GHObject {
-        /* package almost final */ private GitHub root;
         private List<Integer> all;
         private List<Integer> owner;
 

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

@@ -8,7 +8,6 @@ import java.net.URL;
         justification = "JSON API")
 public class GHRequestedAction extends GHObject {
     private GHRepository owner;
-    private GitHub root;
     private String identifier;
     private String label;
     private String description;
@@ -46,4 +45,4 @@ public class GHRequestedAction extends GHObject {
         return null;
     }
 
-}
+}

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

@@ -10,11 +10,10 @@ import java.util.Date;
  * @see GHRepository#getSubscription() GHRepository#getSubscription()
  * @see GHThread#getSubscription() GHThread#getSubscription()
  */
-public class GHSubscription {
+public class GHSubscription extends GitHubInteractiveObject {
     private String created_at, url, repository_url, reason;
     private boolean subscribed, ignored;
 
-    private GitHub root;
     private GHRepository repo;
 
     /**

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

@@ -9,9 +9,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
  */
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
-public class GHTag {
+public class GHTag extends GitHubInteractiveObject {
     private GHRepository owner;
-    private GitHub root;
 
     private String name;
     private GHCommit commit;

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

@@ -9,9 +9,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
  */
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
-public class GHTagObject {
+public class GHTagObject extends GitHubInteractiveObject {
     private GHRepository owner;
-    private GitHub root;
 
     private String tag;
     private String sha;

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

@@ -24,8 +24,6 @@ public class GHTeam extends GHObject implements Refreshable {
 
     private GHOrganization organization; // populated by GET /user/teams where Teams+Orgs are returned together
 
-    protected /* final */ GitHub root;
-
     public enum Privacy {
         SECRET, // only visible to organization owners and members of this team.
         CLOSED // visible to all members of this organization.
@@ -145,6 +143,22 @@ public class GHTeam extends GHObject implements Refreshable {
         return GHDiscussion.readAll(this);
     }
 
+    /**
+     * List members with specified role paged iterable.
+     *
+     * @param role
+     *            the role
+     * @return the paged iterable
+     * @throws IOException
+     *             the io exception
+     */
+    public PagedIterable<GHUser> listMembers(String role) throws IOException {
+        return root.createRequest()
+                .withUrlPath(api("/members"))
+                .with("role", role)
+                .toIterable(GHUser[].class, item -> item.wrapUp(root));
+    }
+
     /**
      * Gets a single discussion by ID.
      *
@@ -171,7 +185,7 @@ public class GHTeam extends GHObject implements Refreshable {
      *             the io exception
      */
     public PagedIterable<GHUser> listMembers() throws IOException {
-        return root.createRequest().withUrlPath(api("/members")).toIterable(GHUser[].class, item -> item.wrapUp(root));
+        return listMembers("all");
     }
 
     /**

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

@@ -7,9 +7,7 @@ import java.io.IOException;
  *
  * https://developer.github.com/v3/teams/#create-team
  */
-public class GHTeamBuilder {
+public class GHTeamBuilder extends GitHubInteractiveObject {
-
-    private final GitHub root;
     protected final Requester builder;
     private final String orgName;
 

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

@@ -17,7 +17,6 @@ import java.util.Date;
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
 public class GHThread extends GHObject {
-    private GitHub root;
     private GHRepository repository;
     private Subject subject;
     private String reason;

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

@@ -26,6 +26,7 @@ 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 org.kohsuke.github.internal.Previews;
 
 import java.io.*;
 import java.util.*;
@@ -37,8 +38,8 @@ import java.util.logging.Logger;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import static org.kohsuke.github.Previews.INERTIA;
+import static org.kohsuke.github.internal.Previews.INERTIA;
-import static org.kohsuke.github.Previews.MACHINE_MAN;
+import static org.kohsuke.github.internal.Previews.MACHINE_MAN;
 
 /**
  * Root of the GitHub API.
@@ -741,7 +742,7 @@ 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>
      */
@@ -845,7 +846,7 @@ public class GitHub {
      * @return the gh create repository builder
      */
     public GHCreateRepositoryBuilder createRepository(String name) {
-        return new GHCreateRepositoryBuilder(this, "/user/repos", name);
+        return new GHCreateRepositoryBuilder(name, this, "/user/repos");
     }
 
     /**
@@ -1013,7 +1014,7 @@ public class GitHub {
      * @see <a href="https://developer.github.com/v3/apps/#get-the-authenticated-github-app">Get the authenticated
      *      GitHub App</a>
      */
-    @Preview
+    @Preview(MACHINE_MAN)
     @Deprecated
     public GHApp getApp() throws IOException {
         return createRequest().withPreview(MACHINE_MAN).withUrlPath("/app").fetch(GHApp.class).wrapUp(this);
@@ -1108,7 +1109,7 @@ public class GitHub {
      *
      * @return the gh commit search builder
      */
-    @Preview
+    @Preview(Previews.CLOAK)
     @Deprecated
     public GHCommitSearchBuilder searchCommits() {
         return new GHCommitSearchBuilder(this);
@@ -1208,26 +1209,34 @@ public class GitHub {
     }
 
     /**
-     * Do not use this method. This method will be removed and should never have been needed in the first place.
+     * Gets an {@link ObjectWriter} that can be used to convert data objects in this library to JSON.
+     *
+     * If you must convert data object in this library to JSON, the {@link ObjectWriter} returned by this method is the
+     * only supported way of doing so. This {@link ObjectWriter} can be used to convert any library data object to JSON
+     * without throwing an exception.
+     *
+     * WARNING: While the JSON generated is generally expected to be stable, it is not part of the API of this library
+     * and may change without warning. Use with extreme caution.
      *
      * @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.
+     * Gets an {@link ObjectReader} that can be used to convert JSON into library data objects.
+     *
+     * If you must manually create library data objects from JSON, the {@link ObjectReader} returned by this method is
+     * the only supported way of doing so.
+     *
+     * WARNING: Objects generated from this method have limited functionality. They will not throw when being crated
+     * from valid JSON matching the expected object, but they are not guaranteed to be usable beyond that. Use with
+     * extreme caution.
      *
      * @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());

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

@@ -0,0 +1,23 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JacksonInject;
+
+/**
+ * Defines a base class that all classes in this library that interact with GitHub inherit from.
+ *
+ * Ensures that all data references to GitHub connection are transient.
+ *
+ * Classes that do not need to interact with GitHub after they are instantiated do not need to inherit from this class.
+ */
+abstract class GitHubInteractiveObject {
+    @JacksonInject
+    /* package almost final */ transient GitHub root;
+
+    GitHubInteractiveObject() {
+        root = null;
+    }
+
+    GitHubInteractiveObject(GitHub root) {
+        this.root = root;
+    }
+}

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

@@ -2,6 +2,7 @@ package org.kohsuke.github;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import org.apache.commons.lang3.StringUtils;
+import org.kohsuke.github.internal.Previews;
 
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -75,7 +76,7 @@ class GitHubRequest {
 
     /**
      * Create a new {@link Builder}.
-     * 
+     *
      * @return a new {@link Builder}.
      */
     public static Builder<?> newBuilder() {
@@ -165,7 +166,7 @@ class GitHubRequest {
 
     /**
      * The base GitHub API URL for this request represented as a {@link String}
-     * 
+     *
      * @return the url string
      */
     @Nonnull
@@ -176,7 +177,7 @@ class GitHubRequest {
     /**
      * The url path to be added to the {@link #apiUrl()} for this request. If this does not start with a "/", it instead
      * represents the full url string for this request.
-     * 
+     *
      * @return a url path or full url string
      */
     @Nonnull
@@ -186,7 +187,7 @@ class GitHubRequest {
 
     /**
      * The content type to to be sent by this request.
-     * 
+     *
      * @return the content type.
      */
     @Nonnull
@@ -196,7 +197,7 @@ class GitHubRequest {
 
     /**
      * The {@link InputStream} to be sent as the body of this request.
-     * 
+     *
      * @return the {@link InputStream}.
      */
     @CheckForNull
@@ -206,7 +207,7 @@ class GitHubRequest {
 
     /**
      * The {@link URL} for this request. This is the actual URL the {@link GitHubClient} will send this request to.
-     * 
+     *
      * @return the request {@link URL}
      */
     @Nonnull
@@ -216,7 +217,7 @@ class GitHubRequest {
 
     /**
      * Whether arguments for this request should be included in the URL or in the body of the request.
-     * 
+     *
      * @return true if the arguements should be sent in the body of the request.
      */
     public boolean inBody() {
@@ -226,7 +227,7 @@ class GitHubRequest {
     /**
      * Create a {@link Builder} from this request. Initial values of the builder will be the same as this
      * {@link GitHubRequest}.
-     * 
+     *
      * @return a {@link Builder} based on this request.
      */
     public Builder<?> toBuilder() {
@@ -346,7 +347,7 @@ class GitHubRequest {
 
         /**
          * Builds a {@link GitHubRequest} from this builder.
-         * 
+         *
          * @return a {@link GitHubRequest}
          * @throws MalformedURLException
          *             if the GitHub API URL cannot be constructed
@@ -437,6 +438,25 @@ class GitHubRequest {
             return withHeader("Accept", name);
         }
 
+        public B withPreview(Previews preview) {
+            return withPreview(preview.mediaType());
+        }
+
+        /**
+         * With requester.
+         *
+         * @param Map
+         *            map of key value pairs to add
+         * @return the request builder
+         */
+        public B with(Map<String, Object> map) {
+            for (Map.Entry<String, Object> entry : map.entrySet()) {
+                with(entry.getKey(), entry.getValue());
+            }
+
+            return (B) this;
+        }
+
         /**
          * With requester.
          *

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

@@ -4,6 +4,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 import java.util.Date;
 
+import javax.annotation.CheckForNull;
+
 /**
  * Represents a user in Git who authors/commits a commit.
  * <p>
@@ -15,10 +17,10 @@ import java.util.Date;
 @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
         justification = "JSON API")
 public class GitUser {
-    private String name, email, date;
+    private String name, email, date, username;
 
     /**
-     * Gets name.
+     * Gets the git user name for an author or committer on a git commit.
      *
      * @return Human readable name of the user, such as "Kohsuke Kawaguchi"
      */
@@ -27,18 +29,28 @@ public class GitUser {
     }
 
     /**
-     * Gets email.
+     * Gets the git email for an author or committer on a git commit.
      *
-     * @return E -mail address, such as "foo@example.com"
+     * @return E-mail address, such as "foo@example.com"
      */
     public String getEmail() {
         return email;
     }
 
+    /**
+     * Gets username. Note: it presents only in events.
+     *
+     * @return GitHub username
+     */
+    @CheckForNull
+    public String getUsername() {
+        return username;
+    }
+
     /**
      * Gets date.
      *
-     * @return This field doesn't appear to be consistently available in all the situations where this class is used.
+     * @return Commit Date.
      */
     public Date getDate() {
         return GitHubClient.parseDate(date);

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

@@ -164,7 +164,7 @@ public abstract class PagedIterable<T> implements Iterable<T> {
 
     /**
      * Concatenates a list of arrays into a single array.
-     * 
+     *
      * @param type
      *            the type of array to be returned.
      * @param pages

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

@@ -35,14 +35,14 @@ public class PagedIterator<T> implements Iterator<T> {
      * Current batch of items. Each time {@link #next()} is called the next item in this array will be returned. After
      * the last item of the array is returned, when {@link #next()} is called again, a new page of items will be fetched
      * and iterating will continue from the first item in the new page.
-     * 
+     *
      * @see #fetch() {@link #fetch()} for details on how this field is used.
      */
     private T[] currentPage;
 
     /**
      * The index of the next item on the page, the item that will be returned when {@link #next()} is called.
-     * 
+     *
      * @see #fetch() {@link #fetch()} for details on how this field is used.
      */
     private int nextItemIndex;

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

@@ -18,7 +18,7 @@ import javax.annotation.Nonnull;
                 "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" },
         justification = "Constructed by JSON API")
 public class PagedSearchIterable<T> extends PagedIterable<T> {
-    private final GitHub root;
+    private final transient GitHub root;
 
     private final GitHubRequest request;
 

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

@@ -1,5 +1,7 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -8,11 +10,23 @@ import java.lang.annotation.RetentionPolicy;
  * Indicates that the method/class/etc marked maps to GitHub API in the preview period.
  * <p>
  * These APIs are subject to change and not a part of the backward compatibility commitment. Always used in conjunction
- * with 'deprecated' to raise awareness to clients.
+ * with 'deprecated' to raise awareness to clients. In addition, it's advised to update the targets documentation to
+ * signify that the deprecation is required until preview feature being used is promoted to stable.
  *
  * @author Kohsuke Kawaguchi
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface Preview {
+
+    /**
+     * An optional field defining what API media types must be set inorder to support the usage of this annotations
+     * target.
+     * <p>
+     * This value must be set using the existing constants defined in {@link Previews}
+     *
+     * @return The API preview media type.
+     */
+    public Previews[] value();
+
 }

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

@@ -44,7 +44,7 @@ public abstract class RateLimitChecker {
      * {@code true} at least once for a particular request, {@link GitHubRateLimitChecker} may choose to sleep for some
      * small additional between calls and before letting the request continue.
      * </p>
-     * 
+     *
      * @param rateLimitRecord
      *            the current {@link GHRateLimit.Record} to check against.
      * @param count

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

@@ -2,7 +2,7 @@ package org.kohsuke.github;
 
 /**
  * Specifies the rate limit record of an operation.
- * 
+ *
  * @see GitHubBuilder#withRateLimitChecker(RateLimitChecker, RateLimitTarget)
  */
 public enum RateLimitTarget {

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

@@ -2,12 +2,14 @@ package org.kohsuke.github;
 
 import java.io.IOException;
 
+import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL;
+
 /**
  * Those {@link GHObject}s that can have {@linkplain GHReaction reactions}.
  *
  * @author Kohsuke Kawaguchi
  */
-@Preview
+@Preview(SQUIRREL_GIRL)
 @Deprecated
 public interface Reactable {
     /**
@@ -15,7 +17,7 @@ public interface Reactable {
      *
      * @return the paged iterable
      */
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     PagedIterable<GHReaction> listReactions();
 
@@ -28,7 +30,7 @@ public interface Reactable {
      * @throws IOException
      *             the io exception
      */
-    @Preview
+    @Preview(SQUIRREL_GIRL)
     @Deprecated
     GHReaction createReaction(ReactionContent content) throws IOException;
 }

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

@@ -40,7 +40,7 @@ import javax.annotation.Nonnull;
  * @author Kohsuke Kawaguchi
  */
 class Requester extends GitHubRequest.Builder<Requester> {
-    /* private */ final GitHubClient client;
+    /* private */ final transient GitHubClient client;
 
     Requester(GitHubClient client) {
         this.client = client;

src/main/java/org/kohsuke/github/extras/OkHttpConnector.java

@@ -26,7 +26,11 @@ import javax.net.ssl.SSLSocketFactory;
  *
  * @author Roberto Tyley
  * @author Kohsuke Kawaguchi
+ * @deprecated This class depends on an unsupported version of OkHttp. Switch to
+ *             {@link org.kohsuke.github.extras.okhttp3.OkHttpConnector}.
+ * @see org.kohsuke.github.extras.okhttp3.OkHttpConnector
  */
+@Deprecated
 public class OkHttpConnector implements HttpConnector {
     private static final String HEADER_NAME = "Cache-Control";
     private final OkUrlFactory urlFactory;
@@ -45,7 +49,7 @@ public class OkHttpConnector implements HttpConnector {
 
     /**
      * package private for tests to be able to change max-age for cache.
-     * 
+     *
      * @param urlFactory
      * @param cacheMaxAge
      */

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

@@ -1,25 +1,5 @@
 package org.kohsuke.github.extras.okhttp3;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Dispatcher;
-import okhttp3.Handshake;
-import okhttp3.Headers;
-import okhttp3.HttpUrl;
-import okhttp3.Interceptor;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okio.Buffer;
-import okio.BufferedSink;
-import okio.Okio;
-import okio.Pipe;
-import okio.Timeout;
-
 /*
  * Copyright (C) 2014 Square, Inc.
  *
@@ -35,6 +15,28 @@ import okio.Timeout;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Dispatcher;
+import okhttp3.Handshake;
+import okhttp3.Headers;
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSink;
+import okio.Okio;
+import okio.Pipe;
+import okio.Timeout;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -179,7 +181,7 @@ public final class ObsoleteUrlFactory implements URLStreamHandlerFactory, Clonea
      * <p>
      * This code configures OkHttp to handle all HTTP and HTTPS connections created with
      * {@link java.net.URL#openConnection()}:
-     * 
+     *
      * <pre>
      * {
      *     &#64;code
@@ -404,7 +406,7 @@ public final class ObsoleteUrlFactory implements URLStreamHandlerFactory, Clonea
             try {
                 Response response = getResponse(true);
                 if (hasBody(response) && response.code() >= HTTP_BAD_REQUEST) {
-                    return response.body().byteStream();
+                    return new ResponseBodyInputStream(response.body());
                 }
                 return null;
             } catch (IOException e) {
@@ -486,7 +488,7 @@ public final class ObsoleteUrlFactory implements URLStreamHandlerFactory, Clonea
             Response response = getResponse(false);
             if (response.code() >= HTTP_BAD_REQUEST)
                 throw new FileNotFoundException(url.toString());
-            return response.body().byteStream();
+            return new ResponseBodyInputStream(response.body());
         }
 
         @Override
@@ -957,6 +959,7 @@ public final class ObsoleteUrlFactory implements URLStreamHandlerFactory, Clonea
             initOutputStream(Okio.buffer(pipe.sink()), expectedContentLength);
         }
 
+        @Override
         public boolean isOneShot() {
             return true;
         }
@@ -1367,4 +1370,69 @@ public final class ObsoleteUrlFactory implements URLStreamHandlerFactory, Clonea
             super(cause);
         }
     }
+
+    /**
+     * Make sure both the ResponseBody and the InputStream are closed when the InputStream coming from the ResponseBody
+     * is closed.
+     */
+    private static final class ResponseBodyInputStream extends InputStream {
+
+        private final ResponseBody responseBody;
+
+        private final InputStream inputStream;
+
+        private ResponseBodyInputStream(ResponseBody responseBody) {
+            this.responseBody = responseBody;
+            this.inputStream = responseBody.byteStream();
+        }
+
+        @Override
+        public int read() throws IOException {
+            return inputStream.read();
+        }
+
+        @Override
+        public int read(byte b[]) throws IOException {
+            return inputStream.read(b);
+        }
+
+        @Override
+        public int read(byte b[], int off, int len) throws IOException {
+            return inputStream.read(b, off, len);
+        }
+
+        @Override
+        public long skip(long n) throws IOException {
+            return inputStream.skip(n);
+        }
+
+        @Override
+        public int available() throws IOException {
+            return inputStream.available();
+        }
+
+        @Override
+        public synchronized void mark(int readlimit) {
+            inputStream.mark(readlimit);
+        }
+
+        @Override
+        public synchronized void reset() throws IOException {
+            inputStream.reset();
+        }
+
+        @Override
+        public boolean markSupported() {
+            return inputStream.markSupported();
+        }
+
+        @Override
+        public void close() throws IOException {
+            try {
+                inputStream.close();
+            } finally {
+                responseBody.close();
+            }
+        }
+    }
 }