Skip to content

Prepare for GitHub API 2.0.0 #672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Prepare for GitHub API 2.0.0 #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<jandex-plugin.version>3.2.7</jandex-plugin.version>
<assertj.version>3.27.3</assertj.version>

<quarkus-github-api.version>1.326.0</quarkus-github-api.version>
<quarkus-github-api.version>999-SNAPSHOT</quarkus-github-api.version>
<airline.version>3.0.0</airline.version>

<webjar.fomantic-ui.version>2.9.0</webjar.fomantic-ui.version>
Expand Down
1 change: 0 additions & 1 deletion runtime/src/main/java/io/quarkiverse/githubapp/runtime/config/GitHubAppRuntimeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 1 addition & 7 deletions runtime/src/main/java/io/quarkiverse/githubapp/runtime/github/PayloadHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.quarkiverse.githubapp.runtime.github;

import java.io.IOException;
import java.util.Optional;

import org.kohsuke.github.GHEventPayload;
Expand Down Expand Up @@ -80,12 +79,7 @@ public static Optional<String> 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());
Expand Down
11 changes: 5 additions & 6 deletions testing/src/main/java/io/quarkiverse/githubapp/testing/internal/GitHubMockContextImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,17 @@
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;
import org.kohsuke.github.GHPullRequest;
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;
Expand Down Expand Up @@ -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);
}
Expand Down
Loading