Unverified Commit 7599f28d authored by Vladimir Molodkin's avatar Vladimir Molodkin Committed by GitHub
Browse files

#954 add include_retried for jobs api (#955)



* #954 add include_retried for jobs api

* Apply suggestions from code review

* Fix compile error

---------

Co-authored-by: default avatarvladimir.molodkin <vladimir.molodkin@aliexpress.ru>
Co-authored-by: default avatarJérémie Bresson <dev@jmini.fr>
Co-authored-by: default avatarJeremie Bresson <jeremie.bresson@unblu.com>
parent 6a9d9293
...@@ -139,9 +139,22 @@ public class JobApi extends AbstractApi implements Constants { ...@@ -139,9 +139,22 @@ public class JobApi extends AbstractApi implements Constants {
* @throws GitLabApiException if any exception occurs during execution * @throws GitLabApiException if any exception occurs during execution
*/ */
public List<Job> getJobsForPipeline(Object projectIdOrPath, long pipelineId) throws GitLabApiException { public List<Job> getJobsForPipeline(Object projectIdOrPath, long pipelineId) throws GitLabApiException {
Response response = get(Response.Status.OK, getDefaultPerPageParam(), return getJobsForPipeline(projectIdOrPath, pipelineId, (Boolean) null);
"projects", getProjectIdOrPath(projectIdOrPath), "pipelines", pipelineId, "jobs"); }
return (response.readEntity(new GenericType<List<Job>>() {}));
/**
* Get a list of jobs in a pipeline.
*
* <pre><code>GitLab Endpoint: GET /projects/:id/pipelines/:pipeline_id/jobs</code></pre>
*
* @param projectIdOrPath id, path of the project, or a Project instance holding the project ID or path to get the pipelines for
* @param pipelineId the pipeline ID to get the list of jobs for
* @param includeRetried Include retried jobs in the response
* @return a list containing the jobs for the specified project ID and pipeline ID
* @throws GitLabApiException if any exception occurs during execution
*/
public List<Job> getJobsForPipeline(Object projectIdOrPath, long pipelineId, Boolean includeRetried) throws GitLabApiException {
return getJobsForPipeline(projectIdOrPath, pipelineId, null, includeRetried);
} }
/** /**
...@@ -156,7 +169,26 @@ public class JobApi extends AbstractApi implements Constants { ...@@ -156,7 +169,26 @@ public class JobApi extends AbstractApi implements Constants {
* @throws GitLabApiException if any exception occurs during execution * @throws GitLabApiException if any exception occurs during execution
*/ */
public List<Job> getJobsForPipeline(Object projectIdOrPath, long pipelineId, JobScope scope) throws GitLabApiException { public List<Job> getJobsForPipeline(Object projectIdOrPath, long pipelineId, JobScope scope) throws GitLabApiException {
GitLabApiForm formData = new GitLabApiForm().withParam("scope", scope).withParam(PER_PAGE_PARAM, getDefaultPerPage()); return getJobsForPipeline(projectIdOrPath, pipelineId, scope, false);
}
/**
* Get a list of jobs in a pipeline.
*
* <pre><code>GitLab Endpoint: GET /projects/:id/pipelines/:pipeline_id/jobs</code></pre>
*
* @param projectIdOrPath id, path of the project, or a Project instance holding the project ID or path to get the pipelines for
* @param pipelineId the pipeline ID to get the list of jobs for
* @param scope the scope of jobs, one of: CREATED, PENDING, RUNNING, FAILED, SUCCESS, CANCELED, SKIPPED, MANUAL
* @param includeRetried Include retried jobs in the response
* @return a list containing the jobs for the specified project ID and pipeline ID
* @throws GitLabApiException if any exception occurs during execution
*/
public List<Job> getJobsForPipeline(Object projectIdOrPath, long pipelineId, JobScope scope, Boolean includeRetried) throws GitLabApiException {
GitLabApiForm formData = new GitLabApiForm()
.withParam("scope", scope)
.withParam("include_retried", includeRetried)
.withParam(PER_PAGE_PARAM, getDefaultPerPage());
Response response = get(Response.Status.OK, formData.asMap(), "projects", getProjectIdOrPath(projectIdOrPath), "pipelines", pipelineId, "jobs"); Response response = get(Response.Status.OK, formData.asMap(), "projects", getProjectIdOrPath(projectIdOrPath), "pipelines", pipelineId, "jobs");
return (response.readEntity(new GenericType<List<Job>>() {})); return (response.readEntity(new GenericType<List<Job>>() {}));
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment