From 903ea84401067e903977ba8037b1db0e6f79f16a Mon Sep 17 00:00:00 2001 From: Tristan Lins Date: Sun, 30 Jun 2019 16:33:48 +0200 Subject: [PATCH 1/2] Add methods GitlabAPI#getProjectPipeline(...) --- src/main/java/org/gitlab/api/GitlabAPI.java | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index c8770ec1..210787fe 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -976,6 +976,29 @@ public GitlabUpload uploadFile(GitlabProject project, File file) throws IOExcept return dispatch().withAttachment("file", file).to(tailUrl, GitlabUpload.class); } + /** + * Get a project's pipeline + * + * @param project the project + * @param pipeline the pipeline + * @return The project pipeline + */ + public GitlabPipeline getProjectPipeline(GitlabProject project, GitlabPipeline pipeline) throws IOException { + return getProjectPipeline(project.getId(), pipeline.getId()); + } + + /** + * Get a project's pipeline + * + * @param projectId the project id + * @param pipelineId the pipeline id + * @return The project pipeline + */ + public GitlabPipeline getProjectPipeline(Integer projectId, Integer pipelineId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabPipeline.URL + sanitizeId(pipelineId, "pipelineId"); + return retrieve().to(tailUrl, GitlabPipeline.class); + } + /** * Gets a list of a project's jobs in Gitlab * From 739d0eaee8f336183b6fb89fa1a689857f8bb819 Mon Sep 17 00:00:00 2001 From: Tristan Lins Date: Sun, 30 Jun 2019 17:52:54 +0200 Subject: [PATCH 2/2] Add missing / at pipeline url --- src/main/java/org/gitlab/api/GitlabAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 210787fe..829cc4cd 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -995,7 +995,7 @@ public GitlabPipeline getProjectPipeline(GitlabProject project, GitlabPipeline p * @return The project pipeline */ public GitlabPipeline getProjectPipeline(Integer projectId, Integer pipelineId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabPipeline.URL + sanitizeId(pipelineId, "pipelineId"); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabPipeline.URL + "/" + sanitizeId(pipelineId, "pipelineId"); return retrieve().to(tailUrl, GitlabPipeline.class); }