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

Only run coverage on code in this library

.gitattributes

@@ -0,0 +1 @@
+*.java text eol=lf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+# Description
+
+<!-- Describe your change here -->
+
+# Before submitting a PR:
+We love getting PRs, but we hate asking people for the same basic changes every time.
+
+- [ ] Push your changes to a branch other than `main`. Create your PR from that branch.
+- [ ] Add JavaDocs and other comments
+- [ ] Write tests that run and pass in CI. See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to capture snapshot data.
+- [ ] Run `mvn -D enable-ci clean install site` locally. If this command doesn't succeed, your change will not pass CI.
+
+# When creating a PR: 
+
+- [ ] Fill in the "Description" above.
+- [ ] Enable "Allow edits from maintainers".

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+      time: "02:00"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+      time: "02:00"

.github/release-drafter.yml

@@ -1,5 +1,6 @@
-name-template: 'v$NEXT_PATCH_VERSION 🌈'
-tag-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:

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main, gh-pages ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ main ]
+  schedule:
+    - cron: '20 0 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/maven-build.yml

@@ -1,22 +1,98 @@
-name: Java CI Build and Test
+name: CI
 
 on: [push, pull_request]
 
+# this is required by spotless for JDK 16+
+env:
+  JAVA_11_PLUS_MAVEN_OPTS: "--add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"
 
 jobs:
   build:
-
+    name: build-only (Java ${{ matrix.java }})
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        java: [ '1.8.0', '11.0.x', '13.0.x' ]
+        java: [ 16 ]
     steps:
-    - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'adopt'
+      - name: Cached .m2
+        uses: actions/cache@v2.1.5
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Maven Install (skipTests)
+        env:
+          MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
+        run: mvn -B install -DskipTests --file pom.xml
+  site:
+    name: site (Java ${{ matrix.java }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 8, 11 ]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'adopt'
+      - uses: actions/cache@v2.1.5
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Maven Site
+        run: mvn -B site -D enable-ci --file pom.xml
+  test:
+    name: test (${{ matrix.os }}, Java ${{ matrix.java }})
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu, windows ]
+        java: [ 8, 11, 16 ]
+    steps:
+    - uses: actions/checkout@v2
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
         java-version: ${{ matrix.java }}
-    - name: Maven Download all dependencies
-      run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.1:go-offline
-    - name: Maven Build
-      run: mvn -B install site --file pom.xml
+        distribution: 'adopt'
+    - uses: actions/cache@v2.1.5
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    # JDK 8
+    - name: Maven Install without Code Coverage
+      if: matrix.os == 'windows' && matrix.java == '8'
+      run: mvn -B install --file pom.xml
+    - name: Maven Install with Code Coverage
+      if: matrix.os != 'windows' && matrix.java == '8'
+      run: mvn -B install -D enable-ci --file pom.xml
+    - name: Codecov Report 
+      if: matrix.os != 'windows' && matrix.java == '8'
+      uses: codecov/codecov-action@v1.4.1  
+    # JDK 11+
+    - name: Maven Install without Code Coverage
+      if: matrix.os == 'windows' && matrix.java != '8'
+      env:
+        MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
+      run: mvn -B install --file pom.xml
+    - name: Maven Install with Code Coverage
+      if: matrix.os != 'windows' && matrix.java != '8'
+      env:
+        MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
+      run: mvn -B install -D enable-ci --file pom.xml

.github/workflows/release-drafter.yml

@@ -0,0 +1,11 @@
+
+name: Release Drafter
+
+on: push 
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Release Drafter
+        uses: release-drafter/release-drafter@v5.15.0

.gitignore

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

CONTRIBUTING.md

@@ -14,10 +14,14 @@ Example:
 
 This the default behavior.
 
+Example for a single test case:
+
+`mvn install -Dtest=WireMockStatusReporterTest#user_whenProxying_AuthCorrectlyConfigured`
+
 
 ### Setting up credential
 
-1. Create an OAuth token on github.com
+1. Create a "Personal access token" on https://github.com/ (`Settings` > `Developer settings` > `Personal access tokens`)
 2. Set the GITHUB_OAUTH environment variable to the value of that token
 3. Set the system property `test.github.useProxy` (usually like "-Dtest.github.useProxy" as a Java VM option)
 
@@ -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,
-run your test with `test.github.takeSnapshot` ("-Dtest.github.takeSnapshot" as a Java VM option).  For example:
+#### Running tests using GitHub test proxy
 
-    `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 `getNonRecordingGitHub()` 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`.
-Each method would get a separate director that would hold the data files for that test method.
+#### Running tests against your personal GitHub user account
+
+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.
 

README.md

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

codecov.yml

@@ -0,0 +1,7 @@
+ignore:
+  - "**/extras/okhttp3/ObsoleteUrlFactory**"
+  - "**/extras/OkHttpConnector"
+  - "**/extras/OkHttp3Connector"
+  - "**/example/**"
+  - "**/github/EnforcementLevel"
+

pom.xml

@@ -1,46 +1,53 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.kohsuke</groupId>
-    <artifactId>pom</artifactId>
-    <version>21</version>
-    <relativePath />
-  </parent>
-
+  <groupId>org.kohsuke</groupId>
   <artifactId>github-api</artifactId>
-  <version>1.99</version>
+  <version>1.129</version>
   <name>GitHub API for Java</name>
   <url>https://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
 
   <scm>
-    <connection>scm:git:git@github.com/github-api/${project.artifactId}.git</connection>
-    <developerConnection>scm:git:ssh://git@github.com/github-api/${project.artifactId}.git</developerConnection>
-    <url>https://${project.artifactId}.kohsuke.org/</url>
-    <tag>github-api-1.99</tag>
+    <connection>scm:git:git@github.com/hub4j/${project.artifactId}.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/hub4j/${project.artifactId}.git</developerConnection>
+    <url>https://github.com/hub4j/github-api/</url>
+    <tag>github-api-1.129</tag>
   </scm>
 
   <distributionManagement>
+    <snapshotRepository>
+      <id>sonatype-nexus-snapshots</id>
+      <name>Sonatype Nexus Snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    </snapshotRepository>
+    <repository>
+      <id>sonatype-nexus-staging</id>
+      <name>Nexus Release Repository</name>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
     <site>
       <id>github-pages</id>
-      <url>gitsite:git@github.com/github-api/${project.artifactId}.git</url>
+      <url>gitsite:git@github.com/hub4j/${project.artifactId}.git</url>
     </site>
   </distributionManagement>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spotbugs-maven-plugin.version>3.1.12.2</spotbugs-maven-plugin.version>
-    <spotbugs.version>3.1.12</spotbugs.version>
+    <spotbugs-maven-plugin.version>4.2.3</spotbugs-maven-plugin.version>
+    <spotbugs.version>4.2.3</spotbugs.version>
     <spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
     <hamcrest.version>2.2</hamcrest.version>
-    <okhttp3.version>3.12.3</okhttp3.version>
-    <okio.version>2.4.1</okio.version>
-    <jacoco.coverage.target.class>.80</jacoco.coverage.target.class>
-    <jacoco.coverage.target.method>0.20</jacoco.coverage.target.method>
-    <jacoco.coverage.target.line>0.50</jacoco.coverage.target.line>
-    <jacoco.coverage.target.other>0.50</jacoco.coverage.target.other>
+    <okhttp3.version>4.4.1</okhttp3.version>
+    <okio.version>2.5.0</okio.version>
+    <!-- Using this as the minimum bar for code coverage.  Adding methods without covering them will fail this. -->
+    <jacoco.coverage.target.bundle.method>0.70</jacoco.coverage.target.bundle.method>
+    <jacoco.coverage.target.class.method>0.50</jacoco.coverage.target.class.method>
     <!-- For non-ci builds we'd like the build to still complete if jacoco metrics aren't met. -->
     <jacoco.haltOnFailure>false</jacoco.haltOnFailure>
+    <jjwt.suite.version>0.11.2</jjwt.suite.version>
+
+    <jacoco.surefire.argLine />
+    <surefire.argLine />
   </properties>
 
   <build>
@@ -55,6 +62,14 @@
         <artifactId>maven-scm-manager-plexus</artifactId>
         <version>1.11.2</version>
       </extension>
+      <!-- Doing site publishing manually for now -->
+<!--
+      <extension>
+        <groupId>org.kohsuke</groupId>
+        <artifactId>wagon-gitsite</artifactId>
+        <version>0.3.5</version>
+      </extension>
+-->
     </extensions>
     <testResources>
       <testResource>
@@ -66,18 +81,147 @@
     </testResources>
     <pluginManagement>
       <plugins>
-        <!-- adds jacoco coverage -->
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.2</version>
+          <configuration>
+            <!-- SUREFIRE-1226 workaround -->
+            <trimStackTrace>false</trimStackTrace>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>3.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.6</version>
+        </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.5</version>
+          <version>0.8.6</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+              <configuration>
+                <propertyName>jacoco.surefire.argLine</propertyName>
+                <!-- no need to get data about external code. It dramatically reduces performance of JaCoCo for nothing -->
+                <include>org.kohsuke.*</include>
+              </configuration>
+            </execution>
+            <!-- attached to Maven test phase -->
+            <execution>
+              <id>report</id>
+              <phase>test</phase>
+              <goals>
+                <goal>report</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>check</id>
+              <phase>test</phase>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <configuration>
+                <rules>
+                  <rule>
+                    <element>BUNDLE</element>
+                    <limits>
+                      <limit>
+                        <counter>METHOD</counter>
+                        <value>COVEREDRATIO</value>
+                        <minimum>${jacoco.coverage.target.bundle.method}</minimum>
+                      </limit>
+                    </limits>
+                  </rule>
+                  <rule>
+                    <!--We end up with chatty logs, but it shows us which particular classes    -->
+                    <!--are lacking in coverage. If this is too much, just remove the           -->
+                    <!--<element>CLASS</element> tag below.                                     -->
+                    <element>CLASS</element>
+                    <limits>
+                      <limit>
+                        <counter>METHOD</counter>
+                        <value>COVEREDRATIO</value>
+                        <minimum>${jacoco.coverage.target.class.method}</minimum>
+                      </limit>
+                    </limits>
+                    <excludes>
+                      <!-- Code implemented externally -->
+                      <exclude>org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory.**</exclude>
+                      <exclude>org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory</exclude>
+
+                      <!-- Sample only -->
+                      <exclude>org.kohsuke.github.example.*</exclude>
+
+
+                      <!-- Deprecated -->
+                      <exclude>org.kohsuke.github.extras.OkHttpConnector</exclude>
+                      <exclude>org.kohsuke.github.extras.OkHttp3Connector</exclude>
+                      <exclude>org.kohsuke.github.EnforcementLevel</exclude>
+                      <exclude>org.kohsuke.github.GHPerson.1</exclude>
+                      
+                      <!-- TODO: Some coverage, but more needed -->
+                      <exclude>org.kohsuke.github.GHPullRequestReviewBuilder.DraftReviewComment</exclude>
+                      <exclude>org.kohsuke.github.GHIssue.PullRequest</exclude>
+                      <exclude>org.kohsuke.github.GHCommitSearchBuilder</exclude>
+                      <exclude>org.kohsuke.github.GHRepositorySearchBuilder</exclude>
+                      <exclude>org.kohsuke.github.GHUserSearchBuilder</exclude>
+
+                      <!-- TODO: These still need test coverage -->
+                      <exclude>org.kohsuke.github.GHBranchProtection.RequiredSignatures</exclude>
+                      <exclude>org.kohsuke.github.GHBranchProtectionBuilder.Restrictions</exclude>
+                      <exclude>org.kohsuke.github.GHBranchProtection.Restrictions</exclude>
+                      <exclude>org.kohsuke.github.GHCommentAuthorAssociation</exclude>
+                      <exclude>org.kohsuke.github.GHCompare.Commit</exclude>
+                      <exclude>org.kohsuke.github.GHCompare.InnerCommit</exclude>
+                      <exclude>org.kohsuke.github.GHCompare.Tree</exclude>
+                      <exclude>org.kohsuke.github.GHCompare.User</exclude>
+                      <exclude>org.kohsuke.github.GHCompare</exclude>
+                      <exclude>org.kohsuke.github.GHDeployKey</exclude>
+                      <exclude>org.kohsuke.github.GHEmail</exclude>
+                      <exclude>org.kohsuke.github.GHInvitation</exclude>
+                      <exclude>org.kohsuke.github.GHPullRequestCommitDetail.Authorship</exclude>
+                      <exclude>org.kohsuke.github.GHPullRequestCommitDetail.Commit</exclude>
+                      <exclude>org.kohsuke.github.GHPullRequestCommitDetail.CommitPointer</exclude>
+                      <exclude>org.kohsuke.github.GHPullRequestCommitDetail.Tree</exclude>
+                      <exclude>org.kohsuke.github.GHPullRequestCommitDetail</exclude>
+                      <exclude>org.kohsuke.github.GHPullRequestFileDetail</exclude>
+                      <exclude>org.kohsuke.github.GHReleaseUpdater</exclude>
+                      <exclude>org.kohsuke.github.GHRequestedAction</exclude>
+                      <exclude>org.kohsuke.github.GHVerifiedKey</exclude>
+                    </excludes>
+                  </rule>
+                </rules>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.2.0</version>
           <configuration>
             <source>8</source>
+            <failOnWarnings>true</failOnWarnings>
+            <doclint>all</doclint>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.sonatype.plugins</groupId>
+          <artifactId>nexus-staging-maven-plugin</artifactId>
+          <version>1.6.8</version>
+          <extensions>true</extensions>
+          <configuration>
+            <serverId>sonatype-nexus-staging</serverId>
+            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+            <autoReleaseAfterClose>true</autoReleaseAfterClose>
           </configuration>
         </plugin>
       </plugins>
@@ -86,7 +230,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.8.2</version>
+        <version>3.9.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -99,15 +243,19 @@
           <goals>deploy</goals>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.1.2</version>
         <dependencies>
           <dependency>
             <groupId>org.apache.bcel</groupId>
             <artifactId>bcel</artifactId>
-            <version>6.4.1</version>
+            <version>6.5.0</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -129,12 +277,20 @@
 
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <executions>
+          <execution>
+            <id>default-test</id>
+            <configuration>
+              <excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
+              <argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.18</version>
+        <version>1.20</version>
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
@@ -152,17 +308,48 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>	
-        <groupId>com.infradna.tool</groupId>	
-        <artifactId>bridge-method-injector</artifactId>	
-        <version>1.18</version>	
-        <executions>	
-          <execution>	
-            <goals>	
-              <goal>process</goal>	
-            </goals>	
-          </execution>	
-        </executions>	
+      <plugin>
+        <groupId>com.infradna.tool</groupId>
+        <artifactId>bridge-method-injector</artifactId>
+        <version>1.18</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.10.3</version>
+        <executions>
+          <execution>
+            <id>spotless-check</id>
+            <!-- runs in verify phase by default -->
+            <goals>
+              <!-- can be disabled using -Dspotless.check.skip=true -->
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <eclipse>
+              <file>${basedir}/src/build/eclipse/formatter.xml</file>
+            </eclipse>
+
+            <importOrder>
+              <file>${basedir}/src/build/eclipse/eclipse.importorder</file>
+            </importOrder>
+            <removeUnusedImports />
+
+            <trimTrailingWhitespace />
+            <endWithNewline />
+
+          </java>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>com.github.spotbugs</groupId>
@@ -190,17 +377,6 @@
           </dependency>
         </dependencies>
       </plugin>
-      <!-- Do not use gmaven plugin -->
-      <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>gmaven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -211,9 +387,10 @@
       <version>3.9</version>
     </dependency>
     <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.13</version>
+      <groupId>com.tngtech.archunit</groupId>
+      <artifactId>archunit</artifactId>
+      <version>0.18.0</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
@@ -237,18 +414,24 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <version>4.0.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.10.0</version>
+      <version>2.12.3</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.6</version>
+      <version>2.8.0</version>
     </dependency>
     <dependency>
       <groupId>com.infradna.tool</groupId>
@@ -256,6 +439,27 @@
       <version>1.18</version>
       <optional>true</optional>
     </dependency>
