diff --git a/pom.xml b/pom.xml index 416ac8d88..50a1f8af1 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.kohsuke github-api - 1.118-SNAPSHOT + 1.120-SNAPSHOT GitHub API for Java https://github-api.kohsuke.org/ GitHub API for Java @@ -154,7 +154,7 @@ org.kohsuke.github.example.* - org.kohsuke.github.Previews + org.kohsuke.github.internal.Previews org.kohsuke.github.extras.OkHttp3Connector @@ -472,7 +472,7 @@ org.kohsuke.stapler stapler - 1.260 + 1.262 test diff --git a/src/main/java/org/kohsuke/github/GHApp.java b/src/main/java/org/kohsuke/github/GHApp.java index 630088793..b2178046d 100644 --- a/src/main/java/org/kohsuke/github/GHApp.java +++ b/src/main/java/org/kohsuke/github/GHApp.java @@ -5,7 +5,7 @@ import java.net.URL; import java.util.List; import java.util.Map; -import static org.kohsuke.github.Previews.MACHINE_MAN; +import static org.kohsuke.github.internal.Previews.MACHINE_MAN; /** * A Github App. diff --git a/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java b/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java index 6d25d26b3..1c2d305c0 100644 --- a/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java +++ b/src/main/java/org/kohsuke/github/GHAppCreateTokenBuilder.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.kohsuke.github.Previews.MACHINE_MAN; +import static org.kohsuke.github.internal.Previews.MACHINE_MAN; /** * Creates a access token for a GitHub App Installation diff --git a/src/main/java/org/kohsuke/github/GHAppInstallation.java b/src/main/java/org/kohsuke/github/GHAppInstallation.java index 167105aa8..7b1797fd5 100644 --- a/src/main/java/org/kohsuke/github/GHAppInstallation.java +++ b/src/main/java/org/kohsuke/github/GHAppInstallation.java @@ -8,8 +8,8 @@ import java.net.URL; import java.util.List; import java.util.Map; -import static org.kohsuke.github.Previews.GAMBIT; -import static org.kohsuke.github.Previews.MACHINE_MAN; +import static org.kohsuke.github.internal.Previews.GAMBIT; +import static org.kohsuke.github.internal.Previews.MACHINE_MAN; /** * A Github App Installation. diff --git a/src/main/java/org/kohsuke/github/GHBranch.java b/src/main/java/org/kohsuke/github/GHBranch.java index fdce55b1d..cfda84cee 100644 --- a/src/main/java/org/kohsuke/github/GHBranch.java +++ b/src/main/java/org/kohsuke/github/GHBranch.java @@ -3,6 +3,7 @@ package org.kohsuke.github; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import org.kohsuke.github.internal.Previews; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/kohsuke/github/GHBranchProtection.java b/src/main/java/org/kohsuke/github/GHBranchProtection.java index 9f8aebd18..a8723bf6e 100644 --- a/src/main/java/org/kohsuke/github/GHBranchProtection.java +++ b/src/main/java/org/kohsuke/github/GHBranchProtection.java @@ -6,7 +6,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.util.Collection; -import static org.kohsuke.github.Previews.ZZZAX; +import static org.kohsuke.github.internal.Previews.ZZZAX; /** * The type GHBranchProtection. diff --git a/src/main/java/org/kohsuke/github/GHBranchProtectionBuilder.java b/src/main/java/org/kohsuke/github/GHBranchProtectionBuilder.java index 9f60aec13..22df023d6 100644 --- a/src/main/java/org/kohsuke/github/GHBranchProtectionBuilder.java +++ b/src/main/java/org/kohsuke/github/GHBranchProtectionBuilder.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.kohsuke.github.Previews.*; +import static org.kohsuke.github.internal.Previews.LUKE_CAGE; /** * Builder to configure the branch protection settings. diff --git a/src/main/java/org/kohsuke/github/GHCheckRun.java b/src/main/java/org/kohsuke/github/GHCheckRun.java index c28430022..717bdc985 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRun.java +++ b/src/main/java/org/kohsuke/github/GHCheckRun.java @@ -3,6 +3,7 @@ package org.kohsuke.github; import com.fasterxml.jackson.annotation.JsonProperty; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import org.kohsuke.github.internal.Previews; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/kohsuke/github/GHCheckRunBuilder.java b/src/main/java/org/kohsuke/github/GHCheckRunBuilder.java index 9623f9721..6294079b3 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRunBuilder.java +++ b/src/main/java/org/kohsuke/github/GHCheckRunBuilder.java @@ -28,6 +28,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import edu.umd.cs.findbugs.annotations.CheckForNull; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import org.kohsuke.github.internal.Previews; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/org/kohsuke/github/GHCommit.java b/src/main/java/org/kohsuke/github/GHCommit.java index 76077608a..82655b553 100644 --- a/src/main/java/org/kohsuke/github/GHCommit.java +++ b/src/main/java/org/kohsuke/github/GHCommit.java @@ -11,8 +11,8 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import static org.kohsuke.github.Previews.ANTIOPE; -import static org.kohsuke.github.Previews.GROOT; +import static org.kohsuke.github.internal.Previews.ANTIOPE; +import static org.kohsuke.github.internal.Previews.GROOT; /** * A commit in a repository. diff --git a/src/main/java/org/kohsuke/github/GHCommitComment.java b/src/main/java/org/kohsuke/github/GHCommitComment.java index 72d6dee94..be77e1ca7 100644 --- a/src/main/java/org/kohsuke/github/GHCommitComment.java +++ b/src/main/java/org/kohsuke/github/GHCommitComment.java @@ -5,7 +5,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.URL; -import static org.kohsuke.github.Previews.*; +import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL; /** * A comment attached to a commit (or a specific line in a specific file of a commit.) diff --git a/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java b/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java index 9338d26d9..49baa64e1 100644 --- a/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java +++ b/src/main/java/org/kohsuke/github/GHCommitSearchBuilder.java @@ -1,6 +1,7 @@ package org.kohsuke.github; import org.apache.commons.lang3.StringUtils; +import org.kohsuke.github.internal.Previews; import java.io.IOException; diff --git a/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java b/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java index 6f1b6a26f..fa98790b3 100644 --- a/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java +++ b/src/main/java/org/kohsuke/github/GHCreateRepositoryBuilder.java @@ -2,7 +2,7 @@ package org.kohsuke.github; import java.io.IOException; -import static org.kohsuke.github.Previews.BAPTISTE; +import static org.kohsuke.github.internal.Previews.BAPTISTE; /** * Creates a repository diff --git a/src/main/java/org/kohsuke/github/GHDeployment.java b/src/main/java/org/kohsuke/github/GHDeployment.java index 067d67a8d..b93ef0003 100644 --- a/src/main/java/org/kohsuke/github/GHDeployment.java +++ b/src/main/java/org/kohsuke/github/GHDeployment.java @@ -1,5 +1,7 @@ package org.kohsuke.github; +import org.kohsuke.github.internal.Previews; + import java.io.IOException; import java.net.URL; import java.util.Map; diff --git a/src/main/java/org/kohsuke/github/GHDeploymentBuilder.java b/src/main/java/org/kohsuke/github/GHDeploymentBuilder.java index 6a34c1079..bf02ef059 100644 --- a/src/main/java/org/kohsuke/github/GHDeploymentBuilder.java +++ b/src/main/java/org/kohsuke/github/GHDeploymentBuilder.java @@ -1,5 +1,7 @@ package org.kohsuke.github; +import org.kohsuke.github.internal.Previews; + import java.io.IOException; import java.util.List; diff --git a/src/main/java/org/kohsuke/github/GHDeploymentState.java b/src/main/java/org/kohsuke/github/GHDeploymentState.java index fa3a8156d..e1c635aec 100644 --- a/src/main/java/org/kohsuke/github/GHDeploymentState.java +++ b/src/main/java/org/kohsuke/github/GHDeploymentState.java @@ -1,5 +1,7 @@ package org.kohsuke.github; +import org.kohsuke.github.internal.Previews; + /** * Represents the state of deployment */ diff --git a/src/main/java/org/kohsuke/github/GHDeploymentStatus.java b/src/main/java/org/kohsuke/github/GHDeploymentStatus.java index ea242deda..8162ae9b3 100644 --- a/src/main/java/org/kohsuke/github/GHDeploymentStatus.java +++ b/src/main/java/org/kohsuke/github/GHDeploymentStatus.java @@ -1,5 +1,7 @@ package org.kohsuke.github; +import org.kohsuke.github.internal.Previews; + import java.net.URL; import java.util.Locale; diff --git a/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java b/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java index 9ade2c7d7..3e2ab269f 100644 --- a/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java +++ b/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java @@ -1,5 +1,7 @@ package org.kohsuke.github; +import org.kohsuke.github.internal.Previews; + import java.io.IOException; /** diff --git a/src/main/java/org/kohsuke/github/GHDiscussion.java b/src/main/java/org/kohsuke/github/GHDiscussion.java index 81ea3179e..8d80b890b 100644 --- a/src/main/java/org/kohsuke/github/GHDiscussion.java +++ b/src/main/java/org/kohsuke/github/GHDiscussion.java @@ -1,6 +1,7 @@ package org.kohsuke.github; import com.fasterxml.jackson.annotation.JsonProperty; +import org.kohsuke.github.internal.Previews; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java index 63817c10e..372f5c102 100644 --- a/src/main/java/org/kohsuke/github/GHIssue.java +++ b/src/main/java/org/kohsuke/github/GHIssue.java @@ -39,7 +39,7 @@ import java.util.List; import java.util.Locale; import java.util.Objects; -import static org.kohsuke.github.Previews.SQUIRREL_GIRL; +import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL; /** * Represents an issue on GitHub. diff --git a/src/main/java/org/kohsuke/github/GHIssueComment.java b/src/main/java/org/kohsuke/github/GHIssueComment.java index 38a3c6b0c..107dec45b 100644 --- a/src/main/java/org/kohsuke/github/GHIssueComment.java +++ b/src/main/java/org/kohsuke/github/GHIssueComment.java @@ -26,7 +26,7 @@ package org.kohsuke.github; import java.io.IOException; import java.net.URL; -import static org.kohsuke.github.Previews.*; +import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL; /** * Comment to the issue diff --git a/src/main/java/org/kohsuke/github/GHOrganization.java b/src/main/java/org/kohsuke/github/GHOrganization.java index 0ac5a5028..15f13839c 100644 --- a/src/main/java/org/kohsuke/github/GHOrganization.java +++ b/src/main/java/org/kohsuke/github/GHOrganization.java @@ -10,7 +10,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import static org.kohsuke.github.Previews.INERTIA; +import static org.kohsuke.github.internal.Previews.INERTIA; /** * The type GHOrganization. diff --git a/src/main/java/org/kohsuke/github/GHProject.java b/src/main/java/org/kohsuke/github/GHProject.java index 033770d40..426e7cd89 100644 --- a/src/main/java/org/kohsuke/github/GHProject.java +++ b/src/main/java/org/kohsuke/github/GHProject.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.net.URL; import java.util.Locale; -import static org.kohsuke.github.Previews.INERTIA; +import static org.kohsuke.github.internal.Previews.INERTIA; /** * A GitHub project. diff --git a/src/main/java/org/kohsuke/github/GHProjectCard.java b/src/main/java/org/kohsuke/github/GHProjectCard.java index 089b53588..5006a0bcc 100644 --- a/src/main/java/org/kohsuke/github/GHProjectCard.java +++ b/src/main/java/org/kohsuke/github/GHProjectCard.java @@ -6,7 +6,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; -import static org.kohsuke.github.Previews.INERTIA; +import static org.kohsuke.github.internal.Previews.INERTIA; /** * The type GHProjectCard. diff --git a/src/main/java/org/kohsuke/github/GHProjectColumn.java b/src/main/java/org/kohsuke/github/GHProjectColumn.java index 5a6a40724..c816fffd8 100644 --- a/src/main/java/org/kohsuke/github/GHProjectColumn.java +++ b/src/main/java/org/kohsuke/github/GHProjectColumn.java @@ -4,7 +4,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; -import static org.kohsuke.github.Previews.INERTIA; +import static org.kohsuke.github.internal.Previews.INERTIA; /** * The type GHProjectColumn. diff --git a/src/main/java/org/kohsuke/github/GHPullRequest.java b/src/main/java/org/kohsuke/github/GHPullRequest.java index 7906ffe15..1cb8da814 100644 --- a/src/main/java/org/kohsuke/github/GHPullRequest.java +++ b/src/main/java/org/kohsuke/github/GHPullRequest.java @@ -36,8 +36,8 @@ import java.util.Objects; import javax.annotation.CheckForNull; -import static org.kohsuke.github.Previews.LYDIAN; -import static org.kohsuke.github.Previews.SHADOW_CAT; +import static org.kohsuke.github.internal.Previews.LYDIAN; +import static org.kohsuke.github.internal.Previews.SHADOW_CAT; /** * A pull request. diff --git a/src/main/java/org/kohsuke/github/GHPullRequestQueryBuilder.java b/src/main/java/org/kohsuke/github/GHPullRequestQueryBuilder.java index a010ee3a9..0a7c2b353 100644 --- a/src/main/java/org/kohsuke/github/GHPullRequestQueryBuilder.java +++ b/src/main/java/org/kohsuke/github/GHPullRequestQueryBuilder.java @@ -1,6 +1,6 @@ package org.kohsuke.github; -import static org.kohsuke.github.Previews.SHADOW_CAT; +import static org.kohsuke.github.internal.Previews.SHADOW_CAT; /** * Lists up pull requests with some filtering and sorting. diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java b/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java index 6c3ec4901..e2a731e22 100644 --- a/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java +++ b/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java @@ -28,7 +28,7 @@ import java.net.URL; import javax.annotation.CheckForNull; -import static org.kohsuke.github.Previews.*; +import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL; /** * Review comment to the pull request diff --git a/src/main/java/org/kohsuke/github/GHReaction.java b/src/main/java/org/kohsuke/github/GHReaction.java index 04be4c103..ead010e45 100644 --- a/src/main/java/org/kohsuke/github/GHReaction.java +++ b/src/main/java/org/kohsuke/github/GHReaction.java @@ -3,7 +3,7 @@ package org.kohsuke.github; import java.io.IOException; import java.net.URL; -import static org.kohsuke.github.Previews.*; +import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL; /** * Reaction to issue, comment, PR, and so on. diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java index 3832cca0d..a7d47f8a7 100644 --- a/src/main/java/org/kohsuke/github/GHRepository.java +++ b/src/main/java/org/kohsuke/github/GHRepository.java @@ -57,7 +57,13 @@ import java.util.WeakHashMap; import javax.annotation.Nonnull; import static java.util.Arrays.*; -import static org.kohsuke.github.Previews.*; +import static org.kohsuke.github.internal.Previews.ANTIOPE; +import static org.kohsuke.github.internal.Previews.ANT_MAN; +import static org.kohsuke.github.internal.Previews.BAPTISTE; +import static org.kohsuke.github.internal.Previews.FLASH; +import static org.kohsuke.github.internal.Previews.INERTIA; +import static org.kohsuke.github.internal.Previews.MERCY; +import static org.kohsuke.github.internal.Previews.SHADOW_CAT; /** * A repository on GitHub. diff --git a/src/main/java/org/kohsuke/github/GHRepositoryBuilder.java b/src/main/java/org/kohsuke/github/GHRepositoryBuilder.java index e4c2ff4fd..5153780f5 100644 --- a/src/main/java/org/kohsuke/github/GHRepositoryBuilder.java +++ b/src/main/java/org/kohsuke/github/GHRepositoryBuilder.java @@ -3,7 +3,7 @@ package org.kohsuke.github; import java.io.IOException; import java.net.URL; -import static org.kohsuke.github.Previews.BAPTISTE; +import static org.kohsuke.github.internal.Previews.BAPTISTE; abstract class GHRepositoryBuilder extends AbstractBuilder { diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java index 7a4001182..80b268946 100644 --- a/src/main/java/org/kohsuke/github/GitHub.java +++ b/src/main/java/org/kohsuke/github/GitHub.java @@ -26,6 +26,7 @@ package org.kohsuke.github; import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; import com.infradna.tool.bridge_method_injector.WithBridgeMethods; +import org.kohsuke.github.internal.Previews; import java.io.*; import java.util.*; @@ -37,8 +38,8 @@ import java.util.logging.Logger; import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import static org.kohsuke.github.Previews.INERTIA; -import static org.kohsuke.github.Previews.MACHINE_MAN; +import static org.kohsuke.github.internal.Previews.INERTIA; +import static org.kohsuke.github.internal.Previews.MACHINE_MAN; /** * Root of the GitHub API. diff --git a/src/main/java/org/kohsuke/github/GitHubRequest.java b/src/main/java/org/kohsuke/github/GitHubRequest.java index 65ac49192..b988e80c8 100644 --- a/src/main/java/org/kohsuke/github/GitHubRequest.java +++ b/src/main/java/org/kohsuke/github/GitHubRequest.java @@ -2,6 +2,7 @@ package org.kohsuke.github; import edu.umd.cs.findbugs.annotations.NonNull; import org.apache.commons.lang3.StringUtils; +import org.kohsuke.github.internal.Previews; import java.io.InputStream; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/org/kohsuke/github/Preview.java b/src/main/java/org/kohsuke/github/Preview.java index 298668306..b230c6ea3 100644 --- a/src/main/java/org/kohsuke/github/Preview.java +++ b/src/main/java/org/kohsuke/github/Preview.java @@ -1,5 +1,7 @@ package org.kohsuke.github; +import org.kohsuke.github.internal.Previews; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/org/kohsuke/github/Reactable.java b/src/main/java/org/kohsuke/github/Reactable.java index 777ef7a47..c5426a881 100644 --- a/src/main/java/org/kohsuke/github/Reactable.java +++ b/src/main/java/org/kohsuke/github/Reactable.java @@ -2,7 +2,7 @@ package org.kohsuke.github; import java.io.IOException; -import static org.kohsuke.github.Previews.SQUIRREL_GIRL; +import static org.kohsuke.github.internal.Previews.SQUIRREL_GIRL; /** * Those {@link GHObject}s that can have {@linkplain GHReaction reactions}. diff --git a/src/main/java/org/kohsuke/github/Previews.java b/src/main/java/org/kohsuke/github/internal/Previews.java similarity index 98% rename from src/main/java/org/kohsuke/github/Previews.java rename to src/main/java/org/kohsuke/github/internal/Previews.java index c669e7e61..66ef2d9e2 100644 --- a/src/main/java/org/kohsuke/github/Previews.java +++ b/src/main/java/org/kohsuke/github/internal/Previews.java @@ -1,4 +1,4 @@ -package org.kohsuke.github; +package org.kohsuke.github.internal; /** * Provides the media type strings for GitHub API previews @@ -7,7 +7,7 @@ package org.kohsuke.github; * * @author Kohsuke Kawaguchi */ -enum Previews { +public enum Previews { /** * Check-runs and check-suites diff --git a/src/test/java/org/kohsuke/github/GHPullRequestMockTest.java b/src/test/java/org/kohsuke/github/GHPullRequestMockTest.java new file mode 100644 index 000000000..fa40b5506 --- /dev/null +++ b/src/test/java/org/kohsuke/github/GHPullRequestMockTest.java @@ -0,0 +1,21 @@ +package org.kohsuke.github; + +import org.junit.Test; + +import java.io.IOException; + +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +public class GHPullRequestMockTest { + + @Test + public void shouldMockGHPullRequest() throws IOException { + GHPullRequest pullRequest = mock(GHPullRequest.class); + when(pullRequest.isDraft()).thenReturn(true); + + assertTrue("Mock should return true", pullRequest.isDraft()); + } + +}