Skip to content

Commit fe98544

Browse files
committed
Prepare for GitHub API 2.0.0
1 parent cb67607 commit fe98544

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<jandex-plugin.version>3.2.7</jandex-plugin.version>
3030
<assertj.version>3.27.3</assertj.version>
3131

32-
<quarkus-github-api.version>1.326.0</quarkus-github-api.version>
32+
<quarkus-github-api.version>999-SNAPSHOT</quarkus-github-api.version>
3333
<airline.version>3.0.0</airline.version>
3434

3535
<webjar.fomantic-ui.version>2.9.0</webjar.fomantic-ui.version>

runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/GitHubAppRuntimeConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.smallrye.config.ConfigMapping;
1313
import io.smallrye.config.WithConverter;
1414
import io.smallrye.config.WithDefault;
15-
import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient;
1615

1716
@ConfigRoot(phase = ConfigPhase.RUN_TIME)
1817
@ConfigMapping(prefix = "quarkus.github-app")

runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/PayloadHelper.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.quarkiverse.githubapp.runtime.github;
22

3-
import java.io.IOException;
43
import java.util.Optional;
54

65
import org.kohsuke.github.GHEventPayload;
@@ -80,12 +79,7 @@ public static Optional<String> getContext(GHEventPayload eventPayload) {
8079
return Optional.of(((GHEventPayload.WorkflowDispatch) eventPayload).getRepository().getHtmlUrl().toString());
8180
}
8281
if (eventPayload instanceof GHEventPayload.WorkflowRun) {
83-
// unfortunately, getHtmlUrl() for workflow runs can throw an exception
84-
try {
85-
return Optional.of(((GHEventPayload.WorkflowRun) eventPayload).getWorkflowRun().getHtmlUrl().toString());
86-
} catch (IOException e) {
87-
return Optional.of(((GHEventPayload.WorkflowRun) eventPayload).getRepository().getHtmlUrl().toString());
88-
}
82+
return Optional.of(((GHEventPayload.WorkflowRun) eventPayload).getWorkflowRun().getHtmlUrl().toString());
8983
}
9084
if (eventPayload instanceof GHEventPayload.WorkflowJob) {
9185
return Optional.of(((GHEventPayload.WorkflowJob) eventPayload).getWorkflowJob().getHtmlUrl().toString());

testing/src/main/java/io/quarkiverse/githubapp/testing/internal/GitHubMockContextImpl.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,17 @@
1616
import java.util.Optional;
1717
import java.util.function.Consumer;
1818

19-
import org.kohsuke.github.AbuseLimitHandler;
2019
import org.kohsuke.github.GHIssue;
2120
import org.kohsuke.github.GHIssueComment;
2221
import org.kohsuke.github.GHObject;
2322
import org.kohsuke.github.GHPullRequest;
2423
import org.kohsuke.github.GHRepository;
2524
import org.kohsuke.github.GHTeam;
2625
import org.kohsuke.github.GitHub;
27-
import org.kohsuke.github.HttpConnector;
28-
import org.kohsuke.github.RateLimitHandler;
26+
import org.kohsuke.github.GitHubAbuseLimitHandler;
27+
import org.kohsuke.github.GitHubRateLimitHandler;
2928
import org.kohsuke.github.authorization.AuthorizationProvider;
30-
import org.kohsuke.github.internal.GitHubConnectorHttpConnectorAdapter;
29+
import org.kohsuke.github.connector.GitHubConnector;
3130
import org.mockito.Answers;
3231
import org.mockito.MockSettings;
3332
import org.mockito.Mockito;
@@ -66,8 +65,8 @@ public final class GitHubMockContextImpl implements GitHubMockContext, GitHubMoc
6665
clients = new MockMap<>(GitHub.class,
6766
// Configure the client mocks to be offline, because we don't want to send HTTP requests.
6867
settings -> settings.useConstructor("https://api.github.invalid",
69-
new GitHubConnectorHttpConnectorAdapter(HttpConnector.OFFLINE), RateLimitHandler.WAIT,
70-
AbuseLimitHandler.WAIT, null, AuthorizationProvider.ANONYMOUS)
68+
GitHubConnector.OFFLINE, GitHubRateLimitHandler.WAIT,
69+
GitHubAbuseLimitHandler.WAIT, null, AuthorizationProvider.ANONYMOUS)
7170
.defaultAnswer(new GitHubMockDefaultAnswer(defaultAnswers, this::repository)));
7271
graphQLClients = new MockMap<>(DynamicGraphQLClient.class);
7372
}

0 commit comments

Comments
 (0)