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

Merge pull request #845 from bitwiseman/task/redo-822
Modify getRef() changes to be compatible with older GHE versions
2026-03-15 15:50:07 +00:00 · 2020-06-10 20:02:18 -07:00 · 2020-06-10 20:00:44 -07:00 · 2020-06-10 19:53:42 -07:00 · 2020-06-10 19:47:23 -07:00 · 2020-06-10 17:30:12 -07:00
113 changed files with 3898 additions and 215 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,3 +10,7 @@ We love getting PRs, but we hate asking people for the same basic changes every
 - [ ] Run `mvn clean compile` locally. This may reformat your code, commit those changes.
 - [ ] Run `mvn -D enable-ci clean install site` locally. If this command doesn't succeed, your change will not pass CI.

+# When creating a PR: 
+
+- [ ] Fill in the "Description" above. 
+- [ ] Enable "Allow edits from maintainers". 
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.kohsuke</groupId>
  <artifactId>github-api</artifactId>
-  <version>1.112</version>
+  <version>1.114</version>
  <name>GitHub API for Java</name>
  <url>https://github-api.kohsuke.org/</url>
  <description>GitHub API for Java</description>
@@ -11,7 +11,7 @@
    <connection>scm:git:git@github.com/hub4j/${project.artifactId}.git</connection>
    <developerConnection>scm:git:ssh://git@github.com/hub4j/${project.artifactId}.git</developerConnection>
    <url>https://github.com/hub4j/github-api/</url>
-    <tag>github-api-1.112</tag>
+    <tag>github-api-1.114</tag>
  </scm>

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

    // other fields (that only show up in full data)
-    protected String location, blog, email, name, company, type;
+    protected String location, blog, email, bio, name, company, type, twitter_username;
    protected String html_url;
    protected int followers, following, public_repos, public_gists;
-    protected boolean site_admin;
+    protected boolean site_admin, hireable;

    // other fields (that only show up in full data) that require privileged scope
    protected Integer total_private_repos;
@@ -237,6 +237,18 @@ public abstract class GHPerson extends GHObject {
        return location;
    }

+    /**
+     * Gets the Twitter Username of this user, like "GitHub"
+     * 
+     * @return the Twitter username
+     * @throws IOException
+     *             the io exception
+     */
+    public String getTwitterUsername() throws IOException {
+        populate();
+        return twitter_username;
+    }
+
    public Date getCreatedAt() throws IOException {
        populate();
        return super.getCreatedAt();
--- a/src/main/java/org/kohsuke/github/GHRepository.java
+++ b/src/main/java/org/kohsuke/github/GHRepository.java
@@ -25,6 +25,7 @@ package org.kohsuke.github;

 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -1589,10 +1590,29 @@ public class GHRepository extends GHObject {
            refName = refName.replaceFirst("refs/", "");
        }

-        return root.createRequest()
-                .withUrlPath(getApiTailUrl(String.format("git/ref/%s", refName)))
-                .fetch(GHRef.class)
-                .wrap(root);
+        // We would expect this to use `git/ref/%s` but some versions of GHE seem to not support it
+        // Instead use `git/refs/%s` and check the result actually matches the ref
+        GHRef result = null;
+        try {
+            result = root.createRequest()
+                    .withUrlPath(getApiTailUrl(String.format("git/refs/%s", refName)))
+                    .fetch(GHRef.class)
+                    .wrap(root);
+        } catch (IOException e) {
+            // If the parse exception is due to the above returning an array instead of a single ref
+            // that means the individual ref did not exist
+            if (!(e.getCause() instanceof JsonMappingException)) {
+                throw e;
+            }
+        }
+
+        // Verify that the ref returned is the one requested
+        if (result == null || !result.getRef().equals("refs/" + refName)) {
+            throw new GHFileNotFoundException(String.format("git/refs/%s", refName)
+                    + " {\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-reference\"}");
+        }
+        return result;
+
    }

    /**
--- a/src/main/java/org/kohsuke/github/GHTeam.java
+++ b/src/main/java/org/kohsuke/github/GHTeam.java
@@ -3,9 +3,12 @@ package org.kohsuke.github;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;

+import javax.annotation.Nonnull;
+
 /**
 * A team in GitHub organization.
 *
@@ -130,6 +133,36 @@ public class GHTeam extends GHObject implements Refreshable {
        root.createRequest().method("PATCH").with("privacy", privacy).withUrlPath(api("")).send();
    }

+    /**
+     * Retrieves the discussions.
+     *
+     * @return the paged iterable
+     * @throws IOException
+     *             the io exception
+     */
+    @Nonnull
+    public PagedIterable<GHDiscussion> listDiscussions() throws IOException {
+        return GHDiscussion.readAll(this);
+    }
+
+    /**
+     * Gets a single discussion by ID.
+     *
+     * @param discussionNumber
+     *            id of the discussion that we want to query for
+     * @return the discussion
+     * @throws java.io.FileNotFoundException
+     *             if the discussion does not exist
+     * @throws IOException
+     *             the io exception
+     *
+     * @see <a href= "https://developer.github.com/v3/teams/discussions/#get-a-discussion">documentation</a>
+     */
+    @Nonnull
+    public GHDiscussion getDiscussion(long discussionNumber) throws IOException {
+        return GHDiscussion.read(this, discussionNumber);
+    }
+
    /**
     * Retrieves the current members.
     *
@@ -297,6 +330,21 @@ public class GHTeam extends GHObject implements Refreshable {
        return "/teams/" + getId() + tail;
    }

+    /**
+     * Begins the creation of a new instance.
+     *
+     * Consumer must call {@link GHDiscussion.Creator#done()} to commit changes.
+     *
+     * @param title
+     *            title of the discussion to be created
+     * @return a {@link GHDiscussion.Creator}
+     * @throws IOException
+     *             the io exception
+     */
+    public GHDiscussion.Creator createDiscussion(String title) throws IOException {
+        return GHDiscussion.create(this).title(title);
+    }
+
    /**
     * Gets organization.
     *
@@ -318,4 +366,23 @@ public class GHTeam extends GHObject implements Refreshable {
    public URL getHtmlUrl() {
        return GitHubClient.parseURL(html_url);
    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        GHTeam ghTeam = (GHTeam) o;
+        return Objects.equals(name, ghTeam.name) && Objects.equals(getUrl(), ghTeam.getUrl())
+                && Objects.equals(permission, ghTeam.permission) && Objects.equals(slug, ghTeam.slug)
+                && Objects.equals(description, ghTeam.description) && privacy == ghTeam.privacy;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, getUrl(), permission, slug, description, privacy);
+    }
 }
--- a/src/main/java/org/kohsuke/github/GHUser.java
+++ b/src/main/java/org/kohsuke/github/GHUser.java
@@ -173,6 +173,19 @@ public class GHUser extends GHPerson {
        return org.hasPublicMember(this);
    }

+    /**
+     * Returns true if this user is marked as hireable, false otherwise
+     *
+     * @return if the user is marked as hireable
+     */
+    public boolean isHireable() {
+        return hireable;
+    }
+
+    public String getBio() {
+        return bio;
+    }
+
    static GHUser[] wrap(GHUser[] users, GitHub root) {
        for (GHUser f : users)
            f.root = root;
--- a/src/main/java/org/kohsuke/github/GitHubClient.java
+++ b/src/main/java/org/kohsuke/github/GitHubClient.java
@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;

 import java.io.FileNotFoundException;
@@ -351,39 +352,43 @@ abstract class GitHubClient {

            GitHubResponse.ResponseInfo responseInfo = null;
            try {
-                if (LOGGER.isLoggable(FINE)) {
-                    LOGGER.log(FINE,
-                            "GitHub API request [" + (login == null ? "anonymous" : login) + "]: " + request.method()
-                                    + " " + request.url().toString());
+                try {
+                    if (LOGGER.isLoggable(FINE)) {
+                        LOGGER.log(FINE,
+                                "GitHub API request [" + (login == null ? "anonymous" : login) + "]: "
+                                        + request.method() + " " + request.url().toString());
+                    }
+
+                    rateLimitChecker.checkRateLimit(this, request);
+
+                    responseInfo = getResponseInfo(request);
+                    noteRateLimit(responseInfo);
+                    detectOTPRequired(responseInfo);
+
+                    if (isInvalidCached404Response(responseInfo)) {
+                        // Setting "Cache-Control" to "no-cache" stops the cache from supplying
+                        // "If-Modified-Since" or "If-None-Match" values.
+                        // This makes GitHub give us current data (not incorrectly cached data)
+                        request = request.toBuilder().withHeader("Cache-Control", "no-cache").build();
+                        continue;
+                    }
+                    if (!(isRateLimitResponse(responseInfo) || isAbuseLimitResponse(responseInfo))) {
+                        return createResponse(responseInfo, handler);
+                    }
+                } catch (IOException e) {
+                    // For transient errors, retry
+                    if (retryConnectionError(e, request.url(), retries)) {
+                        continue;
+                    }
+
+                    throw interpretApiError(e, request, responseInfo);
                }

-                rateLimitChecker.checkRateLimit(this, request);
-
-                responseInfo = getResponseInfo(request);
-                noteRateLimit(responseInfo);
-                detectOTPRequired(responseInfo);
-
-                if (isInvalidCached404Response(responseInfo)) {
-                    // Setting "Cache-Control" to "no-cache" stops the cache from supplying
-                    // "If-Modified-Since" or "If-None-Match" values.
-                    // This makes GitHub give us current data (not incorrectly cached data)
-                    request = request.toBuilder().withHeader("Cache-Control", "no-cache").build();
-                    continue;
-                }
-                if (!(isRateLimitResponse(responseInfo) || isAbuseLimitResponse(responseInfo))) {
-                    return createResponse(responseInfo, handler);
-                }
-            } catch (IOException e) {
-                // For transient errors, retry
-                if (retryConnectionError(e, request.url(), retries)) {
-                    continue;
-                }
-
-                throw interpretApiError(e, request, responseInfo);
+                handleLimitingErrors(responseInfo);
+            } finally {
+                IOUtils.closeQuietly(responseInfo);
            }

-            handleLimitingErrors(responseInfo);
-
        } while (--retries >= 0);

        throw new GHIOException("Ran out of retries for URL: " + request.url().toString());
--- a/src/main/java/org/kohsuke/github/GitHubHttpUrlConnectionClient.java
+++ b/src/main/java/org/kohsuke/github/GitHubHttpUrlConnectionClient.java
@@ -235,6 +235,10 @@ class GitHubHttpUrlConnectionClient extends GitHubClient {

        private static final Logger LOGGER = Logger.getLogger(GitHubClient.class.getName());

+        @Override
+        public void close() throws IOException {
+            IOUtils.closeQuietly(connection.getInputStream());
+        }
    }

 }
--- a/src/main/java/org/kohsuke/github/GitHubResponse.java
+++ b/src/main/java/org/kohsuke/github/GitHubResponse.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import org.apache.commons.io.IOUtils;

+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -212,7 +213,7 @@ class GitHubResponse<T> {
     * Initial response information supplied to a {@link BodyHandler} when a response is initially received and before
     * the body is processed.
     */
-    static abstract class ResponseInfo {
+    static abstract class ResponseInfo implements Closeable {

        private static final Comparator<String> nullableCaseInsensitiveComparator = Comparator
                .nullsFirst(String.CASE_INSENSITIVE_ORDER);
@@ -317,12 +318,8 @@ class GitHubResponse<T> {
        @Nonnull
        String getBodyAsString() throws IOException {
            InputStreamReader r = null;
-            try {
-                r = new InputStreamReader(this.bodyStream(), StandardCharsets.UTF_8);
-                return IOUtils.toString(r);
-            } finally {
-                IOUtils.closeQuietly(r);
-            }
+            r = new InputStreamReader(this.bodyStream(), StandardCharsets.UTF_8);
+            return IOUtils.toString(r);
        }
    }

--- a/src/main/java/org/kohsuke/github/Requester.java
+++ b/src/main/java/org/kohsuke/github/Requester.java
@@ -23,6 +23,9 @@
 */
 package org.kohsuke.github;

+import org.apache.commons.io.IOUtils;
+
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -108,7 +111,10 @@ class Requester extends GitHubRequest.Builder<Requester> {
     *             the io exception
     */
    public InputStream fetchStream() throws IOException {
-        return client.sendRequest(this, (responseInfo) -> responseInfo.bodyStream()).body();
+        return client
+                .sendRequest(this,
+                        (responseInfo) -> new ByteArrayInputStream(IOUtils.toByteArray(responseInfo.bodyStream())))
+                .body();
    }

    /**
--- a/src/test/java/org/kohsuke/github/GHDiscussionTest.java
+++ b/src/test/java/org/kohsuke/github/GHDiscussionTest.java
@@ -0,0 +1,145 @@
+package org.kohsuke.github;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Set;
+
+import static org.hamcrest.Matchers.*;
+
+/**
+ * @author Charles Moulliard
+ */
+public class GHDiscussionTest extends AbstractGitHubWireMockTest {
+    private final String TEAM_SLUG = "dummy-team";
+    private GHTeam team;
+
+    @Before
+    public void setUp() throws Exception {
+        team = gitHub.getOrganization(GITHUB_API_TEST_ORG).getTeamBySlug(TEAM_SLUG);
+    }
+
+    @After
+    public void cleanupDiscussions() throws Exception {
+        // only need to clean up if we're pointing to the live site
+        if (mockGitHub.isUseProxy()) {
+            for (GHDiscussion discussion : getGitHubBeforeAfter().getOrganization(GITHUB_API_TEST_ORG)
+                    .getTeamBySlug(TEAM_SLUG)
+                    .listDiscussions()) {
+                discussion.delete();
+            }
+        }
+    }
+
+    @Test
+    public void testCreatedDiscussion() throws IOException {
+        GHDiscussion discussion = team.createDiscussion("Some Discussion").body("This is a public discussion").done();
+        assertThat(discussion, notNullValue());
+        assertThat(discussion.getTeam(), equalTo(team));
+        assertThat(discussion.getTitle(), equalTo("Some Discussion"));
+        assertThat(discussion.getBody(), equalTo("This is a public discussion"));
+        assertThat(discussion.isPrivate(), is(false));
+
+        discussion = team.createDiscussion("Some Discussion")
+                .body("This is another public discussion")
+                .private_(false)
+                .done();
+        assertThat(discussion, notNullValue());
+        assertThat(discussion.getTeam(), equalTo(team));
+        assertThat(discussion.getTitle(), equalTo("Some Discussion"));
+        assertThat(discussion.getBody(), equalTo("This is another public discussion"));
+        assertThat(discussion.isPrivate(), is(false));
+
+        discussion = team.createDiscussion("Some Discussion")
+                .body("This is a private (secret) discussion")
+                .private_(true)
+                .done();
+        assertThat(discussion, notNullValue());
+        assertThat(discussion.getTeam(), equalTo(team));
+        assertThat(discussion.getTitle(), equalTo("Some Discussion"));
+        assertThat(discussion.getBody(), equalTo("This is a private (secret) discussion"));
+        assertThat(discussion.isPrivate(), is(true));
+
+        try {
+            team.createDiscussion("Some Discussion").done();
+            fail("Body is required.");
+        } catch (HttpException e) {
+            assertThat(e, instanceOf(HttpException.class));
+            assertThat(e.getMessage(),
+                    containsString("https://developer.github.com/v3/teams/discussions/#create-a-discussion"));
+        }
+    }
+
+    @Test
+    public void testGetAndEditDiscussion() throws IOException {
+        GHDiscussion created = team.createDiscussion("Some Discussion").body("This is a test discussion").done();
+
+        GHDiscussion discussion = team.getDiscussion(created.getNumber());
+
+        // Test convenience getId() override
+        assertThat(discussion.getNumber(), equalTo(created.getId()));
+        assertThat(discussion.getTeam(), equalTo(team));
+        assertThat(discussion.getTitle(), equalTo("Some Discussion"));
+        assertThat(discussion.getBody(), equalTo("This is a test discussion"));
+        assertThat(discussion.isPrivate(), is(false));
+
+        // Test equality
+        assertThat(discussion, equalTo(created));
+
+        discussion = discussion.set().body("This is a test discussion changed");
+        assertThat(discussion.getTeam(), notNullValue());
+
+        assertThat(discussion.getTitle(), equalTo("Some Discussion"));
+        assertThat(discussion.getBody(), equalTo("This is a test discussion changed"));
+
+        discussion = discussion.set().title("Title changed");
+
+        assertThat(discussion.getTitle(), equalTo("Title changed"));
+        assertThat(discussion.getBody(), equalTo("This is a test discussion changed"));
+
+        GHDiscussion discussion2 = gitHub.getOrganization(GITHUB_API_TEST_ORG)
+                .getTeamBySlug(TEAM_SLUG)
+                .getDiscussion(discussion.getNumber());
+
+        assertThat(discussion2, equalTo(discussion));
+        assertThat(discussion2.getTitle(), equalTo("Title changed"));
+        assertThat(discussion2.getBody(), equalTo("This is a test discussion changed"));
+
+        discussion = discussion.update().body("This is a test discussion updated").title("Title updated").done();
+
+        assertThat(discussion.getTeam(), notNullValue());
+        assertThat(discussion.getTitle(), equalTo("Title updated"));
+        assertThat(discussion.getBody(), equalTo("This is a test discussion updated"));
+
+    }
+
+    @Test
+    public void testListDiscussion() throws IOException {
+        team.createDiscussion("Some Discussion A").body("This is a test discussion").done();
+        team.createDiscussion("Some Discussion B").body("This is a test discussion").done();
+        team.createDiscussion("Some Discussion C").body("This is a test discussion").done();
+
+        Set<GHDiscussion> all = team.listDiscussions().toSet();
+        assertThat(all.size(), equalTo(3));
+    }
+
+    @Test
+    public void testToDeleteDiscussion() throws IOException {
+        GHDiscussion discussion = team.createDiscussion("Some Discussion").body("This is a test discussion").done();
+
+        assertThat(discussion.getTitle(), equalTo("Some Discussion"));
+
+        discussion.delete();
+        try {
+            gitHub.getOrganization(GITHUB_API_TEST_ORG).getTeamBySlug(TEAM_SLUG).getDiscussion(discussion.getNumber());
+            fail();
+        } catch (FileNotFoundException e) {
+            assertThat(e.getMessage(),
+                    containsString("https://developer.github.com/v3/teams/discussions/#get-a-single-discussion"));
+        }
+    }
+
+}
--- a/src/test/java/org/kohsuke/github/GHIssueEventAttributeTest.java
+++ b/src/test/java/org/kohsuke/github/GHIssueEventAttributeTest.java
@@ -1,6 +1,5 @@
 package org.kohsuke.github;

-import org.jetbrains.annotations.NotNull;
 import org.junit.Test;

 import java.io.IOException;
@@ -41,7 +40,6 @@ public class GHIssueEventAttributeTest extends AbstractGitHubWireMockTest {
        }
    }

-    @NotNull
    private List<GHIssueEvent> listEvents(final Type type) throws IOException {
        return StreamSupport
                .stream(gitHub.getRepository("chids/project-milestone-test").getIssue(1).listEvents().spliterator(),
--- a/src/test/java/org/kohsuke/github/GHObjectTest.java
+++ b/src/test/java/org/kohsuke/github/GHObjectTest.java
@@ -11,7 +11,7 @@ public class GHObjectTest extends org.kohsuke.github.AbstractGitHubWireMockTest
        GHOrganization org = gitHub.getOrganization(GITHUB_API_TEST_ORG);
        assertThat(org.toString(),
                containsString(
-                        "login=hub4j-test-org,location=<null>,blog=<null>,email=<null>,name=<null>,company=<null>,type=Organization,followers=0,following=0"));
+                        "login=hub4j-test-org,location=<null>,blog=<null>,email=<null>,bio=<null>,name=<null>,company=<null>,type=Organization,followers=0,following=0,hireable=false"));

        // getResponseHeaderFields is deprecated but we should not break it.
        assertThat(org.getResponseHeaderFields(), notNullValue());
--- a/src/test/java/org/kohsuke/github/GHRepositoryTest.java
+++ b/src/test/java/org/kohsuke/github/GHRepositoryTest.java
@@ -429,7 +429,6 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
            assertThat(e.getMessage(),
                    containsString(
                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-reference\"}"));
-            assertThat(e.getCause(), instanceOf(FileNotFoundException.class));
        }
    }

@@ -474,7 +473,6 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
            assertThat(e.getMessage(),
                    containsString(
                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-reference\"}"));
-            assertThat(e.getCause(), instanceOf(FileNotFoundException.class));
        }
    }

