diff --git a/pom.xml b/pom.xml index 4672d119d4..da13d11cdf 100644 --- a/pom.xml +++ b/pom.xml @@ -174,9 +174,11 @@ org.kohsuke.github.connector.GitHubConnectorResponseHttpUrlConnectionAdapter - oorg.kohsuke.github.GHPerson.* org.kohsuke.github.GHRepositorySearchBuilder.Fork + + org.kohsuke.github.GHPerson.1 + org.kohsuke.github.example.* diff --git a/src/main/java/org/kohsuke/github/GHAppInstallation.java b/src/main/java/org/kohsuke/github/GHAppInstallation.java index 0c1ecba823..28102084b1 100644 --- a/src/main/java/org/kohsuke/github/GHAppInstallation.java +++ b/src/main/java/org/kohsuke/github/GHAppInstallation.java @@ -89,7 +89,7 @@ public String getRepositoriesUrl() { * @return the paged iterable * @deprecated This method cannot work on a {@link GHAppInstallation} retrieved from * {@link GHApp#listInstallations()} (for example), except when resorting to unsupported hacks involving - * {@link GHAppInstallation#setRoot(GitHub)} to switch from an application client to an installation + * setRoot(GitHub) to switch from an application client to an installation * client. This method will be removed. You should instead use an installation client (with an * installation token, not a JWT), retrieve a {@link GHAuthenticatedAppInstallation} from * {@link GitHub#getInstallation()}, then call diff --git a/src/main/java/org/kohsuke/github/GHDeploymentStatus.java b/src/main/java/org/kohsuke/github/GHDeploymentStatus.java index 060ab96b23..6639c569b8 100644 --- a/src/main/java/org/kohsuke/github/GHDeploymentStatus.java +++ b/src/main/java/org/kohsuke/github/GHDeploymentStatus.java @@ -51,8 +51,6 @@ GHDeploymentStatus lateBind(GHRepository owner) { /** * Gets target url. - *

- * This method replaces {@link #getTargetUrl() getTargetUrl}}. * * @return the target url * @deprecated until preview feature has graduated to stable diff --git a/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java b/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java index 33afa36d84..b5ec4f449c 100644 --- a/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java +++ b/src/main/java/org/kohsuke/github/GHDeploymentStatusBuilder.java @@ -95,8 +95,6 @@ public GHDeploymentStatusBuilder environmentUrl(String environmentUrl) { /** * The full URL of the deployment's output. - *

- * This method replaces {@link #targetUrl(String) targetUrl}. * * @param logUrl * the deployment output url diff --git a/src/main/java/org/kohsuke/github/GHOrganization.java b/src/main/java/org/kohsuke/github/GHOrganization.java index 41fe8a44ce..72a73c8566 100644 --- a/src/main/java/org/kohsuke/github/GHOrganization.java +++ b/src/main/java/org/kohsuke/github/GHOrganization.java @@ -481,7 +481,7 @@ public GHTeamBuilder createTeam(String name) { public List getRepositoriesWithOpenPullRequests() throws IOException { List r = new ArrayList(); for (GHRepository repository : listRepositories(100)) { - List pullRequests = repository.getPullRequests(GHIssueState.OPEN); + List pullRequests = repository.queryPullRequests().state(GHIssueState.OPEN).list().toList(); if (pullRequests.size() > 0) { r.add(repository); } @@ -499,7 +499,7 @@ public List getRepositoriesWithOpenPullRequests() throws IOExcepti public List getPullRequests() throws IOException { List all = new ArrayList(); for (GHRepository r : getRepositoriesWithOpenPullRequests()) { - all.addAll(r.getPullRequests(GHIssueState.OPEN)); + all.addAll(r.queryPullRequests().state(GHIssueState.OPEN).list().toList()); } return all; } diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java index e33638f6a9..9774f29122 100644 --- a/src/main/java/org/kohsuke/github/GHRepository.java +++ b/src/main/java/org/kohsuke/github/GHRepository.java @@ -1540,20 +1540,6 @@ public GHPullRequest getPullRequest(int i) throws IOException { .wrapUp(this); } - /** - * Retrieves all the pull requests of a particular state. - * - * @param state - * the state - * @return the pull requests - * @throws IOException - * the io exception - * @see #listPullRequests(GHIssueState) #listPullRequests(GHIssueState) - */ - public List getPullRequests(GHIssueState state) throws IOException { - return queryPullRequests().state(state).list().toList(); - } - /** * Retrieves pull requests. * diff --git a/src/main/java/org/kohsuke/github/GHTreeBuilder.java b/src/main/java/org/kohsuke/github/GHTreeBuilder.java index 396ce2b7c8..630eb19b6b 100644 --- a/src/main/java/org/kohsuke/github/GHTreeBuilder.java +++ b/src/main/java/org/kohsuke/github/GHTreeBuilder.java @@ -77,7 +77,7 @@ public GHTreeBuilder baseTree(String baseTree) { } /** - * Specialized version of {@link #entry(String, String, String, String, String)} for adding an existing blob + * Specialized version of entry() for adding an existing blob * referred by its SHA. * * @param path @@ -98,7 +98,7 @@ public GHTreeBuilder shaEntry(String path, String sha, boolean executable) { } /** - * Specialized version of {@link #entry(String, String, String, String, String)} for adding a text file with the + * Specialized version of entry() for adding an existing blob * specified {@code content}. * * @param path diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java index f17b8c544f..9f4ea8704e 100644 --- a/src/main/java/org/kohsuke/github/GitHub.java +++ b/src/main/java/org/kohsuke/github/GitHub.java @@ -846,10 +846,6 @@ public T parseEventPayload(Reader r, Class type) t * You use the returned builder to set various properties, then call {@link GHCreateRepositoryBuilder#create()} to * finally create a repository. * - *

- * To create a repository in an organization, see - * {@link GHOrganization#createRepository(String, String, String, GHTeam, boolean)} - * * @param name * the name * @return the gh create repository builder diff --git a/src/test/java/org/kohsuke/github/AppTest.java b/src/test/java/org/kohsuke/github/AppTest.java index 33260f4838..a812cd5ff6 100755 --- a/src/test/java/org/kohsuke/github/AppTest.java +++ b/src/test/java/org/kohsuke/github/AppTest.java @@ -591,7 +591,7 @@ public void testFetchPullRequest() throws Exception { GHRepository r = gitHub.getOrganization("jenkinsci").getRepository("jenkins"); assertThat(r.getDefaultBranch(), equalTo("main")); r.getPullRequest(1); - r.getPullRequests(GHIssueState.OPEN); + r.queryPullRequests().state(GHIssueState.OPEN).list().toList(); } /** diff --git a/src/test/java/org/kohsuke/github/GHPullRequestTest.java b/src/test/java/org/kohsuke/github/GHPullRequestTest.java index 6a82463670..9126ac1a91 100644 --- a/src/test/java/org/kohsuke/github/GHPullRequestTest.java +++ b/src/test/java/org/kohsuke/github/GHPullRequestTest.java @@ -37,7 +37,7 @@ public void cleanUp() throws Exception { return; } - for (GHPullRequest pr : getRepository(this.getNonRecordingGitHub()).getPullRequests(GHIssueState.OPEN)) { + for (GHPullRequest pr : getRepository(this.getNonRecordingGitHub()).queryPullRequests().state(GHIssueState.OPEN).list().toList()) { pr.close(); } } diff --git a/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java b/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java index 9694f25eb8..9fed265130 100644 --- a/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java +++ b/src/test/java/org/kohsuke/github/extras/okhttp3/GitHubCachingTest.java @@ -61,7 +61,7 @@ protected WireMockConfiguration getWireMockOptions() { @Before public void setupRepo() throws Exception { if (mockGitHub.isUseProxy()) { - for (GHPullRequest pr : getRepository(this.getNonRecordingGitHub()).getPullRequests(GHIssueState.OPEN)) { + for (GHPullRequest pr : getRepository(this.getNonRecordingGitHub()).queryPullRequests().state(GHIssueState.OPEN).list().toList()) { pr.close(); } try {