diff --git a/pom.xml b/pom.xml index cb1f4b5e..162d2b50 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 3.2.7 3.27.3 - 1.326.0 + 999-SNAPSHOT 3.0.0 2.9.0 diff --git a/runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/GitHubAppRuntimeConfig.java b/runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/GitHubAppRuntimeConfig.java index 2bf8ebc3..854ba728 100644 --- a/runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/GitHubAppRuntimeConfig.java +++ b/runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/GitHubAppRuntimeConfig.java @@ -12,7 +12,6 @@ import io.smallrye.config.ConfigMapping; import io.smallrye.config.WithConverter; import io.smallrye.config.WithDefault; -import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient; @ConfigRoot(phase = ConfigPhase.RUN_TIME) @ConfigMapping(prefix = "quarkus.github-app") diff --git a/runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/PayloadHelper.java b/runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/PayloadHelper.java index c3f0e8fd..c71c74ad 100644 --- a/runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/PayloadHelper.java +++ b/runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/PayloadHelper.java @@ -1,6 +1,5 @@ package io.quarkiverse.githubapp.runtime.github; -import java.io.IOException; import java.util.Optional; import org.kohsuke.github.GHEventPayload; @@ -80,12 +79,7 @@ public static Optional getContext(GHEventPayload eventPayload) { return Optional.of(((GHEventPayload.WorkflowDispatch) eventPayload).getRepository().getHtmlUrl().toString()); } if (eventPayload instanceof GHEventPayload.WorkflowRun) { - // unfortunately, getHtmlUrl() for workflow runs can throw an exception - try { - return Optional.of(((GHEventPayload.WorkflowRun) eventPayload).getWorkflowRun().getHtmlUrl().toString()); - } catch (IOException e) { - return Optional.of(((GHEventPayload.WorkflowRun) eventPayload).getRepository().getHtmlUrl().toString()); - } + return Optional.of(((GHEventPayload.WorkflowRun) eventPayload).getWorkflowRun().getHtmlUrl().toString()); } if (eventPayload instanceof GHEventPayload.WorkflowJob) { return Optional.of(((GHEventPayload.WorkflowJob) eventPayload).getWorkflowJob().getHtmlUrl().toString()); diff --git a/testing/src/main/java/io/quarkiverse/githubapp/testing/internal/GitHubMockContextImpl.java b/testing/src/main/java/io/quarkiverse/githubapp/testing/internal/GitHubMockContextImpl.java index de1fae5b..116db11a 100644 --- a/testing/src/main/java/io/quarkiverse/githubapp/testing/internal/GitHubMockContextImpl.java +++ b/testing/src/main/java/io/quarkiverse/githubapp/testing/internal/GitHubMockContextImpl.java @@ -16,7 +16,6 @@ import java.util.Optional; import java.util.function.Consumer; -import org.kohsuke.github.AbuseLimitHandler; import org.kohsuke.github.GHIssue; import org.kohsuke.github.GHIssueComment; import org.kohsuke.github.GHObject; @@ -24,10 +23,10 @@ import org.kohsuke.github.GHRepository; import org.kohsuke.github.GHTeam; import org.kohsuke.github.GitHub; -import org.kohsuke.github.HttpConnector; -import org.kohsuke.github.RateLimitHandler; +import org.kohsuke.github.GitHubAbuseLimitHandler; +import org.kohsuke.github.GitHubRateLimitHandler; import org.kohsuke.github.authorization.AuthorizationProvider; -import org.kohsuke.github.internal.GitHubConnectorHttpConnectorAdapter; +import org.kohsuke.github.connector.GitHubConnector; import org.mockito.Answers; import org.mockito.MockSettings; import org.mockito.Mockito; @@ -66,8 +65,8 @@ public final class GitHubMockContextImpl implements GitHubMockContext, GitHubMoc clients = new MockMap<>(GitHub.class, // Configure the client mocks to be offline, because we don't want to send HTTP requests. settings -> settings.useConstructor("https://api.github.invalid", - new GitHubConnectorHttpConnectorAdapter(HttpConnector.OFFLINE), RateLimitHandler.WAIT, - AbuseLimitHandler.WAIT, null, AuthorizationProvider.ANONYMOUS) + GitHubConnector.OFFLINE, GitHubRateLimitHandler.WAIT, + GitHubAbuseLimitHandler.WAIT, null, AuthorizationProvider.ANONYMOUS) .defaultAnswer(new GitHubMockDefaultAnswer(defaultAnswers, this::repository))); graphQLClients = new MockMap<>(DynamicGraphQLClient.class); }