@@ -505,8 +503,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
            assertThat(e, instanceOf(GHFileNotFoundException.class));
            assertThat(e.getMessage(),
                    containsString(
-                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-single-reference\"}"));
-            assertThat(e.getCause(), instanceOf(FileNotFoundException.class));
+                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-reference\"}"));
        }

        // git/refs/headz
@@ -517,8 +514,7 @@ public class GHRepositoryTest extends AbstractGitHubWireMockTest {
            assertThat(e, instanceOf(GHFileNotFoundException.class));
            assertThat(e.getMessage(),
                    containsString(
-                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-single-reference\"}"));
-            assertThat(e.getCause(), instanceOf(FileNotFoundException.class));
+                            "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-reference\"}"));
        }
    }

--- a/src/test/java/org/kohsuke/github/GHUserTest.java
+++ b/src/test/java/org/kohsuke/github/GHUserTest.java
@@ -102,4 +102,12 @@ public class GHUserTest extends AbstractGitHubWireMockTest {
            repository.delete();
        }
    }
+
+    @Test
+    public void verifyBioAndHireable() throws IOException {
+        GHUser u = gitHub.getUser("Chew");
+        assertThat(u.getBio(), equalTo("I like to program things and I hope to program something cool one day :D"));
+        assertTrue(u.isHireable());
+        assertNotNull(u.getTwitterUsername());
+    }
 }
--- a/src/test/java/org/kohsuke/github/RequesterRetryTest.java
+++ b/src/test/java/org/kohsuke/github/RequesterRetryTest.java
@@ -2,9 +2,13 @@ package org.kohsuke.github;

 import com.github.tomakehurst.wiremock.http.Fault;
 import com.github.tomakehurst.wiremock.stubbing.Scenario;
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.kohsuke.github.extras.ImpatientHttpConnector;
+import org.kohsuke.github.extras.okhttp3.OkHttpConnector;
 import org.mockito.Mockito;

 import java.io.ByteArrayOutputStream;
@@ -20,6 +24,7 @@ import java.net.URL;
 import java.security.Permission;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 import java.util.logging.StreamHandler;
