From afc02faeda529be431b03145c9ecf3932107e046 Mon Sep 17 00:00:00 2001 From: Liam Newman Date: Tue, 19 May 2020 17:04:48 -0700 Subject: [PATCH] Clean up GHObject field access --- .../org/kohsuke/github/GHAppInstallation.java | 8 +++++--- src/main/java/org/kohsuke/github/GHAsset.java | 2 +- .../org/kohsuke/github/GHAuthorization.java | 4 +++- .../org/kohsuke/github/GHCheckRunBuilder.java | 2 +- .../org/kohsuke/github/GHCommitComment.java | 2 +- .../java/org/kohsuke/github/GHDeployment.java | 2 +- src/main/java/org/kohsuke/github/GHIssue.java | 10 +++++++--- .../org/kohsuke/github/GHIssueComment.java | 2 +- .../java/org/kohsuke/github/GHObject.java | 19 ++++++++++--------- .../java/org/kohsuke/github/GHOrgHook.java | 2 +- .../org/kohsuke/github/GHOrganization.java | 2 +- .../java/org/kohsuke/github/GHPerson.java | 7 +++++-- .../java/org/kohsuke/github/GHProject.java | 6 +++--- .../org/kohsuke/github/GHProjectCard.java | 2 +- .../org/kohsuke/github/GHProjectColumn.java | 8 ++++---- .../org/kohsuke/github/GHPullRequest.java | 13 ++++++++++--- .../kohsuke/github/GHPullRequestReview.java | 2 +- .../github/GHPullRequestReviewComment.java | 2 +- .../java/org/kohsuke/github/GHReaction.java | 2 +- .../java/org/kohsuke/github/GHRelease.java | 4 ++-- .../org/kohsuke/github/GHReleaseUpdater.java | 2 +- .../java/org/kohsuke/github/GHRepoHook.java | 2 +- src/main/java/org/kohsuke/github/GHTeam.java | 4 ++-- .../java/org/kohsuke/github/GHAppTest.java | 8 ++++---- .../kohsuke/github/GHCheckRunBuilderTest.java | 8 ++++---- 25 files changed, 72 insertions(+), 53 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHAppInstallation.java b/src/main/java/org/kohsuke/github/GHAppInstallation.java index a13d84b31..652349034 100644 --- a/src/main/java/org/kohsuke/github/GHAppInstallation.java +++ b/src/main/java/org/kohsuke/github/GHAppInstallation.java @@ -296,7 +296,7 @@ public class GHAppInstallation extends GHObject { root.createRequest() .method("DELETE") .withPreview(GAMBIT) - .withUrlPath(String.format("/app/installations/%d", id)) + .withUrlPath(String.format("/app/installations/%d", getId())) .send(); } @@ -315,7 +315,9 @@ public class GHAppInstallation extends GHObject { @Preview @Deprecated public GHAppCreateTokenBuilder createToken(Map permissions) { - return new GHAppCreateTokenBuilder(root, String.format("/app/installations/%d/access_tokens", id), permissions); + return new GHAppCreateTokenBuilder(root, + String.format("/app/installations/%d/access_tokens", getId()), + permissions); } /** @@ -330,6 +332,6 @@ public class GHAppInstallation extends GHObject { @Preview @Deprecated public GHAppCreateTokenBuilder createToken() { - return new GHAppCreateTokenBuilder(root, String.format("/app/installations/%d/access_tokens", id)); + return new GHAppCreateTokenBuilder(root, String.format("/app/installations/%d/access_tokens", getId())); } } diff --git a/src/main/java/org/kohsuke/github/GHAsset.java b/src/main/java/org/kohsuke/github/GHAsset.java index 694ff91b2..7822df687 100644 --- a/src/main/java/org/kohsuke/github/GHAsset.java +++ b/src/main/java/org/kohsuke/github/GHAsset.java @@ -149,7 +149,7 @@ public class GHAsset extends GHObject { } private String getApiRoute() { - return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + id; + return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/releases/assets/" + getId(); } GHAsset wrap(GHRelease release) { diff --git a/src/main/java/org/kohsuke/github/GHAuthorization.java b/src/main/java/org/kohsuke/github/GHAuthorization.java index 2aa861a77..420a74232 100644 --- a/src/main/java/org/kohsuke/github/GHAuthorization.java +++ b/src/main/java/org/kohsuke/github/GHAuthorization.java @@ -112,10 +112,12 @@ public class GHAuthorization extends GHObject { * Gets api url. * * @return the api url + * @deprecated use {@link #getUrl()} */ + @Deprecated @SuppressFBWarnings(value = "NM_CONFUSING", justification = "It's a part of the library API, cannot be changed") public URL getApiURL() { - return GitHubClient.parseURL(url); + return getUrl(); } /** diff --git a/src/main/java/org/kohsuke/github/GHCheckRunBuilder.java b/src/main/java/org/kohsuke/github/GHCheckRunBuilder.java index 289bc4989..d71483c24 100644 --- a/src/main/java/org/kohsuke/github/GHCheckRunBuilder.java +++ b/src/main/java/org/kohsuke/github/GHCheckRunBuilder.java @@ -144,7 +144,7 @@ public final class GHCheckRunBuilder { .withPreview(Previews.ANTIOPE) .method("PATCH") .with("output", output2) - .withUrlPath(repo.getApiTailUrl("check-runs/" + run.id)) + .withUrlPath(repo.getApiTailUrl("check-runs/" + run.getId())) .fetch(GHCheckRun.class) .wrap(repo); } diff --git a/src/main/java/org/kohsuke/github/GHCommitComment.java b/src/main/java/org/kohsuke/github/GHCommitComment.java index c92c08a39..18298552f 100644 --- a/src/main/java/org/kohsuke/github/GHCommitComment.java +++ b/src/main/java/org/kohsuke/github/GHCommitComment.java @@ -153,7 +153,7 @@ public class GHCommitComment extends GHObject implements Reactable { } private String getApiTail() { - return String.format("/repos/%s/%s/comments/%s", owner.getOwnerName(), owner.getName(), id); + return String.format("/repos/%s/%s/comments/%s", owner.getOwnerName(), owner.getName(), getId()); } GHCommitComment wrap(GHRepository owner) { diff --git a/src/main/java/org/kohsuke/github/GHDeployment.java b/src/main/java/org/kohsuke/github/GHDeployment.java index 58437b403..e3bcc4176 100644 --- a/src/main/java/org/kohsuke/github/GHDeployment.java +++ b/src/main/java/org/kohsuke/github/GHDeployment.java @@ -122,7 +122,7 @@ public class GHDeployment extends GHObject { * @return the gh deployment status builder */ public GHDeploymentStatusBuilder createStatus(GHDeploymentState state) { - return new GHDeploymentStatusBuilder(owner, id, state); + return new GHDeploymentStatusBuilder(owner, getId(), state); } /** diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java index 878195be9..274f89671 100644 --- a/src/main/java/org/kohsuke/github/GHIssue.java +++ b/src/main/java/org/kohsuke/github/GHIssue.java @@ -37,6 +37,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; +import java.util.Objects; import static org.kohsuke.github.Previews.SQUIRREL_GIRL; @@ -179,10 +180,12 @@ public class GHIssue extends GHObject implements Reactable { /** * Gets api url. * - * @return the api url + * @return API URL of this object. + * @deprecated use {@link #getUrl()} */ + @Deprecated public URL getApiURL() { - return GitHubClient.parseURL(url); + return getUrl(); } /** @@ -570,7 +573,8 @@ public class GHIssue extends GHObject implements Reactable { protected String getIssuesApiRoute() { if (owner == null) { // Issues returned from search to do not have an owner. Attempt to use url. - return StringUtils.prependIfMissing(getUrl().toString().replace(root.getApiUrl(), ""), "/"); + final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!"); + return StringUtils.prependIfMissing(url.toString().replace(root.getApiUrl(), ""), "/"); } return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/issues/" + number; } diff --git a/src/main/java/org/kohsuke/github/GHIssueComment.java b/src/main/java/org/kohsuke/github/GHIssueComment.java index f2b182bed..73efe23c3 100644 --- a/src/main/java/org/kohsuke/github/GHIssueComment.java +++ b/src/main/java/org/kohsuke/github/GHIssueComment.java @@ -149,6 +149,6 @@ public class GHIssueComment extends GHObject implements Reactable { private String getApiRoute() { return "/repos/" + owner.getRepository().getOwnerName() + "/" + owner.getRepository().getName() - + "/issues/comments/" + id; + + "/issues/comments/" + getId(); } } diff --git a/src/main/java/org/kohsuke/github/GHObject.java b/src/main/java/org/kohsuke/github/GHObject.java index c637690f4..09343474a 100644 --- a/src/main/java/org/kohsuke/github/GHObject.java +++ b/src/main/java/org/kohsuke/github/GHObject.java @@ -26,11 +26,12 @@ public abstract class GHObject { */ protected transient Map> responseHeaderFields; - protected String url; - protected long id; - protected String node_id; - protected String created_at; - protected String updated_at; + private String url; + + private long id; + private String nodeId; + private String createdAt; + private String updatedAt; GHObject() { } @@ -75,12 +76,12 @@ public abstract class GHObject { */ @WithBridgeMethods(value = String.class, adapterMethod = "createdAtStr") public Date getCreatedAt() throws IOException { - return GitHubClient.parseDate(created_at); + return GitHubClient.parseDate(createdAt); } @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", justification = "Bridge method of getCreatedAt") private Object createdAtStr(Date id, Class type) { - return created_at; + return createdAt; } /** @@ -111,7 +112,7 @@ public abstract class GHObject { * on error */ public Date getUpdatedAt() throws IOException { - return GitHubClient.parseDate(updated_at); + return GitHubClient.parseDate(updatedAt); } /** @@ -122,7 +123,7 @@ public abstract class GHObject { * @return Global Node ID. */ public String getNodeId() { - return node_id; + return nodeId; } /** diff --git a/src/main/java/org/kohsuke/github/GHOrgHook.java b/src/main/java/org/kohsuke/github/GHOrgHook.java index d13f76640..45579e44f 100644 --- a/src/main/java/org/kohsuke/github/GHOrgHook.java +++ b/src/main/java/org/kohsuke/github/GHOrgHook.java @@ -22,6 +22,6 @@ class GHOrgHook extends GHHook { @Override String getApiRoute() { - return String.format("/orgs/%s/hooks/%d", organization.getLogin(), id); + return String.format("/orgs/%s/hooks/%d", organization.getLogin(), getId()); } } diff --git a/src/main/java/org/kohsuke/github/GHOrganization.java b/src/main/java/org/kohsuke/github/GHOrganization.java index 7dc272043..004cc0752 100644 --- a/src/main/java/org/kohsuke/github/GHOrganization.java +++ b/src/main/java/org/kohsuke/github/GHOrganization.java @@ -157,7 +157,7 @@ public class GHOrganization extends GHPerson { */ public GHTeam getTeam(long teamId) throws IOException { return root.createRequest() - .withUrlPath(String.format("/organizations/%d/team/%d", id, teamId)) + .withUrlPath(String.format("/organizations/%d/team/%d", getId(), teamId)) .fetch(GHTeam.class) .wrapUp(this); } diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java index 63e3b939b..f1bba9624 100644 --- a/src/main/java/org/kohsuke/github/GHPerson.java +++ b/src/main/java/org/kohsuke/github/GHPerson.java @@ -46,13 +46,16 @@ public abstract class GHPerson extends GHObject { * the io exception */ protected synchronized void populate() throws IOException { - if (created_at != null) { + if (super.getCreatedAt() != null) { return; // already populated } if (root == null || root.isOffline()) { return; // cannot populate, will have to live with what we have } - root.createRequest().withUrlPath(url).fetchInto(this); + URL url = getUrl(); + if (url != null) { + root.createRequest().setRawUrlPath(url.toString()).fetchInto(this); + } } /** diff --git a/src/main/java/org/kohsuke/github/GHProject.java b/src/main/java/org/kohsuke/github/GHProject.java index e2f017c78..09508fa4c 100644 --- a/src/main/java/org/kohsuke/github/GHProject.java +++ b/src/main/java/org/kohsuke/github/GHProject.java @@ -192,7 +192,7 @@ public class GHProject extends GHObject { * @return the api route */ protected String getApiRoute() { - return "/projects/" + id; + return "/projects/" + getId(); } /** @@ -291,7 +291,7 @@ public class GHProject extends GHObject { final GHProject project = this; return root.createRequest() .withPreview(INERTIA) - .withUrlPath(String.format("/projects/%d/columns", id)) + .withUrlPath(String.format("/projects/%d/columns", getId())) .toIterable(GHProjectColumn[].class, item -> item.wrap(project)); } @@ -309,7 +309,7 @@ public class GHProject extends GHObject { .method("POST") .withPreview(INERTIA) .with("name", name) - .withUrlPath(String.format("/projects/%d/columns", id)) + .withUrlPath(String.format("/projects/%d/columns", getId())) .fetch(GHProjectColumn.class) .wrap(this); } diff --git a/src/main/java/org/kohsuke/github/GHProjectCard.java b/src/main/java/org/kohsuke/github/GHProjectCard.java index 494f53cff..d86f34b69 100644 --- a/src/main/java/org/kohsuke/github/GHProjectCard.java +++ b/src/main/java/org/kohsuke/github/GHProjectCard.java @@ -213,7 +213,7 @@ public class GHProjectCard extends GHObject { * @return the api route */ protected String getApiRoute() { - return String.format("/projects/columns/cards/%d", id); + return String.format("/projects/columns/cards/%d", getId()); } /** diff --git a/src/main/java/org/kohsuke/github/GHProjectColumn.java b/src/main/java/org/kohsuke/github/GHProjectColumn.java index 4ca935478..4d42a9127 100644 --- a/src/main/java/org/kohsuke/github/GHProjectColumn.java +++ b/src/main/java/org/kohsuke/github/GHProjectColumn.java @@ -115,7 +115,7 @@ public class GHProjectColumn extends GHObject { * @return the api route */ protected String getApiRoute() { - return String.format("/projects/columns/%d", id); + return String.format("/projects/columns/%d", getId()); } /** @@ -139,7 +139,7 @@ public class GHProjectColumn extends GHObject { final GHProjectColumn column = this; return root.createRequest() .withPreview(INERTIA) - .withUrlPath(String.format("/projects/columns/%d/cards", id)) + .withUrlPath(String.format("/projects/columns/%d/cards", getId())) .toIterable(GHProjectCard[].class, item -> item.wrap(column)); } @@ -157,7 +157,7 @@ public class GHProjectColumn extends GHObject { .method("POST") .withPreview(INERTIA) .with("note", note) - .withUrlPath(String.format("/projects/columns/%d/cards", id)) + .withUrlPath(String.format("/projects/columns/%d/cards", getId())) .fetch(GHProjectCard.class) .wrap(this); } @@ -177,7 +177,7 @@ public class GHProjectColumn extends GHObject { .withPreview(INERTIA) .with("content_type", issue instanceof GHPullRequest ? "PullRequest" : "Issue") .with("content_id", issue.getId()) - .withUrlPath(String.format("/projects/columns/%d/cards", id)) + .withUrlPath(String.format("/projects/columns/%d/cards", getId())) .fetch(GHProjectCard.class) .wrap(this); } diff --git a/src/main/java/org/kohsuke/github/GHPullRequest.java b/src/main/java/org/kohsuke/github/GHPullRequest.java index 92b7c581e..824050c07 100644 --- a/src/main/java/org/kohsuke/github/GHPullRequest.java +++ b/src/main/java/org/kohsuke/github/GHPullRequest.java @@ -33,6 +33,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Objects; import javax.annotation.CheckForNull; @@ -103,7 +104,9 @@ public class GHPullRequest extends GHIssue implements Refreshable { protected String getApiRoute() { if (owner == null) { // Issues returned from search to do not have an owner. Attempt to use url. - return StringUtils.prependIfMissing(getUrl().toString().replace(root.getApiUrl(), ""), "/"); + final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!"); + return StringUtils.prependIfMissing(url.toString().replace(root.getApiUrl(), ""), "/"); + } return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/pulls/" + number; } @@ -387,10 +390,14 @@ public class GHPullRequest extends GHIssue implements Refreshable { * Repopulates this object. */ public void refresh() throws IOException { - if (root.isOffline()) { + if (root == null || root.isOffline()) { return; // cannot populate, will have to live with what we have } - root.createRequest().withPreview(SHADOW_CAT).withUrlPath(url).fetchInto(this).wrapUp(owner); + + URL url = getUrl(); + if (url != null) { + root.createRequest().withPreview(SHADOW_CAT).setRawUrlPath(url.toString()).fetchInto(this).wrapUp(owner); + } } /** diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReview.java b/src/main/java/org/kohsuke/github/GHPullRequestReview.java index 771c09512..4248fb172 100644 --- a/src/main/java/org/kohsuke/github/GHPullRequestReview.java +++ b/src/main/java/org/kohsuke/github/GHPullRequestReview.java @@ -111,7 +111,7 @@ public class GHPullRequestReview extends GHObject { * @return the api route */ protected String getApiRoute() { - return owner.getApiRoute() + "/reviews/" + id; + return owner.getApiRoute() + "/reviews/" + getId(); } /** diff --git a/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java b/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java index 32fded4fe..5fe6cd182 100644 --- a/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java +++ b/src/main/java/org/kohsuke/github/GHPullRequestReviewComment.java @@ -153,7 +153,7 @@ public class GHPullRequestReviewComment extends GHObject implements Reactable { * @return the api route */ protected String getApiRoute() { - return "/repos/" + owner.getRepository().getFullName() + "/pulls/comments/" + id; + return "/repos/" + owner.getRepository().getFullName() + "/pulls/comments/" + getId(); } /** diff --git a/src/main/java/org/kohsuke/github/GHReaction.java b/src/main/java/org/kohsuke/github/GHReaction.java index 2b0b80c39..ca51b9de5 100644 --- a/src/main/java/org/kohsuke/github/GHReaction.java +++ b/src/main/java/org/kohsuke/github/GHReaction.java @@ -58,6 +58,6 @@ public class GHReaction extends GHObject { * the io exception */ public void delete() throws IOException { - root.createRequest().method("DELETE").withPreview(SQUIRREL_GIRL).withUrlPath("/reactions/" + id).send(); + root.createRequest().method("DELETE").withPreview(SQUIRREL_GIRL).withUrlPath("/reactions/" + getId()).send(); } } diff --git a/src/main/java/org/kohsuke/github/GHRelease.java b/src/main/java/org/kohsuke/github/GHRelease.java index 051811832..041cfee85 100644 --- a/src/main/java/org/kohsuke/github/GHRelease.java +++ b/src/main/java/org/kohsuke/github/GHRelease.java @@ -270,7 +270,7 @@ public class GHRelease extends GHObject { * the io exception */ public void delete() throws IOException { - root.createRequest().method("DELETE").withUrlPath(owner.getApiTailUrl("releases/" + id)).send(); + root.createRequest().method("DELETE").withUrlPath(owner.getApiTailUrl("releases/" + getId())).send(); } /** @@ -283,6 +283,6 @@ public class GHRelease extends GHObject { } private String getApiTailUrl(String end) { - return owner.getApiTailUrl(format("releases/%s/%s", id, end)); + return owner.getApiTailUrl(format("releases/%s/%s", getId(), end)); } } diff --git a/src/main/java/org/kohsuke/github/GHReleaseUpdater.java b/src/main/java/org/kohsuke/github/GHReleaseUpdater.java index 4d1b69b89..5aad46c1b 100644 --- a/src/main/java/org/kohsuke/github/GHReleaseUpdater.java +++ b/src/main/java/org/kohsuke/github/GHReleaseUpdater.java @@ -100,7 +100,7 @@ public class GHReleaseUpdater { */ public GHRelease update() throws IOException { return builder.method("PATCH") - .withUrlPath(base.owner.getApiTailUrl("releases/" + base.id)) + .withUrlPath(base.owner.getApiTailUrl("releases/" + base.getId())) .fetch(GHRelease.class) .wrap(base.owner); } diff --git a/src/main/java/org/kohsuke/github/GHRepoHook.java b/src/main/java/org/kohsuke/github/GHRepoHook.java index d273168f4..8de9d9261 100644 --- a/src/main/java/org/kohsuke/github/GHRepoHook.java +++ b/src/main/java/org/kohsuke/github/GHRepoHook.java @@ -18,6 +18,6 @@ class GHRepoHook extends GHHook { @Override String getApiRoute() { - return String.format("/repos/%s/%s/hooks/%d", repository.getOwnerName(), repository.getName(), id); + return String.format("/repos/%s/%s/hooks/%d", repository.getOwnerName(), repository.getName(), getId()); } } diff --git a/src/main/java/org/kohsuke/github/GHTeam.java b/src/main/java/org/kohsuke/github/GHTeam.java index aae670410..421c18bb0 100644 --- a/src/main/java/org/kohsuke/github/GHTeam.java +++ b/src/main/java/org/kohsuke/github/GHTeam.java @@ -161,7 +161,7 @@ public class GHTeam extends GHObject implements Refreshable { */ public boolean hasMember(GHUser user) { try { - root.createRequest().withUrlPath("/teams/" + id + "/members/" + user.getLogin()).send(); + root.createRequest().withUrlPath("/teams/" + getId() + "/members/" + user.getLogin()).send(); return true; } catch (IOException ignore) { return false; @@ -294,7 +294,7 @@ public class GHTeam extends GHObject implements Refreshable { } private String api(String tail) { - return "/teams/" + id + tail; + return "/teams/" + getId() + tail; } /** diff --git a/src/test/java/org/kohsuke/github/GHAppTest.java b/src/test/java/org/kohsuke/github/GHAppTest.java index c2e9d5c26..fa6a837b2 100644 --- a/src/test/java/org/kohsuke/github/GHAppTest.java +++ b/src/test/java/org/kohsuke/github/GHAppTest.java @@ -28,8 +28,8 @@ public class GHAppTest extends AbstractGitHubWireMockTest { @Test public void getGitHubApp() throws IOException { GHApp app = gitHub.getApp(); - assertThat(app.id, is((long) 11111)); - assertThat(app.getOwner().id, is((long) 111111111)); + assertThat(app.getId(), is((long) 11111)); + assertThat(app.getOwner().getId(), is((long) 111111111)); assertThat(app.getOwner().login, is("bogus")); assertThat(app.getName(), is("Bogus-Development")); assertThat(app.getDescription(), is("")); @@ -132,8 +132,8 @@ public class GHAppTest extends AbstractGitHubWireMockTest { Map appPermissions = appInstallation.getPermissions(); GHUser appAccount = appInstallation.getAccount(); - assertThat(appInstallation.id, is((long) 11111111)); - assertThat(appAccount.id, is((long) 111111111)); + assertThat(appInstallation.getId(), is((long) 11111111)); + assertThat(appAccount.getId(), is((long) 111111111)); assertThat(appAccount.login, is("bogus")); assertThat(appInstallation.getRepositorySelection(), is(GHRepositorySelection.SELECTED)); assertThat(appInstallation.getAccessTokenUrl(), endsWith("/app/installations/11111111/access_tokens")); diff --git a/src/test/java/org/kohsuke/github/GHCheckRunBuilderTest.java b/src/test/java/org/kohsuke/github/GHCheckRunBuilderTest.java index d9db27899..be7a8a5d3 100644 --- a/src/test/java/org/kohsuke/github/GHCheckRunBuilderTest.java +++ b/src/test/java/org/kohsuke/github/GHCheckRunBuilderTest.java @@ -55,7 +55,7 @@ public class GHCheckRunBuilderTest extends AbstractGitHubWireMockTest { .create(); assertEquals("completed", checkRun.getStatus()); assertEquals(1, checkRun.getOutput().getAnnotationsCount()); - assertEquals(546384586, checkRun.id); + assertEquals(546384586, checkRun.getId()); } @Test @@ -74,7 +74,7 @@ public class GHCheckRunBuilderTest extends AbstractGitHubWireMockTest { assertEquals("Big Run", checkRun.getOutput().getTitle()); assertEquals("Lots of stuff here ยป", checkRun.getOutput().getSummary()); assertEquals(101, checkRun.getOutput().getAnnotationsCount()); - assertEquals(546384622, checkRun.id); + assertEquals(546384622, checkRun.getId()); } @Test @@ -86,7 +86,7 @@ public class GHCheckRunBuilderTest extends AbstractGitHubWireMockTest { .create(); assertEquals("completed", checkRun.getStatus()); assertEquals(0, checkRun.getOutput().getAnnotationsCount()); - assertEquals(546384705, checkRun.id); + assertEquals(546384705, checkRun.getId()); } @Test @@ -97,7 +97,7 @@ public class GHCheckRunBuilderTest extends AbstractGitHubWireMockTest { .create(); assertEquals("in_progress", checkRun.getStatus()); assertNull(checkRun.getConclusion()); - assertEquals(546469053, checkRun.id); + assertEquals(546469053, checkRun.getId()); } @Test