From 2ffa46529110ff42f00d3a6af83091e7eee2c151 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Mon, 15 Jan 2018 15:26:00 +0200 Subject: [PATCH 01/12] Added attributes 'token' and 'note_events' to add project hook method --- src/main/java/org/gitlab/api/GitlabAPI.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index a9806d23..eac645c6 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1873,7 +1873,7 @@ public GitlabProjectHook addProjectHook(GitlabProject project, String url, Strin .to(tailUrl, GitlabProjectHook.class); } - public GitlabProjectHook addProjectHook(Serializable projectId, String url, boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean tagPushEvents, boolean sslVerification) throws IOException { + public GitlabProjectHook addProjectHook(Serializable projectId, String url, boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean noteEvents, boolean tagPushEvents, boolean sslVerification, String token) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectHook.URL; return dispatch() @@ -1881,8 +1881,10 @@ public GitlabProjectHook addProjectHook(Serializable projectId, String url, bool .with("push_events", pushEvents ? "true" : "false") .with("issues_events", issuesEvents ? "true" : "false") .with("merge_requests_events", mergeRequestEvents ? "true" : "false") + .with("note_events", noteEvents ? "true" : "false") .with("tag_push_events", tagPushEvents ? "true" : "false") .with("enable_ssl_verification", sslVerification ? "true" : "false") + .with("token", token) .to(tailUrl, GitlabProjectHook.class); } From 8d6b93cbaf5039a90a79d563bcfee03106d72b30 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Mon, 15 Jan 2018 15:50:23 +0200 Subject: [PATCH 02/12] Added possibility to use Serializable projectId in bunch of methods --- src/main/java/org/gitlab/api/GitlabAPI.java | 45 +++++++++++++++------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index eac645c6..cea8a0c7 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1331,12 +1331,15 @@ public GitlabMergeRequest getMergeRequestChanges(Serializable projectId, Integer String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + "/changes"; return retrieve().to(tailUrl, GitlabMergeRequest.class); } - - public GitlabMergeRequest getMergeRequest(GitlabProject project, Integer mergeRequestId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + "/" + mergeRequestId; + + public GitlabMergeRequest getMergeRequest(Serializable projectId, Integer mergeRequestId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId; return retrieve().to(tailUrl, GitlabMergeRequest.class); } - + + public GitlabMergeRequest getMergeRequest(GitlabProject project, Integer mergeRequestId) throws IOException { + return getMergeRequest(project.getId(), mergeRequestId); + } /** * Create a new MergeRequest @@ -1402,9 +1405,13 @@ public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mer * @throws IOException on gitlab api call error */ public GitlabMergeRequest acceptMergeRequest(GitlabProject project, Integer mergeRequestId, String mergeCommitMessage) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + "/" + mergeRequestId + "/merge"; + return acceptMergeRequest(project.getId(), mergeRequestId, mergeCommitMessage); + } + + public GitlabMergeRequest acceptMergeRequest(Serializable projectId, Integer mergeRequestId, String mergeCommitMessage) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + "/merge"; GitlabHTTPRequestor requestor = retrieve().method("PUT"); - requestor.with("id", project.getId()); + requestor.with("id", projectId); requestor.with("merge_request_id", mergeRequestId); if (mergeCommitMessage != null) requestor.with("merge_commit_message", mergeCommitMessage); @@ -1559,12 +1566,21 @@ public GitlabCommitComparison compareCommits(Serializable projectId, String comm // List commit statuses for a project ID and commit hash // GET /projects/:id/repository/commits/:sha/statuses public List getCommitStatuses(GitlabProject project, String commitHash) throws IOException { - return getCommitStatuses(project, commitHash, new Pagination()); + return getCommitStatuses(project.getId(), commitHash, new Pagination()); + } + + public List getCommitStatuses(Serializable projectId, String commitHash) throws IOException { + return getCommitStatuses(projectId, commitHash, new Pagination()); } public List getCommitStatuses(GitlabProject project, String commitHash, Pagination pagination) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository" + GitlabCommit.URL + "/" + + return getCommitStatuses(project.getId(), commitHash, pagination); + } + + public List getCommitStatuses(Serializable projectId, String commitHash, + Pagination pagination) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository" + GitlabCommit.URL + "/" + commitHash + GitlabCommitStatus.URL + pagination; GitlabCommitStatus[] statuses = retrieve().to(tailUrl, GitlabCommitStatus[].class); return Arrays.asList(statuses); @@ -1574,7 +1590,12 @@ public List getCommitStatuses(GitlabProject project, String // GET /projects/:id/statuses/:sha public GitlabCommitStatus createCommitStatus(GitlabProject project, String commitHash, String state, String ref, String name, String targetUrl, String description) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabCommitStatus.URL + "/" + commitHash; + return createCommitStatus(project.getId(), commitHash, state, ref, name, targetUrl, description); + } + + public GitlabCommitStatus createCommitStatus(Serializable projectId, String commitHash, String state, String ref, + String name, String targetUrl, String description) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabCommitStatus.URL + "/" + commitHash; return dispatch() .with("state", state) .with("ref", ref) @@ -1604,11 +1625,11 @@ public byte[] getRawFileContent(GitlabProject project, String sha, String filepa * @param filepath The path of the file * @throws IOException on gitlab api call error */ - public byte[] getRawFileContent(Integer projectId, String sha, String filepath) throws IOException { + public byte[] getRawFileContent(Serializable projectId, String sha, String filepath) throws IOException { Query query = new Query() .append("ref", sha); - String tailUrl = GitlabProject.URL + "/" + projectId + "/repository/files/" + sanitizePath(filepath) + "/raw" + query.toString(); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/files/" + sanitizePath(filepath) + "/raw" + query.toString(); return retrieve().to(tailUrl, byte[].class); } @@ -2559,7 +2580,7 @@ private String sanitizePath(String branch) { * @throws IOException on gitlab api call error * @see http://doc.gitlab.com/ce/api/commits.html#post-comment-to-commit */ - public CommitComment createCommitComment(Integer projectId, String sha, String note, + public CommitComment createCommitComment(Serializable projectId, String sha, String note, String path, String line, String line_type) throws IOException { Query query = new Query() From de206cfc44b256205e2ac06a11a284cc94d777d2 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Thu, 18 Jan 2018 16:01:37 +0200 Subject: [PATCH 03/12] Added attribute 'path' to get commits method. --- src/main/java/org/gitlab/api/GitlabAPI.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index cea8a0c7..a07faf6b 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1490,11 +1490,18 @@ public List getLastCommits(Serializable projectId, String branchOr public List getCommits(Serializable projectId, Pagination pagination, String branchOrTag) throws IOException { + return getCommits(projectId, null, branchOrTag, null); + } + + public List getCommits(Serializable projectId, Pagination pagination, + String branchOrTag, String path) throws IOException { final Query query = new Query(); if (branchOrTag != null) { query.append("ref_name", branchOrTag); } - + if (path != null) { + query.append("path", path); + } if (pagination != null) { query.mergeWith(pagination.asQuery()); } From 74cb6189f09b9d9a8fe4a059fe79d68dbcfab4f2 Mon Sep 17 00:00:00 2001 From: artemgubanov Date: Fri, 15 May 2020 14:38:36 +0300 Subject: [PATCH 04/12] restored lost changes from previous version --- pom.xml | 2 +- src/main/java/org/gitlab/api/GitlabAPI.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ab24b40d..a2b1bf3f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1-SNAPSHOT + 4.0.1.smartbear.4 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index a07faf6b..b1fd594a 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1252,22 +1252,22 @@ public List getMergeRequestsWithStatus(GitlabProject project return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } - public List getMergeRequests(Serializable projectId) throws IOException { + public List getMergeRequests(Serializable projectId) { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } - public List getMergeRequests(Serializable projectId, Pagination pagination) throws IOException { + public List getMergeRequests(Serializable projectId, Pagination pagination) { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + pagination.toString(); return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } - public List getMergeRequests(GitlabProject project) throws IOException { + public List getMergeRequests(GitlabProject project) { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } - public List getMergeRequests(GitlabProject project, Pagination pagination) throws IOException { + public List getMergeRequests(GitlabProject project, Pagination pagination) { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + pagination.toString(); return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } @@ -1331,6 +1331,11 @@ public GitlabMergeRequest getMergeRequestChanges(Serializable projectId, Integer String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + "/changes"; return retrieve().to(tailUrl, GitlabMergeRequest.class); } + + public List getMergeRequestCommits(Serializable projectId, Integer mergeRequestId) { + String tailUrl = "/projects/" + this.sanitizeProjectId(projectId) + "/merge_requests" + "/" + mergeRequestId + "/commits"; + return this.retrieve().getAll(tailUrl, GitlabCommit[].class); + } public GitlabMergeRequest getMergeRequest(Serializable projectId, Integer mergeRequestId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId; From 07e3698e5b166acd3f0c7836355605e3d44e3206 Mon Sep 17 00:00:00 2001 From: artemgubanov Date: Fri, 15 May 2020 14:39:00 +0300 Subject: [PATCH 05/12] added has_conflicts param to merge request --- .../org/gitlab/api/models/GitlabMergeRequest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index 7663af17..7b61914b 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -64,6 +64,9 @@ public class GitlabMergeRequest { @JsonProperty("sha") private String sha; + @JsonProperty("has_conflicts") + private boolean hasConflicts; + public Integer getId() { return id; } @@ -281,4 +284,12 @@ public String getSha() { public void setSha(String sha) { this.sha = sha; } + + public boolean isHasConflicts() { + return hasConflicts; + } + + public void setHasConflicts(boolean hasConflicts) { + this.hasConflicts = hasConflicts; + } } From faca8dc96ac971bd77bd9b4b2bb0d1e70b1111da Mon Sep 17 00:00:00 2001 From: tarasenkoMariya Date: Wed, 10 Feb 2021 16:33:44 +0200 Subject: [PATCH 06/12] Add job_events and pipeline_events parameters to create webhook update version to 4.0.1.smartbear.5 --- pom.xml | 2 +- src/main/java/org/gitlab/api/GitlabAPI.java | 27 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2b1bf3f..5cbb788e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1.smartbear.4 + 4.0.1.smartbear.5 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index b1fd594a..e3675db7 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1921,6 +1921,33 @@ public GitlabProjectHook addProjectHook(Serializable projectId, String url, bool .to(tailUrl, GitlabProjectHook.class); } + public GitlabProjectHook addProjectHook(Serializable projectId, + String url, + boolean pushEvents, + boolean issuesEvents, + boolean mergeRequestEvents, + boolean noteEvents, + boolean tagPushEvents, + boolean sslVerification, + boolean jobEvents, + boolean pipelineEvents, + String token) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectHook.URL; + + return dispatch() + .with("url", url) + .with("push_events", pushEvents ? "true" : "false") + .with("issues_events", issuesEvents ? "true" : "false") + .with("merge_requests_events", mergeRequestEvents ? "true" : "false") + .with("note_events", noteEvents ? "true" : "false") + .with("tag_push_events", tagPushEvents ? "true" : "false") + .with("enable_ssl_verification", sslVerification ? "true" : "false") + .with("pipeline_events", pipelineEvents ? "true" : "false") + .with("job_events", jobEvents ? "true" : "false") + .with("token", token) + .to(tailUrl, GitlabProjectHook.class); + } + public GitlabProjectHook editProjectHook(GitlabProject project, String hookId, String url) throws IOException { Query query = new Query() .append("url", url); From ed88c2ef2d9982ec9162e918c4e849581c3bdd2a Mon Sep 17 00:00:00 2001 From: tarasenkoMariya Date: Thu, 11 Feb 2021 11:56:13 +0200 Subject: [PATCH 07/12] Add call to load gitlab pipelines --- src/main/java/org/gitlab/api/GitlabAPI.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index e3675db7..5055477d 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -3067,6 +3067,11 @@ public List getPipelineTriggers(GitlabProject project) throws IOE } } + public List getMergeRequestPipelines(Serializable projectName, Integer mergeRequestId) throws IOException { + return retrieve().getAll(GitlabProject.URL + "/" + sanitizeProjectId(projectName) + GitlabMergeRequest.URL + "/" + + mergeRequestId + GitlabPipeline.URL + PARAM_MAX_ITEMS_PER_PAGE, GitlabPipeline[].class); + } + /** * Gets email-on-push service setup for a projectId. * From d050ee7cb1132acffd53ef39228779928f8303ec Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Mon, 29 Mar 2021 15:52:21 +0300 Subject: [PATCH 08/12] changed whitespace encoding to be '%20' instead of '+' --- pom.xml | 2 +- src/main/java/org/gitlab/api/GitlabAPI.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5cbb788e..05a311e0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1.smartbear.5 + 4.0.1.smartbear.6 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 5055477d..8a2ed111 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2600,7 +2600,7 @@ private String sanitizeId(Serializable id, String parameterName) { private String sanitizePath(String branch) { try { - return URLEncoder.encode(branch, "UTF-8"); + return URLEncoder.encode(branch, "UTF-8").replaceAll("\\+", "%20"); } catch (UnsupportedEncodingException e) { throw new RuntimeException((e)); } From 6d3ab919ab47be4836576cf8df90b1683802c4c5 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Fri, 24 Sep 2021 10:15:10 +0300 Subject: [PATCH 09/12] added merge options to merge api call --- pom.xml | 2 +- src/main/java/org/gitlab/api/GitlabAPI.java | 17 ++++++++++---- .../org/gitlab/api/models/GitlabProject.java | 22 +++++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 05a311e0..038a3d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1.smartbear.6 + 4.0.1.smartbear.7.1 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 8a2ed111..84b4e0a4 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1409,17 +1409,26 @@ public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mer * @return new merge request status * @throws IOException on gitlab api call error */ - public GitlabMergeRequest acceptMergeRequest(GitlabProject project, Integer mergeRequestId, String mergeCommitMessage) throws IOException { - return acceptMergeRequest(project.getId(), mergeRequestId, mergeCommitMessage); + public GitlabMergeRequest acceptMergeRequest(GitlabProject project, Integer mergeRequestId, String mergeCommitMessage, + String squashCommitMessage, boolean deleteBranch) throws IOException { + return acceptMergeRequest(project.getId(), mergeRequestId, mergeCommitMessage, squashCommitMessage, deleteBranch); } - public GitlabMergeRequest acceptMergeRequest(Serializable projectId, Integer mergeRequestId, String mergeCommitMessage) throws IOException { + public GitlabMergeRequest acceptMergeRequest(Serializable projectId, Integer mergeRequestId, String mergeCommitMessage, + String squashCommitMessage, boolean deleteBranch) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + "/merge"; GitlabHTTPRequestor requestor = retrieve().method("PUT"); requestor.with("id", projectId); requestor.with("merge_request_id", mergeRequestId); - if (mergeCommitMessage != null) + if (mergeCommitMessage != null) { requestor.with("merge_commit_message", mergeCommitMessage); + } + if (squashCommitMessage != null) { + requestor.with("squash", true); + requestor.with("squash_commit_message", squashCommitMessage); + } + requestor.with("should_remove_source_branch", deleteBranch); return requestor.to(tailUrl, GitlabMergeRequest.class); } diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 33fb923c..8c5808a6 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -36,6 +36,12 @@ public class GitlabProject { @JsonProperty("merge_requests_enabled") private Boolean mergeRequestsEnabled; + @JsonProperty("merge_method") + private String mergeMethod; + + @JsonProperty("squash_option") + private String squashOption; + @JsonProperty("snippets_enabled") private Boolean snippetsEnabled; @@ -472,6 +478,22 @@ public void setPrintingMergeRequestLinkEnabled(Boolean printingMergeRequestLinkE this.printingMergeRequestLinkEnabled = printingMergeRequestLinkEnabled; } + public String getMergeMethod() { + return mergeMethod; + } + + public void setMergeMethod(String mergeMethod) { + this.mergeMethod = mergeMethod; + } + + public String getSquashOption() { + return squashOption; + } + + public void setSquashOption(String squashOption) { + this.squashOption = squashOption; + } + @Override public boolean equals(Object o) { if (this == o) return true; From 8fbedb619de928e5bc5a1598bec99d3a17284d1d Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Mon, 15 Nov 2021 16:49:46 +0200 Subject: [PATCH 10/12] added squash abd branch-delete fields to merge request class --- pom.xml | 2 +- .../gitlab/api/models/GitlabMergeRequest.java | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 038a3d1b..6c2e5842 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1.smartbear.7.1 + 4.0.1.smartbear.7.2 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index 7b61914b..d90f05bd 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -67,6 +67,12 @@ public class GitlabMergeRequest { @JsonProperty("has_conflicts") private boolean hasConflicts; + @JsonProperty + private boolean squash; + + @JsonProperty("force_remove_source_branch") + private boolean forceRemoveSourceBranch; + public Integer getId() { return id; } @@ -292,4 +298,20 @@ public boolean isHasConflicts() { public void setHasConflicts(boolean hasConflicts) { this.hasConflicts = hasConflicts; } + + public boolean isSquash() { + return squash; + } + + public void setSquash(boolean squash) { + this.squash = squash; + } + + public boolean isForceRemoveSourceBranch() { + return forceRemoveSourceBranch; + } + + public void setForceRemoveSourceBranch(boolean forceRemoveSourceBranch) { + this.forceRemoveSourceBranch = forceRemoveSourceBranch; + } } From 5710eb13099887dd599008315541432fc6540883 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Tue, 13 Jun 2023 13:22:18 +0300 Subject: [PATCH 11/12] added 'get all project members' method --- pom.xml | 2 +- src/main/java/org/gitlab/api/GitlabAPI.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6c2e5842..c77e5670 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1.smartbear.7.2 + 4.0.1.smartbear.8 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 84b4e0a4..73ebe715 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2439,6 +2439,15 @@ public List getProjectMembers(Serializable projectId, Pagin return Arrays.asList(retrieve().to(tailUrl, GitlabProjectMember[].class)); } + public List getProjectMembersAll(Serializable projectId) throws IOException { + return getProjectMembersAll(projectId, new Pagination()); + } + + public List getProjectMembersAll(Serializable projectId, Pagination pagination) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectMember.URL + "/all" + pagination.asQuery(); + return Arrays.asList(retrieve().to(tailUrl, GitlabProjectMember[].class)); + } + /** * This will fail, if the given namespace is a user and not a group * From 599ae7cff5ae247dfbbf455a430c9e5e640294a6 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Tue, 13 Jun 2023 13:28:30 +0300 Subject: [PATCH 12/12] fixed version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c77e5670..0a814c1a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1.smartbear.8 + 4.0.1.smartbear.8.2 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API