@@ -57,7 +62,8 @@ public class RequesterRetryTest extends AbstractGitHubWireMockTest {
    public void attachLogCapturer() {
        logCapturingStream = new ByteArrayOutputStream();
        customLogHandler = new StreamHandler(logCapturingStream, new SimpleFormatter());
-        log.addHandler(customLogHandler);
+        Logger.getLogger(GitHubClient.class.getName()).addHandler(customLogHandler);
+        Logger.getLogger(OkHttpClient.class.getName()).addHandler(customLogHandler);
    }

    public String getTestCapturedLog() throws IOException {
@@ -66,11 +72,40 @@ public class RequesterRetryTest extends AbstractGitHubWireMockTest {
    }

    public void resetTestCapturedLog() throws IOException {
-        log.removeHandler(customLogHandler);
+        Logger.getLogger(GitHubClient.class.getName()).removeHandler(customLogHandler);
+        Logger.getLogger(OkHttpClient.class.getName()).removeHandler(customLogHandler);
        customLogHandler.close();
        attachLogCapturer();
    }

+    @Ignore("Used okhttp3 and this to verify connection closing. To variable for CI system.")
+    @Test
+    public void testGitHubIsApiUrlValid() throws Exception {
+
+        OkHttpClient client = new OkHttpClient().newBuilder()
+                .connectionPool(new ConnectionPool(2, 100, TimeUnit.MILLISECONDS))
+                .build();
+
+        OkHttpConnector connector = new OkHttpConnector(client);
+
+        for (int x = 0; x < 100; x++) {
+
+            this.gitHub = getGitHubBuilder().withEndpoint(mockGitHub.apiServer().baseUrl())
+                    .withConnector(connector)
+                    .build();
+
+            try {
+                gitHub.checkApiUrlValidity();
+            } catch (IOException ioe) {
+                assertTrue(ioe.getMessage().contains("private mode enabled"));
+            }
+            Thread.sleep(100);
+        }
+
+        String capturedLog = getTestCapturedLog();
+        assertThat(capturedLog, not(containsString("leaked")));
+    }
+
    // Issue #539
    @Test
    public void testSocketConnectionAndRetry() throws Exception {
--- a/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java
+++ b/src/test/java/org/kohsuke/github/junit/GitHubWireMockRule.java
@@ -110,43 +110,33 @@ public class GitHubWireMockRule extends WireMockMultiServerRule {
            return;
        }

-        // "If-None-Match" header used for ETag matching for caching connections
-        // "Accept" header is used to specify previews. If it changes expected data may not be retrieved.
-        this.apiServer()
-                .snapshotRecord(recordSpec().forTarget("https://api.github.com")
-                        .captureHeader("If-None-Match")
-                        .captureHeader("If-Modified-Since")
-                        .captureHeader("Cache-Control")
-                        .captureHeader("Accept")
-                        .extractTextBodiesOver(255));
+        recordSnapshot(this.apiServer(), "https://api.github.com", false);

-        // After taking the snapshot, format the output
-        formatTestResources(new File(this.apiServer().getOptions().filesRoot().getPath()).toPath(), false);
+        // For raw server, only fix up mapping files
+        recordSnapshot(this.rawServer(), "https://raw.githubusercontent.com", true);

-        if (this.rawServer() != null) {
-            this.rawServer()
-                    .snapshotRecord(recordSpec().forTarget("https://raw.githubusercontent.com")
-                            .captureHeader("If-None-Match")
-                            .captureHeader("If-Modified-Since")
-                            .captureHeader("Cache-Control")
-                            .captureHeader("Accept")
-                            .extractTextBodiesOver(255));
+        recordSnapshot(this.uploadsServer(), "https://uploads.github.com", false);
+    }

-            // For raw server, only fix up mapping files
-            formatTestResources(new File(this.rawServer().getOptions().filesRoot().getPath()).toPath(), true);
-        }
+    private void recordSnapshot(WireMockServer server, String target, boolean isRawServer) {
+        if (server != null) {

-        if (this.uploadsServer() != null) {
-            this.uploadsServer()
-                    .snapshotRecord(recordSpec().forTarget("https://uploads.github.com")
-                            .captureHeader("If-None-Match")
-                            .captureHeader("If-Modified-Since")
-                            .captureHeader("Cache-Control")
-                            .captureHeader("Accept")
-                            .extractTextBodiesOver(255));
-
-            formatTestResources(new File(this.uploadsServer().getOptions().filesRoot().getPath()).toPath(), false);
+            server.snapshotRecord(recordSpec().forTarget(target)
+                    // "If-None-Match" header used for ETag matching for caching connections
+                    .captureHeader("If-None-Match")
+                    // "If-Modified-Since" header used for ETag matching for caching connections
+                    .captureHeader("If-Modified-Since")
+                    .captureHeader("Cache-Control")
+                    // "Accept" header is used to specify previews. If it changes expected data may not be retrieved.
+                    .captureHeader("Accept")
+                    // This is required, or some requests will return data from unexpected stubs
+                    // For example, if you update "title" and "body", and then update just "title" to the same value
+                    // the mock framework will treat those two requests as equivalent, which we do not want.
+                    .chooseBodyMatchTypeAutomatically(true, false, false)
+                    .extractTextBodiesOver(255));

+            // After taking the snapshot, format the output
+            formatTestResources(new File(this.apiServer().getOptions().filesRoot().getPath()).toPath(), false);
        }
    }

--- a/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3.json
+++ b/src/test/resources/org/kohsuke/github/AppTest/wiremock/testRef/mappings/repos_jenkinsci_jenkins_git_refs_heads_master-3.json
@@ -2,7 +2,7 @@
  "id": "257aa346-b2fa-4808-a587-ce26a6859bf7",
  "name": "repos_jenkinsci_jenkins_git_refs_heads_master",
  "request": {
-    "url": "/repos/jenkinsci/jenkins/git/ref/heads/master",
+    "url": "/repos/jenkinsci/jenkins/git/refs/heads/master",
    "method": "GET",
    "headers": {
      "Accept": {
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/organizations_7544739_team_3451996_discussions-4.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/organizations_7544739_team_3451996_discussions-4.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a public discussion",
+  "body_html": "<p>This is a public discussion</p>",
+  "body_version": "d1ab9311f2fe800dcd6f9499163d5369",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/57/comments",
+  "created_at": "2020-06-05T23:08:28Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/57",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODQ4",
+  "number": 57,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion",
+  "updated_at": "2020-06-05T23:08:28Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/57"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/organizations_7544739_team_3451996_discussions-5.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/organizations_7544739_team_3451996_discussions-5.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is another public discussion",
+  "body_html": "<p>This is another public discussion</p>",
+  "body_version": "611e0dcc600e9915b7d96e4bec2b7b35",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/58/comments",
+  "created_at": "2020-06-05T23:08:29Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/58",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODQ5",
+  "number": 58,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion",
+  "updated_at": "2020-06-05T23:08:29Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/58"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/organizations_7544739_team_3451996_discussions-6.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/organizations_7544739_team_3451996_discussions-6.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a private (secret) discussion",
+  "body_html": "<p>This is a private (secret) discussion</p>",
+  "body_version": "32e9a84be65b3a703f5db5b8635388eb",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/59/comments",
+  "created_at": "2020-06-05T23:08:29Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/59",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODUw",
+  "number": 59,
+  "pinned": false,
+  "private": true,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion",
+  "updated_at": "2020-06-05T23:08:29Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/59"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/orgs_hub4j-test-org-2.json
@@ -0,0 +1,47 @@
+{
+  "login": "hub4j-test-org",
+  "id": 7544739,
+  "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+  "url": "https://api.github.com/orgs/hub4j-test-org",
+  "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+  "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+  "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+  "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+  "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+  "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+  "description": "Hub4j Test Org Description (this could be null or blank too)",
+  "name": "Hub4j Test Org Name (this could be null or blank too)",
+  "company": null,
+  "blog": "https://hub4j.url.io/could/be/null",
+  "location": "Hub4j Test Org Location (this could be null or blank too)",
+  "email": "hub4jtestorgemail@could.be.null.com",
+  "twitter_username": null,
+  "is_verified": false,
+  "has_organization_projects": true,
+  "has_repository_projects": true,
+  "public_repos": 15,
+  "public_gists": 0,
+  "followers": 0,
+  "following": 0,
+  "html_url": "https://github.com/hub4j-test-org",
+  "created_at": "2014-05-10T19:39:11Z",
+  "updated_at": "2020-06-04T05:56:10Z",
+  "type": "Organization",
+  "total_private_repos": 0,
+  "owned_private_repos": 0,
+  "private_gists": 0,
+  "disk_usage": 148,
+  "collaborators": 0,
+  "billing_email": "kk@kohsuke.org",
+  "default_repository_permission": "none",
+  "members_can_create_repositories": false,
+  "two_factor_requirement_enabled": false,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "private_repos": 10000,
+    "filled_seats": 18,
+    "seats": 3
+  }
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-3.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-3.json
@@ -0,0 +1,49 @@
+{
+  "name": "dummy-team",
+  "id": 3451996,
+  "node_id": "MDQ6VGVhbTM0NTE5OTY=",
+  "slug": "dummy-team",
+  "description": "Updated by API TestModified",
+  "privacy": "closed",
+  "url": "https://api.github.com/organizations/7544739/team/3451996",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team",
+  "members_url": "https://api.github.com/organizations/7544739/team/3451996/members{/member}",
+  "repositories_url": "https://api.github.com/organizations/7544739/team/3451996/repos",
+  "permission": "pull",
+  "created_at": "2019-10-03T21:46:12Z",
+  "updated_at": "2020-06-02T19:31:50Z",
+  "members_count": 1,
+  "repos_count": 1,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "url": "https://api.github.com/orgs/hub4j-test-org",
+    "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+    "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+    "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+    "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+    "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "description": "Hub4j Test Org Description (this could be null or blank too)",
+    "name": "Hub4j Test Org Name (this could be null or blank too)",
+    "company": null,
+    "blog": "https://hub4j.url.io/could/be/null",
+    "location": "Hub4j Test Org Location (this could be null or blank too)",
+    "email": "hub4jtestorgemail@could.be.null.com",
+    "twitter_username": null,
+    "is_verified": false,
+    "has_organization_projects": true,
+    "has_repository_projects": true,
+    "public_repos": 15,
+    "public_gists": 0,
+    "followers": 0,
+    "following": 0,
+    "html_url": "https://github.com/hub4j-test-org",
+    "created_at": "2014-05-10T19:39:11Z",
+    "updated_at": "2020-06-04T05:56:10Z",
+    "type": "Organization"
+  },
+  "parent": null
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/__files/user-1.json
@@ -0,0 +1,46 @@
+{
+  "login": "bitwiseman",
+  "id": 1958953,
+  "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+  "gravatar_id": "",
+  "url": "https://api.github.com/users/bitwiseman",
+  "html_url": "https://github.com/bitwiseman",
+  "followers_url": "https://api.github.com/users/bitwiseman/followers",
+  "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+  "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+  "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+  "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+  "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+  "repos_url": "https://api.github.com/users/bitwiseman/repos",
+  "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+  "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+  "type": "User",
+  "site_admin": false,
+  "name": "Liam Newman",
+  "company": "Cloudbees, Inc.",
+  "blog": "",
+  "location": "Seattle, WA, USA",
+  "email": "bitwiseman@gmail.com",
+  "hireable": null,
+  "bio": "https://twitter.com/bitwiseman",
+  "twitter_username": null,
+  "public_repos": 187,
+  "public_gists": 7,
+  "followers": 161,
+  "following": 9,
+  "created_at": "2012-07-11T20:38:33Z",
+  "updated_at": "2020-05-29T18:24:44Z",
+  "private_gists": 19,
+  "total_private_repos": 12,
+  "owned_private_repos": 0,
+  "disk_usage": 33700,
+  "collaborators": 0,
+  "two_factor_authentication": true,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "collaborators": 0,
+    "private_repos": 10000
+  }
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/organizations_7544739_team_3451996_discussions-4.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/organizations_7544739_team_3451996_discussions-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "e99eb2d0-5c5d-42f7-a883-546db75493e4",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Some Discussion\",\"body\":\"This is a public discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-4.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4751",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"e54b9b7ddc5c67ae5103fadab8080b1e\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "Location": "https://api.github.com/organizations/7544739/team/3451996/discussions/57",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF1:24BF:5492EF:64DB5E:5EDAD06C"
+    }
+  },
+  "uuid": "e99eb2d0-5c5d-42f7-a883-546db75493e4",
+  "persistent": true,
+  "insertionIndex": 4
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/organizations_7544739_team_3451996_discussions-5.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/organizations_7544739_team_3451996_discussions-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "838ad222-65d5-47c7-bb86-cd47ba2de6f2",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"private\":false,\"title\":\"Some Discussion\",\"body\":\"This is another public discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-5.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4750",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"bc86e15d1de977f57689648ef418547a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "Location": "https://api.github.com/organizations/7544739/team/3451996/discussions/58",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF1:24BF:549306:64DB6F:5EDAD06C"
+    }
+  },
+  "uuid": "838ad222-65d5-47c7-bb86-cd47ba2de6f2",
+  "persistent": true,
+  "insertionIndex": 5
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/organizations_7544739_team_3451996_discussions-6.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/organizations_7544739_team_3451996_discussions-6.json
@@ -0,0 +1,54 @@
+{
+  "id": "d6c070f6-fd08-4b88-a254-d6d35986cb74",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"private\":true,\"title\":\"Some Discussion\",\"body\":\"This is a private (secret) discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-6.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4749",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"c4ca8b7d421176c6e80f3c6d00ab6f0b\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "Location": "https://api.github.com/organizations/7544739/team/3451996/discussions/59",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF1:24BF:54931E:64DB8A:5EDAD06D"
+    }
+  },
+  "uuid": "d6c070f6-fd08-4b88-a254-d6d35986cb74",
+  "persistent": true,
+  "insertionIndex": 6
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/organizations_7544739_team_3451996_discussions-7.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/organizations_7544739_team_3451996_discussions-7.json
@@ -0,0 +1,47 @@
+{
+  "id": "5f6075fe-cdc4-4fb6-a2cb-ee22cb4e85b8",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Some Discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 422,
+    "body": "{\"message\":\"Invalid request.\\n\\n\\\"body\\\" wasn't supplied.\",\"documentation_url\":\"https://developer.github.com/v3/teams/discussions/#create-a-discussion\"}",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "422 Unprocessable Entity",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4748",
+      "X-RateLimit-Reset": "1591398936",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": "Accept-Encoding, Accept, X-Requested-With",
+      "X-GitHub-Request-Id": "CFF1:24BF:54932E:64DB9C:5EDAD06D"
+    }
+  },
+  "uuid": "5f6075fe-cdc4-4fb6-a2cb-ee22cb4e85b8",
+  "persistent": true,
+  "insertionIndex": 7
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/orgs_hub4j-test-org-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "98208c3a-6b4c-4b98-adb1-b063f7b2c7bf",
+  "name": "orgs_hub4j-test-org",
+  "request": {
+    "url": "/orgs/hub4j-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4753",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0557d9126fa25140eab7bdf16c451149\"",
+      "Last-Modified": "Thu, 04 Jun 2020 05:56:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF1:24BF:5492E0:64DB3F:5EDAD06B"
+    }
+  },
+  "uuid": "98208c3a-6b4c-4b98-adb1-b063f7b2c7bf",
+  "persistent": true,
+  "insertionIndex": 2
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-3.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "ab3d6c7f-c986-4aa1-abf6-14e27bd88ea5",
+  "name": "orgs_hub4j-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/hub4j-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org_teams_dummy-team-3.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:28 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4752",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"adf552e4a615c271e66b7d2bb00e61c4\"",
+      "Last-Modified": "Tue, 02 Jun 2020 19:31:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF1:24BF:5492E7:64DB52:5EDAD06C"
+    }
+  },
+  "uuid": "ab3d6c7f-c986-4aa1-abf6-14e27bd88ea5",
+  "persistent": true,
+  "insertionIndex": 3
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testCreatedDiscussion/mappings/user-1.json
@@ -0,0 +1,47 @@
+{
+  "id": "5f43c9c9-2d3d-45cf-9226-a8503c3815ec",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:27 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4755",
+      "X-RateLimit-Reset": "1591398935",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7e41c6c634de27b9ab8f4e95a42d16db\"",
+      "Last-Modified": "Fri, 29 May 2020 18:24:44 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF1:24BF:5492CD:64DB35:5EDAD06B"
+    }
+  },
+  "uuid": "5f43c9c9-2d3d-45cf-9226-a8503c3815ec",
+  "persistent": true,
+  "insertionIndex": 1
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions-4.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions-4.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion",
+  "body_html": "<p>This is a test discussion</p>",
+  "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64/comments",
+  "created_at": "2020-06-08T18:43:30Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/64",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE4MzQx",
+  "number": 64,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion",
+  "updated_at": "2020-06-08T18:43:30Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-10.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-10.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion updated",
+  "body_html": "<p>This is a test discussion updated</p>",
+  "body_version": "64d46f79a6f4c3806511b2029154a508",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64/comments",
+  "created_at": "2020-06-08T18:43:30Z",
+  "last_edited_at": "2020-06-08T18:43:33Z",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/64",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE4MzQx",
+  "number": 64,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Title updated",
+  "updated_at": "2020-06-08T18:43:33Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-5.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-5.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion",
+  "body_html": "<p>This is a test discussion</p>",
+  "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64/comments",
+  "created_at": "2020-06-08T18:43:30Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/64",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE4MzQx",
+  "number": 64,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion",
+  "updated_at": "2020-06-08T18:43:30Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-6.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-6.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion changed",
+  "body_html": "<p>This is a test discussion changed</p>",
+  "body_version": "40d6d08e84d525b5f268b25f5c9b14d1",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64/comments",
+  "created_at": "2020-06-08T18:43:30Z",
+  "last_edited_at": "2020-06-08T18:43:31Z",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/64",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE4MzQx",
+  "number": 64,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion",
+  "updated_at": "2020-06-08T18:43:31Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-7.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-7.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion changed",
+  "body_html": "<p>This is a test discussion changed</p>",
+  "body_version": "40d6d08e84d525b5f268b25f5c9b14d1",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64/comments",
+  "created_at": "2020-06-08T18:43:30Z",
+  "last_edited_at": "2020-06-08T18:43:31Z",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/64",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE4MzQx",
+  "number": 64,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Title changed",
+  "updated_at": "2020-06-08T18:43:32Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-9.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/organizations_7544739_team_3451996_discussions_64-9.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion changed",
+  "body_html": "<p>This is a test discussion changed</p>",
+  "body_version": "40d6d08e84d525b5f268b25f5c9b14d1",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64/comments",
+  "created_at": "2020-06-08T18:43:30Z",
+  "last_edited_at": "2020-06-08T18:43:31Z",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/64",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE4MzQx",
+  "number": 64,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Title changed",
+  "updated_at": "2020-06-08T18:43:32Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/64"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/orgs_hub4j-test-org-2.json
@@ -0,0 +1,47 @@
+{
+  "login": "hub4j-test-org",
+  "id": 7544739,
+  "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+  "url": "https://api.github.com/orgs/hub4j-test-org",
+  "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+  "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+  "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+  "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+  "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+  "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+  "description": "Hub4j Test Org Description (this could be null or blank too)",
+  "name": "Hub4j Test Org Name (this could be null or blank too)",
+  "company": null,
+  "blog": "https://hub4j.url.io/could/be/null",
+  "location": "Hub4j Test Org Location (this could be null or blank too)",
+  "email": "hub4jtestorgemail@could.be.null.com",
+  "twitter_username": null,
+  "is_verified": false,
+  "has_organization_projects": true,
+  "has_repository_projects": true,
+  "public_repos": 15,
+  "public_gists": 0,
+  "followers": 0,
+  "following": 0,
+  "html_url": "https://github.com/hub4j-test-org",
+  "created_at": "2014-05-10T19:39:11Z",
+  "updated_at": "2020-06-04T05:56:10Z",
+  "type": "Organization",
+  "total_private_repos": 0,
+  "owned_private_repos": 0,
+  "private_gists": 0,
+  "disk_usage": 148,
+  "collaborators": 0,
+  "billing_email": "kk@kohsuke.org",
+  "default_repository_permission": "none",
+  "members_can_create_repositories": false,
+  "two_factor_requirement_enabled": false,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "private_repos": 10000,
+    "filled_seats": 18,
+    "seats": 3
+  }
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-3.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-3.json
@@ -0,0 +1,49 @@
+{
+  "name": "dummy-team",
+  "id": 3451996,
+  "node_id": "MDQ6VGVhbTM0NTE5OTY=",
+  "slug": "dummy-team",
+  "description": "Updated by API TestModified",
+  "privacy": "closed",
+  "url": "https://api.github.com/organizations/7544739/team/3451996",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team",
+  "members_url": "https://api.github.com/organizations/7544739/team/3451996/members{/member}",
+  "repositories_url": "https://api.github.com/organizations/7544739/team/3451996/repos",
+  "permission": "pull",
+  "created_at": "2019-10-03T21:46:12Z",
+  "updated_at": "2020-06-02T19:31:50Z",
+  "members_count": 1,
+  "repos_count": 1,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "url": "https://api.github.com/orgs/hub4j-test-org",
+    "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+    "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+    "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+    "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+    "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "description": "Hub4j Test Org Description (this could be null or blank too)",
+    "name": "Hub4j Test Org Name (this could be null or blank too)",
+    "company": null,
+    "blog": "https://hub4j.url.io/could/be/null",
+    "location": "Hub4j Test Org Location (this could be null or blank too)",
+    "email": "hub4jtestorgemail@could.be.null.com",
+    "twitter_username": null,
+    "is_verified": false,
+    "has_organization_projects": true,
+    "has_repository_projects": true,
+    "public_repos": 15,
+    "public_gists": 0,
+    "followers": 0,
+    "following": 0,
+    "html_url": "https://github.com/hub4j-test-org",
+    "created_at": "2014-05-10T19:39:11Z",
+    "updated_at": "2020-06-04T05:56:10Z",
+    "type": "Organization"
+  },
+  "parent": null
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-8.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-8.json
@@ -0,0 +1,49 @@
+{
+  "name": "dummy-team",
+  "id": 3451996,
+  "node_id": "MDQ6VGVhbTM0NTE5OTY=",
+  "slug": "dummy-team",
+  "description": "Updated by API TestModified",
+  "privacy": "closed",
+  "url": "https://api.github.com/organizations/7544739/team/3451996",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team",
+  "members_url": "https://api.github.com/organizations/7544739/team/3451996/members{/member}",
+  "repositories_url": "https://api.github.com/organizations/7544739/team/3451996/repos",
+  "permission": "pull",
+  "created_at": "2019-10-03T21:46:12Z",
+  "updated_at": "2020-06-02T19:31:50Z",
+  "members_count": 1,
+  "repos_count": 1,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "url": "https://api.github.com/orgs/hub4j-test-org",
+    "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+    "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+    "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+    "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+    "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "description": "Hub4j Test Org Description (this could be null or blank too)",
+    "name": "Hub4j Test Org Name (this could be null or blank too)",
+    "company": null,
+    "blog": "https://hub4j.url.io/could/be/null",
+    "location": "Hub4j Test Org Location (this could be null or blank too)",
+    "email": "hub4jtestorgemail@could.be.null.com",
+    "twitter_username": null,
+    "is_verified": false,
+    "has_organization_projects": true,
+    "has_repository_projects": true,
+    "public_repos": 15,
+    "public_gists": 0,
+    "followers": 0,
+    "following": 0,
+    "html_url": "https://github.com/hub4j-test-org",
+    "created_at": "2014-05-10T19:39:11Z",
+    "updated_at": "2020-06-04T05:56:10Z",
+    "type": "Organization"
+  },
+  "parent": null
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/__files/user-1.json
@@ -0,0 +1,46 @@
+{
+  "login": "bitwiseman",
+  "id": 1958953,
+  "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+  "gravatar_id": "",
+  "url": "https://api.github.com/users/bitwiseman",
+  "html_url": "https://github.com/bitwiseman",
+  "followers_url": "https://api.github.com/users/bitwiseman/followers",
+  "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+  "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+  "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+  "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+  "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+  "repos_url": "https://api.github.com/users/bitwiseman/repos",
+  "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+  "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+  "type": "User",
+  "site_admin": false,
+  "name": "Liam Newman",
+  "company": "Cloudbees, Inc.",
+  "blog": "",
+  "location": "Seattle, WA, USA",
+  "email": "bitwiseman@gmail.com",
+  "hireable": null,
+  "bio": "https://twitter.com/bitwiseman",
+  "twitter_username": null,
+  "public_repos": 187,
+  "public_gists": 7,
+  "followers": 161,
+  "following": 9,
+  "created_at": "2012-07-11T20:38:33Z",
+  "updated_at": "2020-05-29T18:24:44Z",
+  "private_gists": 19,
+  "total_private_repos": 12,
+  "owned_private_repos": 0,
+  "disk_usage": 33700,
+  "collaborators": 0,
+  "two_factor_authentication": true,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "collaborators": 0,
+    "private_repos": 10000
+  }
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions-4.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "d0d593b5-4fec-4e00-97cb-0be87dcf3a65",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Some Discussion\",\"body\":\"This is a test discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-4.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4957",
+      "X-RateLimit-Reset": "1591642578",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"fa7ed609b5bcd7cbba13e22df861b688\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "Location": "https://api.github.com/organizations/7544739/team/3451996/discussions/64",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CBD:39F052:5EDE86D2"
+    }
+  },
+  "uuid": "d0d593b5-4fec-4e00-97cb-0be87dcf3a65",
+  "persistent": true,
+  "insertionIndex": 4
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-10.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-10.json
@@ -0,0 +1,53 @@
+{
+  "id": "8e2e62e2-56b6-469c-8f6a-77ba40fc9494",
+  "name": "organizations_7544739_team_3451996_discussions_64",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions/64",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Title updated\",\"body\":\"This is a test discussion updated\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions_64-10.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4951",
+      "X-RateLimit-Reset": "1591642579",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0e132309e9aca4393134aa70e222cef9\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CD8:39F070:5EDE86D4"
+    }
+  },
+  "uuid": "8e2e62e2-56b6-469c-8f6a-77ba40fc9494",
+  "persistent": true,
+  "insertionIndex": 10
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-5.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-5.json
@@ -0,0 +1,49 @@
+{
+  "id": "188c7eef-a962-41af-81be-bb487e44add2",
+  "name": "organizations_7544739_team_3451996_discussions_64",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions/64",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions_64-5.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4956",
+      "X-RateLimit-Reset": "1591642579",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"fa7ed609b5bcd7cbba13e22df861b688\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:discussion, write:discussion",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CC2:39F057:5EDE86D3"
+    }
+  },
+  "uuid": "188c7eef-a962-41af-81be-bb487e44add2",
+  "persistent": true,
+  "scenarioName": "scenario-2-organizations-7544739-team-3451996-discussions-64",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-2-organizations-7544739-team-3451996-discussions-64-2",
+  "insertionIndex": 5
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-6.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-6.json
@@ -0,0 +1,53 @@
+{
+  "id": "faec08a3-a746-45c3-ac33-52d830e37854",
+  "name": "organizations_7544739_team_3451996_discussions_64",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions/64",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Some Discussion\",\"body\":\"This is a test discussion changed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions_64-6.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4955",
+      "X-RateLimit-Reset": "1591642578",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"e8f61210b01e7faca044ff4ab01e37c7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CC5:39F05B:5EDE86D3"
+    }
+  },
+  "uuid": "faec08a3-a746-45c3-ac33-52d830e37854",
+  "persistent": true,
+  "insertionIndex": 6
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-7.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-7.json
@@ -0,0 +1,53 @@
+{
+  "id": "429533ef-462c-4582-a484-dadcc6c6200c",
+  "name": "organizations_7544739_team_3451996_discussions_64",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions/64",
+    "method": "PATCH",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Title changed\",\"body\":\"This is a test discussion changed\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions_64-7.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4954",
+      "X-RateLimit-Reset": "1591642579",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b6481a9983d068bb81f4e85ad321ddd7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CCD:39F063:5EDE86D3"
+    }
+  },
+  "uuid": "429533ef-462c-4582-a484-dadcc6c6200c",
+  "persistent": true,
+  "insertionIndex": 7
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-9.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/organizations_7544739_team_3451996_discussions_64-9.json
@@ -0,0 +1,48 @@
+{
+  "id": "a257d38b-10a3-4d97-a891-8f0772867cfc",
+  "name": "organizations_7544739_team_3451996_discussions_64",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions/64",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions_64-9.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4952",
+      "X-RateLimit-Reset": "1591642578",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"b6481a9983d068bb81f4e85ad321ddd7\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:discussion, write:discussion",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CD4:39F06C:5EDE86D4"
+    }
+  },
+  "uuid": "a257d38b-10a3-4d97-a891-8f0772867cfc",
+  "persistent": true,
+  "scenarioName": "scenario-2-organizations-7544739-team-3451996-discussions-64",
+  "requiredScenarioState": "scenario-2-organizations-7544739-team-3451996-discussions-64-2",
+  "insertionIndex": 9
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/orgs_hub4j-test-org-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "bfb96aef-cd13-4870-8345-c2365a5a7feb",
+  "name": "orgs_hub4j-test-org",
+  "request": {
+    "url": "/orgs/hub4j-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org-2.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4959",
+      "X-RateLimit-Reset": "1591642579",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0557d9126fa25140eab7bdf16c451149\"",
+      "Last-Modified": "Thu, 04 Jun 2020 05:56:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CB4:39F042:5EDE86D1"
+    }
+  },
+  "uuid": "bfb96aef-cd13-4870-8345-c2365a5a7feb",
+  "persistent": true,
+  "insertionIndex": 2
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-3.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "9e604f25-f6e6-4a1a-992f-c9aa8bb6d325",
+  "name": "orgs_hub4j-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/hub4j-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org_teams_dummy-team-3.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:30 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4958",
+      "X-RateLimit-Reset": "1591642579",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"adf552e4a615c271e66b7d2bb00e61c4\"",
+      "Last-Modified": "Tue, 02 Jun 2020 19:31:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CB8:39F04B:5EDE86D2"
+    }
+  },
+  "uuid": "9e604f25-f6e6-4a1a-992f-c9aa8bb6d325",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-hub4j-test-org-teams-dummy-team",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-orgs-hub4j-test-org-teams-dummy-team-2",
+  "insertionIndex": 3
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-8.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-8.json
@@ -0,0 +1,49 @@
+{
+  "id": "b0e9b0f2-422d-4dad-b1a6-1664b039b1f1",
+  "name": "orgs_hub4j-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/hub4j-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org_teams_dummy-team-8.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4953",
+      "X-RateLimit-Reset": "1591642579",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"adf552e4a615c271e66b7d2bb00e61c4\"",
+      "Last-Modified": "Tue, 02 Jun 2020 19:31:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CD2:39F069:5EDE86D4"
+    }
+  },
+  "uuid": "b0e9b0f2-422d-4dad-b1a6-1664b039b1f1",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-hub4j-test-org-teams-dummy-team",
+  "requiredScenarioState": "scenario-1-orgs-hub4j-test-org-teams-dummy-team-2",
+  "insertionIndex": 8
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testGetAndEditDiscussion/mappings/user-1.json
@@ -0,0 +1,47 @@
+{
+  "id": "54a33589-feb1-45e9-b794-967a6d3f5f30",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Mon, 08 Jun 2020 18:43:29 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4961",
+      "X-RateLimit-Reset": "1591642578",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7e41c6c634de27b9ab8f4e95a42d16db\"",
+      "Last-Modified": "Fri, 29 May 2020 18:24:44 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E996:682F:301CAE:39F040:5EDE86D1"
+    }
+  },
+  "uuid": "54a33589-feb1-45e9-b794-967a6d3f5f30",
+  "persistent": true,
+  "insertionIndex": 1
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/organizations_7544739_team_3451996_discussions-4.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/organizations_7544739_team_3451996_discussions-4.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion",
+  "body_html": "<p>This is a test discussion</p>",
+  "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/61/comments",
+  "created_at": "2020-06-05T23:08:34Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/61",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODUy",
+  "number": 61,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion A",
+  "updated_at": "2020-06-05T23:08:34Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/61"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/organizations_7544739_team_3451996_discussions-5.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/organizations_7544739_team_3451996_discussions-5.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion",
+  "body_html": "<p>This is a test discussion</p>",
+  "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/62/comments",
+  "created_at": "2020-06-05T23:08:35Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/62",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODUz",
+  "number": 62,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion B",
+  "updated_at": "2020-06-05T23:08:35Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/62"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/organizations_7544739_team_3451996_discussions-6.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/organizations_7544739_team_3451996_discussions-6.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion",
+  "body_html": "<p>This is a test discussion</p>",
+  "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/63/comments",
+  "created_at": "2020-06-05T23:08:35Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/63",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODU0",
+  "number": 63,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion C",
+  "updated_at": "2020-06-05T23:08:35Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/63"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/organizations_7544739_team_3451996_discussions-7.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/organizations_7544739_team_3451996_discussions-7.json
@@ -0,0 +1,116 @@
+[
+  {
+    "author": {
+      "login": "bitwiseman",
+      "id": 1958953,
+      "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/bitwiseman",
+      "html_url": "https://github.com/bitwiseman",
+      "followers_url": "https://api.github.com/users/bitwiseman/followers",
+      "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+      "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+      "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+      "repos_url": "https://api.github.com/users/bitwiseman/repos",
+      "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "body": "This is a test discussion",
+    "body_html": "<p>This is a test discussion</p>",
+    "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+    "comments_count": 0,
+    "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/63/comments",
+    "created_at": "2020-06-05T23:08:35Z",
+    "last_edited_at": null,
+    "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/63",
+    "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODU0",
+    "number": 63,
+    "pinned": false,
+    "private": false,
+    "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+    "title": "Some Discussion C",
+    "updated_at": "2020-06-05T23:08:35Z",
+    "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/63"
+  },
+  {
+    "author": {
+      "login": "bitwiseman",
+      "id": 1958953,
+      "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/bitwiseman",
+      "html_url": "https://github.com/bitwiseman",
+      "followers_url": "https://api.github.com/users/bitwiseman/followers",
+      "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+      "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+      "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+      "repos_url": "https://api.github.com/users/bitwiseman/repos",
+      "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "body": "This is a test discussion",
+    "body_html": "<p>This is a test discussion</p>",
+    "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+    "comments_count": 0,
+    "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/62/comments",
+    "created_at": "2020-06-05T23:08:35Z",
+    "last_edited_at": null,
+    "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/62",
+    "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODUz",
+    "number": 62,
+    "pinned": false,
+    "private": false,
+    "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+    "title": "Some Discussion B",
+    "updated_at": "2020-06-05T23:08:35Z",
+    "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/62"
+  },
+  {
+    "author": {
+      "login": "bitwiseman",
+      "id": 1958953,
+      "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/bitwiseman",
+      "html_url": "https://github.com/bitwiseman",
+      "followers_url": "https://api.github.com/users/bitwiseman/followers",
+      "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+      "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+      "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+      "repos_url": "https://api.github.com/users/bitwiseman/repos",
+      "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "body": "This is a test discussion",
+    "body_html": "<p>This is a test discussion</p>",
+    "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+    "comments_count": 0,
+    "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/61/comments",
+    "created_at": "2020-06-05T23:08:34Z",
+    "last_edited_at": null,
+    "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/61",
+    "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODUy",
+    "number": 61,
+    "pinned": false,
+    "private": false,
+    "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+    "title": "Some Discussion A",
+    "updated_at": "2020-06-05T23:08:34Z",
+    "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/61"
+  }
+]
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/orgs_hub4j-test-org-2.json
@@ -0,0 +1,47 @@
+{
+  "login": "hub4j-test-org",
+  "id": 7544739,
+  "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+  "url": "https://api.github.com/orgs/hub4j-test-org",
+  "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+  "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+  "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+  "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+  "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+  "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+  "description": "Hub4j Test Org Description (this could be null or blank too)",
+  "name": "Hub4j Test Org Name (this could be null or blank too)",
+  "company": null,
+  "blog": "https://hub4j.url.io/could/be/null",
+  "location": "Hub4j Test Org Location (this could be null or blank too)",
+  "email": "hub4jtestorgemail@could.be.null.com",
+  "twitter_username": null,
+  "is_verified": false,
+  "has_organization_projects": true,
+  "has_repository_projects": true,
+  "public_repos": 15,
+  "public_gists": 0,
+  "followers": 0,
+  "following": 0,
+  "html_url": "https://github.com/hub4j-test-org",
+  "created_at": "2014-05-10T19:39:11Z",
+  "updated_at": "2020-06-04T05:56:10Z",
+  "type": "Organization",
+  "total_private_repos": 0,
+  "owned_private_repos": 0,
+  "private_gists": 0,
+  "disk_usage": 148,
+  "collaborators": 0,
+  "billing_email": "kk@kohsuke.org",
+  "default_repository_permission": "none",
+  "members_can_create_repositories": false,
+  "two_factor_requirement_enabled": false,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "private_repos": 10000,
+    "filled_seats": 18,
+    "seats": 3
+  }
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-3.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-3.json
@@ -0,0 +1,49 @@
+{
+  "name": "dummy-team",
+  "id": 3451996,
+  "node_id": "MDQ6VGVhbTM0NTE5OTY=",
+  "slug": "dummy-team",
+  "description": "Updated by API TestModified",
+  "privacy": "closed",
+  "url": "https://api.github.com/organizations/7544739/team/3451996",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team",
+  "members_url": "https://api.github.com/organizations/7544739/team/3451996/members{/member}",
+  "repositories_url": "https://api.github.com/organizations/7544739/team/3451996/repos",
+  "permission": "pull",
+  "created_at": "2019-10-03T21:46:12Z",
+  "updated_at": "2020-06-02T19:31:50Z",
+  "members_count": 1,
+  "repos_count": 1,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "url": "https://api.github.com/orgs/hub4j-test-org",
+    "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+    "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+    "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+    "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+    "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "description": "Hub4j Test Org Description (this could be null or blank too)",
+    "name": "Hub4j Test Org Name (this could be null or blank too)",
+    "company": null,
+    "blog": "https://hub4j.url.io/could/be/null",
+    "location": "Hub4j Test Org Location (this could be null or blank too)",
+    "email": "hub4jtestorgemail@could.be.null.com",
+    "twitter_username": null,
+    "is_verified": false,
+    "has_organization_projects": true,
+    "has_repository_projects": true,
+    "public_repos": 15,
+    "public_gists": 0,
+    "followers": 0,
+    "following": 0,
+    "html_url": "https://github.com/hub4j-test-org",
+    "created_at": "2014-05-10T19:39:11Z",
+    "updated_at": "2020-06-04T05:56:10Z",
+    "type": "Organization"
+  },
+  "parent": null
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/__files/user-1.json
@@ -0,0 +1,46 @@
+{
+  "login": "bitwiseman",
+  "id": 1958953,
+  "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+  "gravatar_id": "",
+  "url": "https://api.github.com/users/bitwiseman",
+  "html_url": "https://github.com/bitwiseman",
+  "followers_url": "https://api.github.com/users/bitwiseman/followers",
+  "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+  "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+  "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+  "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+  "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+  "repos_url": "https://api.github.com/users/bitwiseman/repos",
+  "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+  "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+  "type": "User",
+  "site_admin": false,
+  "name": "Liam Newman",
+  "company": "Cloudbees, Inc.",
+  "blog": "",
+  "location": "Seattle, WA, USA",
+  "email": "bitwiseman@gmail.com",
+  "hireable": null,
+  "bio": "https://twitter.com/bitwiseman",
+  "twitter_username": null,
+  "public_repos": 187,
+  "public_gists": 7,
+  "followers": 161,
+  "following": 9,
+  "created_at": "2012-07-11T20:38:33Z",
+  "updated_at": "2020-05-29T18:24:44Z",
+  "private_gists": 19,
+  "total_private_repos": 12,
+  "owned_private_repos": 0,
+  "disk_usage": 33700,
+  "collaborators": 0,
+  "two_factor_authentication": true,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "collaborators": 0,
+    "private_repos": 10000
+  }
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/organizations_7544739_team_3451996_discussions-4.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/organizations_7544739_team_3451996_discussions-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "a9fb558a-d4d8-4bdc-90c6-0c69cf0cccab",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Some Discussion A\",\"body\":\"This is a test discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-4.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4726",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"fda6ea6059960017264945de79550718\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "Location": "https://api.github.com/organizations/7544739/team/3451996/discussions/61",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFFB:979C:1DBF93:23C47C:5EDAD072"
+    }
+  },
+  "uuid": "a9fb558a-d4d8-4bdc-90c6-0c69cf0cccab",
+  "persistent": true,
+  "insertionIndex": 4
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/organizations_7544739_team_3451996_discussions-5.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/organizations_7544739_team_3451996_discussions-5.json
@@ -0,0 +1,54 @@
+{
+  "id": "8122b2d7-fb10-4a80-9c90-603a0331c40c",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Some Discussion B\",\"body\":\"This is a test discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-5.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4725",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"4acb1681262e9f89b5516ad5d804aee4\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "Location": "https://api.github.com/organizations/7544739/team/3451996/discussions/62",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFFB:979C:1DBF96:23C482:5EDAD072"
+    }
+  },
+  "uuid": "8122b2d7-fb10-4a80-9c90-603a0331c40c",
+  "persistent": true,
+  "insertionIndex": 5
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/organizations_7544739_team_3451996_discussions-6.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/organizations_7544739_team_3451996_discussions-6.json
@@ -0,0 +1,54 @@
+{
+  "id": "bb49da5d-06ed-4e5a-8df8-45b8c68f723e",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Some Discussion C\",\"body\":\"This is a test discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-6.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4724",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"c8879f78bca38d17e39a60ce77710200\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "Location": "https://api.github.com/organizations/7544739/team/3451996/discussions/63",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFFB:979C:1DBF99:23C484:5EDAD073"
+    }
+  },
+  "uuid": "bb49da5d-06ed-4e5a-8df8-45b8c68f723e",
+  "persistent": true,
+  "insertionIndex": 6
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/organizations_7544739_team_3451996_discussions-7.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/organizations_7544739_team_3451996_discussions-7.json
@@ -0,0 +1,46 @@
+{
+  "id": "2b24a93c-7d7e-481e-a3fd-681ff45d09e2",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-7.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:35 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4723",
+      "X-RateLimit-Reset": "1591398935",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"06cde48be7ded909e2643d7c62bc1b40\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "read:discussion, write:discussion",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFFB:979C:1DBF9D:23C489:5EDAD073"
+    }
+  },
+  "uuid": "2b24a93c-7d7e-481e-a3fd-681ff45d09e2",
+  "persistent": true,
+  "insertionIndex": 7
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/orgs_hub4j-test-org-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "0deb7fe4-0390-4fff-a7b3-64ec28d47535",
+  "name": "orgs_hub4j-test-org",
+  "request": {
+    "url": "/orgs/hub4j-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4728",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0557d9126fa25140eab7bdf16c451149\"",
+      "Last-Modified": "Thu, 04 Jun 2020 05:56:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFFB:979C:1DBF8B:23C473:5EDAD072"
+    }
+  },
+  "uuid": "0deb7fe4-0390-4fff-a7b3-64ec28d47535",
+  "persistent": true,
+  "insertionIndex": 2
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-3.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-3.json
@@ -0,0 +1,47 @@
+{
+  "id": "772cba72-3cc0-4e06-8be0-7ad41530bca1",
+  "name": "orgs_hub4j-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/hub4j-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org_teams_dummy-team-3.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4727",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"adf552e4a615c271e66b7d2bb00e61c4\"",
+      "Last-Modified": "Tue, 02 Jun 2020 19:31:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFFB:979C:1DBF8F:23C479:5EDAD072"
+    }
+  },
+  "uuid": "772cba72-3cc0-4e06-8be0-7ad41530bca1",
+  "persistent": true,
+  "insertionIndex": 3
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testListDiscussion/mappings/user-1.json
@@ -0,0 +1,47 @@
+{
+  "id": "9404c76c-b91e-4e46-b493-b7f09feb7588",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:34 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4730",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7e41c6c634de27b9ab8f4e95a42d16db\"",
+      "Last-Modified": "Fri, 29 May 2020 18:24:44 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFFB:979C:1DBF88:23C471:5EDAD071"
+    }
+  },
+  "uuid": "9404c76c-b91e-4e46-b493-b7f09feb7588",
+  "persistent": true,
+  "insertionIndex": 1
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/organizations_7544739_team_3451996_discussions-4.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/organizations_7544739_team_3451996_discussions-4.json
@@ -0,0 +1,38 @@
+{
+  "author": {
+    "login": "bitwiseman",
+    "id": 1958953,
+    "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/bitwiseman",
+    "html_url": "https://github.com/bitwiseman",
+    "followers_url": "https://api.github.com/users/bitwiseman/followers",
+    "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+    "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+    "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+    "repos_url": "https://api.github.com/users/bitwiseman/repos",
+    "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+    "type": "User",
+    "site_admin": false
+  },
+  "body": "This is a test discussion",
+  "body_html": "<p>This is a test discussion</p>",
+  "body_version": "db8c6cacef3d11b326f87a5f9f7a2df0",
+  "comments_count": 0,
+  "comments_url": "https://api.github.com/organizations/7544739/team/3451996/discussions/60/comments",
+  "created_at": "2020-06-05T23:08:32Z",
+  "last_edited_at": null,
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team/discussions/60",
+  "node_id": "MDE0OlRlYW1EaXNjdXNzaW9uMTE3ODUx",
+  "number": 60,
+  "pinned": false,
+  "private": false,
+  "team_url": "https://api.github.com/organizations/7544739/team/3451996",
+  "title": "Some Discussion",
+  "updated_at": "2020-06-05T23:08:32Z",
+  "url": "https://api.github.com/organizations/7544739/team/3451996/discussions/60"
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/orgs_hub4j-test-org-2.json
@@ -0,0 +1,47 @@
+{
+  "login": "hub4j-test-org",
+  "id": 7544739,
+  "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+  "url": "https://api.github.com/orgs/hub4j-test-org",
+  "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+  "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+  "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+  "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+  "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+  "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+  "description": "Hub4j Test Org Description (this could be null or blank too)",
+  "name": "Hub4j Test Org Name (this could be null or blank too)",
+  "company": null,
+  "blog": "https://hub4j.url.io/could/be/null",
+  "location": "Hub4j Test Org Location (this could be null or blank too)",
+  "email": "hub4jtestorgemail@could.be.null.com",
+  "twitter_username": null,
+  "is_verified": false,
+  "has_organization_projects": true,
+  "has_repository_projects": true,
+  "public_repos": 15,
+  "public_gists": 0,
+  "followers": 0,
+  "following": 0,
+  "html_url": "https://github.com/hub4j-test-org",
+  "created_at": "2014-05-10T19:39:11Z",
+  "updated_at": "2020-06-04T05:56:10Z",
+  "type": "Organization",
+  "total_private_repos": 0,
+  "owned_private_repos": 0,
+  "private_gists": 0,
+  "disk_usage": 148,
+  "collaborators": 0,
+  "billing_email": "kk@kohsuke.org",
+  "default_repository_permission": "none",
+  "members_can_create_repositories": false,
+  "two_factor_requirement_enabled": false,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "private_repos": 10000,
+    "filled_seats": 18,
+    "seats": 3
+  }
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-3.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-3.json
@@ -0,0 +1,49 @@
+{
+  "name": "dummy-team",
+  "id": 3451996,
+  "node_id": "MDQ6VGVhbTM0NTE5OTY=",
+  "slug": "dummy-team",
+  "description": "Updated by API TestModified",
+  "privacy": "closed",
+  "url": "https://api.github.com/organizations/7544739/team/3451996",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team",
+  "members_url": "https://api.github.com/organizations/7544739/team/3451996/members{/member}",
+  "repositories_url": "https://api.github.com/organizations/7544739/team/3451996/repos",
+  "permission": "pull",
+  "created_at": "2019-10-03T21:46:12Z",
+  "updated_at": "2020-06-02T19:31:50Z",
+  "members_count": 1,
+  "repos_count": 1,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "url": "https://api.github.com/orgs/hub4j-test-org",
+    "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+    "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+    "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+    "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+    "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "description": "Hub4j Test Org Description (this could be null or blank too)",
+    "name": "Hub4j Test Org Name (this could be null or blank too)",
+    "company": null,
+    "blog": "https://hub4j.url.io/could/be/null",
+    "location": "Hub4j Test Org Location (this could be null or blank too)",
+    "email": "hub4jtestorgemail@could.be.null.com",
+    "twitter_username": null,
+    "is_verified": false,
+    "has_organization_projects": true,
+    "has_repository_projects": true,
+    "public_repos": 15,
+    "public_gists": 0,
+    "followers": 0,
+    "following": 0,
+    "html_url": "https://github.com/hub4j-test-org",
+    "created_at": "2014-05-10T19:39:11Z",
+    "updated_at": "2020-06-04T05:56:10Z",
+    "type": "Organization"
+  },
+  "parent": null
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-6.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/orgs_hub4j-test-org_teams_dummy-team-6.json
@@ -0,0 +1,49 @@
+{
+  "name": "dummy-team",
+  "id": 3451996,
+  "node_id": "MDQ6VGVhbTM0NTE5OTY=",
+  "slug": "dummy-team",
+  "description": "Updated by API TestModified",
+  "privacy": "closed",
+  "url": "https://api.github.com/organizations/7544739/team/3451996",
+  "html_url": "https://github.com/orgs/hub4j-test-org/teams/dummy-team",
+  "members_url": "https://api.github.com/organizations/7544739/team/3451996/members{/member}",
+  "repositories_url": "https://api.github.com/organizations/7544739/team/3451996/repos",
+  "permission": "pull",
+  "created_at": "2019-10-03T21:46:12Z",
+  "updated_at": "2020-06-02T19:31:50Z",
+  "members_count": 1,
+  "repos_count": 1,
+  "organization": {
+    "login": "hub4j-test-org",
+    "id": 7544739,
+    "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
+    "url": "https://api.github.com/orgs/hub4j-test-org",
+    "repos_url": "https://api.github.com/orgs/hub4j-test-org/repos",
+    "events_url": "https://api.github.com/orgs/hub4j-test-org/events",
+    "hooks_url": "https://api.github.com/orgs/hub4j-test-org/hooks",
+    "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
+    "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
+    "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
+    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "description": "Hub4j Test Org Description (this could be null or blank too)",
+    "name": "Hub4j Test Org Name (this could be null or blank too)",
+    "company": null,
+    "blog": "https://hub4j.url.io/could/be/null",
+    "location": "Hub4j Test Org Location (this could be null or blank too)",
+    "email": "hub4jtestorgemail@could.be.null.com",
+    "twitter_username": null,
+    "is_verified": false,
+    "has_organization_projects": true,
+    "has_repository_projects": true,
+    "public_repos": 15,
+    "public_gists": 0,
+    "followers": 0,
+    "following": 0,
+    "html_url": "https://github.com/hub4j-test-org",
+    "created_at": "2014-05-10T19:39:11Z",
+    "updated_at": "2020-06-04T05:56:10Z",
+    "type": "Organization"
+  },
+  "parent": null
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/__files/user-1.json
@@ -0,0 +1,46 @@
+{
+  "login": "bitwiseman",
+  "id": 1958953,
+  "node_id": "MDQ6VXNlcjE5NTg5NTM=",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/1958953?v=4",
+  "gravatar_id": "",
+  "url": "https://api.github.com/users/bitwiseman",
+  "html_url": "https://github.com/bitwiseman",
+  "followers_url": "https://api.github.com/users/bitwiseman/followers",
+  "following_url": "https://api.github.com/users/bitwiseman/following{/other_user}",
+  "gists_url": "https://api.github.com/users/bitwiseman/gists{/gist_id}",
+  "starred_url": "https://api.github.com/users/bitwiseman/starred{/owner}{/repo}",
+  "subscriptions_url": "https://api.github.com/users/bitwiseman/subscriptions",
+  "organizations_url": "https://api.github.com/users/bitwiseman/orgs",
+  "repos_url": "https://api.github.com/users/bitwiseman/repos",
+  "events_url": "https://api.github.com/users/bitwiseman/events{/privacy}",
+  "received_events_url": "https://api.github.com/users/bitwiseman/received_events",
+  "type": "User",
+  "site_admin": false,
+  "name": "Liam Newman",
+  "company": "Cloudbees, Inc.",
+  "blog": "",
+  "location": "Seattle, WA, USA",
+  "email": "bitwiseman@gmail.com",
+  "hireable": null,
+  "bio": "https://twitter.com/bitwiseman",
+  "twitter_username": null,
+  "public_repos": 187,
+  "public_gists": 7,
+  "followers": 161,
+  "following": 9,
+  "created_at": "2012-07-11T20:38:33Z",
+  "updated_at": "2020-05-29T18:24:44Z",
+  "private_gists": 19,
+  "total_private_repos": 12,
+  "owned_private_repos": 0,
+  "disk_usage": 33700,
+  "collaborators": 0,
+  "two_factor_authentication": true,
+  "plan": {
+    "name": "free",
+    "space": 976562499,
+    "collaborators": 0,
+    "private_repos": 10000
+  }
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/organizations_7544739_team_3451996_discussions-4.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/organizations_7544739_team_3451996_discussions-4.json
@@ -0,0 +1,54 @@
+{
+  "id": "7f7b202f-1bee-458a-9fd5-1da36a9c7b85",
+  "name": "organizations_7544739_team_3451996_discussions",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions",
+    "method": "POST",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    },
+    "bodyPatterns": [
+      {
+        "equalToJson": "{\"title\":\"Some Discussion\",\"body\":\"This is a test discussion\"}",
+        "ignoreArrayOrder": true,
+        "ignoreExtraElements": false
+      }
+    ]
+  },
+  "response": {
+    "status": 201,
+    "bodyFileName": "organizations_7544739_team_3451996_discussions-4.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "201 Created",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4737",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "\"7d2dd64d5497312194db5251878b211a\"",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "Location": "https://api.github.com/organizations/7544739/team/3451996/discussions/60",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF6:682B:A5960A:C522DA:5EDAD070"
+    }
+  },
+  "uuid": "7f7b202f-1bee-458a-9fd5-1da36a9c7b85",
+  "persistent": true,
+  "insertionIndex": 4
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/organizations_7544739_team_3451996_discussions_60-5.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/organizations_7544739_team_3451996_discussions_60-5.json
@@ -0,0 +1,41 @@
+{
+  "id": "749f35ad-55e1-43b6-8748-1238ca7c01cb",
+  "name": "organizations_7544739_team_3451996_discussions_60",
+  "request": {
+    "url": "/organizations/7544739/team/3451996/discussions/60",
+    "method": "DELETE",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 204,
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:32 GMT",
+      "Server": "GitHub.com",
+      "Status": "204 No Content",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4736",
+      "X-RateLimit-Reset": "1591398936",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "write:discussion",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "Vary": [
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "X-GitHub-Request-Id": "CFF6:682B:A59634:C522FA:5EDAD070"
+    }
+  },
+  "uuid": "749f35ad-55e1-43b6-8748-1238ca7c01cb",
+  "persistent": true,
+  "insertionIndex": 5
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/organizations_7544739_team_3451996_discussions_60-7.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/organizations_7544739_team_3451996_discussions_60-7.json
@@ -1,8 +1,8 @@
 {
-  "id": "019cbb3c-4211-4212-b6ff-fc2a505e4dd0",
-  "name": "repos_hub4j-test-org_github-api_git_ref_heads_gh",
+  "id": "39105355-3f9f-4d78-b2ae-393a8b1ff2bc",
+  "name": "organizations_7544739_team_3451996_discussions_60",
  "request": {
-    "url": "/repos/hub4j-test-org/github-api/git/ref/heads/gh",
+    "url": "/organizations/7544739/team/3451996/discussions/60",
    "method": "GET",
    "headers": {
      "Accept": {
@@ -12,16 +12,15 @@
  },
  "response": {
    "status": 404,
-    "body": "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-single-reference\"}",
+    "body": "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/teams/discussions/#get-a-single-discussion\"}",
    "headers": {
-      "Date": "Wed, 20 May 2020 23:48:57 GMT",
+      "Date": "Fri, 05 Jun 2020 23:08:33 GMT",
      "Content-Type": "application/json; charset=utf-8",
      "Server": "GitHub.com",
      "Status": "404 Not Found",
      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4947",
-      "X-RateLimit-Reset": "1590020149",
-      "X-Poll-Interval": "300",
+      "X-RateLimit-Remaining": "4734",
+      "X-RateLimit-Reset": "1591398936",
      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
      "X-Accepted-OAuth-Scopes": "repo",
      "X-GitHub-Media-Type": "unknown, github.v3",
@@ -32,10 +31,10 @@
      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
      "Content-Security-Policy": "default-src 'none'",
      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "EFC6:5429:F7779:126AFA:5EC5C1E9"
+      "X-GitHub-Request-Id": "CFF6:682B:A59666:C52342:5EDAD071"
    }
  },
-  "uuid": "019cbb3c-4211-4212-b6ff-fc2a505e4dd0",
+  "uuid": "39105355-3f9f-4d78-b2ae-393a8b1ff2bc",
  "persistent": true,
  "insertionIndex": 7
 }
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/orgs_hub4j-test-org-2.json
@@ -0,0 +1,47 @@
+{
+  "id": "ee7942e4-237c-44df-b65f-0b7219e970eb",
+  "name": "orgs_hub4j-test-org",
+  "request": {
+    "url": "/orgs/hub4j-test-org",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org-2.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4739",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"0557d9126fa25140eab7bdf16c451149\"",
+      "Last-Modified": "Thu, 04 Jun 2020 05:56:10 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF6:682B:A595E7:C522A7:5EDAD06F"
+    }
+  },
+  "uuid": "ee7942e4-237c-44df-b65f-0b7219e970eb",
+  "persistent": true,
+  "insertionIndex": 2
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-3.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-3.json
@@ -0,0 +1,50 @@
+{
+  "id": "8766e21f-974b-4048-bbb6-eb5faa935737",
+  "name": "orgs_hub4j-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/hub4j-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org_teams_dummy-team-3.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:32 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4738",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"adf552e4a615c271e66b7d2bb00e61c4\"",
+      "Last-Modified": "Tue, 02 Jun 2020 19:31:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF6:682B:A595F8:C522C5:5EDAD06F"
+    }
+  },
+  "uuid": "8766e21f-974b-4048-bbb6-eb5faa935737",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-hub4j-test-org-teams-dummy-team",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "scenario-1-orgs-hub4j-test-org-teams-dummy-team-2",
+  "insertionIndex": 3
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-6.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/orgs_hub4j-test-org_teams_dummy-team-6.json
@@ -0,0 +1,49 @@
+{
+  "id": "0fd0e9bb-47b9-4526-b489-afc1afe25f42",
+  "name": "orgs_hub4j-test-org_teams_dummy-team",
+  "request": {
+    "url": "/orgs/hub4j-test-org/teams/dummy-team",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "orgs_hub4j-test-org_teams_dummy-team-6.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:33 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4735",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"adf552e4a615c271e66b7d2bb00e61c4\"",
+      "Last-Modified": "Tue, 02 Jun 2020 19:31:50 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF6:682B:A59655:C52324:5EDAD070"
+    }
+  },
+  "uuid": "0fd0e9bb-47b9-4526-b489-afc1afe25f42",
+  "persistent": true,
+  "scenarioName": "scenario-1-orgs-hub4j-test-org-teams-dummy-team",
+  "requiredScenarioState": "scenario-1-orgs-hub4j-test-org-teams-dummy-team-2",
+  "insertionIndex": 6
+}
--- a/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHDiscussionTest/wiremock/testToDeleteDiscussion/mappings/user-1.json
@@ -0,0 +1,47 @@
+{
+  "id": "eb10af45-4001-4548-b1ed-1ea752b8d64f",
+  "name": "user",
+  "request": {
+    "url": "/user",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "user-1.json",
+    "headers": {
+      "Date": "Fri, 05 Jun 2020 23:08:31 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4741",
+      "X-RateLimit-Reset": "1591398936",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"7e41c6c634de27b9ab8f4e95a42d16db\"",
+      "Last-Modified": "Fri, 29 May 2020 18:24:44 GMT",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "CFF6:682B:A595C7:C52293:5EDAD06F"
+    }
+  },
+  "uuid": "eb10af45-4001-4548-b1ed-1ea752b8d64f",
+  "persistent": true,
+  "insertionIndex": 1
+}
--- a/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api_git_refs_heads_master-3.json
+++ b/src/test/resources/org/kohsuke/github/GHEventPayloadTest/wiremock/pushToFork/mappings/repos_hub4j_github-api_git_refs_heads_master-3.json
@@ -2,7 +2,7 @@
  "id": "79569c1e-168b-4816-930b-1ac370e164b9",
  "name": "repos_hub4j_github-api_git_refs_heads_master",
  "request": {
-    "url": "/repos/hub4j/github-api/git/ref/heads/master",
+    "url": "/repos/hub4j/github-api/git/refs/heads/master",
    "method": "GET",
    "headers": {
      "Accept": {
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_hub4j-test-org_github-api_git_refs_heads_master-4.json
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/squashMerge/mappings/repos_hub4j-test-org_github-api_git_refs_heads_master-4.json
@@ -2,7 +2,7 @@
  "id": "7bfa9315-c036-44af-bc3c-1e639325a8fe",
  "name": "repos_hub4j-test-org_github-api_git_refs_heads_master",
  "request": {
-    "url": "/repos/hub4j-test-org/github-api/git/ref/heads/master",
+    "url": "/repos/hub4j-test-org/github-api/git/refs/heads/master",
    "method": "GET",
    "headers": {
      "Accept": {
--- a/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_hub4j-test-org_github-api_git_refs_heads_master-4.json
+++ b/src/test/resources/org/kohsuke/github/GHPullRequestTest/wiremock/updateContentSquashMerge/mappings/repos_hub4j-test-org_github-api_git_refs_heads_master-4.json
@@ -2,7 +2,7 @@
  "id": "fa77be60-4286-4610-bff6-3ab0bac74b1f",
  "name": "repos_hub4j-test-org_github-api_git_refs_heads_master",
  "request": {
-    "url": "/repos/hub4j-test-org/github-api/git/ref/heads/master",
+    "url": "/repos/hub4j-test-org/github-api/git/refs/heads/master",
    "method": "GET",
    "headers": {
      "Accept": {
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/orgs_hub4j-test-org-2.json
@@ -10,17 +10,23 @@
  "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
  "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
  "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
-  "description": null,
+  "description": "Hub4j Test Org Description (this could be null or blank too)",
+  "name": "Hub4j Test Org Name (this could be null or blank too)",
+  "company": null,
+  "blog": "https://hub4j.url.io/could/be/null",
+  "location": "Hub4j Test Org Location (this could be null or blank too)",
+  "email": "hub4jtestorgemail@could.be.null.com",
+  "twitter_username": null,
  "is_verified": false,
  "has_organization_projects": true,
  "has_repository_projects": true,
-  "public_repos": 15,
+  "public_repos": 12,
  "public_gists": 0,
  "followers": 0,
  "following": 0,
  "html_url": "https://github.com/hub4j-test-org",
  "created_at": "2014-05-10T19:39:11Z",
-  "updated_at": "2020-05-15T15:14:14Z",
+  "updated_at": "2020-06-04T05:56:10Z",
  "type": "Organization",
  "total_private_repos": 0,
  "owned_private_repos": 0,
@@ -35,7 +41,7 @@
    "name": "free",
    "space": 976562499,
    "private_repos": 10000,
-    "filled_seats": 17,
+    "filled_seats": 18,
    "seats": 3
  }
 }
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api-3.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api-3.json
@@ -25,7 +25,7 @@
    "site_admin": false
  },
  "html_url": "https://github.com/hub4j-test-org/github-api",
-  "description": "Tricky",
+  "description": "Resetting",
  "fork": true,
  "url": "https://api.github.com/repos/hub4j-test-org/github-api",
  "forks_url": "https://api.github.com/repos/hub4j-test-org/github-api/forks",
@@ -65,7 +65,7 @@
  "releases_url": "https://api.github.com/repos/hub4j-test-org/github-api/releases{/id}",
  "deployments_url": "https://api.github.com/repos/hub4j-test-org/github-api/deployments",
  "created_at": "2019-09-06T23:26:04Z",
-  "updated_at": "2020-01-16T21:22:56Z",
+  "updated_at": "2020-06-10T23:27:59Z",
  "pushed_at": "2020-05-20T16:22:43Z",
  "git_url": "git://github.com/hub4j-test-org/github-api.git",
  "ssh_url": "git@github.com:hub4j-test-org/github-api.git",
@@ -194,27 +194,27 @@
    "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}",
    "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments",
    "created_at": "2010-04-19T04:13:03Z",
-    "updated_at": "2020-05-20T22:54:46Z",
-    "pushed_at": "2020-05-20T20:24:04Z",
+    "updated_at": "2020-06-11T00:43:49Z",
+    "pushed_at": "2020-06-11T00:30:13Z",
    "git_url": "git://github.com/hub4j/github-api.git",
    "ssh_url": "git@github.com:hub4j/github-api.git",
    "clone_url": "https://github.com/hub4j/github-api.git",
    "svn_url": "https://github.com/hub4j/github-api",
    "homepage": "https://github-api.kohsuke.org/",
-    "size": 23100,
-    "stargazers_count": 656,
-    "watchers_count": 656,
+    "size": 24124,
+    "stargazers_count": 669,
+    "watchers_count": 669,
    "language": "Java",
    "has_issues": true,
    "has_projects": true,
    "has_downloads": true,
    "has_wiki": true,
    "has_pages": true,
-    "forks_count": 478,
+    "forks_count": 481,
    "mirror_url": null,
    "archived": false,
    "disabled": false,
-    "open_issues_count": 67,
+    "open_issues_count": 64,
    "license": {
      "key": "mit",
      "name": "MIT License",
@@ -222,9 +222,9 @@
      "url": "https://api.github.com/licenses/mit",
      "node_id": "MDc6TGljZW5zZTEz"
    },
-    "forks": 478,
-    "open_issues": 67,
-    "watchers": 656,
+    "forks": 481,
+    "open_issues": 64,
+    "watchers": 669,
    "default_branch": "master"
  },
  "source": {
@@ -294,27 +294,27 @@
    "releases_url": "https://api.github.com/repos/hub4j/github-api/releases{/id}",
    "deployments_url": "https://api.github.com/repos/hub4j/github-api/deployments",
    "created_at": "2010-04-19T04:13:03Z",
-    "updated_at": "2020-05-20T22:54:46Z",
-    "pushed_at": "2020-05-20T20:24:04Z",
+    "updated_at": "2020-06-11T00:43:49Z",
+    "pushed_at": "2020-06-11T00:30:13Z",
    "git_url": "git://github.com/hub4j/github-api.git",
    "ssh_url": "git@github.com:hub4j/github-api.git",
    "clone_url": "https://github.com/hub4j/github-api.git",
    "svn_url": "https://github.com/hub4j/github-api",
    "homepage": "https://github-api.kohsuke.org/",
-    "size": 23100,
-    "stargazers_count": 656,
-    "watchers_count": 656,
+    "size": 24124,
+    "stargazers_count": 669,
+    "watchers_count": 669,
    "language": "Java",
    "has_issues": true,
    "has_projects": true,
    "has_downloads": true,
    "has_wiki": true,
    "has_pages": true,
-    "forks_count": 478,
+    "forks_count": 481,
    "mirror_url": null,
    "archived": false,
    "disabled": false,
-    "open_issues_count": 67,
+    "open_issues_count": 64,
    "license": {
      "key": "mit",
      "name": "MIT License",
@@ -322,11 +322,11 @@
      "url": "https://api.github.com/licenses/mit",
      "node_id": "MDc6TGljZW5zZTEz"
    },
-    "forks": 478,
-    "open_issues": 67,
-    "watchers": 656,
+    "forks": 481,
+    "open_issues": 64,
+    "watchers": 669,
    "default_branch": "master"
  },
-  "network_count": 478,
+  "network_count": 481,
  "subscribers_count": 0
 }
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api_git_refs_heads_gh-7.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api_git_refs_heads_gh-7.json
@@ -0,0 +1,12 @@
+[
+  {
+    "ref": "refs/heads/gh-pages",
+    "node_id": "MDM6UmVmMjA2ODg4MjAxOnJlZnMvaGVhZHMvZ2gtcGFnZXM=",
+    "url": "https://api.github.com/repos/hub4j-test-org/github-api/git/refs/heads/gh-pages",
+    "object": {
+      "sha": "4e64a0f9c3d561ab8587d2f7b03074b8745b5943",
+      "type": "commit",
+      "url": "https://api.github.com/repos/hub4j-test-org/github-api/git/commits/4e64a0f9c3d561ab8587d2f7b03074b8745b5943"
+    }
+  }
+]
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-4.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-4.json
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-5.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-5.json
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-6.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-6.json
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/__files/user-1.json
@@ -24,16 +24,17 @@
  "email": "bitwiseman@gmail.com",
  "hireable": null,
  "bio": "https://twitter.com/bitwiseman",
-  "public_repos": 183,
+  "twitter_username": null,
+  "public_repos": 187,
  "public_gists": 7,
-  "followers": 159,
+  "followers": 161,
  "following": 9,
  "created_at": "2012-07-11T20:38:33Z",
-  "updated_at": "2020-05-20T16:02:42Z",
+  "updated_at": "2020-05-29T18:24:44Z",
  "private_gists": 19,
  "total_private_repos": 12,
  "owned_private_repos": 0,
-  "disk_usage": 33697,
+  "disk_usage": 33700,
  "collaborators": 0,
  "two_factor_authentication": true,
  "plan": {
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/orgs_hub4j-test-org-2.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/orgs_hub4j-test-org-2.json
@@ -1,5 +1,5 @@
 {
-  "id": "865b9946-8a74-4402-971b-ecd97db742e3",
+  "id": "93493987-1167-42ca-9ce1-668c3697700e",
  "name": "orgs_hub4j-test-org",
  "request": {
    "url": "/orgs/hub4j-test-org",
@@ -14,21 +14,21 @@
    "status": 200,
    "bodyFileName": "orgs_hub4j-test-org-2.json",
    "headers": {
-      "Date": "Wed, 20 May 2020 23:48:56 GMT",
+      "Date": "Thu, 11 Jun 2020 02:20:47 GMT",
      "Content-Type": "application/json; charset=utf-8",
      "Server": "GitHub.com",
      "Status": "200 OK",
      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4952",
-      "X-RateLimit-Reset": "1590020148",
+      "X-RateLimit-Remaining": "4917",
+      "X-RateLimit-Reset": "1591843209",
      "Cache-Control": "private, max-age=60, s-maxage=60",
      "Vary": [
        "Accept, Authorization, Cookie, X-GitHub-OTP",
        "Accept-Encoding, Accept, X-Requested-With",
        "Accept-Encoding"
      ],
-      "ETag": "W/\"de5da0827fbd925dd0dde9d2d6a85f45\"",
-      "Last-Modified": "Fri, 15 May 2020 15:14:14 GMT",
+      "ETag": "W/\"6bd323dd4ab2a01dae2464621246c3cd\"",
+      "Last-Modified": "Thu, 04 Jun 2020 05:56:10 GMT",
      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
      "X-Accepted-OAuth-Scopes": "admin:org, read:org, repo, user, write:org",
      "X-GitHub-Media-Type": "unknown, github.v3",
@@ -38,10 +38,10 @@
      "X-XSS-Protection": "1; mode=block",
      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EFC6:5429:F7742:126AA2:5EC5C1E7"
+      "X-GitHub-Request-Id": "E5B0:5D6A:3A9A6:47E29:5EE194FE"
    }
  },
-  "uuid": "865b9946-8a74-4402-971b-ecd97db742e3",
+  "uuid": "93493987-1167-42ca-9ce1-668c3697700e",
  "persistent": true,
  "insertionIndex": 2
 }
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api-3.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api-3.json
@@ -1,5 +1,5 @@
 {
-  "id": "80b0a475-ed72-40f2-b701-80f014fd077a",
+  "id": "188ff38b-cbda-4bdb-82f0-3dcd5eb20d72",
  "name": "repos_hub4j-test-org_github-api",
  "request": {
    "url": "/repos/hub4j-test-org/github-api",
@@ -14,21 +14,21 @@
    "status": 200,
    "bodyFileName": "repos_hub4j-test-org_github-api-3.json",
    "headers": {
-      "Date": "Wed, 20 May 2020 23:48:56 GMT",
+      "Date": "Thu, 11 Jun 2020 02:20:47 GMT",
      "Content-Type": "application/json; charset=utf-8",
      "Server": "GitHub.com",
      "Status": "200 OK",
      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4951",
-      "X-RateLimit-Reset": "1590020148",
+      "X-RateLimit-Remaining": "4916",
+      "X-RateLimit-Reset": "1591843209",
      "Cache-Control": "private, max-age=60, s-maxage=60",
      "Vary": [
        "Accept, Authorization, Cookie, X-GitHub-OTP",
        "Accept-Encoding, Accept, X-Requested-With",
        "Accept-Encoding"
      ],
-      "ETag": "W/\"312e4c361c7730b8cbae6f074a82248e\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "ETag": "W/\"d50e09a217754b7ffeb7a6aa7219af30\"",
+      "Last-Modified": "Wed, 10 Jun 2020 23:27:59 GMT",
      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
      "X-Accepted-OAuth-Scopes": "repo",
      "X-GitHub-Media-Type": "unknown, github.v3",
@@ -38,10 +38,10 @@
      "X-XSS-Protection": "1; mode=block",
      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EFC6:5429:F774E:126AC9:5EC5C1E8"
+      "X-GitHub-Request-Id": "E5B0:5D6A:3A9A9:47E30:5EE194FF"
    }
  },
-  "uuid": "80b0a475-ed72-40f2-b701-80f014fd077a",
+  "uuid": "188ff38b-cbda-4bdb-82f0-3dcd5eb20d72",
  "persistent": true,
  "insertionIndex": 3
 }
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_heads_gh-7.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_heads_gh-7.json
@@ -0,0 +1,48 @@
+{
+  "id": "36ac5bc2-71dc-416c-a8fd-c50a5b01f124",
+  "name": "repos_hub4j-test-org_github-api_git_refs_heads_gh",
+  "request": {
+    "url": "/repos/hub4j-test-org/github-api/git/refs/heads/gh",
+    "method": "GET",
+    "headers": {
+      "Accept": {
+        "equalTo": "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "bodyFileName": "repos_hub4j-test-org_github-api_git_refs_heads_gh-7.json",
+    "headers": {
+      "Date": "Thu, 11 Jun 2020 02:20:48 GMT",
+      "Content-Type": "application/json; charset=utf-8",
+      "Server": "GitHub.com",
+      "Status": "200 OK",
+      "X-RateLimit-Limit": "5000",
+      "X-RateLimit-Remaining": "4912",
+      "X-RateLimit-Reset": "1591843209",
+      "Cache-Control": "private, max-age=60, s-maxage=60",
+      "Vary": [
+        "Accept, Authorization, Cookie, X-GitHub-OTP",
+        "Accept-Encoding, Accept, X-Requested-With",
+        "Accept-Encoding"
+      ],
+      "ETag": "W/\"aa03a3ba0ec8d4fa83439f8d4390fa91\"",
+      "Last-Modified": "Wed, 10 Jun 2020 23:27:59 GMT",
+      "X-Poll-Interval": "300",
+      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
+      "X-Accepted-OAuth-Scopes": "repo",
+      "X-GitHub-Media-Type": "unknown, github.v3",
+      "Strict-Transport-Security": "max-age=31536000; includeSubdomains; preload",
+      "X-Frame-Options": "deny",
+      "X-Content-Type-Options": "nosniff",
+      "X-XSS-Protection": "1; mode=block",
+      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
+      "Content-Security-Policy": "default-src 'none'",
+      "X-GitHub-Request-Id": "E5B0:5D6A:3A9B3:47E3D:5EE194FF"
+    }
+  },
+  "uuid": "36ac5bc2-71dc-416c-a8fd-c50a5b01f124",
+  "persistent": true,
+  "insertionIndex": 7
+}
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-4.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-4.json
@@ -1,8 +1,8 @@
 {
-  "id": "e38154ef-90ed-42ea-92ca-5ad59a314955",
-  "name": "repos_hub4j-test-org_github-api_git_ref_heads_gh-pages",
+  "id": "22eb7d57-2a85-4948-9103-c4c76c279d00",
+  "name": "repos_hub4j-test-org_github-api_git_refs_heads_gh-pages",
  "request": {
-    "url": "/repos/hub4j-test-org/github-api/git/ref/heads/gh-pages",
+    "url": "/repos/hub4j-test-org/github-api/git/refs/heads/gh-pages",
    "method": "GET",
    "headers": {
      "Accept": {
@@ -12,15 +12,15 @@
  },
  "response": {
    "status": 200,
-    "bodyFileName": "repos_hub4j-test-org_github-api_git_ref_heads_gh-pages-4.json",
+    "bodyFileName": "repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-4.json",
    "headers": {
-      "Date": "Wed, 20 May 2020 23:48:56 GMT",
+      "Date": "Thu, 11 Jun 2020 02:20:47 GMT",
      "Content-Type": "application/json; charset=utf-8",
      "Server": "GitHub.com",
      "Status": "200 OK",
      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4950",
-      "X-RateLimit-Reset": "1590020148",
+      "X-RateLimit-Remaining": "4915",
+      "X-RateLimit-Reset": "1591843209",
      "Cache-Control": "private, max-age=60, s-maxage=60",
      "Vary": [
        "Accept, Authorization, Cookie, X-GitHub-OTP",
@@ -28,7 +28,7 @@
        "Accept-Encoding"
      ],
      "ETag": "W/\"1ab7db857cfacd7c05c569c1a71ecc8c\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "Last-Modified": "Wed, 10 Jun 2020 23:27:59 GMT",
      "X-Poll-Interval": "300",
      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
      "X-Accepted-OAuth-Scopes": "repo",
@@ -39,13 +39,13 @@
      "X-XSS-Protection": "1; mode=block",
      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EFC6:5429:F775F:126ADA:5EC5C1E8"
+      "X-GitHub-Request-Id": "E5B0:5D6A:3A9AC:47E36:5EE194FF"
    }
  },
-  "uuid": "e38154ef-90ed-42ea-92ca-5ad59a314955",
+  "uuid": "22eb7d57-2a85-4948-9103-c4c76c279d00",
  "persistent": true,
-  "scenarioName": "scenario-1-repos-hub4j-test-org-github-api-git-ref-heads-gh-pages",
+  "scenarioName": "scenario-1-repos-hub4j-test-org-github-api-git-refs-heads-gh-pages",
  "requiredScenarioState": "Started",
-  "newScenarioState": "scenario-1-repos-hub4j-test-org-github-api-git-ref-heads-gh-pages-2",
+  "newScenarioState": "scenario-1-repos-hub4j-test-org-github-api-git-refs-heads-gh-pages-2",
  "insertionIndex": 4
 }
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-5.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-5.json
@@ -1,8 +1,8 @@
 {
-  "id": "38be8b43-c558-4cc3-8376-a66dffd3a5a5",
-  "name": "repos_hub4j-test-org_github-api_git_ref_heads_gh-pages",
+  "id": "23d1cd4c-65f0-40df-a643-05747c020b68",
+  "name": "repos_hub4j-test-org_github-api_git_refs_heads_gh-pages",
  "request": {
-    "url": "/repos/hub4j-test-org/github-api/git/ref/heads/gh-pages",
+    "url": "/repos/hub4j-test-org/github-api/git/refs/heads/gh-pages",
    "method": "GET",
    "headers": {
      "Accept": {
@@ -12,15 +12,15 @@
  },
  "response": {
    "status": 200,
-    "bodyFileName": "repos_hub4j-test-org_github-api_git_ref_heads_gh-pages-5.json",
+    "bodyFileName": "repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-5.json",
    "headers": {
-      "Date": "Wed, 20 May 2020 23:48:57 GMT",
+      "Date": "Thu, 11 Jun 2020 02:20:47 GMT",
      "Content-Type": "application/json; charset=utf-8",
      "Server": "GitHub.com",
      "Status": "200 OK",
      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4949",
-      "X-RateLimit-Reset": "1590020149",
+      "X-RateLimit-Remaining": "4914",
+      "X-RateLimit-Reset": "1591843209",
      "Cache-Control": "private, max-age=60, s-maxage=60",
      "Vary": [
        "Accept, Authorization, Cookie, X-GitHub-OTP",
@@ -28,7 +28,7 @@
        "Accept-Encoding"
      ],
      "ETag": "W/\"1ab7db857cfacd7c05c569c1a71ecc8c\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "Last-Modified": "Wed, 10 Jun 2020 23:27:59 GMT",
      "X-Poll-Interval": "300",
      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
      "X-Accepted-OAuth-Scopes": "repo",
@@ -39,13 +39,13 @@
      "X-XSS-Protection": "1; mode=block",
      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EFC6:5429:F7768:126AEA:5EC5C1E8"
+      "X-GitHub-Request-Id": "E5B0:5D6A:3A9AE:47E38:5EE194FF"
    }
  },
-  "uuid": "38be8b43-c558-4cc3-8376-a66dffd3a5a5",
+  "uuid": "23d1cd4c-65f0-40df-a643-05747c020b68",
  "persistent": true,
-  "scenarioName": "scenario-1-repos-hub4j-test-org-github-api-git-ref-heads-gh-pages",
-  "requiredScenarioState": "scenario-1-repos-hub4j-test-org-github-api-git-ref-heads-gh-pages-2",
-  "newScenarioState": "scenario-1-repos-hub4j-test-org-github-api-git-ref-heads-gh-pages-3",
+  "scenarioName": "scenario-1-repos-hub4j-test-org-github-api-git-refs-heads-gh-pages",
+  "requiredScenarioState": "scenario-1-repos-hub4j-test-org-github-api-git-refs-heads-gh-pages-2",
+  "newScenarioState": "scenario-1-repos-hub4j-test-org-github-api-git-refs-heads-gh-pages-3",
  "insertionIndex": 5
 }
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-6.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-6.json
@@ -1,8 +1,8 @@
 {
-  "id": "25200487-a320-4002-a107-fc566f1d1e0f",
-  "name": "repos_hub4j-test-org_github-api_git_ref_heads_gh-pages",
+  "id": "1c47539d-60b6-4e6b-9b5e-8e452c51f30d",
+  "name": "repos_hub4j-test-org_github-api_git_refs_heads_gh-pages",
  "request": {
-    "url": "/repos/hub4j-test-org/github-api/git/ref/heads/gh-pages",
+    "url": "/repos/hub4j-test-org/github-api/git/refs/heads/gh-pages",
    "method": "GET",
    "headers": {
      "Accept": {
@@ -12,15 +12,15 @@
  },
  "response": {
    "status": 200,
-    "bodyFileName": "repos_hub4j-test-org_github-api_git_ref_heads_gh-pages-6.json",
+    "bodyFileName": "repos_hub4j-test-org_github-api_git_refs_heads_gh-pages-6.json",
    "headers": {
-      "Date": "Wed, 20 May 2020 23:48:57 GMT",
+      "Date": "Thu, 11 Jun 2020 02:20:47 GMT",
      "Content-Type": "application/json; charset=utf-8",
      "Server": "GitHub.com",
      "Status": "200 OK",
      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4948",
-      "X-RateLimit-Reset": "1590020149",
+      "X-RateLimit-Remaining": "4913",
+      "X-RateLimit-Reset": "1591843208",
      "Cache-Control": "private, max-age=60, s-maxage=60",
      "Vary": [
        "Accept, Authorization, Cookie, X-GitHub-OTP",
@@ -28,7 +28,7 @@
        "Accept-Encoding"
      ],
      "ETag": "W/\"1ab7db857cfacd7c05c569c1a71ecc8c\"",
-      "Last-Modified": "Thu, 16 Jan 2020 21:22:56 GMT",
+      "Last-Modified": "Wed, 10 Jun 2020 23:27:59 GMT",
      "X-Poll-Interval": "300",
      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
      "X-Accepted-OAuth-Scopes": "repo",
@@ -39,12 +39,12 @@
      "X-XSS-Protection": "1; mode=block",
      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EFC6:5429:F7772:126AF3:5EC5C1E9"
+      "X-GitHub-Request-Id": "E5B0:5D6A:3A9B0:47E3A:5EE194FF"
    }
  },
-  "uuid": "25200487-a320-4002-a107-fc566f1d1e0f",
+  "uuid": "1c47539d-60b6-4e6b-9b5e-8e452c51f30d",
  "persistent": true,
-  "scenarioName": "scenario-1-repos-hub4j-test-org-github-api-git-ref-heads-gh-pages",
-  "requiredScenarioState": "scenario-1-repos-hub4j-test-org-github-api-git-ref-heads-gh-pages-3",
+  "scenarioName": "scenario-1-repos-hub4j-test-org-github-api-git-refs-heads-gh-pages",
+  "requiredScenarioState": "scenario-1-repos-hub4j-test-org-github-api-git-refs-heads-gh-pages-3",
  "insertionIndex": 6
 }
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_headz-8.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/repos_hub4j-test-org_github-api_git_refs_headz-8.json
@@ -1,8 +1,8 @@
 {
-  "id": "17df7473-29a2-4ad8-ba4d-ed5d5ff2305e",
-  "name": "repos_hub4j-test-org_github-api_git_ref_headz",
+  "id": "0c8adeaf-a96e-48d1-b26e-9f574fd2c460",
+  "name": "repos_hub4j-test-org_github-api_git_refs_headz",
  "request": {
-    "url": "/repos/hub4j-test-org/github-api/git/ref/headz",
+    "url": "/repos/hub4j-test-org/github-api/git/refs/headz",
    "method": "GET",
    "headers": {
      "Accept": {
@@ -12,15 +12,15 @@
  },
  "response": {
    "status": 404,
-    "body": "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-single-reference\"}",
+    "body": "{\"message\":\"Not Found\",\"documentation_url\":\"https://developer.github.com/v3/git/refs/#get-a-reference\"}",
    "headers": {
-      "Date": "Wed, 20 May 2020 23:48:57 GMT",
+      "Date": "Thu, 11 Jun 2020 02:23:04 GMT",
      "Content-Type": "application/json; charset=utf-8",
      "Server": "GitHub.com",
      "Status": "404 Not Found",
      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4946",
-      "X-RateLimit-Reset": "1590020148",
+      "X-RateLimit-Remaining": "4910",
+      "X-RateLimit-Reset": "1591843208",
      "X-Poll-Interval": "300",
      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
      "X-Accepted-OAuth-Scopes": "repo",
@@ -32,10 +32,10 @@
      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
      "Content-Security-Policy": "default-src 'none'",
      "Vary": "Accept-Encoding, Accept, X-Requested-With",
-      "X-GitHub-Request-Id": "EFC6:5429:F7782:126B08:5EC5C1E9"
+      "X-GitHub-Request-Id": "E7FA:3E37:A63FE:C9582:5EE19588"
    }
  },
-  "uuid": "17df7473-29a2-4ad8-ba4d-ed5d5ff2305e",
+  "uuid": "0c8adeaf-a96e-48d1-b26e-9f574fd2c460",
  "persistent": true,
  "insertionIndex": 8
 }
--- a/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/user-1.json
+++ b/src/test/resources/org/kohsuke/github/GHRepositoryTest/wiremock/getRef/mappings/user-1.json
@@ -1,5 +1,5 @@
 {
-  "id": "f0825cda-4a2e-408c-8fbb-9358156de5b1",
+  "id": "2e0ec4a0-360f-4f45-8f35-01e219d1a781",
  "name": "user",
  "request": {
    "url": "/user",
@@ -14,21 +14,21 @@
    "status": 200,
    "bodyFileName": "user-1.json",
    "headers": {
-      "Date": "Wed, 20 May 2020 23:48:55 GMT",
+      "Date": "Thu, 11 Jun 2020 02:20:46 GMT",
      "Content-Type": "application/json; charset=utf-8",
      "Server": "GitHub.com",
      "Status": "200 OK",
      "X-RateLimit-Limit": "5000",
-      "X-RateLimit-Remaining": "4954",
-      "X-RateLimit-Reset": "1590020148",
+      "X-RateLimit-Remaining": "4919",
+      "X-RateLimit-Reset": "1591843209",
      "Cache-Control": "private, max-age=60, s-maxage=60",
      "Vary": [
        "Accept, Authorization, Cookie, X-GitHub-OTP",
        "Accept-Encoding, Accept, X-Requested-With",
        "Accept-Encoding"
      ],
-      "ETag": "W/\"12430b620554d3ea3486a0972ee86bc8\"",
-      "Last-Modified": "Wed, 20 May 2020 16:02:42 GMT",
+      "ETag": "W/\"7e41c6c634de27b9ab8f4e95a42d16db\"",
+      "Last-Modified": "Fri, 29 May 2020 18:24:44 GMT",
      "X-OAuth-Scopes": "admin:org, admin:org_hook, admin:public_key, admin:repo_hook, delete_repo, gist, notifications, repo, user, write:discussion",
      "X-Accepted-OAuth-Scopes": "",
      "X-GitHub-Media-Type": "unknown, github.v3",
@@ -38,10 +38,10 @@
      "X-XSS-Protection": "1; mode=block",
      "Referrer-Policy": "origin-when-cross-origin, strict-origin-when-cross-origin",
      "Content-Security-Policy": "default-src 'none'",
-      "X-GitHub-Request-Id": "EFC6:5429:F7724:126A9A:5EC5C1E7"
+      "X-GitHub-Request-Id": "E5B0:5D6A:3A9A0:47E26:5EE194FE"
    }
  },
-  "uuid": "f0825cda-4a2e-408c-8fbb-9358156de5b1",
+  "uuid": "2e0ec4a0-360f-4f45-8f35-01e219d1a781",
  "persistent": true,
  "insertionIndex": 1
 }
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_hub4j-test-org_ghtreebuildertest_git_refs_heads_master-3.json
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testAdd/mappings/repos_hub4j-test-org_ghtreebuildertest_git_refs_heads_master-3.json
@@ -2,7 +2,7 @@
  "id": "add23dfd-74f9-452c-8986-0a80d2f6cbec",
  "name": "repos_hub4j-test-org_ghtreebuildertest_git_refs_heads_master",
  "request": {
-    "url": "/repos/hub4j-test-org/GHTreeBuilderTest/git/ref/heads/master",
+    "url": "/repos/hub4j-test-org/GHTreeBuilderTest/git/refs/heads/master",
    "method": "GET",
    "headers": {
      "Accept": {
--- a/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_hub4j-test-org_ghtreebuildertest_git_refs_heads_master-3.json
+++ b/src/test/resources/org/kohsuke/github/GHTreeBuilderTest/wiremock/testShaEntry/mappings/repos_hub4j-test-org_ghtreebuildertest_git_refs_heads_master-3.json
@@ -2,7 +2,7 @@
  "id": "683572f1-512c-4a6f-b766-7447ed7908fe",
  "name": "repos_hub4j-test-org_ghtreebuildertest_git_refs_heads_master",
  "request": {
-    "url": "/repos/hub4j-test-org/GHTreeBuilderTest/git/ref/heads/master",
+    "url": "/repos/hub4j-test-org/GHTreeBuilderTest/git/refs/heads/master",
    "method": "GET",
    "headers": {
      "Accept": {
--- a/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/verifyBioAndHireable/__files/users_chew-1.json
+++ b/src/test/resources/org/kohsuke/github/GHUserTest/wiremock/verifyBioAndHireable/__files/users_chew-1.json
@@ -0,0 +1,34 @@
+{
+  "login": "Chew",
+  "id": 8278263,
+  "node_id": "MDQ6VXNlcjgyNzgyNjM=",
+  "avatar_url": "https://avatars3.githubusercontent.com/u/8278263?v=4",
+  "gravatar_id": "",
+  "url": "https://api.github.com/users/Chew",
+  "html_url": "https://github.com/Chew",
+  "followers_url": "https://api.github.com/users/Chew/followers",
+  "following_url": "https://api.github.com/users/Chew/following{/other_user}",
+  "gists_url": "https://api.github.com/users/Chew/gists{/gist_id}",
+  "starred_url": "https://api.github.com/users/Chew/starred{/owner}{/repo}",
+  "subscriptions_url": "https://api.github.com/users/Chew/subscriptions",
+  "organizations_url": "https://api.github.com/users/Chew/orgs",
+  "repos_url": "https://api.github.com/users/Chew/repos",
+  "events_url": "https://api.github.com/users/Chew/events{/privacy}",
+  "received_events_url": "https://api.github.com/users/Chew/received_events",
+  "type": "User",
+  "site_admin": false,
+  "name": "Olivia",
+  "company": "@Memerator",
+  "blog": "https://chew.pw",
+  "location": null,
+  "email": null,
+  "hireable": true,
+  "bio": "I like to program things and I hope to program something cool one day :D",
+  "twitter_username": "ChewCraft",
+  "public_repos": 96,
+  "public_gists": 4,
+  "followers": 29,
+  "following": 3,
+  "created_at": "2014-07-26T23:41:36Z",
+  "updated_at": "2020-06-06T20:16:06Z"
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Liam Newman	696967bdd1	[maven-release-plugin] prepare release github-api-1.114	2020-06-10 20:02:18 -07:00
Liam Newman	b76889efc3	Merge pull request #845 from bitwiseman/task/redo-822 Modify getRef() changes to be compatible with older GHE versions	2020-06-10 20:00:44 -07:00
Liam Newman	e6a7b64ebe	Merge branch 'master' into task/redo-822	2020-06-10 19:53:42 -07:00
Liam Newman	9daa0df311	Modify getRef() changes to be compatible with older GHE versions Fixes #844 Fixes #794	2020-06-10 19:47:23 -07:00
Liam Newman	612800bda5	Merge pull request #843 from bitwiseman/task/body-close [JENKINS-62655] Ensure connection response stream is always closed	2020-06-10 17:30:12 -07:00
Liam Newman	a6bbb1dec9	Ensure connection response stream is always closed	2020-06-10 17:22:25 -07:00
Liam Newman	873c93ab64	Merge pull request #841 from hub4j/dependabot/maven/org.apache.bcel-bcel-6.5.0 Chore(deps): Bump bcel from 6.4.1 to 6.5.0	2020-06-10 08:59:00 -07:00
dependabot-preview[bot]	d15242e2d2	Chore(deps): Bump bcel from 6.4.1 to 6.5.0 Bumps bcel from 6.4.1 to 6.5.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-06-10 03:50:37 +00:00
Liam Newman	992d2b937c	Merge pull request #840 from hub4j/dependabot/maven/spotbugs.version-4.0.4 Chore(deps): Bump spotbugs.version from 4.0.3 to 4.0.4	2020-06-09 20:49:24 -07:00
dependabot-preview[bot]	1e05ddad4b	Chore(deps): Bump spotbugs.version from 4.0.3 to 4.0.4 Bumps `spotbugs.version` from 4.0.3 to 4.0.4. Updates `spotbugs` from 4.0.3 to 4.0.4 - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.3...4.0.4) Updates `spotbugs-annotations` from 4.0.3 to 4.0.4 - [Release notes](https://github.com/spotbugs/spotbugs/releases) - [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md) - [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.3...4.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-06-09 06:33:50 +00:00
Liam Newman	4f8a64610b	[maven-release-plugin] prepare for next development iteration	2020-06-08 14:37:20 -07:00
Liam Newman	b82366218c	[maven-release-plugin] prepare release github-api-1.113	2020-06-08 14:37:11 -07:00
Liam Newman	acbe1f4cb3	Update PULL_REQUEST_TEMPLATE.md	2020-06-08 13:25:56 -07:00
Liam Newman	4c5e018583	Merge pull request #838 from Chew/feature/new-profile-data Add bio, hireable, and twitter_username fields to Person	2020-06-08 12:21:16 -07:00
Liam Newman	6c0380e85c	Merge pull request #839 from bitwiseman/issue-828 Add GitHub Team Discussions as GHDiscussion	2020-06-08 12:18:46 -07:00
Liam Newman	fde48e604f	Test coverage and javadoc fixes	2020-06-08 12:06:39 -07:00
Liam Newman	e83a4de5fb	Merge branch 'master' into feature/new-profile-data	2020-06-08 10:33:29 -07:00
Liam Newman	927d2799dc	Move url construction to single method	2020-06-08 10:12:15 -07:00
Liam Newman	1ad701fe5d	Add convenience override of getId()	2020-06-08 09:59:43 -07:00
Liam Newman	086425d2da	Tweaks for batch update	2020-06-08 09:59:43 -07:00
Charles Moulliard	beca54416a	Merge branch 'master' into issue-828	2020-06-08 18:43:15 +02:00
Chew	c92f5c5713	Update test value and add new test for Twitter Username	2020-06-07 15:05:02 -05:00
Chew	dee4e6caff	Add twitter_username to Person and bio and hireable to User	2020-06-07 00:55:44 -05:00
Liam Newman	dd5a39e72e	Improve wiremock stub accuracy	2020-06-06 16:29:26 -07:00
Charles Moulliard	e5ed52165c	Fix: Add missing @param for the delete() method	2020-06-04 18:26:14 +02:00
Charles Moulliard	9484f8e0f5	Chore: Add more methods to test CRUD operations on discusions	2020-06-04 18:19:41 +02:00
Charles Moulliard	947caffe0a	Chore: Add method to get a discussion using a number/id	2020-06-04 17:27:15 +02:00
Charles Moulliard	870090e8df	Chore: Remove javadoc Throwing the exception for the GHDiscussionbuilder - update method	2020-06-04 13:51:04 +02:00
Charles Moulliard	73f07f13c5	Chore: Remove javadoc Throwing the exception	2020-06-04 13:47:41 +02:00
Charles Moulliard	d1952bf591	Chore: Reformat method	2020-06-04 13:37:08 +02:00
Charles Moulliard	5a612e1332	Chore: Add try/catch block if we cannot find the discussion to be updated	2020-06-04 13:25:57 +02:00
Charles Moulliard	b00a9faea6	Fix: Add missing parameter	2020-06-04 12:58:07 +02:00
Charles Moulliard	74db42a703	Chore: Add method to update a discussion	2020-06-04 12:52:58 +02:00
Charles Moulliard	ddf625ca04	Chore: Add method to delete a discussion using its number. Add field number	2020-06-04 12:20:36 +02:00
Charles Moulliard	eca2f017d8	Fix: Add missing import statement for the Jackson Annotation. Use the correct htmlUrl field	2020-06-04 11:32:33 +02:00
Charles Moulliard	3190bde343	Fix: Add mising try/catch block to report the exeption when no discussions are found	2020-06-04 11:31:50 +02:00
Charles Moulliard	c6ebf42a47	Update src/main/java/org/kohsuke/github/GHTeam.java Dont wrapUp using the team object Co-authored-by: Liam Newman <bitwiseman@gmail.com>	2020-06-04 11:14:42 +02:00
Charles Moulliard	c116b60d12	Update src/main/java/org/kohsuke/github/GHDiscussion.java Add doc link to github team discussion API Co-authored-by: Liam Newman <bitwiseman@gmail.com>	2020-06-04 11:13:19 +02:00
Charles Moulliard	5d09e6d9ab	Update src/main/java/org/kohsuke/github/GHDiscussion.java Remove `this.root` as it is already set with the org Co-authored-by: Liam Newman <bitwiseman@gmail.com>	2020-06-04 11:12:38 +02:00
Charles Moulliard	2613ce0ac9	Update src/main/java/org/kohsuke/github/GHDiscussion.java Remove to set the field `root` Co-authored-by: Liam Newman <bitwiseman@gmail.com>	2020-06-04 11:10:21 +02:00
Charles Moulliard	a88e9b28ea	Update src/main/java/org/kohsuke/github/GHDiscussion.java Change the visibility of the fields from protected to private. Add @JacksonInject annotation. Rename html_url to htmlUrl as needed by Jackson Co-authored-by: Liam Newman <bitwiseman@gmail.com>	2020-06-04 11:09:24 +02:00
Charles Moulliard	f0a3c26ee6	Fix: Add the missing correct file to check the discussion created using wiremock	2020-06-04 10:44:26 +02:00
Charles Moulliard	84c87ecb32	Chore: Fixed the null org within the generated json file but we still get an error 404	2020-06-04 08:49:16 +02:00
Charles Moulliard	6573f44d41	Fix: As the name of the organization could be empty/null, then use getLogin to get the org name	2020-06-04 07:46:51 +02:00
Charles Moulliard	3cacbc552c	Fix: Set the organisation name to avoid to populate a url request having /orgs/null	2020-06-04 07:30:44 +02:00
Charles Moulliard	343d623e02	chore: Push new resource files generated	2020-06-04 07:22:53 +02:00
Charles Moulliard	6b80bb2b11	chore: Remove deleted resources files	2020-06-04 07:00:14 +02:00
Charles Moulliard	56fe7452eb	chore. Review test case. Add new wrapUp methods	2020-06-04 06:59:41 +02:00
Charles Moulliard	d3a66f6605	chore: Regenerate new testing files	2020-05-29 17:37:49 +02:00
Charles Moulliard	dd7b4712f1	fix: Add missing @throws IOException	2020-05-29 17:24:49 +02:00
Charles Moulliard	9df5871f6b	chore: wrapUp Github instance	2020-05-29 17:20:54 +02:00
Charles Moulliard	29aab9e9f4	chore: Add missing classes and test case	2020-05-29 16:34:07 +02:00
Charles Moulliard	af67eb7f0b	feat: add new APi for Discussion	2020-05-29 16:28:47 +02:00
Liam Newman	10482c0141	[maven-release-plugin] prepare for next development iteration	2020-05-28 07:48:53 -07:00