diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java index 76ebc8e1c..8bd7c1895 100644 --- a/src/main/java/org/kohsuke/github/GHRepository.java +++ b/src/main/java/org/kohsuke/github/GHRepository.java @@ -3061,10 +3061,10 @@ public class GHRepository extends GHObject { * @throws IOException * the io exception */ - public GHWorkflowRunJob getWorkflowRunJob(long id) throws IOException { + public GHWorkflowJob getWorkflowJob(long id) throws IOException { return root.createRequest() .withUrlPath(getApiTailUrl("/actions/jobs/"), String.valueOf(id)) - .fetch(GHWorkflowRunJob.class) + .fetch(GHWorkflowJob.class) .wrapUp(this); } diff --git a/src/main/java/org/kohsuke/github/GHWorkflowRunJob.java b/src/main/java/org/kohsuke/github/GHWorkflowJob.java similarity index 97% rename from src/main/java/org/kohsuke/github/GHWorkflowRunJob.java rename to src/main/java/org/kohsuke/github/GHWorkflowJob.java index 22b747e4c..9afcc925d 100644 --- a/src/main/java/org/kohsuke/github/GHWorkflowRunJob.java +++ b/src/main/java/org/kohsuke/github/GHWorkflowJob.java @@ -20,7 +20,7 @@ import static java.util.Objects.requireNonNull; * * @author Guillaume Smet */ -public class GHWorkflowRunJob extends GHObject { +public class GHWorkflowJob extends GHObject { // Not provided by the API. @JsonIgnore @@ -171,12 +171,12 @@ public class GHWorkflowRunJob extends GHObject { return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/actions/jobs/" + getId(); } - GHWorkflowRunJob wrapUp(GHRepository owner) { + GHWorkflowJob wrapUp(GHRepository owner) { this.owner = owner; return wrapUp(owner.root); } - GHWorkflowRunJob wrapUp(GitHub root) { + GHWorkflowJob wrapUp(GitHub root) { this.root = root; if (owner != null) { owner.wrap(root); diff --git a/src/main/java/org/kohsuke/github/GHWorkflowRunJobQueryBuilder.java b/src/main/java/org/kohsuke/github/GHWorkflowJobQueryBuilder.java similarity index 73% rename from src/main/java/org/kohsuke/github/GHWorkflowRunJobQueryBuilder.java rename to src/main/java/org/kohsuke/github/GHWorkflowJobQueryBuilder.java index 033903984..af2803b37 100644 --- a/src/main/java/org/kohsuke/github/GHWorkflowRunJobQueryBuilder.java +++ b/src/main/java/org/kohsuke/github/GHWorkflowJobQueryBuilder.java @@ -7,10 +7,10 @@ import java.net.MalformedURLException; * * @author Guillaume Smet */ -public class GHWorkflowRunJobQueryBuilder extends GHQueryBuilder { +public class GHWorkflowJobQueryBuilder extends GHQueryBuilder { private final GHRepository repo; - GHWorkflowRunJobQueryBuilder(GHWorkflowRun workflowRun) { + GHWorkflowJobQueryBuilder(GHWorkflowRun workflowRun) { super(workflowRun.getRepository().root); this.repo = workflowRun.getRepository(); req.withUrlPath(repo.getApiTailUrl("actions/runs"), String.valueOf(workflowRun.getId()), "jobs"); @@ -21,7 +21,7 @@ public class GHWorkflowRunJobQueryBuilder extends GHQueryBuilder list() { + public PagedIterable list() { try { - return new GHWorkflowRunJobsIterable(repo, req.build()); + return new GHWorkflowJobsIterable(repo, req.build()); } catch (MalformedURLException e) { throw new GHException(e.getMessage(), e); } diff --git a/src/main/java/org/kohsuke/github/GHWorkflowRunJobsIterable.java b/src/main/java/org/kohsuke/github/GHWorkflowJobsIterable.java similarity index 51% rename from src/main/java/org/kohsuke/github/GHWorkflowRunJobsIterable.java rename to src/main/java/org/kohsuke/github/GHWorkflowJobsIterable.java index f533d8145..c3be99f4d 100644 --- a/src/main/java/org/kohsuke/github/GHWorkflowRunJobsIterable.java +++ b/src/main/java/org/kohsuke/github/GHWorkflowJobsIterable.java @@ -7,37 +7,37 @@ import javax.annotation.Nonnull; /** * Iterable for workflow run jobs listing. */ -class GHWorkflowRunJobsIterable extends PagedIterable { +class GHWorkflowJobsIterable extends PagedIterable { private final GHRepository repo; private final GitHubRequest request; - private GHWorkflowRunJobsPage result; + private GHWorkflowJobsPage result; - public GHWorkflowRunJobsIterable(GHRepository repo, GitHubRequest request) { + public GHWorkflowJobsIterable(GHRepository repo, GitHubRequest request) { this.repo = repo; this.request = request; } @Nonnull @Override - public PagedIterator _iterator(int pageSize) { + public PagedIterator _iterator(int pageSize) { return new PagedIterator<>( - adapt(GitHubPageIterator.create(repo.root.getClient(), GHWorkflowRunJobsPage.class, request, pageSize)), + adapt(GitHubPageIterator.create(repo.root.getClient(), GHWorkflowJobsPage.class, request, pageSize)), null); } - protected Iterator adapt(final Iterator base) { - return new Iterator() { + protected Iterator adapt(final Iterator base) { + return new Iterator() { public boolean hasNext() { return base.hasNext(); } - public GHWorkflowRunJob[] next() { - GHWorkflowRunJobsPage v = base.next(); + public GHWorkflowJob[] next() { + GHWorkflowJobsPage v = base.next(); if (result == null) { result = v; } - return v.getWorkflowRunJobs(repo); + return v.getWorkflowJobs(repo); } }; } diff --git a/src/main/java/org/kohsuke/github/GHWorkflowRunJobsPage.java b/src/main/java/org/kohsuke/github/GHWorkflowJobsPage.java similarity index 62% rename from src/main/java/org/kohsuke/github/GHWorkflowRunJobsPage.java rename to src/main/java/org/kohsuke/github/GHWorkflowJobsPage.java index 28e89455a..6371d3663 100644 --- a/src/main/java/org/kohsuke/github/GHWorkflowRunJobsPage.java +++ b/src/main/java/org/kohsuke/github/GHWorkflowJobsPage.java @@ -3,16 +3,16 @@ package org.kohsuke.github; /** * Represents the one page of jobs result when listing jobs from a workflow run. */ -class GHWorkflowRunJobsPage { +class GHWorkflowJobsPage { private int total_count; - private GHWorkflowRunJob[] jobs; + private GHWorkflowJob[] jobs; public int getTotalCount() { return total_count; } - GHWorkflowRunJob[] getWorkflowRunJobs(GHRepository repo) { - for (GHWorkflowRunJob job : jobs) { + GHWorkflowJob[] getWorkflowJobs(GHRepository repo) { + for (GHWorkflowJob job : jobs) { job.wrapUp(repo); } return jobs; diff --git a/src/main/java/org/kohsuke/github/GHWorkflowRun.java b/src/main/java/org/kohsuke/github/GHWorkflowRun.java index 1e8e52860..cdf60653c 100644 --- a/src/main/java/org/kohsuke/github/GHWorkflowRun.java +++ b/src/main/java/org/kohsuke/github/GHWorkflowRun.java @@ -318,8 +318,8 @@ public class GHWorkflowRun extends GHObject { * * @return list of jobs from the last execution */ - public PagedIterable listJobs() { - return new GHWorkflowRunJobQueryBuilder(this).latest().list(); + public PagedIterable listJobs() { + return new GHWorkflowJobQueryBuilder(this).latest().list(); } /** @@ -327,8 +327,8 @@ public class GHWorkflowRun extends GHObject { * * @return list of jobs from all the executions */ - public PagedIterable listAllJobs() { - return new GHWorkflowRunJobQueryBuilder(this).all().list(); + public PagedIterable listAllJobs() { + return new GHWorkflowJobQueryBuilder(this).all().list(); } private String getApiRoute() { diff --git a/src/test/java/org/kohsuke/github/GHWorkflowRunTest.java b/src/test/java/org/kohsuke/github/GHWorkflowRunTest.java index 1376aa58f..4d4e705e3 100644 --- a/src/test/java/org/kohsuke/github/GHWorkflowRunTest.java +++ b/src/test/java/org/kohsuke/github/GHWorkflowRunTest.java @@ -4,9 +4,9 @@ import org.awaitility.Awaitility; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.kohsuke.github.GHWorkflowJob.Step; import org.kohsuke.github.GHWorkflowRun.Conclusion; import org.kohsuke.github.GHWorkflowRun.Status; -import org.kohsuke.github.GHWorkflowRunJob.Step; import org.kohsuke.github.function.InputStreamFunction; import java.io.IOException; @@ -339,7 +339,7 @@ public class GHWorkflowRunTest extends AbstractGitHubWireMockTest { latestPreexistingWorkflowRunId).orElseThrow( () -> new IllegalStateException("We must have a valid workflow run starting from here")); - List jobs = workflowRun.listJobs() + List jobs = workflowRun.listJobs() .toList() .stream() .sorted((j1, j2) -> j1.getName().compareTo(j2.getName())) @@ -347,22 +347,22 @@ public class GHWorkflowRunTest extends AbstractGitHubWireMockTest { assertThat(jobs.size(), is(2)); - GHWorkflowRunJob job1 = jobs.get(0); + GHWorkflowJob job1 = jobs.get(0); checkJobProperties(workflowRun.getId(), job1, "job1"); String fullLogContent = job1.downloadLogs(getLogTextInputStreamFunction()); assertThat(fullLogContent, containsString("Hello from job1!")); - GHWorkflowRunJob job2 = jobs.get(1); + GHWorkflowJob job2 = jobs.get(1); checkJobProperties(workflowRun.getId(), job2, "job2"); fullLogContent = job2.downloadLogs(getLogTextInputStreamFunction()); assertThat(fullLogContent, containsString("Hello from job2!")); - // while we have a job around, test GHRepository#getWorkflowRunJob(id) - GHWorkflowRunJob job1ById = repo.getWorkflowRunJob(job1.getId()); + // while we have a job around, test GHRepository#getWorkflowJob(id) + GHWorkflowJob job1ById = repo.getWorkflowJob(job1.getId()); checkJobProperties(workflowRun.getId(), job1ById, "job1"); // Also test listAllJobs() works correctly - List allJobs = workflowRun.listAllJobs().withPageSize(10).iterator().nextPage(); + List allJobs = workflowRun.listAllJobs().withPageSize(10).iterator().nextPage(); assertThat(allJobs.size(), greaterThanOrEqualTo(2)); } @@ -468,8 +468,7 @@ public class GHWorkflowRunTest extends AbstractGitHubWireMockTest { assertFalse(artifact.isExpired()); } - private static void checkJobProperties(long workflowRunId, GHWorkflowRunJob job, String jobName) - throws IOException { + private static void checkJobProperties(long workflowRunId, GHWorkflowJob job, String jobName) throws IOException { assertNotNull(job.getId()); assertNotNull(job.getNodeId()); assertEquals(REPO_NAME, job.getRepository().getFullName());