+    <!-- for stapler-jetty -->
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- for stapler-jetty -->
+    <dependency>
+      <groupId>commons-discovery</groupId>
+      <artifactId>commons-discovery</artifactId>
+      <version>0.5</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- for stapler-jetty -->
+    <dependency>
+      <groupId>org.kohsuke.stapler</groupId>
+      <artifactId>stapler</artifactId>
+      <version>1.263</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-jetty</artifactId>
@@ -265,9 +469,27 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>5.5.1.201910021850-r</version>
+      <version>5.11.0.202103091610-r</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt-api</artifactId>
+      <version>${jjwt.suite.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt-impl</artifactId>
+      <version>${jjwt.suite.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt-jackson</artifactId>
+      <version>${jjwt.suite.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>com.squareup.okio</groupId>
       <artifactId>okio</artifactId>
@@ -280,10 +502,12 @@
       <version>${okhttp3.version}</version>
       <optional>true</optional>
     </dependency>
+    <!-- This is the last version of okhttp3 that support UrlConnection -->
+    <!-- The class using this has been deprecated, this dependency can be remove when that class is. -->
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp-urlconnection</artifactId>
-      <version>${okhttp3.version}</version>
+      <version>3.12.3</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -295,25 +519,25 @@
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>wordnet-random-name</artifactId>
-      <version>1.3</version>
+      <version>1.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.1.0</version>
+      <version>3.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs-annotations</artifactId>
       <version>${spotbugs.version}</version>
-      <optional>true</optional>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.github.tomakehurst</groupId>
       <artifactId>wiremock-jre8-standalone</artifactId>
-      <version>2.25.1</version>
+      <version>2.27.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -322,6 +546,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>
@@ -336,96 +566,31 @@
     </pluginRepository>
   </pluginRepositories>
   <profiles>
+    <!-- only enable slow-or-flaky-test if -Dtest= is not present -->
     <profile>
-      <id>jacoco</id>
+      <id>slow-or-flaky-test</id>
       <activation>
         <property>
-          <name>enable-jacoco</name>
+          <name>!test</name>
         </property>
       </activation>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.5</version>
+            <artifactId>maven-surefire-plugin</artifactId>
             <executions>
               <execution>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-              </execution>
-              <!-- attached to Maven test phase -->
-              <execution>
-                <id>report</id>
+                <id>slow-or-flaky-test</id>
                 <phase>test</phase>
                 <goals>
-                  <goal>report</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>check</id>
-                <phase>install</phase>
-                <goals>
-                  <goal>check</goal>
+                  <goal>test</goal>
                 </goals>
                 <configuration>
-                  <rules>
-                    <rule>
-                      <!--We end up with chatty logs, but it shows us which particular classes    -->
-                      <!--are lacking in coverage. If this is too much, just remove the           -->
-                      <!--<element>CLASS</element> tag below.                                     -->
-                      <element>CLASS</element>
-                      <limits>
-                        <!-- These limits can be overridden, in the form of `0.50` for          -->
-                        <!-- 50%, as necessary. Using a property just puts it in one spot.      -->
-<!--
-                        <limit>
-                          <counter>LINE</counter>
-                          <value>COVEREDRATIO</value>
-                          <minimum>${jacoco.coverage.target.lines}</minimum>
-                        </limit>
--->
-<!--
-                        <limit>
-                          <counter>BRANCH</counter>
-                          <value>COVEREDRATIO</value>
-                          <minimum>${jacoco.coverage.target.other}</minimum>
-                        </limit>
--->
-<!--
-                        <limit>
-                          <counter>INSTRUCTION</counter>
-                          <value>COVEREDRATIO</value>
-                          <minimum>${jacoco.coverage.target.other}</minimum>
-                        </limit>
--->
-<!--
-                        <limit>
-                          <counter>COMPLEXITY</counter>
-                          <value>COVEREDRATIO</value>
-                          <minimum>${jacoco.coverage.target.other}</minimum>
-                        </limit>
--->
-                        <limit>
-                          <counter>METHOD</counter>
-                          <value>COVEREDRATIO</value>
-                          <minimum>${jacoco.coverage.target.method}</minimum>
-                        </limit>
-<!--                        <limit>-->
-<!--                          <counter>CLASS</counter>-->
-<!--                          <value>COVEREDRATIO</value>-->
-<!--                          <minimum>${jacoco.coverage.target.class}</minimum>-->
-<!--                        </limit>-->
-                      </limits>
-                      <excludes>
-                        <exclude>org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory.**</exclude>
-                        <exclude>org.kohsuke.github.extras.okhttp3.ObsoleteUrlFactory</exclude>
-                        <exclude>org.kohsuke.github.extras.OkHttp3Connector</exclude>
-                        <!--<exclude>io.jenkins.plugins.todeclarative.converter.api.*</exclude>-->
-                      </excludes>
-                    </rule>
-                  </rules>
+                  <rerunFailingTestsCount>2</rerunFailingTestsCount>
+                  <!-- There are some tests that take longer or are a little
+                    flaky. Run them here. -->
+                  <includesFile>src/test/resources/slow-or-flaky-tests.txt</includesFile>
+                  <argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
                 </configuration>
               </execution>
             </executions>
@@ -434,13 +599,85 @@
       </build>
     </profile>
     <profile>
-    <id>release</id>
+      <id>ci-non-windows</id>
+      <activation>
+        <property>
+          <name>enable-ci</name>
+        </property>
+        <os>
+          <family>!windows</family>
+        </os>
+      </activation>
+      <properties>
+        <!-- Only fail code coverage on non-windows machines -->
+        <jacoco.haltOnFailure>true</jacoco.haltOnFailure>
+      </properties>
+    </profile>
+    <profile>
+      <id>ci-all</id>
+      <activation>
+        <property>
+          <name>enable-ci</name>
+        </property>
+      </activation>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+          </plugin>
+          <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>spotless-check</id>
+                <!-- In CI, run check early in the build -->
+                <phase>process-sources</phase>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.0.0-M3</version>
+            <executions>
+              <execution>
+                <id>enforce-jacoco-exist</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                    <requireFilesExist>
+                      <files>
+                        <file>${project.build.directory}/jacoco.exec</file>
+                      </files>
+                    </requireFilesExist>
+                  </rules>
+                  <fail>true</fail>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -460,7 +697,26 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.0</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>
@@ -468,6 +724,18 @@
   </profiles>
   <reporting>
     <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <!-- select non-aggregate reports -->
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -494,4 +762,13 @@
       <archive>https://groups.google.com/forum/#!forum/github-api</archive>
     </mailingList>
   </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Kohsuke Kawaguchi</name>
+      <id>kohsuke</id>
+      <email>kk@kohsuke.org</email>
+    </developer>
+  </developers>
+
 </project>

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/build/eclipse/formatter.xml

@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="17">
+    <profile kind="CodeFormatterProfile" name="Java Conventions - GitHub-api" version="17">
+        <!-- Make various elements turn to colums when they wrap -->
+        <!-- Basically the only way to create this is by downloading eclipse and working in their UI -->
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+    </profile>
+    <!-- Keeping the "default" exported values for reference -->
+    <!--
+    <profile kind="CodeFormatterProfile" name="Eclipse [built-in]-Default" version="17">
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+    </profile>
+    -->
+</profiles>

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

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

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

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

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

@@ -1,35 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2010, Kohsuke Kawaguchi
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package org.kohsuke.github;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-@SuppressFBWarnings(value = "UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD", 
-        justification = "Being constructed by JSON deserialization")
-class DeleteToken {
-    public String delete_token;
-}

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

@@ -1,172 +1,292 @@
 package org.kohsuke.github;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.io.IOException;
 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.
  *
  * @author Paulo Miguel Almeida
- *
- * @see GitHub#getApp()
+ * @see GitHub#getApp() GitHub#getApp()
  */
-
 public class GHApp extends GHObject {
 
-    private GitHub root;
     private GHUser owner;
     private String name;
     private String description;
-    @JsonProperty("external_url")
     private String externalUrl;
-    private Map<String,String> permissions;
+    private Map<String, String> permissions;
     private List<GHEvent> events;
-    @JsonProperty("installations_count")
     private long installationsCount;
-    @JsonProperty("html_url")
     private String htmlUrl;
 
-
+    /**
+     * Gets owner.
+     *
+     * @return the owner
+     */
     public GHUser getOwner() {
         return owner;
     }
 
+    /**
+     * Sets owner.
+     *
+     * @param owner
+     *            the owner
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setOwner(GHUser owner) {
         this.owner = owner;
     }
 
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Sets name.
+     *
+     * @param name
+     *            the name
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setName(String name) {
         this.name = name;
     }
 
+    /**
+     * Gets description.
+     *
+     * @return the description
+     */
     public String getDescription() {
         return description;
     }
 
+    /**
+     * Sets description.
+     *
+     * @param description
+     *            the description
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setDescription(String description) {
         this.description = description;
     }
 
+    /**
+     * Gets external url.
+     *
+     * @return the external url
+     */
     public String getExternalUrl() {
         return externalUrl;
     }
 
+    /**
+     * Sets external url.
+     *
+     * @param externalUrl
+     *            the external url
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setExternalUrl(String externalUrl) {
         this.externalUrl = externalUrl;
     }
 
+    /**
+     * Gets events.
+     *
+     * @return the events
+     */
     public List<GHEvent> getEvents() {
         return events;
     }
 
+    /**
+     * Sets events.
+     *
+     * @param events
+     *            the events
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setEvents(List<GHEvent> events) {
         this.events = events;
     }
 
+    /**
+     * Gets installations count.
+     *
+     * @return the installations count
+     */
     public long getInstallationsCount() {
         return installationsCount;
     }
 
+    /**
+     * Sets installations count.
+     *
+     * @param installationsCount
+     *            the installations count
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setInstallationsCount(long installationsCount) {
         this.installationsCount = installationsCount;
     }
 
     public URL getHtmlUrl() {
-        return GitHub.parseURL(htmlUrl);
+        return GitHubClient.parseURL(htmlUrl);
     }
 
+    /**
+     * Gets permissions.
+     *
+     * @return the permissions
+     */
     public Map<String, String> getPermissions() {
         return permissions;
     }
 
+    /**
+     * Sets permissions.
+     *
+     * @param permissions
+     *            the permissions
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setPermissions(Map<String, String> permissions) {
         this.permissions = permissions;
     }
 
-    /*package*/ GHApp wrapUp(GitHub root) {
+    GHApp wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
 
     /**
      * Obtains all the installations associated with this app.
-     *
+     * <p>
      * You must use a JWT to access this endpoint.
      *
-     * @see <a href="https://developer.github.com/v3/apps/#list-installations">List installations</a>
      * @return a list of App installations
+     * @see <a href="https://developer.github.com/v3/apps/#list-installations">List installations</a>
      */
-    @Preview @Deprecated
+    @Preview(MACHINE_MAN)
+    @Deprecated
     public PagedIterable<GHAppInstallation> listInstallations() {
-        return root.retrieve().withPreview(MACHINE_MAN)
-            .asPagedIterable(
-                "/app/installations",
-                GHAppInstallation[].class,
-                item -> item.wrapUp(root) );
+        return root.createRequest()
+                .withPreview(MACHINE_MAN)
+                .withUrlPath("/app/installations")
+                .toIterable(GHAppInstallation[].class, item -> item.wrapUp(root));
     }
 
     /**
-     * Obtain an installation associated with this app
-     * @param id - Installation Id
-     *
+     * Obtain an installation associated with this app.
+     * <p>
      * You must use a JWT to access this endpoint.
      *
+     * @param id
+     *            Installation Id
+     * @return a GHAppInstallation
+     * @throws IOException
+     *             on error
      * @see <a href="https://developer.github.com/v3/apps/#get-an-installation">Get an installation</a>
      */
-    @Preview @Deprecated
+    @Preview(MACHINE_MAN)
+    @Deprecated
     public GHAppInstallation getInstallationById(long id) throws IOException {
-        return root.retrieve().withPreview(MACHINE_MAN).to(String.format("/app/installations/%d", id), GHAppInstallation.class).wrapUp(root);
+        return root.createRequest()
+                .withPreview(MACHINE_MAN)
+                .withUrlPath(String.format("/app/installations/%d", id))
+                .fetch(GHAppInstallation.class)
+                .wrapUp(root);
     }
 
     /**
-     * Obtain an organization installation associated with this app
-     * @param name - Organization name
-     *
+     * Obtain an organization installation associated with this app.
+     * <p>
      * You must use a JWT to access this endpoint.
      *
-     * @see <a href="https://developer.github.com/v3/apps/#get-an-organization-installation">Get an organization installation</a>
+     * @param name
+     *            Organization name
+     * @return a GHAppInstallation
+     * @throws IOException
+     *             on error
+     * @see <a href="https://developer.github.com/v3/apps/#get-an-organization-installation">Get an organization
+     *      installation</a>
      */
-    @Preview @Deprecated
+    @Preview(MACHINE_MAN)
+    @Deprecated
     public GHAppInstallation getInstallationByOrganization(String name) throws IOException {
-        return root.retrieve().withPreview(MACHINE_MAN).to(String.format("/orgs/%s/installation", name), GHAppInstallation.class).wrapUp(root);
+        return root.createRequest()
+                .withPreview(MACHINE_MAN)
+                .withUrlPath(String.format("/orgs/%s/installation", name))
+                .fetch(GHAppInstallation.class)
+                .wrapUp(root);
     }
 
     /**
-     * Obtain an repository installation associated with this app
-     * @param ownerName - Organization or user name
-     * @param repositoryName - Repository name
-     *
+     * Obtain an repository installation associated with this app.
+     * <p>
      * You must use a JWT to access this endpoint.
      *
-     * @see <a href="https://developer.github.com/v3/apps/#get-a-repository-installation">Get a repository installation</a>
+     * @param ownerName
+     *            Organization or user name
+     * @param repositoryName
+     *            Repository name
+     * @return a GHAppInstallation
+     * @throws IOException
+     *             on error
+     * @see <a href="https://developer.github.com/v3/apps/#get-a-repository-installation">Get a repository
+     *      installation</a>
      */
-    @Preview @Deprecated
+    @Preview(MACHINE_MAN)
+    @Deprecated
     public GHAppInstallation getInstallationByRepository(String ownerName, String repositoryName) throws IOException {
-        return root.retrieve().withPreview(MACHINE_MAN).to(String.format("/repos/%s/%s/installation", ownerName, repositoryName), GHAppInstallation.class).wrapUp(root);
+        return root.createRequest()
+                .withPreview(MACHINE_MAN)
+                .withUrlPath(String.format("/repos/%s/%s/installation", ownerName, repositoryName))
+                .fetch(GHAppInstallation.class)
+                .wrapUp(root);
     }
 
     /**
-     * Obtain a user installation associated with this app
-     * @param name - user name
-     *
+     * Obtain a user installation associated with this app.
+     * <p>
      * You must use a JWT to access this endpoint.
      *
+     * @param name
+     *            user name
+     * @return a GHAppInstallation
+     * @throws IOException
+     *             on error
      * @see <a href="https://developer.github.com/v3/apps/#get-a-user-installation">Get a user installation</a>
      */
-    @Preview @Deprecated
+    @Preview(MACHINE_MAN)
+    @Deprecated
     public GHAppInstallation getInstallationByUser(String name) throws IOException {
-        return root.retrieve().withPreview(MACHINE_MAN).to(String.format("/users/%s/installation", name), GHAppInstallation.class).wrapUp(root);
+        return root.createRequest()
+                .withPreview(MACHINE_MAN)
+                .withUrlPath(String.format("/users/%s/installation", name))
+                .fetch(GHAppInstallation.class)
+                .wrapUp(root);
     }
 
 }
-

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

@@ -1,29 +1,36 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
+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
  *
  * @author Paulo Miguel Almeida
- *
- * @see GHAppInstallation#createToken(Map)
+ * @see GHAppInstallation#createToken(Map) GHAppInstallation#createToken(Map)
+ * @see GHAppInstallation#createToken() GHAppInstallation#createToken()
  */
-public class GHAppCreateTokenBuilder {
-    private final GitHub root;
+public class GHAppCreateTokenBuilder extends GitHubInteractiveObject {
     protected final Requester builder;
     private final String apiUrlTail;
 
-    @Preview @Deprecated
-    /*package*/ GHAppCreateTokenBuilder(GitHub root, String apiUrlTail, Map<String, GHPermissionType> permissions) {
+    @BetaApi
+    @Deprecated
+    GHAppCreateTokenBuilder(GitHub root, String apiUrlTail) {
         this.root = root;
         this.apiUrlTail = apiUrlTail;
-        this.builder = new Requester(root);
-        this.builder.withPermissions("permissions",permissions);
+        this.builder = root.createRequest();
+    }
+
+    @BetaApi
+    @Deprecated
+    GHAppCreateTokenBuilder(GitHub root, String apiUrlTail, Map<String, GHPermissionType> permissions) {
+        this(root, apiUrlTail);
+        permissions(permissions);
     }
 
     /**
@@ -31,23 +38,53 @@ public class GHAppCreateTokenBuilder {
      * the access to specific repositories, you can provide the repository_ids when creating the token. When you omit
      * repository_ids, the response does not contain neither the repositories nor the permissions key.
      *
-     * @param repositoryIds - Array containing the repositories Ids
-     *
+     * @param repositoryIds
+     *            Array containing the repositories Ids
+     * @return a GHAppCreateTokenBuilder
      */
-    @Preview @Deprecated
+    @BetaApi
+    @Deprecated
     public GHAppCreateTokenBuilder repositoryIds(List<Long> repositoryIds) {
-        this.builder.with("repository_ids",repositoryIds);
+        this.builder.with("repository_ids", repositoryIds);
+        return this;
+    }
+
+    /**
+     * Set the permissions granted to the access token. The permissions object includes the permission names and their
+     * access type.
+     *
+     * @param permissions
+     *            Map containing the permission names and types.
+     * @return a GHAppCreateTokenBuilder
+     */
+    @BetaApi
+    @Deprecated
+    public GHAppCreateTokenBuilder permissions(Map<String, GHPermissionType> permissions) {
+        Map<String, String> retMap = new HashMap<>();
+        for (Map.Entry<String, GHPermissionType> entry : permissions.entrySet()) {
+            retMap.put(entry.getKey(), GitHubRequest.transformEnum(entry.getValue()));
+        }
+        builder.with("permissions", retMap);
         return this;
     }
 
     /**
      * Creates an app token with all the parameters.
-     *
+     * <p>
      * You must use a JWT to access this endpoint.
+     *
+     * @return a GHAppInstallationToken
+     * @throws IOException
+     *             on error
      */
-    @Preview @Deprecated
+    @Preview(MACHINE_MAN)
+    @Deprecated
     public GHAppInstallationToken create() throws IOException {
-        return builder.method("POST").withPreview(MACHINE_MAN).to(apiUrlTail, GHAppInstallationToken.class).wrapUp(root);
+        return builder.method("POST")
+                .withPreview(MACHINE_MAN)
+                .withUrlPath(apiUrlTail)
+                .fetch(GHAppInstallationToken.class)
+                .wrapUp(root);
     }
 
 }

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

@@ -3,26 +3,25 @@ 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.
  *
  * @author Paulo Miguel Almeida
- *
- * @see GHApp#listInstallations()
- * @see GHApp#getInstallationById(long)
- * @see GHApp#getInstallationByOrganization(String)
- * @see GHApp#getInstallationByRepository(String, String)
- * @see GHApp#getInstallationByUser(String)
+ * @see GHApp#listInstallations() GHApp#listInstallations()
+ * @see GHApp#getInstallationById(long) GHApp#getInstallationById(long)
+ * @see GHApp#getInstallationByOrganization(String) GHApp#getInstallationByOrganization(String)
+ * @see GHApp#getInstallationByRepository(String, String) GHApp#getInstallationByRepository(String, String)
+ * @see GHApp#getInstallationByUser(String) GHApp#getInstallationByUser(String)
  */
-
 public class GHAppInstallation extends GHObject {
-    private GitHub root;
     private GHUser account;
 
     @JsonProperty("access_tokens_url")
@@ -44,124 +43,326 @@ public class GHAppInstallation extends GHObject {
     private String htmlUrl;
 
     public URL getHtmlUrl() {
-        return GitHub.parseURL(htmlUrl);
+        return GitHubClient.parseURL(htmlUrl);
     }
 
+    /**
+     * Gets root.
+     *
+     * @return the root
+     */
     public GitHub getRoot() {
         return root;
     }
 
+    /**
+     * Sets root.
+     *
+     * @param root
+     *            the root
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setRoot(GitHub root) {
         this.root = root;
     }
 
+    /**
+     * Gets account.
+     *
+     * @return the account
+     */
     public GHUser getAccount() {
         return account;
     }
 
+    /**
+     * Sets account.
+     *
+     * @param account
+     *            the account
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setAccount(GHUser account) {
         this.account = account;
     }
 
+    /**
+     * Gets access token url.
+     *
+     * @return the access token url
+     */
     public String getAccessTokenUrl() {
         return accessTokenUrl;
     }
 
+    /**
+     * Sets access token url.
+     *
+     * @param accessTokenUrl
+     *            the access token url
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setAccessTokenUrl(String accessTokenUrl) {
         this.accessTokenUrl = accessTokenUrl;
     }
 
+    /**
+     * Gets repositories url.
+     *
+     * @return the repositories url
+     */
     public String getRepositoriesUrl() {
         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.
+     *
+     * @param repositoriesUrl
+     *            the repositories url
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setRepositoriesUrl(String repositoriesUrl) {
         this.repositoriesUrl = repositoriesUrl;
     }
 
+    /**
+     * Gets app id.
+     *
+     * @return the app id
+     */
     public long getAppId() {
         return appId;
     }
 
+    /**
+     * Sets app id.
+     *
+     * @param appId
+     *            the app id
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setAppId(long appId) {
         this.appId = appId;
     }
 
+    /**
+     * Gets target id.
+     *
+     * @return the target id
+     */
     public long getTargetId() {
         return targetId;
     }
 
+    /**
+     * Sets target id.
+     *
+     * @param targetId
+     *            the target id
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setTargetId(long targetId) {
         this.targetId = targetId;
     }
 
+    /**
+     * Gets target type.
+     *
+     * @return the target type
+     */
     public GHTargetType getTargetType() {
         return targetType;
     }
 
+    /**
+     * Sets target type.
+     *
+     * @param targetType
+     *            the target type
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setTargetType(GHTargetType targetType) {
         this.targetType = targetType;
     }
 
+    /**
+     * Gets permissions.
+     *
+     * @return the permissions
+     */
     public Map<String, GHPermissionType> getPermissions() {
         return permissions;
     }
 
+    /**
+     * Sets permissions.
+     *
+     * @param permissions
+     *            the permissions
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setPermissions(Map<String, GHPermissionType> permissions) {
         this.permissions = permissions;
     }
 
+    /**
+     * Gets events.
+     *
+     * @return the events
+     */
     public List<GHEvent> getEvents() {
         return events;
     }
 
+    /**
+     * Sets events.
+     *
+     * @param events
+     *            the events
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setEvents(List<GHEvent> events) {
         this.events = events;
     }
 
+    /**
+     * Gets single file name.
+     *
+     * @return the single file name
+     */
     public String getSingleFileName() {
         return singleFileName;
     }
 
+    /**
+     * Sets single file name.
+     *
+     * @param singleFileName
+     *            the single file name
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setSingleFileName(String singleFileName) {
         this.singleFileName = singleFileName;
     }
 
+    /**
+     * Gets repository selection.
+     *
+     * @return the repository selection
+     */
     public GHRepositorySelection getRepositorySelection() {
         return repositorySelection;
     }
 
+    /**
+     * Sets repository selection.
+     *
+     * @param repositorySelection
+     *            the repository selection
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setRepositorySelection(GHRepositorySelection repositorySelection) {
         this.repositorySelection = repositorySelection;
     }
 
-    /*package*/ GHAppInstallation wrapUp(GitHub root) {
+    GHAppInstallation wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
 
     /**
      * Delete a Github App installation
-     *
+     * <p>
      * You must use a JWT to access this endpoint.
      *
+     * @throws IOException
+     *             on error
      * @see <a href="https://developer.github.com/v3/apps/#delete-an-installation">Delete an installation</a>
      */
-    @Preview @Deprecated
+    @Preview(GAMBIT)
+    @Deprecated
     public void deleteInstallation() throws IOException {
-        root.retrieve().method("DELETE").withPreview(GAMBIT).to(String.format("/app/installations/%d", id));
+        root.createRequest()
+                .method("DELETE")
+                .withPreview(GAMBIT)
+                .withUrlPath(String.format("/app/installations/%d", getId()))
+                .send();
     }
 
-
     /**
      * Starts a builder that creates a new App Installation Token.
      *
      * <p>
-     * You use the returned builder to set various properties, then call {@link GHAppCreateTokenBuilder#create()}
-     * to finally create an access token.
+     * You use the returned builder to set various properties, then call {@link GHAppCreateTokenBuilder#create()} to
+     * finally create an access token.
+     *
+     * @param permissions
+     *            map of permissions for the created token
+     * @return a GHAppCreateTokenBuilder instance
+     * @deprecated Use {@link GHAppInstallation#createToken()} instead.
      */
-    @Preview @Deprecated
-    public GHAppCreateTokenBuilder createToken(Map<String,GHPermissionType> permissions){
-        return new GHAppCreateTokenBuilder(root,String.format("/app/installations/%d/access_tokens", id), permissions);
+    @BetaApi
+    @Deprecated
+    public GHAppCreateTokenBuilder createToken(Map<String, GHPermissionType> permissions) {
+        return new GHAppCreateTokenBuilder(root,
+                String.format("/app/installations/%d/access_tokens", getId()),
+                permissions);
+    }
+
+    /**
+     * Starts a builder that creates a new App Installation Token.
+     *
+     * <p>
+     * You use the returned builder to set various properties, then call {@link GHAppCreateTokenBuilder#create()} to
+     * finally create an access token.
+     *
+     * @return a GHAppCreateTokenBuilder instance
+     */
+    @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

@@ -1,6 +1,5 @@
 package org.kohsuke.github;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -13,66 +12,130 @@ import java.util.Map;
  * A Github App Installation Token.
  *
  * @author Paulo Miguel Almeida
- *
- * @see GHAppInstallation#createToken(Map)
+ * @see GHAppInstallation#createToken(Map) GHAppInstallation#createToken(Map)
  */
-
-public class GHAppInstallationToken {
-    private GitHub root;
-
+public class GHAppInstallationToken extends GitHubInteractiveObject {
     private String token;
     protected String expires_at;
     private Map<String, String> permissions;
     private List<GHRepository> repositories;
-    @JsonProperty("repository_selection")
     private GHRepositorySelection repositorySelection;
 
+    /**
+     * Gets root.
+     *
+     * @return the root
+     */
     public GitHub getRoot() {
         return root;
     }
 
+    /**
+     * Sets root.
+     *
+     * @param root
+     *            the root
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setRoot(GitHub root) {
         this.root = root;
     }
 
+    /**
+     * Gets permissions.
+     *
+     * @return the permissions
+     */
     public Map<String, String> getPermissions() {
         return permissions;
     }
 
+    /**
+     * Sets permissions.
+     *
+     * @param permissions
+     *            the permissions
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setPermissions(Map<String, String> permissions) {
         this.permissions = permissions;
     }
 
+    /**
+     * Gets token.
+     *
+     * @return the token
+     */
     public String getToken() {
         return token;
     }
 
+    /**
+     * Sets token.
+     *
+     * @param token
+     *            the token
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setToken(String token) {
         this.token = token;
     }
 
+    /**
+     * Gets repositories.
+     *
+     * @return the repositories
+     */
     public List<GHRepository> getRepositories() {
         return repositories;
     }
 
+    /**
+     * Sets repositories.
+     *
+     * @param repositories
+     *            the repositories
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setRepositories(List<GHRepository> repositories) {
         this.repositories = repositories;
     }
 
+    /**
+     * Gets repository selection.
+     *
+     * @return the repository selection
+     */
     public GHRepositorySelection getRepositorySelection() {
         return repositorySelection;
     }
 
+    /**
+     * Sets repository selection.
+     *
+     * @param repositorySelection
+     *            the repository selection
+     * @deprecated Do not use this method. It was added due to incomplete understanding of Jackson binding.
+     */
+    @Deprecated
     public void setRepositorySelection(GHRepositorySelection repositorySelection) {
         this.repositorySelection = repositorySelection;
     }
 
     /**
-     * When was this tokens expires?
+     * Gets expires at.
+     *
+     * @return date when this token expires
+     * @throws IOException
+     *             on error
      */
-    @WithBridgeMethods(value=String.class, adapterMethod="expiresAtStr")
+    @WithBridgeMethods(value = String.class, adapterMethod = "expiresAtStr")
     public Date getExpiresAt() throws IOException {
-        return GitHub.parseDate(expires_at);
+        return GitHubClient.parseDate(expires_at);
     }
 
     @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getExpiresAt")
@@ -80,7 +143,7 @@ public class GHAppInstallationToken {
         return expires_at;
     }
 
-    /*package*/ GHAppInstallationToken wrapUp(GitHub root) {
+    GHAppInstallationToken wrapUp(GitHub root) {
         this.root = root;
         return this;
     }

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

@@ -0,0 +1,140 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.apache.commons.lang3.StringUtils;
+import org.kohsuke.github.function.InputStreamFunction;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Date;
+import java.util.Objects;
+
+import static java.util.Objects.requireNonNull;
+
+/**
+ * An artifact from a workflow run.
+ *
+ * @author Guillaume Smet
+ */
+public class GHArtifact extends GHObject {
+
+    // Not provided by the API.
+    @JsonIgnore
+    private GHRepository owner;
+
+    private String name;
+    private long sizeInBytes;
+    private String archiveDownloadUrl;
+    private boolean expired;
+    private String expiresAt;
+
+    /**
+     * Gets the name.
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the size of the artifact in bytes.
+     *
+     * @return the size
+     */
+    public long getSizeInBytes() {
+        return sizeInBytes;
+    }
+
+    /**
+     * Gets the archive download URL.
+     *
+     * @return the archive download URL
+     */
+    public URL getArchiveDownloadUrl() {
+        return GitHubClient.parseURL(archiveDownloadUrl);
+    }
+
+    /**
+     * If this artifact has expired.
+     *
+     * @return if the artifact has expired
+     */
+    public boolean isExpired() {
+        return expired;
+    }
+
+    /**
+     * Gets the date at which this artifact will expire.
+     *
+     * @return the date of expiration
+     */
+    public Date getExpiresAt() {
+        return GitHubClient.parseDate(expiresAt);
+    }
+
+    /**
+     * Repository to which the artifact belongs.
+     *
+     * @return the repository
+     */
+    public GHRepository getRepository() {
+        return owner;
+    }
+
+    /**
+     * @deprecated This object has no HTML URL.
+     */
+    @Override
+    public URL getHtmlUrl() throws IOException {
+        return null;
+    }
+
+    /**
+     * Deletes the artifact.
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    public void delete() throws IOException {
+        root.createRequest().method("DELETE").withUrlPath(getApiRoute()).fetchHttpStatusCode();
+    }
+
+    /**
+     * Downloads the artifact.
+     *
+     * @param <T>
+     *            the type of result
+     * @param streamFunction
+     *            The {@link InputStreamFunction} that will process the stream
+     * @throws IOException
+     *             The IO exception.
+     * @return the result of reading the stream.
+     */
+    public <T> T download(InputStreamFunction<T> streamFunction) throws IOException {
+        requireNonNull(streamFunction, "Stream function must not be null");
+
+        return root.createRequest().method("GET").withUrlPath(getApiRoute(), "zip").fetchStream(streamFunction);
+    }
+
+    private String getApiRoute() {
+        if (owner == null) {
+            // Workflow runs returned from search to do not have an owner. Attempt to use url.
+            final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
+            return StringUtils.prependIfMissing(url.toString().replace(root.getApiUrl(), ""), "/");
+        }
+        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/actions/artifacts/" + getId();
+    }
+
+    GHArtifact wrapUp(GHRepository owner) {
+        this.owner = owner;
+        return wrapUp(owner.root);
+    }
+
+    GHArtifact wrapUp(GitHub root) {
+        this.root = root;
+        if (owner != null)
+            owner.wrap(root);
+        return this;
+    }
+}

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

@@ -0,0 +1,49 @@
+package org.kohsuke.github;
+
+import java.net.MalformedURLException;
+import java.util.Iterator;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Iterable for artifacts listing.
+ */
+class GHArtifactsIterable extends PagedIterable<GHArtifact> {
+    private final transient GHRepository owner;
+    private final GitHubRequest request;
+
+    private GHArtifactsPage result;
+
+    public GHArtifactsIterable(GHRepository owner, GitHubRequest.Builder<?> requestBuilder) {
+        this.owner = owner;
+        try {
+            this.request = requestBuilder.build();
+        } catch (MalformedURLException e) {
+            throw new GHException("Malformed URL", e);
+        }
+    }
+
+    @Nonnull
+    @Override
+    public PagedIterator<GHArtifact> _iterator(int pageSize) {
+        return new PagedIterator<>(
+                adapt(GitHubPageIterator.create(owner.getRoot().getClient(), GHArtifactsPage.class, request, pageSize)),
+                null);
+    }
+
+    protected Iterator<GHArtifact[]> adapt(final Iterator<GHArtifactsPage> base) {
+        return new Iterator<GHArtifact[]>() {
+            public boolean hasNext() {
+                return base.hasNext();
+            }
+
+            public GHArtifact[] next() {
+                GHArtifactsPage v = base.next();
+                if (result == null) {
+                    result = v;
+                }
+                return v.getArtifacts(owner);
+            }
+        };
+    }
+}

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

@@ -0,0 +1,20 @@
+package org.kohsuke.github;
+
+/**
+ * Represents the one page of artifacts result when listing artifacts.
+ */
+class GHArtifactsPage {
+    private int total_count;
+    private GHArtifact[] artifacts;
+
+    public int getTotalCount() {
+        return total_count;
+    }
+
+    GHArtifact[] getArtifacts(GHRepository owner) {
+        for (GHArtifact artifact : artifacts) {
+            artifact.wrapUp(owner);
+        }
+        return artifacts;
+    }
+}

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

@@ -6,10 +6,9 @@ import java.net.URL;
 /**
  * Asset in a release.
  *
- * @see GHRelease#getAssets()
+ * @see GHRelease#getAssets() GHRelease#getAssets()
  */
 public class GHAsset extends GHObject {
-    GitHub root;
     GHRepository owner;
     private String name;
     private String label;
@@ -19,44 +18,100 @@ public class GHAsset extends GHObject {
     private long download_count;
     private String browser_download_url;
 
+    /**
+     * Gets content type.
+     *
+     * @return the content type
+     */
     public String getContentType() {
         return content_type;
     }
 
+    /**
+     * Sets content type.
+     *
+     * @param contentType
+     *            the content type
+     * @throws IOException
+     *             the io exception
+     */
     public void setContentType(String contentType) throws IOException {
         edit("content_type", contentType);
         this.content_type = contentType;
     }
 
+    /**
+     * Gets download count.
+     *
+     * @return the download count
+     */
     public long getDownloadCount() {
         return download_count;
     }
 
+    /**
+     * Gets label.
+     *
+     * @return the label
+     */
     public String getLabel() {
         return label;
     }
 
+    /**
+     * Sets label.
+     *
+     * @param label
+     *            the label
+     * @throws IOException
+     *             the io exception
+     */
     public void setLabel(String label) throws IOException {
         edit("label", label);
         this.label = label;
     }
 
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Gets owner.
+     *
+     * @return the owner
+     */
     public GHRepository getOwner() {
         return owner;
     }
 
+    /**
+     * Gets root.
+     *
+     * @return the root
+     */
     public GitHub getRoot() {
         return root;
     }
 
+    /**
+     * Gets size.
+     *
+     * @return the size
+     */
     public long getSize() {
         return size;
     }
 
+    /**
+     * Gets state.
+     *
+     * @return the state
+     */
     public String getState() {
         return state;
     }
@@ -69,21 +124,31 @@ public class GHAsset extends GHObject {
         return null;
     }
 
+    /**
+     * Gets browser download url.
+     *
+     * @return the browser download url
+     */
     public String getBrowserDownloadUrl() {
         return browser_download_url;
     }
 
     private void edit(String key, Object value) throws IOException {
-        new Requester(root)._with(key, value).method("PATCH").to(getApiRoute());
+        root.createRequest().with(key, value).method("PATCH").withUrlPath(getApiRoute()).send();
     }
 
+    /**
+     * Delete.
+     *
+     * @throws IOException
+     *             the io exception
+     */
     public void delete() throws IOException {
-        new Requester(root).method("DELETE").to(getApiRoute());
+        root.createRequest().method("DELETE").withUrlPath(getApiRoute()).send();
     }
 
-
     private String getApiRoute() {
-        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + id;
+        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + getId();
     }
 
     GHAsset wrap(GHRelease release) {
@@ -92,6 +157,15 @@ public class GHAsset extends GHObject {
         return this;
     }
 
+    /**
+     * Wrap gh asset [ ].
+     *
+     * @param assets
+     *            the assets
+     * @param release
+     *            the release
+     * @return the gh asset [ ]
+     */
     public static GHAsset[] wrap(GHAsset[] assets, GHRelease release) {
         for (GHAsset aTo : assets) {
             aTo.wrap(release);

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

@@ -10,7 +10,7 @@ import java.util.List;
  * Generated OAuth token
  *
  * @author janinko
- * @see GitHub#createToken(Collection, String, String)
+ * @see GitHub#createToken(Collection, String, String) GitHub#createToken(Collection, String, String)
  * @see <a href="http://developer.github.com/v3/oauth/#create-a-new-authorization">API documentation</a>
  */
 public class GHAuthorization extends GHObject {
@@ -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;
@@ -42,41 +41,82 @@ public class GHAuthorization extends GHObject {
     private String note;
     private String note_url;
     private String fingerprint;
-    //TODO add some user class for https://developer.github.com/v3/oauth_authorizations/#check-an-authorization ?
-    //private GHUser user;
+    // TODO add some user class for https://developer.github.com/v3/oauth_authorizations/#check-an-authorization ?
+    // private GHUser user;
 
+    /**
+     * Gets root.
+     *
+     * @return the root
+     */
     public GitHub getRoot() {
         return root;
     }
 
+    /**
+     * Gets scopes.
+     *
+     * @return the scopes
+     */
     public List<String> getScopes() {
         return scopes;
     }
 
+    /**
+     * Gets token.
+     *
+     * @return the token
+     */
     public String getToken() {
         return token;
     }
 
+    /**
+     * Gets token last eight.
+     *
+     * @return the token last eight
+     */
     public String getTokenLastEight() {
         return token_last_eight;
     }
 
+    /**
+     * Gets hashed token.
+     *
+     * @return the hashed token
+     */
     public String getHashedToken() {
         return hashed_token;
     }
 
+    /**
+     * Gets app url.
+     *
+     * @return the app url
+     */
     public URL getAppUrl() {
-        return GitHub.parseURL(app.url);
+        return GitHubClient.parseURL(app.url);
     }
 
+    /**
+     * Gets app name.
+     *
+     * @return the app name
+     */
     public String getAppName() {
         return app.name;
     }
 
-    @SuppressFBWarnings(value = "NM_CONFUSING", 
-            justification = "It's a part of the library API, cannot be changed")
+    /**
+     * Gets api url.
+     *
+     * @return the api url
+     * @deprecated use {@link #getUrl()}
+     */
+    @Deprecated
+    @SuppressFBWarnings(value = "NM_CONFUSING", justification = "It's a part of the library API, cannot be changed")
     public URL getApiURL() {
-        return GitHub.parseURL(url);
+        return getUrl();
     }
 
     /**
@@ -87,25 +127,40 @@ public class GHAuthorization extends GHObject {
         return null;
     }
 
+    /**
+     * Gets note.
+     *
+     * @return the note
+     */
     public String getNote() {
         return note;
     }
 
+    /**
+     * Gets note url.
+     *
+     * @return the note url
+     */
     public URL getNoteUrl() {
-        return GitHub.parseURL(note_url);
+        return GitHubClient.parseURL(note_url);
     }
 
+    /**
+     * Gets fingerprint.
+     *
+     * @return the fingerprint
+     */
     public String getFingerprint() {
         return fingerprint;
     }
 
-    /*package*/ GHAuthorization wrap(GitHub root) {
+    GHAuthorization wrap(GitHub root) {
         this.root = root;
         return this;
     }
 
-    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD"}, 
-        justification = "JSON API")
+    @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD" },
+            justification = "JSON API")
     private static class App {
         private String url;
         private String name;

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

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

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

@@ -1,12 +1,10 @@
 package org.kohsuke.github;
 
-import org.apache.commons.codec.binary.Base64;
-
 import java.io.IOException;
+import java.util.Base64;
 
 /**
- * Builder pattern for creating a new blob.
- * Based on https://developer.github.com/v3/git/blobs/#create-a-blob
+ * Builder pattern for creating a new blob. Based on https://developer.github.com/v3/git/blobs/#create-a-blob
  */
 public class GHBlobBuilder {
     private final GHRepository repo;
@@ -14,11 +12,15 @@ public class GHBlobBuilder {
 
     GHBlobBuilder(GHRepository repo) {
         this.repo = repo;
-        req = new Requester(repo.root);
+        req = repo.root.createRequest();
     }
 
     /**
      * Configures a blob with the specified text {@code content}.
+     *
+     * @param content
+     *            string text of the blob
+     * @return a GHBlobBuilder
      */
     public GHBlobBuilder textContent(String content) {
         req.with("content", content);
@@ -28,9 +30,13 @@ public class GHBlobBuilder {
 
     /**
      * Configures a blob with the specified binary {@code content}.
+     *
+     * @param content
+     *            byte array of the blob
+     * @return a GHBlobBuilder
      */
     public GHBlobBuilder binaryContent(byte[] content) {
-        String base64Content = Base64.encodeBase64String(content);
+        String base64Content = Base64.getEncoder().encodeToString(content);
         req.with("content", base64Content);
         req.with("encoding", "base64");
         return this;
@@ -42,8 +48,12 @@ public class GHBlobBuilder {
 
     /**
      * Creates a blob based on the parameters specified thus far.
+     *
+     * @return a GHBlob
+     * @throws IOException
+     *             if the blob cannot be created.
      */
     public GHBlob create() throws IOException {
-        return req.method("POST").to(getApiTail(), GHBlob.class);
+        return req.method("POST").withUrlPath(getApiTail()).fetch(GHBlob.class);
     }
 }

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

@@ -1,23 +1,27 @@
 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;
 import java.util.Collection;
+import java.util.Objects;
 
-import static org.kohsuke.github.Previews.*;
+import javax.annotation.CheckForNull;
 
 /**
  * A branch in a repository.
  *
  * @author Yusuke Kokubo
  */
-@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD",
-    "NP_UNWRITTEN_FIELD", "URF_UNREAD_FIELD"}, justification = "JSON API")
-public class GHBranch {
-    private GitHub root;
+@SuppressFBWarnings(
+        value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
+                "URF_UNREAD_FIELD" },
+        justification = "JSON API")
+public class GHBranch extends GitHubInteractiveObject {
     private GHRepository owner;
 
     private String name;
@@ -26,7 +30,15 @@ public class GHBranch {
     private boolean protection;
     private String protection_url;
 
+    @JsonCreator
+    GHBranch(@JsonProperty(value = "name", required = true) String name) throws Exception {
+        Objects.requireNonNull(name);
+        this.name = name;
+    }
 
+    /**
+     * The type Commit.
+     */
     public static class Commit {
         String sha;
 
@@ -34,43 +46,76 @@ public class GHBranch {
         String url;
     }
 
+    /**
+     * Gets root.
+     *
+     * @return the root
+     */
     public GitHub getRoot() {
         return root;
     }
 
     /**
-     * Repository that this branch is in.
+     * Gets owner.
+     *
+     * @return the repository that this branch is in.
      */
     public GHRepository getOwner() {
         return owner;
     }
 
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
     /**
-     * Returns true if the push to this branch is restricted via branch protection.
+     * Is protected boolean.
+     *
+     * @return true if the push to this branch is restricted via branch protection.
      */
-    @Preview @Deprecated
+    @Preview(Previews.LUKE_CAGE)
+    @Deprecated
     public boolean isProtected() {
         return protection;
     }
 
     /**
-     * Returns API URL that deals with the protection of this branch.
+     * Gets protection url.
+     *
+     * @return API URL that deals with the protection of this branch.
      */
-    @Preview @Deprecated
+    @Preview(Previews.LUKE_CAGE)
+    @Deprecated
     public URL getProtectionUrl() {
-        return GitHub.parseURL(protection_url);
-    }
-
-    public GHBranchProtection getProtection() throws IOException {
-        return root.retrieve().to(protection_url, GHBranchProtection.class).wrap(this);
+        return GitHubClient.parseURL(protection_url);
     }
 
     /**
-     * The commit that this branch currently points to.
+     * Gets protection.
+     *
+     * @return the protection
+     * @throws IOException
+     *             the io exception
+     */
+    @Preview(Previews.LUKE_CAGE)
+    @Deprecated
+    public GHBranchProtection getProtection() throws IOException {
+        return root.createRequest()
+                .withPreview(Previews.LUKE_CAGE)
+                .setRawUrlPath(protection_url)
+                .fetch(GHBranchProtection.class)
+                .wrap(this);
+    }
+
+    /**
+     * Gets sha 1.
+     *
+     * @return The SHA1 of the commit that this branch currently points to.
      */
     public String getSHA1() {
         return commit.sha;
@@ -78,40 +123,107 @@ public class GHBranch {
 
     /**
      * Disables branch protection and allows anyone with push access to push changes.
+     *
+     * @throws IOException
+     *             if disabling protection fails
      */
     public void disableProtection() throws IOException {
-        new Requester(root).method("DELETE").to(protection_url);
+        root.createRequest().method("DELETE").setRawUrlPath(protection_url).send();
     }
 
     /**
      * Enables branch protection to control what commit statuses are required to push.
      *
-     * @see GHCommitStatus#getContext()
+     * @return GHBranchProtectionBuilder for enabling protection
+     * @see GHCommitStatus#getContext() GHCommitStatus#getContext()
      */
-    @Preview @Deprecated
+    @Preview(Previews.LUKE_CAGE)
+    @Deprecated
     public GHBranchProtectionBuilder enableProtection() {
         return new GHBranchProtectionBuilder(this);
     }
 
+    /**
+     * Enable protection.
+     *
+     * @param level
+     *            the level
+     * @param contexts
+     *            the contexts
+     * @throws IOException
+     *             the io exception
+     */
     // backward compatibility with previous signature
     @Deprecated
     public void enableProtection(EnforcementLevel level, Collection<String> contexts) throws IOException {
         switch (level) {
-        case OFF:
-            disableProtection();
-            break;
-        case NON_ADMINS:
-        case EVERYONE:
-            enableProtection()
-                .addRequiredChecks(contexts)
-                .includeAdmins(level==EnforcementLevel.EVERYONE)
-                .enable();
-            break;
+            case OFF :
+                disableProtection();
+                break;
+            case NON_ADMINS :
+            case EVERYONE :
+                enableProtection().addRequiredChecks(contexts)
+                        .includeAdmins(level == EnforcementLevel.EVERYONE)
+                        .enable();
+                break;
         }
     }
 
+    /**
+     * Merge a branch into this branch.
+     *
+     * @param headBranch
+     *            the branch whose head will be merged
+     *
+     * @param commitMessage
+     *            the commit message
+     *
+     * @return the merge {@link GHCommit} created, or {@code null} if the base already contains the head (nothing to
+     *         merge).
+     *
+     * @throws IOException
+     *             if merging fails
+     */
+    @CheckForNull
+    public GHCommit merge(GHBranch headBranch, String commitMessage) throws IOException {
+        return merge(headBranch.getName(), commitMessage);
+    }
+
+    /**
+     * Merge a ref into this branch.
+     *
+     * @param head
+     *            the ref name that will be merged into this branch. Follows the usual ref naming rules, could be a
+     *            branch name, tag, or commit sha.
+     *
+     * @param commitMessage
+     *            the commit message
+     *
+     * @return the merge {@link GHCommit} created, or {@code null} if the base already contains the head (nothing to
+     *         merge).
+     *
+     * @throws IOException
+     *             if merging fails
+     */
+    @CheckForNull
+    public GHCommit merge(String head, String commitMessage) throws IOException {
+        GHCommit result = root.createRequest()
+                .withUrlPath(owner.getApiTailUrl("merges"))
+                .method("POST")
+                .with("commit_message", commitMessage)
+                .with("base", this.name)
+                .with("head", head)
+                .fetch(GHCommit.class);
+
+        if (result != null) {
+            result.wrapUp(owner);
+        }
+
+        return result;
+    }
+
     String getApiRoute() {
-        return owner.getApiTailUrl("/branches/"+name);
+        return owner.getApiTailUrl("/branches/" + name);
     }
 
     @Override
@@ -120,7 +232,7 @@ public class GHBranch {
         return "Branch:" + name + " in " + url;
     }
 
-    /*package*/ GHBranch wrap(GHRepository repo) {
+    GHBranch wrap(GHRepository repo) {
         this.owner = repo;
         this.root = repo.root;
         return this;

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

@@ -3,25 +3,30 @@ package org.kohsuke.github;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-import static org.kohsuke.github.Previews.ZZZAX;
-
 import java.io.IOException;
 import java.util.Collection;
 
-@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
-        "URF_UNREAD_FIELD"}, justification = "JSON API")
-public class GHBranchProtection {
+import static org.kohsuke.github.internal.Previews.ZZZAX;
+
+/**
+ * The type GHBranchProtection.
+ *
+ * @see <a href="https://docs.github.com/en/rest/reference/repos#get-branch-protection">GitHub Branch Protection</a>
+ */
+@SuppressFBWarnings(
+        value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
+                "URF_UNREAD_FIELD" },
+        justification = "JSON API")
+public class GHBranchProtection extends GitHubInteractiveObject {
     private static final String REQUIRE_SIGNATURES_URI = "/required_signatures";
 
-    @JsonProperty("enforce_admins")
+    @JsonProperty
     private EnforceAdmins enforceAdmins;
 
-    private GitHub root;
-
     @JsonProperty("required_pull_request_reviews")
     private RequiredReviews requiredReviews;
 
-    @JsonProperty("required_status_checks")
+    @JsonProperty
     private RequiredStatusChecks requiredStatusChecks;
 
     @JsonProperty
@@ -30,40 +35,84 @@ public class GHBranchProtection {
     @JsonProperty
     private String url;
 
-    @Preview @Deprecated
+    /**
+     * Enabled signed commits.
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    @Preview(ZZZAX)
+    @Deprecated
     public void enabledSignedCommits() throws IOException {
-        requester().method("POST")
-                .to(url + REQUIRE_SIGNATURES_URI, RequiredSignatures.class);
+        requester().method("POST").withUrlPath(url + REQUIRE_SIGNATURES_URI).fetch(RequiredSignatures.class);
     }
 
-    @Preview @Deprecated
+    /**
+     * Disable signed commits.
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    @Preview(ZZZAX)
+    @Deprecated
     public void disableSignedCommits() throws IOException {
-        requester().method("DELETE")
-                .to(url + REQUIRE_SIGNATURES_URI);
+        requester().method("DELETE").withUrlPath(url + REQUIRE_SIGNATURES_URI).send();
     }
 
+    /**
+     * Gets enforce admins.
+     *
+     * @return the enforce admins
+     */
     public EnforceAdmins getEnforceAdmins() {
         return enforceAdmins;
     }
 
+    /**
+     * Gets required reviews.
+     *
+     * @return the required reviews
+     */
     public RequiredReviews getRequiredReviews() {
         return requiredReviews;
     }
 
-    @Preview @Deprecated
+    /**
+     * Gets required signatures.
+     *
+     * @return the required signatures
+     * @throws IOException
+     *             the io exception
+     */
+    @Preview(ZZZAX)
+    @Deprecated
     public boolean getRequiredSignatures() throws IOException {
-        return requester().method("GET")
-                .to(url + REQUIRE_SIGNATURES_URI, RequiredSignatures.class).enabled;
+        return requester().withUrlPath(url + REQUIRE_SIGNATURES_URI).fetch(RequiredSignatures.class).enabled;
     }
 
+    /**
+     * Gets required status checks.
+     *
+     * @return the required status checks
+     */
     public RequiredStatusChecks getRequiredStatusChecks() {
         return requiredStatusChecks;
     }
 
+    /**
+     * Gets restrictions.
+     *
+     * @return the restrictions
+     */
     public Restrictions getRestrictions() {
         return restrictions;
     }
 
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
     public String getUrl() {
         return url;
     }
@@ -74,9 +123,12 @@ public class GHBranchProtection {
     }
 
     private Requester requester() {
-        return new Requester(root).withPreview(ZZZAX);
+        return root.createRequest().withPreview(ZZZAX);
     }
 
+    /**
+     * The type EnforceAdmins.
+     */
     public static class EnforceAdmins {
         @JsonProperty
         private boolean enabled;
@@ -84,23 +136,34 @@ public class GHBranchProtection {
         @JsonProperty
         private String url;
 
+        /**
+         * Gets url.
+         *
+         * @return the url
+         */
         public String getUrl() {
             return url;
         }
 
+        /**
+         * Is enabled boolean.
+         *
+         * @return the boolean
+         */
         public boolean isEnabled() {
             return enabled;
         }
     }
 
+    /**
+     * The type RequiredReviews.
+     */
     public static class RequiredReviews {
         @JsonProperty("dismissal_restrictions")
         private Restrictions dismissalRestriction;
 
-        @JsonProperty("dismiss_stale_reviews")
         private boolean dismissStaleReviews;
 
-        @JsonProperty("require_code_owner_reviews")
         private boolean requireCodeOwnerReviews;
 
         @JsonProperty("required_approving_review_count")
@@ -109,22 +172,47 @@ public class GHBranchProtection {
         @JsonProperty
         private String url;
 
+        /**
+         * Gets dismissal restrictions.
+         *
+         * @return the dismissal restrictions
+         */
         public Restrictions getDismissalRestrictions() {
             return dismissalRestriction;
         }
 
+        /**
+         * Gets url.
+         *
+         * @return the url
+         */
         public String getUrl() {
             return url;
         }
 
+        /**
+         * Is dismiss stale reviews boolean.
+         *
+         * @return the boolean
+         */
         public boolean isDismissStaleReviews() {
             return dismissStaleReviews;
         }
 
+        /**
+         * Is require code owner reviews boolean.
+         *
+         * @return the boolean
+         */
         public boolean isRequireCodeOwnerReviews() {
             return requireCodeOwnerReviews;
         }
 
+        /**
+         * Gets required reviewers.
+         *
+         * @return the required reviewers
+         */
         public int getRequiredReviewers() {
             return requiredReviewers;
         }
@@ -137,15 +225,28 @@ public class GHBranchProtection {
         @JsonProperty
         private String url;
 
+        /**
+         * Gets url.
+         *
+         * @return the url
+         */
         public String getUrl() {
             return url;
         }
 
+        /**
+         * Is enabled boolean.
+         *
+         * @return the boolean
+         */
         public boolean isEnabled() {
             return enabled;
         }
     }
 
+    /**
+     * The type RequiredStatusChecks.
+     */
     public static class RequiredStatusChecks {
         @JsonProperty
         private Collection<String> contexts;
@@ -156,24 +257,41 @@ public class GHBranchProtection {
         @JsonProperty
         private String url;
 
+        /**
+         * Gets contexts.
+         *
+         * @return the contexts
+         */
         public Collection<String> getContexts() {
             return contexts;
         }
 
+        /**
+         * Gets url.
+         *
+         * @return the url
+         */
         public String getUrl() {
             return url;
         }
 
+        /**
+         * Is requires branch up to date boolean.
+         *
+         * @return the boolean
+         */
         public boolean isRequiresBranchUpToDate() {
             return strict;
         }
     }
 
+    /**
+     * The type Restrictions.
+     */
     public static class Restrictions {
         @JsonProperty
         private Collection<GHTeam> teams;
 
-        @JsonProperty("teams_url")
         private String teamsUrl;
 
         @JsonProperty
@@ -182,25 +300,49 @@ public class GHBranchProtection {
         @JsonProperty
         private Collection<GHUser> users;
 
-        @JsonProperty("users_url")
         private String usersUrl;
 
+        /**
+         * Gets teams.
+         *
+         * @return the teams
+         */
         public Collection<GHTeam> getTeams() {
             return teams;
         }
 
+        /**
+         * Gets teams url.
+         *
+         * @return the teams url
+         */
         public String getTeamsUrl() {
             return teamsUrl;
         }
 
+        /**
+         * Gets url.
+         *
+         * @return the url
+         */
         public String getUrl() {
             return url;
         }
 
+        /**
+         * Gets users.
+         *
+         * @return the users
+         */
         public Collection<GHUser> getUsers() {
             return users;
         }
 
+        /**
+         * Gets users url.
+         *
+         * @return the users url
+         */
         public String getUsersUrl() {
             return usersUrl;
         }

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

@@ -12,15 +12,17 @@ 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.
  *
- * @see GHBranch#enableProtection()
+ * @see GHBranch#enableProtection() GHBranch#enableProtection()
  */
-@SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
-        "URF_UNREAD_FIELD" }, justification = "JSON API")
+@SuppressFBWarnings(
+        value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
+                "URF_UNREAD_FIELD" },
+        justification = "JSON API")
 public class GHBranchProtectionBuilder {
     private final GHBranch branch;
 
@@ -33,72 +35,159 @@ public class GHBranchProtectionBuilder {
         this.branch = branch;
     }
 
+    /**
+     * Add required checks gh branch protection builder.
+     *
+     * @param checks
+     *            the checks
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder addRequiredChecks(Collection<String> checks) {
         getStatusChecks().contexts.addAll(checks);
         return this;
     }
-    
+
+    /**
+     * Add required checks gh branch protection builder.
+     *
+     * @param checks
+     *            the checks
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder addRequiredChecks(String... checks) {
         addRequiredChecks(Arrays.asList(checks));
         return this;
     }
 
+    /**
+     * Dismiss stale reviews gh branch protection builder.
+     *
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder dismissStaleReviews() {
         return dismissStaleReviews(true);
     }
 
+    /**
+     * Dismiss stale reviews gh branch protection builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder dismissStaleReviews(boolean v) {
         getPrReviews().put("dismiss_stale_reviews", v);
         return this;
     }
 
+    /**
+     * Enable gh branch protection.
+     *
+     * @return the gh branch protection
+     * @throws IOException
+     *             the io exception
+     */
     public GHBranchProtection enable() throws IOException {
         return requester().method("PUT")
                 .withNullable("required_status_checks", statusChecks)
                 .withNullable("required_pull_request_reviews", prReviews)
                 .withNullable("restrictions", restrictions)
                 .withNullable("enforce_admins", enforceAdmins)
-                .to(branch.getProtectionUrl().toString(), GHBranchProtection.class)
+                .withUrlPath(branch.getProtectionUrl().toString())
+                .fetch(GHBranchProtection.class)
                 .wrap(branch);
     }
 
+    /**
+     * Include admins gh branch protection builder.
+     *
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder includeAdmins() {
         return includeAdmins(true);
     }
 
+    /**
+     * Include admins gh branch protection builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder includeAdmins(boolean v) {
         enforceAdmins = v;
         return this;
     }
 
+    /**
+     * Required reviewers gh branch protection builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder requiredReviewers(int v) {
         getPrReviews().put("required_approving_review_count", v);
         return this;
     }
 
+    /**
+     * Require branch is up to date gh branch protection builder.
+     *
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder requireBranchIsUpToDate() {
         return requireBranchIsUpToDate(true);
     }
 
+    /**
+     * Require branch is up to date gh branch protection builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder requireBranchIsUpToDate(boolean v) {
         getStatusChecks().strict = v;
         return this;
     }
 
+    /**
+     * Require code own reviews gh branch protection builder.
+     *
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder requireCodeOwnReviews() {
         return requireCodeOwnReviews(true);
     }
 
+    /**
+     * Require code own reviews gh branch protection builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder requireCodeOwnReviews(boolean v) {
         getPrReviews().put("require_code_owner_reviews", v);
         return this;
     }
 
+    /**
+     * Require reviews gh branch protection builder.
+     *
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder requireReviews() {
         getPrReviews();
         return this;
     }
 
+    /**
+     * Restrict review dismissals gh branch protection builder.
+     *
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder restrictReviewDismissals() {
         getPrReviews();
 
@@ -109,11 +198,23 @@ public class GHBranchProtectionBuilder {
         return this;
     }
 
+    /**
+     * Restrict push access gh branch protection builder.
+     *
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder restrictPushAccess() {
         getRestrictions();
         return this;
     }
 
+    /**
+     * Team push access gh branch protection builder.
+     *
+     * @param teams
+     *            the teams
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder teamPushAccess(Collection<GHTeam> teams) {
         for (GHTeam team : teams) {
             teamPushAccess(team);
@@ -121,6 +222,13 @@ public class GHBranchProtectionBuilder {
         return this;
     }
 
+    /**
+     * Team push access gh branch protection builder.
+     *
+     * @param teams
+     *            the teams
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder teamPushAccess(GHTeam... teams) {
         for (GHTeam team : teams) {
             getRestrictions().teams.add(team.getSlug());
@@ -128,6 +236,13 @@ public class GHBranchProtectionBuilder {
         return this;
     }
 
+    /**
+     * Team review dismissals gh branch protection builder.
+     *
+     * @param teams
+     *            the teams
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder teamReviewDismissals(Collection<GHTeam> teams) {
         for (GHTeam team : teams) {
             teamReviewDismissals(team);
@@ -135,6 +250,13 @@ public class GHBranchProtectionBuilder {
         return this;
     }
 
+    /**
+     * Team review dismissals gh branch protection builder.
+     *
+     * @param teams
+     *            the teams
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder teamReviewDismissals(GHTeam... teams) {
         for (GHTeam team : teams) {
             addReviewRestriction(team.getSlug(), true);
@@ -142,13 +264,27 @@ public class GHBranchProtectionBuilder {
         return this;
     }
 
+    /**
+     * User push access gh branch protection builder.
+     *
+     * @param users
+     *            the users
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder userPushAccess(Collection<GHUser> users) {
         for (GHUser user : users) {
             userPushAccess(user);
         }
         return this;
     }
-    
+
+    /**
+     * User push access gh branch protection builder.
+     *
+     * @param users
+     *            the users
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder userPushAccess(GHUser... users) {
         for (GHUser user : users) {
             getRestrictions().users.add(user.getLogin());
@@ -156,6 +292,13 @@ public class GHBranchProtectionBuilder {
         return this;
     }
 
+    /**
+     * User review dismissals gh branch protection builder.
+     *
+     * @param users
+     *            the users
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder userReviewDismissals(Collection<GHUser> users) {
         for (GHUser team : users) {
             userReviewDismissals(team);
@@ -163,6 +306,13 @@ public class GHBranchProtectionBuilder {
         return this;
     }
 
+    /**
+     * User review dismissals gh branch protection builder.
+     *
+     * @param users
+     *            the users
+     * @return the gh branch protection builder
+     */
     public GHBranchProtectionBuilder userReviewDismissals(GHUser... users) {
         for (GHUser user : users) {
             addReviewRestriction(user.getLogin(), false);
@@ -173,7 +323,7 @@ public class GHBranchProtectionBuilder {
     private void addReviewRestriction(String restriction, boolean isTeam) {
         restrictReviewDismissals();
         Restrictions restrictions = (Restrictions) prReviews.get("dismissal_restrictions");
-        
+
         if (isTeam) {
             restrictions.teams.add(restriction);
         } else {
@@ -203,7 +353,7 @@ public class GHBranchProtectionBuilder {
     }
 
     private Requester requester() {
-        return new Requester(branch.getRoot()).withPreview(LUKE_CAGE);
+        return branch.getRoot().createRequest().withPreview(LUKE_CAGE);
     }
 
     private static class Restrictions {

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

@@ -0,0 +1,342 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.kohsuke.github.GHWorkflowRun.Conclusion;
+import org.kohsuke.github.GHWorkflowRun.Status;
+import org.kohsuke.github.internal.EnumUtils;
+import org.kohsuke.github.internal.Previews;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Represents a check run.
+ *
+ * @see <a href="https://developer.github.com/v3/checks/runs/">documentation</a>
+ */
+@SuppressFBWarnings(value = { "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD", "URF_UNREAD_FIELD" },
+        justification = "JSON API")
+public class GHCheckRun extends GHObject {
+
+    @JsonProperty("repository")
+    GHRepository owner;
+
+    private String status;
+    private String conclusion;
+    private String name;
+    private String headSha;
+    private String nodeId;
+    private String externalId;
+    private String startedAt;
+    private String completedAt;
+    private URL htmlUrl;
+    private URL detailsUrl;
+    private Output output;
+    private GHApp app;
+    private GHPullRequest[] pullRequests;
+    private GHCheckSuite checkSuite;
+
+    GHCheckRun wrap(GHRepository owner) {
+        this.owner = owner;
+        wrap(owner.root);
+        return this;
+    }
+
+    GHCheckRun wrap(GitHub root) {
+        this.root = root;
+        if (owner != null) {
+            owner.wrap(root);
+            if (pullRequests != null && pullRequests.length != 0) {
+                for (GHPullRequest singlePull : pullRequests) {
+                    singlePull.wrap(owner);
+                }
+            }
+
+        }
+        if (checkSuite != null) {
+            if (owner != null) {
+                checkSuite.wrap(owner);
+            } else {
+                checkSuite.wrap(root);
+            }
+        }
+        if (app != null) {
+            app.wrapUp(root);
+        }
+
+        return this;
+    }
+
+    GHPullRequest[] wrap() {
+        return pullRequests;
+    }
+
+    /**
+     * Gets status of the check run.
+     *
+     * @return Status of the check run
+     * @see Status
+     */
+    @WithBridgeMethods(value = String.class, adapterMethod = "statusAsStr")
+    public Status getStatus() {
+        return Status.from(status);
+    }
+
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getStatus")
+    private Object statusAsStr(Status status, Class type) {
+        return status;
+    }
+
+    public static enum Status {
+        QUEUED, IN_PROGRESS, COMPLETED, UNKNOWN;
+
+        public static Status from(String value) {
+            return EnumUtils.getNullableEnumOrDefault(Status.class, value, Status.UNKNOWN);
+        }
+
+        @Override
+        public String toString() {
+            return name().toLowerCase(Locale.ROOT);
+        }
+    }
+
+    /**
+     * Gets conclusion of a completed check run.
+     *
+     * @return Status of the check run
+     * @see Conclusion
+     */
+    @WithBridgeMethods(value = String.class, adapterMethod = "conclusionAsStr")
+    public Conclusion getConclusion() {
+        return Conclusion.from(conclusion);
+    }
+
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getConclusion")
+    private Object conclusionAsStr(Conclusion conclusion, Class type) {
+        return conclusion;
+    }
+
+    /**
+     * Final conclusion of the check.
+     *
+     * From <a href="https://docs.github.com/en/rest/reference/checks#create-a-check-run--parameters">Check Run
+     * Parameters - <code>conclusion</code></a>.
+     */
+    public static enum Conclusion {
+        ACTION_REQUIRED, CANCELLED, FAILURE, NEUTRAL, SUCCESS, SKIPPED, STALE, TIMED_OUT, UNKNOWN;
+
+        public static Conclusion from(String value) {
+            return EnumUtils.getNullableEnumOrDefault(Conclusion.class, value, Conclusion.UNKNOWN);
+        }
+
+        @Override
+        public String toString() {
+            return name().toLowerCase(Locale.ROOT);
+        }
+    }
+
+    /**
+     * Gets the custom name of this check run.
+     *
+     * @return Name of the check run
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the HEAD SHA.
+     *
+     * @return sha for the HEAD commit
+     */
+    public String getHeadSha() {
+        return headSha;
+    }
+
+    /**
+     * Gets the pull requests participated in this check run.
+     *
+     * Note this field is only populated for events. When getting a {@link GHCheckRun} outside of an event, this is
+     * always empty.
+     *
+     * @return the list of {@link GHPullRequest}s for this check run. Only populated for events.
+     * @throws IOException
+     *             the io exception
+     */
+    public List<GHPullRequest> getPullRequests() throws IOException {
+        if (pullRequests != null && pullRequests.length != 0) {
+            for (GHPullRequest singlePull : pullRequests) {
+                // Only refresh if we haven't do so before
+                singlePull.refresh(singlePull.getTitle());
+            }
+            return Collections.unmodifiableList(Arrays.asList(pullRequests));
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * Gets the HTML URL: https://github.com/[owner]/[repo-name]/runs/[check-run-id], usually an GitHub Action page of
+     * the check run.
+     *
+     * @return HTML URL
+     */
+    @Override
+    public URL getHtmlUrl() {
+        return htmlUrl;
+    }
+
+    /**
+     * Gets the global node id to access most objects in GitHub.
+     *
+     * @see <a href="https://developer.github.com/v4/guides/using-global-node-ids/">documentation</a>
+     * @return Global node id
+     */
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    /**
+     * Gets a reference for the check run on the integrator's system.
+     *
+     * @return Reference id
+     */
+    public String getExternalId() {
+        return externalId;
+    }
+
+    /**
+     * Gets the details URL from which to find full details of the check run on the integrator's site.
+     *
+     * @return Details URL
+     */
+    public URL getDetailsUrl() {
+        return detailsUrl;
+    }
+
+    /**
+     * Gets the start time of the check run in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ.
+     *
+     * @return Timestamp of the start time
+     */
+    public Date getStartedAt() {
+        return GitHubClient.parseDate(startedAt);
+    }
+
+    /**
+     * Gets the completed time of the check run in ISO 8601 format: YYYY-MM-DDTHH:MM:SSZ.
+     *
+     * @return Timestamp of the completed time
+     */
+    public Date getCompletedAt() {
+        return GitHubClient.parseDate(completedAt);
+    }
+
+    /**
+     * Gets the GitHub app this check run belongs to, included in response.
+     *
+     * @return GitHub App
+     */
+    public GHApp getApp() {
+        return app;
+    }
+
+    /**
+     * Gets the check suite this check run belongs to
+     *
+     * @return Check suite
+     */
+    public GHCheckSuite getCheckSuite() {
+        return checkSuite;
+    }
+
+    /**
+     * Gets an output for a check run.
+     *
+     * @return Output of a check run
+     */
+    public Output getOutput() {
+        return output;
+    }
+
+    /**
+     * Represents an output in a check run to include summary and other results.
+     *
+     * @see <a href="https://developer.github.com/v3/checks/runs/#output-object">documentation</a>
+     */
+    public static class Output {
+        private String title;
+        private String summary;
+        private String text;
+        private int annotationsCount;
+        private URL annotationsUrl;
+
+        /**
+         * Gets the title of check run.
+         *
+         * @return title of check run
+         */
+        public String getTitle() {
+            return title;
+        }
+
+        /**
+         * Gets the summary of the check run, note that it supports Markdown.
+         *
+         * @return summary of check run
+         */
+        public String getSummary() {
+            return summary;
+        }
+
+        /**
+         * Gets the details of the check run, note that it supports Markdown.
+         *
+         * @return Details of the check run
+         */
+        public String getText() {
+            return text;
+        }
+
+        /**
+         * Gets the annotation count of a check run.
+         *
+         * @return annotation count of a check run
+         */
+        public int getAnnotationsCount() {
+            return annotationsCount;
+        }
+
+        /**
+         * Gets the URL of annotations.
+         *
+         * @return URL of annotations
+         */
+        public URL getAnnotationsUrl() {
+            return annotationsUrl;
+        }
+    }
+
+    public static enum AnnotationLevel {
+        NOTICE, WARNING, FAILURE
+    }
+
+    /**
+     * 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

@@ -0,0 +1,307 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2020 CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.kohsuke.github.internal.Previews;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * Drafts 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(Previews.ANTIOPE)
+@Deprecated
+public final class GHCheckRunBuilder {
+
+    protected final GHRepository repo;
+    protected final Requester requester;
+    private Output output;
+    private List<Action> actions;
+
+    private GHCheckRunBuilder(GHRepository repo, Requester requester) {
+        this.repo = repo;
+        this.requester = requester;
+    }
+
+    GHCheckRunBuilder(GHRepository repo, String name, String headSHA) {
+        this(repo,
+                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) {
+        requester.with("details_url", detailsURL);
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withExternalID(@CheckForNull String externalID) {
+        requester.with("external_id", externalID);
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withStatus(@CheckForNull GHCheckRun.Status status) {
+        if (status != null) {
+            // Do *not* use the overload taking Enum, as that s/_/-/g which would be wrong here.
+            requester.with("status", status.toString().toLowerCase(Locale.ROOT));
+        }
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withConclusion(@CheckForNull GHCheckRun.Conclusion conclusion) {
+        if (conclusion != null) {
+            requester.with("conclusion", conclusion.toString().toLowerCase(Locale.ROOT));
+        }
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withStartedAt(@CheckForNull Date startedAt) {
+        if (startedAt != null) {
+            requester.with("started_at", GitHubClient.printDate(startedAt));
+        }
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder withCompletedAt(@CheckForNull Date completedAt) {
+        if (completedAt != null) {
+            requester.with("completed_at", GitHubClient.printDate(completedAt));
+        }
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder add(@NonNull Output output) {
+        if (this.output != null) {
+            throw new IllegalStateException("cannot add Output twice");
+        }
+        this.output = output;
+        return this;
+    }
+
+    public @NonNull GHCheckRunBuilder add(@NonNull Action action) {
+        if (actions == null) {
+            actions = new LinkedList<>();
+        }
+        actions.add(action);
+        return this;
+    }
+
+    private static final int MAX_ANNOTATIONS = 50;
+    /**
+     * Actually creates the check run. (If more than fifty annotations were requested, this is done in batches.)
+     *
+     * @return the resulting run
+     * @throws IOException
+     *             for the usual reasons
+     */
+    public @NonNull GHCheckRun create() throws IOException {
+        List<Annotation> extraAnnotations;
+        if (output != null && output.annotations != null && output.annotations.size() > MAX_ANNOTATIONS) {
+            extraAnnotations = output.annotations.subList(MAX_ANNOTATIONS, output.annotations.size());
+            output.annotations = output.annotations.subList(0, MAX_ANNOTATIONS);
+        } else {
+            extraAnnotations = Collections.emptyList();
+        }
+        GHCheckRun run = requester.with("output", output).with("actions", actions).fetch(GHCheckRun.class).wrap(repo);
+        while (!extraAnnotations.isEmpty()) {
+            Output output2 = new Output(output.title, output.summary).withText(output.text);
+            int i = Math.min(extraAnnotations.size(), MAX_ANNOTATIONS);
+            output2.annotations = extraAnnotations.subList(0, i);
+            extraAnnotations = extraAnnotations.subList(i, extraAnnotations.size());
+            run = repo.root.createRequest()
+                    .withPreview(Previews.ANTIOPE)
+                    .method("PATCH")
+                    .with("output", output2)
+                    .withUrlPath(repo.getApiTailUrl("check-runs/" + run.getId()))
+                    .fetch(GHCheckRun.class)
+                    .wrap(repo);
+        }
+        return run;
+    }
+
+    /**
+     * @see <a href="https://developer.github.com/v3/checks/runs/#output-object">documentation</a>
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static final class Output {
+
+        private final String title;
+        private final String summary;
+        private String text;
+        private List<Annotation> annotations;
+        private List<Image> images;
+
+        public Output(@NonNull String title, @NonNull String summary) {
+            this.title = title;
+            this.summary = summary;
+        }
+
+        public @NonNull Output withText(@CheckForNull String text) {
+            this.text = text;
+            return this;
+        }
+
+        public @NonNull Output add(@NonNull Annotation annotation) {
+            if (annotations == null) {
+                annotations = new LinkedList<>();
+            }
+            annotations.add(annotation);
+            return this;
+        }
+
+        public @NonNull Output add(@NonNull Image image) {
+            if (images == null) {
+                images = new LinkedList<>();
+            }
+            images.add(image);
+            return this;
+        }
+
+    }
+
+    /**
+     * @see <a href="https://developer.github.com/v3/checks/runs/#annotations-object">documentation</a>
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static final class Annotation {
+
+        private final String path;
+        private final int start_line;
+        private final int end_line;
+        private final String annotation_level;
+        private final String message;
+        private Integer start_column;
+        private Integer end_column;
+        private String title;
+        private String raw_details;
+
+        public Annotation(@NonNull String path,
+                int line,
+                @NonNull GHCheckRun.AnnotationLevel annotationLevel,
+                @NonNull String message) {
+            this(path, line, line, annotationLevel, message);
+        }
+
+        public Annotation(@NonNull String path,
+                int startLine,
+                int endLine,
+                @NonNull GHCheckRun.AnnotationLevel annotationLevel,
+                @NonNull String message) {
+            this.path = path;
+            start_line = startLine;
+            end_line = endLine;
+            annotation_level = annotationLevel.toString().toLowerCase(Locale.ROOT);
+            this.message = message;
+        }
+
+        public @NonNull Annotation withStartColumn(@CheckForNull Integer startColumn) {
+            start_column = startColumn;
+            return this;
+        }
+
+        public @NonNull Annotation withEndColumn(@CheckForNull Integer endColumn) {
+            end_column = endColumn;
+            return this;
+        }
+
+        public @NonNull Annotation withTitle(@CheckForNull String title) {
+            this.title = title;
+            return this;
+        }
+
+        public @NonNull Annotation withRawDetails(@CheckForNull String rawDetails) {
+            raw_details = rawDetails;
+            return this;
+        }
+
+    }
+
+    /**
+     * @see <a href="https://developer.github.com/v3/checks/runs/#images-object">documentation</a>
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static final class Image {
+
+        private final String alt;
+        private final String image_url;
+        private String caption;
+
+        public Image(@NonNull String alt, @NonNull String imageURL) {
+            this.alt = alt;
+            image_url = imageURL;
+        }
+
+        public @NonNull Image withCaption(@CheckForNull String caption) {
+            this.caption = caption;
+            return this;
+        }
+
+    }
+
+    /**
+     * @see <a href="https://developer.github.com/v3/checks/runs/#actions-object">documentation</a>
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static final class Action {
+
+        private final String label;
+        private final String description;
+        private final String identifier;
+
+        public Action(@NonNull String label, @NonNull String description, @NonNull String identifier) {
+            this.label = label;
+            this.description = description;
+            this.identifier = identifier;
+        }
+
+    }
+
+}

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

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

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

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

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

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

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

@@ -11,121 +11,176 @@ 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.
  *
  * @author Kohsuke Kawaguchi
- * @see GHRepository#getCommit(String)
- * @see GHCommitComment#getCommit()
+ * @see GHRepository#getCommit(String) GHRepository#getCommit(String)
+ * @see GHCommitComment#getCommit() GHCommitComment#getCommit()
  */
-@SuppressFBWarnings(value = {"NP_UNWRITTEN_FIELD", "UWF_UNWRITTEN_FIELD"}, 
-        justification = "JSON API")
+@SuppressFBWarnings(value = { "NP_UNWRITTEN_FIELD", "UWF_UNWRITTEN_FIELD" }, justification = "JSON API")
 public class GHCommit {
     private GHRepository owner;
-    
+
     private ShortInfo commit;
 
     /**
      * Short summary of this commit.
      */
-    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
-    "NP_UNWRITTEN_FIELD", "UWF_UNWRITTEN_FIELD"}, justification = "JSON API")
+    @SuppressFBWarnings(
+            value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
+                    "UWF_UNWRITTEN_FIELD" },
+            justification = "JSON API")
     public static class ShortInfo {
         private GHAuthor author;
         private GHAuthor committer;
-        
+
         private String message;
-        
+
         private int comment_count;
 
+        private GHVerification verification;
+
         static class Tree {
             String sha;
         }
 
         private Tree tree;
 
+        /**
+         * Gets author.
+         *
+         * @return the author
+         */
         @WithBridgeMethods(value = GHAuthor.class, castRequired = true)
         public GitUser getAuthor() {
             return author;
         }
 
+        /**
+         * Gets authored date.
+         *
+         * @return the authored date
+         */
         public Date getAuthoredDate() {
-            return GitHub.parseDate(author.date);
+            return author.getDate();
         }
 
+        /**
+         * Gets committer.
+         *
+         * @return the committer
+         */
         @WithBridgeMethods(value = GHAuthor.class, castRequired = true)
         public GitUser getCommitter() {
             return committer;
         }
 
+        /**
+         * Gets commit date.
+         *
+         * @return the commit date
+         */
         public Date getCommitDate() {
-            return GitHub.parseDate(committer.date);
+            return committer.getDate();
         }
 
         /**
-         * Commit message.
+         * Gets message.
+         *
+         * @return Commit message.
          */
         public String getMessage() {
             return message;
         }
 
+        /**
+         * Gets comment count.
+         *
+         * @return the comment count
+         */
         public int getCommentCount() {
             return comment_count;
         }
+
+        /**
+         * Gets Verification Status.
+         *
+         * @return the Verification status
+         */
+        public GHVerification getVerification() {
+            return verification;
+        }
     }
 
     /**
+     * The type GHAuthor.
+     *
      * @deprecated Use {@link GitUser} instead.
      */
     public static class GHAuthor extends GitUser {
-        private String date;
     }
 
+    /**
+     * The type Stats.
+     */
     public static class Stats {
-        int total,additions,deletions;
+        int total, additions, deletions;
     }
 
     /**
      * A file that was modified.
      */
-    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", 
-            justification = "It's being initilized by JSON deserialization")
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "It's being initilized by JSON deserialization")
     public static class File {
         String status;
-        int changes,additions,deletions;
+        int changes, additions, deletions;
         String raw_url, blob_url, sha, patch;
         String filename, previous_filename;
 
         /**
-         * Number of lines added + removed.
+         * Gets lines changed.
+         *
+         * @return Number of lines added + removed.
          */
         public int getLinesChanged() {
             return changes;
         }
 
         /**
-         * Number of lines added.
+         * Gets lines added.
+         *
+         * @return Number of lines added.
          */
         public int getLinesAdded() {
             return additions;
         }
 
         /**
-         * Number of lines removed.
+         * Gets lines deleted.
+         *
+         * @return Number of lines removed.
          */
         public int getLinesDeleted() {
             return deletions;
         }
 
         /**
-         * "modified", "added", or "removed"
+         * Gets status.
+         *
+         * @return "modified", "added", or "removed"
          */
         public String getStatus() {
             return status;
         }
 
         /**
-         * Full path in the repository.
+         * Gets file name.
+         *
+         * @return Full path in the repository.
          */
         @SuppressFBWarnings(value = "NM_CONFUSING",
                 justification = "It's a part of the library's API and cannot be renamed")
@@ -134,81 +189,108 @@ public class GHCommit {
         }
 
         /**
-         * Previous path, in case file has moved.
+         * Gets previous filename.
+         *
+         * @return Previous path, in case file has moved.
          */
         public String getPreviousFilename() {
             return previous_filename;
         }
 
         /**
-         * The actual change.
+         * Gets patch.
+         *
+         * @return The actual change.
          */
         public String getPatch() {
             return patch;
         }
 
         /**
-         * URL like 'https://raw.github.com/jenkinsci/jenkins/4eb17c197dfdcf8ef7ff87eb160f24f6a20b7f0e/core/pom.xml'
-         * that resolves to the actual content of the file.
+         * Gets raw url.
+         *
+         * @return URL like
+         *         'https://raw.github.com/jenkinsci/jenkins/4eb17c197dfdcf8ef7ff87eb160f24f6a20b7f0e/core/pom.xml' that
+         *         resolves to the actual content of the file.
          */
         public URL getRawUrl() {
-            return GitHub.parseURL(raw_url);
+            return GitHubClient.parseURL(raw_url);
         }
 
         /**
-         * URL like 'https://github.com/jenkinsci/jenkins/blob/1182e2ebb1734d0653142bd422ad33c21437f7cf/core/pom.xml'
-         * that resolves to the HTML page that describes this file.
+         * Gets blob url.
+         *
+         * @return URL like
+         *         'https://github.com/jenkinsci/jenkins/blob/1182e2ebb1734d0653142bd422ad33c21437f7cf/core/pom.xml'
+         *         that resolves to the HTML page that describes this file.
          */
         public URL getBlobUrl() {
-            return GitHub.parseURL(blob_url);
+            return GitHubClient.parseURL(blob_url);
         }
 
         /**
-         * [0-9a-f]{40} SHA1 checksum.
+         * Gets sha.
+         *
+         * @return [0 -9a-f]{40} SHA1 checksum.
          */
         public String getSha() {
             return sha;
         }
     }
 
+    /**
+     * The type Parent.
+     */
     public static class Parent {
         @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
-        String url;  
+        String url;
         String sha;
     }
 
     static class User {
         // TODO: what if someone who doesn't have an account on GitHub makes a commit?
         @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
-        String url,avatar_url,gravatar_id;
+        String url, avatar_url, gravatar_id;
         @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
         int id;
-        
+
         String login;
     }
 
-    String url,html_url,sha;
+    String url, html_url, sha;
     List<File> files;
     Stats stats;
     List<Parent> parents;
-    User author,committer;
-
+    User author, committer;
 
+    /**
+     * Gets commit short info.
+     *
+     * @return the commit short info
+     * @throws IOException
+     *             the io exception
+     */
     public ShortInfo getCommitShortInfo() throws IOException {
-        if (commit==null)
+        if (commit == null)
             populate();
         return commit;
     }
 
     /**
-     * The repository that contains the commit.
+     * Gets owner.
+     *
+     * @return the repository that contains the commit.
      */
     public GHRepository getOwner() {
         return owner;
     }
 
     /**
-     * Number of lines added + removed.
+     * Gets lines changed.
+     *
+     * @return the number of lines added + removed.
+     * @throws IOException
+     *             if the field was not populated and refresh fails
      */
     public int getLinesChanged() throws IOException {
         populate();
@@ -216,7 +298,11 @@ public class GHCommit {
     }
 
     /**
-     * Number of lines added.
+     * Gets lines added.
+     *
+     * @return Number of lines added.
+     * @throws IOException
+     *             if the field was not populated and refresh fails
      */
     public int getLinesAdded() throws IOException {
         populate();
@@ -224,7 +310,11 @@ public class GHCommit {
     }
 
     /**
-     * Number of lines removed.
+     * Gets lines deleted.
+     *
+     * @return Number of lines removed.
+     * @throws IOException
+     *             if the field was not populated and refresh fails
      */
     public int getLinesDeleted() throws IOException {
         populate();
@@ -232,21 +322,30 @@ public class GHCommit {
     }
 
     /**
-     * Use this method to walk the tree
+     * Use this method to walk the tree.
+     *
+     * @return a GHTree to walk
+     * @throws IOException
+     *             on error
      */
     public GHTree getTree() throws IOException {
         return owner.getTree(getCommitShortInfo().tree.sha);
     }
 
     /**
-     *  URL of this commit like "https://github.com/kohsuke/sandbox-ant/commit/8ae38db0ea5837313ab5f39d43a6f73de3bd9000"
+     * Gets html url.
+     *
+     * @return URL of this commit like
+     *         "https://github.com/kohsuke/sandbox-ant/commit/8ae38db0ea5837313ab5f39d43a6f73de3bd9000"
      */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
     /**
-     * [0-9a-f]{40} SHA1 checksum.
+     * Gets sha 1.
+     *
+     * @return [0 -9a-f]{40} SHA1 checksum.
      */
     public String getSHA1() {
         return sha;
@@ -255,19 +354,23 @@ public class GHCommit {
     /**
      * List of files changed/added/removed in this commit.
      *
-     * @return
-     *      Can be empty but never null.
+     * @return Can be empty but never null.
+     * @throws IOException
+     *             on error
      */
     public List<File> getFiles() throws IOException {
         populate();
-        return files!=null ? Collections.unmodifiableList(files) : Collections.<File>emptyList();
+        return files != null ? Collections.unmodifiableList(files) : Collections.<File>emptyList();
     }
 
     /**
-     * Returns the SHA1 of parent commit objects.
+     * Gets parent sha 1 s.
+     *
+     * @return SHA1 of parent commit objects.
      */
     public List<String> getParentSHA1s() {
-        if (parents==null)  return Collections.emptyList();
+        if (parents == null)
+            return Collections.emptyList();
         return new AbstractList<String>() {
             @Override
             public String get(int index) {
@@ -283,6 +386,10 @@ public class GHCommit {
 
     /**
      * Resolves the parent commit objects and return them.
+     *
+     * @return parent commit objects
+     * @throws IOException
+     *             on error
      */
     public List<GHCommit> getParents() throws IOException {
         List<GHCommit> r = new ArrayList<GHCommit>();
@@ -291,19 +398,35 @@ public class GHCommit {
         return r;
     }
 
+    /**
+     * Gets author.
+     *
+     * @return the author
+     * @throws IOException
+     *             the io exception
+     */
     public GHUser getAuthor() throws IOException {
         return resolveUser(author);
     }
 
     /**
      * Gets the date the change was authored on.
+     *
      * @return the date the change was authored on.
-     * @throws IOException if the information was not already fetched and an attempt at fetching the information failed.
+     * @throws IOException
+     *             if the information was not already fetched and an attempt at fetching the information failed.
      */
     public Date getAuthoredDate() throws IOException {
         return getCommitShortInfo().getAuthoredDate();
     }
 
+    /**
+     * Gets committer.
+     *
+     * @return the committer
+     * @throws IOException
+     *             the io exception
+     */
     public GHUser getCommitter() throws IOException {
         return resolveUser(committer);
     }
@@ -312,67 +435,151 @@ public class GHCommit {
      * Gets the date the change was committed on.
      *
      * @return the date the change was committed on.
-     * @throws IOException if the information was not already fetched and an attempt at fetching the information failed.
+     * @throws IOException
+     *             if the information was not already fetched and an attempt at fetching the information failed.
      */
     public Date getCommitDate() throws IOException {
         return getCommitShortInfo().getCommitDate();
     }
 
     private GHUser resolveUser(User author) throws IOException {
-        if (author==null || author.login==null) return null;
+        if (author == null || author.login == null)
+            return null;
         return owner.root.getUser(author.login);
     }
 
     /**
-     * Lists up all the commit comments in this repository.
+     * 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.
+     *
+     * @return {@link PagedIterable} with all the commit comments in this repository.
      */
     public PagedIterable<GHCommitComment> listComments() {
-        return owner.root.retrieve()
-            .asPagedIterable(
-                String.format("/repos/%s/%s/commits/%s/comments", owner.getOwnerName(), owner.getName(), sha),
-                GHCommitComment[].class,
-                item -> item.wrap(owner) );
+        return owner.root.createRequest()
+                .withUrlPath(
+                        String.format("/repos/%s/%s/commits/%s/comments", owner.getOwnerName(), owner.getName(), sha))
+                .toIterable(GHCommitComment[].class, item -> item.wrap(owner));
     }
 
     /**
      * Creates a commit comment.
-     *
+     * <p>
      * I'm not sure how path/line/position parameters interact with each other.
+     *
+     * @param body
+     *            body of the comment
+     * @param path
+     *            path of file being commented on
+     * @param line
+     *            target line for comment
+     * @param position
+     *            position on line
+     * @return created GHCommitComment
+     * @throws IOException
+     *             if comment is not created
      */
     public GHCommitComment createComment(String body, String path, Integer line, Integer position) throws IOException {
-        GHCommitComment r = new Requester(owner.root)
-                .with("body",body)
-                .with("path",path)
-                .with("line",line)
-                .with("position",position)
-                .to(String.format("/repos/%s/%s/commits/%s/comments",owner.getOwnerName(),owner.getName(),sha),GHCommitComment.class);
+        GHCommitComment r = owner.root.createRequest()
+                .method("POST")
+                .with("body", body)
+                .with("path", path)
+                .with("line", line)
+                .with("position", position)
+                .withUrlPath(
+                        String.format("/repos/%s/%s/commits/%s/comments", owner.getOwnerName(), owner.getName(), sha))
+                .fetch(GHCommitComment.class);
         return r.wrap(owner);
     }
 
+    /**
+     * Create comment gh commit comment.
+     *
+     * @param body
+     *            the body
+     * @return the gh commit comment
+     * @throws IOException
+     *             the io exception
+     */
     public GHCommitComment createComment(String body) throws IOException {
         return createComment(body, null, null, null);
     }
 
     /**
-     * Gets the status of this commit, newer ones first.
+     * List statuses paged iterable.
+     *
+     * @return status of this commit, newer ones first.
+     * @throws IOException
+     *             if statuses cannot be read
      */
     public PagedIterable<GHCommitStatus> listStatuses() throws IOException {
         return owner.listCommitStatuses(sha);
     }
 
     /**
-     * Gets the last status of this commit, which is what gets shown in the UI.
+     * Gets last status.
+     *
+     * @return the last status of this commit, which is what gets shown in the UI.
+     * @throws IOException
+     *             on error
      */
     public GHCommitStatus getLastStatus() throws IOException {
         return owner.getLastCommitStatus(sha);
     }
 
+    /**
+     * Gets check-runs for given sha.
+     *
+     * @return check runs for given sha.
+     * @throws IOException
+     *             on error
+     */
+    @Preview(ANTIOPE)
+    @Deprecated
+    public PagedIterable<GHCheckRun> getCheckRuns() throws IOException {
+        return owner.getCheckRuns(sha);
+    }
+
     /**
      * Some of the fields are not always filled in when this object is retrieved as a part of another API call.
+     *
+     * @throws IOException
+     *             on error
      */
     void populate() throws IOException {
-        if (files==null && stats==null)
-            owner.root.retrieve().to(owner.getApiTailUrl("commits/" + sha), this);
+        if (files == null && stats == null)
+            owner.root.createRequest().withUrlPath(owner.getApiTailUrl("commits/" + sha)).fetchInto(this);
     }
 
     GHCommit wrapUp(GHRepository owner) {

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

@@ -9,8 +9,7 @@ import java.util.List;
 import java.util.TimeZone;
 
 /**
- * Builder pattern for creating a new commit.
- * Based on https://developer.github.com/v3/git/commits/#create-a-commit
+ * Builder pattern for creating a new commit. Based on https://developer.github.com/v3/git/commits/#create-a-commit
  */
 public class GHCommitBuilder {
     private final GHRepository repo;
@@ -35,11 +34,15 @@ public class GHCommitBuilder {
 
     GHCommitBuilder(GHRepository repo) {
         this.repo = repo;
-        req = new Requester(repo.root);
+        req = repo.root.createRequest().method("POST");
     }
 
     /**
-     * @param message the commit message
+     * Message gh commit builder.
+     *
+     * @param message
+     *            the commit message
+     * @return the gh commit builder
      */
     public GHCommitBuilder message(String message) {
         req.with("message", message);
@@ -47,7 +50,11 @@ public class GHCommitBuilder {
     }
 
     /**
-     * @param tree the SHA of the tree object this commit points to
+     * Tree gh commit builder.
+     *
+     * @param tree
+     *            the SHA of the tree object this commit points to
+     * @return the gh commit builder
      */
     public GHCommitBuilder tree(String tree) {
         req.with("tree", tree);
@@ -55,7 +62,11 @@ public class GHCommitBuilder {
     }
 
     /**
-     * @param parent the SHA of a parent commit.
+     * Parent gh commit builder.
+     *
+     * @param parent
+     *            the SHA of a parent commit.
+     * @return the gh commit builder
      */
     public GHCommitBuilder parent(String parent) {
         parents.add(parent);
@@ -64,17 +75,46 @@ public class GHCommitBuilder {
 
     /**
      * Configures the author of this commit.
+     *
+     * @param name
+     *            the name
+     * @param email
+     *            the email
+     * @param date
+     *            the date
+     * @return the gh commit builder
      */
     public GHCommitBuilder author(String name, String email, Date date) {
-        req._with("author", new UserInfo(name, email, date));
+        req.with("author", new UserInfo(name, email, date));
+        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.
+     *
+     * @param name
+     *            the name
+     * @param email
+     *            the email
+     * @param date
+     *            the date
+     * @return the gh commit builder
      */
     public GHCommitBuilder committer(String name, String email, Date date) {
-        req._with("committer", new UserInfo(name, email, date));
+        req.with("committer", new UserInfo(name, email, date));
         return this;
     }
 
@@ -84,9 +124,13 @@ public class GHCommitBuilder {
 
     /**
      * Creates a blob based on the parameters specified thus far.
+     *
+     * @return the gh commit
+     * @throws IOException
+     *             the io exception
      */
     public GHCommit create() throws IOException {
-        req._with("parents", parents);
-        return req.method("POST").to(getApiTail(), GHCommit.class).wrapUp(repo);
+        req.with("parents", parents);
+        return req.method("POST").withUrlPath(getApiTail()).fetch(GHCommit.class).wrapUp(repo);
     }
 }

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

@@ -5,67 +5,89 @@ 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.)
  *
  * @author Kohsuke Kawaguchi
- * @see GHRepository#listCommitComments()
- * @see GHCommit#listComments()
- * @see GHCommit#createComment(String, String, Integer, Integer)
+ * @see GHRepository#listCommitComments() GHRepository#listCommitComments()
+ * @see GHCommit#listComments() GHCommit#listComments()
+ * @see GHCommit#createComment(String, String, Integer, Integer) GHCommit#createComment(String, String, Integer,
+ *      Integer)
  */
-@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
-    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+@SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
+        justification = "JSON API")
 public class GHCommitComment extends GHObject implements Reactable {
     private GHRepository owner;
 
     String body, html_url, commit_id;
     Integer line;
     String path;
-    GHUser user;  // not fully populated. beware.
+    GHUser user; // not fully populated. beware.
 
+    /**
+     * Gets owner.
+     *
+     * @return the owner
+     */
     public GHRepository getOwner() {
         return owner;
     }
 
     /**
-     * URL like 'https://github.com/kohsuke/sandbox-ant/commit/8ae38db0ea5837313ab5f39d43a6f73de3bd9000#commitcomment-1252827' to
+     * URL like
+     * 'https://github.com/kohsuke/sandbox-ant/commit/8ae38db0ea5837313ab5f39d43a6f73de3bd9000#commitcomment-1252827' to
      * show this commit comment in a browser.
      */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
+    /**
+     * Gets sha 1.
+     *
+     * @return the sha 1
+     */
     public String getSHA1() {
         return commit_id;
     }
 
     /**
      * Commit comment in the GitHub flavored markdown format.
+     *
+     * @return the body
      */
     public String getBody() {
         return body;
     }
 
     /**
-     * A commit comment can be on a specific line of a specific file, if so, this field points to a file.
-     * Otherwise null.
+     * A commit comment can be on a specific line of a specific file, if so, this field points to a file. Otherwise
+     * null.
+     *
+     * @return the path
      */
     public String getPath() {
         return path;
     }
 
     /**
-     * A commit comment can be on a specific line of a specific file, if so, this field points to the line number in the file.
-     * Otherwise -1.
+     * A commit comment can be on a specific line of a specific file, if so, this field points to the line number in the
+     * file. Otherwise -1.
+     *
+     * @return the line
      */
     public int getLine() {
-        return line!=null ? line : -1;
+        return line != null ? line : -1;
     }
 
     /**
      * Gets the user who put this comment.
+     *
+     * @return the user
+     * @throws IOException
+     *             the io exception
      */
     public GHUser getUser() throws IOException {
         return owner == null || owner.root.isOffline() ? user : owner.root.getUser(user.login);
@@ -73,6 +95,10 @@ public class GHCommitComment extends GHObject implements Reactable {
 
     /**
      * Gets the commit to which this comment is associated with.
+     *
+     * @return the commit
+     * @throws IOException
+     *             the io exception
      */
     public GHCommit getCommit() throws IOException {
         return getOwner().getCommit(getSHA1());
@@ -80,43 +106,56 @@ public class GHCommitComment extends GHObject implements Reactable {
 
     /**
      * Updates the body of the commit message.
+     *
+     * @param body
+     *            the body
+     * @throws IOException
+     *             the io exception
      */
     public void update(String body) throws IOException {
-        new Requester(owner.root)
+        owner.root.createRequest()
+                .method("PATCH")
                 .with("body", body)
-                .method("PATCH").to(getApiTail(), GHCommitComment.class);
+                .withUrlPath(getApiTail())
+                .fetch(GHCommitComment.class);
         this.body = body;
     }
 
-    @Preview @Deprecated
+    @Preview(SQUIRREL_GIRL)
+    @Deprecated
     public GHReaction createReaction(ReactionContent content) throws IOException {
-        return new Requester(owner.root)
+        return owner.root.createRequest()
+                .method("POST")
                 .withPreview(SQUIRREL_GIRL)
                 .with("content", content.getContent())
-                .to(getApiTail()+"/reactions", GHReaction.class).wrap(owner.root);
+                .withUrlPath(getApiTail() + "/reactions")
+                .fetch(GHReaction.class)
+                .wrap(owner.root);
     }
 
-    @Preview @Deprecated
+    @Preview(SQUIRREL_GIRL)
+    @Deprecated
     public PagedIterable<GHReaction> listReactions() {
-        return owner.root.retrieve().withPreview(SQUIRREL_GIRL)
-            .asPagedIterable(
-                getApiTail()+"/reactions",
-                GHReaction[].class,
-                item -> item.wrap(owner.root) );
+        return owner.root.createRequest()
+                .withPreview(SQUIRREL_GIRL)
+                .withUrlPath(getApiTail() + "/reactions")
+                .toIterable(GHReaction[].class, item -> item.wrap(owner.root));
     }
 
     /**
      * Deletes this comment.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void delete() throws IOException {
-        new Requester(owner.root).method("DELETE").to(getApiTail());
+        owner.root.createRequest().method("DELETE").withUrlPath(getApiTail()).send();
     }
 
     private String getApiTail() {
-        return String.format("/repos/%s/%s/comments/%s",owner.getOwnerName(),owner.getName(),id);
+        return String.format("/repos/%s/%s/comments/%s", owner.getOwnerName(), owner.getName(), getId());
     }
 
-
     GHCommitComment wrap(GHRepository owner) {
         this.owner = owner;
         if (owner.root.isOffline()) {

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

@@ -36,16 +36,22 @@ public class GHCommitPointer {
     private GHRepository repo;
 
     /**
-     * This points to the user who owns
-     * the {@link #getRepository()}.
+     * This points to the user who owns the {@link #getRepository()}.
+     *
+     * @return the user
+     * @throws IOException
+     *             the io exception
      */
     public GHUser getUser() throws IOException {
-        if (user != null) return user.root.intern(user);
+        if (user != null)
+            return user.root.intern(user);
         return user;
     }
 
     /**
      * The repository that contains the commit.
+     *
+     * @return the repository
      */
     public GHRepository getRepository() {
         return repo;
@@ -53,6 +59,8 @@ public class GHCommitPointer {
 
     /**
      * Named ref to the commit. This appears to be a "short ref" that doesn't include "refs/heads/" portion.
+     *
+     * @return the ref
      */
     public String getRef() {
         return ref;
@@ -60,6 +68,8 @@ public class GHCommitPointer {
 
     /**
      * SHA1 of the commit.
+     *
+     * @return the sha
      */
     public String getSha() {
         return sha;
@@ -67,6 +77,8 @@ public class GHCommitPointer {
 
     /**
      * String that looks like "USERNAME:REF".
+     *
+     * @return the label
      */
     public String getLabel() {
         return label;
@@ -74,13 +86,19 @@ public class GHCommitPointer {
 
     /**
      * Obtains the commit that this pointer is referring to.
+     *
+     * @return the commit
+     * @throws IOException
+     *             the io exception
      */
     public GHCommit getCommit() throws IOException {
         return getRepository().getCommit(getSha());
     }
 
     void wrapUp(GitHub root) {
-        if (user!=null) user.root = root;
-        if (repo!=null) repo.wrap(root);
+        if (user != null)
+            user.root = root;
+        if (repo != null)
+            repo.wrap(root);
     }
 }

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

@@ -16,57 +16,83 @@ import java.util.Date;
  * </pre>
  *
  * @author Kohsuke Kawaguchi
- * @see GHRepository#queryCommits()
-*/
+ * @see GHRepository#queryCommits() GHRepository#queryCommits()
+ */
 public class GHCommitQueryBuilder {
     private final Requester req;
     private final GHRepository repo;
 
-    /*package*/ GHCommitQueryBuilder(GHRepository repo) {
+    GHCommitQueryBuilder(GHRepository repo) {
         this.repo = repo;
-        this.req = repo.root.retrieve();    // requester to build up
+        this.req = repo.root.createRequest(); // requester to build up
     }
 
     /**
      * GItHub login or email address by which to filter by commit author.
+     *
+     * @param author
+     *            the author
+     * @return the gh commit query builder
      */
     public GHCommitQueryBuilder author(String author) {
-        req.with("author",author);
+        req.with("author", author);
         return this;
     }
 
     /**
      * Only commits containing this file path will be returned.
+     *
+     * @param path
+     *            the path
+     * @return the gh commit query builder
      */
     public GHCommitQueryBuilder path(String path) {
-        req.with("path",path);
+        req.with("path", path);
         return this;
     }
 
     /**
      * Specifies the SHA1 commit / tag / branch / etc to start listing commits from.
      *
+     * @param ref
+     *            the ref
+     * @return the gh commit query builder
      */
     public GHCommitQueryBuilder from(String ref) {
-        req.with("sha",ref);
+        req.with("sha", ref);
         return this;
     }
 
+    /**
+     * Page size gh commit query builder.
+     *
+     * @param pageSize
+     *            the page size
+     * @return the gh commit query builder
+     */
     public GHCommitQueryBuilder pageSize(int pageSize) {
-        req.with("per_page",pageSize);
+        req.with("per_page", pageSize);
         return this;
     }
 
     /**
      * Only commits after this date will be returned
+     *
+     * @param dt
+     *            the dt
+     * @return the gh commit query builder
      */
     public GHCommitQueryBuilder since(Date dt) {
-        req.with("since",GitHub.printDate(dt));
+        req.with("since", GitHubClient.printDate(dt));
         return this;
     }
 
     /**
      * Only commits after this date will be returned
+     *
+     * @param timestamp
+     *            the timestamp
+     * @return the gh commit query builder
      */
     public GHCommitQueryBuilder since(long timestamp) {
         return since(new Date(timestamp));
@@ -74,14 +100,22 @@ public class GHCommitQueryBuilder {
 
     /**
      * Only commits before this date will be returned
+     *
+     * @param dt
+     *            the dt
+     * @return the gh commit query builder
      */
     public GHCommitQueryBuilder until(Date dt) {
-        req.with("until",GitHub.printDate(dt));
+        req.with("until", GitHubClient.printDate(dt));
         return this;
     }
 
     /**
      * Only commits before this date will be returned
+     *
+     * @param timestamp
+     *            the timestamp
+     * @return the gh commit query builder
      */
     public GHCommitQueryBuilder until(long timestamp) {
         return until(new Date(timestamp));
@@ -89,12 +123,10 @@ public class GHCommitQueryBuilder {
 
     /**
      * Lists up the commits with the criteria built so far.
+     *
+     * @return the paged iterable
      */
     public PagedIterable<GHCommit> list() {
-        return req
-            .asPagedIterable(
-                repo.getApiTailUrl("commits"),
-                GHCommit[].class,
-                item -> item.wrapUp(repo) );
+        return req.withUrlPath(repo.getApiTailUrl("commits")).toIterable(GHCommit[].class, item -> item.wrapUp(repo));
     }
 }

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;
 
@@ -8,12 +9,13 @@ import java.io.IOException;
  * Search commits.
  *
  * @author Marc de Verdelhan
- * @see GitHub#searchCommits()
+ * @see GitHub#searchCommits() GitHub#searchCommits()
  */
-@Preview @Deprecated
+@Preview(Previews.CLOAK)
+@Deprecated
 public class GHCommitSearchBuilder extends GHSearchBuilder<GHCommit> {
-    /*package*/ GHCommitSearchBuilder(GitHub root) {
-        super(root,CommitSearchResult.class);
+    GHCommitSearchBuilder(GitHub root) {
+        super(root, CommitSearchResult.class);
         req.withPreview(Previews.CLOAK);
     }
 
@@ -25,107 +27,240 @@ public class GHCommitSearchBuilder extends GHSearchBuilder<GHCommit> {
         return this;
     }
 
+    /**
+     * Author gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder author(String v) {
-        return q("author:"+v);
+        return q("author:" + v);
     }
 
+    /**
+     * Committer gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder committer(String v) {
-        return q("committer:"+v);
+        return q("committer:" + v);
     }
 
+    /**
+     * Author name gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder authorName(String v) {
-        return q("author-name:"+v);
+        return q("author-name:" + v);
     }
 
+    /**
+     * Committer name gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder committerName(String v) {
-        return q("committer-name:"+v);
+        return q("committer-name:" + v);
     }
 
+    /**
+     * Author email gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder authorEmail(String v) {
-        return q("author-email:"+v);
+        return q("author-email:" + v);
     }
 
+    /**
+     * Committer email gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder committerEmail(String v) {
-        return q("committer-email:"+v);
+        return q("committer-email:" + v);
     }
 
+    /**
+     * Author date gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder authorDate(String v) {
-        return q("author-date:"+v);
+        return q("author-date:" + v);
     }
 
+    /**
+     * Committer date gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder committerDate(String v) {
-        return q("committer-date:"+v);
+        return q("committer-date:" + v);
     }
 
+    /**
+     * Merge gh commit search builder.
+     *
+     * @param merge
+     *            the merge
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder merge(boolean merge) {
-        return q("merge:"+Boolean.valueOf(merge).toString().toLowerCase());
+        return q("merge:" + Boolean.valueOf(merge).toString().toLowerCase());
     }
 
+    /**
+     * Hash gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder hash(String v) {
-        return q("hash:"+v);
+        return q("hash:" + v);
     }
 
+    /**
+     * Parent gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder parent(String v) {
-        return q("parent:"+v);
+        return q("parent:" + v);
     }
 
+    /**
+     * Tree gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder tree(String v) {
-        return q("tree:"+v);
+        return q("tree:" + v);
     }
 
+    /**
+     * Is gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder is(String v) {
-        return q("is:"+v);
+        return q("is:" + v);
     }
 
+    /**
+     * User gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder user(String v) {
-        return q("user:"+v);
+        return q("user:" + v);
     }
 
+    /**
+     * Org gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder org(String v) {
-        return q("org:"+v);
+        return q("org:" + v);
     }
 
+    /**
+     * Repo gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder repo(String v) {
-        return q("repo:"+v);
+        return q("repo:" + v);
     }
 
+    /**
+     * Order gh commit search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder order(GHDirection v) {
-        req.with("order",v);
+        req.with("order", v);
         return this;
     }
 
+    /**
+     * Sort gh commit search builder.
+     *
+     * @param sort
+     *            the sort
+     * @return the gh commit search builder
+     */
     public GHCommitSearchBuilder sort(Sort sort) {
-        req.with("sort",sort);
+        req.with("sort", sort);
         return this;
     }
 
-    public enum Sort { AUTHOR_DATE, COMMITTER_DATE }
+    /**
+     * The enum Sort.
+     */
+    public enum Sort {
+        AUTHOR_DATE, COMMITTER_DATE
+    }
 
     private static class CommitSearchResult extends SearchResult<GHCommit> {
         private GHCommit[] items;
 
         @Override
-        /*package*/ GHCommit[] getItems(GitHub root) {
+        GHCommit[] getItems(GitHub root) {
             for (GHCommit commit : items) {
                 String repoName = getRepoName(commit.url);
                 try {
                     GHRepository repo = root.getRepository(repoName);
                     commit.wrapUp(repo);
-                } catch (IOException ioe) {}
+                } catch (IOException ioe) {
+                }
             }
             return items;
         }
     }
-    
+
     /**
-     * @param commitUrl a commit URL
+     * @param commitUrl
+     *            a commit URL
      * @return the repo name ("username/reponame")
      */
     private static String getRepoName(String commitUrl) {
         if (StringUtils.isBlank(commitUrl)) {
             return null;
         }
-        int indexOfUsername = (GitHub.GITHUB_URL + "/repos/").length();
+        int indexOfUsername = (GitHubClient.GITHUB_URL + "/repos/").length();
         String[] tokens = commitUrl.substring(indexOfUsername).split("/", 3);
         return tokens[0] + '/' + tokens[1];
     }

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

@@ -7,49 +7,73 @@ import java.net.URL;
  * Represents a status of a commit.
  *
  * @author Kohsuke Kawaguchi
- * @see GHRepository#getLastCommitStatus(String)
- * @see GHCommit#getLastStatus()
- * @see GHRepository#createCommitStatus(String, GHCommitState, String, String)
+ * @see GHRepository#getLastCommitStatus(String) GHRepository#getLastCommitStatus(String)
+ * @see GHCommit#getLastStatus() GHCommit#getLastStatus()
+ * @see GHRepository#createCommitStatus(String, GHCommitState, String, String) GHRepository#createCommitStatus(String,
+ *      GHCommitState, String, String)
  */
 public class GHCommitStatus extends GHObject {
     String state;
-    String target_url,description;
+    String target_url, description;
     String context;
     GHUser creator;
 
-    private GitHub root;
-
-    /*package*/ GHCommitStatus wrapUp(GitHub root) {
-        if (creator!=null)  creator.wrapUp(root);
+    GHCommitStatus wrapUp(GitHub root) {
+        if (creator != null)
+            creator.wrapUp(root);
         this.root = root;
         return this;
     }
 
+    /**
+     * Gets state.
+     *
+     * @return the state
+     */
     public GHCommitState getState() {
         for (GHCommitState s : GHCommitState.values()) {
             if (s.name().equalsIgnoreCase(state))
                 return s;
         }
-        throw new IllegalStateException("Unexpected state: "+state);
+        throw new IllegalStateException("Unexpected state: " + state);
     }
 
     /**
      * The URL that this status is linked to.
-     *
+     * <p>
      * This is the URL specified when creating a commit status.
+     *
+     * @return the target url
      */
     public String getTargetUrl() {
         return target_url;
     }
 
+    /**
+     * Gets description.
+     *
+     * @return the description
+     */
     public String getDescription() {
         return description;
     }
 
+    /**
+     * Gets creator.
+     *
+     * @return the creator
+     * @throws IOException
+     *             the io exception
+     */
     public GHUser getCreator() throws IOException {
         return root.intern(creator);
     }
 
+    /**
+     * Gets context.
+     *
+     * @return the context
+     */
     public String getContext() {
         return context;
     }

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

@@ -21,52 +21,108 @@ public class GHCompare {
 
     private GHRepository owner;
 
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
+    /**
+     * Gets html url.
+     *
+     * @return the html url
+     */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
+    /**
+     * Gets permalink url.
+     *
+     * @return the permalink url
+     */
     public URL getPermalinkUrl() {
-        return GitHub.parseURL(permalink_url);
+        return GitHubClient.parseURL(permalink_url);
     }
 
+    /**
+     * Gets diff url.
+     *
+     * @return the diff url
+     */
     public URL getDiffUrl() {
-        return GitHub.parseURL(diff_url);
+        return GitHubClient.parseURL(diff_url);
     }
 
+    /**
+     * Gets patch url.
+     *
+     * @return the patch url
+     */
     public URL getPatchUrl() {
-        return GitHub.parseURL(patch_url);
+        return GitHubClient.parseURL(patch_url);
     }
 
+    /**
+     * Gets status.
+     *
+     * @return the status
+     */
     public Status getStatus() {
         return status;
     }
 
+    /**
+     * Gets ahead by.
+     *
+     * @return the ahead by
+     */
     public int getAheadBy() {
         return ahead_by;
     }
 
+    /**
+     * Gets behind by.
+     *
+     * @return the behind by
+     */
     public int getBehindBy() {
         return behind_by;
     }
 
+    /**
+     * Gets total commits.
+     *
+     * @return the total commits
+     */
     public int getTotalCommits() {
         return total_commits;
     }
 
+    /**
+     * Gets base commit.
+     *
+     * @return the base commit
+     */
     public Commit getBaseCommit() {
         return base_commit;
     }
 
+    /**
+     * Gets merge base commit.
+     *
+     * @return the merge base commit
+     */
     public Commit getMergeBaseCommit() {
         return merge_base_commit;
     }
 
     /**
      * Gets an array of commits.
+     *
      * @return A copy of the array being stored in the class.
      */
     public Commit[] getCommits() {
@@ -74,9 +130,10 @@ public class GHCompare {
         System.arraycopy(commits, 0, newValue, 0, commits.length);
         return newValue;
     }
-    
+
     /**
      * Gets an array of commits.
+     *
      * @return A copy of the array being stored in the class.
      */
     public GHCommit.File[] getFiles() {
@@ -85,6 +142,13 @@ public class GHCompare {
         return newValue;
     }
 
+    /**
+     * Wrap gh compare.
+     *
+     * @param owner
+     *            the owner
+     * @return the gh compare
+     */
     public GHCompare wrap(GHRepository owner) {
         this.owner = owner;
         for (Commit commit : commits) {
@@ -96,71 +160,126 @@ public class GHCompare {
     }
 
     /**
-     * Compare commits had a child commit element with additional details we want to capture.
-     * This extenstion of GHCommit provides that.
+     * Compare commits had a child commit element with additional details we want to capture. This extenstion of
+     * GHCommit provides that.
      */
-    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD"}, 
+    @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD" },
             justification = "JSON API")
     public static class Commit extends GHCommit {
 
         private InnerCommit commit;
 
+        /**
+         * Gets commit.
+         *
+         * @return the commit
+         */
         public InnerCommit getCommit() {
             return commit;
         }
     }
 
-
+    /**
+     * The type InnerCommit.
+     */
     public static class InnerCommit {
         private String url, sha, message;
         private User author, committer;
         private Tree tree;
 
+        /**
+         * Gets url.
+         *
+         * @return the url
+         */
         public String getUrl() {
             return url;
         }
 
+        /**
+         * Gets sha.
+         *
+         * @return the sha
+         */
         public String getSha() {
             return sha;
         }
 
+        /**
+         * Gets message.
+         *
+         * @return the message
+         */
         public String getMessage() {
             return message;
         }
 
-        @WithBridgeMethods(value=User.class,castRequired=true)
+        /**
+         * Gets author.
+         *
+         * @return the author
+         */
+        @WithBridgeMethods(value = User.class, castRequired = true)
         public GitUser getAuthor() {
             return author;
         }
 
-        @WithBridgeMethods(value=User.class,castRequired=true)
+        /**
+         * Gets committer.
+         *
+         * @return the committer
+         */
+        @WithBridgeMethods(value = User.class, castRequired = true)
         public GitUser getCommitter() {
             return committer;
         }
 
+        /**
+         * Gets tree.
+         *
+         * @return the tree
+         */
         public Tree getTree() {
             return tree;
         }
     }
 
+    /**
+     * The type Tree.
+     */
     public static class Tree {
         private String url, sha;
 
+        /**
+         * Gets url.
+         *
+         * @return the url
+         */
         public String getUrl() {
             return url;
         }
 
+        /**
+         * Gets sha.
+         *
+         * @return the sha
+         */
         public String getSha() {
             return sha;
         }
     }
 
     /**
+     * The type User.
+     *
      * @deprecated use {@link GitUser} instead.
      */
     public static class User extends GitUser {
     }
 
+    /**
+     * The enum Status.
+     */
     public static enum Status {
         behind, ahead, identical, diverged
     }

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

@@ -1,110 +1,169 @@
 package org.kohsuke.github;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.binary.Base64InputStream;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 /**
  * A Content of a repository.
  *
  * @author Alexandre COLLIGNON
- * @see GHRepository#getFileContent(String)
+ * @see GHRepository#getFileContent(String) GHRepository#getFileContent(String)
  */
-@SuppressWarnings({"UnusedDeclaration"})
-public class GHContent implements Refreshable {
+@SuppressWarnings({ "UnusedDeclaration" })
+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.
+     * In normal use of this class, repository field is set via wrap(), but in the code search API, there's a nested
+     * 'repository' field that gets populated from JSON.
      */
     private GHRepository repository;
 
-    private GitHub root;
-
     private String type;
     private String encoding;
     private long size;
     private String sha;
     private String name;
     private String path;
+    private String target;
     private String content;
     private String url; // this is the API url
-    private String git_url;    // this is the Blob url
-    private String html_url;    // this is the UI
+    private String git_url; // this is the Blob url
+    private String html_url; // this is the UI
     private String download_url;
 
+    /**
+     * Gets owner.
+     *
+     * @return the owner
+     */
     public GHRepository getOwner() {
         return repository;
     }
 
+    /**
+     * Gets type.
+     *
+     * @return the type
+     */
     public String getType() {
         return type;
     }
 
+    /**
+     * Gets encoding.
+     *
+     * @return the encoding
+     */
     public String getEncoding() {
         return encoding;
     }
 
+    /**
+     * Gets size.
+     *
+     * @return the size
+     */
     public long getSize() {
         return size;
     }
 
+    /**
+     * Gets sha.
+     *
+     * @return the sha
+     */
     public String getSha() {
         return sha;
     }
 
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Gets path.
+     *
+     * @return the path
+     */
     public String getPath() {
         return path;
     }
 
+    /**
+     * Gets target of a symlink. This will only be set if {@code "symlink".equals(getType())}
+     *
+     * @return the target
+     */
+    public String getTarget() {
+        return target;
+    }
+
     /**
      * Retrieve the decoded content that is stored at this location.
      *
      * <p>
-     * Due to the nature of GitHub's API, you're not guaranteed that
-     * the content will already be populated, so this may trigger
-     * network activity, and can throw an IOException.
+     * Due to the nature of GitHub's API, you're not guaranteed that the content will already be populated, so this may
+     * trigger network activity, and can throw an IOException.
      *
-     * @deprecated
-     *      Use {@link #read()}
+     * @return the content
+     * @throws IOException
+     *             the io exception
+     * @deprecated Use {@link #read()}
      */
     @SuppressFBWarnings("DM_DEFAULT_ENCODING")
     public String getContent() throws IOException {
-        return new String(Base64.decodeBase64(getEncodedContent()));
+        return new String(Base64.getMimeDecoder().decode(getEncodedContent()));
     }
 
     /**
      * Retrieve the base64-encoded content that is stored at this location.
      *
      * <p>
-     * Due to the nature of GitHub's API, you're not guaranteed that
-     * the content will already be populated, so this may trigger
-     * network activity, and can throw an IOException.
+     * Due to the nature of GitHub's API, you're not guaranteed that the content will already be populated, so this may
+     * trigger network activity, and can throw an IOException.
      *
-     * @deprecated
-     *      Use {@link #read()}
+     * @return the encoded content
+     * @throws IOException
+     *             the io exception
+     * @deprecated Use {@link #read()}
      */
     public String getEncodedContent() throws IOException {
         refresh(content);
         return content;
     }
 
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
     public String getUrl() {
         return url;
     }
 
+    /**
+     * Gets git url.
+     *
+     * @return the git url
+     */
     public String getGitUrl() {
         return git_url;
     }
 
+    /**
+     * Gets html url.
+     *
+     * @return the html url
+     */
     public String getHtmlUrl() {
         return html_url;
     }
@@ -114,88 +173,161 @@ public class GHContent implements Refreshable {
      */
     /**
      * Retrieves the actual bytes of the blob.
+     *
+     * @return the input stream
+     * @throws IOException
+     *             the io exception
      */
     public InputStream read() throws IOException {
         refresh(content);
         if (encoding.equals("base64")) {
             try {
-                return new Base64InputStream(new ByteArrayInputStream(content.getBytes("US-ASCII")), false);
-            } catch (UnsupportedEncodingException e) {
-                throw new AssertionError(e);    // US-ASCII is mandatory
+                Base64.Decoder decoder = Base64.getMimeDecoder();
+                return new ByteArrayInputStream(decoder.decode(content.getBytes(StandardCharsets.US_ASCII)));
+            } catch (IllegalArgumentException e) {
+                throw new AssertionError(e); // US-ASCII is mandatory
             }
         }
 
-        throw new UnsupportedOperationException("Unrecognized encoding: "+encoding);
+        throw new UnsupportedOperationException("Unrecognized encoding: " + encoding);
     }
 
     /**
      * URL to retrieve the raw content of the file. Null if this is a directory.
+     *
+     * @return the download url
+     * @throws IOException
+     *             the io exception
      */
     public String getDownloadUrl() throws IOException {
         refresh(download_url);
         return download_url;
     }
 
+    /**
+     * Is file boolean.
+     *
+     * @return the boolean
+     */
     public boolean isFile() {
         return "file".equals(type);
     }
 
+    /**
+     * Is directory boolean.
+     *
+     * @return the boolean
+     */
     public boolean isDirectory() {
         return "dir".equals(type);
     }
 
     /**
      * Fully populate the data by retrieving missing data.
-     *
+     * <p>
      * Depending on the original API call where this object is created, it may not contain everything.
+     *
+     * @throws IOException
+     *             the io exception
      */
     protected synchronized void populate() throws IOException {
-        root.retrieve().to(url, this);
+        root.createRequest().withUrlPath(url).fetchInto(this);
     }
 
     /**
      * List immediate children of this directory.
+     *
+     * @return the paged iterable
+     * @throws IOException
+     *             the io exception
      */
     public PagedIterable<GHContent> listDirectoryContent() throws IOException {
         if (!isDirectory())
-            throw new IllegalStateException(path+" is not a directory");
+            throw new IllegalStateException(path + " is not a directory");
 
-        return root.retrieve()
-            .asPagedIterable(
-                url,
-                GHContent[].class,
-                item -> item.wrap(repository) );
+        return root.createRequest().setRawUrlPath(url).toIterable(GHContent[].class, item -> item.wrap(repository));
     }
 
+    /**
+     * Update gh content update response.
+     *
+     * @param newContent
+     *            the new content
+     * @param commitMessage
+     *            the commit message
+     * @return the gh content update response
+     * @throws IOException
+     *             the io exception
+     */
     @SuppressFBWarnings("DM_DEFAULT_ENCODING")
     public GHContentUpdateResponse update(String newContent, String commitMessage) throws IOException {
         return update(newContent.getBytes(), commitMessage, null);
     }
 
+    /**
+     * Update gh content update response.
+     *
+     * @param newContent
+     *            the new content
+     * @param commitMessage
+     *            the commit message
+     * @param branch
+     *            the branch
+     * @return the gh content update response
+     * @throws IOException
+     *             the io exception
+     */
     @SuppressFBWarnings("DM_DEFAULT_ENCODING")
     public GHContentUpdateResponse update(String newContent, String commitMessage, String branch) throws IOException {
         return update(newContent.getBytes(), commitMessage, branch);
     }
 
+    /**
+     * Update gh content update response.
+     *
+     * @param newContentBytes
+     *            the new content bytes
+     * @param commitMessage
+     *            the commit message
+     * @return the gh content update response
+     * @throws IOException
+     *             the io exception
+     */
     public GHContentUpdateResponse update(byte[] newContentBytes, String commitMessage) throws IOException {
         return update(newContentBytes, commitMessage, null);
     }
 
-    public GHContentUpdateResponse update(byte[] newContentBytes, String commitMessage, String branch) throws IOException {
-        String encodedContent = Base64.encodeBase64String(newContentBytes);
+    /**
+     * Update gh content update response.
+     *
+     * @param newContentBytes
+     *            the new content bytes
+     * @param commitMessage
+     *            the commit message
+     * @param branch
+     *            the branch
+     * @return the gh content update response
+     * @throws IOException
+     *             the io exception
+     */
+    public GHContentUpdateResponse update(byte[] newContentBytes, String commitMessage, String branch)
+            throws IOException {
+        String encodedContent = Base64.getEncoder().encodeToString(newContentBytes);
 
-        Requester requester = new Requester(root)
-            .with("path", path)
-            .with("message", commitMessage)
-            .with("sha", sha)
-            .with("content", encodedContent)
-            .method("PUT");
+        Requester requester = root.createRequest()
+                .method("POST")
+                .with("path", path)
+                .with("message", commitMessage)
+                .with("sha", sha)
+                .with("content", encodedContent)
+                .method("PUT");
 
         if (branch != null) {
             requester.with("branch", branch);
         }
 
-        GHContentUpdateResponse response = requester.to(getApiRoute(), GHContentUpdateResponse.class);
+        GHContentUpdateResponse response = requester.withUrlPath(getApiRoute(repository, path))
+                .fetch(GHContentUpdateResponse.class);
 
         response.getContent().wrap(repository);
         response.getCommit().wrapUp(repository);
@@ -204,29 +336,51 @@ public class GHContent implements Refreshable {
         return response;
     }
 
+    /**
+     * Delete gh content update response.
+     *
+     * @param message
+     *            the message
+     * @return the gh content update response
+     * @throws IOException
+     *             the io exception
+     */
     public GHContentUpdateResponse delete(String message) throws IOException {
         return delete(message, null);
     }
 
+    /**
+     * Delete gh content update response.
+     *
+     * @param commitMessage
+     *            the commit message
+     * @param branch
+     *            the branch
+     * @return the gh content update response
+     * @throws IOException
+     *             the io exception
+     */
     public GHContentUpdateResponse delete(String commitMessage, String branch) throws IOException {
-        Requester requester = new Requester(root)
-            .with("path", path)
-            .with("message", commitMessage)
-            .with("sha", sha)
-            .method("DELETE");
+        Requester requester = root.createRequest()
+                .method("POST")
+                .with("path", path)
+                .with("message", commitMessage)
+                .with("sha", sha)
+                .method("DELETE");
 
         if (branch != null) {
             requester.with("branch", branch);
         }
 
-        GHContentUpdateResponse response = requester.to(getApiRoute(), GHContentUpdateResponse.class);
+        GHContentUpdateResponse response = requester.withUrlPath(getApiRoute(repository, path))
+                .fetch(GHContentUpdateResponse.class);
 
         response.getCommit().wrapUp(repository);
         return response;
     }
 
-    private String getApiRoute() {
-        return "/repos/" + repository.getOwnerName() + "/" + repository.getName() + "/contents/" + path;
+    static String getApiRoute(GHRepository repository, String path) {
+        return repository.getApiTailUrl("contents/" + path);
     }
 
     GHContent wrap(GHRepository owner) {
@@ -234,21 +388,14 @@ public class GHContent implements Refreshable {
         this.root = owner.root;
         return this;
     }
+
     GHContent wrap(GitHub root) {
         this.root = root;
-        if (repository!=null)
+        if (repository != null)
             repository.wrap(root);
         return this;
     }
 
-
-    public static GHContent[] wrap(GHContent[] contents, GHRepository repository) {
-        for (GHContent unwrappedContent : contents) {
-            unwrappedContent.wrap(repository);
-        }
-        return contents;
-    }
-
     /**
      * Fully populate the data by retrieving missing data.
      *
@@ -256,6 +403,6 @@ public class GHContent implements Refreshable {
      */
     @Override
     public synchronized void refresh() throws IOException {
-        root.retrieve().to(url, this);
+        root.createRequest().setRawUrlPath(url).fetchInto(this);
     }
 }

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

@@ -1,9 +1,8 @@
 package org.kohsuke.github;
 
-import org.apache.commons.codec.binary.Base64;
-
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 /**
  * Used to create/update content.
@@ -12,7 +11,7 @@ import java.io.UnsupportedEncodingException;
  * Call various methods to build up parameters, then call {@link #commit()} to make the change effective.
  *
  * @author Kohsuke Kawaguchi
- * @see GHRepository#createContent()
+ * @see GHRepository#createContent() GHRepository#createContent()
  */
 public final class GHContentBuilder {
     private final GHRepository repo;
@@ -21,42 +20,76 @@ public final class GHContentBuilder {
 
     GHContentBuilder(GHRepository repo) {
         this.repo = repo;
-        this.req = new Requester(repo.root).method("PUT");
+        this.req = repo.root.createRequest().method("PUT");
     }
 
+    /**
+     * Path gh content builder.
+     *
+     * @param path
+     *            the path
+     * @return the gh content builder
+     */
     public GHContentBuilder path(String path) {
         this.path = path;
-        req.with("path",path);
+        req.with("path", path);
         return this;
     }
 
+    /**
+     * Branch gh content builder.
+     *
+     * @param branch
+     *            the branch
+     * @return the gh content builder
+     */
     public GHContentBuilder branch(String branch) {
         req.with("branch", branch);
         return this;
     }
 
     /**
-     * Used when updating (but not creating a new content) to specify
-     * Thetblob SHA of the file being replaced.
+     * Used when updating (but not creating a new content) to specify the blob SHA of the file being replaced.
+     *
+     * @param sha
+     *            the sha
+     * @return the gh content builder
      */
     public GHContentBuilder sha(String sha) {
         req.with("sha", sha);
         return this;
     }
 
+    /**
+     * Content gh content builder.
+     *
+     * @param content
+     *            the content
+     * @return the gh content builder
+     */
     public GHContentBuilder content(byte[] content) {
-        req.with("content", Base64.encodeBase64String(content));
+        req.with("content", Base64.getEncoder().encodeToString(content));
         return this;
     }
 
+    /**
+     * Content gh content builder.
+     *
+     * @param content
+     *            the content
+     * @return the gh content builder
+     */
     public GHContentBuilder content(String content) {
-        try {
-            return content(content.getBytes("UTF-8"));
-        } catch (UnsupportedEncodingException x) {
-            throw new AssertionError();
-        }
+        return content(content.getBytes(StandardCharsets.UTF_8));
     }
 
+    /**
+     * Message gh content builder.
+     *
+     * @param commitMessage
+     *            the commit message
+     * @return the gh content builder
+     */
     public GHContentBuilder message(String commitMessage) {
         req.with("message", commitMessage);
         return this;
@@ -64,9 +97,14 @@ public final class GHContentBuilder {
 
     /**
      * Commits a new content.
+     *
+     * @return the gh content update response
+     * @throws IOException
+     *             the io exception
      */
     public GHContentUpdateResponse commit() throws IOException {
-        GHContentUpdateResponse response = req.to(repo.getApiTailUrl("contents/" + path), GHContentUpdateResponse.class);
+        GHContentUpdateResponse response = req.withUrlPath(GHContent.getApiRoute(repo, path))
+                .fetch(GHContentUpdateResponse.class);
 
         response.getContent().wrap(repo);
         response.getCommit().wrapUp(repo);

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

@@ -4,11 +4,11 @@ package org.kohsuke.github;
  * Search code for {@link GHContent}.
  *
  * @author Kohsuke Kawaguchi
- * @see GitHub#searchContent()
+ * @see GitHub#searchContent() GitHub#searchContent()
  */
 public class GHContentSearchBuilder extends GHSearchBuilder<GHContent> {
-    /*package*/ GHContentSearchBuilder(GitHub root) {
-        super(root,ContentSearchResult.class);
+    GHContentSearchBuilder(GitHub root) {
+        super(root, ContentSearchResult.class);
     }
 
     /**
@@ -19,48 +19,145 @@ public class GHContentSearchBuilder extends GHSearchBuilder<GHContent> {
         return this;
     }
 
+    /**
+     * In gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder in(String v) {
-        return q("in:"+v);
+        return q("in:" + v);
     }
 
+    /**
+     * Language gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder language(String v) {
-        return q("language:"+v);
+        return q("language:" + v);
     }
 
+    /**
+     * Fork gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder fork(String v) {
-        return q("fork:"+v);
+        return q("fork:" + v);
     }
 
+    /**
+     * Size gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder size(String v) {
-        return q("size:"+v);
+        return q("size:" + v);
     }
 
+    /**
+     * Path gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder path(String v) {
-        return q("path:"+v);
+        return q("path:" + v);
     }
 
+    /**
+     * Filename gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder filename(String v) {
-        return q("filename:"+v);
+        return q("filename:" + v);
     }
 
+    /**
+     * Extension gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder extension(String v) {
-        return q("extension:"+v);
+        return q("extension:" + v);
     }
 
+    /**
+     * User gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder user(String v) {
-        return q("user:"+v);
+        return q("user:" + v);
     }
 
-
+    /**
+     * Repo gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
     public GHContentSearchBuilder repo(String v) {
-        return q("repo:"+v);
+        return q("repo:" + v);
+    }
+
+    /**
+     * Order gh content search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh content search builder
+     */
+    public GHContentSearchBuilder order(GHDirection v) {
+        req.with("order", v);
+        return this;
+    }
+
+    /**
+     * Sort gh content search builder.
+     *
+     * @param sort
+     *            the sort
+     * @return the gh content search builder
+     */
+    public GHContentSearchBuilder sort(GHContentSearchBuilder.Sort sort) {
+        if (Sort.BEST_MATCH.equals(sort)) {
+            req.remove("sort");
+        } else {
+            req.with("sort", sort);
+        }
+        return this;
+    }
+
+    /**
+     * The enum Sort.
+     */
+    public enum Sort {
+        BEST_MATCH, INDEXED
     }
 
     private static class ContentSearchResult extends SearchResult<GHContent> {
         private GHContent[] items;
 
         @Override
-        /*package*/ GHContent[] getItems(GitHub root) {
+        GHContent[] getItems(GitHub root) {
             for (GHContent item : items)
                 item.wrap(root);
             return items;

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

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

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

@@ -13,7 +13,7 @@ class GHContentWithLicense extends GHContent {
     @Override
     GHContentWithLicense wrap(GHRepository owner) {
         super.wrap(owner);
-        if (license!=null)
+        if (license != null)
             license.wrap(owner.root);
         return this;
     }

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

@@ -1,138 +1,134 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.net.URL;
+
+import static org.kohsuke.github.internal.Previews.BAPTISTE;
 
 /**
  * Creates a repository
  *
  * @author Kohsuke Kawaguchi
  */
-public class GHCreateRepositoryBuilder {
-    private final GitHub root;
-    protected final Requester builder;
-    private final String apiUrlTail;
+public class GHCreateRepositoryBuilder extends GHRepositoryBuilder<GHCreateRepositoryBuilder> {
 
-    /*package*/ GHCreateRepositoryBuilder(GitHub root, String apiUrlTail, String name) {
-        this.root = root;
-        this.apiUrlTail = apiUrlTail;
-        this.builder = new Requester(root);
-        this.builder.with("name",name);
-    }
+    public GHCreateRepositoryBuilder(String name, GitHub root, String apiTail) {
+        super(GHCreateRepositoryBuilder.class, root, null);
+        requester.method("POST").withUrlPath(apiTail);
 
-    public GHCreateRepositoryBuilder description(String description) {
-        this.builder.with("description",description);
-        return this;
-    }
-
-    public GHCreateRepositoryBuilder homepage(URL homepage) {
-        return homepage(homepage.toExternalForm());
-    }
-
-    public GHCreateRepositoryBuilder homepage(String homepage) {
-        this.builder.with("homepage",homepage);
-        return this;
-    }
-
-    /**
-     * Creates a private repository
-     */
-    public GHCreateRepositoryBuilder private_(boolean b) {
-        this.builder.with("private",b);
-        return this;
-    }
-
-    /**
-     * Enables issue tracker
-     */
-    public GHCreateRepositoryBuilder issues(boolean b) {
-        this.builder.with("has_issues",b);
-        return this;
-    }
-
-    /**
-     * Enables wiki
-     */
-    public GHCreateRepositoryBuilder wiki(boolean b) {
-        this.builder.with("has_wiki",b);
-        return this;
-    }
-
-    /**
-     * Enables downloads
-     */
-    public GHCreateRepositoryBuilder downloads(boolean b) {
-        this.builder.with("has_downloads",b);
-        return this;
-    }
-
-    /**
-     * If true, create an initial commit with empty README.
-     */
-    public GHCreateRepositoryBuilder autoInit(boolean b) {
-        this.builder.with("auto_init",b);
-        return this;
-    }
-
-    /**
-     * Allow or disallow squash-merging pull requests.
-     */
-    public GHCreateRepositoryBuilder allowSquashMerge(boolean b) {
-        this.builder.with("allow_squash_merge",b);
-        return this;
-    }
-
-    /**
-     * Allow or disallow merging pull requests with a merge commit.
-     */
-    public GHCreateRepositoryBuilder allowMergeCommit(boolean b) {
-        this.builder.with("allow_merge_commit",b);
-        return this;
-    }
-
-    /**
-     * Allow or disallow rebase-merging pull requests.
-     */
-    public GHCreateRepositoryBuilder allowRebaseMerge(boolean b) {
-        this.builder.with("allow_rebase_merge",b);
-        return this;
+        try {
+            name(name);
+        } catch (IOException e) {
+            // not going to happen here
+        }
     }
 
     /**
      * Creates a default .gitignore
      *
-     * See https://developer.github.com/v3/repos/#create
+     * @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) {
-        this.builder.with("gitignore_template",language);
-        return this;
+    public GHCreateRepositoryBuilder gitignoreTemplate(String language) throws IOException {
+        return with("gitignore_template", language);
     }
 
     /**
      * Desired license template to apply
      *
-     * See https://developer.github.com/v3/repos/#create
+     * @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) {
-        this.builder.with("license_template",license);
+    public GHCreateRepositoryBuilder licenseTemplate(String license) throws IOException {
+        return with("license_template", license);
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * The team that gets granted access to this repository. Only valid for creating a repository in an organization.
+     *
+     * @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) throws IOException {
+        if (team != null)
+            return with("team_id", team.getId());
         return this;
     }
 
     /**
-     * The team that gets granted access to this repository. Only valid for creating a repository in
-     * an organization.
+     * 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.
+     * @deprecated Use {@link #isTemplate(boolean)} method instead
      */
-    public GHCreateRepositoryBuilder team(GHTeam team) {
-        if (team!=null)
-            this.builder.with("team_id",team.getId());
+    @Deprecated
+    public GHCreateRepositoryBuilder templateRepository(boolean enabled) throws IOException {
+        return isTemplate(enabled);
+    }
+
+    /**
+     * Specifies the ownership of the repository.
+     *
+     * @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) throws IOException {
+        return with("owner", owner);
+    }
+
+    /**
+     * Create repository from template repository
+     *
+     * @param templateOwner
+     *            template repository owner
+     * @param templateRepo
+     *            template repository
+     * @return a builder to continue with building
+     * @see <a href="https://developer.github.com/v3/previews/">GitHub API Previews</a>
+     */
+    @Preview(BAPTISTE)
+    @Deprecated
+    public GHCreateRepositoryBuilder fromTemplateRepository(String templateOwner, String templateRepo) {
+        requester.withPreview(BAPTISTE).withUrlPath("/repos/" + templateOwner + "/" + templateRepo + "/generate");
         return this;
     }
 
     /**
      * Creates a repository with all the parameters.
+     *
+     * @return the gh repository
+     * @throws IOException
+     *             if repository cannot be created
      */
     public GHRepository create() throws IOException {
-        return builder.method("POST").to(apiUrlTail, GHRepository.class).wrap(root);
+        return done();
     }
-
 }

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

@@ -4,6 +4,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.io.IOException;
 
+/**
+ * The type GHDeployKey.
+ */
 public class GHDeployKey {
 
     protected String url, key, title;
@@ -11,36 +14,77 @@ public class GHDeployKey {
     protected long id;
     private GHRepository owner;
 
+    /**
+     * Gets id.
+     *
+     * @return the id
+     */
     public long getId() {
         return id;
     }
 
+    /**
+     * Gets key.
+     *
+     * @return the key
+     */
     public String getKey() {
         return key;
     }
 
+    /**
+     * Gets title.
+     *
+     * @return the title
+     */
     public String getTitle() {
         return title;
     }
 
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
     public String getUrl() {
         return url;
     }
 
+    /**
+     * Is verified boolean.
+     *
+     * @return the boolean
+     */
     public boolean isVerified() {
         return verified;
     }
 
+    /**
+     * Wrap gh deploy key.
+     *
+     * @param repo
+     *            the repo
+     * @return the gh deploy key
+     */
     public GHDeployKey wrap(GHRepository repo) {
         this.owner = repo;
         return this;
     }
 
     public String toString() {
-        return new ToStringBuilder(this).append("title",title).append("id",id).append("key",key).toString();
+        return new ToStringBuilder(this).append("title", title).append("id", id).append("key", key).toString();
     }
-    
+
+    /**
+     * Delete.
+     *
+     * @throws IOException
+     *             the io exception
+     */
     public void delete() throws IOException {
-        new Requester(owner.root).method("DELETE").to(String.format("/repos/%s/%s/keys/%d", owner.getOwnerName(), owner.getName(), id));
+        owner.root.createRequest()
+                .method("DELETE")
+                .withUrlPath(String.format("/repos/%s/%s/keys/%d", owner.getOwnerName(), owner.getName(), id))
+                .send();
     }
 }

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

@@ -1,18 +1,21 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.io.IOException;
 import java.net.URL;
+import java.util.Map;
 
 /**
  * Represents a deployment
  *
  * @see <a href="https://developer.github.com/v3/repos/deployments/">documentation</a>
- * @see GHRepository#listDeployments(String, String, String, String)
- * @see GHRepository#getDeployment(long)
+ * @see GHRepository#listDeployments(String, String, String, String) GHRepository#listDeployments(String, String,
+ *      String, String)
+ * @see GHRepository#getDeployment(long) GHRepository#getDeployment(long)
  */
 public class GHDeployment extends GHObject {
     private GHRepository owner;
-    private GitHub root;
     protected String sha;
     protected String ref;
     protected String task;
@@ -22,39 +25,149 @@ 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;
         this.root = owner.root;
-        if(creator != null) creator.wrapUp(root);
+        if (creator != null)
+            creator.wrapUp(root);
         return this;
     }
 
+    /**
+     * Gets statuses url.
+     *
+     * @return the statuses url
+     */
     public URL getStatusesUrl() {
-        return GitHub.parseURL(statuses_url);
+        return GitHubClient.parseURL(statuses_url);
     }
 
+    /**
+     * Gets repository url.
+     *
+     * @return the repository url
+     */
     public URL getRepositoryUrl() {
-        return GitHub.parseURL(repository_url);
+        return GitHubClient.parseURL(repository_url);
     }
 
+    /**
+     * Gets task.
+     *
+     * @return the task
+     */
     public String getTask() {
         return task;
     }
+
+    /**
+     * Gets payload. <b>NOTE:</b> only use this method if you can guarantee the payload will be a simple string,
+     * otherwise use {@link #getPayloadObject()}.
+     *
+     * @return the payload
+     */
     public String getPayload() {
         return (String) payload;
     }
+
+    /**
+     * Gets payload. <b>NOTE:</b> only use this method if you can guarantee the payload will be a JSON object (Map),
+     * otherwise use {@link #getPayloadObject()}.
+     *
+     * @return the payload
+     */
+    public Map<String, Object> getPayloadMap() {
+        return (Map<String, Object>) payload;
+    }
+
+    /**
+     * 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.
+     *
+     * @return the environment
+     */
     public String getEnvironment() {
         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.
+     *
+     * @return the creator
+     * @throws IOException
+     *             the io exception
+     */
     public GHUser getCreator() throws IOException {
         return root.intern(creator);
     }
+
+    /**
+     * Gets ref.
+     *
+     * @return the ref
+     */
     public String getRef() {
         return ref;
     }
-    public String getSha(){
+
+    /**
+     * Gets sha.
+     *
+     * @return the sha
+     */
+    public String getSha() {
         return sha;
     }
 
@@ -66,16 +179,28 @@ public class GHDeployment extends GHObject {
         return null;
     }
 
+    /**
+     * Create status gh deployment status builder.
+     *
+     * @param state
+     *            the state
+     * @return the gh deployment status builder
+     */
     public GHDeploymentStatusBuilder createStatus(GHDeploymentState state) {
-        return new GHDeploymentStatusBuilder(owner,id,state);
+        return new GHDeploymentStatusBuilder(owner, getId(), state);
     }
 
+    /**
+     * List statuses paged iterable.
+     *
+     * @return the paged iterable
+     */
     public PagedIterable<GHDeploymentStatus> listStatuses() {
-        return root.retrieve()
-            .asPagedIterable(
-                statuses_url,
-                GHDeploymentStatus[].class,
-                item -> item.wrap(owner) );
+        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,55 +1,180 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.io.IOException;
 import java.util.List;
 
-//Based on https://developer.github.com/v3/repos/deployments/#create-a-deployment
+/**
+ * The type GHDeploymentBuilder.
+ */
+// Based on https://developer.github.com/v3/repos/deployments/#create-a-deployment
 public class GHDeploymentBuilder {
     private final GHRepository repo;
     private final Requester builder;
 
+    /**
+     * Instantiates a new Gh deployment builder.
+     *
+     * @param repo
+     *            the repo
+     */
     public GHDeploymentBuilder(GHRepository repo) {
         this.repo = repo;
-        this.builder = new Requester(repo.root);
+        this.builder = repo.root.createRequest()
+                .withPreview(Previews.ANT_MAN)
+                .withPreview(Previews.FLASH)
+                .method("POST");
     }
 
+    /**
+     * Instantiates a new Gh deployment builder.
+     *
+     * @param repo
+     *            the repo
+     * @param ref
+     *            the ref
+     */
     public GHDeploymentBuilder(GHRepository repo, String ref) {
         this(repo);
         ref(ref);
     }
 
+    /**
+     * Ref gh deployment builder.
+     *
+     * @param branch
+     *            the branch
+     *
+     * @return the gh deployment builder
+     */
     public GHDeploymentBuilder ref(String branch) {
-        builder.with("ref",branch);
+        builder.with("ref", branch);
         return this;
     }
+
+    /**
+     * Task gh deployment builder.
+     *
+     * @param task
+     *            the task
+     *
+     * @return the gh deployment builder
+     */
     public GHDeploymentBuilder task(String task) {
-        builder.with("task",task);
+        builder.with("task", task);
         return this;
     }
+
+    /**
+     * Auto merge gh deployment builder.
+     *
+     * @param autoMerge
+     *            the auto merge
+     *
+     * @return the gh deployment builder
+     */
     public GHDeploymentBuilder autoMerge(boolean autoMerge) {
-        builder.with("auto_merge",autoMerge);
+        builder.with("auto_merge", autoMerge);
         return this;
     }
 
+    /**
+     * Required contexts gh deployment builder.
+     *
+     * @param requiredContexts
+     *            the required contexts
+     *
+     * @return the gh deployment builder
+     */
     public GHDeploymentBuilder requiredContexts(List<String> requiredContexts) {
-        builder.with("required_contexts",requiredContexts);
+        builder.with("required_contexts", requiredContexts);
         return this;
     }
+
+    /**
+     * Payload gh deployment builder.
+     *
+     * @param payload
+     *            the payload
+     *
+     * @return the gh deployment builder
+     */
     public GHDeploymentBuilder payload(String payload) {
-        builder.with("payload",payload);
+        builder.with("payload", payload);
         return this;
     }
 
+    /**
+     * Environment gh deployment builder.
+     *
+     * @param environment
+     *            the environment
+     *
+     * @return the gh deployment builder
+     */
     public GHDeploymentBuilder environment(String environment) {
-        builder.with("environment",environment);
-        return this;
-    }
-    public GHDeploymentBuilder description(String description) {
-        builder.with("description",description);
+        builder.with("environment", environment);
         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) {
+        builder.with("description", description);
+        return this;
+    }
+
+    /**
+     * Create gh deployment.
+     *
+     * @return the gh deployment
+     *
+     * @throws IOException
+     *             the io exception
+     */
     public GHDeployment create() throws IOException {
-        return builder.to(repo.getApiTailUrl("deployments"),GHDeployment.class).wrap(repo);
+        return builder.withUrlPath(repo.getApiTailUrl("deployments")).fetch(GHDeployment.class).wrap(repo);
     }
 }

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,35 +1,103 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.net.URL;
 import java.util.Locale;
 
+/**
+ * The type GHDeploymentStatus.
+ */
 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) {
         this.owner = owner;
         this.root = owner.root;
-        if(creator != null) creator.wrapUp(root);
+        if (creator != null)
+            creator.wrapUp(root);
         return this;
     }
+
+    /**
+     * Gets target url.
+     *
+     * @deprecated Target url is deprecated in favor of {@link #getLogUrl() getLogUrl}
+     *
+     * @return the target url
+     */
+    @Deprecated
     public URL getTargetUrl() {
-        return GitHub.parseURL(target_url);
+        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.
+     *
+     * @return the deployment url
+     */
     public URL getDeploymentUrl() {
-        return GitHub.parseURL(deployment_url);
+        return GitHubClient.parseURL(deployment_url);
     }
 
-    public URL getRepositoryUrl() {
-        return GitHub.parseURL(repository_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.
+     *
+     * @return the repository url
+     */
+    public URL getRepositoryUrl() {
+        return GitHubClient.parseURL(repository_url);
+    }
+
+    /**
+     * Gets state.
+     *
+     * @return the state
+     */
     public GHDeploymentState getState() {
         return GHDeploymentState.valueOf(state.toUpperCase(Locale.ENGLISH));
     }

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

@@ -1,12 +1,13 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.Previews;
+
 import java.io.IOException;
 
 /**
  * Creates a new deployment status.
  *
- * @see
- *      GHDeployment#createStatus(GHDeploymentState)
+ * @see GHDeployment#createStatus(GHDeploymentState) GHDeployment#createStatus(GHDeploymentState)
  */
 public class GHDeploymentStatusBuilder {
     private final Requester builder;
@@ -14,31 +15,144 @@ public class GHDeploymentStatusBuilder {
     private long deploymentId;
 
     /**
-     * @deprecated
-     *      Use {@link GHDeployment#createStatus(GHDeploymentState)}
+     * Instantiates a new Gh deployment status builder.
+     *
+     * @param repo
+     *            the repo
+     * @param deploymentId
+     *            the deployment id
+     * @param state
+     *            the state
+     *
+     * @deprecated Use {@link GHDeployment#createStatus(GHDeploymentState)}
      */
+    @Deprecated
     public GHDeploymentStatusBuilder(GHRepository repo, int deploymentId, GHDeploymentState state) {
-        this(repo,(long)deploymentId,state);
+        this(repo, (long) deploymentId, state);
     }
 
-    /*package*/ GHDeploymentStatusBuilder(GHRepository repo, long deploymentId, GHDeploymentState state) {
+    GHDeploymentStatusBuilder(GHRepository repo, long deploymentId, GHDeploymentState state) {
         this.repo = repo;
         this.deploymentId = deploymentId;
-        this.builder = new Requester(repo.root);
-        this.builder.with("state",state);
+        this.builder = repo.root.createRequest()
+                .withPreview(Previews.ANT_MAN)
+                .withPreview(Previews.FLASH)
+                .method("POST");
+
+        this.builder.with("state", state);
     }
 
-    public GHDeploymentStatusBuilder description(String description) {
-      this.builder.with("description",description);
-      return this;
-    }
-
-    public GHDeploymentStatusBuilder targetUrl(String targetUrl) {
-        this.builder.with("target_url",targetUrl);
+    /**
+     * 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) {
+        this.builder.with("description", description);
+        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;
+    }
+
+    /**
+     * Create gh deployment status.
+     *
+     * @return the gh deployment status
+     *
+     * @throws IOException
+     *             the io exception
+     */
     public GHDeploymentStatus create() throws IOException {
-        return builder.to(repo.getApiTailUrl("deployments/"+deploymentId+"/statuses"),GHDeploymentStatus.class).wrap(repo);
+        return builder.withUrlPath(repo.getApiTailUrl("deployments/" + deploymentId + "/statuses"))
+                .fetch(GHDeploymentStatus.class)
+                .wrap(repo);
     }
 }

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

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

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

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

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

@@ -25,36 +25,51 @@ package org.kohsuke.github;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-
 /**
  * Represents an email of GitHub.
  *
  * @author Kelly Campbell
  */
-@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
-    "NP_UNWRITTEN_FIELD", "NP_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD"}, justification = "JSON API")
+@SuppressFBWarnings(
+        value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
+                "NP_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD" },
+        justification = "JSON API")
 public class GHEmail {
 
     protected String email;
     protected boolean primary;
     protected boolean verified;
 
+    /**
+     * Gets email.
+     *
+     * @return the email
+     */
     public String getEmail() {
         return email;
     }
 
+    /**
+     * Is primary boolean.
+     *
+     * @return the boolean
+     */
     public boolean isPrimary() {
         return primary;
     }
 
+    /**
+     * Is verified boolean.
+     *
+     * @return the boolean
+     */
     public boolean isVerified() {
         return verified;
     }
 
-
     @Override
     public String toString() {
-        return "Email:"+email;
+        return "Email:" + email;
     }
 
     @Override

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

@@ -1,7 +1,11 @@
 package org.kohsuke.github;
 
+import org.kohsuke.github.internal.EnumUtils;
+
 import java.util.Locale;
 
+import javax.annotation.Nonnull;
+
 /**
  * Hook event type.
  *
@@ -10,57 +14,121 @@ import java.util.Locale;
  * @see <a href="https://developer.github.com/v3/activity/events/types/">Event type reference</a>
  */
 public enum GHEvent {
+    CHECK_RUN,
+    CHECK_SUITE,
+    CODE_SCANNING_ALERT,
     COMMIT_COMMENT,
+    CONTENT_REFERENCE,
     CREATE,
     DELETE,
+    DEPLOY_KEY,
     DEPLOYMENT,
     DEPLOYMENT_STATUS,
     DOWNLOAD,
     FOLLOW,
     FORK,
     FORK_APPLY,
+    GITHUB_APP_AUTHORIZATION,
     GIST,
     GOLLUM,
     INSTALLATION,
     INSTALLATION_REPOSITORIES,
     INTEGRATION_INSTALLATION_REPOSITORIES,
-    CHECK_SUITE,
     ISSUE_COMMENT,
     ISSUES,
     LABEL,
     MARKETPLACE_PURCHASE,
     MEMBER,
     MEMBERSHIP,
+    META,
     MILESTONE,
     ORGANIZATION,
     ORG_BLOCK,
+    PACKAGE,
     PAGE_BUILD,
     PROJECT_CARD,
     PROJECT_COLUMN,
     PROJECT,
+    PING,
     PUBLIC,
     PULL_REQUEST,
     PULL_REQUEST_REVIEW,
     PULL_REQUEST_REVIEW_COMMENT,
     PUSH,
+    REGISTRY_PACKAGE,
     RELEASE,
-    REPOSITORY, // only valid for org hooks
+    REPOSITORY_DISPATCH, // only valid for org hooks
+    REPOSITORY,
+    REPOSITORY_IMPORT,
+    REPOSITORY_VULNERABILITY_ALERT,
+    SCHEDULE,
+    SECURITY_ADVISORY,
+    STAR,
     STATUS,
     TEAM,
     TEAM_ADD,
     WATCH,
-    PING,
+    WORKFLOW_DISPATCH,
+    WORKFLOW_RUN,
+
+    /**
+     * Special event type that means we haven't found an enum value corresponding to the event.
+     */
+    UNKNOWN,
+
     /**
      * Special event type that means "every possible event"
      */
     ALL;
 
-
     /**
      * Returns GitHub's internal representation of this event.
      */
     String symbol() {
-        if (this==ALL)  return "*";
+        if (this == ALL)
+            return "*";
         return name().toLowerCase(Locale.ENGLISH);
     }
+
+    /**
+     * Representation of GitHub Event Type
+     *
+     * @see <a href="https://docs.github.com/en/developers/webhooks-and-events/github-event-types">GitHub event
+     *      types</a>
+     */
+    enum GitHubEventType {
+        CommitCommentEvent(COMMIT_COMMENT),
+        CreateEvent(CREATE),
+        DeleteEvent(DELETE),
+        ForkEvent(FORK),
+        GollumEvent(GOLLUM),
+        IssueCommentEvent(ISSUE_COMMENT),
+        IssuesEvent(ISSUES),
+        MemberEvent(MEMBER),
+        PublicEvent(PUBLIC),
+        PullRequestEvent(PULL_REQUEST),
+        PullRequestReviewEvent(PULL_REQUEST_REVIEW),
+        PullRequestReviewCommentEvent(PULL_REQUEST_REVIEW_COMMENT),
+        PushEvent(PUSH),
+        ReleaseEvent(RELEASE),
+        WatchEvent(WATCH),
+        UnknownEvent(UNKNOWN);
+
+        private final GHEvent event;
+        GitHubEventType(GHEvent event) {
+            this.event = event;
+        }
+
+        /**
+         * Required due to different naming conventions between different GitHub event names for Webhook events and
+         * GitHub events
+         *
+         * @param event
+         *            the github event as a string to convert to Event enum
+         * @return GHEvent
+         */
+        static GHEvent transformToGHEvent(@Nonnull String event) {
+            return EnumUtils.getEnumOrDefault(GitHubEventType.class, event, UnknownEvent).event;
+        }
+    }
 }

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

@@ -2,6 +2,7 @@ package org.kohsuke.github;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.kohsuke.github.GHEvent.GitHubEventType;
 
 import java.io.IOException;
 import java.util.Date;
@@ -12,9 +13,7 @@ import java.util.Date;
  * @author Kohsuke Kawaguchi
  */
 @SuppressFBWarnings(value = "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", justification = "JSON API")
-public class GHEventInfo {
-    private GitHub root;
-
+public class GHEventInfo extends GitHubInteractiveObject {
     // we don't want to expose Jackson dependency to the user. This needs databinding
     private ObjectNode payload;
 
@@ -30,76 +29,114 @@ public class GHEventInfo {
     /**
      * Inside the event JSON model, GitHub uses a slightly different format.
      */
-    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD",
-        "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" }, justification = "JSON API")
+    @SuppressFBWarnings(
+            value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD",
+                    "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" },
+            justification = "JSON API")
     public static class GHEventRepository {
         @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
         private long id;
         @SuppressFBWarnings(value = "UUF_UNUSED_FIELD", justification = "We don't provide it in API now")
-        private String url;     // repository API URL
-        private String name;    // owner/repo
+        private String url; // repository API URL
+        private String name; // owner/repo
     }
 
+    /**
+     * Gets type.
+     *
+     * @return the type
+     */
     public GHEvent getType() {
-        String t = type;
-        if (t.endsWith("Event"))    t=t.substring(0,t.length()-5);
-        for (GHEvent e : GHEvent.values()) {
-            if (e.name().replace("_","").equalsIgnoreCase(t))
-                return e;
-        }
-        return null;    // unknown event type
+        return GitHubEventType.transformToGHEvent(type);
     }
 
-    /*package*/ GHEventInfo wrapUp(GitHub root) {
+    GHEventInfo wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
 
+    /**
+     * Gets id.
+     *
+     * @return the id
+     */
     public long getId() {
         return id;
     }
 
+    /**
+     * Gets created at.
+     *
+     * @return the created at
+     */
     public Date getCreatedAt() {
-        return GitHub.parseDate(created_at);
+        return GitHubClient.parseDate(created_at);
     }
 
     /**
-     * Repository where the change was made.
+     * Gets repository.
+     *
+     * @return Repository where the change was made.
+     * @throws IOException
+     *             on error
      */
-    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" }, 
+    @SuppressFBWarnings(value = { "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" },
             justification = "The field comes from JSON deserialization")
     public GHRepository getRepository() throws IOException {
         return root.getRepository(repo.name);
     }
-    
-    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" }, 
+
+    /**
+     * Gets actor.
+     *
+     * @return the {@link GHUser} actor for this event.
+     * @throws IOException
+     *             on error
+     */
+    @SuppressFBWarnings(value = { "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" },
             justification = "The field comes from JSON deserialization")
     public GHUser getActor() throws IOException {
         return root.getUser(actor.getLogin());
     }
 
     /**
-     * Quick way to just get the actor of the login.
+     * Gets actor login.
+     *
+     * @return the login of the actor.
+     * @throws IOException
+     *             on error
      */
     public String getActorLogin() throws IOException {
         return actor.getLogin();
     }
 
-    @SuppressFBWarnings(value = {"UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" }, 
+    /**
+     * Gets organization.
+     *
+     * @return the organization
+     * @throws IOException
+     *             the io exception
+     */
+    @SuppressFBWarnings(value = { "UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" },
             justification = "The field comes from JSON deserialization")
     public GHOrganization getOrganization() throws IOException {
-        return (org==null || org.getLogin()==null) ? null : root.getOrganization(org.getLogin());
+        return (org == null || org.getLogin() == null) ? null : root.getOrganization(org.getLogin());
     }
 
     /**
      * Retrieves the payload.
-     * 
+     *
+     * @param <T>
+     *            the type parameter
      * @param type
-     *      Specify one of the {@link GHEventPayload} subtype that defines a type-safe access to the payload.
-     *      This must match the {@linkplain #getType() event type}.
+     *            Specify one of the {@link GHEventPayload} subtype that defines a type-safe access to the payload. This
+     *            must match the {@linkplain #getType() event type}.
+     * @return parsed event payload
+     * @throws IOException
+     *             if payload cannot be parsed
      */
     public <T extends GHEventPayload> T getPayload(Class<T> type) throws IOException {
-        T v = GitHub.MAPPER.readValue(payload.traverse(), type);
+        T v = GitHubClient.getMappingObjectReader(root).readValue(payload.traverse(), type);
         v.wrapUp(root);
         return v;
     }

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

@@ -1,13 +1,29 @@
 package org.kohsuke.github;
 
 /**
+ * The type GHException.
+ *
  * @author Kohsuke Kawaguchi
  */
 public class GHException extends RuntimeException {
+    /**
+     * Instantiates a new Gh exception.
+     *
+     * @param message
+     *            the message
+     */
     public GHException(String message) {
         super(message);
     }
 
+    /**
+     * Instantiates a new Gh exception.
+     *
+     * @param message
+     *            the message
+     * @param cause
+     *            the cause
+     */
     public GHException(String message, Throwable cause) {
         super(message, cause);
     }

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

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

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

@@ -1,12 +1,13 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -14,14 +15,14 @@ import java.util.Map.Entry;
  * Gist
  *
  * @author Kohsuke Kawaguchi
- * @see GHUser#listGists()
- * @see GitHub#getGist(String)
- * @see GitHub#createGist()
+ * @see GHUser#listGists() GHUser#listGists()
+ * @see GitHub#getGist(String) GitHub#getGist(String)
+ * @see GitHub#createGist() GitHub#createGist()
  * @see <a href="https://developer.github.com/v3/gists/">documentation</a>
  */
 public class GHGist extends GHObject {
-    /*package almost final*/ GHUser owner;
-    /*package almost final*/ GitHub root;
+
+    final GHUser owner;
 
     private String forks_url, commits_url, id, git_pull_url, git_push_url, html_url;
 
@@ -34,87 +35,154 @@ public class GHGist extends GHObject {
 
     private String comments_url;
 
-    private Map<String,GHGistFile> files = new HashMap<String, GHGistFile>();
+    private final Map<String, GHGistFile> files;
 
-    /**
-     * User that owns this Gist.
-     */
-    public GHUser getOwner() throws IOException {
-        return root.intern(owner);
+    @JsonCreator
+    private GHGist(@JacksonInject GitHub root,
+            @JsonProperty("owner") GHUser owner,
+            @JsonProperty("files") Map<String, GHGistFile> files) {
+        this.root = root;
+        for (Entry<String, GHGistFile> e : files.entrySet()) {
+            e.getValue().fileName = e.getKey();
+        }
+        this.files = Collections.unmodifiableMap(files);
+        this.owner = root.getUser(owner);
     }
 
+    /**
+     * Unlike most other GitHub objects, the id for Gists can be non-numeric, such as "aa5a315d61ae9438b18d". If the id
+     * is numeric, this method will get it. If id is not numeric, this will throw a runtime
+     * {@link NumberFormatException}.
+     *
+     * @return id of the Gist.
+     * @deprecated Use {@link #getGistId()} instead.
+     */
+    @Deprecated
+    @Override
+    public long getId() {
+        return Long.parseLong(getGistId());
+    }
+
+    /**
+     * Gets the id for this Gist. Unlike most other GitHub objects, the id for Gists can be non-numeric, such as
+     * "aa5a315d61ae9438b18d". This should be used instead of {@link #getId()}.
+     *
+     * @return id of this Gist
+     */
+    public String getGistId() {
+        return this.id;
+    }
+
+    /**
+     * Gets owner.
+     *
+     * @return User that owns this Gist.
+     * @throws IOException
+     *             the io exception
+     */
+    public GHUser getOwner() throws IOException {
+        return owner;
+    }
+
+    /**
+     * Gets forks url.
+     *
+     * @return the forks url
+     */
     public String getForksUrl() {
         return forks_url;
     }
 
+    /**
+     * Gets commits url.
+     *
+     * @return the commits url
+     */
     public String getCommitsUrl() {
         return commits_url;
     }
 
     /**
-     * URL like https://gist.github.com/gists/12345.git
+     * Gets git pull url.
+     *
+     * @return URL like https://gist.github.com/gists/12345.git
      */
     public String getGitPullUrl() {
         return git_pull_url;
     }
 
+    /**
+     * Gets git push url.
+     *
+     * @return the git push url
+     */
     public String getGitPushUrl() {
         return git_push_url;
     }
 
+    /**
+     * Get the html url.
+     *
+     * @return the github html url
+     */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
+    /**
+     * Is public boolean.
+     *
+     * @return the boolean
+     */
     public boolean isPublic() {
         return _public;
     }
 
+    /**
+     * Gets description.
+     *
+     * @return the description
+     */
     public String getDescription() {
         return description;
     }
 
+    /**
+     * Gets comment count.
+     *
+     * @return the comment count
+     */
     public int getCommentCount() {
         return comments;
     }
 
     /**
-     * API URL of listing comments.
+     * Gets comments url.
+     *
+     * @return API URL of listing comments.
      */
     public String getCommentsUrl() {
         return comments_url;
     }
 
+    /**
+     * Gets file.
+     *
+     * @param name
+     *            the name
+     * @return the file
+     */
     public GHGistFile getFile(String name) {
         return files.get(name);
     }
 
-    public Map<String,GHGistFile> getFiles() {
-        return Collections.unmodifiableMap(files);
-    }
-
-    /*package*/ GHGist wrapUp(GHUser owner) {
-        this.owner = owner;
-        this.root = owner.root;
-        wrapUp();
-        return this;
-    }
-
     /**
-     * Used when caller obtains {@link GHGist} without knowing its owner.
-     * A partially constructed owner object is interned.
+     * Gets files.
+     *
+     * @return the files
      */
-    /*package*/ GHGist wrapUp(GitHub root) {
-        this.owner = root.getUser(owner);
-        this.root = root;
-        wrapUp();
-        return this;
-    }
-
-    private void wrapUp() {
-        for (Entry<String, GHGistFile> e : files.entrySet()) {
-            e.getValue().fileName = e.getKey();
-        }
+    public Map<String, GHGistFile> getFiles() {
+        return files;
     }
 
     String getApiTailUrl(String tail) {
@@ -125,42 +193,73 @@ public class GHGist extends GHObject {
         return result;
     }
 
+    /**
+     * Star.
+     *
+     * @throws IOException
+     *             the io exception
+     */
     public void star() throws IOException {
-        new Requester(root).method("PUT").to(getApiTailUrl("star"));
+        root.createRequest().method("PUT").withUrlPath(getApiTailUrl("star")).send();
     }
 
+    /**
+     * Unstar.
+     *
+     * @throws IOException
+     *             the io exception
+     */
     public void unstar() throws IOException {
-        new Requester(root).method("DELETE").to(getApiTailUrl("star"));
+        root.createRequest().method("DELETE").withUrlPath(getApiTailUrl("star")).send();
     }
 
+    /**
+     * Is starred boolean.
+     *
+     * @return the boolean
+     * @throws IOException
+     *             the io exception
+     */
     public boolean isStarred() throws IOException {
-        return root.retrieve().asHttpStatusCode(getApiTailUrl("star"))/100==2;
+        return root.createRequest().withUrlPath(getApiTailUrl("star")).fetchHttpStatusCode() / 100 == 2;
     }
 
     /**
      * Forks this gist into your own.
+     *
+     * @return the gh gist
+     * @throws IOException
+     *             the io exception
      */
     public GHGist fork() throws IOException {
-        return new Requester(root).to(getApiTailUrl("forks"),GHGist.class).wrapUp(root);
+        return root.createRequest().method("POST").withUrlPath(getApiTailUrl("forks")).fetch(GHGist.class);
     }
 
+    /**
+     * List forks paged iterable.
+     *
+     * @return the paged iterable
+     */
     public PagedIterable<GHGist> listForks() {
-        return root.retrieve()
-            .asPagedIterable(
-                getApiTailUrl("forks"),
-                GHGist[].class,
-                item -> item.wrapUp(root) );
+        return root.createRequest().withUrlPath(getApiTailUrl("forks")).toIterable(GHGist[].class, null);
     }
 
     /**
      * Deletes this gist.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void delete() throws IOException {
-        new Requester(root).method("DELETE").to("/gists/" + id);
+        root.createRequest().method("DELETE").withUrlPath("/gists/" + id).send();
     }
 
     /**
      * Updates this gist via a builder.
+     *
+     * @return the gh gist updater
+     * @throws IOException
+     *             the io exception
      */
     public GHGistUpdater update() throws IOException {
         return new GHGistUpdater(this);
@@ -168,8 +267,10 @@ public class GHGist extends GHObject {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         GHGist ghGist = (GHGist) o;
         return id.equals(ghGist.id);
 
@@ -179,10 +280,4 @@ public class GHGist extends GHObject {
     public int hashCode() {
         return id.hashCode();
     }
-
-    GHGist wrap(GHUser owner) {
-        this.owner = owner;
-        this.root = owner.root;
-        return this;
-    }
 }

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

@@ -4,45 +4,75 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 
+import javax.annotation.Nonnull;
+
 /**
  * Builder pattern for creating a new Gist.
  *
  * @author Kohsuke Kawaguchi
- * @see GitHub#createGist()
+ * @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>();
+    private final LinkedHashMap<String, Object> files = new LinkedHashMap<String, Object>();
 
+    /**
+     * Instantiates a new Gh gist builder.
+     *
+     * @param root
+     *            the root
+     */
     public GHGistBuilder(GitHub root) {
-        this.root = root;
-        req = new Requester(root);
+        req = root.createRequest().method("POST");
     }
 
+    /**
+     * Description gh gist builder.
+     *
+     * @param desc
+     *            the desc
+     * @return the gh gist builder
+     */
     public GHGistBuilder description(String desc) {
-        req.with("description",desc);
-        return this;
-    }
-
-    public GHGistBuilder public_(boolean v) {
-        req.with("public",v);
+        req.with("description", desc);
         return this;
     }
 
     /**
-     * Adds a new file.
+     * Public gh gist builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh gist builder
      */
-    public GHGistBuilder file(String fileName, String content) {
+    public GHGistBuilder public_(boolean v) {
+        req.with("public", v);
+        return this;
+    }
+
+    /**
+     * File gh gist builder.
+     *
+     * @param fileName
+     *            the file name
+     * @param content
+     *            the content
+     * @return Adds a new file.
+     */
+    public GHGistBuilder file(@Nonnull String fileName, @Nonnull String content) {
         files.put(fileName, Collections.singletonMap("content", content));
         return this;
     }
 
     /**
      * Creates a Gist based on the parameters specified thus far.
+     *
+     * @return created Gist
+     * @throws IOException
+     *             if Gist cannot be created.
      */
     public GHGist create() throws IOException {
-        req._with("files",files);
-        return req.to("/gists",GHGist.class).wrapUp(root);
+        req.with("files", files);
+        return req.withUrlPath("/gists").fetch(GHGist.class);
     }
 }

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

@@ -4,23 +4,29 @@ package org.kohsuke.github;
  * A file inside {@link GHGist}
  *
  * @author Kohsuke Kawaguchi
- * @see GHGist#getFile(String)
- * @see GHGist#getFiles()
+ * @see GHGist#getFile(String) GHGist#getFile(String)
+ * @see GHGist#getFiles() GHGist#getFiles()
  */
 public class GHGistFile {
-    /*package almost final*/ String fileName;
+    /* package almost final */ String fileName;
 
     private int size;
     private String raw_url, type, language, content;
     private boolean truncated;
 
-
+    /**
+     * Gets file name.
+     *
+     * @return the file name
+     */
     public String getFileName() {
         return fileName;
     }
 
     /**
      * File size in bytes.
+     *
+     * @return the size
      */
     public int getSize() {
         return size;
@@ -28,6 +34,8 @@ public class GHGistFile {
 
     /**
      * URL that serves this file as-is.
+     *
+     * @return the raw url
      */
     public String getRawUrl() {
         return raw_url;
@@ -35,17 +43,26 @@ public class GHGistFile {
 
     /**
      * Content type of this Gist, such as "text/plain"
+     *
+     * @return the type
      */
     public String getType() {
         return type;
     }
 
+    /**
+     * Gets language.
+     *
+     * @return the language
+     */
     public String getLanguage() {
         return language;
     }
 
     /**
      * Content of this file.
+     *
+     * @return the content
      */
     public String getContent() {
         return content;
@@ -53,6 +70,8 @@ public class GHGistFile {
 
     /**
      * (?) indicates if {@link #getContent()} contains a truncated content.
+     *
+     * @return the boolean
      */
     public boolean isTruncated() {
         return truncated;

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

@@ -1,8 +1,11 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
 
 /**
  * Builder pattern for updating a Gist.
@@ -12,49 +15,113 @@ import java.util.LinkedHashMap;
 public class GHGistUpdater {
     private final GHGist base;
     private final Requester builder;
-    LinkedHashMap<String,Object> files;
+    LinkedHashMap<String, Map<String, String>> files;
 
     GHGistUpdater(GHGist base) {
         this.base = base;
-        this.builder = new Requester(base.root);
+        this.builder = base.root.createRequest();
 
         files = new LinkedHashMap<>();
     }
 
-    public GHGistUpdater addFile(String fileName, String content) throws IOException {
+    /**
+     * Add file gh gist updater.
+     *
+     * @param fileName
+     *            the file name
+     * @param content
+     *            the content
+     * @return the gh gist updater
+     * @throws IOException
+     *             the io exception
+     */
+    public GHGistUpdater addFile(@Nonnull String fileName, @Nonnull String content) throws IOException {
         updateFile(fileName, content);
         return this;
     }
 
-//    // This method does not work.
-//    public GHGistUpdater deleteFile(String fileName) throws IOException {
-//        files.put(fileName, Collections.singletonMap("filename", null));
-//        return this;
-//    }
-
-    public GHGistUpdater renameFile(String fileName, String newFileName) throws IOException
-    {
-        files.put(fileName, Collections.singletonMap("filename", newFileName));
+    public GHGistUpdater deleteFile(@Nonnull String fileName) throws IOException {
+        files.put(fileName, null);
         return this;
     }
 
-    public GHGistUpdater updateFile(String fileName, String content) throws IOException {
-        files.put(fileName, Collections.singletonMap("content", content));
+    /**
+     * Rename file gh gist updater.
+     *
+     * @param fileName
+     *            the file name
+     * @param newFileName
+     *            the new file name
+     * @return the gh gist updater
+     * @throws IOException
+     *             the io exception
+     */
+    public GHGistUpdater renameFile(@Nonnull String fileName, @Nonnull String newFileName) throws IOException {
+        Map<String, String> file = files.computeIfAbsent(fileName, d -> new HashMap<>());
+        file.put("filename", newFileName);
         return this;
     }
 
+    /**
+     * Update file gh gist updater.
+     *
+     * @param fileName
+     *            the file name
+     * @param content
+     *            the content
+     * @return the gh gist updater
+     * @throws IOException
+     *             the io exception
+     */
+    public GHGistUpdater updateFile(@Nonnull String fileName, @Nonnull String content) throws IOException {
+        Map<String, String> file = files.computeIfAbsent(fileName, d -> new HashMap<>());
+        file.put("content", content);
+        return this;
+    }
+
+    /**
+     * Update file name and content
+     *
+     * @param fileName
+     *            the file name
+     * @param newFileName
+     *            the new file name
+     * @param content
+     *            the content
+     * @return the gh gist updater
+     * @throws IOException
+     *             the io exception
+     */
+    public GHGistUpdater updateFile(@Nonnull String fileName, @Nonnull String newFileName, @Nonnull String content)
+            throws IOException {
+        Map<String, String> file = files.computeIfAbsent(fileName, d -> new HashMap<>());
+        file.put("content", content);
+        file.put("filename", newFileName);
+        files.put(fileName, file);
+        return this;
+    }
+
+    /**
+     * Description gh gist updater.
+     *
+     * @param desc
+     *            the desc
+     * @return the gh gist updater
+     */
     public GHGistUpdater description(String desc) {
-        builder.with("description",desc);
+        builder.with("description", desc);
         return this;
     }
 
     /**
      * Updates the Gist based on the parameters specified thus far.
+     *
+     * @return the gh gist
+     * @throws IOException
+     *             the io exception
      */
     public GHGist update() throws IOException {
-        builder._with("files", files);
-        return builder
-                .method("PATCH")
-                .to(base.getApiTailUrl(""), GHGist.class).wrap(base.owner);
+        builder.with("files", files);
+        return builder.method("PATCH").withUrlPath(base.getApiTailUrl("")).fetch(GHGist.class);
     }
 }

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

@@ -11,49 +11,80 @@ import java.util.Locale;
 import java.util.Map;
 
 /**
+ * The type GHHook.
+ *
  * @author Kohsuke Kawaguchi
  */
-@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", 
-    "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+@SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
+        justification = "JSON API")
 public abstract class GHHook extends GHObject {
     String name;
     List<String> events;
     boolean active;
-    Map<String,String> config;
+    Map<String, String> config;
 
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * Gets events.
+     *
+     * @return the events
+     */
     public EnumSet<GHEvent> getEvents() {
         EnumSet<GHEvent> s = EnumSet.noneOf(GHEvent.class);
         for (String e : events) {
-            if (e.equals("*"))  s.add(GHEvent.ALL);
-            else                s.add(Enum.valueOf(GHEvent.class, e.toUpperCase(Locale.ENGLISH)));
+            if (e.equals("*"))
+                s.add(GHEvent.ALL);
+            else
+                s.add(Enum.valueOf(GHEvent.class, e.toUpperCase(Locale.ENGLISH)));
         }
         return s;
     }
 
+    /**
+     * Is active boolean.
+     *
+     * @return the boolean
+     */
     public boolean isActive() {
         return active;
     }
 
+    /**
+     * Gets config.
+     *
+     * @return the config
+     */
     public Map<String, String> getConfig() {
         return Collections.unmodifiableMap(config);
     }
 
     /**
+     * Ping.
+     *
+     * @throws IOException
+     *             the io exception
      * @see <a href="https://developer.github.com/v3/repos/hooks/#ping-a-hook">Ping hook</a>
      */
     public void ping() throws IOException {
-        new Requester(getRoot()).method("POST").to(getApiRoute() + "/pings");
+        getRoot().createRequest().method("POST").withUrlPath(getApiRoute() + "/pings").send();
     }
 
     /**
      * Deletes this hook.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void delete() throws IOException {
-        new Requester(getRoot()).method("DELETE").to(getApiRoute());
+        getRoot().createRequest().method("DELETE").withUrlPath(getApiRoute()).send();
     }
 
     /**

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

@@ -12,41 +12,77 @@ import java.util.Map;
  * functionality
  */
 class GHHooks {
-    static abstract class Context {
-        private final GitHub root;
+    static abstract class Context extends GitHubInteractiveObject {
 
         private Context(GitHub root) {
-          this.root = root;
+            this.root = root;
         }
 
+        /**
+         * Gets hooks.
+         *
+         * @return the hooks
+         * @throws IOException
+         *             the io exception
+         */
         public List<GHHook> getHooks() throws IOException {
-        	
-            GHHook [] hookArray = root.retrieve().to(collection(),collectionClass());  // jdk/eclipse bug requires this to be on separate line
+
+            GHHook[] hookArray = root.createRequest().withUrlPath(collection()).fetch(collectionClass()); // jdk/eclipse
+                                                                                                          // bug
+            // requires this
+            // to be on separate line
             List<GHHook> list = new ArrayList<GHHook>(Arrays.asList(hookArray));
             for (GHHook h : list)
-              wrap(h);
+                wrap(h);
             return list;
         }
 
+        /**
+         * Gets hook.
+         *
+         * @param id
+         *            the id
+         * @return the hook
+         * @throws IOException
+         *             the io exception
+         */
         public GHHook getHook(int id) throws IOException {
-            GHHook hook = root.retrieve().to(collection() + "/" + id, clazz());
+            GHHook hook = root.createRequest().withUrlPath(collection() + "/" + id).fetch(clazz());
             return wrap(hook);
         }
 
-        public GHHook createHook(String name, Map<String, String> config, Collection<GHEvent> events, boolean active) throws IOException {
+        /**
+         * Create hook gh hook.
+         *
+         * @param name
+         *            the name
+         * @param config
+         *            the config
+         * @param events
+         *            the events
+         * @param active
+         *            the active
+         * @return the gh hook
+         * @throws IOException
+         *             the io exception
+         */
+        public GHHook createHook(String name, Map<String, String> config, Collection<GHEvent> events, boolean active)
+                throws IOException {
             List<String> ea = null;
-            if (events!=null) {
-              ea = new ArrayList<String>();
-              for (GHEvent e : events)
-                ea.add(e.symbol());
+            if (events != null) {
+                ea = new ArrayList<String>();
+                for (GHEvent e : events)
+                    ea.add(e.symbol());
             }
 
-            GHHook hook = new Requester(root)
-                .with("name", name)
-                .with("active", active)
-                ._with("config", config)
-                ._with("events", ea)
-                .to(collection(), clazz());
+            GHHook hook = root.createRequest()
+                    .method("POST")
+                    .with("name", name)
+                    .with("active", active)
+                    .with("config", config)
+                    .with("events", ea)
+                    .withUrlPath(collection())
+                    .fetch(clazz());
 
             return wrap(hook);
         }
@@ -87,7 +123,7 @@ class GHHooks {
 
         @Override
         GHHook wrap(GHHook hook) {
-            return ((GHRepoHook)hook).wrap(repository);
+            return ((GHRepoHook) hook).wrap(repository);
         }
     }
 
@@ -116,15 +152,15 @@ class GHHooks {
 
         @Override
         GHHook wrap(GHHook hook) {
-            return ((GHOrgHook)hook).wrap(organization);
+            return ((GHOrgHook) hook).wrap(organization);
         }
     }
 
-      static Context repoContext(GHRepository repository, GHUser owner) {
-          return new RepoContext(repository, owner);
-      }
+    static Context repoContext(GHRepository repository, GHUser owner) {
+        return new RepoContext(repository, owner);
+    }
 
-      static Context orgContext(GHOrganization organization) {
-          return new OrgContext(organization);
-      }
+    static Context orgContext(GHOrganization organization) {
+        return new OrgContext(organization);
+    }
 }

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

@@ -1,34 +1,62 @@
 package org.kohsuke.github;
 
-import javax.annotation.CheckForNull;
 import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
 /**
- * Request/responce contains useful metadata.
- * Custom exception allows store info for next diagnostics.
+ * Request/responce contains useful metadata. Custom exception allows store info for next diagnostics.
  *
  * @author Kanstantsin Shautsou
  */
 public class GHIOException extends IOException {
     protected Map<String, List<String>> responseHeaderFields;
 
+    /**
+     * Instantiates a new Ghio exception.
+     */
     public GHIOException() {
     }
 
+    /**
+     * Instantiates a new Ghio exception.
+     *
+     * @param message
+     *            the message
+     */
     public GHIOException(String message) {
         super(message);
     }
 
+    /**
+     * Constructs a {@code GHIOException} with the specified detail message and cause.
+     *
+     * @param message
+     *            The detail message (which is saved for later retrieval by the {@link #getMessage()} method)
+     *
+     * @param cause
+     *            The cause (which is saved for later retrieval by the {@link #getCause()} method). (A null value is
+     *            permitted, and indicates that the cause is nonexistent or unknown.)
+     */
+    public GHIOException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * Gets response header fields.
+     *
+     * @return the response header fields
+     */
     @CheckForNull
     public Map<String, List<String>> getResponseHeaderFields() {
         return responseHeaderFields;
     }
 
-    GHIOException withResponseHeaderFields(HttpURLConnection urlConnection) {
-        this.responseHeaderFields = urlConnection.getHeaderFields();
+    GHIOException withResponseHeaderFields(@Nonnull Map<String, List<String>> headerFields) {
+        this.responseHeaderFields = headerFields;
         return this;
     }
 }

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

@@ -6,13 +6,16 @@ import java.io.IOException;
 import java.net.URL;
 
 /**
- * @see GitHub#getMyInvitations()
- * @see GHRepository#listInvitations()
+ * The type GHInvitation.
+ *
+ * @see GitHub#getMyInvitations() GitHub#getMyInvitations()
+ * @see GHRepository#listInvitations() GHRepository#listInvitations()
  */
-@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD",
-    "NP_UNWRITTEN_FIELD", "UUF_UNUSED_FIELD"}, justification = "JSON API")
+@SuppressFBWarnings(
+        value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD",
+                "UUF_UNUSED_FIELD" },
+        justification = "JSON API")
 public class GHInvitation extends GHObject {
-    /*package almost final*/ GitHub root;
 
     private int id;
     private GHRepository repository;
@@ -20,27 +23,33 @@ public class GHInvitation extends GHObject {
     private String permissions;
     private String html_url;
 
-    /*package*/ GHInvitation wrapUp(GitHub root) {
+    GHInvitation wrapUp(GitHub root) {
         this.root = root;
         return this;
     }
 
     /**
      * Accept a repository invitation.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void accept() throws IOException {
-        root.retrieve().method("PATCH").to("/user/repository_invitations/" + id);
+        root.createRequest().method("PATCH").withUrlPath("/user/repository_invitations/" + id).send();
     }
 
     /**
      * Decline a repository invitation.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void decline() throws IOException {
-        root.retrieve().method("DELETE").to("/user/repository_invitations/" + id);
+        root.createRequest().method("DELETE").withUrlPath("/user/repository_invitations/" + id).send();
     }
 
     @Override
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 }

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

@@ -24,10 +24,10 @@
 
 package org.kohsuke.github;
 
-import static org.kohsuke.github.Previews.SQUIRREL_GIRL;
-
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -35,28 +35,28 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
+import java.util.Objects;
+
+import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL;
 
 /**
  * Represents an issue on GitHub.
  *
  * @author Eric Maupin
  * @author Kohsuke Kawaguchi
- * @see GHRepository#getIssue(int)
- * @see GitHub#searchIssues()
+ * @see GHRepository#getIssue(int) GHRepository#getIssue(int)
+ * @see GitHub#searchIssues() GitHub#searchIssues()
  * @see GHIssueSearchBuilder
  */
-public class GHIssue extends GHObject implements Reactable{
+public class GHIssue extends GHObject implements Reactable {
     private static final String ASSIGNEES = "assignees";
 
-    GitHub root;
     GHRepository owner;
-    
+
     // API v3
-    protected GHUser assignee;  // not sure what this field is now that 'assignees' exist
+    protected GHUser assignee; // not sure what this field is now that 'assignees' exist
     protected GHUser[] assignees;
     protected String state;
     protected int number;
@@ -64,8 +64,7 @@ public class GHIssue extends GHObject implements Reactable{
     protected int comments;
     @SkipFromToString
     protected String body;
-    // for backward compatibility with < 1.63, this collection needs to hold instances of Label, not GHLabel
-    protected List<Label> labels;
+    protected List<GHLabel> labels;
     protected GHUser user;
     protected String title, html_url;
     protected GHIssue.PullRequest pull_request;
@@ -73,35 +72,30 @@ public class GHIssue extends GHObject implements Reactable{
     protected GHUser closed_by;
     protected boolean locked;
 
-    /**
-     * @deprecated use {@link GHLabel}
-     */
-    public static class Label extends GHLabel {
-    }
-    
-    /*package*/ GHIssue wrap(GHRepository owner) {
+    GHIssue wrap(GHRepository owner) {
         this.owner = owner;
-        if(milestone != null) milestone.wrap(owner);
+        if (milestone != null)
+            milestone.wrap(owner);
         return wrap(owner.root);
     }
 
-    /*package*/ GHIssue wrap(GitHub root) {
+    GHIssue wrap(GitHub root) {
         this.root = root;
-        if(assignee != null) assignee.wrapUp(root);
-        if(assignees!=null)    GHUser.wrap(assignees,root);
-        if(user != null) user.wrapUp(root);
-        if(closed_by != null) closed_by.wrapUp(root);
+        if (assignee != null)
+            assignee.wrapUp(root);
+        if (assignees != null)
+            GHUser.wrap(assignees, root);
+        if (user != null)
+            user.wrapUp(root);
+        if (closed_by != null)
+            closed_by.wrapUp(root);
         return this;
     }
 
-    /*package*/ static GHIssue[] wrap(GHIssue[] issues, GHRepository owner) {
-        for (GHIssue i : issues)
-            i.wrap(owner);
-        return issues;
-    }
-
     /**
      * Repository to which the issue belongs.
+     *
+     * @return the repository
      */
     public GHRepository getRepository() {
         return owner;
@@ -109,6 +103,8 @@ public class GHIssue extends GHObject implements Reactable{
 
     /**
      * The description of this pull request.
+     *
+     * @return the body
      */
     public String getBody() {
         return body;
@@ -116,76 +112,138 @@ public class GHIssue extends GHObject implements Reactable{
 
     /**
      * ID.
+     *
+     * @return the number
      */
     public int getNumber() {
         return number;
     }
 
     /**
-     * The HTML page of this issue,
-     * like https://github.com/jenkinsci/jenkins/issues/100
+     * The HTML page of this issue, like https://github.com/jenkinsci/jenkins/issues/100
      */
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
+    /**
+     * Gets title.
+     *
+     * @return the title
+     */
     public String getTitle() {
         return title;
     }
 
+    /**
+     * Is locked boolean.
+     *
+     * @return the boolean
+     */
     public boolean isLocked() {
         return locked;
     }
 
+    /**
+     * Gets state.
+     *
+     * @return the state
+     */
     public GHIssueState getState() {
         return Enum.valueOf(GHIssueState.class, state.toUpperCase(Locale.ENGLISH));
     }
 
-    public Collection<GHLabel> getLabels() throws IOException {
-        if(labels == null){
+    /**
+     * Gets labels.
+     *
+     * @return the labels
+     */
+    public Collection<GHLabel> getLabels() {
+        if (labels == null) {
             return Collections.emptyList();
         }
-        return Collections.<GHLabel>unmodifiableList(labels);
+        return Collections.unmodifiableList(labels);
     }
 
+    /**
+     * Gets closed at.
+     *
+     * @return the closed at
+     */
     public Date getClosedAt() {
-        return GitHub.parseDate(closed_at);
+        return GitHubClient.parseDate(closed_at);
     }
 
-    public URL getApiURL(){
-        return GitHub.parseURL(url);
+    /**
+     * Gets api url.
+     *
+     * @return API URL of this object.
+     * @deprecated use {@link #getUrl()}
+     */
+    @Deprecated
+    public URL getApiURL() {
+        return getUrl();
     }
 
+    /**
+     * Lock.
+     *
+     * @throws IOException
+     *             the io exception
+     */
     public void lock() throws IOException {
-        new Requester(root).method("PUT").to(getApiRoute()+"/lock");
+        root.createRequest().method("PUT").withUrlPath(getApiRoute() + "/lock").send();
     }
 
+    /**
+     * Unlock.
+     *
+     * @throws IOException
+     *             the io exception
+     */
     public void unlock() throws IOException {
-        new Requester(root).method("PUT").to(getApiRoute()+"/lock");
+        root.createRequest().method("PUT").withUrlPath(getApiRoute() + "/lock").send();
     }
 
     /**
      * Updates the issue by adding a comment.
      *
-     * @return
-     *      Newly posted comment.
+     * @param message
+     *            the message
+     * @return Newly posted comment.
+     * @throws IOException
+     *             the io exception
      */
     @WithBridgeMethods(void.class)
     public GHIssueComment comment(String message) throws IOException {
-        GHIssueComment r = new Requester(root).with("body",message).to(getIssuesApiRoute() + "/comments", GHIssueComment.class);
+        GHIssueComment r = root.createRequest()
+                .method("POST")
+                .with("body", message)
+                .withUrlPath(getIssuesApiRoute() + "/comments")
+                .fetch(GHIssueComment.class);
         return r.wrapUp(this);
     }
 
     private void edit(String key, Object value) throws IOException {
-        new Requester(root)._with(key, value).method("PATCH").to(getApiRoute());
+        root.createRequest().with(key, value).method("PATCH").withUrlPath(getApiRoute()).send();
+    }
+
+    /**
+     * Identical to edit(), but allows null for the value.
+     */
+    private void editNullable(String key, Object value) throws IOException {
+        root.createRequest().withNullable(key, value).method("PATCH").withUrlPath(getApiRoute()).send();
     }
 
     private void editIssue(String key, Object value) throws IOException {
-        new Requester(root)._with(key, value).method("PATCH").to(getIssuesApiRoute());
+        root.createRequest().withNullable(key, value).method("PATCH").withUrlPath(getIssuesApiRoute()).send();
     }
 
     /**
      * Closes this issue.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void close() throws IOException {
         edit("state", "closed");
@@ -193,171 +251,394 @@ public class GHIssue extends GHObject implements Reactable{
 
     /**
      * Reopens this issue.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void reopen() throws IOException {
         edit("state", "open");
     }
 
+    /**
+     * Sets title.
+     *
+     * @param title
+     *            the title
+     * @throws IOException
+     *             the io exception
+     */
     public void setTitle(String title) throws IOException {
-        edit("title",title);
+        edit("title", title);
     }
 
+    /**
+     * Sets body.
+     *
+     * @param body
+     *            the body
+     * @throws IOException
+     *             the io exception
+     */
     public void setBody(String body) throws IOException {
-        edit("body",body);
+        edit("body", body);
     }
 
+    /**
+     * Sets the milestone for this issue.
+     *
+     * @param milestone
+     *            The milestone to assign this issue to. Use null to remove the milestone for this issue.
+     * @throws IOException
+     *             The io exception
+     */
     public void setMilestone(GHMilestone milestone) throws IOException {
-        edit("milestone",milestone.getNumber());
+        if (milestone == null) {
+            editIssue("milestone", null);
+        } else {
+            editIssue("milestone", milestone.getNumber());
+        }
     }
 
+    /**
+     * Assign to.
+     *
+     * @param user
+     *            the user
+     * @throws IOException
+     *             the io exception
+     */
     public void assignTo(GHUser user) throws IOException {
         setAssignees(user);
     }
 
+    /**
+     * Sets labels on the target to a specific list.
+     *
+     * @param labels
+     *            the labels
+     * @throws IOException
+     *             the io exception
+     */
     public void setLabels(String... labels) throws IOException {
-        editIssue("labels",labels);
+        editIssue("labels", labels);
     }
 
     /**
      * Adds labels to the issue.
      *
-     * @param names Names of the label
+     * Labels that are already present on the target are ignored.
+     *
+     * @return the complete list of labels including the new additions
+     * @param names
+     *            Names of the label
+     * @throws IOException
+     *             the io exception
      */
-    public void addLabels(String... names) throws IOException {
-        _addLabels(Arrays.asList(names));
+    @WithBridgeMethods(void.class)
+    public List<GHLabel> addLabels(String... names) throws IOException {
+        return _addLabels(Arrays.asList(names));
     }
 
-    public void addLabels(GHLabel... labels) throws IOException {
-        addLabels(Arrays.asList(labels));
+    /**
+     * Add labels.
+     *
+     * Labels that are already present on the target are ignored.
+     *
+     * @return the complete list of labels including the new additions
+     * @param labels
+     *            the labels
+     * @throws IOException
+     *             the io exception
+     */
+    @WithBridgeMethods(void.class)
+    public List<GHLabel> addLabels(GHLabel... labels) throws IOException {
+        return addLabels(Arrays.asList(labels));
     }
 
-    public void addLabels(Collection<GHLabel> labels) throws IOException {
-        _addLabels(GHLabel.toNames(labels));
+    /**
+     * Add labels.
+     *
+     * Labels that are already present on the target are ignored.
+     *
+     * @return the complete list of labels including the new additions
+     * @param labels
+     *            the labels
+     * @throws IOException
+     *             the io exception
+     */
+    @WithBridgeMethods(void.class)
+    public List<GHLabel> addLabels(Collection<GHLabel> labels) throws IOException {
+        return _addLabels(GHLabel.toNames(labels));
     }
 
-    private void _addLabels(Collection<String> names) throws IOException {
-        List<String> newLabels = new ArrayList<String>();
+    private List<GHLabel> _addLabels(Collection<String> names) throws IOException {
+        return Arrays.asList(root.createRequest()
+                .with("labels", names)
+                .method("POST")
+                .withUrlPath(getIssuesApiRoute() + "/labels")
+                .fetch(GHLabel[].class));
+    }
 
-        for (GHLabel label : getLabels()) {
-            newLabels.add(label.getName());
-        }
+    /**
+     * Remove a single label.
+     *
+     * Attempting to remove a label that is not present throws {@link GHFileNotFoundException}.
+     *
+     * @return the remaining list of labels
+     * @param name
+     *            the name
+     * @throws IOException
+     *             the io exception, throws {@link GHFileNotFoundException} if label was not present.
+     */
+    @WithBridgeMethods(void.class)
+    public List<GHLabel> removeLabel(String name) throws IOException {
+        return Arrays.asList(root.createRequest()
+                .method("DELETE")
+                .withUrlPath(getIssuesApiRoute() + "/labels", name)
+                .fetch(GHLabel[].class));
+    }
+
+    /**
+     * Remove a collection of labels.
+     *
+     * Attempting to remove labels that are not present on the target are ignored.
+     *
+     * @return the remaining list of labels
+     * @param names
+     *            the names
+     * @throws IOException
+     *             the io exception
+     */
+    @WithBridgeMethods(void.class)
+    public List<GHLabel> removeLabels(String... names) throws IOException {
+        return _removeLabels(Arrays.asList(names));
+    }
+
+    /**
+     * Remove a collection of labels.
+     *
+     * Attempting to remove labels that are not present on the target are ignored.
+     *
+     * @return the remaining list of labels
+     * @param labels
+     *            the labels
+     * @throws IOException
+     *             the io exception
+     * @see #removeLabels(String...) #removeLabels(String...)
+     */
+    @WithBridgeMethods(void.class)
+    public List<GHLabel> removeLabels(GHLabel... labels) throws IOException {
+        return removeLabels(Arrays.asList(labels));
+    }
+
+    /**
+     * Remove a collection of labels.
+     *
+     * Attempting to remove labels that are not present on the target are ignored.
+     *
+     * @return the remaining list of labels
+     * @param labels
+     *            the labels
+     * @throws IOException
+     *             the io exception
+     */
+    @WithBridgeMethods(void.class)
+    public List<GHLabel> removeLabels(Collection<GHLabel> labels) throws IOException {
+        return _removeLabels(GHLabel.toNames(labels));
+    }
+
+    private List<GHLabel> _removeLabels(Collection<String> names) throws IOException {
+        List<GHLabel> remainingLabels = Collections.emptyList();
         for (String name : names) {
-            if (!newLabels.contains(name)) {
-                newLabels.add(name);
+            try {
+                remainingLabels = removeLabel(name);
+            } catch (GHFileNotFoundException e) {
+                // when trying to remove multiple labels, we ignore already removed
             }
         }
-        setLabels(newLabels.toArray(new String[0]));
-    }
-
-    /**
-     * Remove a given label by name from this issue.
-     */
-    public void removeLabels(String... names) throws IOException {
-        _removeLabels(Arrays.asList(names));
-    }
-
-    /**
-     * @see #removeLabels(String...)
-     */
-    public void removeLabels(GHLabel... labels) throws IOException {
-        removeLabels(Arrays.asList(labels));
-    }
-
-    public void removeLabels(Collection<GHLabel> labels) throws IOException {
-        _removeLabels(GHLabel.toNames(labels));
-    }
-
-    private void _removeLabels(Collection<String> names) throws IOException {
-        List<String> newLabels = new ArrayList<String>();
-
-        for (GHLabel l : getLabels()) {
-            if (!names.contains(l.getName())) {
-                newLabels.add(l.getName());
-            }
-        }
-
-        setLabels(newLabels.toArray(new String[0]));
+        return remainingLabels;
     }
 
     /**
      * Obtains all the comments associated with this issue.
-     * 
-     * @see #listComments() 
+     *
+     * @return the comments
+     * @throws IOException
+     *             the io exception
+     * @see #listComments() #listComments()
      */
     public List<GHIssueComment> getComments() throws IOException {
-        return listComments().asList();
+        return listComments().toList();
     }
-    
+
     /**
      * Obtains all the comments associated with this issue.
+     *
+     * @return the paged iterable
+     * @throws IOException
+     *             the io exception
      */
     public PagedIterable<GHIssueComment> listComments() throws IOException {
-        return root.retrieve()
-            .asPagedIterable(
-                getIssuesApiRoute() + "/comments",
-                GHIssueComment[].class,
-                item -> item.wrapUp(GHIssue.this) );
+        return root.createRequest()
+                .withUrlPath(getIssuesApiRoute() + "/comments")
+                .toIterable(GHIssueComment[].class, item -> item.wrapUp(this));
     }
 
-    @Preview @Deprecated
+    @Preview(SQUIRREL_GIRL)
+    @Deprecated
     public GHReaction createReaction(ReactionContent content) throws IOException {
-        return new Requester(owner.root)
+        return root.createRequest()
+                .method("POST")
                 .withPreview(SQUIRREL_GIRL)
                 .with("content", content.getContent())
-                .to(getApiRoute()+"/reactions", GHReaction.class).wrap(root);
+                .withUrlPath(getApiRoute() + "/reactions")
+                .fetch(GHReaction.class)
+                .wrap(root);
     }
 
-    @Preview @Deprecated
+    @Preview(SQUIRREL_GIRL)
+    @Deprecated
     public PagedIterable<GHReaction> listReactions() {
-        return owner.root.retrieve().withPreview(SQUIRREL_GIRL)
-            .asPagedIterable(
-                getApiRoute()+"/reactions",
-                GHReaction[].class,
-                item -> item.wrap(owner.root) );
+        return root.createRequest()
+                .withPreview(SQUIRREL_GIRL)
+                .withUrlPath(getApiRoute() + "/reactions")
+                .toIterable(GHReaction[].class, item -> item.wrap(root));
     }
 
+    /**
+     * Add assignees.
+     *
+     * @param assignees
+     *            the assignees
+     * @throws IOException
+     *             the io exception
+     */
     public void addAssignees(GHUser... assignees) throws IOException {
         addAssignees(Arrays.asList(assignees));
     }
 
+    /**
+     * Add assignees.
+     *
+     * @param assignees
+     *            the assignees
+     * @throws IOException
+     *             the io exception
+     */
     public void addAssignees(Collection<GHUser> assignees) throws IOException {
-        root.retrieve().method("POST").withLogins(ASSIGNEES,assignees).to(getIssuesApiRoute()+"/assignees",this);
+        root.createRequest()
+                .method("POST")
+                .with(ASSIGNEES, getLogins(assignees))
+                .withUrlPath(getIssuesApiRoute() + "/assignees")
+                .fetchInto(this);
     }
 
+    /**
+     * Sets assignees.
+     *
+     * @param assignees
+     *            the assignees
+     * @throws IOException
+     *             the io exception
+     */
     public void setAssignees(GHUser... assignees) throws IOException {
         setAssignees(Arrays.asList(assignees));
     }
 
+    /**
+     * Sets assignees.
+     *
+     * @param assignees
+     *            the assignees
+     * @throws IOException
+     *             the io exception
+     */
     public void setAssignees(Collection<GHUser> assignees) throws IOException {
-        new Requester(root).withLogins(ASSIGNEES, assignees).method("PATCH").to(getIssuesApiRoute());
+        root.createRequest()
+                .method("PATCH")
+                .with(ASSIGNEES, getLogins(assignees))
+                .withUrlPath(getIssuesApiRoute())
+                .send();
     }
 
+    /**
+     * Remove assignees.
+     *
+     * @param assignees
+     *            the assignees
+     * @throws IOException
+     *             the io exception
+     */
     public void removeAssignees(GHUser... assignees) throws IOException {
         removeAssignees(Arrays.asList(assignees));
     }
 
+    /**
+     * Remove assignees.
+     *
+     * @param assignees
+     *            the assignees
+     * @throws IOException
+     *             the io exception
+     */
     public void removeAssignees(Collection<GHUser> assignees) throws IOException {
-        root.retrieve().method("DELETE").withLogins(ASSIGNEES,assignees).inBody().to(getIssuesApiRoute()+"/assignees",this);
+        root.createRequest()
+                .method("DELETE")
+                .with(ASSIGNEES, getLogins(assignees))
+                .inBody()
+                .withUrlPath(getIssuesApiRoute() + "/assignees")
+                .fetchInto(this);
     }
 
+    /**
+     * Gets api route.
+     *
+     * @return the api route
+     */
     protected String getApiRoute() {
         return getIssuesApiRoute();
     }
 
+    /**
+     * Gets issues api route.
+     *
+     * @return the issues api route
+     */
     protected String getIssuesApiRoute() {
-        return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/issues/"+number;
+        if (owner == null) {
+            // Issues returned from search to do not have an owner. Attempt to use url.
+            final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
+            return StringUtils.prependIfMissing(url.toString().replace(root.getApiUrl(), ""), "/");
+        }
+        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/issues/" + number;
     }
 
+    /**
+     * Gets assignee.
+     *
+     * @return the assignee
+     * @throws IOException
+     *             the io exception
+     */
     public GHUser getAssignee() throws IOException {
         return root.intern(assignee);
     }
 
+    /**
+     * Gets assignees.
+     *
+     * @return the assignees
+     */
     public List<GHUser> getAssignees() {
         return Collections.unmodifiableList(Arrays.asList(assignees));
     }
 
     /**
      * User who submitted the issue.
+     *
+     * @return the user
+     * @throws IOException
+     *             the io exception
      */
     public GHUser getUser() throws IOException {
         return root.intern(user);
@@ -367,67 +648,114 @@ public class GHIssue extends GHObject implements Reactable{
      * Reports who has closed the issue.
      *
      * <p>
-     * Note that GitHub doesn't always seem to report this information
-     * even for an issue that's already closed. See
+     * Note that GitHub doesn't always seem to report this information even for an issue that's already closed. See
      * https://github.com/kohsuke/github-api/issues/60.
+     *
+     * @return the closed by
+     * @throws IOException
+     *             the io exception
      */
     public GHUser getClosedBy() throws IOException {
-        if(!"closed".equals(state)) return null;
+        if (!"closed".equals(state))
+            return null;
 
-        //TODO
+        // TODO
         /*
-        if (closed_by==null) {
-            closed_by = owner.getIssue(number).getClosed_by();
-        }
-        */
+         * if (closed_by==null) { closed_by = owner.getIssue(number).getClosed_by(); }
+         */
         return root.intern(closed_by);
     }
-    
-    public int getCommentsCount(){
+
+    /**
+     * Gets comments count.
+     *
+     * @return the comments count
+     */
+    public int getCommentsCount() {
         return comments;
     }
 
     /**
      * Returns non-null if this issue is a shadow of a pull request.
+     *
+     * @return the pull request
      */
     public PullRequest getPullRequest() {
         return pull_request;
     }
 
+    /**
+     * Is pull request boolean.
+     *
+     * @return the boolean
+     */
     public boolean isPullRequest() {
-        return pull_request!=null;
+        return pull_request != null;
     }
 
+    /**
+     * Gets milestone.
+     *
+     * @return the milestone
+     */
     public GHMilestone getMilestone() {
         return milestone;
     }
 
-    @SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD"}, 
-        justification = "JSON API")
-    public static class PullRequest{
+    /**
+     * The type PullRequest.
+     */
+    @SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD" },
+            justification = "JSON API")
+    public static class PullRequest {
         private String diff_url, patch_url, html_url;
-        
+
+        /**
+         * Gets diff url.
+         *
+         * @return the diff url
+         */
         public URL getDiffUrl() {
-            return GitHub.parseURL(diff_url);
+            return GitHubClient.parseURL(diff_url);
         }
-        
+
+        /**
+         * Gets patch url.
+         *
+         * @return the patch url
+         */
         public URL getPatchUrl() {
-            return GitHub.parseURL(patch_url);
+            return GitHubClient.parseURL(patch_url);
         }
-        
+
+        /**
+         * Gets url.
+         *
+         * @return the url
+         */
         public URL getUrl() {
-            return GitHub.parseURL(html_url);
+            return GitHubClient.parseURL(html_url);
         }
     }
 
+    protected static List<String> getLogins(Collection<GHUser> users) {
+        List<String> names = new ArrayList<String>(users.size());
+        for (GHUser a : users) {
+            names.add(a.getLogin());
+        }
+        return names;
+    }
+
     /**
-     * Lists events for this issue.
-     * See https://developer.github.com/v3/issues/events/
+     * Lists events for this issue. See https://developer.github.com/v3/issues/events/
+     *
+     * @return the paged iterable
+     * @throws IOException
+     *             the io exception
      */
     public PagedIterable<GHIssueEvent> listEvents() throws IOException {
-        return root.retrieve().asPagedIterable(
-            owner.getApiTailUrl(String.format("/issues/%s/events", number)),
-            GHIssueEvent[].class,
-            item -> item.wrapUp(GHIssue.this) );
+        return root.createRequest()
+                .withUrlPath(owner.getApiTailUrl(String.format("/issues/%s/events", number)))
+                .toIterable(GHIssueEvent[].class, item -> item.wrapUp(this));
     }
 }

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

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
+ * The type GHIssueBuilder.
+ *
  * @author Kohsuke Kawaguchi
  */
 public class GHIssueBuilder {
@@ -15,46 +17,86 @@ public class GHIssueBuilder {
 
     GHIssueBuilder(GHRepository repo, String title) {
         this.repo = repo;
-        this.builder = new Requester(repo.root);
-        builder.with("title",title);
+        this.builder = repo.root.createRequest().method("POST");
+        builder.with("title", title);
     }
 
     /**
      * Sets the main text of an issue, which is arbitrary multi-line text.
+     *
+     * @param str
+     *            the str
+     * @return the gh issue builder
      */
     public GHIssueBuilder body(String str) {
-        builder.with("body",str);
+        builder.with("body", str);
         return this;
     }
 
+    /**
+     * Assignee gh issue builder.
+     *
+     * @param user
+     *            the user
+     * @return the gh issue builder
+     */
     public GHIssueBuilder assignee(GHUser user) {
-        if (user!=null)
+        if (user != null)
             assignees.add(user.getLogin());
         return this;
     }
 
+    /**
+     * Assignee gh issue builder.
+     *
+     * @param user
+     *            the user
+     * @return the gh issue builder
+     */
     public GHIssueBuilder assignee(String user) {
-        if (user!=null)
+        if (user != null)
             assignees.add(user);
         return this;
     }
 
+    /**
+     * Milestone gh issue builder.
+     *
+     * @param milestone
+     *            the milestone
+     * @return the gh issue builder
+     */
     public GHIssueBuilder milestone(GHMilestone milestone) {
-        if (milestone!=null)
-            builder.with("milestone",milestone.getNumber());
+        if (milestone != null)
+            builder.with("milestone", milestone.getNumber());
         return this;
     }
 
+    /**
+     * Label gh issue builder.
+     *
+     * @param label
+     *            the label
+     * @return the gh issue builder
+     */
     public GHIssueBuilder label(String label) {
-        if (label!=null)
+        if (label != null)
             labels.add(label);
         return this;
     }
 
     /**
      * Creates a new issue.
+     *
+     * @return the gh issue
+     * @throws IOException
+     *             the io exception
      */
     public GHIssue create() throws IOException {
-        return builder.with("labels",labels).with("assignees",assignees).to(repo.getApiTailUrl("issues"),GHIssue.class).wrap(repo);
+        return builder.with("labels", labels)
+                .with("assignees", assignees)
+                .withUrlPath(repo.getApiTailUrl("issues"))
+                .fetch(GHIssue.class)
+                .wrap(repo);
     }
 }

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

@@ -0,0 +1,49 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Wrapper to define changed fields on issues action="edited"
+ *
+ * @see GHEventPayload.Issue
+ */
+@SuppressFBWarnings("UWF_UNWRITTEN_FIELD")
+public class GHIssueChanges {
+
+    private GHFrom title;
+    private GHFrom body;
+
+    /**
+     * Old issue title.
+     *
+     * @return old issue title (or null if not changed)
+     */
+    public GHFrom getTitle() {
+        return title;
+    }
+
+    /**
+     * Old issue body.
+     *
+     * @return old issue body (or null if not changed)
+     */
+    public GHFrom getBody() {
+        return body;
+    }
+
+    /**
+     * 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/GHIssueComment.java

@@ -26,14 +26,14 @@ 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
  *
  * @author Kohsuke Kawaguchi
- * @see GHIssue#comment(String)
- * @see GHIssue#listComments()
+ * @see GHIssue#comment(String) GHIssue#comment(String)
+ * @see GHIssue#listComments() GHIssue#listComments()
  */
 public class GHIssueComment extends GHObject implements Reactable {
     GHIssue owner;
@@ -41,13 +41,15 @@ public class GHIssueComment extends GHObject implements Reactable {
     private String body, gravatar_id, html_url, author_association;
     private GHUser user; // not fully populated. beware.
 
-    /*package*/ GHIssueComment wrapUp(GHIssue owner) {
+    GHIssueComment wrapUp(GHIssue owner) {
         this.owner = owner;
         return this;
     }
 
     /**
      * Gets the issue to which this comment is associated.
+     *
+     * @return the parent
      */
     public GHIssue getParent() {
         return owner;
@@ -55,6 +57,8 @@ public class GHIssueComment extends GHObject implements Reactable {
 
     /**
      * The comment itself.
+     *
+     * @return the body
      */
     public String getBody() {
         return body;
@@ -62,6 +66,8 @@ public class GHIssueComment extends GHObject implements Reactable {
 
     /**
      * Gets the ID of the user who posted this comment.
+     *
+     * @return the user name
      */
     @Deprecated
     public String getUserName() {
@@ -70,54 +76,79 @@ public class GHIssueComment extends GHObject implements Reactable {
 
     /**
      * Gets the user who posted this comment.
+     *
+     * @return the user
+     * @throws IOException
+     *             the io exception
      */
     public GHUser getUser() throws IOException {
         return owner == null || owner.root.isOffline() ? user : owner.root.getUser(user.getLogin());
     }
-    
+
     @Override
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
+    /**
+     * Gets author association.
+     *
+     * @return the author association
+     */
     public GHCommentAuthorAssociation getAuthorAssociation() {
         return GHCommentAuthorAssociation.valueOf(author_association);
     }
-    
+
     /**
      * Updates the body of the issue comment.
+     *
+     * @param body
+     *            the body
+     * @throws IOException
+     *             the io exception
      */
     public void update(String body) throws IOException {
-        new Requester(owner.root).with("body", body).method("PATCH").to(getApiRoute(), GHIssueComment.class);
+        owner.root.createRequest()
+                .method("PATCH")
+                .with("body", body)
+                .withUrlPath(getApiRoute())
+                .fetch(GHIssueComment.class);
         this.body = body;
     }
 
     /**
      * Deletes this issue comment.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void delete() throws IOException {
-        new Requester(owner.root).method("DELETE").to(getApiRoute());
+        owner.root.createRequest().method("DELETE").withUrlPath(getApiRoute()).send();
     }
 
-    @Preview @Deprecated
+    @Preview(SQUIRREL_GIRL)
+    @Deprecated
     public GHReaction createReaction(ReactionContent content) throws IOException {
-        return new Requester(owner.root)
+        return owner.root.createRequest()
+                .method("POST")
                 .withPreview(SQUIRREL_GIRL)
                 .with("content", content.getContent())
-                .to(getApiRoute()+"/reactions", GHReaction.class).wrap(owner.root);
+                .withUrlPath(getApiRoute() + "/reactions")
+                .fetch(GHReaction.class)
+                .wrap(owner.root);
     }
 
-    @Preview @Deprecated
+    @Preview(SQUIRREL_GIRL)
+    @Deprecated
     public PagedIterable<GHReaction> listReactions() {
-        return owner.root.retrieve()
-            .withPreview(SQUIRREL_GIRL)
-            .asPagedIterable(
-                getApiRoute()+"/reactions",
-                GHReaction[].class,
-                item -> item.wrap(owner.root) );
+        return owner.root.createRequest()
+                .withPreview(SQUIRREL_GIRL)
+                .withUrlPath(getApiRoute() + "/reactions")
+                .toIterable(GHReaction[].class, item -> item.wrap(owner.root));
     }
 
     private String getApiRoute() {
-        return "/repos/"+owner.getRepository().getOwnerName()+"/"+owner.getRepository().getName()+"/issues/comments/" + id;
+        return "/repos/" + owner.getRepository().getOwnerName() + "/" + owner.getRepository().getName()
+                + "/issues/comments/" + getId();
     }
 }

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

@@ -3,11 +3,13 @@ package org.kohsuke.github;
 import java.util.Date;
 
 /**
+ * The type GHIssueEvent.
+ *
+ * @see <a href="https://developer.github.com/v3/issues/events/">Github documentation for issue events</a>
+ *
  * @author Martin van Zijl
  */
-public class GHIssueEvent {
-    private GitHub root;
-
+public class GHIssueEvent extends GitHubInteractiveObject {
     private long id;
     private String node_id;
     private String url;
@@ -16,49 +18,132 @@ public class GHIssueEvent {
     private String commit_id;
     private String commit_url;
     private String created_at;
+    private GHMilestone milestone;
+    private GHLabel label;
+    private GHUser assignee;
 
     private GHIssue issue;
 
+    /**
+     * Gets id.
+     *
+     * @return the id
+     */
     public long getId() {
         return id;
     }
 
+    /**
+     * Gets node id.
+     *
+     * @return the node id
+     */
     public String getNodeId() {
         return node_id;
     }
 
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
     public String getUrl() {
         return url;
     }
 
+    /**
+     * Gets actor.
+     *
+     * @return the actor
+     */
     public GHUser getActor() {
         return actor;
     }
 
+    /**
+     * Gets event.
+     *
+     * @return the event
+     */
     public String getEvent() {
         return event;
     }
 
+    /**
+     * Gets commit id.
+     *
+     * @return the commit id
+     */
     public String getCommitId() {
         return commit_id;
     }
 
+    /**
+     * Gets commit url.
+     *
+     * @return the commit url
+     */
     public String getCommitUrl() {
         return commit_url;
     }
 
+    /**
+     * Gets created at.
+     *
+     * @return the created at
+     */
     public Date getCreatedAt() {
-        return GitHub.parseDate(created_at);
+        return GitHubClient.parseDate(created_at);
     }
 
+    /**
+     * Gets root.
+     *
+     * @return the root
+     */
     public GitHub getRoot() {
         return root;
     }
 
+    /**
+     * Gets issue.
+     *
+     * @return the issue
+     */
     public GHIssue getIssue() {
         return issue;
     }
 
+    /**
+     * Get the {@link GHMilestone} that this issue was added to or removed from. Only present for events "milestoned"
+     * and "demilestoned", <code>null</code> otherwise.
+     *
+     * @return the milestone
+     */
+    public GHMilestone getMilestone() {
+        return milestone;
+    }
+
+    /**
+     * Get the {@link GHLabel} that was added to or removed from the issue. Only present for events "labeled" and
+     * "unlabeled", <code>null</code> otherwise.
+     *
+     * @return the label
+     */
+    public GHLabel getLabel() {
+        return label;
+    }
+
+    /**
+     * Get the {@link GHUser} that was assigned or unassigned from the issue. Only present for events "assigned" and
+     * "unassigned", <code>null</code> otherwise.
+     *
+     * @return the user
+     */
+    public GHUser getAssignee() {
+        return assignee;
+    }
+
     GHIssueEvent wrapUp(GitHub root) {
         this.root = root;
         return this;

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

@@ -4,11 +4,11 @@ package org.kohsuke.github;
  * Search issues.
  *
  * @author Kohsuke Kawaguchi
- * @see GitHub#searchIssues()
+ * @see GitHub#searchIssues() GitHub#searchIssues()
  */
 public class GHIssueSearchBuilder extends GHSearchBuilder<GHIssue> {
-    /*package*/ GHIssueSearchBuilder(GitHub root) {
-        super(root,IssueSearchResult.class);
+    GHIssueSearchBuilder(GitHub root) {
+        super(root, IssueSearchResult.class);
     }
 
     /**
@@ -19,43 +19,91 @@ public class GHIssueSearchBuilder extends GHSearchBuilder<GHIssue> {
         return this;
     }
 
+    /**
+     * Mentions gh issue search builder.
+     *
+     * @param u
+     *            the u
+     * @return the gh issue search builder
+     */
     public GHIssueSearchBuilder mentions(GHUser u) {
         return mentions(u.getLogin());
     }
 
+    /**
+     * Mentions gh issue search builder.
+     *
+     * @param login
+     *            the login
+     * @return the gh issue search builder
+     */
     public GHIssueSearchBuilder mentions(String login) {
-        return q("mentions:"+login);
+        return q("mentions:" + login);
     }
 
+    /**
+     * Is open gh issue search builder.
+     *
+     * @return the gh issue search builder
+     */
     public GHIssueSearchBuilder isOpen() {
         return q("is:open");
     }
 
+    /**
+     * Is closed gh issue search builder.
+     *
+     * @return the gh issue search builder
+     */
     public GHIssueSearchBuilder isClosed() {
         return q("is:closed");
     }
 
+    /**
+     * Is merged gh issue search builder.
+     *
+     * @return the gh issue search builder
+     */
     public GHIssueSearchBuilder isMerged() {
         return q("is:merged");
     }
 
+    /**
+     * Order gh issue search builder.
+     *
+     * @param v
+     *            the v
+     * @return the gh issue search builder
+     */
     public GHIssueSearchBuilder order(GHDirection v) {
-        req.with("order",v);
+        req.with("order", v);
         return this;
     }
 
+    /**
+     * Sort gh issue search builder.
+     *
+     * @param sort
+     *            the sort
+     * @return the gh issue search builder
+     */
     public GHIssueSearchBuilder sort(Sort sort) {
-        req.with("sort",sort);
+        req.with("sort", sort);
         return this;
     }
 
-    public enum Sort { COMMENTS, CREATED, UPDATED }
+    /**
+     * The enum Sort.
+     */
+    public enum Sort {
+        COMMENTS, CREATED, UPDATED
+    }
 
     private static class IssueSearchResult extends SearchResult<GHIssue> {
         private GHIssue[] items;
 
         @Override
-        /*package*/ GHIssue[] getItems(GitHub root) {
+        GHIssue[] getItems(GitHub root) {
             for (GHIssue i : items)
                 i.wrap(root);
             return items;

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

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

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

@@ -9,46 +9,71 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
  * @author Kohsuke Kawaguchi
  */
 @SuppressFBWarnings(value = "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", justification = "JSON API")
-public class GHKey {
-    /*package almost final*/ GitHub root;
-
+public class GHKey extends GitHubInteractiveObject {
     protected String url, key, title;
     protected boolean verified;
     protected int id;
 
+    /**
+     * Gets id.
+     *
+     * @return the id
+     */
     public int getId() {
         return id;
     }
 
+    /**
+     * Gets key.
+     *
+     * @return the key
+     */
     public String getKey() {
         return key;
     }
 
+    /**
+     * Gets title.
+     *
+     * @return the title
+     */
     public String getTitle() {
         return title;
     }
 
     /**
      * Something like "https://api.github.com/user/keys/73593"
+     *
+     * @return the url
      */
     public String getUrl() {
         return url;
     }
 
+    /**
+     * Gets root.
+     *
+     * @return the root
+     */
     public GitHub getRoot() {
         return root;
     }
-    
+
+    /**
+     * Is verified boolean.
+     *
+     * @return the boolean
+     */
     public boolean isVerified() {
         return verified;
     }
 
-    /*package*/ GHKey wrap(GitHub root) {
+    GHKey wrap(GitHub root) {
         this.root = root;
         return this;
     }
 
     public String toString() {
-        return new ToStringBuilder(this).append("title",title).append("id",id).append("key",key).toString();
+        return new ToStringBuilder(this).append("title", title).append("id", id).append("key", key).toString();
     }
 }

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

@@ -1,101 +1,297 @@
 package org.kohsuke.github;
 
+import com.fasterxml.jackson.annotation.JacksonInject;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
-import static org.kohsuke.github.Previews.SYMMETRA;
-/**
- * @author Kohsuke Kawaguchi
- * @see GHIssue#getLabels()
- * @see GHRepository#listLabels()
- */
-public class GHLabel {
-    private String url, name, color, description;
-    private GHRepository repo;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
 
+/**
+ * The type GHLabel.
+ *
+ * @author Kohsuke Kawaguchi
+ * @see <a href="https://developer.github.com/v3/issues/labels/">Labels</a>
+ * @see GHIssue#getLabels() GHIssue#getLabels()
+ * @see GHRepository#listLabels() GHRepository#listLabels()
+ */
+public class GHLabel extends GitHubInteractiveObject {
+
+    private long id;
+    private String nodeId;
+    @JsonProperty("default")
+    private boolean default_;
+
+    @Nonnull
+    private String url, name, color;
+
+    @CheckForNull
+    private String description;
+
+    @JsonCreator
+    private GHLabel(@JacksonInject @Nonnull GitHub root) {
+        this.root = root;
+        url = "";
+        name = "";
+        color = "";
+        description = null;
+    }
+
+    @Nonnull
+    GitHub getApiRoot() {
+        return Objects.requireNonNull(root);
+    }
+
+    /**
+     * Gets id.
+     *
+     * @return the id
+     */
+    public long getId() {
+        return id;
+    }
+
+    /**
+     * Gets node id.
+     *
+     * @return the node id.
+     */
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
+    @Nonnull
     public String getUrl() {
         return url;
     }
 
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
+    @Nonnull
     public String getName() {
         return name;
     }
 
     /**
      * Color code without leading '#', such as 'f29513'
+     *
+     * @return the color
      */
+    @Nonnull
     public String getColor() {
         return color;
     }
 
     /**
      * Purpose of Label
+     *
+     * @return the description
      */
-    @Preview @Deprecated
+    @CheckForNull
     public String getDescription() {
         return description;
     }
 
-    /*package*/ GHLabel wrapUp(GHRepository repo) {
-        this.repo = repo;
-        return this;
-    }
-
-    public void delete() throws IOException {
-        repo.root.retrieve().method("DELETE").to(url);
+    /**
+     * If the label is one of the default labels created by GitHub automatically.
+     *
+     * @return true if the label is a default one
+     */
+    public boolean isDefault() {
+        return default_;
     }
 
     /**
+     * Sets color.
+     *
      * @param newColor
-     *      6-letter hex color code, like "f29513"
+     *            6-letter hex color code, like "f29513"
+     * @throws IOException
+     *             the io exception
+     * @deprecated use {@link #set()} or {@link #update()} instead
      */
+    @Deprecated
     public void setColor(String newColor) throws IOException {
-        repo.root.retrieve().method("PATCH")
-                .withPreview(SYMMETRA)
-                .with("name", name)
-                .with("color", newColor)
-                .with("description", description)
-                .to(url);
+        set().color(newColor);
     }
 
     /**
+     * Sets description.
+     *
      * @param newDescription
-     *      Description of label
+     *            Description of label
+     * @throws IOException
+     *             the io exception
+     * @deprecated use {@link #set()} or {@link #update()} instead
      */
-    @Preview @Deprecated
+    @Deprecated
     public void setDescription(String newDescription) throws IOException {
-        repo.root.retrieve().method("PATCH")
-                .withPreview(SYMMETRA)
-                .with("name", name)
-                .with("color", color)
-                .with("description", newDescription)
-                .to(url);
+        set().description(newDescription);
     }
 
-    /*package*/ static Collection<String> toNames(Collection<GHLabel> labels) {
-        List<String> r = new ArrayList<String>();
+    static Collection<String> toNames(Collection<GHLabel> labels) {
+        List<String> r = new ArrayList<>();
         for (GHLabel l : labels) {
             r.add(l.getName());
         }
         return r;
     }
 
+    /**
+     * Begins the creation of a new instance.
+     *
+     * Consumer must call {@link Creator#done()} to commit changes.
+     *
+     * @param repository
+     *            the repository in which the label will be created.
+     * @return a {@link Creator}
+     * @throws IOException
+     *             the io exception
+     */
+    @BetaApi
+    @Deprecated
+    static Creator create(GHRepository repository) throws IOException {
+        return new Creator(repository);
+    }
+
+    /**
+     * Reads a label from a repository.
+     *
+     * @param repository
+     *            the repository to read from
+     * @param name
+     *            the name of the label
+     * @return a label
+     * @throws IOException
+     *             the io exception
+     */
+    static GHLabel read(@Nonnull GHRepository repository, @Nonnull String name) throws IOException {
+        return repository.root.createRequest()
+                .withUrlPath(repository.getApiTailUrl("labels"), name)
+                .fetch(GHLabel.class);
+
+    }
+
+    /**
+     * Reads all labels from a repository.
+     *
+     * @param repository
+     *            the repository to read from
+     * @return iterable of all labels
+     * @throws IOException
+     *             the io exception
+     */
+    static PagedIterable<GHLabel> readAll(@Nonnull final GHRepository repository) throws IOException {
+        return repository.root.createRequest()
+                .withUrlPath(repository.getApiTailUrl("labels"))
+                .toIterable(GHLabel[].class, null);
+
+    }
+
+    /**
+     * Begins a batch update
+     *
+     * Consumer must call {@link Updater#done()} to commit changes.
+     *
+     * @return a {@link Updater}
+     */
+    @BetaApi
+    @Deprecated
+    public Updater update() {
+        return new Updater(this);
+    }
+
+    /**
+     * Begins a single property update.
+     *
+     * @return a {@link Setter}
+     */
+    @BetaApi
+    @Deprecated
+    public Setter set() {
+        return new Setter(this);
+    }
+
+    /**
+     * Delete this label from the repository.
+     *
+     * @throws IOException
+     *             the io exception
+     */
+    public void delete() throws IOException {
+        root.createRequest().method("DELETE").setRawUrlPath(getUrl()).send();
+    }
+
     @Override
     public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         final GHLabel ghLabel = (GHLabel) o;
-        return Objects.equals(url, ghLabel.url) &&
-                Objects.equals(name, ghLabel.name) &&
-                Objects.equals(color, ghLabel.color) &&
-                Objects.equals(repo, ghLabel.repo);
+        return Objects.equals(url, ghLabel.url) && Objects.equals(name, ghLabel.name)
+                && Objects.equals(color, ghLabel.color) && Objects.equals(description, ghLabel.description);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(url, name, color, repo);
+        return Objects.hash(url, name, color, description);
     }
+
+    /**
+     * A {@link GHLabelBuilder} that updates a single property per request
+     *
+     * {@link #done()} is called automatically after the property is set.
+     */
+    @BetaApi
+    @Deprecated
+    public static class Setter extends GHLabelBuilder<GHLabel> {
+        private Setter(@Nonnull GHLabel base) {
+            super(GHLabel.class, base.getApiRoot(), base);
+            requester.method("PATCH").setRawUrlPath(base.getUrl());
+        }
+    }
+
+    /**
+     * A {@link GHLabelBuilder} that allows multiple properties to be updated per request.
+     *
+     * Consumer must call {@link #done()} to commit changes.
+     */
+    @BetaApi
+    @Deprecated
+    public static class Updater extends GHLabelBuilder<Updater> {
+        private Updater(@Nonnull GHLabel base) {
+            super(Updater.class, base.getApiRoot(), base);
+            requester.method("PATCH").setRawUrlPath(base.getUrl());
+        }
+    }
+
+    /**
+     * A {@link GHLabelBuilder} that creates a new {@link GHLabel}
+     *
+     * Consumer must call {@link #done()} to create the new instance.
+     */
+    @BetaApi
+    @Deprecated
+    public static class Creator extends GHLabelBuilder<Creator> {
+        private Creator(@Nonnull GHRepository repository) {
+            super(Creator.class, repository.root, null);
+            requester.method("POST").withUrlPath(repository.getApiTailUrl("labels"));
+        }
+    }
+
 }

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

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

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

@@ -0,0 +1,49 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Wrapper to define changed fields on label action="edited"
+ *
+ * @see GHEventPayload.Label
+ */
+@SuppressFBWarnings("UWF_UNWRITTEN_FIELD")
+public class GHLabelChanges {
+
+    private GHFrom name;
+    private GHFrom color;
+
+    /**
+     * Old label name.
+     *
+     * @return old label name (or null if not changed)
+     */
+    public GHFrom getName() {
+        return name;
+    }
+
+    /**
+     * Old label color.
+     *
+     * @return old label color (or null if not changed)
+     */
+    public GHFrom getColor() {
+        return color;
+    }
+
+    /**
+     * 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/GHLicense.java

@@ -24,29 +24,26 @@
 
 package org.kohsuke.github;
 
-import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * The GitHub Preview API's license information
- * <p>
  *
  * @author Duncan Dickinson
- * @see GitHub#getLicense(String)
- * @see GHRepository#getLicense()
+ * @see GitHub#getLicense(String) GitHub#getLicense(String)
+ * @see GHRepository#getLicense() GHRepository#getLicense()
  * @see <a href="https://developer.github.com/v3/licenses/">https://developer.github.com/v3/licenses/</a>
  */
-@SuppressWarnings({"UnusedDeclaration"})
-@SuppressFBWarnings(value = {"UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD",
-        "NP_UNWRITTEN_FIELD"}, justification = "JSON API")
+@SuppressWarnings({ "UnusedDeclaration" })
+@SuppressFBWarnings(value = { "UWF_UNWRITTEN_PUBLIC_OR_PROTECTED_FIELD", "UWF_UNWRITTEN_FIELD", "NP_UNWRITTEN_FIELD" },
+        justification = "JSON API")
 public class GHLicense extends GHObject {
-    @SuppressFBWarnings("IS2_INCONSISTENT_SYNC") // root is set before the object is returned to the app
-    /*package almost final*/ GitHub root;
 
     // these fields are always present, even in the short form
     protected String key, name;
@@ -61,6 +58,8 @@ public class GHLicense extends GHObject {
     protected List<String> forbidden = new ArrayList<String>();
 
     /**
+     * Gets key.
+     *
      * @return a mnemonic for the license
      */
     public String getKey() {
@@ -68,24 +67,20 @@ public class GHLicense extends GHObject {
     }
 
     /**
+     * Gets name.
+     *
      * @return the license name
      */
     public String getName() {
         return name;
     }
 
-    /**
-     * @return API URL of this object.
-     */
-    @WithBridgeMethods(value = String.class, adapterMethod = "urlToString")
-    public URL getUrl() {
-        return GitHub.parseURL(url);
-    }
-
     /**
      * Featured licenses are bold in the new repository drop-down
      *
      * @return True if the license is featured, false otherwise
+     * @throws IOException
+     *             the io exception
      */
     public Boolean isFeatured() throws IOException {
         populate();
@@ -94,39 +89,88 @@ public class GHLicense extends GHObject {
 
     public URL getHtmlUrl() throws IOException {
         populate();
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
 
+    /**
+     * Gets description.
+     *
+     * @return the description
+     * @throws IOException
+     *             the io exception
+     */
     public String getDescription() throws IOException {
         populate();
         return description;
     }
 
+    /**
+     * Gets category.
+     *
+     * @return the category
+     * @throws IOException
+     *             the io exception
+     */
     public String getCategory() throws IOException {
         populate();
         return category;
     }
 
+    /**
+     * Gets implementation.
+     *
+     * @return the implementation
+     * @throws IOException
+     *             the io exception
+     */
     public String getImplementation() throws IOException {
         populate();
         return implementation;
     }
 
+    /**
+     * Gets required.
+     *
+     * @return the required
+     * @throws IOException
+     *             the io exception
+     */
     public List<String> getRequired() throws IOException {
         populate();
         return required;
     }
 
+    /**
+     * Gets permitted.
+     *
+     * @return the permitted
+     * @throws IOException
+     *             the io exception
+     */
     public List<String> getPermitted() throws IOException {
         populate();
         return permitted;
     }
 
+    /**
+     * Gets forbidden.
+     *
+     * @return the forbidden
+     * @throws IOException
+     *             the io exception
+     */
     public List<String> getForbidden() throws IOException {
         populate();
         return forbidden;
     }
 
+    /**
+     * Gets body.
+     *
+     * @return the body
+     * @throws IOException
+     *             the io exception
+     */
     public String getBody() throws IOException {
         populate();
         return body;
@@ -134,30 +178,43 @@ public class GHLicense extends GHObject {
 
     /**
      * Fully populate the data by retrieving missing data.
-     *
+     * <p>
      * Depending on the original API call where this object is created, it may not contain everything.
+     *
+     * @throws IOException
+     *             the io exception
      */
     protected synchronized void populate() throws IOException {
-        if (description!=null)    return; // already populated
+        if (description != null)
+            return; // already populated
 
-        root.retrieve().to(url, this);
+        if (root == null || root.isOffline()) {
+            return; // cannot populate, will have to live with what we have
+        }
+
+        URL url = getUrl();
+        if (url != null) {
+            root.createRequest().setRawUrlPath(url.toString()).fetchInto(this);
+        }
     }
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof GHLicense)) return false;
+        if (this == o)
+            return true;
+        if (!(o instanceof GHLicense))
+            return false;
 
         GHLicense that = (GHLicense) o;
-        return this.url.equals(that.url);
+        return Objects.equals(getUrl(), that.getUrl());
     }
 
     @Override
     public int hashCode() {
-        return url.hashCode();
+        return Objects.hashCode(getUrl());
     }
 
-    /*package*/ GHLicense wrap(GitHub root) {
+    GHLicense wrap(GitHub root) {
         this.root = root;
         return this;
     }

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

@@ -0,0 +1,86 @@
+package org.kohsuke.github;
+
+import java.net.URL;
+
+/**
+ * Base class for Github Marketplace Account.
+ *
+ * @author Paulo Miguel Almeida
+ * @see GitHub#getMyMarketplacePurchases()
+ * @see GHMarketplaceListAccountBuilder#createRequest()
+ */
+public class GHMarketplaceAccount extends GitHubInteractiveObject {
+    private String url;
+    private long id;
+    private String login;
+    private String email;
+    private String organizationBillingEmail;
+    private GHMarketplaceAccountType type;
+
+    /**
+     * Wrap up gh marketplace account.
+     *
+     * @param root
+     *            the root
+     * @return an instance of the GHMarketplaceAccount class
+     */
+    GHMarketplaceAccount wrapUp(GitHub root) {
+        this.root = root;
+        return this;
+    }
+
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
+    public URL getUrl() {
+        return GitHubClient.parseURL(url);
+    }
+
+    /**
+     * Gets id.
+     *
+     * @return the id
+     */
+    public long getId() {
+        return id;
+    }
+
+    /**
+     * Gets login.
+     *
+     * @return the login
+     */
+    public String getLogin() {
+        return login;
+    }
+
+    /**
+     * Gets email.
+     *
+     * @return the email
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    /**
+     * Gets organization billing email.
+     *
+     * @return the organization billing email
+     */
+    public String getOrganizationBillingEmail() {
+        return organizationBillingEmail;
+    }
+
+    /**
+     * Gets type.
+     *
+     * @return the type
+     */
+    public GHMarketplaceAccountType getType() {
+        return type;
+    }
+
+}

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

@@ -0,0 +1,53 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * A Github Marketplace Account Plan.
+ *
+ * @author Paulo Miguel Almeida
+ * @see GHMarketplaceListAccountBuilder#createRequest()
+ */
+public class GHMarketplaceAccountPlan extends GHMarketplaceAccount {
+
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    private GHMarketplacePendingChange marketplacePendingChange;
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    private GHMarketplacePurchase marketplacePurchase;
+
+    /**
+     * Wrap up gh marketplace account.
+     *
+     * @param root
+     *            the root
+     * @return an instance of the GHMarketplaceAccount class
+     */
+    GHMarketplaceAccountPlan wrapUp(GitHub root) {
+        super.wrapUp(root);
+        if (this.marketplacePendingChange != null)
+            this.marketplacePendingChange.wrapUp(this.root);
+
+        if (this.marketplacePurchase != null)
+            this.marketplacePurchase.wrapUp(this.root);
+
+        return this;
+    }
+
+    /**
+     * Gets marketplace pending change.
+     *
+     * @return the marketplace pending change
+     */
+    public GHMarketplacePendingChange getMarketplacePendingChange() {
+        return marketplacePendingChange;
+    }
+
+    /**
+     * Gets marketplace purchase.
+     *
+     * @return the marketplace purchase
+     */
+    public GHMarketplacePurchase getMarketplacePurchase() {
+        return marketplacePurchase;
+    }
+}

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

@@ -0,0 +1,22 @@
+package org.kohsuke.github;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Locale;
+
+/**
+ * GitHub Marketplace Account type.
+ *
+ * @author Paulo Miguel Almeida
+ * @see GHMarketplaceAccount
+ */
+public enum GHMarketplaceAccountType {
+    ORGANIZATION, USER;
+
+    /**
+     * Returns GitHub's internal representation of this event.
+     */
+    String symbol() {
+        return StringUtils.capitalize(name().toLowerCase(Locale.ENGLISH));
+    }
+}

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

@@ -0,0 +1,70 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+
+/**
+ * Returns any accounts associated with a plan, including free plans
+ *
+ * @author Paulo Miguel Almeida
+ * @see GHMarketplacePlan#listAccounts()
+ */
+public class GHMarketplaceListAccountBuilder extends GitHubInteractiveObject {
+    private final Requester builder;
+    private final long planId;
+
+    GHMarketplaceListAccountBuilder(GitHub root, long planId) {
+        this.root = root;
+        this.builder = root.createRequest();
+        this.planId = planId;
+    }
+
+    /**
+     * Sorts the GitHub accounts by the date they were created or last updated. Can be one of created or updated.
+     * <p>
+     * If omitted, the default sorting strategy will be "CREATED"
+     *
+     * @param sort
+     *            the sort strategy
+     * @return a GHMarketplaceListAccountBuilder
+     */
+    public GHMarketplaceListAccountBuilder sort(Sort sort) {
+        this.builder.with("sort", sort);
+        return this;
+    }
+
+    /**
+     * Orders the GitHub accounts results, Can be one of asc or desc. Ignored without the sort parameter.
+     *
+     * @param direction
+     *            the order strategy
+     * @return a GHMarketplaceListAccountBuilder
+     */
+    public GHMarketplaceListAccountBuilder direction(GHDirection direction) {
+        this.builder.with("direction", direction);
+        return this;
+    }
+
+    /**
+     * The enum Sort.
+     */
+    public enum Sort {
+        CREATED, UPDATED
+    }
+
+    /**
+     * List any accounts associated with the plan specified on construction with all the order/sort parameters set.
+     * <p>
+     * GitHub Apps must use a JWT to access this endpoint.
+     * <p>
+     * OAuth Apps must use basic authentication with their client ID and client secret to access this endpoint.
+     *
+     * @return a paged iterable instance of GHMarketplaceAccountPlan
+     * @throws IOException
+     *             on error
+     */
+    public PagedIterable<GHMarketplaceAccountPlan> createRequest() throws IOException {
+        return builder.withUrlPath(String.format("/marketplace_listing/plans/%d/accounts", this.planId))
+                .toIterable(GHMarketplaceAccountPlan[].class, item -> item.wrapUp(root));
+    }
+
+}

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

@@ -0,0 +1,73 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.util.Date;
+
+/**
+ * A Github Marketplace purchase pending change.
+ *
+ * @author Paulo Miguel Almeida
+ * @see GHMarketplaceListAccountBuilder#createRequest()
+ */
+public class GHMarketplacePendingChange extends GitHubInteractiveObject {
+    private long id;
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    private Long unitCount;
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    private GHMarketplacePlan plan;
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    private String effectiveDate;
+
+    /**
+     * Wrap up gh marketplace pending change.
+     *
+     * @param root
+     *            the root
+     * @return an instance of the GHMarketplacePendingChange class
+     */
+    GHMarketplacePendingChange wrapUp(GitHub root) {
+        this.root = root;
+        if (plan != null) { // sanity check
+            this.plan.wrapUp(this.root);
+        }
+        return this;
+    }
+
+    /**
+     * Gets id.
+     *
+     * @return the id
+     */
+    public long getId() {
+        return id;
+    }
+
+    /**
+     * Gets unit count.
+     *
+     * @return the unit count
+     */
+    public Long getUnitCount() {
+        return unitCount;
+    }
+
+    /**
+     * Gets plan.
+     *
+     * @return the plan
+     */
+    public GHMarketplacePlan getPlan() {
+        return plan;
+    }
+
+    /**
+     * Gets effective date.
+     *
+     * @return the effective date
+     */
+    public Date getEffectiveDate() {
+        return GitHubClient.parseDate(effectiveDate);
+    }
+
+}

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

@@ -0,0 +1,182 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.net.URL;
+import java.util.List;
+
+/**
+ * A Github Marketplace plan.
+ *
+ * @author Paulo Miguel Almeida
+ * @see GitHub#listMarketplacePlans()
+ */
+public class GHMarketplacePlan extends GitHubInteractiveObject {
+    private String url;
+    private String accountsUrl;
+    private long id;
+    private long number;
+    private String name;
+    private String description;
+    private long monthlyPriceInCents;
+    private long yearlyPriceInCents;
+    private GHMarketplacePriceModel priceModel;
+    @JsonProperty("has_free_trial")
+    private boolean freeTrial; // JavaBeans Spec 1.01 section 8.3.2 forces us to have is<propertyName>
+    private String unitName;
+    private String state;
+    private List<String> bullets;
+
+    /**
+     * Wrap up gh marketplace plan.
+     *
+     * @param root
+     *            the root
+     * @return an instance of the GHMarketplacePlan class
+     */
+    GHMarketplacePlan wrapUp(GitHub root) {
+        this.root = root;
+        return this;
+    }
+
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
+    public URL getUrl() {
+        return GitHubClient.parseURL(url);
+    }
+
+    /**
+     * Gets accounts url.
+     *
+     * @return the accounts url
+     */
+    public String getAccountsUrl() {
+        return accountsUrl;
+    }
+
+    /**
+     * Gets id.
+     *
+     * @return the id
+     */
+    public long getId() {
+        return id;
+    }
+
+    /**
+     * Gets number.
+     *
+     * @return the number
+     */
+    public long getNumber() {
+        return number;
+    }
+
+    /**
+     * Gets name.
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets description.
+     *
+     * @return the description
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Gets monthly price in cents.
+     *
+     * @return the monthly price in cents
+     */
+    public long getMonthlyPriceInCents() {
+        return monthlyPriceInCents;
+    }
+
+    /**
+     * Gets yearly price in cents.
+     *
+     * @return the yearly price in cents
+     */
+    public long getYearlyPriceInCents() {
+        return yearlyPriceInCents;
+    }
+
+    /**
+     * Gets price model.
+     *
+     * @return the price model
+     */
+    public GHMarketplacePriceModel getPriceModel() {
+        return priceModel;
+    }
+
+    /**
+     * Is free trial boolean.
+     *
+     * @return the boolean
+     */
+    public boolean isFreeTrial() {
+        return freeTrial;
+    }
+
+    /**
+     * Gets unit name.
+     *
+     * @return the unit name
+     */
+    public String getUnitName() {
+        return unitName;
+    }
+
+    /**
+     * Gets state.
+     *
+     * @return the state
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * Gets bullets.
+     *
+     * @return the bullets
+     */
+    public List<String> getBullets() {
+        return bullets;
+    }
+
+    /**
+     * Starts a builder that list any accounts associated with a plan, including free plans. For per-seat pricing, you
+     * see the list of accounts that have purchased the plan, including the number of seats purchased. When someone
+     * submits a plan change that won't be processed until the end of their billing cycle, you will also see the
+     * upcoming pending change.
+     *
+     * <p>
+     * You use the returned builder to set various properties, then call
+     * {@link GHMarketplaceListAccountBuilder#createRequest()} to finally list the accounts related to this plan.
+     *
+     * <p>
+     * GitHub Apps must use a JWT to access this endpoint.
+     * <p>
+     * OAuth Apps must use basic authentication with their client ID and client secret to access this endpoint.
+     *
+     * @return a GHMarketplaceListAccountBuilder instance
+     * @see <a href=
+     *      "https://developer.github.com/v3/apps/marketplace/#list-all-github-accounts-user-or-organization-on-a-specific-plan">List
+     *      all GitHub accounts (user or organization) on a specific plan</a>
+     */
+    public GHMarketplaceListAccountBuilder listAccounts() {
+        return new GHMarketplaceListAccountBuilder(root, this.id);
+    }
+}

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

@@ -0,0 +1,29 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * GitHub Marketplace plan pricing model.
+ *
+ * @author Paulo Miguel Almeida
+ * @see GHMarketplacePlan
+ */
+public enum GHMarketplacePriceModel {
+    FREE("free"), PER_UNIT("per-unit"), FLAT_RATE("flat-rate");
+
+    @JsonValue
+    private final String internalName;
+
+    GHMarketplacePriceModel(String internalName) {
+        this.internalName = internalName;
+    }
+
+    /**
+     * Returns GitHub's internal representation of this event.
+     *
+     * @return a string containing GitHub's internal representation of this event.
+     */
+    public String symbol() {
+        return internalName;
+    }
+}

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

@@ -0,0 +1,101 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.util.Date;
+
+/**
+ * A Github Marketplace purchase.
+ *
+ * @author Paulo Miguel Almeida
+ * @see GHMarketplaceListAccountBuilder#createRequest() GHMarketplaceListAccountBuilder#createRequest()
+ */
+public class GHMarketplacePurchase extends GitHubInteractiveObject {
+
+    private String billingCycle;
+    private String nextBillingDate;
+    private boolean onFreeTrial;
+    private String freeTrialEndsOn;
+    private Long unitCount;
+    private String updatedAt;
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    private GHMarketplacePlan plan;
+
+    /**
+     * Wrap up gh marketplace purchase.
+     *
+     * @param root
+     *            the root
+     * @return an instance of the GHMarketplacePurchase class
+     */
+    GHMarketplacePurchase wrapUp(GitHub root) {
+        this.root = root;
+        if (plan != null) { // sanity check
+            this.plan.wrapUp(this.root);
+        }
+        return this;
+    }
+
+    /**
+     * Gets billing cycle.
+     *
+     * @return the billing cycle
+     */
+    public String getBillingCycle() {
+        return billingCycle;
+    }
+
+    /**
+     * Gets next billing date.
+     *
+     * @return the next billing date
+     */
+    public Date getNextBillingDate() {
+        return GitHubClient.parseDate(nextBillingDate);
+    }
+
+    /**
+     * Is on free trial boolean.
+     *
+     * @return the boolean
+     */
+    public boolean isOnFreeTrial() {
+        return onFreeTrial;
+    }
+
+    /**
+     * Gets free trial ends on.
+     *
+     * @return the free trial ends on
+     */
+    public Date getFreeTrialEndsOn() {
+        return GitHubClient.parseDate(freeTrialEndsOn);
+    }
+
+    /**
+     * Gets unit count.
+     *
+     * @return the unit count
+     */
+    public Long getUnitCount() {
+        return unitCount;
+    }
+
+    /**
+     * Gets updated at.
+     *
+     * @return the updated at
+     */
+    public Date getUpdatedAt() {
+        return GitHubClient.parseDate(updatedAt);
+    }
+
+    /**
+     * Gets plan.
+     *
+     * @return the plan
+     */
+    public GHMarketplacePlan getPlan() {
+        return plan;
+    }
+}

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

@@ -0,0 +1,112 @@
+package org.kohsuke.github;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+import java.util.Date;
+
+/**
+ * Github Marketplace User Purchase
+ *
+ * @author Paulo Miguel Almeida
+ * @see GitHub#getMyMarketplacePurchases()
+ */
+public class GHMarketplaceUserPurchase extends GitHubInteractiveObject {
+    private String billingCycle;
+    private String nextBillingDate;
+    private boolean onFreeTrial;
+    private String freeTrialEndsOn;
+    private Long unitCount;
+    private String updatedAt;
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    private GHMarketplaceAccount account;
+    @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", justification = "Field comes from JSON deserialization")
+    private GHMarketplacePlan plan;
+
+    /**
+     * Wrap up GHMarketplaceUserPurchase.
+     *
+     * @param root
+     *            the root
+     * @return an instance of the GHMarketplaceUserPurchase class
+     */
+    GHMarketplaceUserPurchase wrapUp(GitHub root) {
+        this.root = root;
+        if (this.account != null)
+            this.account.wrapUp(this.root);
+        if (this.plan != null)
+            this.plan.wrapUp(this.root);
+        return this;
+    }
+
+    /**
+     * Gets billing cycle.
+     *
+     * @return the billing cycle
+     */
+    public String getBillingCycle() {
+        return billingCycle;
+    }
+
+    /**
+     * Gets next billing date.
+     *
+     * @return the next billing date
+     */
+    public Date getNextBillingDate() {
+        return GitHubClient.parseDate(nextBillingDate);
+    }
+
+    /**
+     * Is on free trial boolean.
+     *
+     * @return the boolean
+     */
+    public boolean isOnFreeTrial() {
+        return onFreeTrial;
+    }
+
+    /**
+     * Gets free trial ends on.
+     *
+     * @return the free trial ends on
+     */
+    public Date getFreeTrialEndsOn() {
+        return GitHubClient.parseDate(freeTrialEndsOn);
+    }
+
+    /**
+     * Gets unit count.
+     *
+     * @return the unit count
+     */
+    public Long getUnitCount() {
+        return unitCount;
+    }
+
+    /**
+     * Gets updated at.
+     *
+     * @return the updated at
+     */
+    public Date getUpdatedAt() {
+        return GitHubClient.parseDate(updatedAt);
+    }
+
+    /**
+     * Gets account.
+     *
+     * @return the account
+     */
+    public GHMarketplaceAccount getAccount() {
+        return account;
+    }
+
+    /**
+     * Gets plan.
+     *
+     * @return the plan
+     */
+    public GHMarketplacePlan getPlan() {
+        return plan;
+    }
+}

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

@@ -8,33 +8,56 @@ import java.util.Locale;
  * Represents a membership of a user in an organization.
  *
  * @author Kohsuke Kawaguchi
- * @see GHMyself#listOrgMemberships()
+ * @see GHMyself#listOrgMemberships() GHMyself#listOrgMemberships()
  */
-public class GHMembership /* extends GHObject --- but it doesn't have id, created_at, etc. */ {
-    GitHub root;
-
+public class GHMembership extends GitHubInteractiveObject {
     String url;
     String state;
     String role;
     GHUser user;
     GHOrganization organization;
 
+    /**
+     * Gets url.
+     *
+     * @return the url
+     */
     public URL getUrl() {
-        return GitHub.parseURL(url);
+        return GitHubClient.parseURL(url);
     }
 
+    /**
+     * Gets state.
+     *
+     * @return the state
+     */
     public State getState() {
         return Enum.valueOf(State.class, state.toUpperCase(Locale.ENGLISH));
     }
 
+    /**
+     * Gets role.
+     *
+     * @return the role
+     */
     public Role getRole() {
         return Enum.valueOf(Role.class, role.toUpperCase(Locale.ENGLISH));
     }
 
+    /**
+     * Gets user.
+     *
+     * @return the user
+     */
     public GHUser getUser() {
         return user;
     }
 
+    /**
+     * Gets organization.
+     *
+     * @return the organization
+     */
     public GHOrganization getOrganization() {
         return organization;
     }
@@ -42,24 +65,23 @@ public class GHMembership /* extends GHObject --- but it doesn't have id, create
     /**
      * Accepts a pending invitation to an organization.
      *
-     * @see GHMyself#getMembership(GHOrganization)
+     * @throws IOException
+     *             the io exception
+     * @see GHMyself#getMembership(GHOrganization) GHMyself#getMembership(GHOrganization)
      */
     public void activate() throws IOException {
-        root.retrieve().method("PATCH").with("state",State.ACTIVE).to(url,this);
+        root.createRequest().method("PATCH").with("state", State.ACTIVE).withUrlPath(url).fetchInto(this);
     }
 
-    /*package*/ GHMembership wrap(GitHub root) {
+    GHMembership wrap(GitHub root) {
         this.root = root;
-        if (user!=null)     user = root.getUser(user.wrapUp(root));
-        if (organization!=null) organization.wrapUp(root);
+        if (user != null)
+            user = root.getUser(user.wrapUp(root));
+        if (organization != null)
+            organization.wrapUp(root);
         return this;
     }
 
-    /*package*/ static void wrap(GHMembership[] page, GitHub root) {
-        for (GHMembership m : page)
-            m.wrap(root);
-    }
-
     /**
      * Role of a user in an organization.
      */
@@ -78,7 +100,6 @@ public class GHMembership /* extends GHObject --- but it doesn't have id, create
      * Whether a role is currently active or waiting for acceptance (pending)
      */
     public enum State {
-        ACTIVE,
-        PENDING;
+        ACTIVE, PENDING;
     }
 }

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

@@ -0,0 +1,89 @@
+package org.kohsuke.github;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Class that wraps the list of GitHub's IP addresses.
+ *
+ * @author Paulo Miguel Almeida
+ * @see GitHub#getMeta() GitHub#getMeta()
+ * @see <a href="https://developer.github.com/v3/meta/#meta">Get Meta</a>
+ */
+public class GHMeta {
+
+    @JsonProperty("verifiable_password_authentication")
+    private boolean verifiablePasswordAuthentication;
+    private List<String> hooks;
+    private List<String> git;
+    private List<String> web;
+    private List<String> api;
+    private List<String> pages;
+    private List<String> importer = new ArrayList<>();
+
+    /**
+     * Is verifiable password authentication boolean.
+     *
+     * @return the boolean
+     */
+    public boolean isVerifiablePasswordAuthentication() {
+        return verifiablePasswordAuthentication;
+    }
+
+    /**
+     * Gets hooks.
+     *
+     * @return the hooks
+     */
+    public List<String> getHooks() {
+        return Collections.unmodifiableList(hooks);
+    }
+
+    /**
+     * Gets git.
+     *
+     * @return the git
+     */
+    public List<String> getGit() {
+        return Collections.unmodifiableList(git);
+    }
+
+    /**
+     * Gets web.
+     *
+     * @return the web
+     */
+    public List<String> getWeb() {
+        return Collections.unmodifiableList(web);
+    }
+
+    /**
+     * Gets api.
+     *
+     * @return the api
+     */
+    public List<String> getApi() {
+        return Collections.unmodifiableList(api);
+    }
+
+    /**
+     * Gets pages.
+     *
+     * @return the pages
+     */
+    public List<String> getPages() {
+        return Collections.unmodifiableList(pages);
+    }
+
+    /**
+     * Gets importer.
+     *
+     * @return the importer
+     */
+    public List<String> getImporter() {
+        return Collections.unmodifiableList(importer);
+    }
+}

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

@@ -6,12 +6,11 @@ import java.util.Date;
 import java.util.Locale;
 
 /**
- * 
- * @author Yusuke Kokubo
+ * The type GHMilestone.
  *
+ * @author Yusuke Kokubo
  */
 public class GHMilestone extends GHObject {
-    GitHub root;
     GHRepository owner;
 
     GHUser creator;
@@ -19,60 +18,120 @@ public class GHMilestone extends GHObject {
     private int closed_issues, open_issues, number;
     protected String closed_at;
 
+    /**
+     * Gets root.
+     *
+     * @return the root
+     */
     public GitHub getRoot() {
         return root;
     }
-    
+
+    /**
+     * Gets owner.
+     *
+     * @return the owner
+     */
     public GHRepository getOwner() {
         return owner;
     }
-    
+
+    /**
+     * Gets creator.
+     *
+     * @return the creator
+     * @throws IOException
+     *             the io exception
+     */
     public GHUser getCreator() throws IOException {
         return root.intern(creator);
     }
-    
+
+    /**
+     * Gets due on.
+     *
+     * @return the due on
+     */
     public Date getDueOn() {
-        if (due_on == null) return null;
-        return GitHub.parseDate(due_on);
+        if (due_on == null)
+            return null;
+        return GitHubClient.parseDate(due_on);
     }
 
     /**
      * When was this milestone closed?
+     *
+     * @return the closed at
+     * @throws IOException
+     *             the io exception
      */
     public Date getClosedAt() throws IOException {
-        return GitHub.parseDate(closed_at);
+        return GitHubClient.parseDate(closed_at);
     }
 
+    /**
+     * Gets title.
+     *
+     * @return the title
+     */
     public String getTitle() {
         return title;
     }
-    
+
+    /**
+     * Gets description.
+     *
+     * @return the description
+     */
     public String getDescription() {
         return description;
     }
-    
+
+    /**
+     * Gets closed issues.
+     *
+     * @return the closed issues
+     */
     public int getClosedIssues() {
         return closed_issues;
     }
-    
+
+    /**
+     * Gets open issues.
+     *
+     * @return the open issues
+     */
     public int getOpenIssues() {
         return open_issues;
     }
-    
+
+    /**
+     * Gets number.
+     *
+     * @return the number
+     */
     public int getNumber() {
         return number;
     }
 
     public URL getHtmlUrl() {
-        return GitHub.parseURL(html_url);
+        return GitHubClient.parseURL(html_url);
     }
-    
+
+    /**
+     * Gets state.
+     *
+     * @return the state
+     */
     public GHMilestoneState getState() {
         return Enum.valueOf(GHMilestoneState.class, state.toUpperCase(Locale.ENGLISH));
     }
 
     /**
      * Closes this milestone.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void close() throws IOException {
         edit("state", "closed");
@@ -80,6 +139,9 @@ public class GHMilestone extends GHObject {
 
     /**
      * Reopens this milestone.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void reopen() throws IOException {
         edit("state", "open");
@@ -87,31 +149,70 @@ public class GHMilestone extends GHObject {
 
     /**
      * Deletes this milestone.
+     *
+     * @throws IOException
+     *             the io exception
      */
     public void delete() throws IOException {
-        root.retrieve().method("DELETE").to(getApiRoute());
+        root.createRequest().method("DELETE").withUrlPath(getApiRoute()).send();
     }
 
     private void edit(String key, Object value) throws IOException {
-        new Requester(root)._with(key, value).method("PATCH").to(getApiRoute());
+        root.createRequest().with(key, value).method("PATCH").withUrlPath(getApiRoute()).send();
     }
 
+    /**
+     * Sets title.
+     *
+     * @param title
+     *            the title
+     * @throws IOException
+     *             the io exception
+     */
     public void setTitle(String title) throws IOException {
         edit("title", title);
     }
 
+    /**
+     * Sets description.
+     *
+     * @param description
+     *            the description
+     * @throws IOException
+     *             the io exception
+     */
     public void setDescription(String description) throws IOException {
         edit("description", description);
     }
 
+    /**
+     * Sets due on.
+     *
+     * @param dueOn
+     *            the due on
+     * @throws IOException
+     *             the io exception
+     */
     public void setDueOn(Date dueOn) throws IOException {
-        edit("due_on", GitHub.printDate(dueOn));
+        edit("due_on", GitHubClient.printDate(dueOn));
     }
 
+    /**
+     * Gets api route.
+     *
+     * @return the api route
+     */
     protected String getApiRoute() {
-        return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/milestones/"+number;
+        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/milestones/" + number;
     }
 
+    /**
+     * Wrap gh milestone.
+     *
+     * @param repo
+     *            the repo
+     * @return the gh milestone
+     */
     public GHMilestone wrap(GHRepository repo) {
         this.owner = repo;
         this.root = repo.root;

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

@@ -1,11 +1,10 @@
 package org.kohsuke.github;
 
 /**
- * 
- * @author Yusuke Kokubo
+ * The enum GHMilestoneState.
  *
+ * @author Yusuke Kokubo
  */
 public enum GHMilestoneState {
-    OPEN,
-    CLOSED
-}
+    OPEN, CLOSED
+}