From b207ac9261b1694c600830fb0d45b2faf9468a54 Mon Sep 17 00:00:00 2001 From: "M. Hagen" Date: Fri, 2 Dec 2016 01:07:25 +0100 Subject: [PATCH 001/119] Remove tailing slash (#173) https://docs.gitlab.com/ee/api/projects.html#list-branches --- src/main/java/org/gitlab/api/models/GitlabBranch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabBranch.java b/src/main/java/org/gitlab/api/models/GitlabBranch.java index 15302a71..eaebc3e3 100644 --- a/src/main/java/org/gitlab/api/models/GitlabBranch.java +++ b/src/main/java/org/gitlab/api/models/GitlabBranch.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class GitlabBranch { - public final static String URL = "/repository/branches/"; + public final static String URL = "/repository/branches"; @JsonProperty("name") private String name; From 2244e4b6bfcadf002a57999e41c09bccb8138e87 Mon Sep 17 00:00:00 2001 From: Marco Andreini Date: Mon, 12 Dec 2016 06:37:53 +0100 Subject: [PATCH 002/119] Milestone is not more required creating issue. (#175) --- src/main/java/org/gitlab/api/GitlabAPI.java | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 6fede1e6..5f0013d7 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1256,7 +1256,7 @@ public GitlabNote createNote(GitlabMergeRequest mergeRequest, String body) throw return dispatch().with("body", body).to(tailUrl, GitlabNote.class); } - + /** * Delete a Merge Request Note * @@ -1407,7 +1407,7 @@ public GitlabIssue getIssue(Serializable projectId, Integer issueId) throws IOEx return retrieve().to(tailUrl, GitlabIssue.class); } - public GitlabIssue createIssue(int projectId, int assigneeId, int milestoneId, String labels, + public GitlabIssue createIssue(int projectId, int assigneeId, Integer milestoneId, String labels, String description, String title) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL; GitlabHTTPRequestor requestor = dispatch(); @@ -1415,7 +1415,7 @@ public GitlabIssue createIssue(int projectId, int assigneeId, int milestoneId, S return requestor.to(tailUrl, GitlabIssue.class); } - + public GitlabIssue moveIssue(Integer projectId, Integer issueId, Integer toProjectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL + "/" + issueId + "/move"; GitlabHTTPRequestor requestor = dispatch(); @@ -1437,7 +1437,7 @@ public GitlabIssue editIssue(int projectId, int issueId, int assigneeId, int mil } private void applyIssue(GitlabHTTPRequestor requestor, int projectId, - int assigneeId, int milestoneId, String labels, String description, + int assigneeId, Integer milestoneId, String labels, String description, String title) { requestor.with("title", title) @@ -1449,7 +1449,7 @@ private void applyIssue(GitlabHTTPRequestor requestor, int projectId, requestor.with("assignee_id", assigneeId == -1 ? 0 : assigneeId); } } - + public GitlabNote getNote(GitlabIssue issue, Integer noteId) throws IOException { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + @@ -1805,7 +1805,7 @@ public List getProjectMembers(Serializable projectId, Pagin String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectMember.URL + pagination.asQuery(); return Arrays.asList(retrieve().to(tailUrl, GitlabProjectMember[].class)); } - + /** * This will fail, if the given namespace is a user and not a group * @@ -2101,7 +2101,7 @@ public List getAllAwards(GitlabMergeRequest mergeRequest) throws IO } /** - * Get a specific award for a merge request + * Get a specific award for a merge request * * @param mergeRequest * @param awardId @@ -2115,7 +2115,7 @@ public GitlabAward getAward(GitlabMergeRequest mergeRequest, Integer awardId) th } /** - * Create an award for a merge request + * Create an award for a merge request * * @param mergeRequest * @param awardName @@ -2125,12 +2125,12 @@ public GitlabAward createAward(GitlabMergeRequest mergeRequest, String awardName Query query = new Query().append("name", awardName); String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getId() + GitlabAward.URL + query.toString(); - + return dispatch().to(tailUrl, GitlabAward.class); } /** - * Delete an award for a merge request + * Delete an award for a merge request * * @param mergeRequest * @param award @@ -2139,7 +2139,7 @@ public GitlabAward createAward(GitlabMergeRequest mergeRequest, String awardName public void deleteAward(GitlabMergeRequest mergeRequest, GitlabAward award) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getId() + GitlabAward.URL + "/" + award.getId(); - + retrieve().method("DELETE").to(tailUrl, Void.class); } @@ -2171,7 +2171,7 @@ public GitlabAward getAward(GitlabIssue issue, Integer awardId) throws IOExcepti } /** - * Create an award for an issue + * Create an award for an issue * * @param issue * @param awardName @@ -2181,7 +2181,7 @@ public GitlabAward createAward(GitlabIssue issue, String awardName) throws IOExc Query query = new Query().append("name", awardName); String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + GitlabAward.URL + query.toString(); - + return dispatch().to(tailUrl, GitlabAward.class); } @@ -2239,7 +2239,7 @@ public GitlabAward createAward(GitlabIssue issue, Integer noteId, String awardNa Query query = new Query().append("name", awardName); String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + GitlabNote.URL + noteId + GitlabAward.URL + query.toString(); - + return dispatch().to(tailUrl, GitlabAward.class); } From 96372c209c9a7c4de55548fdc9274d86422ba51d Mon Sep 17 00:00:00 2001 From: Sander Cornelissen Date: Mon, 12 Dec 2016 06:38:10 +0100 Subject: [PATCH 003/119] Get All members of group, not only the first page (#177) --- 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 5f0013d7..37da71b8 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -418,7 +418,7 @@ public List getGroupMembers(GitlabGroup group) throws IOExcep */ public List getGroupMembers(Integer groupId) throws IOException { String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabGroupMember.URL; - return Arrays.asList(retrieve().to(tailUrl, GitlabGroupMember[].class)); + return retrieve().getAll(tailUrl, GitlabGroupMember[].class); } /** From 4d9a8a08f3fbf6e6b7b0e1bdc57a7f0bc7e4eb1f Mon Sep 17 00:00:00 2001 From: Amudha Palani Date: Sun, 11 Dec 2016 23:40:48 -0600 Subject: [PATCH 004/119] Add Service Email-On-Push (#161) Add Service Email-On-Push --- src/main/java/org/gitlab/api/GitlabAPI.java | 55 ++++++++ .../models/GitlabEmailonPushProperties.java | 33 +++++ .../api/models/GitlabServiceEmailOnPush.java | 123 ++++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/GitlabEmailonPushProperties.java create mode 100644 src/main/java/org/gitlab/api/models/GitlabServiceEmailOnPush.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 37da71b8..14780972 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2404,4 +2404,59 @@ public List getBuildTriggers(GitlabProject project) throws IOExce return retrieve().getAll(GitlabProject.URL + "/" + project.getId() + GitlabTrigger.URL, GitlabTrigger[].class); } } + + /** + * Gets email-on-push service setup for a projectId. + * @param projectId The ID of the project containing the variable. + * @throws IOException + */ + public GitlabServiceEmailOnPush getEmailsOnPush(Integer projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL; + return retrieve().to(tailUrl, GitlabServiceEmailOnPush.class); + } + + /** + * Update recipients for email-on-push service for a projectId. + * @param projectId The ID of the project containing the variable. + * @param emailAddress The emailaddress of the recipent who is going to receive push notification. + * @return + * @throws IOException + */ + public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws IOException { + String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL; + + GitlabServiceEmailOnPush emailOnPush = this.getEmailsOnPush(projectId); + GitlabEmailonPushProperties properties = emailOnPush.getProperties(); + String appendedRecipients = properties.getRecipients(); + if(appendedRecipients != "") + { + if(appendedRecipients.contains(emailAddress)) + return true; + appendedRecipients = appendedRecipients + " " + emailAddress; + } + else + appendedRecipients = emailAddress; + + Query query = new Query() + .appendIf("active", true) + .appendIf("recipients", appendedRecipients); + + tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL + query.toString(); + return retrieve().method("PUT").to(tailUrl, Boolean.class); + } + + /** + * + * Get a list of projects accessible by the authenticated user by search. + * + * @return A list of gitlab projects + * @throws IOException + */ + public List searchProjects(String query) throws IOException { + List projects = new ArrayList(); + String tailUrl = GitlabProject.URL + "/search/" + query; + GitlabProject[] response = retrieve().to(tailUrl, GitlabProject[].class); + projects = Arrays.asList(response); + return projects; + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabEmailonPushProperties.java b/src/main/java/org/gitlab/api/models/GitlabEmailonPushProperties.java new file mode 100644 index 00000000..92606286 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabEmailonPushProperties.java @@ -0,0 +1,33 @@ +package org.gitlab.api.models; + +public class GitlabEmailonPushProperties { + + private Integer disable_diffs; + private String recipients; + private Integer send_from_committer_email; + + public Integer getDisableDiffs() { + return disable_diffs; + } + + public void setDisableDiffs(Integer disable_diffs) { + this.disable_diffs = disable_diffs; + } + + public String getRecipients() { + return recipients; + } + + public void setRecipients(String recipients) { + this.recipients = recipients; + } + + public Integer getSendFromCommitterEmail() { + return send_from_committer_email; + } + + public void setSendFromCommitterEmail(Integer send_from_committer_email) { + this.send_from_committer_email = send_from_committer_email; + } +} + diff --git a/src/main/java/org/gitlab/api/models/GitlabServiceEmailOnPush.java b/src/main/java/org/gitlab/api/models/GitlabServiceEmailOnPush.java new file mode 100644 index 00000000..ca6a1ce8 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabServiceEmailOnPush.java @@ -0,0 +1,123 @@ +package org.gitlab.api.models; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabServiceEmailOnPush { + + public static final String URL = "/services/emails-on-push/"; + + private Integer id; + private String title; + + @JsonProperty("created_at") + private Date createdAt; + + @JsonProperty("updated_at") + private Date updatedAt; + + private boolean active; + private boolean push_events; + private boolean issues_events; + private boolean merge_requests_events; + private boolean tag_push_events; + private boolean note_events; + private boolean build_events; + private GitlabEmailonPushProperties properties; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + public boolean isPushEvents() { + return push_events; + } + + public void setPushEvents(boolean push_events) { + this.push_events = push_events; + } + + public boolean isIssuesEvents() { + return issues_events; + } + + public void setIssuesEvents(boolean issues_events) { + this.issues_events = issues_events; + } + + public boolean isMergeRequestsEvents() { + return merge_requests_events; + } + + public void setMergeRequestsEvents(boolean merge_requests_events) { + this.merge_requests_events = merge_requests_events; + } + + public boolean isTagPushEvents() { + return tag_push_events; + } + + public void setTagPushEvents(boolean tag_push_events) { + this.tag_push_events = tag_push_events; + } + + public boolean isNoteEvents() { + return note_events; + } + + public void setNoteEvents(boolean note_events) { + this.note_events = note_events; + } + + public boolean isBuildEvents() { + return build_events; + } + + public void setBuildEvents(boolean build_events) { + this.build_events = build_events; + } + + public GitlabEmailonPushProperties getProperties() { + return properties; + } + + public void setProperties(GitlabEmailonPushProperties properties) { + this.properties = properties; + } +} From 83b57e906f45275f9503d5532d14e344a8827b95 Mon Sep 17 00:00:00 2001 From: Sander Cornelissen Date: Wed, 14 Dec 2016 22:39:57 +0100 Subject: [PATCH 005/119] Add List of identities under GitlabUser (#178) * Add List of identities under GitlabUser * Fix UUID. It was UID --- .../org/gitlab/api/models/GitlabUser.java | 10 +++++++ .../gitlab/api/models/GitlabUserIdentity.java | 28 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/GitlabUserIdentity.java diff --git a/src/main/java/org/gitlab/api/models/GitlabUser.java b/src/main/java/org/gitlab/api/models/GitlabUser.java index e0b613cc..777b979d 100644 --- a/src/main/java/org/gitlab/api/models/GitlabUser.java +++ b/src/main/java/org/gitlab/api/models/GitlabUser.java @@ -1,6 +1,7 @@ package org.gitlab.api.models; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; @@ -22,6 +23,7 @@ public class GitlabUser { private String _provider; private String _state; private boolean _blocked; + private List _identities; @JsonProperty("private_token") private String _privateToken; @@ -289,4 +291,12 @@ public Integer getProjectsLimit() { public void setProjectsLimit(Integer projectsLimit) { this._projectsLimit = projectsLimit; } + + public List getIdentities() { + return _identities; + } + + public void setIdentities(List identities) { + this._identities = identities; + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabUserIdentity.java b/src/main/java/org/gitlab/api/models/GitlabUserIdentity.java new file mode 100644 index 00000000..94171842 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabUserIdentity.java @@ -0,0 +1,28 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabUserIdentity { + + @JsonProperty("provider") + private String _provider; + + @JsonProperty("extern_uid") + private String _externUid; + + public String getProvider() { + return _provider; + } + + public void setProvider(String provider) { + this._provider = provider; + } + + public String getExternUid() { + return _externUid; + } + + public void setExternUuid(String externUid) { + this._externUid = externUid; + } +} From 372a1542040de7878c21bf2ab3636e297bbe2cfe Mon Sep 17 00:00:00 2001 From: Max Tuni Date: Thu, 29 Dec 2016 15:19:54 +0100 Subject: [PATCH 006/119] File upload support refs #167 (#170) * fixes #167 * fixes #167 * fix author and imports * fix spacing * replace tabs with spaces * better formatting --- src/main/java/org/gitlab/api/GitlabAPI.java | 34 +++++-- .../gitlab/api/http/GitlabHTTPRequestor.java | 89 ++++++++++++++++--- .../org/gitlab/api/models/GitlabUpload.java | 35 ++++++++ .../java/org/gitlab/api/GitlabUploadTest.java | 60 +++++++++++++ 4 files changed, 201 insertions(+), 17 deletions(-) create mode 100644 src/main/java/org/gitlab/api/models/GitlabUpload.java create mode 100644 src/test/java/org/gitlab/api/GitlabUploadTest.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 14780972..719b82ed 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1,11 +1,6 @@ package org.gitlab.api; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.gitlab.api.http.GitlabHTTPRequestor; -import org.gitlab.api.http.Query; -import org.gitlab.api.models.*; - +import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.Serializable; @@ -18,6 +13,20 @@ import java.util.Date; import java.util.List; +import org.gitlab.api.http.GitlabHTTPRequestor; +import org.gitlab.api.http.Query; +import org.gitlab.api.models.*; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; + +import org.gitlab.api.http.GitlabHTTPRequestor; +import org.gitlab.api.http.Query; +import org.gitlab.api.models.*; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * Gitlab API Wrapper class @@ -621,6 +630,19 @@ public List getAllProjects() throws IOException { return retrieve().getAll(tailUrl, GitlabProject[].class); } + /** + * Uploads a file to a project + * + * @param project + * @param file + * @return + * @throws IOException + */ + public GitlabUpload uploadFile(GitlabProject project, File file) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + GitlabUpload.URL; + return dispatch().withAttachment("file", file).to(tailUrl, GitlabUpload.class); + } + /** * * Gets a list of a project's builds in Gitlab diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index 18822390..af2cc4fe 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -1,17 +1,15 @@ package org.gitlab.api.http; -import org.apache.commons.io.IOUtils; -import org.gitlab.api.AuthMethod; -import org.gitlab.api.GitlabAPI; -import org.gitlab.api.GitlabAPIException; -import org.gitlab.api.TokenType; -import org.gitlab.api.models.GitlabCommit; - -import javax.net.ssl.*; +import java.io.File; import java.io.FileNotFoundException; +import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; import java.lang.reflect.Field; import java.net.*; import java.util.*; @@ -19,6 +17,15 @@ import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; +import javax.net.ssl.*; + +import org.apache.commons.io.IOUtils; +import org.gitlab.api.AuthMethod; +import org.gitlab.api.GitlabAPI; +import org.gitlab.api.GitlabAPIException; +import org.gitlab.api.TokenType; +import org.gitlab.api.models.GitlabCommit; + /** * Gitlab HTTP Requestor * Responsible for handling HTTP requests to the Gitlab API @@ -33,6 +40,7 @@ public class GitlabHTTPRequestor { private String method = "GET"; // Default to GET requests private Map data = new HashMap(); + private Map attachments = new HashMap(); private String apiToken; private TokenType tokenType; @@ -75,7 +83,7 @@ public GitlabHTTPRequestor authenticate(String token, TokenType type, AuthMethod this.authMethod = method; return this; } - + /** * Sets the HTTP Request method for the request. * Has a fluent api for method chaining. @@ -107,6 +115,21 @@ public GitlabHTTPRequestor with(String key, Object value) { } return this; } + + /** + * Sets the HTTP Form Post parameters for the request + * Has a fluent api for method chaining + * + * @param key Form parameter Key + * @param value Form parameter Value + * @return this + */ + public GitlabHTTPRequestor withAttachment(String key, File file) { + if (file != null && key != null) { + attachments.put(key, file); + } + return this; + } public T to(String tailAPIUrl, T instance) throws IOException { return to(tailAPIUrl, null, instance); @@ -131,8 +154,9 @@ public T to(String tailAPIUrl, Class type, T instance) throws IOException HttpURLConnection connection = null; try { connection = setupConnection(root.getAPIUrl(tailAPIUrl)); - - if (hasOutput()) { + if (hasAttachments()) { + submitAttachments(connection); + } else if (hasOutput()) { submitData(connection); } else if ("PUT".equals(method)) { // PUT requires Content-Length: 0 even when there is no body (eg: API for protecting a branch) @@ -270,12 +294,55 @@ private void findNextUrl() throws MalformedURLException { }; } + private void submitAttachments(HttpURLConnection connection) throws IOException { + String boundary = Long.toHexString(System.currentTimeMillis()); // Just generate some unique random value. + connection.setDoOutput(true); + connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary); + String charset = "UTF-8"; + String CRLF = "\r\n"; // Line separator required by multipart/form-data. + OutputStream output = connection.getOutputStream(); + PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, charset), true); + try { + for (Map.Entry paramEntry : data.entrySet()) { + String paramName = paramEntry.getKey(); + String param = GitlabAPI.MAPPER.writeValueAsString(paramEntry.getValue()); + writer.append("--" + boundary).append(CRLF); + writer.append("Content-Disposition: form-data; name=\"" + paramName + "\"").append(CRLF); + writer.append("Content-Type: text/plain; charset=" + charset).append(CRLF); + writer.append(CRLF).append(param).append(CRLF).flush(); + } + for (Map.Entry attachMentEntry : attachments.entrySet()) { + File binaryFile = attachMentEntry.getValue(); + writer.append("--" + boundary).append(CRLF); + writer.append("Content-Disposition: form-data; name=\""+ attachMentEntry.getKey() +"\"; filename=\"" + binaryFile.getName() + "\"").append(CRLF); + writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(binaryFile.getName())).append(CRLF); + writer.append("Content-Transfer-Encoding: binary").append(CRLF); + writer.append(CRLF).flush(); + Reader fileReader = new FileReader(binaryFile); + try { + IOUtils.copy(fileReader, output); + } finally { + fileReader.close(); + } + output.flush(); // Important before continuing with writer! + writer.append(CRLF).flush(); // CRLF is important! It indicates end of boundary. + } + writer.append("--" + boundary + "--").append(CRLF).flush(); + } finally { + writer.close(); + } + } + private void submitData(HttpURLConnection connection) throws IOException { connection.setDoOutput(true); connection.setRequestProperty("Content-Type", "application/json"); GitlabAPI.MAPPER.writeValue(connection.getOutputStream(), data); } + private boolean hasAttachments() { + return !attachments.isEmpty(); + } + private boolean hasOutput() { return method.equals("POST") || method.equals("PUT") && !data.isEmpty(); } diff --git a/src/main/java/org/gitlab/api/models/GitlabUpload.java b/src/main/java/org/gitlab/api/models/GitlabUpload.java new file mode 100644 index 00000000..407d2033 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabUpload.java @@ -0,0 +1,35 @@ +package org.gitlab.api.models; + +public class GitlabUpload { + + public final static String URL = "/uploads"; + + private String alt; + private String url; + private String markdown; + + public String getAlt() { + return alt; + } + + public void setAlt(String alt) { + this.alt = alt; + } + + public String getMarkdown() { + return markdown; + } + + public void setMarkdown(String markdown) { + this.markdown = markdown; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + +} diff --git a/src/test/java/org/gitlab/api/GitlabUploadTest.java b/src/test/java/org/gitlab/api/GitlabUploadTest.java new file mode 100644 index 00000000..0288d377 --- /dev/null +++ b/src/test/java/org/gitlab/api/GitlabUploadTest.java @@ -0,0 +1,60 @@ +package org.gitlab.api; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.apache.commons.io.IOUtils; +import org.gitlab.api.models.GitlabProject; +import org.gitlab.api.models.GitlabUpload; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + +@Ignore +public class GitlabUploadTest { + + private static final String TEST_URL = System.getProperty("TEST_URL", "http://localhost"); + private static final String TEST_TOKEN = System.getProperty("TEST_TOKEN", "y0E5b9761b7y4qk"); + private static final String TEST_PROJECT = System.getProperty("TEST_PROJECT", "user/project"); + + @Test + public void testUploadToProject() throws Exception { + GitlabAPI api = GitlabAPI.connect(TEST_URL, TEST_TOKEN); + String content = "test file content"; + File tempFile = createTempFile(content); + try { + GitlabUpload upload = api.uploadFile(gitlabProject(api), tempFile); + Assert.assertNotNull(upload.getUrl()); + } finally { + tempFile.delete(); + } + } + + private File createTempFile(String content) throws IOException { + File tempFile = File.createTempFile("upload-", ".txt"); + InputStream is = new ByteArrayInputStream(content.getBytes()); + OutputStream os = new FileOutputStream(tempFile); + try { + IOUtils.copy(is, os); + } finally { + is.close(); + os.close(); + } + return tempFile; + } + + private GitlabProject gitlabProject(GitlabAPI api) throws IOException { + for (GitlabProject gitlabProject : api.getProjects()) { + String projetPath = String.format("%s/%s", gitlabProject.getNamespace().getPath(), gitlabProject.getPath()); + if (projetPath.equals(TEST_PROJECT)) { + return gitlabProject; + } + } + throw new IllegalStateException(); + } + +} From efd607feef1ed3a321bd77e3a551467cc7864f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Dziedziul?= Date: Wed, 11 Jan 2017 18:40:57 +0100 Subject: [PATCH 007/119] Add createdAt field to CommitComment (#180) --- .../java/org/gitlab/api/models/CommitComment.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/org/gitlab/api/models/CommitComment.java b/src/main/java/org/gitlab/api/models/CommitComment.java index eeb67d79..dd40c0b8 100644 --- a/src/main/java/org/gitlab/api/models/CommitComment.java +++ b/src/main/java/org/gitlab/api/models/CommitComment.java @@ -2,6 +2,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Date; + public class CommitComment { public static final String URL = "/comments"; @@ -14,6 +16,9 @@ public class CommitComment { @JsonProperty("line_type") private String lineType; + @JsonProperty("created_at") + private Date createdAt; + public GitlabUser getAuthor() { return author; } @@ -53,4 +58,12 @@ public String getLineType() { public void setLineType(String lineType) { this.lineType = lineType; } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } } From 36e858e3f56bf033d8f9e3ebc404762d0e168fe6 Mon Sep 17 00:00:00 2001 From: Brian Krische Date: Sun, 29 Jan 2017 19:25:42 -0600 Subject: [PATCH 008/119] Add support for projects shared with a group. (#185) --- .../org/gitlab/api/models/GitlabGroup.java | 13 +++++++ .../org/gitlab/api/models/GitlabProject.java | 11 ++++++ .../api/models/GitlabProjectSharedGroup.java | 38 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/GitlabProjectSharedGroup.java diff --git a/src/main/java/org/gitlab/api/models/GitlabGroup.java b/src/main/java/org/gitlab/api/models/GitlabGroup.java index 84a242b3..99a9480c 100644 --- a/src/main/java/org/gitlab/api/models/GitlabGroup.java +++ b/src/main/java/org/gitlab/api/models/GitlabGroup.java @@ -2,6 +2,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + public class GitlabGroup { public static final String URL = "/groups"; @@ -16,6 +18,9 @@ public class GitlabGroup { @JsonProperty("ldap_access") private Integer ldapAccess; + @JsonProperty("shared_projects") + private List sharedProjects; + public Integer getId() { return id; } @@ -60,4 +65,12 @@ public void setLdapAccess(GitlabAccessLevel ldapGitlabAccessLevel) { this.ldapAccess = ldapGitlabAccessLevel.accessValue; } } + + public List getSharedProjects() { + return sharedProjects; + } + + public void setSharedProjects(List sharedProjects) { + this.sharedProjects = sharedProjects; + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 7a2dc50f..9de2a1b6 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -95,6 +95,9 @@ public class GitlabProject { @JsonProperty("tag_list") private List tagList; + @JsonProperty("shared_with_groups") + private List sharedWithGroups; + public Integer getId() { return id; } @@ -350,4 +353,12 @@ public List getTagList() { public void setTagList(List tagList) { this.tagList = tagList; } + + public List getSharedWithGroups() { + return sharedWithGroups; + } + + public void setSharedWithGroups(List sharedWithGroups) { + this.sharedWithGroups = sharedWithGroups; + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabProjectSharedGroup.java b/src/main/java/org/gitlab/api/models/GitlabProjectSharedGroup.java new file mode 100644 index 00000000..46de51eb --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabProjectSharedGroup.java @@ -0,0 +1,38 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabProjectSharedGroup { + @JsonProperty("group_id") + private int groupId; + + @JsonProperty("group_name") + private String groupName; + + @JsonProperty("group_access_level") + private int groupAccessLevel; + + public int getGroupId() { + return groupId; + } + + public void setGroupId(int groupId) { + this.groupId = groupId; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public GitlabAccessLevel getAccessLevel() { + return GitlabAccessLevel.fromAccessValue(groupAccessLevel); + } + + public void setAccessLevel(GitlabAccessLevel accessLevel) { + this.groupAccessLevel = accessLevel.accessValue; + } +} From ee7bc843bf2f65e2ae6a17615cb66cc9aa2ca2e1 Mon Sep 17 00:00:00 2001 From: Pokerkoffer Date: Mon, 30 Jan 2017 02:26:03 +0100 Subject: [PATCH 009/119] Recursive file tree from repo (#184) * Recursive option on repository tree * added path attribute to Repoclass --- src/main/java/org/gitlab/api/GitlabAPI.java | 5 +++-- .../java/org/gitlab/api/models/GitlabRepositoryTree.java | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 719b82ed..dce81116 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1243,10 +1243,11 @@ public byte[] getFileArchive(GitlabProject project) throws IOException { * @param ref_name The name of a repository branch or tag or if not given the default branch (optional) * @throws IOException on gitlab api call error */ - public List getRepositoryTree(GitlabProject project, String path, String ref_name) throws IOException { + public List getRepositoryTree(GitlabProject project, String path, String ref_name, boolean recursive) throws IOException { Query query = new Query() .appendIf("path", path) - .appendIf("ref_name", ref_name); + .appendIf("ref_name", ref_name) + .appendIf("recursive", recursive); String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository" + GitlabRepositoryTree.URL + query.toString(); GitlabRepositoryTree[] tree = retrieve().to(tailUrl, GitlabRepositoryTree[].class); diff --git a/src/main/java/org/gitlab/api/models/GitlabRepositoryTree.java b/src/main/java/org/gitlab/api/models/GitlabRepositoryTree.java index f9a1c3fe..02784d78 100644 --- a/src/main/java/org/gitlab/api/models/GitlabRepositoryTree.java +++ b/src/main/java/org/gitlab/api/models/GitlabRepositoryTree.java @@ -7,6 +7,7 @@ public class GitlabRepositoryTree { private String type; private String mode; private String id; + private String path; public String getName() { return name; @@ -40,4 +41,11 @@ public void setId(String id) { this.id = id; } + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } } From ca6cf2a76a18b085a5aec970dd0d3c23759f4e10 Mon Sep 17 00:00:00 2001 From: Mirko Friedenhagen Date: Sat, 4 Feb 2017 23:42:09 +0100 Subject: [PATCH 010/119] Add additional fields for Runner. (#186) The current model is missing some fields. --- .../org/gitlab/api/models/GitlabRunner.java | 81 ++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabRunner.java b/src/main/java/org/gitlab/api/models/GitlabRunner.java index 85dfe1ab..c042a35b 100644 --- a/src/main/java/org/gitlab/api/models/GitlabRunner.java +++ b/src/main/java/org/gitlab/api/models/GitlabRunner.java @@ -3,14 +3,27 @@ import com.fasterxml.jackson.annotation.JsonProperty; -public class GitlabRunner { +import java.util.Date; +import java.util.List; +public class GitlabRunner { private Integer id; private String description; private Boolean active; @JsonProperty("is_shared") private Boolean isShared; private String name; + private String version; + private String revision; + @JsonProperty("contacted_at") + private Date contactedAt; + @JsonProperty("tag_list") + private List tagList; + @JsonProperty("run_untagged") + private Boolean runUntagged; + private Boolean locked; + private String platform; + private String architecture; public Integer getId() { return id; @@ -51,4 +64,70 @@ public String getName() { public void setName(String name) { this.name = name; } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getRevision() { + return revision; + } + + public void setRevision(String revision) { + this.revision = revision; + } + + public Date getContactedAt() { + return contactedAt; + } + + public void setContactedAt(Date contactedAt) { + this.contactedAt = contactedAt; + } + + public List getTagList() { + return tagList; + } + + public void setTagList(List tagList) { + this.tagList = tagList; + } + + public Boolean isRunUntagged() { + return runUntagged; + } + + public void setRunUntagged(boolean runUntagged) { + this.runUntagged = runUntagged; + } + + public Boolean isLocked() { + return locked; + } + + public void setLocked(boolean locked) { + this.locked = locked; + } + + + public String getPlatform() { + return platform; + } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public String getArchitecture() { + return architecture; + } + + public void setArchitecture(String architecture) { + this.architecture = architecture; + } + } From 20f5c0f7a766413c3a6bfe07c8130f24a26e55ca Mon Sep 17 00:00:00 2001 From: Mirko Friedenhagen Date: Sat, 4 Feb 2017 23:42:54 +0100 Subject: [PATCH 011/119] Modify user agent (#187) * Add additional fields for Runner. The current model is missing some fields. * Make the User-Agent settable. This makes it easier to see which program executed requests. --- src/main/java/org/gitlab/api/GitlabAPI.java | 14 ++++++++++++++ .../org/gitlab/api/http/GitlabHTTPRequestor.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index dce81116..9c3dcbad 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -48,6 +48,7 @@ public class GitlabAPI { private AuthMethod authMethod; private boolean ignoreCertificateErrors = false; private int requestTimeout = 0; + private String userAgent = GitlabAPI.class.getCanonicalName() + "/" + System.getProperty("java.version"); private GitlabAPI(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method) { this.hostUrl = hostUrl.endsWith("/") ? hostUrl.replaceAll("/$", "") : hostUrl; @@ -2482,4 +2483,17 @@ public List searchProjects(String query) throws IOException { projects = Arrays.asList(response); return projects; } + + /** + * Set the User-Agent header for the requests. + * + * @param userAgent + */ + public void setUserAgent(String userAgent) { + this.userAgent = userAgent; + } + + public String getUserAgent() { + return userAgent; + } } diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index af2cc4fe..bab88ece 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -380,7 +380,7 @@ private HttpURLConnection setupConnection(URL url) throws IOException { throw (IOException) new IOException("Failed to set the custom verb").initCause(x); } } - + connection.setRequestProperty("User-Agent", root.getUserAgent()); connection.setRequestProperty("Accept-Encoding", "gzip"); return connection; } From 97c80dbbca229a72525b97d60cbfa91e2a856b26 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 8 Feb 2017 22:17:40 +0100 Subject: [PATCH 012/119] Various new API additions (#189) * Retrieve version of GitLab API * Web URL for group * webUrl in MR * Date fields * sha for merge request * Repository file API * Added another overloaded version * Getters and setters * Missing '/' separator --- src/main/java/org/gitlab/api/GitlabAPI.java | 27 ++++- .../org/gitlab/api/models/GitlabCommit.java | 16 +++ .../org/gitlab/api/models/GitlabGroup.java | 11 ++ .../gitlab/api/models/GitlabMergeRequest.java | 21 ++++ .../api/models/GitlabRepositoryFile.java | 103 ++++++++++++++++++ .../org/gitlab/api/models/GitlabVersion.java | 13 +++ 6 files changed, 186 insertions(+), 5 deletions(-) create mode 100644 src/main/java/org/gitlab/api/models/GitlabRepositoryFile.java create mode 100644 src/main/java/org/gitlab/api/models/GitlabVersion.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 9c3dcbad..686eddd8 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1255,6 +1255,15 @@ public List getRepositoryTree(GitlabProject project, Strin return Arrays.asList(tree); } + public GitlabRepositoryFile getRepositoryFile(GitlabProject project, String path, String ref) throws IOException { + Query query = new Query() + .append("file_path", path) + .append("ref", ref); + + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files" + query.toString(); + return retrieve().to(tailUrl, GitlabRepositoryFile.class); + } + /** * Update a Merge Request Note * @@ -1346,22 +1355,26 @@ public void createBranch(Serializable projectId, String branchName, String ref) * @throws IOException on gitlab api call error */ public void deleteBranch(Serializable projectId, String branchName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + sanitizeBranch(branchName); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + '/' + sanitizeBranch(branchName); retrieve().method("DELETE").to(tailUrl, Void.class); } - public GitlabBranch getBranch(GitlabProject project, String branchName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + sanitizeBranch(branchName); + public GitlabBranch getBranch(Serializable projectId, String branchName) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + '/' + sanitizeBranch(branchName); return retrieve().to(tailUrl, GitlabBranch.class); } + public GitlabBranch getBranch(GitlabProject project, String branchName) throws IOException { + return getBranch(project.getId(),branchName); + } + public void protectBranch(GitlabProject project, String branchName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + sanitizeBranch(branchName) + "/protect"; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + '/' + sanitizeBranch(branchName) + "/protect"; retrieve().method("PUT").to(tailUrl, Void.class); } public void unprotectBranch(GitlabProject project, String branchName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + sanitizeBranch(branchName) + "/unprotect"; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + '/' + sanitizeBranch(branchName) + "/unprotect"; retrieve().method("PUT").to(tailUrl, Void.class); } @@ -2496,4 +2509,8 @@ public void setUserAgent(String userAgent) { public String getUserAgent() { return userAgent; } + + public GitlabVersion getVersion() throws IOException { + return retrieve().to("version",GitlabVersion.class); + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabCommit.java b/src/main/java/org/gitlab/api/models/GitlabCommit.java index f731ca73..60da1a68 100644 --- a/src/main/java/org/gitlab/api/models/GitlabCommit.java +++ b/src/main/java/org/gitlab/api/models/GitlabCommit.java @@ -98,6 +98,22 @@ public void setParentIds(List parentIds) { this.parentIds = parentIds; } + public Date getCommittedDate() { + return committedDate; + } + + public void setCommittedDate(Date committedDate) { + this.committedDate = committedDate; + } + + public Date getAuthoredDate() { + return authoredDate; + } + + public void setAuthoredDate(Date authoredDate) { + this.authoredDate = authoredDate; + } + @Override public boolean equals(Object obj) { // we say that two commit objects are equal iff they have the same ID diff --git a/src/main/java/org/gitlab/api/models/GitlabGroup.java b/src/main/java/org/gitlab/api/models/GitlabGroup.java index 99a9480c..82a68bd1 100644 --- a/src/main/java/org/gitlab/api/models/GitlabGroup.java +++ b/src/main/java/org/gitlab/api/models/GitlabGroup.java @@ -21,6 +21,9 @@ public class GitlabGroup { @JsonProperty("shared_projects") private List sharedProjects; + @JsonProperty("web_url") + private String webUrl; + public Integer getId() { return id; } @@ -73,4 +76,12 @@ public List getSharedProjects() { public void setSharedProjects(List sharedProjects) { this.sharedProjects = sharedProjects; } + + public String getWebUrl() { + return webUrl; + } + + public void setWebUrl(String webUrl) { + this.webUrl = webUrl; + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index 40df1ccf..606c34c5 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -53,6 +53,11 @@ public class GitlabMergeRequest { @JsonProperty("merge_status") private String mergeStatus; + @JsonProperty("web_url") + private String webUrl; + + private String sha; + public Integer getId() { return id; } @@ -242,4 +247,20 @@ public void setChanges(List changes) { public String getMergeStatus() { return mergeStatus; } public void setMergeStatus(String mergeStatus) { this.mergeStatus = mergeStatus; } + + public String getWebUrl() { + return webUrl; + } + + public void setWebUrl(String webUrl) { + this.webUrl = webUrl; + } + + public String getSha() { + return sha; + } + + public void setSha(String sha) { + this.sha = sha; + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabRepositoryFile.java b/src/main/java/org/gitlab/api/models/GitlabRepositoryFile.java new file mode 100644 index 00000000..38086333 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabRepositoryFile.java @@ -0,0 +1,103 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * @author Kohsuke Kawaguchi + */ +public class GitlabRepositoryFile { + /* + "ref" : "master", + "blob_id" : "17cab971a4202e8342effbb358ebe07c2de8fcc0", + "commit_id" : "e8e073d98a6f15f8018e3359bf7bce3a6a144227", + "encoding" : "base64", + "size" : 21, + "content" : "VGhpcyBpcyBzdXBlciB3aWRnZXQK", + "file_path" : "README.md", + "file_name" : "README.md", + "last_commit_id" : "c0ad9bcdc43bc7f4050c58c699ff44cb8b916cdb" + */ + + private String ref; + + @JsonProperty("blob_id") + private String blobId; + + @JsonProperty("commit_id") + private String commitId; + + @JsonProperty("last_commit_id") + private String lastCommitId; + + @JsonProperty("file_path") + private String filePath; + + @JsonProperty("file_name") + private String fileName; + + private String encoding, content; + + public String getRef() { + return ref; + } + + public void setRef(String ref) { + this.ref = ref; + } + + public String getBlobId() { + return blobId; + } + + public void setBlobId(String blobId) { + this.blobId = blobId; + } + + public String getCommitId() { + return commitId; + } + + public void setCommitId(String commitId) { + this.commitId = commitId; + } + + public String getLastCommitId() { + return lastCommitId; + } + + public void setLastCommitId(String lastCommitId) { + this.lastCommitId = lastCommitId; + } + + public String getFilePath() { + return filePath; + } + + public void setFilePath(String filePath) { + this.filePath = filePath; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getEncoding() { + return encoding; + } + + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } +} diff --git a/src/main/java/org/gitlab/api/models/GitlabVersion.java b/src/main/java/org/gitlab/api/models/GitlabVersion.java new file mode 100644 index 00000000..976f3703 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabVersion.java @@ -0,0 +1,13 @@ +package org.gitlab.api.models; + +public class GitlabVersion { + private String version,revision; + + public String getVersion() { + return version; + } + + public String getRevision() { + return revision; + } +} From 9095a62222d5be101d2ec4aa8155b1c8ad45e431 Mon Sep 17 00:00:00 2001 From: Chen Yiran Date: Sat, 4 Mar 2017 03:12:22 +0800 Subject: [PATCH 013/119] add getProject method via namespace and project name (#191) --- src/main/java/org/gitlab/api/GitlabAPI.java | 34 +++++++++------------ 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 686eddd8..c15eed1e 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1,10 +1,12 @@ package org.gitlab.api; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.gitlab.api.http.GitlabHTTPRequestor; +import org.gitlab.api.http.Query; +import org.gitlab.api.models.*; + +import java.io.*; import java.net.URL; import java.net.URLEncoder; import java.text.SimpleDateFormat; @@ -13,20 +15,6 @@ import java.util.Date; import java.util.List; -import org.gitlab.api.http.GitlabHTTPRequestor; -import org.gitlab.api.http.Query; -import org.gitlab.api.models.*; - -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.gitlab.api.http.GitlabHTTPRequestor; -import org.gitlab.api.http.Query; -import org.gitlab.api.models.*; - -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; - /** * Gitlab API Wrapper class @@ -581,6 +569,14 @@ public GitlabProject getProject(Serializable projectId) throws IOException { return retrieve().to(tailUrl, GitlabProject.class); } + /** + * use namespace & project name to get project + */ + public GitlabProject getProject(String namespace, String projectName) throws IOException{ + String tailUrl = GitlabProject.URL + "/" + namespace + "%2F" + projectName; + return retrieve().to(tailUrl, GitlabProject.class); + } + /** * * Get a list of projects accessible by the authenticated user. From 4b9fe8a286f8cba4571b7d978e57e85c7a8b8f1c Mon Sep 17 00:00:00 2001 From: Tristan Lins Date: Fri, 3 Mar 2017 20:12:43 +0100 Subject: [PATCH 014/119] GitlabAPI#getGroupProjects() retrieve all projects from the group (#192) --- 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 c15eed1e..3932644a 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -393,7 +393,7 @@ public List getGroupProjects(GitlabGroup group) throws IOExceptio */ public List getGroupProjects(Integer groupId) throws IOException { String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabProject.URL; - return Arrays.asList(retrieve().to(tailUrl, GitlabProject[].class)); + return retrieve().getAll(tailUrl, GitlabProject[].class); } /** From ffa218d097f02f61b2cc06aef74d017ba48b6647 Mon Sep 17 00:00:00 2001 From: Gabriel Allaigre Date: Mon, 6 Mar 2017 16:39:02 +0100 Subject: [PATCH 015/119] - Add proxy support (#193) --- src/main/java/org/gitlab/api/GitlabAPI.java | 11 +++++++++++ .../java/org/gitlab/api/http/GitlabHTTPRequestor.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 3932644a..2c43c4d1 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -7,6 +7,7 @@ import org.gitlab.api.models.*; import java.io.*; +import java.net.Proxy; import java.net.URL; import java.net.URLEncoder; import java.text.SimpleDateFormat; @@ -35,6 +36,7 @@ public class GitlabAPI { private final TokenType tokenType; private AuthMethod authMethod; private boolean ignoreCertificateErrors = false; + private Proxy proxy; private int requestTimeout = 0; private String userAgent = GitlabAPI.class.getCanonicalName() + "/" + System.getProperty("java.version"); @@ -69,6 +71,11 @@ public GitlabAPI ignoreCertificateErrors(boolean ignoreCertificateErrors) { return this; } + public GitlabAPI proxy(Proxy proxy) { + this.proxy = proxy; + return this; + } + public int getRequestTimeout() { return requestTimeout; } @@ -90,6 +97,10 @@ public boolean isIgnoreCertificateErrors() { return ignoreCertificateErrors; } + public Proxy getProxy() { + return proxy; + } + public URL getAPIUrl(String tailAPIUrl) throws IOException { if (!tailAPIUrl.startsWith("/")) { tailAPIUrl = "/" + tailAPIUrl; diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index bab88ece..2efa2d03 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -358,7 +358,7 @@ private HttpURLConnection setupConnection(URL url) throws IOException { url = new URL(urlWithAuth); } - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + HttpURLConnection connection = root.getProxy() != null ? (HttpURLConnection) url.openConnection(root.getProxy()) : (HttpURLConnection) url.openConnection(); if (apiToken != null && authMethod == AuthMethod.HEADER) { connection.setRequestProperty(tokenType.getTokenHeaderName(), String.format(tokenType.getTokenHeaderFormat(), apiToken)); } From 27eb69ba671be2da8e1a5fe75fac6be2bf035e4c Mon Sep 17 00:00:00 2001 From: Johno Crawford Date: Sun, 12 Mar 2017 17:27:56 +0100 Subject: [PATCH 016/119] API calls retrieving all results may be slow (#195) Motivation: Speed up API calls. Modifications: Set maximum per page param when retrieving all results. Result: Less calls to GitLab API endpoint when retrieving all results. --- src/main/java/org/gitlab/api/GitlabAPI.java | 49 +++++++++++-------- src/main/java/org/gitlab/api/Pagination.java | 10 ++++ .../java/org/gitlab/api/PaginationTest.java | 6 +++ 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 2c43c4d1..9a9bbe0f 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -29,7 +29,8 @@ public class GitlabAPI { private static final String API_NAMESPACE = "/api/v3"; private static final String PARAM_SUDO = "sudo"; - + private static final String PARAM_MAX_ITEMS_PER_PAGE = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).toString(); + private final String hostUrl; private final String apiToken; @@ -117,7 +118,7 @@ public URL getUrl(String tailAPIUrl) throws IOException { } public List getUsers() throws IOException { - String tailUrl = GitlabUser.URL; + String tailUrl = GitlabUser.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabUser[].class); } @@ -368,7 +369,7 @@ public GitlabGroup getGroup(String path) throws IOException { } public List getGroups() throws IOException { - return getGroupsViaSudo(null, null); + return getGroupsViaSudo(null, new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE)); } public List getGroupsViaSudo(String username, Pagination pagination) throws IOException { @@ -403,7 +404,7 @@ public List getGroupProjects(GitlabGroup group) throws IOExceptio * @throws IOException */ public List getGroupProjects(Integer groupId) throws IOException { - String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabProject.URL; + String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabProject.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -426,7 +427,7 @@ public List getGroupMembers(GitlabGroup group) throws IOExcep * @throws IOException on gitlab api call error */ public List getGroupMembers(Integer groupId) throws IOException { - String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabGroupMember.URL; + String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabGroupMember.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabGroupMember[].class); } @@ -596,7 +597,7 @@ public GitlabProject getProject(String namespace, String projectName) throws IOE * @throws IOException */ public List getProjects() throws IOException { - String tailUrl = GitlabProject.URL; + String tailUrl = GitlabProject.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -608,7 +609,7 @@ public List getProjects() throws IOException { * @throws IOException */ public List getOwnedProjects() throws IOException { - String tailUrl = GitlabProject.URL + "/owned"; + String tailUrl = GitlabProject.URL + "/owned" + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -622,6 +623,7 @@ public List getOwnedProjects() throws IOException { public List getProjectsViaSudo(GitlabUser user) throws IOException { Query query = new Query() .appendIf(PARAM_SUDO, user.getId()); + query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); String tailUrl = GitlabProject.URL + query.toString(); return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -634,7 +636,7 @@ public List getProjectsViaSudo(GitlabUser user) throws IOExceptio * @throws IOException */ public List getAllProjects() throws IOException { - String tailUrl = GitlabProject.URL + "/all"; + String tailUrl = GitlabProject.URL + "/all" + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -672,7 +674,7 @@ public List getProjectBuilds(GitlabProject project) throws IOExcept * @throws IOException */ public List getProjectBuilds(Integer projectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBuild.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBuild.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabBuild[].class); } @@ -872,27 +874,31 @@ public void deleteProject(Serializable projectId) throws IOException { } public List getOpenMergeRequests(Serializable projectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "?state=opened"; + Query query = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery(); + query.append("state", "opened"); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + query; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } public List getOpenMergeRequests(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + "?state=opened"; + Query query = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery(); + query.append("state", "opened"); + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + query; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } public List getMergeRequests(Serializable projectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } public List getMergeRequests(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } public List getAllMergeRequests(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } @@ -907,6 +913,7 @@ public List getAllMergeRequests(GitlabProject project) throw public GitlabMergeRequest getMergeRequestByIid(Serializable projectId, Integer mergeRequestIid) throws IOException { Query query = new Query() .append("iid", mergeRequestIid.toString()); + query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + query.toString(); List ls = retrieve().getAll(tailUrl, GitlabMergeRequest[].class); if (ls.size() == 0) { @@ -1036,7 +1043,7 @@ public List getNotes(GitlabMergeRequest mergeRequest) throws IOExcep public List getAllNotes(GitlabMergeRequest mergeRequest) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getId() + - GitlabNote.URL; + GitlabNote.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabNote[].class); } @@ -1054,7 +1061,7 @@ public List getCommitBuilds(GitlabProject projectId, String commitH } public List getCommitBuilds(Serializable projectId, String commitHash) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + commitHash + GitlabBuild.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + commitHash + GitlabBuild.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabBuild[].class); } @@ -1442,7 +1449,7 @@ public void deleteProjectHook(GitlabProject project, String hookId) throws IOExc } public List getIssues(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabIssue.URL; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabIssue[].class); } @@ -2139,7 +2146,7 @@ public void deleteTag(GitlabProject project, String tagName) throws IOException */ public List getAllAwards(GitlabMergeRequest mergeRequest) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getId() + GitlabAward.URL; + + mergeRequest.getId() + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabAward[].class); } @@ -2195,7 +2202,7 @@ public void deleteAward(GitlabMergeRequest mergeRequest, GitlabAward award) thro */ public List getAllAwards(GitlabIssue issue) throws IOException { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabAward.URL; + + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabAward[].class); } @@ -2251,7 +2258,7 @@ public void deleteAward(GitlabIssue issue, GitlabAward award) throws IOException */ public List getAllAwards(GitlabIssue issue, Integer noteId) throws IOException { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabNote.URL + noteId + GitlabAward.URL; + + GitlabNote.URL + noteId + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabAward[].class); } @@ -2445,7 +2452,7 @@ public List getBuildTriggers(GitlabProject project) throws IOExce // not helpful. throw new IllegalStateException("Builds are not enabled for " + project.getNameWithNamespace() ); } else { - return retrieve().getAll(GitlabProject.URL + "/" + project.getId() + GitlabTrigger.URL, GitlabTrigger[].class); + return retrieve().getAll(GitlabProject.URL + "/" + project.getId() + GitlabTrigger.URL + PARAM_MAX_ITEMS_PER_PAGE, GitlabTrigger[].class); } } diff --git a/src/main/java/org/gitlab/api/Pagination.java b/src/main/java/org/gitlab/api/Pagination.java index af2e3c4e..b7084529 100644 --- a/src/main/java/org/gitlab/api/Pagination.java +++ b/src/main/java/org/gitlab/api/Pagination.java @@ -26,6 +26,16 @@ public void setPerPage(int perPage) { } catch (UnsupportedEncodingException ignored) { } } + + public Pagination withPage(int page) { + setPage(page); + return this; + } + + public Pagination withPerPage(int perPage) { + setPerPage(perPage); + return this; + } public Query asQuery() { return paginationQuery; diff --git a/src/test/java/org/gitlab/api/PaginationTest.java b/src/test/java/org/gitlab/api/PaginationTest.java index ce8c2839..e08db9b2 100644 --- a/src/test/java/org/gitlab/api/PaginationTest.java +++ b/src/test/java/org/gitlab/api/PaginationTest.java @@ -60,4 +60,10 @@ public void complexPagination() throws UnsupportedEncodingException { assertEquals(expectedQuery.toString(), pagination.toString()); assertEquals(expectedQuery.toString(), pagination.asQuery().toString()); } + + @Test + public void maxItemsPerPage() throws Exception { + Pagination pagination = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE); + assertEquals(String.format("?%s=%d", Pagination.PARAM_PER_PAGE, Pagination.MAX_ITEMS_PER_PAGE), pagination.toString()); + } } From 20d3c7dbac3a23909c2c3d84ee26bb45953b5e3b Mon Sep 17 00:00:00 2001 From: Joshua Sorah Date: Sun, 16 Apr 2017 16:17:28 -0400 Subject: [PATCH 017/119] Handle 204 response (#203) * Fix typo * Do not attempt to map to a Void object --- src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java | 2 +- src/test/java/org/gitlab/api/GitlabAPITest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index 2efa2d03..24a9818c 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -393,7 +393,7 @@ private T parse(HttpURLConnection connection, Class type, T instance) thr } reader = new InputStreamReader(wrapStream(connection, connection.getInputStream()), "UTF-8"); String data = IOUtils.toString(reader); - if (type != null) { + if (type != null && type != Void.class) { return GitlabAPI.MAPPER.readValue(data, type); } else if (instance != null) { return GitlabAPI.MAPPER.readerForUpdating(instance).readValue(data); diff --git a/src/test/java/org/gitlab/api/GitlabAPITest.java b/src/test/java/org/gitlab/api/GitlabAPITest.java index 7287d670..f2f636e5 100644 --- a/src/test/java/org/gitlab/api/GitlabAPITest.java +++ b/src/test/java/org/gitlab/api/GitlabAPITest.java @@ -123,7 +123,7 @@ public void testCreateUpdateDeleteUser() throws IOException { randVal("userName"), randVal("fullName"), randVal("skypeId"), - randVal("linledin"), + randVal("linkedin"), randVal("twitter"), "http://" + randVal("url.com"), 10, From 577572c7cd9681385a98d53faae37ae32aa3a4b6 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Sun, 16 Apr 2017 22:17:50 +0200 Subject: [PATCH 018/119] Added the possibility of creating group projects. (#197) --- src/main/java/org/gitlab/api/GitlabAPI.java | 39 +++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 9a9bbe0f..92bf1122 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -726,6 +726,45 @@ public GitlabProject createProject(String name) throws IOException { return createProject(name, null, null, null, null, null, null, null, null, null, null); } + /** + * Creates a group Project + * + * @param name The name of the project + * @param group The group for which the project should be crated + * @return The GitLab Project + * @throws IOException on gitlab api call error + */ + public GitlabProject createProjectForGroup(String name, GitlabGroup group) throws IOException { + return createProjectForGroup(name, group, null); + } + + /** + * Creates a group Project + * + * @param name The name of the project + * @param group The group for which the project should be crated + * @param description The project description + * @return The GitLab Project + * @throws IOException on gitlab api call error + */ + public GitlabProject createProjectForGroup(String name, GitlabGroup group, String description) throws IOException { + return createProjectForGroup(name, group, description, null); + } + + /** + * Creates a group Project + * + * @param name The name of the project + * @param group The group for which the project should be crated + * @param description The project description + * @param visibilityLevel The project visibility level (private: 0, internal: 10, public: 20) + * @return The GitLab Project + * @throws IOException on gitlab api call error + */ + public GitlabProject createProjectForGroup(String name, GitlabGroup group, String description, Integer visibilityLevel) throws IOException { + return createProject(name, group.getId(), description, null, null, null, null, null, null, visibilityLevel, null); + } + /** * Creates a Project * From 499ea0eb4cd363ca3a45de0ce580a1d42b626219 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Sun, 16 Apr 2017 22:18:02 +0200 Subject: [PATCH 019/119] Add creating hooks with secret token. (#199) --- src/main/java/org/gitlab/api/GitlabAPI.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 92bf1122..16a13c3b 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1456,6 +1456,14 @@ public GitlabProjectHook addProjectHook(GitlabProject project, String url) throw return dispatch().to(tailUrl, GitlabProjectHook.class); } + public GitlabProjectHook addProjectHook(GitlabProject project, String url, String token) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + GitlabProjectHook.URL; + return dispatch() + .with("url", url) + .with("token", token) + .to(tailUrl, GitlabProjectHook.class); + } + public GitlabProjectHook addProjectHook(Serializable projectId, String url, boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean tagPushEvents, boolean sslVerification) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectHook.URL; From 679f25ac34babf46674313ab1567bf5e82d063c4 Mon Sep 17 00:00:00 2001 From: Tim Olshansky Date: Sun, 16 Apr 2017 13:20:11 -0700 Subject: [PATCH 020/119] [maven-release-plugin] prepare release 1.2.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4081b7a7..756cc5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 1.2.8-SNAPSHOT + 1.2.8 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API From 9b082282040a6c39a16d4a20d89e171f7d0be1b6 Mon Sep 17 00:00:00 2001 From: Tim Olshansky Date: Sun, 16 Apr 2017 13:20:19 -0700 Subject: [PATCH 021/119] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 756cc5cb..f8a7e936 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 1.2.8 + 1.2.9-SNAPSHOT Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API From fecbaa79f9f3fa78d0943dd5540849745e9ff781 Mon Sep 17 00:00:00 2001 From: Mirko Friedenhagen Date: Fri, 28 Apr 2017 17:52:43 +0200 Subject: [PATCH 022/119] Support for GitLab API 4 - Use docker for testing (#207) * #201 initial support for v3 -> v4 api changes. * Introduce Docker for testing * Switch to Maven in travis because releases are built with Maven anyway * Introduce Maven-Wrapper to fixate the used Maven version. * Reuse existing GitlabAPITest as integration test which will be run always when docker is available. * Use docker-maven-plugin for starting/stopping GitLab. * For use with Maven run `mvn -Pdocker-gitlab clean verify`. Starting GitLab takes a long time (>100 seconds on my Macbook Pro). * For use in the IDE run: ``` mvn -Pdocker-gitlab,docker-ide docker:start mvn -Pdocker-gitlab,docker-ide docker:stop ``` * Extract APIForIntegrationTestingHolder * username/password sessions per time unit are limited * Need at least source and target 1.7 AssertionError in Tests is only available for >= JDK7 * Use GitlabUploadIT as another integration test * Don't choke when dockerized SUT is not available Need to throw AssumptionViolatedException in BeforeClass because otherwise the class is not initialized correctly. * Add CONTRIBUTING.md and travis badge. * Fix API calls for user block/unblock, add some calls * block/unblock uses POST instead of PUT. * Add ability to refine permissions for branch protection. * Add ability to add deploy key with push permission. * Fix getRawFileContent and getRepositoryTree --- .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 47610 bytes .mvn/wrapper/maven-wrapper.properties | 1 + .travis.yml | 10 +- CONTRIBUTING.md | 9 + README.md | 3 +- mvnw | 225 ++++++++++++++++++ mvnw.cmd | 143 +++++++++++ pom.xml | 84 ++++++- src/main/java/org/gitlab/api/GitlabAPI.java | 201 ++++++++-------- .../api/models/GitlabBuildVariable.java | 2 +- .../{GitlabBuild.java => GitlabJob.java} | 4 +- .../org/gitlab/api/models/GitlabProject.java | 24 +- .../org/gitlab/api/models/GitlabSSHKey.java | 1 + .../api/APIForIntegrationTestingHolder.java | 43 ++++ .../{GitlabAPITest.java => GitlabAPIIT.java} | 62 +++-- .../java/org/gitlab/api/GitlabUploadIT.java | 52 ++++ .../java/org/gitlab/api/GitlabUploadTest.java | 60 ----- src/test/resources/gitlab.rb | 2 + 18 files changed, 718 insertions(+), 208 deletions(-) create mode 100755 .mvn/wrapper/maven-wrapper.jar create mode 100755 .mvn/wrapper/maven-wrapper.properties create mode 100644 CONTRIBUTING.md create mode 100755 mvnw create mode 100755 mvnw.cmd rename src/main/java/org/gitlab/api/models/{GitlabBuild.java => GitlabJob.java} (97%) create mode 100644 src/test/java/org/gitlab/api/APIForIntegrationTestingHolder.java rename src/test/java/org/gitlab/api/{GitlabAPITest.java => GitlabAPIIT.java} (78%) create mode 100644 src/test/java/org/gitlab/api/GitlabUploadIT.java delete mode 100644 src/test/java/org/gitlab/api/GitlabUploadTest.java create mode 100644 src/test/resources/gitlab.rb diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100755 index 0000000000000000000000000000000000000000..9cc84ea9b4d95453115d0c26488d6a78694e0bc6 GIT binary patch literal 47610 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 literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100755 index 00000000..56bb0164 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 4332fd0b..b6b481f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: java -sudo: false +sudo: required +services: + - docker jdk: - oraclejdk7 install: -- ./gradlew assemble +- ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip script: -- ./gradlew check -before_deploy: -- ./gradlew deployZip +- ./mvnw -B -V -Pdocker-gitlab verify diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..5b8d6f70 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,9 @@ +# How to contribute + + +* The integration tests need a running Docker infrastructure. +* To execute these, run `mvn -Pdocker-gitlab clean verify`. This will spawn + a new gitlab instance (`pull` needs some time and starting `gitlab-ce` may take up to 3 minutes). +* To run integration tests in your IDE, you need to execute `mvn -Pdocker-gitlab,docker-ide docker:start`. +* Once you are done, you may stop gitlab by executing `mvn -Pdocker-gitlab,docker-ide docker:stop`. +* For more information about the API, take a look at the [documentation](https://gitlab.com/help/api/README.md). \ No newline at end of file diff --git a/README.md b/README.md index 7a64ec5e..fff8b844 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Gitlab Java API Wrapper [![Maven Central](https://img.shields.io/maven-central/v/org.gitlab/java-gitlab-api.svg)](http://mvnrepository.com/artifact/org.gitlab/java-gitlab-api) - +[![Build Status](https://travis-ci.org/timols/java-gitlab-api.svg?branch=master)](https://travis-ci.org/timols/java-gitlab-api) A wrapper for the [Gitlab API](https://gitlab.org) written in Java. [Documentation](https://timols.github.io/java-gitlab-api) is available in the form of [Javadocs](https://timols.github.io/java-gitlab-api) +The major version indicates the API version of gitlab. diff --git a/mvnw b/mvnw new file mode 100755 index 00000000..5bf251c0 --- /dev/null +++ b/mvnw @@ -0,0 +1,225 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100755 index 00000000..019bd74d --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,143 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index f8a7e936..148befc7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 1.2.9-SNAPSHOT + 4.0.1-SNAPSHOT Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API @@ -60,8 +60,13 @@ + 1.7 + 1.7 UTF-8 UTF-8 + 2.20 + + 180000 @@ -100,26 +105,28 @@ org.apache.maven.plugins maven-compiler-plugin 2.5.1 - - 1.6 - 1.6 - org.apache.maven.plugins maven-surefire-plugin - 2.17 + ${maven-surefire-plugin.version} org.apache.maven.plugins maven-failsafe-plugin - 2.17 + ${maven-surefire-plugin.version} default-integration-test integration-test + + + ${docker.host.address} + ${gitlab.port} + + default-verify @@ -145,4 +152,67 @@ + + + docker-ide + + 127.0.0.1 + 18080 + + + + docker-gitlab + + + + io.fabric8 + docker-maven-plugin + 0.18.1 + + + default-start + + start + + + + default-stop + + stop + + + + + + + gitlab/gitlab-ce:latest + gitlab + + + gitlab.port:80 + + + + + ${user.dir}/src/test/resources/gitlab.rb:/etc/gitlab/gitlab.rb + + + + + + http://${docker.host.address}:${gitlab.port}/api/v4/version + GET + 401 + + + + + + + + + + + + diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 16a13c3b..47089f44 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -27,7 +27,7 @@ public class GitlabAPI { public static final ObjectMapper MAPPER = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - private static final String API_NAMESPACE = "/api/v3"; + private static final String API_NAMESPACE = "/api/v4"; private static final String PARAM_SUDO = "sudo"; private static final String PARAM_MAX_ITEMS_PER_PAGE = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).toString(); @@ -268,7 +268,7 @@ public void blockUser(Integer targetUserId) throws IOException { String tailUrl = GitlabUser.USERS_URL + "/" + targetUserId + GitlabUser.BLOCK_URL; - retrieve().method("PUT").to(tailUrl, Void.class); + retrieve().method("POST").to(tailUrl, Void.class); } /** @@ -281,7 +281,7 @@ public void unblockUser(Integer targetUserId) throws IOException { String tailUrl = GitlabUser.USERS_URL + "/" + targetUserId + GitlabUser.UNBLOCK_URL; - retrieve().method("PUT").to(tailUrl, Void.class); + retrieve().method("POST").to(tailUrl, Void.class); } /** @@ -609,34 +609,36 @@ public List getProjects() throws IOException { * @throws IOException */ public List getOwnedProjects() throws IOException { - String tailUrl = GitlabProject.URL + "/owned" + PARAM_MAX_ITEMS_PER_PAGE; + Query query = new Query().append("owner", "true"); + String tailUrl = GitlabProject.URL + query.toString() + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabProject[].class); } /** * - * Get a list of projects accessible by the authenticated user. + * Get a list of projects starred by the authenticated user. * * @return A list of gitlab projects * @throws IOException */ - public List getProjectsViaSudo(GitlabUser user) throws IOException { - Query query = new Query() - .appendIf(PARAM_SUDO, user.getId()); - query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); - String tailUrl = GitlabProject.URL + query.toString(); + public List getStarredProjects() throws IOException { + Query query = new Query().append("starred", "true"); + String tailUrl = GitlabProject.URL + query.toString() + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabProject[].class); } /** * - * Get's all projects in Gitlab, requires sudo user + * Get a list of projects accessible by the authenticated user. * * @return A list of gitlab projects * @throws IOException */ - public List getAllProjects() throws IOException { - String tailUrl = GitlabProject.URL + "/all" + PARAM_MAX_ITEMS_PER_PAGE; + public List getProjectsViaSudo(GitlabUser user) throws IOException { + Query query = new Query() + .appendIf(PARAM_SUDO, user.getId()); + query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); + String tailUrl = GitlabProject.URL + query.toString(); return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -655,27 +657,27 @@ public GitlabUpload uploadFile(GitlabProject project, File file) throws IOExcept /** * - * Gets a list of a project's builds in Gitlab + * Gets a list of a project's jobs in Gitlab * * @param project the project - * @return A list of project builds + * @return A list of project jobs * @throws IOException */ - public List getProjectBuilds(GitlabProject project) throws IOException { - return getProjectBuilds(project.getId()); + public List getProjectJobs(GitlabProject project) throws IOException { + return getProjectJobs(project.getId()); } /** * - * Gets a list of a project's builds in Gitlab + * Gets a list of a project's jobs in Gitlab * * @param projectId the project id - * @return A list of project builds + * @return A list of project jobs * @throws IOException */ - public List getProjectBuilds(Integer projectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBuild.URL + PARAM_MAX_ITEMS_PER_PAGE; - return retrieve().getAll(tailUrl, GitlabBuild[].class); + public List getProjectJobs(Integer projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabJob[].class); } /** @@ -683,35 +685,35 @@ public List getProjectBuilds(Integer projectId) throws IOException * Gets a build for a project * * @param projectId the project id - * @param buildId the build id - * @return A list of project builds + * @param jobId the build id + * @return A list of project jobs * @throws IOException */ - public GitlabBuild getProjectBuild(Integer projectId, Integer buildId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBuild.URL + "/" + buildId; - return retrieve().to(tailUrl, GitlabBuild.class); + public GitlabJob getProjectJob(Integer projectId, Integer jobId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + jobId; + return retrieve().to(tailUrl, GitlabJob.class); } /** * Get build artifacts of a project build * * @param project The Project - * @param build The build + * @param job The build * @throws IOException on gitlab api call error */ - public byte[] getBuildArtifact(GitlabProject project, GitlabBuild build) throws IOException { - return getBuildArtifact(project.getId(), build.getId()); + public byte[] getJobArtifact(GitlabProject project, GitlabJob job) throws IOException { + return getJobArtifact(project.getId(), job.getId()); } /** * Get build artifacts of a project build * * @param projectId The Project's Id - * @param buildId The build's Id + * @param jobId The build's Id * @throws IOException on gitlab api call error */ - public byte[] getBuildArtifact(Integer projectId, Integer buildId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBuild.URL + "/" + buildId + "/artifacts"; + public byte[] getJobArtifact(Integer projectId, Integer jobId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + jobId + "/artifacts"; return retrieve().to(tailUrl, byte[].class); } @@ -757,12 +759,12 @@ public GitlabProject createProjectForGroup(String name, GitlabGroup group, Strin * @param name The name of the project * @param group The group for which the project should be crated * @param description The project description - * @param visibilityLevel The project visibility level (private: 0, internal: 10, public: 20) + * @param visibility The project visibility level (private: 0, internal: 10, public: 20) * @return The GitLab Project * @throws IOException on gitlab api call error */ - public GitlabProject createProjectForGroup(String name, GitlabGroup group, String description, Integer visibilityLevel) throws IOException { - return createProject(name, group.getId(), description, null, null, null, null, null, null, visibilityLevel, null); + public GitlabProject createProjectForGroup(String name, GitlabGroup group, String description, String visibility) throws IOException { + return createProject(name, group.getId(), description, null, null, null, null, null, null, visibility, null); } /** @@ -776,14 +778,13 @@ public GitlabProject createProjectForGroup(String name, GitlabGroup group, Strin * @param mergeRequestsEnabled Whether Merge Requests should be enabled, otherwise null indicates to use GitLab default * @param wikiEnabled Whether a Wiki should be enabled, otherwise null indicates to use GitLab default * @param snippetsEnabled Whether Snippets should be enabled, otherwise null indicates to use GitLab default - * @param publik Whether the project is public or private, if true same as setting visibilityLevel = 20, otherwise null indicates to use GitLab default - * @param visibilityLevel The visibility level of the project, otherwise null indicates to use GitLab default + * @param visibility The visibility level of the project, otherwise null indicates to use GitLab default * @param importUrl The Import URL for the project, otherwise null * @return the Gitlab Project * @throws IOException on gitlab api call error */ @Deprecated - public GitlabProject createProject(String name, Integer namespaceId, String description, Boolean issuesEnabled, Boolean wallEnabled, Boolean mergeRequestsEnabled, Boolean wikiEnabled, Boolean snippetsEnabled, Boolean publik, Integer visibilityLevel, String importUrl) throws IOException { + public GitlabProject createProject(String name, Integer namespaceId, String description, Boolean issuesEnabled, Boolean wallEnabled, Boolean mergeRequestsEnabled, Boolean wikiEnabled, Boolean snippetsEnabled, Boolean publik, String visibility, String importUrl) throws IOException { Query query = new Query() .append("name", name) .appendIf("namespace_id", namespaceId) @@ -793,8 +794,7 @@ public GitlabProject createProject(String name, Integer namespaceId, String desc .appendIf("merge_requests_enabled", mergeRequestsEnabled) .appendIf("wiki_enabled", wikiEnabled) .appendIf("snippets_enabled", snippetsEnabled) - .appendIf("public", publik) - .appendIf("visibility_level", visibilityLevel) + .appendIf("visibility", visibility) .appendIf("import_url", importUrl); String tailUrl = GitlabProject.URL + query.toString(); @@ -811,7 +811,7 @@ public GitlabProject createProject(String name, Integer namespaceId, String desc * @throws IOException on gitlab api call error */ public GitlabProject createUserProject(Integer userId, String name) throws IOException { - return createUserProject(userId, name, null, null, null, null, null, null, null, null, null, null); + return createUserProject(userId, name, null, null, null, null, null, null, null, null, null); } /** @@ -826,14 +826,13 @@ public GitlabProject createUserProject(Integer userId, String name) throws IOExc * @param mergeRequestsEnabled Whether Merge Requests should be enabled, otherwise null indicates to use GitLab default * @param wikiEnabled Whether a Wiki should be enabled, otherwise null indicates to use GitLab default * @param snippetsEnabled Whether Snippets should be enabled, otherwise null indicates to use GitLab default - * @param publik Whether the project is public or private, if true same as setting visibilityLevel = 20, otherwise null indicates to use GitLab default - * @param visibilityLevel The visibility level of the project, otherwise null indicates to use GitLab default + * @param visibility The visibility level of the project, otherwise null indicates to use GitLab default * @param importUrl The Import URL for the project, otherwise null * @return The GitLab Project * @throws IOException on gitlab api call error */ @Deprecated - public GitlabProject createUserProject(Integer userId, String name, String description, String defaultBranch, Boolean issuesEnabled, Boolean wallEnabled, Boolean mergeRequestsEnabled, Boolean wikiEnabled, Boolean snippetsEnabled, Boolean publik, Integer visibilityLevel, String importUrl) throws IOException { + public GitlabProject createUserProject(Integer userId, String name, String description, String defaultBranch, Boolean issuesEnabled, Boolean wallEnabled, Boolean mergeRequestsEnabled, Boolean wikiEnabled, Boolean snippetsEnabled, String visibility, String importUrl) throws IOException { Query query = new Query() .append("name", name) .appendIf("description", description) @@ -843,8 +842,7 @@ public GitlabProject createUserProject(Integer userId, String name, String descr .appendIf("merge_requests_enabled", mergeRequestsEnabled) .appendIf("wiki_enabled", wikiEnabled) .appendIf("snippets_enabled", snippetsEnabled) - .appendIf("public", publik) - .appendIf("visibility_level", visibilityLevel) + .appendIf("visibility", visibility) .appendIf("import_url", importUrl); String tailUrl = GitlabProject.URL + "/user/" + userId + query.toString(); @@ -864,7 +862,6 @@ public GitlabProject createUserProject(Integer userId, String name, String descr * @param mergeRequestsEnabled Whether Merge Requests should be enabled, otherwise null indicates to use GitLab default * @param wikiEnabled Whether a Wiki should be enabled, otherwise null indicates to use GitLab default * @param snippetsEnabled Whether Snippets should be enabled, otherwise null indicates to use GitLab default - * @param publik Whether the project is public or private, if true same as setting visibilityLevel = 20, otherwise null indicates to use GitLab default * @param visibilityLevel The visibility level of the project, otherwise null indicates to use GitLab default * @return the Gitlab Project * @throws IOException on gitlab api call error @@ -880,8 +877,7 @@ public GitlabProject updateProject( Boolean mergeRequestsEnabled, Boolean wikiEnabled, Boolean snippetsEnabled, - Boolean publik, - Integer visibilityLevel) + String visibility) throws IOException { Query query = new Query() @@ -893,8 +889,7 @@ public GitlabProject updateProject( .appendIf("merge_requests_enabled", mergeRequestsEnabled) .appendIf("wiki_enabled", wikiEnabled) .appendIf("snippets_enabled", snippetsEnabled) - .appendIf("public", publik) - .appendIf("visibility_level", visibilityLevel); + .appendIf("visibility", visibility); String tailUrl = GitlabProject.URL + "/" + projectId + query.toString(); @@ -970,12 +965,12 @@ public GitlabMergeRequest getMergeRequestByIid(Serializable projectId, Integer m * @throws IOException on gitlab api call error */ public GitlabMergeRequest getMergeRequestChanges(Serializable projectId, Integer mergeRequestId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/merge_request/" + mergeRequestId + "/changes"; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/merge_requests/" + mergeRequestId + "/changes"; return retrieve().to(tailUrl, GitlabMergeRequest.class); } public GitlabMergeRequest getMergeRequest(GitlabProject project, Integer mergeRequestId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + "/merge_request/" + mergeRequestId; + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/merge_requests/" + mergeRequestId; return retrieve().to(tailUrl, GitlabMergeRequest.class); } @@ -1094,17 +1089,6 @@ public GitlabCommit getCommit(Serializable projectId, String commitHash) throws return retrieve().to(tailUrl, GitlabCommit.class); } - - public List getCommitBuilds(GitlabProject projectId, String commitHash) throws IOException { - return getCommitBuilds(projectId.getId(), commitHash); - } - - public List getCommitBuilds(Serializable projectId, String commitHash) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + commitHash + GitlabBuild.URL + PARAM_MAX_ITEMS_PER_PAGE; - return retrieve().getAll(tailUrl, GitlabBuild[].class); - } - - public List getCommits(GitlabMergeRequest mergeRequest) throws IOException { return getCommits(mergeRequest, new Pagination()); } @@ -1260,9 +1244,9 @@ public byte[] getRawFileContent(GitlabProject project, String sha, String filepa */ public byte[] getRawFileContent(Integer projectId, String sha, String filepath) throws IOException { Query query = new Query() - .append("filepath", filepath); + .append("ref", sha); - String tailUrl = GitlabProject.URL + "/" + projectId + "/repository/blobs/" + sha + query.toString(); + String tailUrl = GitlabProject.URL + "/" + projectId + "/repository/files/" + sanitizePath(filepath) + "/raw" + query.toString(); return retrieve().to(tailUrl, byte[].class); } @@ -1294,13 +1278,13 @@ public byte[] getFileArchive(GitlabProject project) throws IOException { * * @param project The Project * @param path The path inside the repository. Used to get content of subdirectories (optional) - * @param ref_name The name of a repository branch or tag or if not given the default branch (optional) + * @param ref The name of a repository branch or tag or if not given the default branch (optional) * @throws IOException on gitlab api call error */ - public List getRepositoryTree(GitlabProject project, String path, String ref_name, boolean recursive) throws IOException { + public List getRepositoryTree(GitlabProject project, String path, String ref, boolean recursive) throws IOException { Query query = new Query() .appendIf("path", path) - .appendIf("ref_name", ref_name) + .appendIf("ref", ref) .appendIf("recursive", recursive); String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository" + GitlabRepositoryTree.URL + query.toString(); @@ -1310,10 +1294,9 @@ public List getRepositoryTree(GitlabProject project, Strin public GitlabRepositoryFile getRepositoryFile(GitlabProject project, String path, String ref) throws IOException { Query query = new Query() - .append("file_path", path) .append("ref", ref); - String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files" + query.toString(); + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files/" + sanitizePath(path) + query.toString(); return retrieve().to(tailUrl, GitlabRepositoryFile.class); } @@ -1397,7 +1380,7 @@ public void createBranch(GitlabProject project, String branchName, String ref) t */ public void createBranch(Serializable projectId, String branchName, String ref) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL; - dispatch().with("branch_name", branchName).with("ref", ref).to(tailUrl, Void.class); + dispatch().with("branch", branchName).with("ref", ref).to(tailUrl, Void.class); } /** @@ -1408,12 +1391,12 @@ public void createBranch(Serializable projectId, String branchName, String ref) * @throws IOException on gitlab api call error */ public void deleteBranch(Serializable projectId, String branchName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + '/' + sanitizeBranch(branchName); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + '/' + sanitizePath(branchName); retrieve().method("DELETE").to(tailUrl, Void.class); } public GitlabBranch getBranch(Serializable projectId, String branchName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + '/' + sanitizeBranch(branchName); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + '/' + sanitizePath(branchName); return retrieve().to(tailUrl, GitlabBranch.class); } @@ -1422,12 +1405,19 @@ public GitlabBranch getBranch(GitlabProject project, String branchName) throws I } public void protectBranch(GitlabProject project, String branchName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + '/' + sanitizeBranch(branchName) + "/protect"; - retrieve().method("PUT").to(tailUrl, Void.class); + protectBranchWithDeveloperOptions(project, branchName, false, false); + } + + public void protectBranchWithDeveloperOptions(GitlabProject project, String branchName, boolean developers_can_push, boolean developers_can_merge) throws IOException { + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + '/' + sanitizePath(branchName) + "/protect"; + final Query query = new Query() + .append("developers_can_push", Boolean.toString(developers_can_push)) + .append("developers_can_merge", Boolean.toString(developers_can_merge)); + retrieve().method("PUT").to(tailUrl + query.toString(), Void.class); } public void unprotectBranch(GitlabProject project, String branchName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + '/' + sanitizeBranch(branchName) + "/unprotect"; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + '/' + sanitizePath(branchName) + "/unprotect"; retrieve().method("PUT").to(tailUrl, Void.class); } @@ -1949,15 +1939,34 @@ public void transfer(Integer namespaceId, Integer projectId) throws IOException * @throws IOException on gitlab api call error */ public GitlabSSHKey createDeployKey(Integer targetProjectId, String title, String key) throws IOException { + return createDeployKey(targetProjectId, title, key, false); + } + + /** + * Create a new deploy key for the project which can push. + * + * @param targetProjectId The id of the Gitlab project + * @param title The title of the ssh key + * @param key The public key + * @return The new GitlabSSHKey + * @throws IOException on gitlab api call error + */ + public GitlabSSHKey createPushDeployKey(Integer targetProjectId, String title, String key) throws IOException { + return createDeployKey(targetProjectId, title, key, true); + } + + private GitlabSSHKey createDeployKey(Integer targetProjectId, String title, String key, boolean canPush) throws IOException { Query query = new Query() .append("title", title) - .append("key", key); + .append("key", key) + .append("can_push", Boolean.toString(canPush)); - String tailUrl = GitlabProject.URL + "/" + targetProjectId + GitlabSSHKey.KEYS_URL + query.toString(); + String tailUrl = GitlabProject.URL + "/" + targetProjectId + GitlabSSHKey.DEPLOY_KEYS_URL + query.toString(); return dispatch().to(tailUrl, GitlabSSHKey.class); } + /** * Delete a deploy key for a project * @@ -1966,7 +1975,7 @@ public GitlabSSHKey createDeployKey(Integer targetProjectId, String title, Strin * @throws IOException on gitlab api call error */ public void deleteDeployKey(Integer targetProjectId, Integer targetKeyId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + targetProjectId + GitlabSSHKey.KEYS_URL + "/" + targetKeyId; + String tailUrl = GitlabProject.URL + "/" + targetProjectId + GitlabSSHKey.DEPLOY_KEYS_URL + "/" + targetKeyId; retrieve().method("DELETE").to(tailUrl, Void.class); } @@ -1978,7 +1987,7 @@ public void deleteDeployKey(Integer targetProjectId, Integer targetKeyId) throws * @throws IOException on gitlab api call error */ public List getDeployKeys(Integer targetProjectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + targetProjectId + GitlabSSHKey.KEYS_URL; + String tailUrl = GitlabProject.URL + "/" + targetProjectId + GitlabSSHKey.DEPLOY_KEYS_URL; return Arrays.asList(retrieve().to(tailUrl, GitlabSSHKey[].class)); } @@ -2041,7 +2050,7 @@ private String sanitizeProjectId(Serializable projectId) { } } - private String sanitizeBranch(String branch){ + private String sanitizePath(String branch){ try { return URLEncoder.encode(branch, "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -2390,7 +2399,7 @@ public GitlabBuildVariable getBuildVariable(Integer projectId, String key) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + - GitlabBuildVariable.URL + + GitlabBuildVariable.URL + "/" + key; return retrieve().to(tailUrl, GitlabBuildVariable.class); } @@ -2447,7 +2456,7 @@ public void deleteBuildVariable(Integer projectId, String key) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + - GitlabBuildVariable.URL + + GitlabBuildVariable.URL + "/" + key; retrieve().method("DELETE").to(tailUrl, Void.class); } @@ -2476,7 +2485,7 @@ public GitlabBuildVariable updateBuildVariable(Integer projectId, String newValue) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + - GitlabBuildVariable.URL + + GitlabBuildVariable.URL + "/" + key; GitlabHTTPRequestor requestor = retrieve().method("PUT"); if (newValue != null) { @@ -2490,14 +2499,14 @@ public GitlabBuildVariable updateBuildVariable(Integer projectId, * * @param project the project * @return list of build triggers - * @throws IllegalStateException if builds are not enabled for the project + * @throws IllegalStateException if jobs are not enabled for the project * @throws IOException */ - public List getBuildTriggers(GitlabProject project) throws IOException { - if (!project.isBuildsEnabled()) { - // if the project has not allowed builds, you will only get a 403 forbidden message which is + public List getPipelineTriggers(GitlabProject project) throws IOException { + if (!project.isJobsEnabled()) { + // if the project has not allowed jobs, you will only get a 403 forbidden message which is // not helpful. - throw new IllegalStateException("Builds are not enabled for " + project.getNameWithNamespace() ); + throw new IllegalStateException("Jobs are not enabled for " + project.getNameWithNamespace() ); } else { return retrieve().getAll(GitlabProject.URL + "/" + project.getId() + GitlabTrigger.URL + PARAM_MAX_ITEMS_PER_PAGE, GitlabTrigger[].class); } @@ -2550,12 +2559,12 @@ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws * @return A list of gitlab projects * @throws IOException */ - public List searchProjects(String query) throws IOException { - List projects = new ArrayList(); - String tailUrl = GitlabProject.URL + "/search/" + query; + public List searchProjects(String search) throws IOException { + Query query = new Query() + .append("search", search); + String tailUrl = GitlabProject.URL + query.toString(); GitlabProject[] response = retrieve().to(tailUrl, GitlabProject[].class); - projects = Arrays.asList(response); - return projects; + return Arrays.asList(response); } /** diff --git a/src/main/java/org/gitlab/api/models/GitlabBuildVariable.java b/src/main/java/org/gitlab/api/models/GitlabBuildVariable.java index 605499de..e7e202f6 100644 --- a/src/main/java/org/gitlab/api/models/GitlabBuildVariable.java +++ b/src/main/java/org/gitlab/api/models/GitlabBuildVariable.java @@ -6,7 +6,7 @@ * @author Vitezslav Zak */ public class GitlabBuildVariable { - public final static String URL = "/variables/"; + public final static String URL = "/variables"; public GitlabBuildVariable() { } diff --git a/src/main/java/org/gitlab/api/models/GitlabBuild.java b/src/main/java/org/gitlab/api/models/GitlabJob.java similarity index 97% rename from src/main/java/org/gitlab/api/models/GitlabBuild.java rename to src/main/java/org/gitlab/api/models/GitlabJob.java index d1805138..4027c544 100644 --- a/src/main/java/org/gitlab/api/models/GitlabBuild.java +++ b/src/main/java/org/gitlab/api/models/GitlabJob.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; -public class GitlabBuild { +public class GitlabJob { - public final static String URL = "/builds"; + public final static String URL = "/jobs"; private GitlabCommit commit; private Float coverage; diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 9de2a1b6..5fc9d857 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -45,14 +45,14 @@ public class GitlabProject { @JsonProperty("wiki_enabled") private boolean wikiEnabled; - @JsonProperty("builds_enabled") - private boolean buildsEnabled; + @JsonProperty("jobs_enabled") + private boolean jobsEnabled; @JsonProperty("shared_runners_enabled") private boolean sharedRunnersEnabled; - @JsonProperty("public_builds") - private boolean publicBuilds; + @JsonProperty("public_jobs") + private boolean publicJobs; @JsonProperty("runners_token") private String runnersToken; @@ -210,12 +210,12 @@ public void setWikiEnabled(boolean wikiEnabled) { this.wikiEnabled = wikiEnabled; } - public boolean isBuildsEnabled() { - return buildsEnabled; + public boolean isJobsEnabled() { + return jobsEnabled; } - public void setBuildsEnabled(boolean buildsEnabled) { - this.buildsEnabled = buildsEnabled; + public void setJobsEnabled(boolean jobsEnabled) { + this.jobsEnabled = jobsEnabled; } public boolean isSharedRunnersEnabled() { @@ -226,12 +226,12 @@ public void setSharedRunnersEnabled(boolean sharedRunnersEnabled) { this.sharedRunnersEnabled = sharedRunnersEnabled; } - public boolean hasPublicBuilds() { - return publicBuilds; + public boolean hasPublicJobs() { + return publicJobs; } - public void setPublicBuilds(boolean publicBuilds) { - this.publicBuilds = publicBuilds; + public void setPublicJobs(boolean publicJobs) { + this.publicJobs = publicJobs; } public String getRunnersToken() { diff --git a/src/main/java/org/gitlab/api/models/GitlabSSHKey.java b/src/main/java/org/gitlab/api/models/GitlabSSHKey.java index 4635ae5a..f9e29e6e 100644 --- a/src/main/java/org/gitlab/api/models/GitlabSSHKey.java +++ b/src/main/java/org/gitlab/api/models/GitlabSSHKey.java @@ -3,6 +3,7 @@ public class GitlabSSHKey { public static String KEYS_URL = "/keys"; + public static String DEPLOY_KEYS_URL = "/deploy_keys"; private Integer _id; private String _title; diff --git a/src/test/java/org/gitlab/api/APIForIntegrationTestingHolder.java b/src/test/java/org/gitlab/api/APIForIntegrationTestingHolder.java new file mode 100644 index 00000000..a2ac1a2a --- /dev/null +++ b/src/test/java/org/gitlab/api/APIForIntegrationTestingHolder.java @@ -0,0 +1,43 @@ +package org.gitlab.api; + + +import org.gitlab.api.models.GitlabSession; +import org.junit.AssumptionViolatedException; + +import java.io.IOException; + +/** + * Token holder for integration tests. + *
    + *
  • By throwing an {@link AssumptionViolatedException} when the host is not reachable, + * provoke skipping of tests.
    • + *
  • GitLab is strict about creating too much sessions for username/password. + * If you create too many sessions, you will receive HTTP/429 (Retry Later).
    • + *
+ */ +public class APIForIntegrationTestingHolder { + + private static final String TEST_URL = "http://" + System.getProperty("docker.host.address", "localhost") + ":" + System.getProperty("gitlab.port", "18080"); + + public static APIForIntegrationTestingHolder INSTANCE = new APIForIntegrationTestingHolder(); + + private Object api; + + private APIForIntegrationTestingHolder(){ + final GitlabSession session; + try { + session = GitlabAPI.connect(TEST_URL, "root", "password"); + String privateToken = session.getPrivateToken(); + api = GitlabAPI.connect(TEST_URL, privateToken); + } catch (IOException e) { + api = e; + } + } + + public GitlabAPI getApi() { + if (api instanceof IOException) { + throw new AssumptionViolatedException("GITLAB not running on '" + TEST_URL + "', skipping...", (IOException)api); + } + return (GitlabAPI)api; + } +} diff --git a/src/test/java/org/gitlab/api/GitlabAPITest.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java similarity index 78% rename from src/test/java/org/gitlab/api/GitlabAPITest.java rename to src/test/java/org/gitlab/api/GitlabAPIIT.java index f2f636e5..d3f24155 100644 --- a/src/test/java/org/gitlab/api/GitlabAPITest.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -1,40 +1,36 @@ package org.gitlab.api; import org.gitlab.api.models.GitlabBuildVariable; -import org.gitlab.api.models.GitlabProject; import org.gitlab.api.models.GitlabGroup; +import org.gitlab.api.models.GitlabProject; import org.gitlab.api.models.GitlabUser; -import org.junit.Before; -import org.junit.Ignore; +import org.junit.BeforeClass; import org.junit.Test; import java.io.FileNotFoundException; import java.io.IOException; -import java.net.ConnectException; import java.net.URL; +import java.util.List; import java.util.UUID; import static org.junit.Assert.*; -import static org.junit.Assume.assumeNoException; -@Ignore -public class GitlabAPITest { +public class GitlabAPIIT { - GitlabAPI api; + static GitlabAPI api; - private static final String TEST_URL = System.getProperty("TEST_URL", "http://localhost"); - private static final String TEST_TOKEN = System.getProperty("TEST_TOKEN", "y0E5b9761b7y4qk"); - - String rand = UUID.randomUUID().toString().replace("-", "").substring(0, 8); + private static final String TEST_URL = "http://" + System.getProperty("docker.host.address", "localhost") + ":" + System.getProperty("gitlab.port", "18080"); + String rand = createRandomString(); + @BeforeClass + public static void getApi() { + api = APIForIntegrationTestingHolder.INSTANCE.getApi(); + } - @Before - public void setup() throws IOException { - api = GitlabAPI.connect(TEST_URL, TEST_TOKEN); + @Test + public void Check_invalid_credentials() throws IOException { try { - api.dispatch().with("login", "INVALID").with("password", rand).to("session", GitlabUser.class); - } catch (ConnectException e) { - assumeNoException("GITLAB not running on '" + TEST_URL + "', skipping...", e); + api.dispatch().with("login", "INVALID").with("password", createRandomString()).to("session", GitlabUser.class); } catch (GitlabAPIException e) { final String message = e.getMessage(); if (!message.equals("{\"message\":\"401 Unauthorized\"}")) { @@ -44,10 +40,9 @@ public void setup() throws IOException { } } } - @Test public void testAllProjects() throws IOException { - api.getAllProjects(); + api.getProjects(); } @Test @@ -57,7 +52,7 @@ public void testConnect() throws IOException { @Test public void testGetAPIUrl() throws IOException { - URL expected = new URL(TEST_URL + "/api/v3/"); + URL expected = new URL(TEST_URL + "/api/v4/"); assertEquals(expected, api.getAPIUrl("")); } @@ -113,7 +108,7 @@ public void testCreateUpdateDeleteVariable() throws IOException { } @Test - public void testCreateUpdateDeleteUser() throws IOException { + public void testCreateUpdateDeleteUser() throws IOException, InterruptedException { String password = randVal("$%password"); @@ -138,7 +133,6 @@ public void testCreateUpdateDeleteUser() throws IOException { GitlabUser refetched = api.getUserViaSudo(gitUser.getUsername()); assertNotNull(refetched); - assertEquals(refetched.getUsername(), gitUser.getUsername()); api.updateUser(gitUser.getId(), gitUser.getEmail(), password, gitUser.getUsername(), @@ -153,9 +147,13 @@ public void testCreateUpdateDeleteUser() throws IOException { assertNotNull(postUpdate); assertEquals(postUpdate.getSkype(), "newSkypeId"); + // block + api.blockUser(refetched.getId()); + api.unblockUser(refetched.getId()); api.deleteUser(postUpdate.getId()); - + // This is odd, but it seems the user is deleted asynchronously... + Thread.sleep(1000); // expect a 404, but we have no access to it try { GitlabUser shouldNotExist = api.getUser(postUpdate.getId()); @@ -188,7 +186,23 @@ public void testGetGroupByPath() throws IOException { api.deleteGroup(group.getId()); } + @Test + public void Check_get_owned_projects() throws IOException { + final List ownedProjects = api.getOwnedProjects(); + assertEquals(0, ownedProjects.size()); + } + + @Test + public void Check_search_projects() throws IOException { + final List searchedProjects = api.searchProjects("foo"); + assertEquals(0, searchedProjects.size()); + } + private String randVal(String postfix) { return rand + "_" + postfix; } + + private static String createRandomString() { + return UUID.randomUUID().toString().replace("-", "").substring(0, 8); + } } diff --git a/src/test/java/org/gitlab/api/GitlabUploadIT.java b/src/test/java/org/gitlab/api/GitlabUploadIT.java new file mode 100644 index 00000000..31524b66 --- /dev/null +++ b/src/test/java/org/gitlab/api/GitlabUploadIT.java @@ -0,0 +1,52 @@ +package org.gitlab.api; + +import org.apache.commons.io.IOUtils; +import org.gitlab.api.models.GitlabProject; +import org.gitlab.api.models.GitlabUpload; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.*; + +public class GitlabUploadIT { + + static GitlabAPI api; + + @BeforeClass + public static void getApi() { + api = APIForIntegrationTestingHolder.INSTANCE.getApi(); + } + + + @Test + public void testUploadToProject() throws Exception { + GitlabProject project; + try { + project = api.getProject("root", "project"); + } catch (FileNotFoundException e) { + project = api.createUserProject(api.getUser().getId(), "project"); + } + String content = "test file content"; + File tempFile = createTempFile(content); + try { + GitlabUpload upload = api.uploadFile(project, tempFile); + Assert.assertNotNull(upload.getUrl()); + } finally { + tempFile.delete(); + } + } + + private File createTempFile(String content) throws IOException { + File tempFile = File.createTempFile("upload-", ".txt"); + InputStream is = new ByteArrayInputStream(content.getBytes()); + OutputStream os = new FileOutputStream(tempFile); + try { + IOUtils.copy(is, os); + } finally { + is.close(); + os.close(); + } + return tempFile; + } +} diff --git a/src/test/java/org/gitlab/api/GitlabUploadTest.java b/src/test/java/org/gitlab/api/GitlabUploadTest.java deleted file mode 100644 index 0288d377..00000000 --- a/src/test/java/org/gitlab/api/GitlabUploadTest.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.gitlab.api; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import org.apache.commons.io.IOUtils; -import org.gitlab.api.models.GitlabProject; -import org.gitlab.api.models.GitlabUpload; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; - -@Ignore -public class GitlabUploadTest { - - private static final String TEST_URL = System.getProperty("TEST_URL", "http://localhost"); - private static final String TEST_TOKEN = System.getProperty("TEST_TOKEN", "y0E5b9761b7y4qk"); - private static final String TEST_PROJECT = System.getProperty("TEST_PROJECT", "user/project"); - - @Test - public void testUploadToProject() throws Exception { - GitlabAPI api = GitlabAPI.connect(TEST_URL, TEST_TOKEN); - String content = "test file content"; - File tempFile = createTempFile(content); - try { - GitlabUpload upload = api.uploadFile(gitlabProject(api), tempFile); - Assert.assertNotNull(upload.getUrl()); - } finally { - tempFile.delete(); - } - } - - private File createTempFile(String content) throws IOException { - File tempFile = File.createTempFile("upload-", ".txt"); - InputStream is = new ByteArrayInputStream(content.getBytes()); - OutputStream os = new FileOutputStream(tempFile); - try { - IOUtils.copy(is, os); - } finally { - is.close(); - os.close(); - } - return tempFile; - } - - private GitlabProject gitlabProject(GitlabAPI api) throws IOException { - for (GitlabProject gitlabProject : api.getProjects()) { - String projetPath = String.format("%s/%s", gitlabProject.getNamespace().getPath(), gitlabProject.getPath()); - if (projetPath.equals(TEST_PROJECT)) { - return gitlabProject; - } - } - throw new IllegalStateException(); - } - -} diff --git a/src/test/resources/gitlab.rb b/src/test/resources/gitlab.rb new file mode 100644 index 00000000..c47fdb49 --- /dev/null +++ b/src/test/resources/gitlab.rb @@ -0,0 +1,2 @@ +gitlab_rails['initial_root_password'] = "password" +gitlab_rails['lfs_enabled'] = false From 07dda996b1b99018bc69c214d30d1be7d061989b Mon Sep 17 00:00:00 2001 From: timols Date: Fri, 28 Apr 2017 13:16:03 -0700 Subject: [PATCH 023/119] Reset pom to 4.0.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 148befc7..eb236fea 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1-SNAPSHOT + 4.0.0-SNAPSHOT Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API From 642e8abda89696f06b0762043a65b7287c043778 Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Wed, 24 May 2017 18:25:11 -0400 Subject: [PATCH 024/119] Support creation of subgroups (#210) ... and every other group creation option that is presently documented. --- src/main/java/org/gitlab/api/GitlabAPI.java | 29 +++++ .../gitlab/api/models/CreateGroupRequest.java | 114 ++++++++++++++++++ .../org/gitlab/api/models/GitlabGroup.java | 11 ++ 3 files changed, 154 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/CreateGroupRequest.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 47089f44..e121d561 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -485,6 +485,35 @@ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAc } + /** + * Creates a Group + * + * @param request The project-creation request + * @param sudoUser The user to create the group on behalf of + * + * @return The GitLab Group + * @throws IOException on gitlab api call error + */ + public GitlabGroup createGroup(CreateGroupRequest request, GitlabUser sudoUser) throws IOException { + + Query query = new Query() + .append("name", request.getName()) + .append("path", request.getPath()) + .appendIf("ldap_cn", request.getLdapCn()) + .appendIf("description", request.getDescription()) + .appendIf("membershipLock", request.getMembershipLock()) + .appendIf("share_with_group_lock", request.getShareWithGroupLock()) + .appendIf("visibility", request.getVisibility()) + .appendIf("lfs_enabled", request.getLfsEnabled()) + .appendIf("request_access_enabled", request.getRequestAccessEnabled()) + .appendIf("parent_id", request.getParentId()) + .appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null); + + String tailUrl = GitlabGroup.URL + query.toString(); + + return dispatch().to(tailUrl, GitlabGroup.class); + } + /** * Creates a Group * diff --git a/src/main/java/org/gitlab/api/models/CreateGroupRequest.java b/src/main/java/org/gitlab/api/models/CreateGroupRequest.java new file mode 100644 index 00000000..6464b481 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/CreateGroupRequest.java @@ -0,0 +1,114 @@ +package org.gitlab.api.models; + + +public class CreateGroupRequest { + + public CreateGroupRequest(String name) { + this(name, name); + } + + public CreateGroupRequest(String name, String path) { + this.name = name; + this.path = path; + } + + private String name; + private String path; + private String ldapCn; + private String description; + private Boolean membershipLock; + private Boolean shareWithGroupLock; + private Boolean visibility; + private Boolean lfsEnabled; + private Boolean requestAccessEnabled; + private Integer parentId; + + public String getName() { + return name; + } + + public CreateGroupRequest setName(String name) { + this.name = name; + return this; + } + public String getPath() { + return path; + } + + public CreateGroupRequest setPath(String path) { + this.path = path; + return this; + } + + public String getLdapCn() { + return ldapCn; + } + + public CreateGroupRequest setLdapCn(String ldapCn) { + this.ldapCn = ldapCn; + return this; + } + + public String getDescription() { + return description; + } + + public CreateGroupRequest setDescription(String description) { + this.description = description; + return this; + } + + public Boolean getMembershipLock() { + return membershipLock; + } + + public CreateGroupRequest setMembershipLock(Boolean membershipLock) { + this.membershipLock = membershipLock; + return this; + } + + public Boolean getShareWithGroupLock() { + return shareWithGroupLock; + } + + public CreateGroupRequest setShareWithGroupLock(Boolean shareWithGroupLock) { + this.shareWithGroupLock = shareWithGroupLock; + return this; + } + + public Boolean getVisibility() { + return visibility; + } + + public CreateGroupRequest setVisibility(Boolean visibility) { + this.visibility = visibility; + return this; + } + + public Boolean getLfsEnabled() { + return lfsEnabled; + } + + public CreateGroupRequest setLfsEnabled(Boolean lfsEnabled) { + this.lfsEnabled = lfsEnabled; + return this; + } + + public Boolean getRequestAccessEnabled() { + return requestAccessEnabled; + } + + public CreateGroupRequest setRequestAccessEnabled(Boolean requestAccessEnabled) { + this.requestAccessEnabled = requestAccessEnabled; + return this; + } + + public Integer getParentId() { + return parentId; + } + + public CreateGroupRequest setParentId(Integer parentId) { + this.parentId = parentId; + return this; + } +} \ No newline at end of file diff --git a/src/main/java/org/gitlab/api/models/GitlabGroup.java b/src/main/java/org/gitlab/api/models/GitlabGroup.java index 82a68bd1..19fa1be8 100644 --- a/src/main/java/org/gitlab/api/models/GitlabGroup.java +++ b/src/main/java/org/gitlab/api/models/GitlabGroup.java @@ -24,14 +24,25 @@ public class GitlabGroup { @JsonProperty("web_url") private String webUrl; + @JsonProperty("parent_id") + private Integer parentId; + public Integer getId() { return id; } + public Integer getParentId() { + return parentId; + } + public void setId(Integer id) { this.id = id; } + public void setParentId(Integer parentId) { + this.parentId = parentId; + } + public String getName() { return name; } From 5b99e864e04c9a89c3484ce5bf3f0346fe882377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Thu, 25 May 2017 00:25:29 +0200 Subject: [PATCH 025/119] fixes update/accept Merge Request URLs (#211) * fixes update/accept Merge Request URLs * usage of the GitlabMergeRequest constant for the URL --- src/main/java/org/gitlab/api/GitlabAPI.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index e121d561..f23956eb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -994,12 +994,12 @@ public GitlabMergeRequest getMergeRequestByIid(Serializable projectId, Integer m * @throws IOException on gitlab api call error */ public GitlabMergeRequest getMergeRequestChanges(Serializable projectId, Integer mergeRequestId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/merge_requests/" + mergeRequestId + "/changes"; + 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() + "/merge_requests/" + mergeRequestId; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + "/" + mergeRequestId; return retrieve().to(tailUrl, GitlabMergeRequest.class); } @@ -1056,7 +1056,7 @@ public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mer .appendIf("state_event", stateEvent) .appendIf("labels", labels); - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/merge_request/" + mergeRequestId + query.toString(); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + query.toString(); return retrieve().method("PUT").to(tailUrl, GitlabMergeRequest.class); } @@ -1069,7 +1069,7 @@ 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() + "/merge_request/" + mergeRequestId + "/merge"; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + "/" + mergeRequestId + "/merge"; GitlabHTTPRequestor requestor = retrieve().method("PUT"); requestor.with("id", project.getId()); requestor.with("merge_request_id", mergeRequestId); From 32eb941bdf5f81a7935116d6b2f0ac37eedd9baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Thu, 25 May 2017 00:26:00 +0200 Subject: [PATCH 026/119] add missing field mergeCommitSHA and json property SHA (#212) --- .../gitlab/api/models/GitlabMergeRequest.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index 606c34c5..51588809 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -49,13 +49,16 @@ public class GitlabMergeRequest { @JsonProperty("created_at") private Date createdAt; - + @JsonProperty("merge_commit_sha") + private String mergeCommitSHA; + @JsonProperty("merge_status") private String mergeStatus; @JsonProperty("web_url") private String webUrl; + @JsonProperty("sha") private String sha; public Integer getId() { @@ -244,9 +247,21 @@ public void setChanges(List changes) { this.changes = changes; } - public String getMergeStatus() { return mergeStatus; } + public String getMergeCommitSHA() { + return mergeCommitSHA; + } + + public void setMergeCommitSHA(String mergeCommitSHA) { + this.mergeCommitSHA = mergeCommitSHA; + } - public void setMergeStatus(String mergeStatus) { this.mergeStatus = mergeStatus; } + public String getMergeStatus() { + return mergeStatus; + } + + public void setMergeStatus(String mergeStatus) { + this.mergeStatus = mergeStatus; + } public String getWebUrl() { return webUrl; From 5996edbe733930c6f99444bef635e16f35d5cd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Sun, 28 May 2017 22:52:25 +0200 Subject: [PATCH 027/119] Improvement of getMergedRequest methods and new cherryPick method (#209) * New methods to retrieve Merge Requests with a given status * improvement of the API to retrieve the Merge Requests * new method to cherry-pick a commit * new cherryPick method with a GitlabProject and javadoc * fixed cherryPick method url and method * moves MergeRequest status constants --- src/main/java/org/gitlab/api/GitlabAPI.java | 101 ++++++++++++++++-- .../gitlab/api/models/GitlabMergeRequest.java | 5 +- 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index f23956eb..16263a58 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -937,34 +937,119 @@ public void deleteProject(Serializable projectId) throws IOException { } public List getOpenMergeRequests(Serializable projectId) throws IOException { - Query query = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery(); - query.append("state", "opened"); - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + query; - return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); + return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_OPENED); + } + + public List getOpenMergeRequests(Serializable projectId, Pagination pagination) throws IOException { + return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_OPENED, pagination); } public List getOpenMergeRequests(GitlabProject project) throws IOException { - Query query = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery(); - query.append("state", "opened"); + return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_OPENED); + } + + public List getOpenMergeRequests(GitlabProject project, Pagination pagination) throws IOException { + return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_OPENED, pagination); + } + + public List getMergedMergeRequests(Serializable projectId) throws IOException { + return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_MERGED); + } + + public List getMergedMergeRequests(Serializable projectId, Pagination pagination) throws IOException { + return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_MERGED, pagination); + } + + public List getMergedMergeRequests(GitlabProject project) throws IOException { + return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_MERGED); + } + + public List getMergedMergeRequests(GitlabProject project, Pagination pagination) throws IOException { + return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_MERGED, pagination); + } + + public List getClosedMergeRequests(Serializable projectId) throws IOException { + return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_CLOSED); + } + + public List getClosedMergeRequests(Serializable projectId, Pagination pagination) throws IOException { + return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_CLOSED, pagination); + } + + public List getClosedMergeRequests(GitlabProject project) throws IOException { + return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_CLOSED); + } + + public List getClosedMergeRequests(GitlabProject project, Pagination pagination) throws IOException { + return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_CLOSED, pagination); + } + + public List getMergeRequestsWithStatus(Serializable projectId, String status) throws IOException { + return getMergeRequestsWithStatus(projectId, status, new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE)); + } + + public List getMergeRequestsWithStatus(Serializable projectId, String state, Pagination pagination) throws IOException { + Query query = pagination.asQuery(); + query.append("state", state); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + query; + return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); + } + + public List getMergeRequestsWithStatus(GitlabProject project, String status) throws IOException { + return getMergeRequestsWithStatus(project, status, new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE)); + } + + public List getMergeRequestsWithStatus(GitlabProject project, String state, Pagination pagination) throws IOException { + Query query = pagination.asQuery(); + query.append("state", state); String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + query; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } - + public List getMergeRequests(Serializable projectId) throws IOException { 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 { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + pagination.toString(); + return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); + } public List getMergeRequests(GitlabProject project) throws IOException { 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 { + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + pagination.toString(); + return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); + } public List getAllMergeRequests(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + PARAM_MAX_ITEMS_PER_PAGE; + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } + /** + * Cherry picks a commit. + * + * @param projectId The id of the project + * @param sha The sha of the commit + * @param targetBranchName The branch on which the commit must be cherry-picked + * @return the commit of the cherry-pick. + * @throws IOException on gitlab api call error + */ + public GitlabCommit cherryPick(Serializable projectId, String sha, String targetBranchName) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + sha + "/cherry_pick"; + return retrieve().with("branch", targetBranchName).to(tailUrl, GitlabCommit.class); + } + + public GitlabCommit cherryPick(GitlabProject project, String sha, String targetBranchName) throws IOException { + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/commits/" + sha + "/cherry_pick"; + return dispatch().with("branch", targetBranchName).to(tailUrl, GitlabCommit.class); + } + /** * Return Merge Request. * diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index 51588809..7663af17 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -7,7 +7,10 @@ public class GitlabMergeRequest { public static final String URL = "/merge_requests"; - + public static final String STATUS_OPENED = "opened"; + public static final String STATUS_MERGED = "merged"; + public static final String STATUS_CLOSED = "closed"; + private Integer id; private Integer iid; private String title; From 8c8c1bb9ccb256020493a7bc0e8a8144243c3fb2 Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Sun, 28 May 2017 16:55:14 -0400 Subject: [PATCH 028/119] Add a createProject method that takes all the options (#213) * Add a createProject method that takes all the options This is intended to allow https://gitlab.com/gitlab-org/gitlab-ce/issues/32935 to be worked around, but maybe it will be more generally useful too. * Replace the bogus "visibilityLevel" value with the correct "visibilty" field --- src/main/java/org/gitlab/api/GitlabAPI.java | 46 ++++++- .../org/gitlab/api/models/GitlabProject.java | 120 +++++++++++++++--- 2 files changed, 149 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 16263a58..9c9c499b 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -746,6 +746,50 @@ public byte[] getJobArtifact(Integer projectId, Integer jobId) throws IOExceptio return retrieve().to(tailUrl, byte[].class); } + /** + * Creates a Project + * + * @param project The project to create + * @return The GitLab Project + * @throws IOException on gitlab api call error + */ + public GitlabProject createProject(GitlabProject project) throws IOException { + Query query = new Query() + .appendIf("name", project.getName()) + .appendIf("path", project.getPath()) + .appendIf("default_branch", project.getDefaultBranch()) + .appendIf("description", project.getDescription()) + .appendIf("issues_enabled", project.isIssuesEnabled()) + .appendIf("merge_requests_enabled", project.isMergeRequestsEnabled()) + .appendIf("jobs_enabled", project.isJobsEnabled()) + .appendIf("wiki_enabled", project.isWikiEnabled()) + .appendIf("snippets_enabled", project.isSnippetsEnabled()) + + .appendIf("container_registry_enabled", project.isContainerRegistryEnabled()) + .appendIf("shared_runners_enabled", project.isSharedRunnersEnabled()) + + .appendIf("visibility", project.getVisibility()) + .appendIf("public_jobs", project.hasPublicJobs()) + .appendIf("import_url", project.getImportUrl()) + + .appendIf("only_allow_merge_if_pipeline_succeeds", project.getOnlyAllowMergeIfPipelineSucceeds()) + .appendIf("only_allow_merge_if_all_discussions_are_resolved", project.getOnlyAllowMergeIfAllDiscussionsAreResolved()) + .appendIf("lfs_enabled", project.isLfsEnabled()) + .appendIf("request_enabled", project.isRequestAccessEnabled()) + .appendIf("repository_storage", project.getRepositoryStorage()) + .appendIf("approvals_before_merge", project.getApprovalsBeforeMerge()); + + GitlabNamespace namespace = project.getNamespace(); + if (namespace != null) { + query.appendIf("namespace_id", namespace.getId()); + } + + + String tailUrl = GitlabProject.URL + query.toString(); + + return dispatch().to(tailUrl, GitlabProject.class); + } + /** * Creates a private Project * @@ -891,7 +935,7 @@ public GitlabProject createUserProject(Integer userId, String name, String descr * @param mergeRequestsEnabled Whether Merge Requests should be enabled, otherwise null indicates to use GitLab default * @param wikiEnabled Whether a Wiki should be enabled, otherwise null indicates to use GitLab default * @param snippetsEnabled Whether Snippets should be enabled, otherwise null indicates to use GitLab default - * @param visibilityLevel The visibility level of the project, otherwise null indicates to use GitLab default + * @param visibility The visibility level of the project, otherwise null indicates to use GitLab default * @return the Gitlab Project * @throws IOException on gitlab api call error */ diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 5fc9d857..9040b852 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -21,38 +21,38 @@ public class GitlabProject { private String defaultBranch; private GitlabUser owner; - private boolean publicProject; + private Boolean publicProject; private String path; - @JsonProperty("visibility_level") - private Integer visibilityLevel; + @JsonProperty("visibility") + private String visibility; @JsonProperty("path_with_namespace") private String pathWithNamespace; @JsonProperty("issues_enabled") - private boolean issuesEnabled; + private Boolean issuesEnabled; @JsonProperty("merge_requests_enabled") - private boolean mergeRequestsEnabled; + private Boolean mergeRequestsEnabled; @JsonProperty("snippets_enabled") - private boolean snippetsEnabled; + private Boolean snippetsEnabled; @JsonProperty("wall_enabled") private boolean wallEnabled; @JsonProperty("wiki_enabled") - private boolean wikiEnabled; + private Boolean wikiEnabled; @JsonProperty("jobs_enabled") - private boolean jobsEnabled; + private Boolean jobsEnabled; @JsonProperty("shared_runners_enabled") - private boolean sharedRunnersEnabled; + private Boolean sharedRunnersEnabled; @JsonProperty("public_jobs") - private boolean publicJobs; + private Boolean publicJobs; @JsonProperty("runners_token") private String runnersToken; @@ -98,6 +98,30 @@ public class GitlabProject { @JsonProperty("shared_with_groups") private List sharedWithGroups; + @JsonProperty("container_registry_enabled") + private boolean containerRegistryEnabled; + + @JsonProperty("only_allow_merge_if_pipeline_succeeds") + private Boolean onlyAllowMergeIfPipelineSucceeds; + + @JsonProperty("only_allow_merge_if_all_discussions_are_resolved") + private Boolean onlyAllowMergeIfAllDiscussionsAreResolved; + + @JsonProperty("lfs_enabled") + private Boolean lfsEnabled; + + @JsonProperty("request_access_enabled") + private Boolean requestAccessEnabled; + + @JsonProperty("repository_storage") + private String repositoryStorage; + + @JsonProperty("approvals_before_merge") + private Integer approvalsBeforeMerge; + + @JsonProperty("import_url") + private String importUrl; + public Integer getId() { return id; } @@ -138,12 +162,12 @@ public void setDefaultBranch(String defaultBranch) { this.defaultBranch = defaultBranch; } - public Integer getVisibilityLevel() { - return visibilityLevel; + public String getVisibility() { + return visibility; } - public void setVisibilityLevel(Integer visibilityLevel) { - this.visibilityLevel = visibilityLevel; + public void setVisibility(String visibility) { + this.visibility = visibility; } public GitlabUser getOwner() { @@ -218,14 +242,54 @@ public void setJobsEnabled(boolean jobsEnabled) { this.jobsEnabled = jobsEnabled; } - public boolean isSharedRunnersEnabled() { + public Boolean isRequestAccessEnabled() { + return requestAccessEnabled; + } + + public void setRequestAccessEnabled(Boolean requestAccessEnabled) { + this.requestAccessEnabled = requestAccessEnabled; + } + + public Boolean isLfsEnabled() { + return lfsEnabled; + } + + public void setLfsEnabled(Boolean lfsEnabled) { + this.lfsEnabled = lfsEnabled; + } + + public Boolean isSharedRunnersEnabled() { return sharedRunnersEnabled; } - public void setSharedRunnersEnabled(boolean sharedRunnersEnabled) { + public void setSharedRunnersEnabled(Boolean sharedRunnersEnabled) { this.sharedRunnersEnabled = sharedRunnersEnabled; } + public boolean getOnlyAllowMergeIfPipelineSucceeds() { + return onlyAllowMergeIfPipelineSucceeds; + } + + public void setOnlyAllowMergeIfPipelineSucceeds(boolean onlyAllowMergeIfPipelineSucceeds) { + this.onlyAllowMergeIfPipelineSucceeds = onlyAllowMergeIfPipelineSucceeds; + } + + public boolean getOnlyAllowMergeIfAllDiscussionsAreResolved() { + return onlyAllowMergeIfAllDiscussionsAreResolved; + } + + public void setOnlyAllowMergeIfAllDiscussionsAreResolved(boolean onlyAllowMergeIfAllDiscussionsAreResolved) { + this.onlyAllowMergeIfAllDiscussionsAreResolved = onlyAllowMergeIfAllDiscussionsAreResolved; + } + + public boolean isContainerRegistryEnabled() { + return containerRegistryEnabled; + } + + public void setContainerRegistryEnabled(boolean containerRegistryEnabled) { + this.containerRegistryEnabled = containerRegistryEnabled; + } + public boolean hasPublicJobs() { return publicJobs; } @@ -361,4 +425,28 @@ public List getSharedWithGroups() { public void setSharedWithGroups(List sharedWithGroups) { this.sharedWithGroups = sharedWithGroups; } + + public String getRepositoryStorage() { + return repositoryStorage; + } + + public void setRepositoryStorage(String repositoryStorage) { + this.repositoryStorage = repositoryStorage; + } + + public Integer getApprovalsBeforeMerge() { + return approvalsBeforeMerge; + } + + public void setApprovalsBeforeMerge(Integer approvalsBeforeMerge) { + this.approvalsBeforeMerge = approvalsBeforeMerge; + } + + public String getImportUrl() { + return importUrl; + } + + public void setImportUrl(String importUrl) { + this.importUrl = importUrl; + } } From cf4bd19f60f5c647d087a87c9c62efc660608827 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Sirot Date: Mon, 12 Jun 2017 23:42:38 +0200 Subject: [PATCH 029/119] Repository file create update and delete support (#215) * Add create/update/delete Repository files * Fix create/update verb --- src/main/java/org/gitlab/api/GitlabAPI.java | 66 +++++++++++++++++++ .../models/GitlabSimpleRepositoryFile.java | 32 +++++++++ 2 files changed, 98 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/GitlabSimpleRepositoryFile.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 9c9c499b..f4eeaeb9 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1458,6 +1458,72 @@ public GitlabRepositoryFile getRepositoryFile(GitlabProject project, String path return retrieve().to(tailUrl, GitlabRepositoryFile.class); } + /** + * Creates a new file in the repository + * + * @param project The Project + * @param path The file path inside the repository + * @param branchName The name of a repository branch + * @param commitMsg The commit message + * @param content The base64 encoded content of the file + * @throws IOException on gitlab api call error + */ + public GitlabSimpleRepositoryFile createRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg, String content) throws IOException { + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files"; + GitlabHTTPRequestor requestor = dispatch(); + + return requestor + .with("file_path", sanitizePath(path)) + .with("branch_name", branchName) + .with("encoding", "base64") + .with("commit_message", commitMsg) + .with("content", content) + .to(tailUrl, GitlabSimpleRepositoryFile.class); + } + + /** + * Updates the content of an existing file in the repository + * + * @param project The Project + * @param path The file path inside the repository + * @param branchName The name of a repository branch + * @param commitMsg The commit message + * @param content The base64 encoded content of the file + * @throws IOException on gitlab api call error + */ + public GitlabSimpleRepositoryFile updateRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg, String content) throws IOException { + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files"; + GitlabHTTPRequestor requestor = retrieve().method("PUT"); + + return requestor + .with("file_path", sanitizePath(path)) + .with("branch_name", branchName) + .with("encoding", "base64") + .with("commit_message", commitMsg) + .with("content", content) + .to(tailUrl, GitlabSimpleRepositoryFile.class); + } + + /** + * Deletes an existing file in the repository + * + * @param project The Project + * @param path The file path inside the repository + * @param branchName The name of a repository branch + * @param commitMsg The commit message + * @throws IOException on gitlab api call error + */ + public GitlabSimpleRepositoryFile deleteRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg) throws IOException { + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files"; + GitlabHTTPRequestor requestor = retrieve().method("DELETE"); + + return requestor + .with("file_path", sanitizePath(path)) + .with("branch_name", branchName) + .with("commit_message", commitMsg) + .to(tailUrl, GitlabSimpleRepositoryFile.class); + } + /** * Update a Merge Request Note * diff --git a/src/main/java/org/gitlab/api/models/GitlabSimpleRepositoryFile.java b/src/main/java/org/gitlab/api/models/GitlabSimpleRepositoryFile.java new file mode 100644 index 00000000..7b48f203 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabSimpleRepositoryFile.java @@ -0,0 +1,32 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabSimpleRepositoryFile { + /* + "file_name": "app/project.rb", + "branch_name": "master" + */ + + @JsonProperty("file_name") + private String fileName; + + @JsonProperty("branch_name") + private String branchName; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getBranchName() { + return branchName; + } + + public void setBranchName(String branchName) { + this.branchName = branchName; + } +} From ea2c1c38582d4a748b0f99d2048dd4032562b3e8 Mon Sep 17 00:00:00 2001 From: Brian Krische Date: Mon, 26 Jun 2017 13:17:43 -0500 Subject: [PATCH 030/119] RepositoryTree, Branches, and Tags lists are paginated in the v4 api. (#217) * RepositoryTree, Branches, and Tags lists are paginated in the v4 api. * Add the maximum per_page parameter to the query. --- src/main/java/org/gitlab/api/GitlabAPI.java | 25 +++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index f4eeaeb9..37eeb7eb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1440,14 +1440,13 @@ public byte[] getFileArchive(GitlabProject project) throws IOException { * @throws IOException on gitlab api call error */ public List getRepositoryTree(GitlabProject project, String path, String ref, boolean recursive) throws IOException { - Query query = new Query() + Query query = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery() .appendIf("path", path) .appendIf("ref", ref) .appendIf("recursive", recursive); String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository" + GitlabRepositoryTree.URL + query.toString(); - GitlabRepositoryTree[] tree = retrieve().to(tailUrl, GitlabRepositoryTree[].class); - return Arrays.asList(tree); + return retrieve().getAll(tailUrl, GitlabRepositoryTree[].class); } public GitlabRepositoryFile getRepositoryFile(GitlabProject project, String path, String ref) throws IOException { @@ -1564,15 +1563,13 @@ public void deleteNote(GitlabMergeRequest mergeRequest, GitlabNote noteToDelete) } public List getBranches(Serializable projectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL; - GitlabBranch[] branches = retrieve().to(tailUrl, GitlabBranch[].class); - return Arrays.asList(branches); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabBranch[].class); } public List getBranches(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL; - GitlabBranch[] branches = retrieve().to(tailUrl, GitlabBranch[].class); - return Arrays.asList(branches); + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabBranch[].class); } /** @@ -2334,9 +2331,8 @@ public List getCommitComments(Integer projectId, String sha) thro * @throws IOException on gitlab api call error */ public List getTags(Serializable projectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL; - GitlabTag[] tags = retrieve().to(tailUrl, GitlabTag[].class); - return Arrays.asList(tags); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabTag[].class); } /** @@ -2347,9 +2343,8 @@ public List getTags(Serializable projectId) throws IOException { * @throws IOException on gitlab api call error */ public List getTags(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabTag.URL; - GitlabTag[] tags = retrieve().to(tailUrl, GitlabTag[].class); - return Arrays.asList(tags); + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabTag.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabTag[].class); } /** From 61b57a7ca0303c17baca41bd9716f8f4976ce07e Mon Sep 17 00:00:00 2001 From: Brian Krische Date: Mon, 26 Jun 2017 13:18:04 -0500 Subject: [PATCH 031/119] Add method to share and un-share project with a group. (#218) * Add method to share and un-share project with a group. * Add another method to delete shared group link with ID numbers only. --- src/main/java/org/gitlab/api/GitlabAPI.java | 42 +++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 37eeb7eb..7962cf8d 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2786,6 +2786,48 @@ public List searchProjects(String search) throws IOException { return Arrays.asList(response); } + /** + * Share a project with a group. + * + * @param accessLevel The permissions level to grant the group. + * @param group The group to share with. + * @param project The project to be shared. + * @param expiration Share expiration date in ISO 8601 format: 2016-09-26 or {@code null}. + * @throws IOException on gitlab api call error + */ + public void shareProjectWithGroup(GitlabAccessLevel accessLevel, String expiration, GitlabGroup group, GitlabProject project) throws IOException { + Query query = new Query() + .append("group_id", group.getId().toString()) + .append("group_access", String.valueOf(accessLevel.accessValue)) + .appendIf("expires_at", expiration); + + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/share" + query.toString(); + dispatch().to(tailUrl, Void.class); + } + + /** + * Delete a shared project link within a group. + * + * @param group The group. + * @param project The project. + * @throws IOException on gitlab api call error + */ + public void deleteSharedProjectGroupLink(GitlabGroup group, GitlabProject project) throws IOException { + deleteSharedProjectGroupLink(group.getId(), project.getId()); + } + + /** + * Delete a shared project link within a group. + * + * @param groupId The group id number. + * @param projectId The project id number. + * @throws IOException on gitlab api call error + */ + public void deleteSharedProjectGroupLink(int groupId, int projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + projectId + "/share/" + groupId; + retrieve().method("DELETE").to(tailUrl, Void.class); + } + /** * Set the User-Agent header for the requests. * From 10fc14cdb4af8de2edce6a9df5dce041b730e244 Mon Sep 17 00:00:00 2001 From: Brian Krische Date: Mon, 26 Jun 2017 13:18:20 -0500 Subject: [PATCH 032/119] `request_enabled` property on projects changed to `request_access_enabled`. (#219) --- 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 7962cf8d..6c9be5fb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -775,7 +775,7 @@ public GitlabProject createProject(GitlabProject project) throws IOException { .appendIf("only_allow_merge_if_pipeline_succeeds", project.getOnlyAllowMergeIfPipelineSucceeds()) .appendIf("only_allow_merge_if_all_discussions_are_resolved", project.getOnlyAllowMergeIfAllDiscussionsAreResolved()) .appendIf("lfs_enabled", project.isLfsEnabled()) - .appendIf("request_enabled", project.isRequestAccessEnabled()) + .appendIf("request_access_enabled", project.isRequestAccessEnabled()) .appendIf("repository_storage", project.getRepositoryStorage()) .appendIf("approvals_before_merge", project.getApprovalsBeforeMerge()); From 149bcea8a0be66dd820ff47dc26d55f8bc808b1a Mon Sep 17 00:00:00 2001 From: Emilien Mottet Date: Fri, 28 Jul 2017 01:44:48 +0200 Subject: [PATCH 033/119] use openjdk8 (#231) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6b481f2..87800ef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required services: - docker jdk: -- oraclejdk7 +- oraclejdk8 install: - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip script: From 90c9f2ae8d1608a98498d6cb283dc3257d9383c0 Mon Sep 17 00:00:00 2001 From: Emilien Mottet Date: Fri, 28 Jul 2017 23:34:44 +0200 Subject: [PATCH 034/119] add hashcode in GitlabCommit & GitlabCommitStatus (#230) --- src/main/java/org/gitlab/api/models/GitlabCommit.java | 5 +++++ src/main/java/org/gitlab/api/models/GitlabCommitStatus.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/org/gitlab/api/models/GitlabCommit.java b/src/main/java/org/gitlab/api/models/GitlabCommit.java index 60da1a68..0fb5812d 100644 --- a/src/main/java/org/gitlab/api/models/GitlabCommit.java +++ b/src/main/java/org/gitlab/api/models/GitlabCommit.java @@ -126,4 +126,9 @@ public boolean equals(Object obj) { return false; } } + + @Override + public int hashCode() { + return this.getId().hashCode(); + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabCommitStatus.java b/src/main/java/org/gitlab/api/models/GitlabCommitStatus.java index 3eb726c9..1505246d 100644 --- a/src/main/java/org/gitlab/api/models/GitlabCommitStatus.java +++ b/src/main/java/org/gitlab/api/models/GitlabCommitStatus.java @@ -128,4 +128,9 @@ public boolean equals(Object obj) { return false; } } + + @Override + public int hashCode() { + return this.getId().hashCode(); + } } From 4769949aa463d749a867779e127999a54d1a9ea4 Mon Sep 17 00:00:00 2001 From: Mustafa YILDIRIM Date: Sat, 29 Jul 2017 00:35:12 +0300 Subject: [PATCH 035/119] Add jira service (#220) --- src/main/java/org/gitlab/api/GitlabAPI.java | 59 +++++++++ .../api/models/GitlabJiraProperties.java | 48 +++++++ .../gitlab/api/models/GitlabServiceJira.java | 124 ++++++++++++++++++ 3 files changed, 231 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/GitlabJiraProperties.java create mode 100644 src/main/java/org/gitlab/api/models/GitlabServiceJira.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 6c9be5fb..eda09a18 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2771,6 +2771,65 @@ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws return retrieve().method("PUT").to(tailUrl, Boolean.class); } + /** + * Get JIRA service settings for a project. + * https://docs.gitlab.com/ce/api/services.html#get-jira-service-settings + * + * @param projectId The ID of the project containing the variable. + * @return + * @throws IOException + */ + public GitlabServiceJira getJiraService(Integer projectId) throws IOException{ + String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL; + return retrieve().to(tailUrl, GitlabServiceJira.class); + } + + /** + * Remove all previously JIRA settings from a project. + * https://docs.gitlab.com/ce/api/services.html#delete-jira-service + * + * @param projectId The ID of the project containing the variable. + * @return + * @throws IOException + */ + public boolean deleteJiraService(Integer projectId) throws IOException{ + String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL; + return retrieve().method("DELETE").to(tailUrl, Boolean.class); + } + + /** + * Set JIRA service for a project. + * https://docs.gitlab.com/ce/api/services.html#create-edit-jira-service + * + * @param projectId The ID of the project containing the variable. + * @param jiraPropties + * @return + * @throws IOException + */ + public boolean createOrEditJiraService(Integer projectId, GitlabJiraProperties jiraPropties) throws IOException{ + + Query query = new Query() + .appendIf("url", jiraPropties.getUrl()) + .appendIf("project_key", jiraPropties.getProjectKey()); + + if(!jiraPropties.getUsername().isEmpty()){ + query.appendIf("username", jiraPropties.getUsername()); + } + + if(!jiraPropties.getPassword().isEmpty()){ + query.appendIf("password", jiraPropties.getPassword()); + } + + if(jiraPropties.getIssueTransitionId() != null){ + query.appendIf("jira_issue_transition_id", jiraPropties.getIssueTransitionId()); + } + + + String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL+ query.toString(); + return retrieve().method("PUT").to(tailUrl, Boolean.class); + + } + /** * * Get a list of projects accessible by the authenticated user by search. diff --git a/src/main/java/org/gitlab/api/models/GitlabJiraProperties.java b/src/main/java/org/gitlab/api/models/GitlabJiraProperties.java new file mode 100644 index 00000000..1702acf5 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabJiraProperties.java @@ -0,0 +1,48 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabJiraProperties { + + private String url; + + @JsonProperty("project_key") + private String projectKey; + + private String username; + private String password; + + @JsonProperty("jira_issue_transition_id") + private Integer issueTransitionId; + + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getProjectKey() { + return projectKey; + } + public void setProjectKey(String projectKey) { + this.projectKey = projectKey; + } + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + public Integer getIssueTransitionId() { + return issueTransitionId; + } + public void setIssueTransitionId(Integer issueTransitionId) { + this.issueTransitionId = issueTransitionId; + } +} diff --git a/src/main/java/org/gitlab/api/models/GitlabServiceJira.java b/src/main/java/org/gitlab/api/models/GitlabServiceJira.java new file mode 100644 index 00000000..159fa239 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabServiceJira.java @@ -0,0 +1,124 @@ +package org.gitlab.api.models; + +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabServiceJira { + + public static final String URL = "/services/jira/"; + + private Integer id; + private String title; + + @JsonProperty("created_at") + private Date createdAt; + + @JsonProperty("updated_at") + private Date updatedAt; + + private boolean active; + private boolean push_events; + private boolean issues_events; + private boolean merge_requests_events; + private boolean tag_push_events; + private boolean note_events; + private boolean build_events; + private GitlabJiraProperties properties; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public boolean isActive() { + return active; + } + + public void setActive(boolean active) { + this.active = active; + } + + public boolean isPushEvents() { + return push_events; + } + + public void setPushEvents(boolean push_events) { + this.push_events = push_events; + } + + public boolean isIssuesEvents() { + return issues_events; + } + + public void setIssuesEvents(boolean issues_events) { + this.issues_events = issues_events; + } + + public boolean isMergeRequestsEvents() { + return merge_requests_events; + } + + public void setMergeRequestsEvents(boolean merge_requests_events) { + this.merge_requests_events = merge_requests_events; + } + + public boolean isTagPushEvents() { + return tag_push_events; + } + + public void setTagPushEvents(boolean tag_push_events) { + this.tag_push_events = tag_push_events; + } + + public boolean isNoteEvents() { + return note_events; + } + + public void setNoteEvents(boolean note_events) { + this.note_events = note_events; + } + + public boolean isBuildEvents() { + return build_events; + } + + public void setBuildEvents(boolean build_events) { + this.build_events = build_events; + } + + public GitlabJiraProperties getProperties() { + return properties; + } + public void setProperties(GitlabJiraProperties properties) { + this.properties = properties; + } + +} From 0db8393d33e653614e87c2bf8db26b0df291d994 Mon Sep 17 00:00:00 2001 From: Denny Ayard Date: Fri, 15 Sep 2017 13:06:58 -0400 Subject: [PATCH 036/119] Custom createUser requests supported (#233) --- src/main/java/org/gitlab/api/GitlabAPI.java | 11 + .../gitlab/api/models/CreateUserRequest.java | 258 ++++++++++++++++++ 2 files changed, 269 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/CreateUserRequest.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index eda09a18..edf97ddb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -207,6 +207,17 @@ public GitlabUser createUser(String email, String password, String username, return dispatch().to(tailUrl, GitlabUser.class); } + + /** + * Create a new user. This may succeed only if the requester is an administrator. + * @param request An object that represents the parameters for the request. + * @return {@link GitlabUser} + * @throws IOException on gitlab api call error + */ + public GitlabUser createUser(CreateUserRequest request) throws IOException { + String tailUrl = GitlabUser.USERS_URL + request.toQuery().toString(); + return dispatch().to(tailUrl, GitlabUser.class); + } /** diff --git a/src/main/java/org/gitlab/api/models/CreateUserRequest.java b/src/main/java/org/gitlab/api/models/CreateUserRequest.java new file mode 100644 index 00000000..0880e029 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/CreateUserRequest.java @@ -0,0 +1,258 @@ +package org.gitlab.api.models; + +import java.io.UnsupportedEncodingException; +import org.gitlab.api.http.Query; + +/** + * Model for customized creater-user requests. + * + */ +public class CreateUserRequest { + + private String email; + private String password; + private Boolean resetPassword; + private String username; + private String name; + private String skype; + private String linkedin; + private String twitter; + private String websiteUrl; + private String organization; + private Integer projectsLimit; + private String externUid; + private String provider; + private String bio; + private String location; + private Boolean admin; + private Boolean canCreateGroup; + private Boolean skipConfirmation; + private Boolean external; + private String avatar; + + /** + * The only constructor. The constructor demands the required fields for the request. + * + * @param name The user's name. + * @param username The user's display name. + * @param email The user's email. + */ + public CreateUserRequest(String name, String username, String email){ + this.name = name; + this.username = username; + this.email = email; + } + + /** + * Generates a query based on this request's properties. + * @return {@link Query} + * @throws UnsupportedEncodingException + */ + public Query toQuery() throws UnsupportedEncodingException{ + return new Query() + .appendIf("email", email) + .appendIf("password", password) + .appendIf("reset_password", resetPassword) + .appendIf("username", username) + .appendIf("name", name) + .appendIf("skype", skype) + .appendIf("linkedin", linkedin) + .appendIf("twitter", twitter) + .appendIf("website_url", websiteUrl) + .appendIf("organization", organization) + .appendIf("projects_limit", projectsLimit) + .appendIf("extern_uid", externUid) + .appendIf("provider", provider) + .appendIf("bio", bio) + .appendIf("location", location) + .appendIf("admin", admin) + .appendIf("can_create_group", canCreateGroup) + .appendIf("skip_confirmation", skipConfirmation) + .appendIf("external", external) + .appendIf("avatar", avatar); + + } + + public String getEmail() { + return email; + } + + public CreateUserRequest setEmail(String email) { + this.email = email; + return this; + } + + public String getPassword() { + return password; + } + + public CreateUserRequest setPassword(String password) { + this.password = password; + return this; + } + + public Boolean getResetPassword() { + return resetPassword; + } + + public CreateUserRequest setResetPassword(Boolean resetPassword) { + this.resetPassword = resetPassword; + return this; + } + + public String getUsername() { + return username; + } + + public CreateUserRequest setUsername(String username) { + this.username = username; + return this; + } + + public String getName() { + return name; + } + + public CreateUserRequest setName(String name) { + this.name = name; + return this; + } + + public String getSkype() { + return skype; + } + + public CreateUserRequest setSkype(String skype) { + this.skype = skype; + return this; + } + + public String getLinkedin() { + return linkedin; + } + + public CreateUserRequest setLinkedin(String linkedin) { + this.linkedin = linkedin; + return this; + } + + public String getTwitter() { + return twitter; + } + + public CreateUserRequest setTwitter(String twitter) { + this.twitter = twitter; + return this; + } + + public String getWebsiteUrl() { + return websiteUrl; + } + + public CreateUserRequest setWebsiteUrl(String websiteUrl) { + this.websiteUrl = websiteUrl; + return this; + } + + public String getOrganization() { + return organization; + } + + public CreateUserRequest setOrganization(String organization) { + this.organization = organization; + return this; + } + + public Integer getProjectsLimit() { + return projectsLimit; + } + + public CreateUserRequest setProjectsLimit(Integer projectsLimit) { + this.projectsLimit = projectsLimit; + return this; + } + + public String getExternUid() { + return externUid; + } + + public CreateUserRequest setExternUid(String externUid) { + this.externUid = externUid; + return this; + } + + public String getProvider() { + return provider; + } + + public CreateUserRequest setProvider(String provider) { + this.provider = provider; + return this; + } + + public String getBio() { + return bio; + } + + public CreateUserRequest setBio(String bio) { + this.bio = bio; + return this; + } + + public String getLocation() { + return location; + } + + public CreateUserRequest setLocation(String location) { + this.location = location; + return this; + } + + public Boolean getAdmin() { + return admin; + } + + public CreateUserRequest setAdmin(Boolean admin) { + this.admin = admin; + return this; + } + + public Boolean getCanCreateGroup() { + return canCreateGroup; + } + + public CreateUserRequest setCanCreateGroup(Boolean canCreateGroup) { + this.canCreateGroup = canCreateGroup; + return this; + } + + public Boolean getSkipConfirmation() { + return skipConfirmation; + } + + public CreateUserRequest setSkipConfirmation(Boolean skipConfirmation) { + this.skipConfirmation = skipConfirmation; + return this; + } + + public Boolean getExternal() { + return external; + } + + public CreateUserRequest setExternal(Boolean external) { + this.external = external; + return this; + } + + public String getAvatar() { + return avatar; + } + + public CreateUserRequest setAvatar(String avatar) { + this.avatar = avatar; + return this; + } + + + +} From a72d102bd9ef82c2a45ea09046a6b7618c0ce051 Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Fri, 15 Sep 2017 13:07:20 -0400 Subject: [PATCH 037/119] Add a project flag to the api (#224) * all properties need to be nullable * Add printing_merge_request_link_enabled to projects This was added upstream at: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12240 --- src/main/java/org/gitlab/api/GitlabAPI.java | 3 +- .../org/gitlab/api/models/GitlabProject.java | 66 +++++++++++-------- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index edf97ddb..7df80899 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -788,7 +788,8 @@ public GitlabProject createProject(GitlabProject project) throws IOException { .appendIf("lfs_enabled", project.isLfsEnabled()) .appendIf("request_access_enabled", project.isRequestAccessEnabled()) .appendIf("repository_storage", project.getRepositoryStorage()) - .appendIf("approvals_before_merge", project.getApprovalsBeforeMerge()); + .appendIf("approvals_before_merge", project.getApprovalsBeforeMerge()) + .appendIf("printing_merge_request_link_enabled", project.isPrintingMergeRequestLinkEnabled()); GitlabNamespace namespace = project.getNamespace(); if (namespace != null) { diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 9040b852..f573175c 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -40,7 +40,7 @@ public class GitlabProject { private Boolean snippetsEnabled; @JsonProperty("wall_enabled") - private boolean wallEnabled; + private Boolean wallEnabled; @JsonProperty("wiki_enabled") private Boolean wikiEnabled; @@ -73,7 +73,7 @@ public class GitlabProject { private Date lastActivityAt; @JsonProperty("archived") - private boolean archived; + private Boolean archived; private GitlabNamespace namespace; @@ -99,7 +99,7 @@ public class GitlabProject { private List sharedWithGroups; @JsonProperty("container_registry_enabled") - private boolean containerRegistryEnabled; + private Boolean containerRegistryEnabled; @JsonProperty("only_allow_merge_if_pipeline_succeeds") private Boolean onlyAllowMergeIfPipelineSucceeds; @@ -122,6 +122,9 @@ public class GitlabProject { @JsonProperty("import_url") private String importUrl; + @JsonProperty("is_printing_merge_request_link_enabled") + private Boolean printingMergeRequestLinkEnabled; + public Integer getId() { return id; } @@ -194,51 +197,51 @@ public void setPathWithNamespace(String pathWithNamespace) { this.pathWithNamespace = pathWithNamespace; } - public boolean isIssuesEnabled() { + public Boolean isIssuesEnabled() { return issuesEnabled; } - public void setIssuesEnabled(boolean issuesEnabled) { + public void setIssuesEnabled(Boolean issuesEnabled) { this.issuesEnabled = issuesEnabled; } - public boolean isMergeRequestsEnabled() { + public Boolean isMergeRequestsEnabled() { return mergeRequestsEnabled; } - public void setMergeRequestsEnabled(boolean mergeRequestsEnabled) { + public void setMergeRequestsEnabled(Boolean mergeRequestsEnabled) { this.mergeRequestsEnabled = mergeRequestsEnabled; } - public boolean isSnippetsEnabled() { + public Boolean isSnippetsEnabled() { return snippetsEnabled; } - public void setSnippetsEnabled(boolean snippetsEnabled) { + public void setSnippetsEnabled(Boolean snippetsEnabled) { this.snippetsEnabled = snippetsEnabled; } - public boolean isWallEnabled() { + public Boolean isWallEnabled() { return wallEnabled; } - public void setWallEnabled(boolean wallEnabled) { + public void setWallEnabled(Boolean wallEnabled) { this.wallEnabled = wallEnabled; } - public boolean isWikiEnabled() { + public Boolean isWikiEnabled() { return wikiEnabled; } - public void setWikiEnabled(boolean wikiEnabled) { + public void setWikiEnabled(Boolean wikiEnabled) { this.wikiEnabled = wikiEnabled; } - public boolean isJobsEnabled() { + public Boolean isJobsEnabled() { return jobsEnabled; } - public void setJobsEnabled(boolean jobsEnabled) { + public void setJobsEnabled(Boolean jobsEnabled) { this.jobsEnabled = jobsEnabled; } @@ -266,35 +269,35 @@ public void setSharedRunnersEnabled(Boolean sharedRunnersEnabled) { this.sharedRunnersEnabled = sharedRunnersEnabled; } - public boolean getOnlyAllowMergeIfPipelineSucceeds() { + public Boolean getOnlyAllowMergeIfPipelineSucceeds() { return onlyAllowMergeIfPipelineSucceeds; } - public void setOnlyAllowMergeIfPipelineSucceeds(boolean onlyAllowMergeIfPipelineSucceeds) { + public void setOnlyAllowMergeIfPipelineSucceeds(Boolean onlyAllowMergeIfPipelineSucceeds) { this.onlyAllowMergeIfPipelineSucceeds = onlyAllowMergeIfPipelineSucceeds; } - public boolean getOnlyAllowMergeIfAllDiscussionsAreResolved() { + public Boolean getOnlyAllowMergeIfAllDiscussionsAreResolved() { return onlyAllowMergeIfAllDiscussionsAreResolved; } - public void setOnlyAllowMergeIfAllDiscussionsAreResolved(boolean onlyAllowMergeIfAllDiscussionsAreResolved) { + public void setOnlyAllowMergeIfAllDiscussionsAreResolved(Boolean onlyAllowMergeIfAllDiscussionsAreResolved) { this.onlyAllowMergeIfAllDiscussionsAreResolved = onlyAllowMergeIfAllDiscussionsAreResolved; } - public boolean isContainerRegistryEnabled() { + public Boolean isContainerRegistryEnabled() { return containerRegistryEnabled; } - public void setContainerRegistryEnabled(boolean containerRegistryEnabled) { + public void setContainerRegistryEnabled(Boolean containerRegistryEnabled) { this.containerRegistryEnabled = containerRegistryEnabled; } - public boolean hasPublicJobs() { + public Boolean hasPublicJobs() { return publicJobs; } - public void setPublicJobs(boolean publicJobs) { + public void setPublicJobs(Boolean publicJobs) { this.publicJobs = publicJobs; } @@ -346,19 +349,19 @@ public void setNamespace(GitlabNamespace namespace) { this.namespace = namespace; } - public boolean isPublic() { + public Boolean isPublic() { return publicProject; } - public void setPublic(boolean aPublic) { + public void setPublic(Boolean aPublic) { publicProject = aPublic; } - public boolean isArchived() { + public Boolean isArchived() { return archived; } - public void setArchived(boolean archived) { + public void setArchived(Boolean archived) { this.archived = archived; } @@ -449,4 +452,13 @@ public String getImportUrl() { public void setImportUrl(String importUrl) { this.importUrl = importUrl; } + + public Boolean isPrintingMergeRequestLinkEnabled() { + return printingMergeRequestLinkEnabled; + } + + public void setPrintingMergeRequestLinkEnabled(Boolean printingMergeRequestLinkEnabled) { + this.printingMergeRequestLinkEnabled = printingMergeRequestLinkEnabled; + } + } From 0de8580915ee649799f58f00db6f3f5c205fbbd5 Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Fri, 15 Sep 2017 13:08:03 -0400 Subject: [PATCH 038/119] all properties need to be nullable (#214) From 3fb72c8f80dd40fce2738f0a6cd2db550d9a1d7f Mon Sep 17 00:00:00 2001 From: Denny Ayard Date: Fri, 15 Sep 2017 13:08:56 -0400 Subject: [PATCH 039/119] Fix for Setting a new Group's Visibility (#234) * Updated getGroup to better support path arguments * Fix for setting new-group visiblity --- src/main/java/org/gitlab/api/GitlabAPI.java | 26 ++++--------- .../gitlab/api/models/CreateGroupRequest.java | 37 ++++++++++++++++--- .../gitlab/api/models/GitlabVisibility.java | 20 ++++++++++ 3 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 src/main/java/org/gitlab/api/models/GitlabVisibility.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 7df80899..ca672a42 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; + import org.gitlab.api.http.GitlabHTTPRequestor; import org.gitlab.api.http.Query; import org.gitlab.api.models.*; @@ -375,7 +376,7 @@ public GitlabGroup getGroup(Integer groupId) throws IOException { * @throws IOException */ public GitlabGroup getGroup(String path) throws IOException { - String tailUrl = GitlabGroup.URL + "/" + path; + String tailUrl = GitlabGroup.URL + "/" + URLEncoder.encode(path, "UTF-8"); return retrieve().to(tailUrl, GitlabGroup.class); } @@ -499,27 +500,16 @@ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAc /** * Creates a Group * - * @param request The project-creation request - * @param sudoUser The user to create the group on behalf of + * @param request An object that represents the parameters for the request. + * @param sudoUser The user for whom we're creating the group * * @return The GitLab Group * @throws IOException on gitlab api call error */ - public GitlabGroup createGroup(CreateGroupRequest request, GitlabUser sudoUser) throws IOException { - - Query query = new Query() - .append("name", request.getName()) - .append("path", request.getPath()) - .appendIf("ldap_cn", request.getLdapCn()) - .appendIf("description", request.getDescription()) - .appendIf("membershipLock", request.getMembershipLock()) - .appendIf("share_with_group_lock", request.getShareWithGroupLock()) - .appendIf("visibility", request.getVisibility()) - .appendIf("lfs_enabled", request.getLfsEnabled()) - .appendIf("request_access_enabled", request.getRequestAccessEnabled()) - .appendIf("parent_id", request.getParentId()) - .appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null); - + public GitlabGroup createGroup(CreateGroupRequest request, GitlabUser sudoUser) throws IOException { + Query query = request.toQuery(); + query.appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null); + String tailUrl = GitlabGroup.URL + query.toString(); return dispatch().to(tailUrl, GitlabGroup.class); diff --git a/src/main/java/org/gitlab/api/models/CreateGroupRequest.java b/src/main/java/org/gitlab/api/models/CreateGroupRequest.java index 6464b481..baf5554c 100644 --- a/src/main/java/org/gitlab/api/models/CreateGroupRequest.java +++ b/src/main/java/org/gitlab/api/models/CreateGroupRequest.java @@ -1,15 +1,21 @@ package org.gitlab.api.models; +import java.io.UnsupportedEncodingException; +import org.gitlab.api.http.Query; +/** + * The model for custom group-creation requests. + * + */ public class CreateGroupRequest { public CreateGroupRequest(String name) { - this(name, name); + this(name, name); } public CreateGroupRequest(String name, String path) { - this.name = name; - this.path = path; + this.name = name; + this.path = path; } private String name; @@ -18,10 +24,29 @@ public CreateGroupRequest(String name, String path) { private String description; private Boolean membershipLock; private Boolean shareWithGroupLock; - private Boolean visibility; + private GitlabVisibility visibility; private Boolean lfsEnabled; private Boolean requestAccessEnabled; private Integer parentId; + + /** + * Generates query representing this request's properties. + * @return {@link Query} + * @throws UnsupportedEncodingException + */ + public Query toQuery() throws UnsupportedEncodingException{ + return new Query() + .append("name", name) + .append("path", path) + .appendIf("ldap_cn", ldapCn) + .appendIf("description", description) + .appendIf("membershipLock", membershipLock) + .appendIf("share_with_group_lock", shareWithGroupLock) + .appendIf("visibility", visibility != null ? visibility.toString() : null) + .appendIf("lfs_enabled", lfsEnabled) + .appendIf("request_access_enabled", requestAccessEnabled) + .appendIf("parent_id", parentId); + } public String getName() { return name; @@ -76,11 +101,11 @@ public CreateGroupRequest setShareWithGroupLock(Boolean shareWithGroupLock) { return this; } - public Boolean getVisibility() { + public GitlabVisibility getVisibility() { return visibility; } - public CreateGroupRequest setVisibility(Boolean visibility) { + public CreateGroupRequest setVisibility(GitlabVisibility visibility) { this.visibility = visibility; return this; } diff --git a/src/main/java/org/gitlab/api/models/GitlabVisibility.java b/src/main/java/org/gitlab/api/models/GitlabVisibility.java new file mode 100644 index 00000000..fa209336 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabVisibility.java @@ -0,0 +1,20 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Enum for the privacy settings supported by GitLab API v4. + */ +public enum GitlabVisibility { + PRIVATE, INTERNAL, PUBLIC; + + /** + * Returns lower-case of {@link #name()}. Lower-case is required for requests + * that accept a visiblity parameter. + */ + @Override + @JsonValue + public String toString() { + return name().toLowerCase(); + } +} \ No newline at end of file From 20526fb0b22ccd4a1c86d98b0f9298167e44d7b1 Mon Sep 17 00:00:00 2001 From: Sergey Sobko Date: Fri, 15 Sep 2017 20:09:27 +0300 Subject: [PATCH 040/119] Milestones API: Add start_date field (#227) --- src/main/java/org/gitlab/api/GitlabAPI.java | 26 +++++++++++++------ .../gitlab/api/models/GitlabMilestone.java | 11 ++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index ca672a42..34b8b0d8 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1932,6 +1932,7 @@ public List getMilestones(Serializable projectId) throws IOExce * @param title The title of the milestone. * @param description The description of the milestone. (Optional) * @param dueDate The date the milestone is due. (Optional) + * @param startDate The start date of the milestone. (Optional) * @return The newly created, de-serialized milestone. * @throws IOException */ @@ -1939,16 +1940,19 @@ public GitlabMilestone createMilestone( Serializable projectId, String title, String description, - Date dueDate) throws IOException { + Date dueDate, + Date startDate) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabMilestone.URL; GitlabHTTPRequestor requestor = dispatch().with("title", title); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); if (description != null) { requestor = requestor.with("description", description); } if (dueDate != null) { - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - String formatted = formatter.format(dueDate); - requestor = requestor.with("due_date", formatted); + requestor = requestor.with("due_date", formatter.format(dueDate)); + } + if (startDate != null) { + requestor = requestor.with("start_date", formatter.format(startDate)); } return requestor.to(tailUrl, GitlabMilestone.class); } @@ -1966,7 +1970,8 @@ public GitlabMilestone createMilestone( String title = milestone.getTitle(); String description = milestone.getDescription(); Date dateDue = milestone.getDueDate(); - return createMilestone(projectId, title, description, dateDue); + Date dateStart = milestone.getStartDate(); + return createMilestone(projectId, title, description, dateDue, dateStart); } /** @@ -1976,6 +1981,7 @@ public GitlabMilestone createMilestone( * @param title The title of the milestone. (Optional) * @param description The description of the milestone. (Optional) * @param dueDate The date the milestone is due. (Optional) + * @param startDate The start date of the milestone. (Optional) * @param stateEvent A value used to update the state of the milestone. * (Optional) (activate | close) * @return The updated, de-serialized milestone. @@ -1987,12 +1993,14 @@ public GitlabMilestone updateMilestone( String title, String description, Date dueDate, + Date startDate, String stateEvent) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabMilestone.URL + "/" + milestoneId; GitlabHTTPRequestor requestor = retrieve().method("PUT"); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); if (title != null) { requestor.with("title", title); } @@ -2000,9 +2008,10 @@ public GitlabMilestone updateMilestone( requestor = requestor.with("description", description); } if (dueDate != null) { - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - String formatted = formatter.format(dueDate); - requestor = requestor.with("due_date", formatted); + requestor = requestor.with("due_date", formatter.format(dueDate)); + } + if (startDate != null) { + requestor = requestor.with("start_date", formatter.format(startDate)); } if (stateEvent != null) { requestor.with("state_event", stateEvent); @@ -2028,6 +2037,7 @@ public GitlabMilestone updateMilestone( edited.getTitle(), edited.getDescription(), edited.getDueDate(), + edited.getStartDate(), stateEvent); } diff --git a/src/main/java/org/gitlab/api/models/GitlabMilestone.java b/src/main/java/org/gitlab/api/models/GitlabMilestone.java index de91ffd4..f13de77d 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMilestone.java +++ b/src/main/java/org/gitlab/api/models/GitlabMilestone.java @@ -22,6 +22,9 @@ public class GitlabMilestone { @JsonProperty("due_date") private Date dueDate; + @JsonProperty("start_date") + private Date startDate; + private String state; @JsonProperty("updated_date") @@ -78,6 +81,14 @@ public void setDueDate(Date dueDate) { this.dueDate = dueDate; } + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + public String getState() { return state; } From b40a44e5f309133c16da2086fb158887e0ab6236 Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Fri, 15 Sep 2017 13:10:23 -0400 Subject: [PATCH 041/119] merge request approvals (#236) --- src/main/java/org/gitlab/api/GitlabAPI.java | 10 ++ .../gitlab/api/models/GitlabApprovedBy.java | 19 +++ .../models/GitlabMergeRequestApprovals.java | 146 ++++++++++++++++++ .../org/gitlab/api/models/GitlabUser.java | 2 +- 4 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/gitlab/api/models/GitlabApprovedBy.java create mode 100644 src/main/java/org/gitlab/api/models/GitlabMergeRequestApprovals.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 34b8b0d8..4028629d 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1077,6 +1077,16 @@ public List getAllMergeRequests(GitlabProject project) throw return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } + /** + * Get information about the approvals present and required for a merge request + * EE only. + */ + public GitlabMergeRequestApprovals getMergeRequestApprovals(GitlabMergeRequest mr) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(mr.getTargetProjectId()) + + GitlabMergeRequest.URL + "/" + mr.getIid() + GitlabMergeRequestApprovals.URL; + return retrieve().to(tailUrl, GitlabMergeRequestApprovals.class); + } + /** * Cherry picks a commit. * diff --git a/src/main/java/org/gitlab/api/models/GitlabApprovedBy.java b/src/main/java/org/gitlab/api/models/GitlabApprovedBy.java new file mode 100644 index 00000000..1c5f8937 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabApprovedBy.java @@ -0,0 +1,19 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Incomprehensibly, Gitlab packages "approved_by" in a wrapper which contains a user + * and nothing else. + */ +public class GitlabApprovedBy { + private GitlabUser user; + + public GitlabUser getUser() { + return user; + } + + public void setUser(GitlabUser user) { + this.user = user; + } +} diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequestApprovals.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequestApprovals.java new file mode 100644 index 00000000..84069fed --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequestApprovals.java @@ -0,0 +1,146 @@ +package org.gitlab.api.models; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabMergeRequestApprovals { + public static final String URL = "/approvals"; + + private Integer id; + private Integer iid; + @JsonProperty("project_id") + private Integer projectId; + private String title; + private String description; + private String state; + + @JsonProperty("updated_at") + private Date updatedAt; + + @JsonProperty("created_at") + private Date createdAt; + + @JsonProperty("merge_status") + private String mergeStatus; + + @JsonProperty("approvals_required") + private Integer approvalsRequired; + + @JsonProperty("approvals_left") + private Integer approvalsLeft; + + @JsonProperty("approved_by") + private List approvedBy; + + @JsonProperty("suggested_approvers") + private List suggestedApprovers; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getIid() { + return iid; + } + + public void setIid(Integer iid) { + this.iid = iid; + } + + public Integer getProjectId() { + return projectId; + } + + public void setProjectId(Integer projectId) { + this.projectId = projectId; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getDescription() { + return description; + } + + public void setDescription(String d) { + description = d; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public String getMergeStatus() { + return mergeStatus; + } + + public void setMergeStatus(String mergeStatus) { + this.mergeStatus = mergeStatus; + } + + public Integer getApprovalsRequired() { + return approvalsRequired; + } + + public void setApprovalsRequired(Integer approvalsRequired) { + this.approvalsRequired = approvalsRequired; + } + + public Integer getApprovalsLeft() { + return approvalsLeft; + } + + public void setApprovalsLeft(Integer approvalsLeft) { + this.approvalsLeft = approvalsLeft; + } + + public List getApprovedBy() { + return approvedBy; + } + + public void setApprovedBy(List approvedBy) { + this.approvedBy = approvedBy; + } + + public List getSuggestedApprovers() { + return suggestedApprovers; + } + + public void setSuggestedApprovers(List suggestedApprovers) { + this.suggestedApprovers = suggestedApprovers; + } +} diff --git a/src/main/java/org/gitlab/api/models/GitlabUser.java b/src/main/java/org/gitlab/api/models/GitlabUser.java index 777b979d..58e527e9 100644 --- a/src/main/java/org/gitlab/api/models/GitlabUser.java +++ b/src/main/java/org/gitlab/api/models/GitlabUser.java @@ -22,7 +22,7 @@ public class GitlabUser { private String _twitter; private String _provider; private String _state; - private boolean _blocked; + private Boolean _blocked; private List _identities; @JsonProperty("private_token") From e650ce44179272c110e851cb4c88c1d7535e172b Mon Sep 17 00:00:00 2001 From: Miguel Ferreira Date: Fri, 15 Sep 2017 21:46:09 +0200 Subject: [PATCH 042/119] Retrieve group milestones (#239) * Remove trailing whitespace * Rename method to retrieve project milestones * Add method to retrieve group milestones * Sanitize project ID before using it in path * Add method to retrieve group milestone issues * Add group_id to GitlabMilestone model * Add method to retrieve project milestone issues --- src/main/java/org/gitlab/api/GitlabAPI.java | 123 +++++++++++------- .../gitlab/api/models/GitlabMilestone.java | 11 ++ 2 files changed, 90 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4028629d..02deff44 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -31,7 +31,7 @@ public class GitlabAPI { private static final String API_NAMESPACE = "/api/v4"; private static final String PARAM_SUDO = "sudo"; private static final String PARAM_MAX_ITEMS_PER_PAGE = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).toString(); - + private final String hostUrl; private final String apiToken; @@ -674,7 +674,7 @@ public List getProjectsViaSudo(GitlabUser user) throws IOExceptio /** * Uploads a file to a project - * + * * @param project * @param file * @return @@ -684,7 +684,7 @@ public GitlabUpload uploadFile(GitlabProject project, File file) throws IOExcept String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + GitlabUpload.URL; return dispatch().withAttachment("file", file).to(tailUrl, GitlabUpload.class); } - + /** * * Gets a list of a project's jobs in Gitlab @@ -985,7 +985,7 @@ public void deleteProject(Serializable projectId) throws IOException { public List getOpenMergeRequests(Serializable projectId) throws IOException { return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_OPENED); } - + public List getOpenMergeRequests(Serializable projectId, Pagination pagination) throws IOException { return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_OPENED, pagination); } @@ -993,15 +993,15 @@ public List getOpenMergeRequests(Serializable projectId, Pag public List getOpenMergeRequests(GitlabProject project) throws IOException { return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_OPENED); } - + public List getOpenMergeRequests(GitlabProject project, Pagination pagination) throws IOException { return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_OPENED, pagination); } - + public List getMergedMergeRequests(Serializable projectId) throws IOException { return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_MERGED); } - + public List getMergedMergeRequests(Serializable projectId, Pagination pagination) throws IOException { return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_MERGED, pagination); } @@ -1009,15 +1009,15 @@ public List getMergedMergeRequests(Serializable projectId, P public List getMergedMergeRequests(GitlabProject project) throws IOException { return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_MERGED); } - + public List getMergedMergeRequests(GitlabProject project, Pagination pagination) throws IOException { return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_MERGED, pagination); } - + public List getClosedMergeRequests(Serializable projectId) throws IOException { return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_CLOSED); } - + public List getClosedMergeRequests(Serializable projectId, Pagination pagination) throws IOException { return getMergeRequestsWithStatus(projectId, GitlabMergeRequest.STATUS_CLOSED, pagination); } @@ -1025,7 +1025,7 @@ public List getClosedMergeRequests(Serializable projectId, P public List getClosedMergeRequests(GitlabProject project) throws IOException { return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_CLOSED); } - + public List getClosedMergeRequests(GitlabProject project, Pagination pagination) throws IOException { return getMergeRequestsWithStatus(project, GitlabMergeRequest.STATUS_CLOSED, pagination); } @@ -1033,30 +1033,30 @@ public List getClosedMergeRequests(GitlabProject project, Pa public List getMergeRequestsWithStatus(Serializable projectId, String status) throws IOException { return getMergeRequestsWithStatus(projectId, status, new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE)); } - + public List getMergeRequestsWithStatus(Serializable projectId, String state, Pagination pagination) throws IOException { Query query = pagination.asQuery(); query.append("state", state); String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + query; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } - + public List getMergeRequestsWithStatus(GitlabProject project, String status) throws IOException { return getMergeRequestsWithStatus(project, status, new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE)); } - + public List getMergeRequestsWithStatus(GitlabProject project, String state, Pagination pagination) throws IOException { Query query = pagination.asQuery(); query.append("state", state); String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + query; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } - + public List getMergeRequests(Serializable projectId) throws IOException { 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 { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + pagination.toString(); return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); @@ -1066,7 +1066,7 @@ public List getMergeRequests(GitlabProject project) throws I 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 { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + pagination.toString(); return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); @@ -1089,7 +1089,7 @@ public GitlabMergeRequestApprovals getMergeRequestApprovals(GitlabMergeRequest m /** * Cherry picks a commit. - * + * * @param projectId The id of the project * @param sha The sha of the commit * @param targetBranchName The branch on which the commit must be cherry-picked @@ -1100,12 +1100,12 @@ public GitlabCommit cherryPick(Serializable projectId, String sha, String target String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + sha + "/cherry_pick"; return retrieve().with("branch", targetBranchName).to(tailUrl, GitlabCommit.class); } - + public GitlabCommit cherryPick(GitlabProject project, String sha, String targetBranchName) throws IOException { String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/commits/" + sha + "/cherry_pick"; return dispatch().with("branch", targetBranchName).to(tailUrl, GitlabCommit.class); } - + /** * Return Merge Request. * @@ -1719,7 +1719,21 @@ public void deleteProjectHook(GitlabProject project, String hookId) throws IOExc } public List getIssues(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabIssue[].class); + } + + public List getIssues(GitlabProject project, GitlabMilestone milestone) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + + GitlabMilestone.URL + "/" + sanitizeMilestoneId(milestone.getId()) + + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabIssue[].class); + } + + public List getIssues(GitlabGroup group, GitlabMilestone milestone) throws IOException { + String tailUrl = GitlabGroup.URL + "/" + sanitizeGroupId(group.getId()) + + GitlabMilestone.URL + "/" + sanitizeMilestoneId(milestone.getId()) + + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabIssue[].class); } @@ -1928,14 +1942,23 @@ public GitlabLabel updateLabel(Serializable projectId, } public List getMilestones(GitlabProject project) throws IOException { - return getMilestones(String.valueOf(project.getId())); + return getProjectMilestones(String.valueOf(project.getId())); + } + + public List getMilestones(GitlabGroup group) throws IOException { + return getGroupMilestones(String.valueOf(group.getId())); } - public List getMilestones(Serializable projectId) throws IOException { + public List getProjectMilestones(Serializable projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMilestone.URL; return Arrays.asList(retrieve().to(tailUrl, GitlabMilestone[].class)); } + public List getGroupMilestones(Serializable groupId) throws IOException { + String tailUrl = GitlabGroup.URL + "/" + sanitizeGroupId(groupId) + GitlabMilestone.URL; + return Arrays.asList(retrieve().to(tailUrl, GitlabMilestone[].class)); + } + /** * Cretaes a new project milestone. * @param projectId The ID of the project. @@ -2282,12 +2305,24 @@ public GitlabSystemHook deleteSystemHook(Integer hookId) throws IOException { } private String sanitizeProjectId(Serializable projectId) { - if (!(projectId instanceof String) && !(projectId instanceof Number)) { - throw new IllegalArgumentException("projectId needs to be of type String or Number"); + return sanitizeId(projectId, "projectId"); + } + + private String sanitizeGroupId(Serializable groupId) { + return sanitizeId(groupId, "groupId"); + } + + private String sanitizeMilestoneId(Serializable milestoneId) { + return sanitizeId(milestoneId, "milestoneId"); + } + + private String sanitizeId(Serializable id, String parameterName) { + if (!(id instanceof String) && !(id instanceof Number)) { + throw new IllegalArgumentException(parameterName + " needs to be of type String or Number"); } try { - return URLEncoder.encode(String.valueOf(projectId), "UTF-8"); + return URLEncoder.encode(String.valueOf(id), "UTF-8"); } catch (UnsupportedEncodingException e) { throw new RuntimeException((e)); } @@ -2752,7 +2787,7 @@ public List getPipelineTriggers(GitlabProject project) throws IOE return retrieve().getAll(GitlabProject.URL + "/" + project.getId() + GitlabTrigger.URL + PARAM_MAX_ITEMS_PER_PAGE, GitlabTrigger[].class); } } - + /** * Gets email-on-push service setup for a projectId. * @param projectId The ID of the project containing the variable. @@ -2762,12 +2797,12 @@ public GitlabServiceEmailOnPush getEmailsOnPush(Integer projectId) throws IOExce String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL; return retrieve().to(tailUrl, GitlabServiceEmailOnPush.class); } - + /** * Update recipients for email-on-push service for a projectId. * @param projectId The ID of the project containing the variable. * @param emailAddress The emailaddress of the recipent who is going to receive push notification. - * @return + * @return * @throws IOException */ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws IOException { @@ -2784,7 +2819,7 @@ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws } else appendedRecipients = emailAddress; - + Query query = new Query() .appendIf("active", true) .appendIf("recipients", appendedRecipients); @@ -2792,11 +2827,11 @@ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL + query.toString(); return retrieve().method("PUT").to(tailUrl, Boolean.class); } - + /** * Get JIRA service settings for a project. * https://docs.gitlab.com/ce/api/services.html#get-jira-service-settings - * + * * @param projectId The ID of the project containing the variable. * @return * @throws IOException @@ -2805,11 +2840,11 @@ public GitlabServiceJira getJiraService(Integer projectId) throws IOException{ String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL; return retrieve().to(tailUrl, GitlabServiceJira.class); } - + /** * Remove all previously JIRA settings from a project. * https://docs.gitlab.com/ce/api/services.html#delete-jira-service - * + * * @param projectId The ID of the project containing the variable. * @return * @throws IOException @@ -2818,40 +2853,40 @@ public boolean deleteJiraService(Integer projectId) throws IOException{ String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL; return retrieve().method("DELETE").to(tailUrl, Boolean.class); } - + /** * Set JIRA service for a project. * https://docs.gitlab.com/ce/api/services.html#create-edit-jira-service - * + * * @param projectId The ID of the project containing the variable. * @param jiraPropties * @return * @throws IOException */ public boolean createOrEditJiraService(Integer projectId, GitlabJiraProperties jiraPropties) throws IOException{ - + Query query = new Query() .appendIf("url", jiraPropties.getUrl()) .appendIf("project_key", jiraPropties.getProjectKey()); - + if(!jiraPropties.getUsername().isEmpty()){ query.appendIf("username", jiraPropties.getUsername()); } - + if(!jiraPropties.getPassword().isEmpty()){ query.appendIf("password", jiraPropties.getPassword()); } - + if(jiraPropties.getIssueTransitionId() != null){ query.appendIf("jira_issue_transition_id", jiraPropties.getIssueTransitionId()); } - - + + String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL+ query.toString(); return retrieve().method("PUT").to(tailUrl, Boolean.class); - + } - + /** * * Get a list of projects accessible by the authenticated user by search. diff --git a/src/main/java/org/gitlab/api/models/GitlabMilestone.java b/src/main/java/org/gitlab/api/models/GitlabMilestone.java index f13de77d..5f533e6e 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMilestone.java +++ b/src/main/java/org/gitlab/api/models/GitlabMilestone.java @@ -15,6 +15,9 @@ public class GitlabMilestone { @JsonProperty("project_id") private int projectId; + @JsonProperty("group_id") + private int groupId; + private String title; private String description; @@ -57,6 +60,14 @@ public void setProjectId(int projectId) { this.projectId = projectId; } + public int getGroupId() { + return groupId; + } + + public void setGroupId(int groupId) { + this.groupId = groupId; + } + public String getTitle() { return title; } From 14e4766f35a4525b7a3ee0c072de76beb6a39c4f Mon Sep 17 00:00:00 2001 From: Miguel Ferreira Date: Fri, 15 Sep 2017 21:51:06 +0200 Subject: [PATCH 043/119] Add method to retrieve projects that the user is member of (#243) * Add method to retrieve projects that the user is member of * Fix methods to retrieve starred and owned projects In these two methods the API URL was being created with two query objects, which renders an invalid URL --- src/main/java/org/gitlab/api/GitlabAPI.java | 20 +++++++++++++++++-- src/test/java/org/gitlab/api/GitlabAPIIT.java | 6 ++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 02deff44..d4813246 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -640,7 +640,22 @@ public List getProjects() throws IOException { */ public List getOwnedProjects() throws IOException { Query query = new Query().append("owner", "true"); - String tailUrl = GitlabProject.URL + query.toString() + PARAM_MAX_ITEMS_PER_PAGE; + query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); + String tailUrl = GitlabProject.URL + query.toString(); + return retrieve().getAll(tailUrl, GitlabProject[].class); + } + + /** + * + * Get a list of projects that the authenticated user is a member of. + * + * @return A list of gitlab projects + * @throws IOException + */ + public List getMembershipProjects() throws IOException { + Query query = new Query().append("membership", "true"); + query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); + String tailUrl = GitlabProject.URL + query.toString(); return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -653,7 +668,8 @@ public List getOwnedProjects() throws IOException { */ public List getStarredProjects() throws IOException { Query query = new Query().append("starred", "true"); - String tailUrl = GitlabProject.URL + query.toString() + PARAM_MAX_ITEMS_PER_PAGE; + query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); + String tailUrl = GitlabProject.URL + query.toString(); return retrieve().getAll(tailUrl, GitlabProject[].class); } diff --git a/src/test/java/org/gitlab/api/GitlabAPIIT.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java index d3f24155..5c25dc7a 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIIT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -186,6 +186,12 @@ public void testGetGroupByPath() throws IOException { api.deleteGroup(group.getId()); } + @Test + public void testGetMembershipProjects() throws IOException { + final List membershipProjects = api.getMembershipProjects(); + assertEquals(0, membershipProjects.size()); + } + @Test public void Check_get_owned_projects() throws IOException { final List ownedProjects = api.getOwnedProjects(); From 39402e084d81883dbabd0d531c9758d497c90c6c Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Fri, 15 Sep 2017 15:52:32 -0400 Subject: [PATCH 044/119] getMergeRequestByIid must use a direct url (#247) --- src/main/java/org/gitlab/api/GitlabAPI.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index d4813246..95966fc6 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1131,15 +1131,8 @@ public GitlabCommit cherryPick(GitlabProject project, String sha, String targetB * @throws IOException on gitlab api call error */ public GitlabMergeRequest getMergeRequestByIid(Serializable projectId, Integer mergeRequestIid) throws IOException { - Query query = new Query() - .append("iid", mergeRequestIid.toString()); - query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + query.toString(); - List ls = retrieve().getAll(tailUrl, GitlabMergeRequest[].class); - if (ls.size() == 0) { - throw new FileNotFoundException(); - } - return ls.get(0); + String tailUrl = GitlabProject.URL + "/" + projectId + GitlabMergeRequest.URL + "/" + mergeRequestIid; + return retrieve().to(tailUrl, GitlabMergeRequest.class); } /** From ffdb91585dbf2e42ad808d5a45120e8fed8db896 Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Fri, 15 Sep 2017 21:52:55 +0200 Subject: [PATCH 045/119] Using MR IID instead of ID (#250) --- src/main/java/org/gitlab/api/GitlabAPI.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 95966fc6..17a1c224 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1238,7 +1238,7 @@ public GitlabMergeRequest acceptMergeRequest(GitlabProject project, Integer merg */ public GitlabNote getNote(GitlabMergeRequest mergeRequest, Integer noteId) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + - GitlabMergeRequest.URL + "/" + mergeRequest.getId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL + "/" + noteId; return retrieve().to(tailUrl, GitlabNote.class); @@ -1246,7 +1246,7 @@ public GitlabNote getNote(GitlabMergeRequest mergeRequest, Integer noteId) throw public List getNotes(GitlabMergeRequest mergeRequest) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + - GitlabMergeRequest.URL + "/" + mergeRequest.getId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL; GitlabNote[] notes = retrieve().to(tailUrl, GitlabNote[].class); @@ -1255,7 +1255,7 @@ public List getNotes(GitlabMergeRequest mergeRequest) throws IOExcep public List getAllNotes(GitlabMergeRequest mergeRequest) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + - GitlabMergeRequest.URL + "/" + mergeRequest.getId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabNote[].class); @@ -1558,14 +1558,14 @@ public GitlabNote updateNote(GitlabMergeRequest mergeRequest, Integer noteId, St .appendIf("body", body); String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + - GitlabMergeRequest.URL + "/" + mergeRequest.getId() + GitlabNote.URL + "/" + noteId + query.toString(); + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL + "/" + noteId + query.toString(); return retrieve().method("PUT").to(tailUrl, GitlabNote.class); } public GitlabNote createNote(GitlabMergeRequest mergeRequest, String body) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + - GitlabMergeRequest.URL + "/" + mergeRequest.getId() + GitlabNote.URL; + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL; return dispatch().with("body", body).to(tailUrl, GitlabNote.class); } @@ -1579,7 +1579,7 @@ public GitlabNote createNote(GitlabMergeRequest mergeRequest, String body) throw */ public void deleteNote(GitlabMergeRequest mergeRequest, GitlabNote noteToDelete) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getId() + GitlabNote.URL + "/" + noteToDelete.getId(); + + mergeRequest.getIid() + GitlabNote.URL + "/" + noteToDelete.getId(); retrieve().method("DELETE").to(tailUrl, GitlabNote.class); } @@ -2487,7 +2487,7 @@ public void deleteTag(GitlabProject project, String tagName) throws IOException */ public List getAllAwards(GitlabMergeRequest mergeRequest) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getId() + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; + + mergeRequest.getIid() + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabAward[].class); } @@ -2501,7 +2501,7 @@ public List getAllAwards(GitlabMergeRequest mergeRequest) throws IO */ public GitlabAward getAward(GitlabMergeRequest mergeRequest, Integer awardId) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getId() + GitlabAward.URL + "/" + awardId; + + mergeRequest.getIid() + GitlabAward.URL + "/" + awardId; return retrieve().to(tailUrl, GitlabAward.class); } @@ -2516,7 +2516,7 @@ public GitlabAward getAward(GitlabMergeRequest mergeRequest, Integer awardId) th public GitlabAward createAward(GitlabMergeRequest mergeRequest, String awardName) throws IOException { Query query = new Query().append("name", awardName); String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getId() + GitlabAward.URL + query.toString(); + + mergeRequest.getIid() + GitlabAward.URL + query.toString(); return dispatch().to(tailUrl, GitlabAward.class); } @@ -2530,7 +2530,7 @@ public GitlabAward createAward(GitlabMergeRequest mergeRequest, String awardName */ public void deleteAward(GitlabMergeRequest mergeRequest, GitlabAward award) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getId() + GitlabAward.URL + "/" + award.getId(); + + mergeRequest.getIid() + GitlabAward.URL + "/" + award.getId(); retrieve().method("DELETE").to(tailUrl, Void.class); } From 62b45f44860066956b8dbc3e9eb61bc931cd803f Mon Sep 17 00:00:00 2001 From: Emilien Mottet Date: Fri, 15 Sep 2017 21:55:13 +0200 Subject: [PATCH 046/119] add LastActivityOn field in GitlabUser (#249) --- src/main/java/org/gitlab/api/models/GitlabUser.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/gitlab/api/models/GitlabUser.java b/src/main/java/org/gitlab/api/models/GitlabUser.java index 58e527e9..fcc3906d 100644 --- a/src/main/java/org/gitlab/api/models/GitlabUser.java +++ b/src/main/java/org/gitlab/api/models/GitlabUser.java @@ -76,6 +76,9 @@ public class GitlabUser { @JsonProperty("projects_limit") private Integer _projectsLimit; + @JsonProperty("last_activity_on") + private Date _lastActivityOn; + public Integer getId() { return _id; } @@ -299,4 +302,12 @@ public List getIdentities() { public void setIdentities(List identities) { this._identities = identities; } + + public Date getLastActivityOn() { + return _lastActivityOn; + } + + public void setLastActivityOn(Date _lastActivityOn) { + this._lastActivityOn = _lastActivityOn; + } } From d5f26ee069ac12b26211044001e0c51039c243ab Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Sun, 8 Oct 2017 03:50:58 -0400 Subject: [PATCH 047/119] make various methods which take project and group ids take the (#254) unescaped versions, just like getGroup() --- src/main/java/org/gitlab/api/GitlabAPI.java | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 17a1c224..cf8cb41e 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -615,7 +615,7 @@ public GitlabProject getProject(Serializable projectId) throws IOException { * use namespace & project name to get project */ public GitlabProject getProject(String namespace, String projectName) throws IOException{ - String tailUrl = GitlabProject.URL + "/" + namespace + "%2F" + projectName; + String tailUrl = GitlabProject.URL + "/" + sanitizeGroupId(namespace) + "%2F" + sanitizeProjectId(projectName); return retrieve().to(tailUrl, GitlabProject.class); } @@ -1131,7 +1131,7 @@ public GitlabCommit cherryPick(GitlabProject project, String sha, String targetB * @throws IOException on gitlab api call error */ public GitlabMergeRequest getMergeRequestByIid(Serializable projectId, Integer mergeRequestIid) throws IOException { - String tailUrl = GitlabProject.URL + "/" + projectId + GitlabMergeRequest.URL + "/" + mergeRequestIid; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestIid; return retrieve().to(tailUrl, GitlabMergeRequest.class); } @@ -1283,7 +1283,7 @@ public List getCommits(GitlabMergeRequest mergeRequest, Pagination query.mergeWith(pagination.asQuery()); - String tailUrl = GitlabProject.URL + "/" + projectId + + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository" + GitlabCommit.URL + query.toString(); GitlabCommit[] commits = retrieve().to(tailUrl, GitlabCommit[].class); @@ -1808,7 +1808,7 @@ public List getNotes(GitlabIssue issue) throws IOException { } public GitlabNote createNote(Serializable projectId, Integer issueId, String message) throws IOException { - String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabIssue.URL + "/" + issueId + GitlabNote.URL; return dispatch().with("body", message).to(tailUrl, GitlabNote.class); } @@ -1826,8 +1826,9 @@ public GitlabNote createNote(GitlabIssue issue, String message) throws IOExcepti * @throws IOException on gitlab api call error */ public void deleteNote(Serializable projectId, Integer issueId, GitlabNote noteToDelete) throws IOException { - String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL + "/" - + issueId + GitlabNote.URL + "/" + noteToDelete.getId(); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + + GitlabIssue.URL + "/" + issueId + GitlabNote.URL + + "/" + noteToDelete.getId(); retrieve().method("DELETE").to(tailUrl, GitlabNote.class); } @@ -1850,7 +1851,7 @@ public void deleteNote(GitlabIssue issue, GitlabNote noteToDelete) throws IOExce */ public List getLabels(Serializable projectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + projectId + GitlabLabel.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabLabel.URL; GitlabLabel[] labels = retrieve().to(tailUrl, GitlabLabel[].class); return Arrays.asList(labels); } @@ -1878,7 +1879,7 @@ public GitlabLabel createLabel( Serializable projectId, String name, String color) throws IOException { - String tailUrl = GitlabProject.URL + "/" + projectId + GitlabLabel.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabLabel.URL; return dispatch().with("name", name) .with("color", color) .to(tailUrl, GitlabLabel.class); @@ -1908,7 +1909,7 @@ public void deleteLabel(Serializable projectId, String name) Query query = new Query(); query.append("name", name); String tailUrl = GitlabProject.URL + "/" + - projectId + + sanitizeProjectId(projectId) + GitlabLabel.URL + query.toString(); retrieve().method("DELETE").to(tailUrl, Void.class); @@ -1938,7 +1939,7 @@ public GitlabLabel updateLabel(Serializable projectId, String name, String newName, String newColor) throws IOException { - String tailUrl = GitlabProject.URL + "/" + projectId + GitlabLabel.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabLabel.URL; GitlabHTTPRequestor requestor = retrieve().method("PUT"); requestor.with("name", name); if (newName != null) { @@ -1984,7 +1985,7 @@ public GitlabMilestone createMilestone( String description, Date dueDate, Date startDate) throws IOException { - String tailUrl = GitlabProject.URL + "/" + projectId + GitlabMilestone.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMilestone.URL; GitlabHTTPRequestor requestor = dispatch().with("title", title); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); if (description != null) { @@ -2038,7 +2039,7 @@ public GitlabMilestone updateMilestone( Date startDate, String stateEvent) throws IOException { String tailUrl = GitlabProject.URL + "/" + - projectId + + sanitizeProjectId(projectId) + GitlabMilestone.URL + "/" + milestoneId; GitlabHTTPRequestor requestor = retrieve().method("PUT"); From b5bf629d7f5bff65dbc13cd6833b1666bdbc8f7c Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Sun, 8 Oct 2017 03:51:41 -0400 Subject: [PATCH 048/119] getMergeRequestApprovals: use projectId not targetProjectId (#258) Make the getMergeRequestApprovals API consistent with notes api by looking at the projectId field instead of the targetProjectId field. For projects which are sourced from upstream, I believe that these will be the same (from reading the gitlab code -- the API docs are unclear; see https://gitlab.com/gitlab-org/gitlab-ce/issues/38539 ). --- 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 cf8cb41e..4582e33f 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1098,7 +1098,7 @@ public List getAllMergeRequests(GitlabProject project) throw * EE only. */ public GitlabMergeRequestApprovals getMergeRequestApprovals(GitlabMergeRequest mr) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(mr.getTargetProjectId()) + + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(mr.getProjectId()) + GitlabMergeRequest.URL + "/" + mr.getIid() + GitlabMergeRequestApprovals.URL; return retrieve().to(tailUrl, GitlabMergeRequestApprovals.class); } From e1936287c49443518f64f1ffd799f918e9a7aad7 Mon Sep 17 00:00:00 2001 From: Miguel Ferreira Date: Sun, 8 Oct 2017 09:52:08 +0200 Subject: [PATCH 049/119] Add method and respective model to retrieve issue time stats (#240) --- src/main/java/org/gitlab/api/GitlabAPI.java | 5 +++ .../api/models/GitlabIssueTimeStats.java | 40 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/GitlabIssueTimeStats.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4582e33f..8e982757 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1751,6 +1751,11 @@ public GitlabIssue getIssue(Serializable projectId, Integer issueId) throws IOEx return retrieve().to(tailUrl, GitlabIssue.class); } + public GitlabIssueTimeStats getIssueTimeStats(Serializable projectId, Integer issueId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabIssue.URL + "/" + issueId + GitlabIssueTimeStats.URL; + return retrieve().to(tailUrl, GitlabIssueTimeStats.class); + } + public GitlabIssue createIssue(int projectId, int assigneeId, Integer milestoneId, String labels, String description, String title) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL; diff --git a/src/main/java/org/gitlab/api/models/GitlabIssueTimeStats.java b/src/main/java/org/gitlab/api/models/GitlabIssueTimeStats.java new file mode 100644 index 00000000..3f57e156 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabIssueTimeStats.java @@ -0,0 +1,40 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabIssueTimeStats { + + public static final String URL = "/time_stats"; + + @JsonProperty("time_estimate") + private long timeEstimate = 0; + + @JsonProperty("total_time_spent") + private long totalTimeSpent = 0; + + @JsonProperty("human_time_estimate") + private String humanTimeEstimate; + + @JsonProperty("human_total_time_spent") + private String humanTotalTimeSpent; + + public static String getURL() { + return URL; + } + + public long getTimeEstimate() { + return timeEstimate; + } + + public long getTotalTimeSpent() { + return totalTimeSpent; + } + + public String getHumanTimeEstimate() { + return humanTimeEstimate; + } + + public String getHumanTotalTimeSpent() { + return humanTotalTimeSpent; + } +} From 841515ae9e966883c1b01a0abf388205353bf7b4 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Sirot <470082+jcsirot@users.noreply.github.com> Date: Wed, 13 Dec 2017 23:38:37 +0100 Subject: [PATCH 050/119] Repository file create update v4 (#241) * Update to v4 API * Fix deleteRepositoryFile: pass parameters as query params and delete returns 204 'no content' --- src/main/java/org/gitlab/api/GitlabAPI.java | 25 +++++++++------------ 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 8e982757..acb4a941 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1489,12 +1489,11 @@ public GitlabRepositoryFile getRepositoryFile(GitlabProject project, String path * @throws IOException on gitlab api call error */ public GitlabSimpleRepositoryFile createRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg, String content) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files"; + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files/" + sanitizePath(path); GitlabHTTPRequestor requestor = dispatch(); return requestor - .with("file_path", sanitizePath(path)) - .with("branch_name", branchName) + .with("branch", branchName) .with("encoding", "base64") .with("commit_message", commitMsg) .with("content", content) @@ -1512,12 +1511,11 @@ public GitlabSimpleRepositoryFile createRepositoryFile(GitlabProject project, St * @throws IOException on gitlab api call error */ public GitlabSimpleRepositoryFile updateRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg, String content) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files"; + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files/" + sanitizePath(path); GitlabHTTPRequestor requestor = retrieve().method("PUT"); return requestor - .with("file_path", sanitizePath(path)) - .with("branch_name", branchName) + .with("branch", branchName) .with("encoding", "base64") .with("commit_message", commitMsg) .with("content", content) @@ -1533,15 +1531,12 @@ public GitlabSimpleRepositoryFile updateRepositoryFile(GitlabProject project, St * @param commitMsg The commit message * @throws IOException on gitlab api call error */ - public GitlabSimpleRepositoryFile deleteRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files"; - GitlabHTTPRequestor requestor = retrieve().method("DELETE"); - - return requestor - .with("file_path", sanitizePath(path)) - .with("branch_name", branchName) - .with("commit_message", commitMsg) - .to(tailUrl, GitlabSimpleRepositoryFile.class); + public void deleteRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg) throws IOException { + Query query = new Query() + .append("branch", branchName) + .append("commit_message", commitMsg); + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files/" + sanitizePath(path) + query.toString(); + retrieve().method("DELETE").to(tailUrl, Void.class); } /** From e3f568f2fffcdfbcbe5ebed99c995284bb13ad85 Mon Sep 17 00:00:00 2001 From: Emilien Mottet Date: Wed, 13 Dec 2017 23:39:46 +0100 Subject: [PATCH 051/119] Remove conditional processing for commits (#245) --- .../org/gitlab/api/http/GitlabHTTPRequestor.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index 24a9818c..dcd3abec 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -279,16 +279,9 @@ private void findNextUrl() throws MalformedURLException { Integer page = Integer.parseInt(matcher.group(2)) + 1; this.url = new URL(matcher.replaceAll(matcher.group(1) + "page=" + page)); } else { - if (GitlabCommit[].class == type) { - // there is a bug in the Gitlab CE API - // (https://gitlab.com/gitlab-org/gitlab-ce/issues/759) - // that starts pagination with page=0 for commits - this.url = new URL(url + (url.indexOf('?') > 0 ? '&' : '?') + "page=1"); - } else { - // Since the page query was not present, its safe to assume that we just - // currently used the first page, so we can default to page 2 - this.url = new URL(url + (url.indexOf('?') > 0 ? '&' : '?') + "&page=2"); - } + // Since the page query was not present, its safe to assume that we just + // currently used the first page, so we can default to page 2 + this.url = new URL(url + (url.indexOf('?') > 0 ? '&' : '?') + "&page=2"); } } }; From 3bb5ad60328d7b37272c9a67cd66171037104c03 Mon Sep 17 00:00:00 2001 From: Emilien Mottet Date: Wed, 13 Dec 2017 23:40:12 +0100 Subject: [PATCH 052/119] fix namespace, add create a fork, add forkedfrom field in project ,add tests (#242) * fix namespace and add test * add create fork and test * add forkedFrom fix space fix equals --- src/main/java/org/gitlab/api/GitlabAPI.java | 40 +++++++- .../gitlab/api/models/GitlabNamespace.java | 96 ++++++++++++------- .../org/gitlab/api/models/GitlabProject.java | 35 ++++++- src/test/java/org/gitlab/api/GitlabAPIIT.java | 49 ++++++++++ 4 files changed, 185 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index acb4a941..1ceb527e 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -688,6 +688,18 @@ public List getProjectsViaSudo(GitlabUser user) throws IOExceptio return retrieve().getAll(tailUrl, GitlabProject[].class); } + /** + * Get a list of the namespaces of the authenticated user. + * If the user is an administrator, a list of all namespaces in the GitLab instance is shown. + * + * @return A list of gitlab namespace + * @throws IOException + */ + public List getNamespaces() throws IOException { + String tailUrl = GitlabNamespace.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabNamespace[].class); + } + /** * Uploads a file to a project * @@ -941,6 +953,30 @@ public GitlabProject createUserProject(Integer userId, String name, String descr return dispatch().to(tailUrl, GitlabProject.class); } + /** + * @param namespace The namespace of the fork + * @param projectId ProjectId of the project forked + * @return The new Gitlab Project + * @throws IOException on gitlab api call error + */ + public GitlabProject createFork(String namespace, Integer projectId) throws IOException { + Query query = new Query() + .appendIf("id", projectId) + .append("namespace", namespace); + String tailUrl = GitlabProject.URL + "/" + projectId + "/fork"; + return dispatch().to(tailUrl, GitlabProject.class); + } + + /** + * @param namespace The namespace of the fork + * @param gitlabProject The project forked + * @return The new Gitlab Project + * @throws IOException on gitlab api call error + */ + public GitlabProject createFork(String namespace, GitlabProject gitlabProject) throws IOException { + return createFork(namespace, gitlabProject.getId()); + } + /** * Updates a Project * @@ -2189,7 +2225,7 @@ public List getNamespaceMembers(GitlabNamespace namespace) * @throws IOException on gitlab api call error */ public List getNamespaceMembers(Integer namespaceId) throws IOException { - String tailUrl = GitlabNamespace.URL + "/" + namespaceId + GitlabProjectMember.URL; + String tailUrl = GitlabGroup.URL + "/" + namespaceId + GitlabProjectMember.URL; return Arrays.asList(retrieve().to(tailUrl, GitlabProjectMember[].class)); } @@ -2201,7 +2237,7 @@ public List getNamespaceMembers(Integer namespaceId) throws * @throws IOException on gitlab api call error */ public void transfer(Integer namespaceId, Integer projectId) throws IOException { - String tailUrl = GitlabNamespace.URL + "/" + namespaceId + GitlabProject.URL + "/" + projectId; + String tailUrl = GitlabGroup.URL + "/" + namespaceId + GitlabProject.URL + "/" + projectId; dispatch().to(tailUrl, Void.class); } diff --git a/src/main/java/org/gitlab/api/models/GitlabNamespace.java b/src/main/java/org/gitlab/api/models/GitlabNamespace.java index 5de74269..0173f86b 100644 --- a/src/main/java/org/gitlab/api/models/GitlabNamespace.java +++ b/src/main/java/org/gitlab/api/models/GitlabNamespace.java @@ -5,21 +5,24 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class GitlabNamespace { - public static final String URL = "/groups"; + public static final String URL = "/namespaces"; private Integer id; private String name; private String path; - private String description; + private String kind; + private String plan; - @JsonProperty("created_at") - private Date createdAt; + @JsonProperty("full_path") + private String fullPath; + + @JsonProperty("parent_id") + private String parentId; + + @JsonProperty("members_count_with_descendants") + private Integer membersCountWithDescendants; - @JsonProperty("updated_at") - private Date updatedAt; - @JsonProperty("owner_id") - private Integer ownerId; public Integer getId() { return id; @@ -29,51 +32,80 @@ public void setId(Integer id) { this.id = id; } - public Date getCreatedAt() { - return createdAt; + public String getName() { + return name; } - public void setCreatedAt(Date createdAt) { - this.createdAt = createdAt; + public void setName(String name) { + this.name = name; } - public Date getUpdatedAt() { - return updatedAt; + public String getPath() { + return path; } - public void setUpdatedAt(Date updatedAt) { - this.updatedAt = updatedAt; + public void setPath(String path) { + this.path = path; } - public Integer getOwnerId() { - return ownerId; + public String getKind() { + return kind; } - public void setOwnerId(Integer ownerId) { - this.ownerId = ownerId; + public void setKind(String kind) { + this.kind = kind; } - public String getName() { - return name; + public String getPlan() { + return plan; } - public void setName(String name) { - this.name = name; + public void setPlan(String plan) { + this.plan = plan; } - public String getPath() { - return path; + public String getFullPath() { + return fullPath; } - public void setPath(String path) { - this.path = path; + public void setFullPath(String fullPath) { + this.fullPath = fullPath; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public Integer getMembersCountWithDescendants() { + return membersCountWithDescendants; } - public String getDescription() { - return description; + public void setMembersCountWithDescendants(Integer membersCountWithDescendants) { + this.membersCountWithDescendants = membersCountWithDescendants; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + GitlabNamespace that = (GitlabNamespace) o; + + if (id != null || that.id != null) { + return id != null && id.equals(that.id); + } else { + return name != null ? name.equals(that.name) : that.name == null; + } } - public void setDescription(String description) { - this.description = description; + @Override + public int hashCode() { + int result = id != null ? id.hashCode() : 0; + result = 31 * result + (name != null ? name.hashCode() : 0); + return result; } } diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index f573175c..33fb923c 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -122,6 +122,9 @@ public class GitlabProject { @JsonProperty("import_url") private String importUrl; + @JsonProperty("forked_from_project") + private GitlabProject forkedFrom; + @JsonProperty("is_printing_merge_request_link_enabled") private Boolean printingMergeRequestLinkEnabled; @@ -453,12 +456,42 @@ public void setImportUrl(String importUrl) { this.importUrl = importUrl; } + public GitlabProject getForkedFrom() { + return forkedFrom; + } + + public void setForkedFrom(GitlabProject forkedFrom) { + this.forkedFrom = forkedFrom; + } + public Boolean isPrintingMergeRequestLinkEnabled() { - return printingMergeRequestLinkEnabled; + return printingMergeRequestLinkEnabled; } public void setPrintingMergeRequestLinkEnabled(Boolean printingMergeRequestLinkEnabled) { this.printingMergeRequestLinkEnabled = printingMergeRequestLinkEnabled; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + GitlabProject that = (GitlabProject) o; + + if (id != null || that.id != null) { + return id != null && id.equals(that.id); + } else { + if (name != null ? !name.equals(that.name) : that.name != null) return false; + return namespace != null ? namespace.equals(that.namespace) : that.namespace == null; + } + } + + @Override + public int hashCode() { + int result = id != null ? id.hashCode() : 0; + result = 31 * result + (name != null ? name.hashCode() : 0); + result = 31 * result + (namespace != null ? namespace.hashCode() : 0); + return result; + } } diff --git a/src/test/java/org/gitlab/api/GitlabAPIIT.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java index 5c25dc7a..84b1296e 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIIT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -2,6 +2,7 @@ import org.gitlab.api.models.GitlabBuildVariable; import org.gitlab.api.models.GitlabGroup; +import org.gitlab.api.models.GitlabNamespace; import org.gitlab.api.models.GitlabProject; import org.gitlab.api.models.GitlabUser; import org.junit.BeforeClass; @@ -204,6 +205,54 @@ public void Check_search_projects() throws IOException { assertEquals(0, searchedProjects.size()); } + /** + * There is at least one namespace for the user + * + * @throws IOException + */ + @Test + public void testGetNamespace() throws IOException { + final List gitlabNamespaces = api.getNamespaces(); + assertTrue(gitlabNamespaces.size() > 0); + } + + @Test + public void testCreateDeleteFork() throws IOException { + String projectName = randVal("Fork-me"); + + String password = randVal("$%password"); + + + GitlabUser gitUser = api.createUser(randVal("testEmail@gitlabapitest.com"), + password, + randVal("userName"), + randVal("fullName"), + randVal("skypeId"), + randVal("linkedin"), + randVal("twitter"), + "http://" + randVal("url.com"), + 10, + randVal("externuid"), + randVal("externprovidername"), + randVal("bio"), + false, + false, + false); + + + GitlabProject project = api.createUserProject(gitUser.getId(), projectName); + GitlabProject fork = api.createFork(api.getNamespaces().get(0).getPath(), project); + + assertNotNull(fork); + + assertEquals(project.getId(), fork.getForkedFrom().getId()); + + api.deleteProject(project.getId()); + api.deleteProject(fork.getId()); + + api.deleteUser(gitUser.getId()); + } + private String randVal(String postfix) { return rand + "_" + postfix; } From 02ac18432772330d5c54c982aa685cda1c9fbd63 Mon Sep 17 00:00:00 2001 From: nodonutsforyou Date: Wed, 13 Dec 2017 23:42:17 +0100 Subject: [PATCH 053/119] get trace file api call: https://docs.gitlab.com/ee/api/jobs.html#get-a-trace-file (#223) --- 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 1ceb527e..705cce6f 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -775,6 +775,29 @@ public byte[] getJobArtifact(Integer projectId, Integer jobId) throws IOExceptio return retrieve().to(tailUrl, byte[].class); } + /** + * Get build trace of a project build + * + * @param project The Project + * @param job The build + * @throws IOException on gitlab api call error + */ + public byte[] getJobTrace(GitlabProject project, GitlabJob job) throws IOException { + return getJobArtifact(project.getId(), job.getId()); + } + + /** + * Get build trace of a project build + * + * @param projectId The Project's Id + * @param jobId The build's Id + * @throws IOException on gitlab api call error + */ + public byte[] getJobTrace(Integer projectId, Integer jobId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + jobId + "/trace"; + return retrieve().to(tailUrl, byte[].class); + } + /** * Creates a Project * From a451860ea44aaef9a8fd4e6712d8dca477b4a046 Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Wed, 13 Dec 2017 17:42:36 -0500 Subject: [PATCH 054/119] make blocked nullable (#256) --- src/main/java/org/gitlab/api/models/GitlabUser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabUser.java b/src/main/java/org/gitlab/api/models/GitlabUser.java index fcc3906d..26dc04ae 100644 --- a/src/main/java/org/gitlab/api/models/GitlabUser.java +++ b/src/main/java/org/gitlab/api/models/GitlabUser.java @@ -111,11 +111,11 @@ public void setName(String name) { _name = name; } - public boolean isBlocked() { + public Boolean isBlocked() { return _blocked; } - public void setBlocked(boolean blocked) { + public void setBlocked(Boolean blocked) { _blocked = blocked; } From 5bbc58296b5f4ab871d6392815b5af59ac585467 Mon Sep 17 00:00:00 2001 From: Morgan Seznec Date: Wed, 13 Dec 2017 23:42:52 +0100 Subject: [PATCH 055/119] Fix skip_confirmation (#261) --- 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 705cce6f..cbf18a7b 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -189,7 +189,7 @@ public GitlabUser createUser(String email, String password, String username, Query query = new Query() .append("email", email) - .appendIf("confirm", skip_confirmation == null ? null : !skip_confirmation) + .appendIf("skip_confirmation", skip_confirmation) .appendIf("password", password) .appendIf("username", username) .appendIf("name", fullName) From 5faeb8b9017aa22272a04210adcd142c459b99d2 Mon Sep 17 00:00:00 2001 From: aram535 Date: Wed, 13 Dec 2017 17:44:02 -0500 Subject: [PATCH 056/119] Added getProjectJson() methods (#263) --- src/main/java/org/gitlab/api/GitlabAPI.java | 16 +++++++ .../gitlab/api/http/GitlabHTTPRequestor.java | 9 ++-- src/test/java/org/gitlab/api/GitlabJson.java | 44 +++++++++++++++++++ .../api/http/GitlabHTTPRequestorTest.java | 5 +-- 4 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 src/test/java/org/gitlab/api/GitlabJson.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index cbf18a7b..96ef9811 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -619,6 +619,22 @@ public GitlabProject getProject(String namespace, String projectName) throws IOE return retrieve().to(tailUrl, GitlabProject.class); } + /* + * use project id to get Project JSON + */ + public String getProjectJson (Serializable projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId); + return retrieve().to(tailUrl, String.class); + } + + /* + * use namespace & project name to get project + */ + public String getProjectJson(String namespace, String projectName) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeGroupId(namespace) + "%2F" + sanitizeProjectId(projectName); + return retrieve().to(tailUrl, String.class); + } + /** * * Get a list of projects accessible by the authenticated user. diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index dcd3abec..e63d180e 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -385,11 +385,14 @@ private T parse(HttpURLConnection connection, Class type, T instance) thr return type.cast(IOUtils.toByteArray(wrapStream(connection, connection.getInputStream()))); } reader = new InputStreamReader(wrapStream(connection, connection.getInputStream()), "UTF-8"); - String data = IOUtils.toString(reader); + String json = IOUtils.toString(reader); + if (type != null && type == String.class) { + return type.cast(json); + } if (type != null && type != Void.class) { - return GitlabAPI.MAPPER.readValue(data, type); + return GitlabAPI.MAPPER.readValue(json, type); } else if (instance != null) { - return GitlabAPI.MAPPER.readerForUpdating(instance).readValue(data); + return GitlabAPI.MAPPER.readerForUpdating(instance).readValue(json); } else { return null; } diff --git a/src/test/java/org/gitlab/api/GitlabJson.java b/src/test/java/org/gitlab/api/GitlabJson.java new file mode 100644 index 00000000..a18f0adb --- /dev/null +++ b/src/test/java/org/gitlab/api/GitlabJson.java @@ -0,0 +1,44 @@ +package org.gitlab.api; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.util.List; +import java.util.Random; + +import org.gitlab.api.models.GitlabProject; +import org.junit.BeforeClass; +import org.junit.Test; + +public class GitlabJson { + + static GitlabAPI api; + + @BeforeClass + public static void getApi() { + api = APIForIntegrationTestingHolder.INSTANCE.getApi(); + } + + @Test + public void getProjectJson () throws IOException { + List projects = api.getProjects(); + int randomProjectNumber = getRandomProject(projects); + if (randomProjectNumber != 0) { + String p = api.getProjectJson(randomProjectNumber); + assertTrue("The JSON is 0 length",p.length() > 0); + assertTrue("Project JSON does not contain 'id'.",p.indexOf("id") > 0); + assertTrue("Project JSON does not contain 'default_branch'.",p.indexOf("default_branch") > 0); + } else { + fail("No projects are defined in the gitlab instance, or something failed."); + } + } + + private int getRandomProject (List projects) { + if (projects.size() > 0) { + Random rand = new Random(); + return projects.get(rand.nextInt(projects.size())).getId(); + } else + return 0; + } +} diff --git a/src/test/java/org/gitlab/api/http/GitlabHTTPRequestorTest.java b/src/test/java/org/gitlab/api/http/GitlabHTTPRequestorTest.java index 6c95e1c5..f9effc4b 100644 --- a/src/test/java/org/gitlab/api/http/GitlabHTTPRequestorTest.java +++ b/src/test/java/org/gitlab/api/http/GitlabHTTPRequestorTest.java @@ -1,11 +1,10 @@ package org.gitlab.api.http; +import static org.junit.Assert.assertEquals; + import org.gitlab.api.GitlabAPI; -import org.gitlab.api.TokenType; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class GitlabHTTPRequestorTest { @Test From 1e4ce629f05b948ef44550d4d53e71ecacea3755 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 13 Dec 2017 23:45:45 +0100 Subject: [PATCH 057/119] Add possibility of creating subgroups. (#265) * Added possibility to get issues by projectId. * Added possibility to create subgroups. --- src/main/java/org/gitlab/api/GitlabAPI.java | 26 +++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 96ef9811..842139cd 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -528,13 +528,31 @@ public GitlabGroup createGroup(CreateGroupRequest request, GitlabUser sudoUser) * @throws IOException on gitlab api call error */ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAccessLevel ldapAccess, GitlabUser sudoUser) throws IOException { + return createGroup(name, path, ldapCn, ldapAccess, sudoUser, null); + } + + /** + * Creates a Group + * + * @param name The name of the group + * @param path The path for the group + * @param ldapCn LDAP Group Name to sync with, null otherwise + * @param ldapAccess Access level for LDAP group members, null otherwise + * @param sudoUser The user to create the group on behalf of + * @param parentId The id of a parent group; the new group will be its subgroup + * @return The GitLab Group + * + * @throws IOException on gitlab api call error + */ + public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAccessLevel ldapAccess, GitlabUser sudoUser, Integer parentId) throws IOException { Query query = new Query() .append("name", name) .append("path", path) .appendIf("ldap_cn", ldapCn) .appendIf("ldap_access", ldapAccess) - .appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null); + .appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null) + .appendIf("parent_id", parentId); String tailUrl = GitlabGroup.URL + query.toString(); @@ -1798,7 +1816,11 @@ public void deleteProjectHook(GitlabProject project, String hookId) throws IOExc } public List getIssues(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; + return getIssues(project.getId()); + } + + public List getIssues(Serializable projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabIssue[].class); } From ed706bdaa3dad5bca11ade9096b0e175e5d59518 Mon Sep 17 00:00:00 2001 From: Tim Olshansky Date: Fri, 15 Dec 2017 09:49:33 -0800 Subject: [PATCH 058/119] [maven-release-plugin] prepare release 4.0.0 --- pom.xml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eb236fea..e9705fc9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.0-SNAPSHOT + 4.0.0 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API @@ -214,5 +214,23 @@ - + + doclint-java8-disable + + [1.8,) + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + + + + + + From 0fc804af7efc20389f718297746f2ec33dabdf85 Mon Sep 17 00:00:00 2001 From: Tim Olshansky Date: Fri, 15 Dec 2017 09:49:43 -0800 Subject: [PATCH 059/119] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9705fc9..1fada3f4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.0 + 4.0.1-SNAPSHOT Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API From ccd481f785c403ce271b0a8ac8f48a9d096778e7 Mon Sep 17 00:00:00 2001 From: Jaye Pitzeruse Date: Wed, 20 Dec 2017 13:18:15 -0600 Subject: [PATCH 060/119] gh-273: Fixed raw blob uri to use new api v4 syntax (#274) --- 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 842139cd..4cd61529 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1530,7 +1530,7 @@ public byte[] getRawFileContent(Integer projectId, String sha, String filepath) * @throws IOException on gitlab api call error */ public byte[] getRawBlobContent(GitlabProject project, String sha) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/raw_blobs/" + sha; + String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/blobs/" + sha + "/raw"; return retrieve().to(tailUrl, byte[].class); } From 5e36ab54ff3c2f70142e187ba9a6811eafd66153 Mon Sep 17 00:00:00 2001 From: Tim Schruben Date: Fri, 22 Dec 2017 14:19:50 -0500 Subject: [PATCH 061/119] Added additional field to the GitlabGroup object (#278) --- .../org/gitlab/api/models/GitlabGroup.java | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/main/java/org/gitlab/api/models/GitlabGroup.java b/src/main/java/org/gitlab/api/models/GitlabGroup.java index 19fa1be8..3a456802 100644 --- a/src/main/java/org/gitlab/api/models/GitlabGroup.java +++ b/src/main/java/org/gitlab/api/models/GitlabGroup.java @@ -11,6 +11,13 @@ public class GitlabGroup { private Integer id; private String name; private String path; + private String description; + + @JsonProperty("lfs_enabled") + private Boolean lfsEnabled; + + @JsonProperty("avatar_url") + private String avatarUrl; @JsonProperty("ldap_cn") private String ldapCn; @@ -27,6 +34,63 @@ public class GitlabGroup { @JsonProperty("parent_id") private Integer parentId; + @JsonProperty("full_name") + private String fullName; + + @JsonProperty("full_path") + private String fullPath; + + @JsonProperty("request_access_enabled") + private Boolean requestAccessEnabled; + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Boolean isLfsEnabled() { + return lfsEnabled; + } + + public void setLfsEnabled(Boolean lfsEnabled) { + this.lfsEnabled = lfsEnabled; + } + + public String getAvatarUrl() { + return avatarUrl; + } + + public void setAvatarUrl(String avatarUrl) { + this.avatarUrl = avatarUrl; + } + + public String getFullName() { + return fullName; + } + + public void setFullName(String fullName) { + this.fullName = fullName; + } + + public String getFullPath() { + return fullPath; + } + + public void setFullPath(String fullPath) { + this.fullPath = fullPath; + } + + public Boolean isRequestAccessEnabled() { + return requestAccessEnabled; + } + + public void setRequestAccessEnabled(Boolean requestAccessEnabled) { + this.requestAccessEnabled = requestAccessEnabled; + } + public Integer getId() { return id; } From 247443fd1156a1fb60a0de523ea994cdadec1e48 Mon Sep 17 00:00:00 2001 From: David Lam Date: Fri, 22 Dec 2017 14:20:00 -0500 Subject: [PATCH 062/119] Runner Status (#276) * updated .gitignore to .idea directory * updated build.gradle * added RunnerScope enum and qualified field variable returns * added out directory to .gitignore * updated pom.xml to java 8 and latest fabric8 * updated GitlabUser getters to return nullable Boolean object * added RunnerScope to GitlabRunner * exposed Runner API --- .gitignore | 3 +- build.gradle | 22 ++-- pom.xml | 7 +- src/main/java/org/gitlab/api/GitlabAPI.java | 31 +++++ .../org/gitlab/api/models/GitlabRunner.java | 59 +++++++-- .../org/gitlab/api/models/GitlabUser.java | 120 +++++++++--------- 6 files changed, 153 insertions(+), 89 deletions(-) diff --git a/.gitignore b/.gitignore index 7a3b81b9..b395fd90 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .DS_Store -.idea/* +.idea/ *.iml build/ target/* @@ -13,3 +13,4 @@ target .settings *.ipr *.iws +out/ diff --git a/build.gradle b/build.gradle index a0d3a58d..a9820738 100644 --- a/build.gradle +++ b/build.gradle @@ -4,18 +4,18 @@ buildscript { } } -apply plugin: 'java' -apply plugin: 'maven' - -// IDE plugins -apply plugin: 'idea' -apply plugin: 'eclipse' +plugins { + id "java" + id "maven" + id "idea" + id "eclipse" +} -sourceCompatibility = 1.7 -targetCompatibility = 1.7 +sourceCompatibility = 1.8 +targetCompatibility = 1.8 group = 'org.gitlab' -version = '1.2.7-SNAPSHOT' +version = '4.0.1-SNAPSHOT' repositories { mavenLocal() @@ -23,7 +23,7 @@ repositories { } dependencies { - compile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.5.3') + compile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.5.+') compile(group: 'commons-io', name: 'commons-io', version: '2.4') testCompile(group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3') testCompile(group: 'junit', name: 'junit', version: '4.12') @@ -45,5 +45,5 @@ task sourcesJar(type: Jar, dependsOn:classes) { artifacts { archives sourcesJar } task wrapper(type: Wrapper) { - gradleVersion = '2.4' + gradleVersion = '4.4' } diff --git a/pom.xml b/pom.xml index 1fada3f4..ab24b40d 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ - 1.7 - 1.7 + 1.8 + 1.8 UTF-8 UTF-8 2.20 @@ -167,7 +167,7 @@ io.fabric8 docker-maven-plugin - 0.18.1 + 0.23.0 default-start @@ -225,6 +225,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.0.0 -Xdoclint:none diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4cd61529..af933a77 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -3067,4 +3067,35 @@ public String getUserAgent() { public GitlabVersion getVersion() throws IOException { return retrieve().to("version",GitlabVersion.class); } + + /** + * Returns a List of all GitlabRunners. + * + * @return List of GitlabRunners + * @throws IOException + */ + public List getRunners() throws IOException { + return getRunners(GitlabRunner.RunnerScope.ALL); + } + + /** + * Returns a List of GitlabRunners. + * + * @param scope Can be null. Defines type of Runner to retrieve. + * @return List of GitLabRunners + * @throws IOException on Gitlab API call error + */ + public List getRunners(GitlabRunner.RunnerScope scope) throws IOException { + StringBuilder tailUrl = new StringBuilder("runners/all"); + Query query = new Query() + .appendIf("scope", scope.getScope()); + tailUrl.append(query.toString()); + return retrieve().getAll(tailUrl.toString(), GitlabRunner[].class); + } + + public GitlabRunner getRunnerDetail(int id) throws IOException { + String tailUrl = String.format("runners/%d", id); + return retrieve().to(tailUrl, GitlabRunner.class); + } + } diff --git a/src/main/java/org/gitlab/api/models/GitlabRunner.java b/src/main/java/org/gitlab/api/models/GitlabRunner.java index c042a35b..27082868 100644 --- a/src/main/java/org/gitlab/api/models/GitlabRunner.java +++ b/src/main/java/org/gitlab/api/models/GitlabRunner.java @@ -7,13 +7,38 @@ import java.util.List; public class GitlabRunner { + public enum RunnerScope { + SPECIFIC("specific"), + SHARED("shared"), + ACTIVE("active"), + PAUSED("paused"), + ONLINE("online"), + ALL(null); + + private final String scope; + + RunnerScope(String scope) { + this.scope = scope; + } + + public String getScope() { + return this.scope; + } + } + + @JsonProperty("id") private Integer id; + @JsonProperty("description") private String description; + @JsonProperty("active") private Boolean active; @JsonProperty("is_shared") private Boolean isShared; + @JsonProperty("name") private String name; + @JsonProperty("version") private String version; + @JsonProperty("revision") private String revision; @JsonProperty("contacted_at") private Date contactedAt; @@ -21,12 +46,18 @@ public class GitlabRunner { private List tagList; @JsonProperty("run_untagged") private Boolean runUntagged; + @JsonProperty("locked") private Boolean locked; + @JsonProperty("platform") private String platform; + @JsonProperty("architecture") private String architecture; + @JsonProperty("projects") + private List projects; + public Integer getId() { - return id; + return this.id; } public void setId(Integer id) { @@ -34,7 +65,7 @@ public void setId(Integer id) { } public String getDescription() { - return description; + return this.description; } public void setDescription(String description) { @@ -42,7 +73,7 @@ public void setDescription(String description) { } public Boolean getActive() { - return active; + return this.active; } public void setActive(Boolean active) { @@ -50,15 +81,15 @@ public void setActive(Boolean active) { } public Boolean getShared() { - return isShared; + return this.isShared; } public void setShared(Boolean shared) { - isShared = shared; + this.isShared = shared; } public String getName() { - return name; + return this.name; } public void setName(String name) { @@ -66,7 +97,7 @@ public void setName(String name) { } public String getVersion() { - return version; + return this.version; } public void setVersion(String version) { @@ -74,7 +105,7 @@ public void setVersion(String version) { } public String getRevision() { - return revision; + return this.revision; } public void setRevision(String revision) { @@ -82,7 +113,7 @@ public void setRevision(String revision) { } public Date getContactedAt() { - return contactedAt; + return this.contactedAt; } public void setContactedAt(Date contactedAt) { @@ -90,7 +121,7 @@ public void setContactedAt(Date contactedAt) { } public List getTagList() { - return tagList; + return this.tagList; } public void setTagList(List tagList) { @@ -98,7 +129,7 @@ public void setTagList(List tagList) { } public Boolean isRunUntagged() { - return runUntagged; + return this.runUntagged; } public void setRunUntagged(boolean runUntagged) { @@ -106,7 +137,7 @@ public void setRunUntagged(boolean runUntagged) { } public Boolean isLocked() { - return locked; + return this.locked; } public void setLocked(boolean locked) { @@ -115,7 +146,7 @@ public void setLocked(boolean locked) { public String getPlatform() { - return platform; + return this.platform; } public void setPlatform(String platform) { @@ -123,7 +154,7 @@ public void setPlatform(String platform) { } public String getArchitecture() { - return architecture; + return this.architecture; } public void setArchitecture(String architecture) { diff --git a/src/main/java/org/gitlab/api/models/GitlabUser.java b/src/main/java/org/gitlab/api/models/GitlabUser.java index 26dc04ae..9e82dbb1 100644 --- a/src/main/java/org/gitlab/api/models/GitlabUser.java +++ b/src/main/java/org/gitlab/api/models/GitlabUser.java @@ -44,7 +44,7 @@ public class GitlabUser { private String _bio; @JsonProperty("dark_scheme") - private boolean _darkScheme; + private Boolean _darkScheme; @JsonProperty("theme_id") private Integer _themeId; @@ -53,16 +53,16 @@ public class GitlabUser { private String _externUid; @JsonProperty("is_admin") - private boolean _isAdmin; + private Boolean _isAdmin; @JsonProperty("can_create_group") - private boolean _canCreateGroup; + private Boolean _canCreateGroup; @JsonProperty("can_create_project") - private boolean _canCreateProject; + private Boolean _canCreateProject; @JsonProperty("can_create_team") - private boolean _canCreateTeam; + private Boolean _canCreateTeam; @JsonProperty("avatar_url") private String _avatarUrl; @@ -80,171 +80,171 @@ public class GitlabUser { private Date _lastActivityOn; public Integer getId() { - return _id; + return this._id; } public void setId(Integer id) { - _id = id; + this._id = id; } public String getUsername() { - return _username; + return this._username; } public void setUsername(String userName) { - _username = userName; + this._username = userName; } public String getEmail() { - return _email; + return this._email; } public void setEmail(String email) { - _email = email; + this._email = email; } public String getName() { - return _name; + return this._name; } public void setName(String name) { - _name = name; + this._name = name; } public Boolean isBlocked() { - return _blocked; + return this._blocked; } public void setBlocked(Boolean blocked) { - _blocked = blocked; + this._blocked = blocked; } public Date getCreatedAt() { - return _createdAt; + return this._createdAt; } public void setCreatedAt(Date createdAt) { - _createdAt = createdAt; + this._createdAt = createdAt; } public String getBio() { - return _bio; + return this._bio; } public void setBio(String bio) { - _bio = bio; + this._bio = bio; } public String getSkype() { - return _skype; + return this._skype; } public void setSkype(String skype) { - _skype = skype; + this._skype = skype; } public String getLinkedin() { - return _linkedin; + return this._linkedin; } public void setLinkedin(String linkedin) { - _linkedin = linkedin; + this._linkedin = linkedin; } public String getTwitter() { - return _twitter; + return this._twitter; } public void setTwitter(String twitter) { - _twitter = twitter; + this._twitter = twitter; } - public boolean isDarkScheme() { - return _darkScheme; + public Boolean isDarkScheme() { + return this._darkScheme; } public void setDarkScheme(boolean darkScheme) { - _darkScheme = darkScheme; + this._darkScheme = darkScheme; } public Integer getThemeId() { - return _themeId; + return this._themeId; } public void setThemeId(Integer themeId) { - _themeId = themeId; + this._themeId = themeId; } public String getExternUid() { - return _externUid; + return this._externUid; } public void setExternUid(String externUid) { - _externUid = externUid; + this._externUid = externUid; } public String getProvider() { - return _provider; + return this._provider; } public void setProvider(String provider) { - _provider = provider; + this._provider = provider; } public String getState() { - return _state; + return this._state; } public void setState(String state) { - _state = state; + this._state = state; } public String getExternProviderName() { - return _externProviderName; + return this._externProviderName; } public void setExternProviderName(String externProviderName) { - _externProviderName = externProviderName; + this._externProviderName = externProviderName; } public String getWebsiteUrl() { - return _websiteUrl; + return this._websiteUrl; } public void setWebsiteUrl(String websiteUrl) { - _websiteUrl = websiteUrl; + this._websiteUrl = websiteUrl; } - public boolean isAdmin() { - return _isAdmin; + public Boolean isAdmin() { + return this._isAdmin; } public void setAdmin(boolean admin) { - _isAdmin = admin; + this._isAdmin = admin; } - public boolean isCanCreateGroup() { - return _canCreateGroup; + public Boolean isCanCreateGroup() { + return this._canCreateGroup; } public void setCanCreateGroup(boolean canCreateGroup) { - _canCreateGroup = canCreateGroup; + this._canCreateGroup = canCreateGroup; } - public boolean isCanCreateProject() { - return _canCreateProject; + public Boolean isCanCreateProject() { + return this._canCreateProject; } public void setCanCreateProject(boolean canCreateProject) { - _canCreateProject = canCreateProject; + this._canCreateProject = canCreateProject; } - public boolean isCanCreateTeam() { - return _canCreateTeam; + public Boolean isCanCreateTeam() { + return this._canCreateTeam; } public void setCanCreateTeam(boolean canCreateTeam) { - _canCreateTeam = canCreateTeam; + this._canCreateTeam = canCreateTeam; } public String getAvatarUrl() { @@ -264,7 +264,7 @@ public void setColorSchemeId(Integer colorSchemeId) { } public String getPrivateToken() { - return _privateToken; + return this._privateToken; } public void setPrivateToken(String privateToken) { @@ -272,23 +272,23 @@ public void setPrivateToken(String privateToken) { } public Date getLastSignInAt() { - return _lastSignInAt; + return this._lastSignInAt; } public void setLastSignInAt(Date lastSignInAt) { - _lastSignInAt = lastSignInAt; + this._lastSignInAt = lastSignInAt; } public Date getCurrentSignInAt() { - return _currentSignInAt; + return this._currentSignInAt; } public void setCurrentSignInAt(Date currentSignInAt) { - _currentSignInAt = currentSignInAt; + this._currentSignInAt = currentSignInAt; } public Integer getProjectsLimit() { - return _projectsLimit; + return this._projectsLimit; } public void setProjectsLimit(Integer projectsLimit) { @@ -296,7 +296,7 @@ public void setProjectsLimit(Integer projectsLimit) { } public List getIdentities() { - return _identities; + return this._identities; } public void setIdentities(List identities) { @@ -304,7 +304,7 @@ public void setIdentities(List identities) { } public Date getLastActivityOn() { - return _lastActivityOn; + return this._lastActivityOn; } public void setLastActivityOn(Date _lastActivityOn) { From b1256c33c9ff410ab20584a9a1bad6d240433a53 Mon Sep 17 00:00:00 2001 From: Bryan Potere Date: Fri, 22 Dec 2017 14:20:18 -0500 Subject: [PATCH 063/119] Rename file_name to file_path (#272) --- .../api/models/GitlabSimpleRepositoryFile.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabSimpleRepositoryFile.java b/src/main/java/org/gitlab/api/models/GitlabSimpleRepositoryFile.java index 7b48f203..f1075922 100644 --- a/src/main/java/org/gitlab/api/models/GitlabSimpleRepositoryFile.java +++ b/src/main/java/org/gitlab/api/models/GitlabSimpleRepositoryFile.java @@ -8,18 +8,18 @@ public class GitlabSimpleRepositoryFile { "branch_name": "master" */ - @JsonProperty("file_name") - private String fileName; + @JsonProperty("file_path") + private String filePath; - @JsonProperty("branch_name") + @JsonProperty("branch") private String branchName; - public String getFileName() { - return fileName; + public String getFilePath() { + return filePath; } - public void setFileName(String fileName) { - this.fileName = fileName; + public void setFilePath(String filePath) { + this.filePath = filePath; } public String getBranchName() { From cc235d92a679f68ee85bf2e61e325ca122e793bc Mon Sep 17 00:00:00 2001 From: Florian Baader Date: Wed, 27 Dec 2017 20:02:23 +0100 Subject: [PATCH 064/119] Introduced Job API (#279) * Introduced Job API * Add pipeline field of GitlabCommit --- src/main/java/org/gitlab/api/GitlabAPI.java | 744 ++++++++++-------- .../org/gitlab/api/models/GitlabCommit.java | 15 +- .../org/gitlab/api/models/GitlabPipeline.java | 52 ++ 3 files changed, 482 insertions(+), 329 deletions(-) create mode 100644 src/main/java/org/gitlab/api/models/GitlabPipeline.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index af933a77..1112f0f7 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2,12 +2,14 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; - import org.gitlab.api.http.GitlabHTTPRequestor; import org.gitlab.api.http.Query; import org.gitlab.api.models.*; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.Serializable; +import java.io.UnsupportedEncodingException; import java.net.Proxy; import java.net.URL; import java.net.URLEncoder; @@ -125,9 +127,10 @@ public List getUsers() throws IOException { /** * Finds users by email address or username. + * * @param emailOrUsername Some portion of the email address or username * @return A non-null List of GitlabUser instances. If the search term is - * null or empty a List with zero GitlabUsers is returned. + * null or empty a List with zero GitlabUsers is returned. * @throws IOException */ public List findUsers(String emailOrUsername) throws IOException { @@ -176,7 +179,7 @@ public GitlabUser getUserViaSudo(String username) throws IOException { * @param isAdmin Is Admin * @param can_create_group Can Create Group * @param skip_confirmation Skip Confirmation - * @return A GitlabUser + * @return A GitlabUser * @throws IOException on gitlab api call error * @see http://doc.gitlab.com/ce/api/users.html */ @@ -208,16 +211,17 @@ public GitlabUser createUser(String email, String password, String username, return dispatch().to(tailUrl, GitlabUser.class); } - + /** * Create a new user. This may succeed only if the requester is an administrator. + * * @param request An object that represents the parameters for the request. * @return {@link GitlabUser} * @throws IOException on gitlab api call error */ public GitlabUser createUser(CreateUserRequest request) throws IOException { - String tailUrl = GitlabUser.USERS_URL + request.toQuery().toString(); - return dispatch().to(tailUrl, GitlabUser.class); + String tailUrl = GitlabUser.USERS_URL + request.toQuery().toString(); + return dispatch().to(tailUrl, GitlabUser.class); } @@ -356,7 +360,7 @@ public GitlabSSHKey getSSHKey(Integer keyId) throws IOException { /** * Delete a user * - * @param targetUserId The target User ID + * @param targetUserId The target User ID * @throws IOException on gitlab api call error */ public void deleteUser(Integer targetUserId) throws IOException { @@ -471,8 +475,8 @@ public GitlabGroup createGroup(String name, String path) throws IOException { /** * Creates a Group * - * @param name The name of the group - * @param path The path for the group + * @param name The name of the group + * @param path The path for the group * @param sudoUser The user to create the group on behalf of * @return The GitLab Group * @throws IOException on gitlab api call error @@ -488,7 +492,6 @@ public GitlabGroup createGroupViaSudo(String name, String path, GitlabUser sudoU * @param path The path for the group * @param ldapCn LDAP Group Name to sync with, null otherwise * @param ldapAccess Access level for LDAP group members, null otherwise - * * @return The GitLab Group * @throws IOException on gitlab api call error */ @@ -502,14 +505,13 @@ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAc * * @param request An object that represents the parameters for the request. * @param sudoUser The user for whom we're creating the group - * * @return The GitLab Group * @throws IOException on gitlab api call error */ - public GitlabGroup createGroup(CreateGroupRequest request, GitlabUser sudoUser) throws IOException { + public GitlabGroup createGroup(CreateGroupRequest request, GitlabUser sudoUser) throws IOException { Query query = request.toQuery(); query.appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null); - + String tailUrl = GitlabGroup.URL + query.toString(); return dispatch().to(tailUrl, GitlabGroup.class); @@ -522,8 +524,7 @@ public GitlabGroup createGroup(CreateGroupRequest request, GitlabUser sudoUser) * @param path The path for the group * @param ldapCn LDAP Group Name to sync with, null otherwise * @param ldapAccess Access level for LDAP group members, null otherwise - * @param sudoUser The user to create the group on behalf of - * + * @param sudoUser The user to create the group on behalf of * @return The GitLab Group * @throws IOException on gitlab api call error */ @@ -541,7 +542,6 @@ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAc * @param sudoUser The user to create the group on behalf of * @param parentId The id of a parent group; the new group will be its subgroup * @return The GitLab Group - * * @throws IOException on gitlab api call error */ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAccessLevel ldapAccess, GitlabUser sudoUser, Integer parentId) throws IOException { @@ -632,7 +632,7 @@ public GitlabProject getProject(Serializable projectId) throws IOException { /** * use namespace & project name to get project */ - public GitlabProject getProject(String namespace, String projectName) throws IOException{ + public GitlabProject getProject(String namespace, String projectName) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeGroupId(namespace) + "%2F" + sanitizeProjectId(projectName); return retrieve().to(tailUrl, GitlabProject.class); } @@ -640,7 +640,7 @@ public GitlabProject getProject(String namespace, String projectName) throws IOE /* * use project id to get Project JSON */ - public String getProjectJson (Serializable projectId) throws IOException { + public String getProjectJson(Serializable projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId); return retrieve().to(tailUrl, String.class); } @@ -654,7 +654,6 @@ public String getProjectJson(String namespace, String projectName) throws IOExce } /** - * * Get a list of projects accessible by the authenticated user. * * @return A list of gitlab projects @@ -666,7 +665,6 @@ public List getProjects() throws IOException { } /** - * * Get a list of projects owned by the authenticated user. * * @return A list of gitlab projects @@ -680,7 +678,6 @@ public List getOwnedProjects() throws IOException { } /** - * * Get a list of projects that the authenticated user is a member of. * * @return A list of gitlab projects @@ -694,7 +691,6 @@ public List getMembershipProjects() throws IOException { } /** - * * Get a list of projects starred by the authenticated user. * * @return A list of gitlab projects @@ -708,7 +704,6 @@ public List getStarredProjects() throws IOException { } /** - * * Get a list of projects accessible by the authenticated user. * * @return A list of gitlab projects @@ -748,7 +743,6 @@ public GitlabUpload uploadFile(GitlabProject project, File file) throws IOExcept } /** - * * Gets a list of a project's jobs in Gitlab * * @param project the project @@ -760,7 +754,6 @@ public List getProjectJobs(GitlabProject project) throws IOException } /** - * * Gets a list of a project's jobs in Gitlab * * @param projectId the project id @@ -772,12 +765,92 @@ public List getProjectJobs(Integer projectId) throws IOException { return retrieve().getAll(tailUrl, GitlabJob[].class); } + /** + * Gets a list of project's jobs of the given pipeline in Gitlab * + * @param project the project + * @param pipelineId + * @return A list of project jobs + * @throws IOException + */ + public List getPipelineJobs(GitlabProject project, Integer pipelineId) throws IOException { + return getPipelineJobs(project.getId(), pipelineId); + } + + /** + * Gets a list of project's jobs of the given pipeline in Gitlab + * + * @param projectId + * @param pipelineId + * @return A list of project jobs + * @throws IOException + */ + public List getPipelineJobs(Integer projectId, Integer pipelineId) { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabPipeline.URL + "/" + sanitizeId(pipelineId, "PipelineID") + GitlabJob.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabJob[].class); + } + + + /** + * Cancel a single job of a project + * + * @param projectId + * @param jobId + * @return + * @throws IOException + */ + public GitlabJob cancelJob(Integer projectId, Integer jobId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + sanitizeId(jobId, "JobID") + "/cancel"; + return dispatch().to(tailUrl, GitlabJob.class); + } + + /** + * Retry a single job of a project + * + * @param projectId + * @param jobId + * @return + * @throws IOException + */ + public GitlabJob retryJob(Integer projectId, Integer jobId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + sanitizeId(jobId, "JobID") + "/retry"; + return dispatch().to(tailUrl, GitlabJob.class); + } + + /** + * Erase a single job of a project (remove job artifacts and a job trace) + * + * @param projectId + * @param jobId + * @return + * @throws IOException + */ + public GitlabJob eraseJob(Integer projectId, Integer jobId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + sanitizeId(jobId, "JobID") + "/erase"; + return dispatch().to(tailUrl, GitlabJob.class); + } + + + /** + * Triggers a manual action to start a job. + * + * @param projectId + * @param jobId + * @return + * @throws IOException + */ + public GitlabJob playJob(Integer projectId, Integer jobId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + sanitizeId(jobId, "JobID") + "/play"; + return dispatch().to(tailUrl, GitlabJob.class); + } + + + /** * Gets a build for a project * * @param projectId the project id - * @param jobId the build id + * @param jobId the build id * @return A list of project jobs * @throws IOException */ @@ -790,7 +863,7 @@ public GitlabJob getProjectJob(Integer projectId, Integer jobId) throws IOExcept * Get build artifacts of a project build * * @param project The Project - * @param job The build + * @param job The build * @throws IOException on gitlab api call error */ public byte[] getJobArtifact(GitlabProject project, GitlabJob job) throws IOException { @@ -801,7 +874,7 @@ public byte[] getJobArtifact(GitlabProject project, GitlabJob job) throws IOExce * Get build artifacts of a project build * * @param projectId The Project's Id - * @param jobId The build's Id + * @param jobId The build's Id * @throws IOException on gitlab api call error */ public byte[] getJobArtifact(Integer projectId, Integer jobId) throws IOException { @@ -813,7 +886,7 @@ public byte[] getJobArtifact(Integer projectId, Integer jobId) throws IOExceptio * Get build trace of a project build * * @param project The Project - * @param job The build + * @param job The build * @throws IOException on gitlab api call error */ public byte[] getJobTrace(GitlabProject project, GitlabJob job) throws IOException { @@ -824,7 +897,7 @@ public byte[] getJobTrace(GitlabProject project, GitlabJob job) throws IOExcepti * Get build trace of a project build * * @param projectId The Project's Id - * @param jobId The build's Id + * @param jobId The build's Id * @throws IOException on gitlab api call error */ public byte[] getJobTrace(Integer projectId, Integer jobId) throws IOException { @@ -868,7 +941,7 @@ public GitlabProject createProject(GitlabProject project) throws IOException { GitlabNamespace namespace = project.getNamespace(); if (namespace != null) { - query.appendIf("namespace_id", namespace.getId()); + query.appendIf("namespace_id", namespace.getId()); } @@ -916,10 +989,10 @@ public GitlabProject createProjectForGroup(String name, GitlabGroup group, Strin /** * Creates a group Project * - * @param name The name of the project - * @param group The group for which the project should be crated - * @param description The project description - * @param visibility The project visibility level (private: 0, internal: 10, public: 20) + * @param name The name of the project + * @param group The group for which the project should be crated + * @param description The project description + * @param visibility The project visibility level (private: 0, internal: 10, public: 20) * @return The GitLab Project * @throws IOException on gitlab api call error */ @@ -1046,24 +1119,23 @@ public GitlabProject createFork(String namespace, GitlabProject gitlabProject) t * @param mergeRequestsEnabled Whether Merge Requests should be enabled, otherwise null indicates to use GitLab default * @param wikiEnabled Whether a Wiki should be enabled, otherwise null indicates to use GitLab default * @param snippetsEnabled Whether Snippets should be enabled, otherwise null indicates to use GitLab default - * @param visibility The visibility level of the project, otherwise null indicates to use GitLab default + * @param visibility The visibility level of the project, otherwise null indicates to use GitLab default * @return the Gitlab Project * @throws IOException on gitlab api call error */ @Deprecated public GitlabProject updateProject( Integer projectId, - String name, - String description, - String defaultBranch, + String name, + String description, + String defaultBranch, Boolean issuesEnabled, Boolean wallEnabled, Boolean mergeRequestsEnabled, Boolean wikiEnabled, Boolean snippetsEnabled, String visibility) - throws IOException - { + throws IOException { Query query = new Query() .appendIf("name", name) .appendIf("description", description) @@ -1191,17 +1263,17 @@ public List getAllMergeRequests(GitlabProject project) throw * EE only. */ public GitlabMergeRequestApprovals getMergeRequestApprovals(GitlabMergeRequest mr) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(mr.getProjectId()) + - GitlabMergeRequest.URL + "/" + mr.getIid() + GitlabMergeRequestApprovals.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(mr.getProjectId()) + + GitlabMergeRequest.URL + "/" + mr.getIid() + GitlabMergeRequestApprovals.URL; return retrieve().to(tailUrl, GitlabMergeRequestApprovals.class); } /** * Cherry picks a commit. * - * @param projectId The id of the project - * @param sha The sha of the commit - * @param targetBranchName The branch on which the commit must be cherry-picked + * @param projectId The id of the project + * @param sha The sha of the commit + * @param targetBranchName The branch on which the commit must be cherry-picked * @return the commit of the cherry-pick. * @throws IOException on gitlab api call error */ @@ -1231,8 +1303,8 @@ public GitlabMergeRequest getMergeRequestByIid(Serializable projectId, Integer m /** * Return a Merge Request including its changes. * - * @param projectId The id of the project - * @param mergeRequestId The id of the merge request + * @param projectId The id of the project + * @param mergeRequestId The id of the merge request * @return the Gitlab Merge Request * @throws IOException on gitlab api call error */ @@ -1273,18 +1345,17 @@ public GitlabMergeRequest createMergeRequest(Serializable projectId, String sour } - /** * Updates a Merge Request * - * @param projectId The id of the project - * @param mergeRequestId The id of the merge request to update - * @param targetBranch The target branch of the merge request, otherwise null to leave it untouched - * @param assigneeId The id of the assignee, otherwise null to leave it untouched - * @param title The title of the merge request, otherwise null to leave it untouched - * @param description The description of the merge request, otherwise null to leave it untouched - * @param stateEvent The state (close|reopen|merge) of the merge request, otherwise null to leave it untouched - * @param labels A comma separated list of labels, otherwise null to leave it untouched + * @param projectId The id of the project + * @param mergeRequestId The id of the merge request to update + * @param targetBranch The target branch of the merge request, otherwise null to leave it untouched + * @param assigneeId The id of the assignee, otherwise null to leave it untouched + * @param title The title of the merge request, otherwise null to leave it untouched + * @param description The description of the merge request, otherwise null to leave it untouched + * @param stateEvent The state (close|reopen|merge) of the merge request, otherwise null to leave it untouched + * @param labels A comma separated list of labels, otherwise null to leave it untouched * @return the Merge Request * @throws IOException on gitlab api call error */ @@ -1305,8 +1376,8 @@ public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mer } /** - * @param project The Project - * @param mergeRequestId Merge Request ID + * @param project The Project + * @param mergeRequestId Merge Request ID * @param mergeCommitMessage optional merge commit message. Null if not set * @return new merge request status * @throws IOException on gitlab api call error @@ -1324,8 +1395,8 @@ public GitlabMergeRequest acceptMergeRequest(GitlabProject project, Integer merg /** * Get a Note from a Merge Request. * - * @param mergeRequest The merge request - * @param noteId The id of the note + * @param mergeRequest The merge request + * @param noteId The id of the note * @return the Gitlab Note * @throws IOException on gitlab api call error */ @@ -1497,9 +1568,9 @@ public GitlabCommitStatus createCommitStatus(GitlabProject project, String commi /** * Get raw file content * - * @param project The Project - * @param sha The commit or branch name - * @param filepath The path of the file + * @param project The Project + * @param sha The commit or branch name + * @param filepath The path of the file * @throws IOException on gitlab api call error */ public byte[] getRawFileContent(GitlabProject project, String sha, String filepath) throws IOException { @@ -1510,8 +1581,8 @@ public byte[] getRawFileContent(GitlabProject project, String sha, String filepa * Get raw file content * * @param projectId The Project - * @param sha The commit or branch name - * @param filepath The path of the file + * @param sha The commit or branch name + * @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 { @@ -1526,7 +1597,7 @@ public byte[] getRawFileContent(Integer projectId, String sha, String filepath) * Get the raw file contents for a blob by blob SHA. * * @param project The Project - * @param sha The commit or branch name + * @param sha The commit or branch name * @throws IOException on gitlab api call error */ public byte[] getRawBlobContent(GitlabProject project, String sha) throws IOException { @@ -1549,8 +1620,8 @@ public byte[] getFileArchive(GitlabProject project) throws IOException { * Get an archive of the repository * * @param project The Project - * @param path The path inside the repository. Used to get content of subdirectories (optional) - * @param ref The name of a repository branch or tag or if not given the default branch (optional) + * @param path The path inside the repository. Used to get content of subdirectories (optional) + * @param ref The name of a repository branch or tag or if not given the default branch (optional) * @throws IOException on gitlab api call error */ public List getRepositoryTree(GitlabProject project, String path, String ref, boolean recursive) throws IOException { @@ -1561,7 +1632,7 @@ public List getRepositoryTree(GitlabProject project, Strin String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository" + GitlabRepositoryTree.URL + query.toString(); return retrieve().getAll(tailUrl, GitlabRepositoryTree[].class); - } + } public GitlabRepositoryFile getRepositoryFile(GitlabProject project, String path, String ref) throws IOException { Query query = new Query() @@ -1574,11 +1645,11 @@ public GitlabRepositoryFile getRepositoryFile(GitlabProject project, String path /** * Creates a new file in the repository * - * @param project The Project - * @param path The file path inside the repository + * @param project The Project + * @param path The file path inside the repository * @param branchName The name of a repository branch - * @param commitMsg The commit message - * @param content The base64 encoded content of the file + * @param commitMsg The commit message + * @param content The base64 encoded content of the file * @throws IOException on gitlab api call error */ public GitlabSimpleRepositoryFile createRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg, String content) throws IOException { @@ -1586,21 +1657,21 @@ public GitlabSimpleRepositoryFile createRepositoryFile(GitlabProject project, St GitlabHTTPRequestor requestor = dispatch(); return requestor - .with("branch", branchName) - .with("encoding", "base64") - .with("commit_message", commitMsg) - .with("content", content) - .to(tailUrl, GitlabSimpleRepositoryFile.class); + .with("branch", branchName) + .with("encoding", "base64") + .with("commit_message", commitMsg) + .with("content", content) + .to(tailUrl, GitlabSimpleRepositoryFile.class); } /** * Updates the content of an existing file in the repository * - * @param project The Project - * @param path The file path inside the repository + * @param project The Project + * @param path The file path inside the repository * @param branchName The name of a repository branch - * @param commitMsg The commit message - * @param content The base64 encoded content of the file + * @param commitMsg The commit message + * @param content The base64 encoded content of the file * @throws IOException on gitlab api call error */ public GitlabSimpleRepositoryFile updateRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg, String content) throws IOException { @@ -1608,26 +1679,26 @@ public GitlabSimpleRepositoryFile updateRepositoryFile(GitlabProject project, St GitlabHTTPRequestor requestor = retrieve().method("PUT"); return requestor - .with("branch", branchName) - .with("encoding", "base64") - .with("commit_message", commitMsg) - .with("content", content) - .to(tailUrl, GitlabSimpleRepositoryFile.class); + .with("branch", branchName) + .with("encoding", "base64") + .with("commit_message", commitMsg) + .with("content", content) + .to(tailUrl, GitlabSimpleRepositoryFile.class); } /** * Deletes an existing file in the repository * - * @param project The Project - * @param path The file path inside the repository + * @param project The Project + * @param path The file path inside the repository * @param branchName The name of a repository branch - * @param commitMsg The commit message + * @param commitMsg The commit message * @throws IOException on gitlab api call error */ public void deleteRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg) throws IOException { Query query = new Query() - .append("branch", branchName) - .append("commit_message", commitMsg); + .append("branch", branchName) + .append("commit_message", commitMsg); String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files/" + sanitizePath(path) + query.toString(); retrieve().method("DELETE").to(tailUrl, Void.class); } @@ -1635,9 +1706,9 @@ public void deleteRepositoryFile(GitlabProject project, String path, String bran /** * Update a Merge Request Note * - * @param mergeRequest The merge request - * @param noteId The id of the note - * @param body The content of the note + * @param mergeRequest The merge request + * @param noteId The id of the note + * @param body The content of the note * @return the Gitlab Note * @throws IOException on gitlab api call error */ @@ -1661,15 +1732,15 @@ public GitlabNote createNote(GitlabMergeRequest mergeRequest, String body) throw /** * Delete a Merge Request Note * - * @param mergeRequest The merge request - * @param noteToDelete The note to delete + * @param mergeRequest The merge request + * @param noteToDelete The note to delete * @throws IOException on gitlab api call error */ public void deleteNote(GitlabMergeRequest mergeRequest, GitlabNote noteToDelete) throws IOException { - String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getIid() + GitlabNote.URL + "/" + noteToDelete.getId(); - retrieve().method("DELETE").to(tailUrl, GitlabNote.class); - } + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + + mergeRequest.getIid() + GitlabNote.URL + "/" + noteToDelete.getId(); + retrieve().method("DELETE").to(tailUrl, GitlabNote.class); + } public List getBranches(Serializable projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + PARAM_MAX_ITEMS_PER_PAGE; @@ -1684,12 +1755,12 @@ public List getBranches(GitlabProject project) throws IOException /** * Create Branch. * - * Create Repository Branch Documentation + * Create Repository Branch Documentation * * - * @param project The gitlab project + * @param project The gitlab project * @param branchName The name of the branch to create - * @param ref The branch name or commit SHA to create branch from + * @param ref The branch name or commit SHA to create branch from * @throws IOException on gitlab api call error */ public void createBranch(GitlabProject project, String branchName, String ref) throws IOException { @@ -1699,13 +1770,12 @@ public void createBranch(GitlabProject project, String branchName, String ref) t /** * Create Branch. * - * Create Repository Branch Documentation + * Create Repository Branch Documentation * * - * * @param projectId The id of the project * @param branchName The name of the branch to create - * @param ref The branch name or commit SHA to create branch from + * @param ref The branch name or commit SHA to create branch from * @throws IOException on gitlab api call error */ public void createBranch(Serializable projectId, String branchName, String ref) throws IOException { @@ -1731,7 +1801,7 @@ public GitlabBranch getBranch(Serializable projectId, String branchName) throws } public GitlabBranch getBranch(GitlabProject project, String branchName) throws IOException { - return getBranch(project.getId(),branchName); + return getBranch(project.getId(), branchName); } public void protectBranch(GitlabProject project, String branchName) throws IOException { @@ -1917,31 +1987,32 @@ public GitlabNote createNote(GitlabIssue issue, String message) throws IOExcepti /** * Delete an Issue Note * - * @param projectId The project id - * @param issueId The issue id - * @param noteToDelete The note to delete + * @param projectId The project id + * @param issueId The issue id + * @param noteToDelete The note to delete * @throws IOException on gitlab api call error */ - public void deleteNote(Serializable projectId, Integer issueId, GitlabNote noteToDelete) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) - + GitlabIssue.URL + "/" + issueId + GitlabNote.URL - + "/" + noteToDelete.getId(); - retrieve().method("DELETE").to(tailUrl, GitlabNote.class); - } + public void deleteNote(Serializable projectId, Integer issueId, GitlabNote noteToDelete) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + + GitlabIssue.URL + "/" + issueId + GitlabNote.URL + + "/" + noteToDelete.getId(); + retrieve().method("DELETE").to(tailUrl, GitlabNote.class); + } - /** + /** * Delete an Issue Note * - * @param issue The issue - * @param noteToDelete The note to delete + * @param issue The issue + * @param noteToDelete The note to delete * @throws IOException on gitlab api call error */ - public void deleteNote(GitlabIssue issue, GitlabNote noteToDelete) throws IOException { - deleteNote(String.valueOf(issue.getProjectId()), issue.getId(), noteToDelete); - } + public void deleteNote(GitlabIssue issue, GitlabNote noteToDelete) throws IOException { + deleteNote(String.valueOf(issue.getProjectId()), issue.getId(), noteToDelete); + } /** * Gets labels associated with a project. + * * @param projectId The ID of the project. * @return A non-null list of labels. * @throws IOException @@ -1955,6 +2026,7 @@ public List getLabels(Serializable projectId) /** * Gets labels associated with a project. + * * @param project The project associated with labels. * @return A non-null list of labels. * @throws IOException @@ -1966,9 +2038,10 @@ public List getLabels(GitlabProject project) /** * Creates a new label. + * * @param projectId The ID of the project containing the new label. - * @param name The name of the label. - * @param color The color of the label (eg #ff0000). + * @param name The name of the label. + * @param color The color of the label (eg #ff0000). * @return The newly created label. * @throws IOException */ @@ -1978,14 +2051,15 @@ public GitlabLabel createLabel( String color) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabLabel.URL; return dispatch().with("name", name) - .with("color", color) - .to(tailUrl, GitlabLabel.class); + .with("color", color) + .to(tailUrl, GitlabLabel.class); } /** * Creates a new label. + * * @param projectId The ID of the project containing the label. - * @param label The label to create. + * @param label The label to create. * @return The newly created label. */ public GitlabLabel createLabel(Serializable projectId, GitlabLabel label) @@ -1997,8 +2071,9 @@ public GitlabLabel createLabel(Serializable projectId, GitlabLabel label) /** * Deletes an existing label. + * * @param projectId The ID of the project containing the label. - * @param name The name of the label to delete. + * @param name The name of the label to delete. * @throws IOException */ public void deleteLabel(Serializable projectId, String name) @@ -2014,8 +2089,9 @@ public void deleteLabel(Serializable projectId, String name) /** * Deletes an existing label. + * * @param projectId The ID of the project containing the label. - * @param label The label to delete. + * @param label The label to delete. * @throws IOException */ public void deleteLabel(Serializable projectId, GitlabLabel label) @@ -2025,10 +2101,11 @@ public void deleteLabel(Serializable projectId, GitlabLabel label) /** * Updates an existing label. + * * @param projectId The ID of the project containing the label. - * @param name The name of the label to update. - * @param newName The updated name. - * @param newColor The updated color. + * @param name The name of the label to update. + * @param newName The updated name. + * @param newColor The updated color. * @return The updated, deserialized label. * @throws IOException */ @@ -2068,11 +2145,12 @@ public List getGroupMilestones(Serializable groupId) throws IOE /** * Cretaes a new project milestone. - * @param projectId The ID of the project. - * @param title The title of the milestone. + * + * @param projectId The ID of the project. + * @param title The title of the milestone. * @param description The description of the milestone. (Optional) - * @param dueDate The date the milestone is due. (Optional) - * @param startDate The start date of the milestone. (Optional) + * @param dueDate The date the milestone is due. (Optional) + * @param startDate The start date of the milestone. (Optional) * @return The newly created, de-serialized milestone. * @throws IOException */ @@ -2099,6 +2177,7 @@ public GitlabMilestone createMilestone( /** * Creates a new project milestone. + * * @param projectId The ID of the project. * @param milestone The milestone to create. * @return The newly created, de-serialized milestone. @@ -2116,14 +2195,15 @@ public GitlabMilestone createMilestone( /** * Updates an existing project milestone. - * @param projectId The ID of the project. + * + * @param projectId The ID of the project. * @param milestoneId The ID of the milestone. - * @param title The title of the milestone. (Optional) + * @param title The title of the milestone. (Optional) * @param description The description of the milestone. (Optional) - * @param dueDate The date the milestone is due. (Optional) - * @param startDate The start date of the milestone. (Optional) - * @param stateEvent A value used to update the state of the milestone. - * (Optional) (activate | close) + * @param dueDate The date the milestone is due. (Optional) + * @param startDate The start date of the milestone. (Optional) + * @param stateEvent A value used to update the state of the milestone. + * (Optional) (activate | close) * @return The updated, de-serialized milestone. * @throws IOException */ @@ -2161,8 +2241,9 @@ public GitlabMilestone updateMilestone( /** * Updates an existing project milestone. - * @param projectId The ID of the project. - * @param edited The already edited milestone. + * + * @param projectId The ID of the project. + * @param edited The already edited milestone. * @param stateEvent A value used to update the state of the milestone. * (Optional) (activate | close) * @return The updated, de-serialized milestone. @@ -2183,10 +2264,11 @@ public GitlabMilestone updateMilestone( /** * Updates an existing project milestone. - * @param edited The already edited milestone. - * @return The updated, de-serialized milestone. + * + * @param edited The already edited milestone. * @param stateEvent A value used to update the state of the milestone. * (Optional) (activate | close) + * @return The updated, de-serialized milestone. * @throws IOException */ public GitlabMilestone updateMilestone( @@ -2259,11 +2341,11 @@ public List getProjectMembers(GitlabProject project, Pagina } public List getProjectMembers(Serializable projectId) throws IOException { - return getProjectMembers(projectId, new Pagination()); + return getProjectMembers(projectId, new Pagination()); } public List getProjectMembers(Serializable projectId, Pagination pagination) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectMember.URL + pagination.asQuery(); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectMember.URL + pagination.asQuery(); return Arrays.asList(retrieve().to(tailUrl, GitlabProjectMember[].class)); } @@ -2271,7 +2353,7 @@ public List getProjectMembers(Serializable projectId, Pagin * This will fail, if the given namespace is a user and not a group * * @param namespace The namespace - * @return A list of Gitlab Project members + * @return A list of Gitlab Project members * @throws IOException on gitlab api call error */ public List getNamespaceMembers(GitlabNamespace namespace) throws IOException { @@ -2282,7 +2364,7 @@ public List getNamespaceMembers(GitlabNamespace namespace) * This will fail, if the given namespace is a user and not a group * * @param namespaceId Namespace ID - * @return A list of Gitlab Project members + * @return A list of Gitlab Project members * @throws IOException on gitlab api call error */ public List getNamespaceMembers(Integer namespaceId) throws IOException { @@ -2306,8 +2388,8 @@ public void transfer(Integer namespaceId, Integer projectId) throws IOException * Create a new deploy key for the project * * @param targetProjectId The id of the Gitlab project - * @param title The title of the ssh key - * @param key The public key + * @param title The title of the ssh key + * @param key The public key * @return The new GitlabSSHKey * @throws IOException on gitlab api call error */ @@ -2319,8 +2401,8 @@ public GitlabSSHKey createDeployKey(Integer targetProjectId, String title, Strin * Create a new deploy key for the project which can push. * * @param targetProjectId The id of the Gitlab project - * @param title The title of the ssh key - * @param key The public key + * @param title The title of the ssh key + * @param key The public key * @return The new GitlabSSHKey * @throws IOException on gitlab api call error */ @@ -2344,7 +2426,7 @@ private GitlabSSHKey createDeployKey(Integer targetProjectId, String title, Stri * Delete a deploy key for a project * * @param targetProjectId The id of the Gitlab project - * @param targetKeyId The id of the Gitlab ssh key + * @param targetKeyId The id of the Gitlab ssh key * @throws IOException on gitlab api call error */ public void deleteDeployKey(Integer targetProjectId, Integer targetKeyId) throws IOException { @@ -2435,7 +2517,7 @@ private String sanitizeId(Serializable id, String parameterName) { } } - private String sanitizePath(String branch){ + private String sanitizePath(String branch) { try { return URLEncoder.encode(branch, "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -2446,45 +2528,45 @@ private String sanitizePath(String branch){ /** * Post comment to commit * - * @param projectId (required) - The ID of a project - * @param sha (required) - The name of a repository branch or tag or if not given the default branch - * @param note (required) - Text of comment - * @param path (optional) - The file path - * @param line (optional) - The line number - * @param line_type (optional) - The line type (new or old) - * @return A CommitComment + * @param projectId (required) - The ID of a project + * @param sha (required) - The name of a repository branch or tag or if not given the default branch + * @param note (required) - Text of comment + * @param path (optional) - The file path + * @param line (optional) - The line number + * @param line_type (optional) - The line type (new or old) + * @return A CommitComment * @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, - String path, String line, String line_type) throws IOException { + String path, String line, String line_type) throws IOException { - Query query = new Query() - .append("id", projectId.toString()) - .appendIf("sha", sha) - .appendIf("note", note) - .appendIf("path", path) - .appendIf("line", line) - .appendIf("line_type", line_type); - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + sha + CommitComment.URL + query.toString(); + Query query = new Query() + .append("id", projectId.toString()) + .appendIf("sha", sha) + .appendIf("note", note) + .appendIf("path", path) + .appendIf("line", line) + .appendIf("line_type", line_type); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + sha + CommitComment.URL + query.toString(); - return dispatch().to(tailUrl, CommitComment.class); + return dispatch().to(tailUrl, CommitComment.class); } /** * Get the comments of a commit * - * @param projectId (required) - The ID of a project - * @param sha (required) - The name of a repository branch or tag or if not given the default branch - * @return A CommitComment + * @param projectId (required) - The ID of a project + * @param sha (required) - The name of a repository branch or tag or if not given the default branch + * @return A CommitComment * @throws IOException on gitlab api call error * @see http://doc.gitlab.com/ce/api/commits.html#post-comment-to-commit */ public List getCommitComments(Integer projectId, String sha) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + sha + CommitComment.URL; + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/commits/" + sha + CommitComment.URL; - return Arrays.asList(retrieve().to(tailUrl, CommitComment[].class)); + return Arrays.asList(retrieve().to(tailUrl, CommitComment[].class)); } /** @@ -2495,8 +2577,8 @@ public List getCommitComments(Integer projectId, String sha) thro * @throws IOException on gitlab api call error */ public List getTags(Serializable projectId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL + PARAM_MAX_ITEMS_PER_PAGE; - return retrieve().getAll(tailUrl, GitlabTag[].class); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabTag[].class); } /** @@ -2507,8 +2589,8 @@ public List getTags(Serializable projectId) throws IOException { * @throws IOException on gitlab api call error */ public List getTags(GitlabProject project) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabTag.URL + PARAM_MAX_ITEMS_PER_PAGE; - return retrieve().getAll(tailUrl, GitlabTag[].class); + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabTag.URL + PARAM_MAX_ITEMS_PER_PAGE; + return retrieve().getAll(tailUrl, GitlabTag[].class); } /** @@ -2523,13 +2605,13 @@ public List getTags(GitlabProject project) throws IOException { * @throws IOException on gitlab api call error */ public GitlabTag addTag(Serializable projectId, String tagName, String ref, String message, String releaseDescription) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL; - return dispatch() - .with("tag_name", tagName ) - .with("ref", ref) - .with("message", message) - .with("release_description", releaseDescription) - .to(tailUrl, GitlabTag.class); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL; + return dispatch() + .with("tag_name", tagName) + .with("ref", ref) + .with("message", message) + .with("release_description", releaseDescription) + .to(tailUrl, GitlabTag.class); } /** @@ -2544,13 +2626,13 @@ public GitlabTag addTag(Serializable projectId, String tagName, String ref, Stri * @throws IOException on gitlab api call error */ public GitlabTag addTag(GitlabProject project, String tagName, String ref, String message, String releaseDescription) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabTag.URL; - return dispatch() - .with("tag_name", tagName ) - .with("ref", ref) - .with("message", message) - .with("release_description", releaseDescription) - .to(tailUrl, GitlabTag.class); + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabTag.URL; + return dispatch() + .with("tag_name", tagName) + .with("ref", ref) + .with("message", message) + .with("release_description", releaseDescription) + .to(tailUrl, GitlabTag.class); } /** @@ -2561,8 +2643,8 @@ public GitlabTag addTag(GitlabProject project, String tagName, String ref, Strin * @throws IOException on gitlab api call error */ public void deleteTag(Serializable projectId, String tagName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL + "/" + tagName; - retrieve().method("DELETE").to(tailUrl, Void.class); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL + "/" + tagName; + retrieve().method("DELETE").to(tailUrl, Void.class); } /** @@ -2573,8 +2655,8 @@ public void deleteTag(Serializable projectId, String tagName) throws IOException * @throws IOException on gitlab api call error */ public void deleteTag(GitlabProject project, String tagName) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project + GitlabTag.URL + "/" + tagName; - retrieve().method("DELETE").to(tailUrl, Void.class); + String tailUrl = GitlabProject.URL + "/" + project + GitlabTag.URL + "/" + tagName; + retrieve().method("DELETE").to(tailUrl, Void.class); } /** @@ -2583,12 +2665,12 @@ public void deleteTag(GitlabProject project, String tagName) throws IOException * @param mergeRequest * @throws IOException on gitlab api call error */ - public List getAllAwards(GitlabMergeRequest mergeRequest) throws IOException { - String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getIid() + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; + public List getAllAwards(GitlabMergeRequest mergeRequest) throws IOException { + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + + mergeRequest.getIid() + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; - return retrieve().getAll(tailUrl, GitlabAward[].class); - } + return retrieve().getAll(tailUrl, GitlabAward[].class); + } /** * Get a specific award for a merge request @@ -2597,12 +2679,12 @@ public List getAllAwards(GitlabMergeRequest mergeRequest) throws IO * @param awardId * @throws IOException on gitlab api call error */ - public GitlabAward getAward(GitlabMergeRequest mergeRequest, Integer awardId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getIid() + GitlabAward.URL + "/" + awardId; + public GitlabAward getAward(GitlabMergeRequest mergeRequest, Integer awardId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + + mergeRequest.getIid() + GitlabAward.URL + "/" + awardId; - return retrieve().to(tailUrl, GitlabAward.class); - } + return retrieve().to(tailUrl, GitlabAward.class); + } /** * Create an award for a merge request @@ -2611,13 +2693,13 @@ public GitlabAward getAward(GitlabMergeRequest mergeRequest, Integer awardId) th * @param awardName * @throws IOException on gitlab api call error */ - public GitlabAward createAward(GitlabMergeRequest mergeRequest, String awardName) throws IOException { - Query query = new Query().append("name", awardName); - String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getIid() + GitlabAward.URL + query.toString(); + public GitlabAward createAward(GitlabMergeRequest mergeRequest, String awardName) throws IOException { + Query query = new Query().append("name", awardName); + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + + mergeRequest.getIid() + GitlabAward.URL + query.toString(); - return dispatch().to(tailUrl, GitlabAward.class); - } + return dispatch().to(tailUrl, GitlabAward.class); + } /** * Delete an award for a merge request @@ -2626,12 +2708,12 @@ public GitlabAward createAward(GitlabMergeRequest mergeRequest, String awardName * @param award * @throws IOException on gitlab api call error */ - public void deleteAward(GitlabMergeRequest mergeRequest, GitlabAward award) throws IOException { - String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" - + mergeRequest.getIid() + GitlabAward.URL + "/" + award.getId(); + public void deleteAward(GitlabMergeRequest mergeRequest, GitlabAward award) throws IOException { + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + + mergeRequest.getIid() + GitlabAward.URL + "/" + award.getId(); - retrieve().method("DELETE").to(tailUrl, Void.class); - } + retrieve().method("DELETE").to(tailUrl, Void.class); + } /** * Get all awards for an issue @@ -2639,12 +2721,12 @@ public void deleteAward(GitlabMergeRequest mergeRequest, GitlabAward award) thro * @param issue * @throws IOException on gitlab api call error */ - public List getAllAwards(GitlabIssue issue) throws IOException { - String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; + public List getAllAwards(GitlabIssue issue) throws IOException { + String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; - return retrieve().getAll(tailUrl, GitlabAward[].class); - } + return retrieve().getAll(tailUrl, GitlabAward[].class); + } /** * Get a specific award for an issue @@ -2653,12 +2735,12 @@ public List getAllAwards(GitlabIssue issue) throws IOException { * @param awardId * @throws IOException on gitlab api call error */ - public GitlabAward getAward(GitlabIssue issue, Integer awardId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabAward.URL + "/" + awardId; + public GitlabAward getAward(GitlabIssue issue, Integer awardId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + + GitlabAward.URL + "/" + awardId; - return retrieve().to(tailUrl, GitlabAward.class); - } + return retrieve().to(tailUrl, GitlabAward.class); + } /** * Create an award for an issue @@ -2667,13 +2749,13 @@ public GitlabAward getAward(GitlabIssue issue, Integer awardId) throws IOExcepti * @param awardName * @throws IOException on gitlab api call error */ - public GitlabAward createAward(GitlabIssue issue, String awardName) throws IOException { - Query query = new Query().append("name", awardName); - String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabAward.URL + query.toString(); + public GitlabAward createAward(GitlabIssue issue, String awardName) throws IOException { + Query query = new Query().append("name", awardName); + String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + + GitlabAward.URL + query.toString(); - return dispatch().to(tailUrl, GitlabAward.class); - } + return dispatch().to(tailUrl, GitlabAward.class); + } /** * Delete an award for an issue @@ -2682,25 +2764,25 @@ public GitlabAward createAward(GitlabIssue issue, String awardName) throws IOExc * @param award * @throws IOException on gitlab api call error */ - public void deleteAward(GitlabIssue issue, GitlabAward award) throws IOException { - String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabAward.URL + "/" + award.getId(); - retrieve().method("DELETE").to(tailUrl, Void.class); - } + public void deleteAward(GitlabIssue issue, GitlabAward award) throws IOException { + String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + + GitlabAward.URL + "/" + award.getId(); + retrieve().method("DELETE").to(tailUrl, Void.class); + } - /** + /** * Get all awards for an issue note * * @param issue * @param noteId * @throws IOException on gitlab api call error */ - public List getAllAwards(GitlabIssue issue, Integer noteId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabNote.URL + noteId + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; + public List getAllAwards(GitlabIssue issue, Integer noteId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + + GitlabNote.URL + noteId + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; - return retrieve().getAll(tailUrl, GitlabAward[].class); - } + return retrieve().getAll(tailUrl, GitlabAward[].class); + } /** * Get a specific award for an issue note @@ -2710,12 +2792,12 @@ public List getAllAwards(GitlabIssue issue, Integer noteId) throws * @param awardId * @throws IOException on gitlab api call error */ - public GitlabAward getAward(GitlabIssue issue, Integer noteId, Integer awardId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabNote.URL + noteId + GitlabAward.URL + "/" + awardId; + public GitlabAward getAward(GitlabIssue issue, Integer noteId, Integer awardId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + + GitlabNote.URL + noteId + GitlabAward.URL + "/" + awardId; - return retrieve().to(tailUrl, GitlabAward.class); - } + return retrieve().to(tailUrl, GitlabAward.class); + } /** * Create an award for an issue note @@ -2725,15 +2807,15 @@ public GitlabAward getAward(GitlabIssue issue, Integer noteId, Integer awardId) * @param awardName * @throws IOException on gitlab api call error */ - public GitlabAward createAward(GitlabIssue issue, Integer noteId, String awardName) throws IOException { - Query query = new Query().append("name", awardName); - String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabNote.URL + noteId + GitlabAward.URL + query.toString(); + public GitlabAward createAward(GitlabIssue issue, Integer noteId, String awardName) throws IOException { + Query query = new Query().append("name", awardName); + String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + + GitlabNote.URL + noteId + GitlabAward.URL + query.toString(); - return dispatch().to(tailUrl, GitlabAward.class); - } + return dispatch().to(tailUrl, GitlabAward.class); + } - /** + /** * Delete an award for an issue note * * @param issue @@ -2741,14 +2823,15 @@ public GitlabAward createAward(GitlabIssue issue, Integer noteId, String awardNa * @param award * @throws IOException on gitlab api call error */ - public void deleteAward(GitlabIssue issue, Integer noteId, GitlabAward award) throws IOException { - String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() - + GitlabNote.URL + noteId + GitlabAward.URL + "/" + award.getId(); - retrieve().method("DELETE").to(tailUrl, Void.class); - } + public void deleteAward(GitlabIssue issue, Integer noteId, GitlabAward award) throws IOException { + String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + + GitlabNote.URL + noteId + GitlabAward.URL + "/" + award.getId(); + retrieve().method("DELETE").to(tailUrl, Void.class); + } /** * Gets build variables associated with a project. + * * @param projectId The ID of the project. * @return A non-null list of variables. * @throws IOException @@ -2762,6 +2845,7 @@ public List getBuildVariables(Integer projectId) /** * Gets build variables associated with a project. + * * @param project The project associated with variables. * @return A non-null list of variables. * @throws IOException @@ -2773,8 +2857,9 @@ public List getBuildVariables(GitlabProject project) /** * Gets build variable associated with a project and key. + * * @param projectId The ID of the project. - * @param key The key of the variable. + * @param key The key of the variable. * @return A variable. * @throws IOException */ @@ -2789,6 +2874,7 @@ public GitlabBuildVariable getBuildVariable(Integer projectId, String key) /** * Gets build variable associated with a project and key. + * * @param project The project associated with the variable. * @return A variable. * @throws IOException @@ -2800,9 +2886,10 @@ public GitlabBuildVariable getBuildVariable(GitlabProject project, String key) /** * Creates a new build variable. + * * @param projectId The ID of the project containing the new variable. - * @param key The key of the variable. - * @param value The value of the variable + * @param key The key of the variable. + * @param value The value of the variable * @return The newly created variable. * @throws IOException */ @@ -2818,8 +2905,9 @@ public GitlabBuildVariable createBuildVariable( /** * Creates a new variable. + * * @param projectId The ID of the project containing the variable. - * @param variable The variable to create. + * @param variable The variable to create. * @return The newly created variable. */ public GitlabBuildVariable createBuildVariable(Integer projectId, GitlabBuildVariable variable) @@ -2831,8 +2919,9 @@ public GitlabBuildVariable createBuildVariable(Integer projectId, GitlabBuildVar /** * Deletes an existing variable. + * * @param projectId The ID of the project containing the variable. - * @param key The key of the variable to delete. + * @param key The key of the variable to delete. * @throws IOException */ public void deleteBuildVariable(Integer projectId, String key) @@ -2846,8 +2935,9 @@ public void deleteBuildVariable(Integer projectId, String key) /** * Deletes an existing variable. + * * @param projectId The ID of the project containing the variable. - * @param variable The variable to delete. + * @param variable The variable to delete. * @throws IOException */ public void deleteBuildVariable(Integer projectId, GitlabBuildVariable variable) @@ -2857,15 +2947,16 @@ public void deleteBuildVariable(Integer projectId, GitlabBuildVariable variable) /** * Updates an existing variable. + * * @param projectId The ID of the project containing the variable. - * @param key The key of the variable to update. - * @param newValue The updated value. + * @param key The key of the variable to update. + * @param newValue The updated value. * @return The updated, deserialized variable. * @throws IOException */ public GitlabBuildVariable updateBuildVariable(Integer projectId, - String key, - String newValue) throws IOException { + String key, + String newValue) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabBuildVariable.URL + "/" + @@ -2889,7 +2980,7 @@ public List getPipelineTriggers(GitlabProject project) throws IOE if (!project.isJobsEnabled()) { // if the project has not allowed jobs, you will only get a 403 forbidden message which is // not helpful. - throw new IllegalStateException("Jobs are not enabled for " + project.getNameWithNamespace() ); + throw new IllegalStateException("Jobs are not enabled for " + project.getNameWithNamespace()); } else { return retrieve().getAll(GitlabProject.URL + "/" + project.getId() + GitlabTrigger.URL + PARAM_MAX_ITEMS_PER_PAGE, GitlabTrigger[].class); } @@ -2897,6 +2988,7 @@ public List getPipelineTriggers(GitlabProject project) throws IOE /** * Gets email-on-push service setup for a projectId. + * * @param projectId The ID of the project containing the variable. * @throws IOException */ @@ -2907,7 +2999,8 @@ public GitlabServiceEmailOnPush getEmailsOnPush(Integer projectId) throws IOExce /** * Update recipients for email-on-push service for a projectId. - * @param projectId The ID of the project containing the variable. + * + * @param projectId The ID of the project containing the variable. * @param emailAddress The emailaddress of the recipent who is going to receive push notification. * @return * @throws IOException @@ -2918,18 +3011,16 @@ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws GitlabServiceEmailOnPush emailOnPush = this.getEmailsOnPush(projectId); GitlabEmailonPushProperties properties = emailOnPush.getProperties(); String appendedRecipients = properties.getRecipients(); - if(appendedRecipients != "") - { - if(appendedRecipients.contains(emailAddress)) - return true; - appendedRecipients = appendedRecipients + " " + emailAddress; - } - else - appendedRecipients = emailAddress; + if (appendedRecipients != "") { + if (appendedRecipients.contains(emailAddress)) + return true; + appendedRecipients = appendedRecipients + " " + emailAddress; + } else + appendedRecipients = emailAddress; Query query = new Query() - .appendIf("active", true) - .appendIf("recipients", appendedRecipients); + .appendIf("active", true) + .appendIf("recipients", appendedRecipients); tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL + query.toString(); return retrieve().method("PUT").to(tailUrl, Boolean.class); @@ -2943,9 +3034,9 @@ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws * @return * @throws IOException */ - public GitlabServiceJira getJiraService(Integer projectId) throws IOException{ - String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL; - return retrieve().to(tailUrl, GitlabServiceJira.class); + public GitlabServiceJira getJiraService(Integer projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceJira.URL; + return retrieve().to(tailUrl, GitlabServiceJira.class); } /** @@ -2956,58 +3047,57 @@ public GitlabServiceJira getJiraService(Integer projectId) throws IOException{ * @return * @throws IOException */ - public boolean deleteJiraService(Integer projectId) throws IOException{ - String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL; - return retrieve().method("DELETE").to(tailUrl, Boolean.class); + public boolean deleteJiraService(Integer projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceJira.URL; + return retrieve().method("DELETE").to(tailUrl, Boolean.class); } /** * Set JIRA service for a project. * https://docs.gitlab.com/ce/api/services.html#create-edit-jira-service * - * @param projectId The ID of the project containing the variable. + * @param projectId The ID of the project containing the variable. * @param jiraPropties * @return * @throws IOException */ - public boolean createOrEditJiraService(Integer projectId, GitlabJiraProperties jiraPropties) throws IOException{ + public boolean createOrEditJiraService(Integer projectId, GitlabJiraProperties jiraPropties) throws IOException { - Query query = new Query() - .appendIf("url", jiraPropties.getUrl()) - .appendIf("project_key", jiraPropties.getProjectKey()); + Query query = new Query() + .appendIf("url", jiraPropties.getUrl()) + .appendIf("project_key", jiraPropties.getProjectKey()); - if(!jiraPropties.getUsername().isEmpty()){ - query.appendIf("username", jiraPropties.getUsername()); - } + if (!jiraPropties.getUsername().isEmpty()) { + query.appendIf("username", jiraPropties.getUsername()); + } - if(!jiraPropties.getPassword().isEmpty()){ - query.appendIf("password", jiraPropties.getPassword()); - } + if (!jiraPropties.getPassword().isEmpty()) { + query.appendIf("password", jiraPropties.getPassword()); + } - if(jiraPropties.getIssueTransitionId() != null){ - query.appendIf("jira_issue_transition_id", jiraPropties.getIssueTransitionId()); - } + if (jiraPropties.getIssueTransitionId() != null) { + query.appendIf("jira_issue_transition_id", jiraPropties.getIssueTransitionId()); + } - String tailUrl = GitlabProject.URL+ "/" + projectId + GitlabServiceJira.URL+ query.toString(); - return retrieve().method("PUT").to(tailUrl, Boolean.class); + String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceJira.URL + query.toString(); + return retrieve().method("PUT").to(tailUrl, Boolean.class); } /** - * - * Get a list of projects accessible by the authenticated user by search. - * - * @return A list of gitlab projects - * @throws IOException - */ - public List searchProjects(String search) throws IOException { - Query query = new Query() - .append("search", search); - String tailUrl = GitlabProject.URL + query.toString(); - GitlabProject[] response = retrieve().to(tailUrl, GitlabProject[].class); - return Arrays.asList(response); - } + * Get a list of projects accessible by the authenticated user by search. + * + * @return A list of gitlab projects + * @throws IOException + */ + public List searchProjects(String search) throws IOException { + Query query = new Query() + .append("search", search); + String tailUrl = GitlabProject.URL + query.toString(); + GitlabProject[] response = retrieve().to(tailUrl, GitlabProject[].class); + return Arrays.asList(response); + } /** * Share a project with a group. @@ -3065,7 +3155,7 @@ public String getUserAgent() { } public GitlabVersion getVersion() throws IOException { - return retrieve().to("version",GitlabVersion.class); + return retrieve().to("version", GitlabVersion.class); } /** @@ -3088,7 +3178,7 @@ public List getRunners() throws IOException { public List getRunners(GitlabRunner.RunnerScope scope) throws IOException { StringBuilder tailUrl = new StringBuilder("runners/all"); Query query = new Query() - .appendIf("scope", scope.getScope()); + .appendIf("scope", scope.getScope()); tailUrl.append(query.toString()); return retrieve().getAll(tailUrl.toString(), GitlabRunner[].class); } diff --git a/src/main/java/org/gitlab/api/models/GitlabCommit.java b/src/main/java/org/gitlab/api/models/GitlabCommit.java index 0fb5812d..f99bc32f 100644 --- a/src/main/java/org/gitlab/api/models/GitlabCommit.java +++ b/src/main/java/org/gitlab/api/models/GitlabCommit.java @@ -1,10 +1,10 @@ package org.gitlab.api.models; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Date; import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; - public class GitlabCommit { public final static String URL = "/commits"; @@ -34,6 +34,9 @@ public class GitlabCommit { @JsonProperty("parent_ids") private List parentIds; + @JsonProperty("last_pipeline") + private GitlabPipeline lastPipeline; + public String getId() { return id; } @@ -131,4 +134,12 @@ public boolean equals(Object obj) { public int hashCode() { return this.getId().hashCode(); } + + public GitlabPipeline getLastPipeline() { + return lastPipeline; + } + + public void setLastPipeline(GitlabPipeline lastPipeline) { + this.lastPipeline = lastPipeline; + } } diff --git a/src/main/java/org/gitlab/api/models/GitlabPipeline.java b/src/main/java/org/gitlab/api/models/GitlabPipeline.java new file mode 100644 index 00000000..31927db5 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabPipeline.java @@ -0,0 +1,52 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class GitlabPipeline { + public static final String URL = "/pipelines"; + + + @JsonProperty("id") + private Integer id; + + @JsonProperty("ref") + private String ref; + + @JsonProperty("sha") + private String sha; + + @JsonProperty("status") + private String status; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getRef() { + return ref; + } + + public void setRef(String ref) { + this.ref = ref; + } + + public String getSha() { + return sha; + } + + public void setSha(String sha) { + this.sha = sha; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } +} From cb51a38fe034549361fdfaaf56191260359dbd8e Mon Sep 17 00:00:00 2001 From: aram535 Date: Tue, 2 Jan 2018 14:59:06 -0500 Subject: [PATCH 065/119] This is a partial revert of a previous commit, fixed two JUnits that fail on a "vanila" docker gitlab install (#271) * Partial revert of commit 9b08228 - getAllProjects added back in * Moved version to 1.2.9-SNAPSHOT as 1.2.8 has already been released --- src/main/java/org/gitlab/api/GitlabAPI.java | 21 ++++++++++++++++++- src/test/java/org/gitlab/api/GitlabAPIIT.java | 6 +++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 1112f0f7..a9806d23 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -623,7 +623,26 @@ public void deleteGroup(Integer groupId) throws IOException { String tailUrl = GitlabGroup.URL + "/" + groupId; retrieve().method("DELETE").to(tailUrl, Void.class); } - + + /** + * + * Get's all projects in Gitlab, requires sudo user + * + * @return A list of gitlab projects + * @throws IOException + */ + public List getAllProjects() throws IOException { + String tailUrl = GitlabProject.URL; + return retrieve().getAll(tailUrl, GitlabProject[].class); + } + + /** + * Get Project by project Id + * + * @param projectId + * @return + * @throws IOException + */ public GitlabProject getProject(Serializable projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId); return retrieve().to(tailUrl, GitlabProject.class); diff --git a/src/test/java/org/gitlab/api/GitlabAPIIT.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java index 84b1296e..3d087a2d 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIIT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -43,7 +43,7 @@ public void Check_invalid_credentials() throws IOException { } @Test public void testAllProjects() throws IOException { - api.getProjects(); + api.getAllProjects(); } @Test @@ -190,13 +190,13 @@ public void testGetGroupByPath() throws IOException { @Test public void testGetMembershipProjects() throws IOException { final List membershipProjects = api.getMembershipProjects(); - assertEquals(0, membershipProjects.size()); + assertTrue(membershipProjects.size() >= 0); } @Test public void Check_get_owned_projects() throws IOException { final List ownedProjects = api.getOwnedProjects(); - assertEquals(0, ownedProjects.size()); + assertTrue(ownedProjects.size() >= 0); } @Test From 1b3dae461bcc56c61b04c8be779599de1f808faa Mon Sep 17 00:00:00 2001 From: Jaye Pitzeruse Date: Fri, 5 Jan 2018 10:28:46 -0600 Subject: [PATCH 066/119] gh-275: Propagate exceptions as a RuntimeException instead of java.lang.Error (#281) --- src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index e63d180e..e12dc6c6 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -24,7 +24,6 @@ import org.gitlab.api.GitlabAPI; import org.gitlab.api.GitlabAPIException; import org.gitlab.api.TokenType; -import org.gitlab.api.models.GitlabCommit; /** * Gitlab HTTP Requestor @@ -121,7 +120,7 @@ public GitlabHTTPRequestor with(String key, Object value) { * Has a fluent api for method chaining * * @param key Form parameter Key - * @param value Form parameter Value + * @param file File data * @return this */ public GitlabHTTPRequestor withAttachment(String key, File file) { @@ -208,7 +207,7 @@ public Iterator asIterator(final String tailApiUrl, final Class type) try { url = root.getAPIUrl(tailApiUrl); } catch (IOException e) { - throw new Error(e); + throw new RuntimeException(e); } } @@ -260,7 +259,7 @@ private void fetch() { handleAPIError(e, connection); } } catch (IOException e) { - throw new Error(e); + throw new RuntimeException(e); } } From 18325e4dceb4588f205ff001efc4862babec2ac1 Mon Sep 17 00:00:00 2001 From: agubanov Date: Wed, 7 Feb 2018 00:03:35 +0200 Subject: [PATCH 067/119] Add attributes to some API calls; Add possibility to use Serializable projectId in bunch of methods (#282) * Added attributes 'token' and 'note_events' to add project hook method * Added possibility to use Serializable projectId in bunch of methods * Added attribute 'path' to get commits method. --- src/main/java/org/gitlab/api/GitlabAPI.java | 58 ++++++++++++++++----- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index a9806d23..a07faf6b 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); @@ -1483,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()); } @@ -1559,12 +1573,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 +1597,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 +1632,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); } @@ -1873,7 +1901,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 +1909,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); } @@ -2557,7 +2587,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 7fc55569f7c46960265aea3975bc63530f09f0f1 Mon Sep 17 00:00:00 2001 From: David Lam Date: Tue, 6 Feb 2018 17:06:50 -0500 Subject: [PATCH 068/119] GitLabProjectMember Permission Level (#287) --- src/main/java/org/gitlab/api/GitlabAPI.java | 63 +++++++++++++++------ 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index a07faf6b..8b1f49b4 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -623,22 +623,21 @@ public void deleteGroup(Integer groupId) throws IOException { String tailUrl = GitlabGroup.URL + "/" + groupId; retrieve().method("DELETE").to(tailUrl, Void.class); } - - /** - * - * Get's all projects in Gitlab, requires sudo user - * - * @return A list of gitlab projects - * @throws IOException - */ - public List getAllProjects() throws IOException { - String tailUrl = GitlabProject.URL; - return retrieve().getAll(tailUrl, GitlabProject[].class); - } - - /** - * Get Project by project Id - * + + /** + * Get's all projects in Gitlab, requires sudo user + * + * @return A list of gitlab projects + * @throws IOException + */ + public List getAllProjects() throws IOException { + String tailUrl = GitlabProject.URL; + return retrieve().getAll(tailUrl, GitlabProject[].class); + } + + /** + * Get Project by project Id + * * @param projectId * @return * @throws IOException @@ -2381,6 +2380,38 @@ public void deleteProjectMember(Integer projectId, Integer userId) throws IOExce retrieve().method("DELETE").to(tailUrl, Void.class); } + /** + * Updates a project member. + * + * @param projectId the project id + * @param userId the user id + * @param accessLevel the updated access level for the specified user + * @return GitLabProjectMember with updated access level on success + * @throws IOException on Gitlab API call error + */ + public GitlabProjectMember updateProjectMember(Integer projectId, Integer userId, GitlabAccessLevel accessLevel) throws IOException { + return updateProjectMember(projectId, userId, accessLevel, null); + } + + /** + * Updates a project member. + * + * @param projectId the project id + * @param userId the user id + * @param accessLevel the updated access level for the specified user + * @param expiresAt the date at which the user's membership expires at in the form YEAR-MONTH-DAY + * @return GitLabProjectMember with updated access level on success + * @throws IOException on Gitlab API call error + */ + public GitlabProjectMember updateProjectMember(Integer projectId, Integer userId, GitlabAccessLevel accessLevel, String expiresAt) throws IOException { + Query query = new Query() + .appendIf("access_level", accessLevel) + .appendIf("expires_at", expiresAt); + String tailUrl = GitlabProject.URL + "/" + projectId + GitlabProjectMember.URL + "/" + userId + query.toString(); + return retrieve().method("PUT").to(tailUrl, GitlabProjectMember.class); + } + + public List getProjectMembers(GitlabProject project) throws IOException { return getProjectMembers(project.getId()); } From 628e85d99652379e41efe3e4790580fbddbe48f4 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" <35496033+PhilMFischer@users.noreply.github.com> Date: Tue, 6 Feb 2018 23:07:23 +0100 Subject: [PATCH 069/119] Improved Apache 2.0 licensing Information (#286) * Improving Apache 2.0 License (#285) - Renamed previous LICENSE file to be called NOTICE as required and suggested by Apache - Added the original Apache License 2.0 text as LICENSE text file * Improving Apache 2.0 Licensing Information (#285) - Updated gradle and maven build to include Notice and License into binary jar output * Improving Apache 2.0 Licensing Information (#285) - adjusted gradle build to also add notice and license to sources jar - maven source already contains notice and license file * Improving Apache 2.0 Licensing Information (#285) - Fixed indenting in pom.xml of newly added reosurces section * Improving Apache 2.0 Licensing Information (#285) - Fixed indentation of added properties in build.gradle file --- LICENSE | 215 +++++++++++++++++++++++++++++++++++++++++++++++---- NOTICE | 13 ++++ build.gradle | 4 + pom.xml | 11 +++ 4 files changed, 230 insertions(+), 13 deletions(-) create mode 100644 NOTICE diff --git a/LICENSE b/LICENSE index 2977f0c9..75b52484 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,202 @@ -Copyright 2013-2014 Timothy Olshansky - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/NOTICE b/NOTICE new file mode 100644 index 00000000..2977f0c9 --- /dev/null +++ b/NOTICE @@ -0,0 +1,13 @@ +Copyright 2013-2014 Timothy Olshansky + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/build.gradle b/build.gradle index a9820738..e9f35e3d 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,8 @@ dependencies { jar { manifest { attributes 'Gradle-Version': gradle.gradleVersion } + from "LICENSE" + from "NOTICE" } install { @@ -40,6 +42,8 @@ install { task sourcesJar(type: Jar, dependsOn:classes) { classifier = 'sources' from sourceSets.main.allSource + from "LICENSE" + from "NOTICE" } artifacts { archives sourcesJar } diff --git a/pom.xml b/pom.xml index ab24b40d..95aba0ce 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,18 @@ + + + + + ./ + + LICENSE + NOTICE + + + org.apache.maven.plugins From fa97eaa4616b9f2ea2a3571177af9b673c271419 Mon Sep 17 00:00:00 2001 From: "Philipp M. Fischer" <35496033+PhilMFischer@users.noreply.github.com> Date: Tue, 6 Feb 2018 23:07:58 +0100 Subject: [PATCH 070/119] GitlabAPI.getNotes(...) call creating non api v4 compliant URL (#283) (#284) - Fixed both methods to extract correct IID rather than the ID to access the Notes from an GitlabIssue --- src/main/java/org/gitlab/api/GitlabAPI.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 8b1f49b4..f5414136 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2011,14 +2011,14 @@ private void applyIssue(GitlabHTTPRequestor requestor, int projectId, public GitlabNote getNote(GitlabIssue issue, Integer noteId) throws IOException { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + - GitlabIssue.URL + "/" + issue.getId() + + GitlabIssue.URL + "/" + issue.getIid() + GitlabNote.URL + "/" + noteId; return retrieve().to(tailUrl, GitlabNote.class); } public List getNotes(GitlabIssue issue) throws IOException { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" - + issue.getId() + GitlabNote.URL; + + issue.getIid() + GitlabNote.URL; return Arrays.asList(retrieve().to(tailUrl, GitlabNote[].class)); } From feeffe20f2e43873af5e20aa2a77be3f3de4def1 Mon Sep 17 00:00:00 2001 From: Morgan Seznec Date: Wed, 14 Mar 2018 06:50:43 +0100 Subject: [PATCH 071/119] Add some properties to GitlabUser and GitlabGroup (#291) * Fix skip_confirmation * Fixed create user test Changed skip_confirmation value to true * Add external property to GitlabUser model Add the possibility to set/get external property on GitlabUser. * Add methods to create/update group --- src/main/java/org/gitlab/api/GitlabAPI.java | 73 +++++++++++++++++-- .../org/gitlab/api/models/GitlabGroup.java | 52 ++++++++++++- .../org/gitlab/api/models/GitlabUser.java | 11 +++ src/test/java/org/gitlab/api/GitlabAPIIT.java | 42 +++++++++-- 4 files changed, 163 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index f5414136..3a21b2bb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -179,7 +179,8 @@ public GitlabUser getUserViaSudo(String username) throws IOException { * @param isAdmin Is Admin * @param can_create_group Can Create Group * @param skip_confirmation Skip Confirmation - * @return A GitlabUser + * @param external External + * @return A GitlabUser * @throws IOException on gitlab api call error * @see http://doc.gitlab.com/ce/api/users.html */ @@ -188,7 +189,7 @@ public GitlabUser createUser(String email, String password, String username, String twitter, String website_url, Integer projects_limit, String extern_uid, String extern_provider_name, String bio, Boolean isAdmin, Boolean can_create_group, - Boolean skip_confirmation) throws IOException { + Boolean skip_confirmation, Boolean external) throws IOException { Query query = new Query() .append("email", email) @@ -205,7 +206,8 @@ public GitlabUser createUser(String email, String password, String username, .appendIf("provider", extern_provider_name) .appendIf("bio", bio) .appendIf("admin", isAdmin) - .appendIf("can_create_group", can_create_group); + .appendIf("can_create_group", can_create_group) + .appendIf("external", external); String tailUrl = GitlabUser.USERS_URL + query.toString(); @@ -243,6 +245,7 @@ public GitlabUser createUser(CreateUserRequest request) throws IOException { * @param bio Bio * @param isAdmin Is Admin * @param can_create_group Can Create Group + * @param external External * @return The Updated User * @throws IOException on gitlab api call error */ @@ -251,7 +254,7 @@ public GitlabUser updateUser(Integer targetUserId, String fullName, String skypeId, String linkedIn, String twitter, String website_url, Integer projects_limit, String extern_uid, String extern_provider_name, - String bio, Boolean isAdmin, Boolean can_create_group) throws IOException { + String bio, Boolean isAdmin, Boolean can_create_group, Boolean external) throws IOException { Query query = new Query() .append("email", email) @@ -267,7 +270,8 @@ public GitlabUser updateUser(Integer targetUserId, .appendIf("provider", extern_provider_name) .appendIf("bio", bio) .appendIf("admin", isAdmin) - .appendIf("can_create_group", can_create_group); + .appendIf("can_create_group", can_create_group) + .appendIf("external", external); String tailUrl = GitlabUser.USERS_URL + "/" + targetUserId + query.toString(); @@ -558,6 +562,65 @@ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAc return dispatch().to(tailUrl, GitlabGroup.class); } + + /** + * Creates a Group + * + * @param group The gitlab Group object + * @param sudoUser The user to create the group on behalf of + * + * @return The GitLab Group + * @throws IOException on gitlab api call error + */ + public GitlabGroup createGroup(GitlabGroup group, GitlabUser sudoUser) throws IOException { + + Query query = new Query() + .append("name", group.getName()) + .append("path", group.getPath()) + .appendIf("description", group.getDescription()) + .appendIf("membership_lock", group.getMembershipLock()) + .appendIf("share_with_group_lock", group.getShareWithGroupLock()) + .appendIf("visibility", group.getVisibility().toString()) + .appendIf("lfs_enabled", group.isLfsEnabled()) + .appendIf("request_access_enabled", group.isRequestAccessEnabled()) + .appendIf("shared_runners_minutes_limit", group.getSharedRunnersMinutesLimit()) + .appendIf("ldap_cn", group.getLdapCn()) + .appendIf("ldap_access", group.getLdapAccess()) + .appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null); + + String tailUrl = GitlabGroup.URL + query.toString(); + + return dispatch().to(tailUrl, GitlabGroup.class); + } + + /** + * Updates a Group + * + * @param group the group object + * @param sudoUser The user to create the group on behalf of + * @return The GitLab Group + * @throws IOException on gitlab api call error + */ + public GitlabGroup updateGroup(GitlabGroup group, GitlabUser sudoUser) throws IOException { + + Query query = new Query() + .appendIf("name", group.getName()) + .appendIf("path", group.getPath()) + .appendIf("description", group.getDescription()) + .appendIf("membership_lock", group.getMembershipLock()) + .appendIf("share_with_group_lock", group.getShareWithGroupLock()) + .appendIf("visibility", group.getVisibility().toString()) + .appendIf("lfs_enabled", group.isLfsEnabled()) + .appendIf("request_access_enabled", group.isRequestAccessEnabled()) + .appendIf("shared_runners_minutes_limit", group.getSharedRunnersMinutesLimit()) + .appendIf("ldap_cn", group.getLdapCn()) + .appendIf("ldap_access", group.getLdapAccess()) + .appendIf(PARAM_SUDO, sudoUser != null ? sudoUser.getId() : null); + + String tailUrl = GitlabGroup.URL + "/" + group.getId() + query.toString(); + + return retrieve().method("PUT").to(tailUrl, GitlabGroup.class); + } /** * Add a group member. diff --git a/src/main/java/org/gitlab/api/models/GitlabGroup.java b/src/main/java/org/gitlab/api/models/GitlabGroup.java index 3a456802..1003cc52 100644 --- a/src/main/java/org/gitlab/api/models/GitlabGroup.java +++ b/src/main/java/org/gitlab/api/models/GitlabGroup.java @@ -12,9 +12,24 @@ public class GitlabGroup { private String name; private String path; private String description; - + + @JsonProperty("membership_lock") + private Boolean membershipLock; + + @JsonProperty("share_with_group_lock") + private Boolean shareWithGroupLock; + + @JsonProperty("visibility") + private GitlabVisibility visibility; + @JsonProperty("lfs_enabled") private Boolean lfsEnabled; + + @JsonProperty("request_access_enabled") + private Boolean requestAccessEnabled; + + @JsonProperty("shared_runners_minutes_limit") + private Integer sharedRunnersMinutesLimit; @JsonProperty("avatar_url") private String avatarUrl; @@ -40,9 +55,6 @@ public class GitlabGroup { @JsonProperty("full_path") private String fullPath; - @JsonProperty("request_access_enabled") - private Boolean requestAccessEnabled; - public String getDescription() { return description; } @@ -131,6 +143,38 @@ public void setLdapCn(String ldapCn) { this.ldapCn = ldapCn; } + public Boolean getMembershipLock() { + return membershipLock; + } + + public void setMembershipLock(Boolean membershipLock) { + this.membershipLock = membershipLock; + } + + public Boolean getShareWithGroupLock() { + return shareWithGroupLock; + } + + public void setShareWithGroupLock(Boolean shareWithGroupLock) { + this.shareWithGroupLock = shareWithGroupLock; + } + + public GitlabVisibility getVisibility() { + return visibility; + } + + public void setVisibility(GitlabVisibility visibility) { + this.visibility = visibility; + } + + public Integer getSharedRunnersMinutesLimit() { + return sharedRunnersMinutesLimit; + } + + public void setSharedRunnersMinutesLimit(Integer sharedRunnersMinutesLimit) { + this.sharedRunnersMinutesLimit = sharedRunnersMinutesLimit; + } + public GitlabAccessLevel getLdapAccess() { if (ldapAccess == null) { return null; diff --git a/src/main/java/org/gitlab/api/models/GitlabUser.java b/src/main/java/org/gitlab/api/models/GitlabUser.java index 9e82dbb1..840c6f86 100644 --- a/src/main/java/org/gitlab/api/models/GitlabUser.java +++ b/src/main/java/org/gitlab/api/models/GitlabUser.java @@ -64,6 +64,9 @@ public class GitlabUser { @JsonProperty("can_create_team") private Boolean _canCreateTeam; + @JsonProperty("external") + private boolean _external; + @JsonProperty("avatar_url") private String _avatarUrl; @@ -247,6 +250,14 @@ public void setCanCreateTeam(boolean canCreateTeam) { this._canCreateTeam = canCreateTeam; } + public boolean isExternal() { + return _external; + } + + public void setExternal(boolean external) { + _external = external; + } + public String getAvatarUrl() { return _avatarUrl; } diff --git a/src/test/java/org/gitlab/api/GitlabAPIIT.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java index 3d087a2d..121d86a0 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIIT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -1,10 +1,6 @@ package org.gitlab.api; -import org.gitlab.api.models.GitlabBuildVariable; -import org.gitlab.api.models.GitlabGroup; -import org.gitlab.api.models.GitlabNamespace; -import org.gitlab.api.models.GitlabProject; -import org.gitlab.api.models.GitlabUser; +import org.gitlab.api.models.*; import org.junit.BeforeClass; import org.junit.Test; @@ -128,6 +124,7 @@ public void testCreateUpdateDeleteUser() throws IOException, InterruptedExceptio randVal("bio"), false, false, + true, false); assertNotNull(gitUser); @@ -139,7 +136,7 @@ public void testCreateUpdateDeleteUser() throws IOException, InterruptedExceptio api.updateUser(gitUser.getId(), gitUser.getEmail(), password, gitUser.getUsername(), gitUser.getName(), "newSkypeId", gitUser.getLinkedin(), gitUser.getTwitter(), gitUser.getWebsiteUrl(), 10 /* project limit does not come back on GET */, gitUser.getExternUid(), gitUser.getExternProviderName(), - gitUser.getBio(), gitUser.isAdmin(), gitUser.isCanCreateGroup()); + gitUser.getBio(), gitUser.isAdmin(), gitUser.isCanCreateGroup(), gitUser.isExternal()); GitlabUser postUpdate = api.getUserViaSudo(gitUser.getUsername()); @@ -186,6 +183,38 @@ public void testGetGroupByPath() throws IOException { // Cleanup api.deleteGroup(group.getId()); } + + @Test + public void testCreateAndUpdateGroup() throws IOException { + // Given + GitlabGroup originalGroup = new GitlabGroup(); + originalGroup.setDescription("test description"); + originalGroup.setName("groupNameTest"); + originalGroup.setPath("groupPathTest"); + originalGroup.setVisibility(GitlabVisibility.INTERNAL); + + GitlabGroup newGroup = api.createGroup(originalGroup, null); + assertNotNull(newGroup); + assertEquals(originalGroup.getId(), newGroup.getId()); + assertEquals(originalGroup.getName(), newGroup.getName()); + assertEquals(originalGroup.getPath(), newGroup.getPath()); + assertEquals(originalGroup.getDescription(), newGroup.getDescription()); + assertEquals(originalGroup.getVisibility(), newGroup.getVisibility()); + + GitlabGroup groupToUpdate = new GitlabGroup(); + groupToUpdate.setId(newGroup.getId()); + groupToUpdate.setVisibility(GitlabVisibility.PRIVATE); + + // When + GitlabGroup updatedGroup = api.updateGroup(newGroup, null); + + // Then: + assertNotNull(updatedGroup); + assertEquals(groupToUpdate.getVisibility(), updatedGroup.getVisibility()); + + // Cleanup + api.deleteGroup(updatedGroup.getId()); + } @Test public void testGetMembershipProjects() throws IOException { @@ -237,6 +266,7 @@ public void testCreateDeleteFork() throws IOException { randVal("bio"), false, false, + false, false); From 66032fa9c37fd79e6ed66a92aaff9af775fc9427 Mon Sep 17 00:00:00 2001 From: Bruno Ferreira Date: Wed, 14 Mar 2018 05:51:08 +0000 Subject: [PATCH 072/119] Added a new method to create a new SSH key (#292) * Added a new method to create a new SSH key Added a new method to create a new SSH key for the current user (https://docs.gitlab.com/ce/api/users.html#add-ssh-key) because the other method already available doesn't work if the user is not admin (https://docs.gitlab.com/ce/api/users.html#add-ssh-key-for-user) and wants to add a new SSH key for him. * Updated docs and removed extra "/" * Removed extra "s" from the tailURL formation --- src/main/java/org/gitlab/api/GitlabAPI.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 3a21b2bb..257c0213 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -323,6 +323,25 @@ public GitlabSSHKey createSSHKey(Integer targetUserId, String title, String key) return dispatch().to(tailUrl, GitlabSSHKey.class); } + + /** + * Create a new ssh key for the authenticated user. + * + * @param title The title of the ssh key + * @param key The public key + * @return The new GitlabSSHKey + * @throws IOException on gitlab api call error + */ + public GitlabSSHKey createSSHKey(String title, String key) throws IOException { + + Query query = new Query() + .append("title", title) + .append("key", key); + + String tailUrl = GitlabUser.USER_URL + GitlabSSHKey.KEYS_URL + query.toString(); + + return dispatch().to(tailUrl, GitlabSSHKey.class); + } /** * Delete user's ssh key From 0fac7335c76d64e783a417c879a87b3375cd09f9 Mon Sep 17 00:00:00 2001 From: reznicekp Date: Wed, 14 Mar 2018 06:51:25 +0100 Subject: [PATCH 073/119] 295 missing attributes in gitlab issue class (#296) * missing attributes added in GitlabIssue class (#295) * Revert "missing attributes added in GitlabIssue class (#295)" This reverts commit 97f30e663c273f078af8309066f1bc32ac3e51b1. * missing attributes added in GitlabIssue class (#295) --- .../org/gitlab/api/models/GitlabIssue.java | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/src/main/java/org/gitlab/api/models/GitlabIssue.java b/src/main/java/org/gitlab/api/models/GitlabIssue.java index 3d7f8cef..de62fb5a 100644 --- a/src/main/java/org/gitlab/api/models/GitlabIssue.java +++ b/src/main/java/org/gitlab/api/models/GitlabIssue.java @@ -1,6 +1,8 @@ package org.gitlab.api.models; +import java.time.LocalDate; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,9 +28,30 @@ public enum Action { private String[] labels; private GitlabMilestone milestone; + private List assignees; private GitlabUser assignee; private GitlabUser author; + @JsonProperty("user_notes_count") + private Integer userNotesCount; + + @JsonProperty("upvotes") + private Integer upVotes; + + @JsonProperty("downvotes") + private Integer downVotes; + + @JsonProperty("due_date") + private LocalDate dueDate; + + private Boolean confidential; + + @JsonProperty("discussion_locked") + private Boolean discussionLocked; + + @JsonProperty("time_stats") + private GitlabIssueTimeStats timeStats; + private String state; @JsonProperty("updated_at") @@ -37,6 +60,12 @@ public enum Action { @JsonProperty("created_at") private Date createdAt; + @JsonProperty("closed_at") + private Date closedAt; + + @JsonProperty("web_url") + private String webUrl; + public int getId() { return id; } @@ -93,6 +122,13 @@ public void setMilestone(GitlabMilestone milestone) { this.milestone = milestone; } + public List getAssignees() { + return assignees; + } + + public void setAssignees(List assignees) { + this.assignees = assignees; + } public GitlabUser getAssignee() { return assignee; } @@ -109,6 +145,62 @@ public void setAuthor(GitlabUser author) { this.author = author; } + public Integer getUserNotesCount() { + return userNotesCount; + } + + public void setUserNotesCount(Integer userNotesCount) { + this.userNotesCount = userNotesCount; + } + + public Integer getUpVotes() { + return upVotes; + } + + public void setUpVotes(Integer upVotes) { + this.upVotes = upVotes; + } + + public Integer getDownVotes() { + return downVotes; + } + + public void setDownVotes(Integer downVotes) { + this.downVotes = downVotes; + } + + public LocalDate getDueDate() { + return dueDate; + } + + public void setDueDate(LocalDate dueDate) { + this.dueDate = dueDate; + } + + public Boolean getConfidential() { + return confidential; + } + + public void setConfidential(Boolean confidential) { + this.confidential = confidential; + } + + public Boolean getDiscussionLocked() { + return discussionLocked; + } + + public void setDiscussionLocked(Boolean discussionLocked) { + this.discussionLocked = discussionLocked; + } + + public GitlabIssueTimeStats getTimeStats() { + return timeStats; + } + + public void setTimeStats(GitlabIssueTimeStats timeStats) { + this.timeStats = timeStats; + } + public String getState() { return state; } From 119bd5a2fbf84cba261ea49153749171b0afbadc Mon Sep 17 00:00:00 2001 From: David Lam Date: Wed, 14 Mar 2018 01:52:54 -0400 Subject: [PATCH 074/119] Controlled Pagination for Gitlab Projects and Runners (#290) * Controlled Pagination for Gitlab Projects and Runners * Add new GitlabRunner fields --- build.gradle | 36 ++--- gradle/wrapper/gradle-wrapper.properties | 4 +- src/main/java/org/gitlab/api/GitlabAPI.java | 132 ++++++++++++++++-- .../org/gitlab/api/models/GitlabRunner.java | 22 ++- 4 files changed, 162 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index e9f35e3d..1469b1a8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { - tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' - } + tasks.withType(JavaCompile) { + options.encoding = "UTF-8" + } } plugins { @@ -14,8 +14,8 @@ plugins { sourceCompatibility = 1.8 targetCompatibility = 1.8 -group = 'org.gitlab' -version = '4.0.1-SNAPSHOT' +group = "org.gitlab" +version = "4.0.1-SNAPSHOT" repositories { mavenLocal() @@ -23,31 +23,31 @@ repositories { } dependencies { - compile(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.5.+') - compile(group: 'commons-io', name: 'commons-io', version: '2.4') - testCompile(group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3') - testCompile(group: 'junit', name: 'junit', version: '4.12') + compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.5.+") + compile(group: "commons-io", name: "commons-io", version: "2.4") + testCompile(group: "org.hamcrest", name: "hamcrest-all", version: "1.3") + testCompile(group: "junit", name: "junit", version: "4.12") } jar { - manifest { attributes 'Gradle-Version': gradle.gradleVersion } - from "LICENSE" - from "NOTICE" + manifest { attributes "Gradle-Version": gradle.gradleVersion } + from "LICENSE" + from "NOTICE" } install { - repositories.mavenInstaller { pom.artifactId = 'java-gitlab-api' } + repositories.mavenInstaller { pom.artifactId = "java-gitlab-api" } } task sourcesJar(type: Jar, dependsOn:classes) { - classifier = 'sources' - from sourceSets.main.allSource - from "LICENSE" - from "NOTICE" + classifier = "sources" + from sourceSets.main.allSource + from "LICENSE" + from "NOTICE" } artifacts { archives sourcesJar } task wrapper(type: Wrapper) { - gradleVersion = '4.4' + gradleVersion = "4.6" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1c608ef..cd225d45 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed May 13 23:55:44 CEST 2015 +#Tue Mar 06 18:55:53 EST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 257c0213..3b41aafb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -764,6 +764,39 @@ public List getProjects() throws IOException { return retrieve().getAll(tailUrl, GitlabProject[].class); } + /** + * Get a list of projects of size perPage accessible by the authenticated user. + * + * @param page page offset. + * @param perPage number elements to get after page offset. + * @return A list of gitlab projects + * @throws IOException on Gitlab API call error + */ + public List getProjectsWithPagination(int page, int perPage) throws IOException { + Pagination pagination = new Pagination() + .withPage(page) + .withPerPage(perPage); + return getProjectsWithPagination(pagination); + } + + /** + * Get a list of projects by pagination accessible by the authenticated user. + * + * @param pagination + * @return + * @throws IOException + */ + public List getProjectsWithPagination(Pagination pagination) throws IOException { + StringBuilder tailUrl = new StringBuilder(GitlabProject.URL); + + if (pagination != null) { + Query query = pagination.asQuery(); + tailUrl.append(query.toString()); + } + + return Arrays.asList(retrieve().method("GET").to(tailUrl.toString(), GitlabProject[].class)); + } + /** * Get a list of projects owned by the authenticated user. * @@ -817,6 +850,44 @@ public List getProjectsViaSudo(GitlabUser user) throws IOExceptio return retrieve().getAll(tailUrl, GitlabProject[].class); } + /** + * Get a list of projects of perPage elements accessible by the authenticated user given page offset + * + * @param user Gitlab User to invoke sudo with + * @param page Page offset + * @param perPage Number of elements to get after page offset + * @return A list of gitlab projects + * @throws IOException Gitlab API call error + */ + public List getProjectsViaSudoWithPagination(GitlabUser user, int page, int perPage) throws IOException { + Pagination pagination = new Pagination() + .withPage(page) + .withPerPage(perPage); + return getProjectsViaSudoWithPagination(user, pagination); + } + + /** + * Get a list of projects of with Pagination. + * + * @param user Gitlab User to invoke sudo with + * @param pagination + * @return A list of gitlab projects + * @throws IOException Gitlab API call error + */ + public List getProjectsViaSudoWithPagination(GitlabUser user, Pagination pagination) throws IOException { + StringBuilder tailUrl = new StringBuilder(GitlabProject.URL); + + Query query = new Query() + .appendIf(PARAM_SUDO, user.getId()); + + if (pagination != null) { + query.mergeWith(pagination.asQuery()); + } + + tailUrl.append(query.toString()); + return Arrays.asList(retrieve().method("GET").to(tailUrl.toString(), GitlabProject[].class)); + } + /** * Get a list of the namespaces of the authenticated user. * If the user is an administrator, a list of all namespaces in the GitLab instance is shown. @@ -1412,12 +1483,12 @@ 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(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); } @@ -1488,7 +1559,7 @@ public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mer public GitlabMergeRequest acceptMergeRequest(GitlabProject project, Integer mergeRequestId, String mergeCommitMessage) throws IOException { 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"); @@ -1656,7 +1727,7 @@ public GitlabCommitComparison compareCommits(Serializable projectId, String comm public List getCommitStatuses(GitlabProject project, String commitHash) throws IOException { return getCommitStatuses(project.getId(), commitHash, new Pagination()); } - + public List getCommitStatuses(Serializable projectId, String commitHash) throws IOException { return getCommitStatuses(projectId, commitHash, new Pagination()); } @@ -1665,7 +1736,7 @@ public List getCommitStatuses(GitlabProject project, String Pagination pagination) throws IOException { 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 + "/" + @@ -1680,7 +1751,7 @@ public GitlabCommitStatus createCommitStatus(GitlabProject project, String commi String name, String targetUrl, String description) throws IOException { 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; @@ -3327,7 +3398,7 @@ public GitlabVersion getVersion() throws IOException { * @throws IOException */ public List getRunners() throws IOException { - return getRunners(GitlabRunner.RunnerScope.ALL); + return getRunnersWithPagination(GitlabRunner.RunnerScope.ALL, null); } /** @@ -3338,16 +3409,55 @@ public List getRunners() throws IOException { * @throws IOException on Gitlab API call error */ public List getRunners(GitlabRunner.RunnerScope scope) throws IOException { - StringBuilder tailUrl = new StringBuilder("runners/all"); + return getRunnersWithPagination(scope, null); + } + + /** + * Returns a list of runners with perPage elements on the page number specified. + * + * @param scope Can be null. Defines type of Runner to retrieve. + * @param page Page to get perPage number of Runners from. + * @param perPage Number of elements to get per page. + * @return List of GitlabRunners + * @throws IOException on Gitlab API call error + */ + public List getRunnersWithPagination(GitlabRunner.RunnerScope scope, int page, int perPage) throws IOException { + Pagination pagination = new Pagination() + .withPage(page) + .withPerPage(perPage); + return getRunnersWithPagination(scope, pagination); + } + + /** + * Returns a list of runners with perPage elements on the page number specified. + * + * @param scope Can be null. Defines type of Runner to retrieve. + * @param pagination Can be null. Pagination to query by. + * @return List of GitlabRunners + * @throws IOException on Gitlab API call error + */ + public List getRunnersWithPagination(GitlabRunner.RunnerScope scope, Pagination pagination) throws IOException { + StringBuilder tailUrl = new StringBuilder(GitlabRunner.URL).append("/all"); Query query = new Query() .appendIf("scope", scope.getScope()); + + if (pagination != null) { + query.mergeWith(pagination.asQuery()); + } + tailUrl.append(query.toString()); - return retrieve().getAll(tailUrl.toString(), GitlabRunner[].class); + return Arrays.asList(retrieve().method("GET").to(tailUrl.toString(), GitlabRunner[].class)); } + /** + * Get details information of the runner with the specified id. + * + * @param id Runner id. + * @return Extensive GitlabRunner Details. + * @throws IOException + */ public GitlabRunner getRunnerDetail(int id) throws IOException { - String tailUrl = String.format("runners/%d", id); + String tailUrl = String.format("%s/%d", GitlabRunner.URL, id); return retrieve().to(tailUrl, GitlabRunner.class); } - } diff --git a/src/main/java/org/gitlab/api/models/GitlabRunner.java b/src/main/java/org/gitlab/api/models/GitlabRunner.java index 27082868..d03d0561 100644 --- a/src/main/java/org/gitlab/api/models/GitlabRunner.java +++ b/src/main/java/org/gitlab/api/models/GitlabRunner.java @@ -7,6 +7,8 @@ import java.util.List; public class GitlabRunner { + public static final String URL = "/runners"; + public enum RunnerScope { SPECIFIC("specific"), SHARED("shared"), @@ -54,7 +56,10 @@ public String getScope() { private String architecture; @JsonProperty("projects") private List projects; - + @JsonProperty("online") + private Boolean online; + @JsonProperty("status") + private String status; public Integer getId() { return this.id; @@ -161,4 +166,19 @@ public void setArchitecture(String architecture) { this.architecture = architecture; } + public Boolean getOnline() { + return this.online; + } + + public void setOnline(boolean online) { + this.online = online; + } + + public String getStatus() { + return this.status; + } + + public void setStatus(String status) { + this.status = status; + } } From 455b84d1c6e2c380fae9f5c0360486a62384f56b Mon Sep 17 00:00:00 2001 From: Wim Jongman Date: Tue, 24 Apr 2018 21:37:40 +0200 Subject: [PATCH 075/119] Update pom.xml (#294) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 95aba0ce..a2c4ce6f 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 1.8 UTF-8 UTF-8 - 2.20 + 2.21.0 180000 @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-source-plugin - 2.4 + 3.0.0 attach-sources @@ -236,7 +236,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0 + 3.0.0-M1 -Xdoclint:none From 58b0179c016875b21fd73224b44a12bcf46aec9b Mon Sep 17 00:00:00 2001 From: Shaburov Oleg Date: Thu, 3 May 2018 22:46:56 +0300 Subject: [PATCH 076/119] Fixed: GITHUB-297: The "connectTimeout" parameter is not configurable (#298) * Fixed: GITHUB-297: The "connectTimeout" parameter is not configurable Refactoring: add getter for host field GitlabAPI && remove unused IOException from the method signature * add unit tests + jupiter + logging + refactoring + fix smells & corrupted tests * add dependencies to the pom.xml --- CHANGES.txt | 2 + build.gradle | 22 +- pom.xml | 60 +++- src/main/java/org/gitlab/api/GitlabAPI.java | 321 ++++++++++-------- .../gitlab/api/http/GitlabHTTPRequestor.java | 114 +++---- src/main/java/org/gitlab/api/http/Method.java | 11 + src/test/java/org/gitlab/api/GitlabAPIIT.java | 86 ++--- src/test/java/org/gitlab/api/GitlabAPIUT.java | 93 +++++ .../api/http/GitlabHTTPRequestorTest.java | 106 +++++- src/test/resources/log4j2.xml | 16 + 10 files changed, 550 insertions(+), 281 deletions(-) create mode 100644 CHANGES.txt create mode 100644 src/main/java/org/gitlab/api/http/Method.java create mode 100644 src/test/java/org/gitlab/api/GitlabAPIUT.java create mode 100644 src/test/resources/log4j2.xml diff --git a/CHANGES.txt b/CHANGES.txt new file mode 100644 index 00000000..f8749726 --- /dev/null +++ b/CHANGES.txt @@ -0,0 +1,2 @@ +Current +Fixed: GITHUB-297: The "connectTimeout" parameter is not configurable. \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1469b1a8..c9fd7ac3 100644 --- a/build.gradle +++ b/build.gradle @@ -23,10 +23,17 @@ repositories { } dependencies { - compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.5.+") - compile(group: "commons-io", name: "commons-io", version: "2.4") - testCompile(group: "org.hamcrest", name: "hamcrest-all", version: "1.3") - testCompile(group: "junit", name: "junit", version: "4.12") + compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.8.0-beta2') + compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.5.+") + compile(group: "commons-io", name: "commons-io", version: "2.4") + testCompile(group: "org.hamcrest", name: "hamcrest-all", version: "1.3") + testCompile(group: 'org.mockito', name: 'mockito-core', version: '2.18.3') + testCompile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0') + testCompile(group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.0') + testCompile(group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.2.0') + testRuntime(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.2.0') + testCompile(group: "junit", name: "junit", version: "4.12") + testRuntime(group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.2.0') } jar { @@ -51,3 +58,10 @@ artifacts { archives sourcesJar } task wrapper(type: Wrapper) { gradleVersion = "4.6" } + +test { + useJUnitPlatform { + includeEngines 'junit-jupiter' + includeEngines 'junit-vintage' + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index a2c4ce6f..29a9e759 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,14 @@ luu@fuzzproductions.com Fuzz Productions + + Oleg Shaburov + shaburov.o.a@gmail.com + + Automation QA + + +3 + @@ -67,6 +75,8 @@ 2.21.0 180000 + 2.11.0 + 5.2.0 @@ -85,10 +95,23 @@ commons-io 2.4 + - org.hamcrest - hamcrest-all - 1.3 + org.slf4j + slf4j-api + 1.8.0-beta2 + + + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} test @@ -97,6 +120,37 @@ 4.12 test + + org.junit.vintage + junit-vintage-engine + ${junit.jupiter.version} + test + + + org.hamcrest + hamcrest-all + 1.3 + test + + + org.mockito + mockito-core + 2.10.0 + test + + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + test + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + test + diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 3b41aafb..bae26fab 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -5,6 +5,8 @@ import org.gitlab.api.http.GitlabHTTPRequestor; import org.gitlab.api.http.Query; import org.gitlab.api.models.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -19,15 +21,18 @@ import java.util.Date; import java.util.List; +import static org.gitlab.api.http.Method.*; /** * Gitlab API Wrapper class * * @author @timols (Tim O) */ -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "WeakerAccess"}) public class GitlabAPI { + private static final Logger LOG = LoggerFactory.getLogger(GitlabAPI.class); + public static final ObjectMapper MAPPER = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); private static final String API_NAMESPACE = "/api/v4"; @@ -41,7 +46,9 @@ public class GitlabAPI { private AuthMethod authMethod; private boolean ignoreCertificateErrors = false; private Proxy proxy; - private int requestTimeout = 0; + private int defaultTimeout = 0; + private int readTimeout = defaultTimeout; + private int connectionTimeout = defaultTimeout; private String userAgent = GitlabAPI.class.getCanonicalName() + "/" + System.getProperty("java.version"); private GitlabAPI(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method) { @@ -80,12 +87,50 @@ public GitlabAPI proxy(Proxy proxy) { return this; } + public int getResponseReadTimeout() { + return readTimeout; + } + + /** + * @deprecated use this.getResponseReadTimeout() method + */ + @Deprecated public int getRequestTimeout() { - return requestTimeout; + return getResponseReadTimeout(); + } + + /** + * @deprecated use this.setResponseReadTimeout(int readTimeout) method + */ + @Deprecated + public GitlabAPI setRequestTimeout(int readTimeout) { + setResponseReadTimeout(readTimeout); + return this; } - public GitlabAPI setRequestTimeout(int requestTimeout) { - this.requestTimeout = requestTimeout; + public GitlabAPI setResponseReadTimeout(int readTimeout) { + if (readTimeout < 0) { + LOG.warn("The value of the \"Response Read Timeout\" parameter can not be negative. " + + "The default value [{}] will be used.", defaultTimeout); + this.readTimeout = defaultTimeout; + } else { + this.readTimeout = readTimeout; + } + return this; + } + + public int getConnectionTimeout() { + return connectionTimeout; + } + + public GitlabAPI setConnectionTimeout(int connectionTimeout) { + if (connectionTimeout < 0) { + LOG.warn("The value of the \"Connection Timeout\" parameter can not be negative. " + + "The default value [{}] will be used.", defaultTimeout); + this.connectionTimeout = defaultTimeout; + } else { + this.connectionTimeout = connectionTimeout; + } return this; } @@ -94,7 +139,7 @@ public GitlabHTTPRequestor retrieve() { } public GitlabHTTPRequestor dispatch() { - return new GitlabHTTPRequestor(this).authenticate(apiToken, tokenType, authMethod).method("POST"); + return new GitlabHTTPRequestor(this).authenticate(apiToken, tokenType, authMethod).method(POST); } public boolean isIgnoreCertificateErrors() { @@ -120,7 +165,11 @@ public URL getUrl(String tailAPIUrl) throws IOException { return new URL(hostUrl + tailAPIUrl); } - public List getUsers() throws IOException { + public String getHost() { + return hostUrl; + } + + public List getUsers() { String tailUrl = GitlabUser.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabUser[].class); } @@ -131,10 +180,10 @@ public List getUsers() throws IOException { * @param emailOrUsername Some portion of the email address or username * @return A non-null List of GitlabUser instances. If the search term is * null or empty a List with zero GitlabUsers is returned. - * @throws IOException + * @throws IOException on gitlab api call error */ public List findUsers(String emailOrUsername) throws IOException { - List users = new ArrayList(); + List users = new ArrayList<>(); if (emailOrUsername != null && !emailOrUsername.equals("")) { String tailUrl = GitlabUser.URL + "?search=" + emailOrUsername; GitlabUser[] response = retrieve().to(tailUrl, GitlabUser[].class); @@ -275,7 +324,7 @@ public GitlabUser updateUser(Integer targetUserId, String tailUrl = GitlabUser.USERS_URL + "/" + targetUserId + query.toString(); - return retrieve().method("PUT").to(tailUrl, GitlabUser.class); + return retrieve().method(PUT).to(tailUrl, GitlabUser.class); } /** @@ -288,7 +337,7 @@ public void blockUser(Integer targetUserId) throws IOException { String tailUrl = GitlabUser.USERS_URL + "/" + targetUserId + GitlabUser.BLOCK_URL; - retrieve().method("POST").to(tailUrl, Void.class); + retrieve().method(POST).to(tailUrl, Void.class); } /** @@ -301,7 +350,7 @@ public void unblockUser(Integer targetUserId) throws IOException { String tailUrl = GitlabUser.USERS_URL + "/" + targetUserId + GitlabUser.UNBLOCK_URL; - retrieve().method("POST").to(tailUrl, Void.class); + retrieve().method(POST).to(tailUrl, Void.class); } /** @@ -352,7 +401,7 @@ public GitlabSSHKey createSSHKey(String title, String key) throws IOException { */ public void deleteSSHKey(Integer targetUserId, Integer targetKeyId) throws IOException { String tailUrl = GitlabUser.USERS_URL + "/" + targetUserId + GitlabSSHKey.KEYS_URL + "/" + targetKeyId; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } @@ -388,7 +437,7 @@ public GitlabSSHKey getSSHKey(Integer keyId) throws IOException { */ public void deleteUser(Integer targetUserId) throws IOException { String tailUrl = GitlabUser.USERS_URL + "/" + targetUserId; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } public GitlabGroup getGroup(Integer groupId) throws IOException { @@ -399,8 +448,9 @@ public GitlabGroup getGroup(Integer groupId) throws IOException { * Get a group by path * * @param path Path of the group - * @return - * @throws IOException + * @return {@link GitlabGroup} object + * + * @throws IOException on gitlab api call error */ public GitlabGroup getGroup(String path) throws IOException { String tailUrl = GitlabGroup.URL + "/" + URLEncoder.encode(path, "UTF-8"); @@ -429,9 +479,8 @@ public List getGroupsViaSudo(String username, Pagination pagination * * @param group the target group * @return a list of projects for the group - * @throws IOException */ - public List getGroupProjects(GitlabGroup group) throws IOException { + public List getGroupProjects(GitlabGroup group) { return getGroupProjects(group.getId()); } @@ -440,9 +489,8 @@ public List getGroupProjects(GitlabGroup group) throws IOExceptio * * @param groupId the target group's id. * @return a list of projects for the group - * @throws IOException */ - public List getGroupProjects(Integer groupId) throws IOException { + public List getGroupProjects(Integer groupId) { String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabProject.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -452,9 +500,8 @@ public List getGroupProjects(Integer groupId) throws IOException * * @param group The GitLab Group * @return The Group Members - * @throws IOException on gitlab api call error */ - public List getGroupMembers(GitlabGroup group) throws IOException { + public List getGroupMembers(GitlabGroup group) { return getGroupMembers(group.getId()); } @@ -463,9 +510,8 @@ public List getGroupMembers(GitlabGroup group) throws IOExcep * * @param groupId The id of the GitLab Group * @return The Group Members - * @throws IOException on gitlab api call error */ - public List getGroupMembers(Integer groupId) throws IOException { + public List getGroupMembers(Integer groupId) { String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabGroupMember.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabGroupMember[].class); } @@ -638,7 +684,7 @@ public GitlabGroup updateGroup(GitlabGroup group, GitlabUser sudoUser) throws IO String tailUrl = GitlabGroup.URL + "/" + group.getId() + query.toString(); - return retrieve().method("PUT").to(tailUrl, GitlabGroup.class); + return retrieve().method(PUT).to(tailUrl, GitlabGroup.class); } /** @@ -692,7 +738,7 @@ public void deleteGroupMember(GitlabGroup group, GitlabUser user) throws IOExcep */ public void deleteGroupMember(Integer groupId, Integer userId) throws IOException { String tailUrl = GitlabGroup.URL + "/" + groupId + "/" + GitlabGroupMember.URL + "/" + userId; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -703,16 +749,15 @@ public void deleteGroupMember(Integer groupId, Integer userId) throws IOExceptio */ public void deleteGroup(Integer groupId) throws IOException { String tailUrl = GitlabGroup.URL + "/" + groupId; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** * Get's all projects in Gitlab, requires sudo user * * @return A list of gitlab projects - * @throws IOException */ - public List getAllProjects() throws IOException { + public List getAllProjects() { String tailUrl = GitlabProject.URL; return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -720,9 +765,9 @@ public List getAllProjects() throws IOException { /** * Get Project by project Id * - * @param projectId - * @return - * @throws IOException + * @param projectId - gitlab project Id + * @return {@link GitlabProject} + * @throws IOException on gitlab api call error */ public GitlabProject getProject(Serializable projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId); @@ -757,9 +802,8 @@ public String getProjectJson(String namespace, String projectName) throws IOExce * Get a list of projects accessible by the authenticated user. * * @return A list of gitlab projects - * @throws IOException */ - public List getProjects() throws IOException { + public List getProjects() { String tailUrl = GitlabProject.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabProject[].class); } @@ -784,7 +828,7 @@ public List getProjectsWithPagination(int page, int perPage) thro * * @param pagination * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public List getProjectsWithPagination(Pagination pagination) throws IOException { StringBuilder tailUrl = new StringBuilder(GitlabProject.URL); @@ -794,14 +838,14 @@ public List getProjectsWithPagination(Pagination pagination) thro tailUrl.append(query.toString()); } - return Arrays.asList(retrieve().method("GET").to(tailUrl.toString(), GitlabProject[].class)); + return Arrays.asList(retrieve().method(GET).to(tailUrl.toString(), GitlabProject[].class)); } /** * Get a list of projects owned by the authenticated user. * * @return A list of gitlab projects - * @throws IOException + * @throws IOException on gitlab api call error */ public List getOwnedProjects() throws IOException { Query query = new Query().append("owner", "true"); @@ -814,7 +858,7 @@ public List getOwnedProjects() throws IOException { * Get a list of projects that the authenticated user is a member of. * * @return A list of gitlab projects - * @throws IOException + * @throws IOException on gitlab api call error */ public List getMembershipProjects() throws IOException { Query query = new Query().append("membership", "true"); @@ -827,7 +871,7 @@ public List getMembershipProjects() throws IOException { * Get a list of projects starred by the authenticated user. * * @return A list of gitlab projects - * @throws IOException + * @throws IOException on gitlab api call error */ public List getStarredProjects() throws IOException { Query query = new Query().append("starred", "true"); @@ -840,7 +884,7 @@ public List getStarredProjects() throws IOException { * Get a list of projects accessible by the authenticated user. * * @return A list of gitlab projects - * @throws IOException + * @throws IOException on gitlab api call error */ public List getProjectsViaSudo(GitlabUser user) throws IOException { Query query = new Query() @@ -885,7 +929,7 @@ public List getProjectsViaSudoWithPagination(GitlabUser user, Pag } tailUrl.append(query.toString()); - return Arrays.asList(retrieve().method("GET").to(tailUrl.toString(), GitlabProject[].class)); + return Arrays.asList(retrieve().method(GET).to(tailUrl.toString(), GitlabProject[].class)); } /** @@ -893,9 +937,8 @@ public List getProjectsViaSudoWithPagination(GitlabUser user, Pag * If the user is an administrator, a list of all namespaces in the GitLab instance is shown. * * @return A list of gitlab namespace - * @throws IOException */ - public List getNamespaces() throws IOException { + public List getNamespaces() { String tailUrl = GitlabNamespace.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabNamespace[].class); } @@ -906,7 +949,7 @@ public List getNamespaces() throws IOException { * @param project * @param file * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabUpload uploadFile(GitlabProject project, File file) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + GitlabUpload.URL; @@ -918,9 +961,8 @@ public GitlabUpload uploadFile(GitlabProject project, File file) throws IOExcept * * @param project the project * @return A list of project jobs - * @throws IOException */ - public List getProjectJobs(GitlabProject project) throws IOException { + public List getProjectJobs(GitlabProject project) { return getProjectJobs(project.getId()); } @@ -929,9 +971,8 @@ public List getProjectJobs(GitlabProject project) throws IOException * * @param projectId the project id * @return A list of project jobs - * @throws IOException */ - public List getProjectJobs(Integer projectId) throws IOException { + public List getProjectJobs(Integer projectId) { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabJob[].class); } @@ -943,9 +984,8 @@ public List getProjectJobs(Integer projectId) throws IOException { * @param project the project * @param pipelineId * @return A list of project jobs - * @throws IOException */ - public List getPipelineJobs(GitlabProject project, Integer pipelineId) throws IOException { + public List getPipelineJobs(GitlabProject project, Integer pipelineId) { return getPipelineJobs(project.getId(), pipelineId); } @@ -955,7 +995,6 @@ public List getPipelineJobs(GitlabProject project, Integer pipelineId * @param projectId * @param pipelineId * @return A list of project jobs - * @throws IOException */ public List getPipelineJobs(Integer projectId, Integer pipelineId) { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabPipeline.URL + "/" + sanitizeId(pipelineId, "PipelineID") + GitlabJob.URL + PARAM_MAX_ITEMS_PER_PAGE; @@ -969,7 +1008,7 @@ public List getPipelineJobs(Integer projectId, Integer pipelineId) { * @param projectId * @param jobId * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabJob cancelJob(Integer projectId, Integer jobId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + sanitizeId(jobId, "JobID") + "/cancel"; @@ -982,7 +1021,7 @@ public GitlabJob cancelJob(Integer projectId, Integer jobId) throws IOException * @param projectId * @param jobId * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabJob retryJob(Integer projectId, Integer jobId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + sanitizeId(jobId, "JobID") + "/retry"; @@ -995,7 +1034,7 @@ public GitlabJob retryJob(Integer projectId, Integer jobId) throws IOException { * @param projectId * @param jobId * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabJob eraseJob(Integer projectId, Integer jobId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + sanitizeId(jobId, "JobID") + "/erase"; @@ -1009,7 +1048,7 @@ public GitlabJob eraseJob(Integer projectId, Integer jobId) throws IOException { * @param projectId * @param jobId * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabJob playJob(Integer projectId, Integer jobId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + sanitizeId(jobId, "JobID") + "/play"; @@ -1023,7 +1062,7 @@ public GitlabJob playJob(Integer projectId, Integer jobId) throws IOException { * @param projectId the project id * @param jobId the build id * @return A list of project jobs - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabJob getProjectJob(Integer projectId, Integer jobId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabJob.URL + "/" + jobId; @@ -1320,7 +1359,7 @@ public GitlabProject updateProject( String tailUrl = GitlabProject.URL + "/" + projectId + query.toString(); - return retrieve().method("PUT").to(tailUrl, GitlabProject.class); + return retrieve().method(PUT).to(tailUrl, GitlabProject.class); } /** @@ -1331,7 +1370,7 @@ public GitlabProject updateProject( */ public void deleteProject(Serializable projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId); - retrieve().method("DELETE").to(tailUrl, null); + retrieve().method(DELETE).to(tailUrl, null); } public List getOpenMergeRequests(Serializable projectId) throws IOException { @@ -1404,27 +1443,27 @@ 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); } - public List getAllMergeRequests(GitlabProject project) throws IOException { + public List getAllMergeRequests(GitlabProject project) { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL; return retrieve().getAll(tailUrl, GitlabMergeRequest[].class); } @@ -1546,7 +1585,7 @@ public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mer String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + query.toString(); - return retrieve().method("PUT").to(tailUrl, GitlabMergeRequest.class); + return retrieve().method(PUT).to(tailUrl, GitlabMergeRequest.class); } /** @@ -1562,7 +1601,7 @@ public GitlabMergeRequest acceptMergeRequest(GitlabProject project, Integer merg 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"); + GitlabHTTPRequestor requestor = retrieve().method(PUT); requestor.with("id", projectId); requestor.with("merge_request_id", mergeRequestId); if (mergeCommitMessage != null) @@ -1595,7 +1634,7 @@ public List getNotes(GitlabMergeRequest mergeRequest) throws IOExcep return Arrays.asList(notes); } - public List getAllNotes(GitlabMergeRequest mergeRequest) throws IOException { + public List getAllNotes(GitlabMergeRequest mergeRequest) { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL + PARAM_MAX_ITEMS_PER_PAGE; @@ -1875,7 +1914,7 @@ public GitlabSimpleRepositoryFile createRepositoryFile(GitlabProject project, St */ public GitlabSimpleRepositoryFile updateRepositoryFile(GitlabProject project, String path, String branchName, String commitMsg, String content) throws IOException { String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files/" + sanitizePath(path); - GitlabHTTPRequestor requestor = retrieve().method("PUT"); + GitlabHTTPRequestor requestor = retrieve().method(PUT); return requestor .with("branch", branchName) @@ -1899,7 +1938,7 @@ public void deleteRepositoryFile(GitlabProject project, String path, String bran .append("branch", branchName) .append("commit_message", commitMsg); String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository/files/" + sanitizePath(path) + query.toString(); - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -1918,7 +1957,7 @@ public GitlabNote updateNote(GitlabMergeRequest mergeRequest, Integer noteId, St String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL + "/" + noteId + query.toString(); - return retrieve().method("PUT").to(tailUrl, GitlabNote.class); + return retrieve().method(PUT).to(tailUrl, GitlabNote.class); } public GitlabNote createNote(GitlabMergeRequest mergeRequest, String body) throws IOException { @@ -1938,15 +1977,15 @@ public GitlabNote createNote(GitlabMergeRequest mergeRequest, String body) throw public void deleteNote(GitlabMergeRequest mergeRequest, GitlabNote noteToDelete) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL + "/" + noteToDelete.getId(); - retrieve().method("DELETE").to(tailUrl, GitlabNote.class); + retrieve().method(DELETE).to(tailUrl, GitlabNote.class); } - public List getBranches(Serializable projectId) throws IOException { + public List getBranches(Serializable projectId) { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabBranch[].class); } - public List getBranches(GitlabProject project) throws IOException { + public List getBranches(GitlabProject project) { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabBranch[].class); } @@ -1991,7 +2030,7 @@ public void createBranch(Serializable projectId, String branchName, String ref) */ public void deleteBranch(Serializable projectId, String branchName) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBranch.URL + '/' + sanitizePath(branchName); - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } public GitlabBranch getBranch(Serializable projectId, String branchName) throws IOException { @@ -2012,12 +2051,12 @@ public void protectBranchWithDeveloperOptions(GitlabProject project, String bran final Query query = new Query() .append("developers_can_push", Boolean.toString(developers_can_push)) .append("developers_can_merge", Boolean.toString(developers_can_merge)); - retrieve().method("PUT").to(tailUrl + query.toString(), Void.class); + retrieve().method(PUT).to(tailUrl + query.toString(), Void.class); } public void unprotectBranch(GitlabProject project, String branchName) throws IOException { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabBranch.URL + '/' + sanitizePath(branchName) + "/unprotect"; - retrieve().method("PUT").to(tailUrl, Void.class); + retrieve().method(PUT).to(tailUrl, Void.class); } public List getProjectHooks(Serializable projectId) throws IOException { @@ -2073,36 +2112,36 @@ public GitlabProjectHook editProjectHook(GitlabProject project, String hookId, S .append("url", url); String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabProjectHook.URL + "/" + hookId + query.toString(); - return retrieve().method("PUT").to(tailUrl, GitlabProjectHook.class); + return retrieve().method(PUT).to(tailUrl, GitlabProjectHook.class); } public void deleteProjectHook(GitlabProjectHook hook) throws IOException { String tailUrl = GitlabProject.URL + "/" + hook.getProjectId() + GitlabProjectHook.URL + "/" + hook.getId(); - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } public void deleteProjectHook(GitlabProject project, String hookId) throws IOException { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabProjectHook.URL + "/" + hookId; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } - public List getIssues(GitlabProject project) throws IOException { + public List getIssues(GitlabProject project) { return getIssues(project.getId()); } - public List getIssues(Serializable projectId) throws IOException { + public List getIssues(Serializable projectId) { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabIssue[].class); } - public List getIssues(GitlabProject project, GitlabMilestone milestone) throws IOException { + public List getIssues(GitlabProject project, GitlabMilestone milestone) { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(project.getId()) + GitlabMilestone.URL + "/" + sanitizeMilestoneId(milestone.getId()) + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabIssue[].class); } - public List getIssues(GitlabGroup group, GitlabMilestone milestone) throws IOException { + public List getIssues(GitlabGroup group, GitlabMilestone milestone) { String tailUrl = GitlabGroup.URL + "/" + sanitizeGroupId(group.getId()) + GitlabMilestone.URL + "/" + sanitizeMilestoneId(milestone.getId()) + GitlabIssue.URL + PARAM_MAX_ITEMS_PER_PAGE; @@ -2138,7 +2177,7 @@ public GitlabIssue moveIssue(Integer projectId, Integer issueId, Integer toProje public GitlabIssue editIssue(int projectId, int issueId, int assigneeId, int milestoneId, String labels, String description, String title, GitlabIssue.Action action) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabIssue.URL + "/" + issueId; - GitlabHTTPRequestor requestor = retrieve().method("PUT"); + GitlabHTTPRequestor requestor = retrieve().method(PUT); applyIssue(requestor, projectId, assigneeId, milestoneId, labels, description, title); if (action != GitlabIssue.Action.LEAVE) { @@ -2197,7 +2236,7 @@ public void deleteNote(Serializable projectId, Integer issueId, GitlabNote noteT String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabIssue.URL + "/" + issueId + GitlabNote.URL + "/" + noteToDelete.getId(); - retrieve().method("DELETE").to(tailUrl, GitlabNote.class); + retrieve().method(DELETE).to(tailUrl, GitlabNote.class); } /** @@ -2216,7 +2255,7 @@ public void deleteNote(GitlabIssue issue, GitlabNote noteToDelete) throws IOExce * * @param projectId The ID of the project. * @return A non-null list of labels. - * @throws IOException + * @throws IOException on gitlab api call error */ public List getLabels(Serializable projectId) throws IOException { @@ -2230,7 +2269,7 @@ public List getLabels(Serializable projectId) * * @param project The project associated with labels. * @return A non-null list of labels. - * @throws IOException + * @throws IOException on gitlab api call error */ public List getLabels(GitlabProject project) throws IOException { @@ -2244,7 +2283,7 @@ public List getLabels(GitlabProject project) * @param name The name of the label. * @param color The color of the label (eg #ff0000). * @return The newly created label. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabLabel createLabel( Serializable projectId, @@ -2275,7 +2314,7 @@ public GitlabLabel createLabel(Serializable projectId, GitlabLabel label) * * @param projectId The ID of the project containing the label. * @param name The name of the label to delete. - * @throws IOException + * @throws IOException on gitlab api call error */ public void deleteLabel(Serializable projectId, String name) throws IOException { @@ -2285,7 +2324,7 @@ public void deleteLabel(Serializable projectId, String name) sanitizeProjectId(projectId) + GitlabLabel.URL + query.toString(); - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -2293,7 +2332,7 @@ public void deleteLabel(Serializable projectId, String name) * * @param projectId The ID of the project containing the label. * @param label The label to delete. - * @throws IOException + * @throws IOException on gitlab api call error */ public void deleteLabel(Serializable projectId, GitlabLabel label) throws IOException { @@ -2308,14 +2347,14 @@ public void deleteLabel(Serializable projectId, GitlabLabel label) * @param newName The updated name. * @param newColor The updated color. * @return The updated, deserialized label. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabLabel updateLabel(Serializable projectId, String name, String newName, String newColor) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabLabel.URL; - GitlabHTTPRequestor requestor = retrieve().method("PUT"); + GitlabHTTPRequestor requestor = retrieve().method(PUT); requestor.with("name", name); if (newName != null) { requestor.with("new_name", newName); @@ -2353,7 +2392,7 @@ public List getGroupMilestones(Serializable groupId) throws IOE * @param dueDate The date the milestone is due. (Optional) * @param startDate The start date of the milestone. (Optional) * @return The newly created, de-serialized milestone. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabMilestone createMilestone( Serializable projectId, @@ -2382,7 +2421,7 @@ public GitlabMilestone createMilestone( * @param projectId The ID of the project. * @param milestone The milestone to create. * @return The newly created, de-serialized milestone. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabMilestone createMilestone( Serializable projectId, @@ -2406,7 +2445,7 @@ public GitlabMilestone createMilestone( * @param stateEvent A value used to update the state of the milestone. * (Optional) (activate | close) * @return The updated, de-serialized milestone. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabMilestone updateMilestone( Serializable projectId, @@ -2420,7 +2459,7 @@ public GitlabMilestone updateMilestone( sanitizeProjectId(projectId) + GitlabMilestone.URL + "/" + milestoneId; - GitlabHTTPRequestor requestor = retrieve().method("PUT"); + GitlabHTTPRequestor requestor = retrieve().method(PUT); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); if (title != null) { requestor.with("title", title); @@ -2448,7 +2487,7 @@ public GitlabMilestone updateMilestone( * @param stateEvent A value used to update the state of the milestone. * (Optional) (activate | close) * @return The updated, de-serialized milestone. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabMilestone updateMilestone( Serializable projectId, @@ -2470,7 +2509,7 @@ public GitlabMilestone updateMilestone( * @param stateEvent A value used to update the state of the milestone. * (Optional) (activate | close) * @return The updated, de-serialized milestone. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabMilestone updateMilestone( GitlabMilestone edited, @@ -2530,7 +2569,7 @@ public void deleteProjectMember(GitlabProject project, GitlabUser user) throws I */ public void deleteProjectMember(Integer projectId, Integer userId) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + "/" + GitlabProjectMember.URL + "/" + userId; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -2561,7 +2600,7 @@ public GitlabProjectMember updateProjectMember(Integer projectId, Integer userId .appendIf("access_level", accessLevel) .appendIf("expires_at", expiresAt); String tailUrl = GitlabProject.URL + "/" + projectId + GitlabProjectMember.URL + "/" + userId + query.toString(); - return retrieve().method("PUT").to(tailUrl, GitlabProjectMember.class); + return retrieve().method(PUT).to(tailUrl, GitlabProjectMember.class); } @@ -2664,7 +2703,7 @@ private GitlabSSHKey createDeployKey(Integer targetProjectId, String title, Stri */ public void deleteDeployKey(Integer targetProjectId, Integer targetKeyId) throws IOException { String tailUrl = GitlabProject.URL + "/" + targetProjectId + GitlabSSHKey.DEPLOY_KEYS_URL + "/" + targetKeyId; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -2723,7 +2762,7 @@ public void testSystemHook(Integer hookId) throws IOException { */ public GitlabSystemHook deleteSystemHook(Integer hookId) throws IOException { String tailUrl = GitlabSystemHook.URL + "/" + hookId; - return retrieve().method("DELETE").to(tailUrl, GitlabSystemHook.class); + return retrieve().method(DELETE).to(tailUrl, GitlabSystemHook.class); } private String sanitizeProjectId(Serializable projectId) { @@ -2807,9 +2846,8 @@ public List getCommitComments(Integer projectId, String sha) thro * * @param projectId * @return - * @throws IOException on gitlab api call error */ - public List getTags(Serializable projectId) throws IOException { + public List getTags(Serializable projectId) { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabTag[].class); } @@ -2819,9 +2857,8 @@ public List getTags(Serializable projectId) throws IOException { * * @param project * @return - * @throws IOException on gitlab api call error */ - public List getTags(GitlabProject project) throws IOException { + public List getTags(GitlabProject project) { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabTag.URL + PARAM_MAX_ITEMS_PER_PAGE; return retrieve().getAll(tailUrl, GitlabTag[].class); } @@ -2877,7 +2914,7 @@ public GitlabTag addTag(GitlabProject project, String tagName, String ref, Strin */ public void deleteTag(Serializable projectId, String tagName) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabTag.URL + "/" + tagName; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -2889,16 +2926,15 @@ public void deleteTag(Serializable projectId, String tagName) throws IOException */ public void deleteTag(GitlabProject project, String tagName) throws IOException { String tailUrl = GitlabProject.URL + "/" + project + GitlabTag.URL + "/" + tagName; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** * Get all awards for a merge request * * @param mergeRequest - * @throws IOException on gitlab api call error */ - public List getAllAwards(GitlabMergeRequest mergeRequest) throws IOException { + public List getAllAwards(GitlabMergeRequest mergeRequest) { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; @@ -2945,16 +2981,15 @@ public void deleteAward(GitlabMergeRequest mergeRequest, GitlabAward award) thro String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabAward.URL + "/" + award.getId(); - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** * Get all awards for an issue * * @param issue - * @throws IOException on gitlab api call error */ - public List getAllAwards(GitlabIssue issue) throws IOException { + public List getAllAwards(GitlabIssue issue) { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; @@ -3000,7 +3035,7 @@ public GitlabAward createAward(GitlabIssue issue, String awardName) throws IOExc public void deleteAward(GitlabIssue issue, GitlabAward award) throws IOException { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + GitlabAward.URL + "/" + award.getId(); - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -3008,9 +3043,8 @@ public void deleteAward(GitlabIssue issue, GitlabAward award) throws IOException * * @param issue * @param noteId - * @throws IOException on gitlab api call error */ - public List getAllAwards(GitlabIssue issue, Integer noteId) throws IOException { + public List getAllAwards(GitlabIssue issue, Integer noteId) { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + GitlabNote.URL + noteId + GitlabAward.URL + PARAM_MAX_ITEMS_PER_PAGE; @@ -3059,7 +3093,7 @@ public GitlabAward createAward(GitlabIssue issue, Integer noteId, String awardNa public void deleteAward(GitlabIssue issue, Integer noteId, GitlabAward award) throws IOException { String tailUrl = GitlabProject.URL + "/" + issue.getProjectId() + GitlabIssue.URL + "/" + issue.getId() + GitlabNote.URL + noteId + GitlabAward.URL + "/" + award.getId(); - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -3067,7 +3101,7 @@ public void deleteAward(GitlabIssue issue, Integer noteId, GitlabAward award) th * * @param projectId The ID of the project. * @return A non-null list of variables. - * @throws IOException + * @throws IOException on gitlab api call error */ public List getBuildVariables(Integer projectId) throws IOException { @@ -3081,7 +3115,7 @@ public List getBuildVariables(Integer projectId) * * @param project The project associated with variables. * @return A non-null list of variables. - * @throws IOException + * @throws IOException on gitlab api call error */ public List getBuildVariables(GitlabProject project) throws IOException { @@ -3094,7 +3128,7 @@ public List getBuildVariables(GitlabProject project) * @param projectId The ID of the project. * @param key The key of the variable. * @return A variable. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabBuildVariable getBuildVariable(Integer projectId, String key) throws IOException { @@ -3110,7 +3144,7 @@ public GitlabBuildVariable getBuildVariable(Integer projectId, String key) * * @param project The project associated with the variable. * @return A variable. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabBuildVariable getBuildVariable(GitlabProject project, String key) throws IOException { @@ -3124,7 +3158,7 @@ public GitlabBuildVariable getBuildVariable(GitlabProject project, String key) * @param key The key of the variable. * @param value The value of the variable * @return The newly created variable. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabBuildVariable createBuildVariable( Integer projectId, @@ -3155,7 +3189,7 @@ public GitlabBuildVariable createBuildVariable(Integer projectId, GitlabBuildVar * * @param projectId The ID of the project containing the variable. * @param key The key of the variable to delete. - * @throws IOException + * @throws IOException on gitlab api call error */ public void deleteBuildVariable(Integer projectId, String key) throws IOException { @@ -3163,7 +3197,7 @@ public void deleteBuildVariable(Integer projectId, String key) projectId + GitlabBuildVariable.URL + "/" + key; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -3171,7 +3205,7 @@ public void deleteBuildVariable(Integer projectId, String key) * * @param projectId The ID of the project containing the variable. * @param variable The variable to delete. - * @throws IOException + * @throws IOException on gitlab api call error */ public void deleteBuildVariable(Integer projectId, GitlabBuildVariable variable) throws IOException { @@ -3185,7 +3219,7 @@ public void deleteBuildVariable(Integer projectId, GitlabBuildVariable variable) * @param key The key of the variable to update. * @param newValue The updated value. * @return The updated, deserialized variable. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabBuildVariable updateBuildVariable(Integer projectId, String key, @@ -3194,7 +3228,7 @@ public GitlabBuildVariable updateBuildVariable(Integer projectId, projectId + GitlabBuildVariable.URL + "/" + key; - GitlabHTTPRequestor requestor = retrieve().method("PUT"); + GitlabHTTPRequestor requestor = retrieve().method(PUT); if (newValue != null) { requestor = requestor.with("value", newValue); } @@ -3207,9 +3241,8 @@ public GitlabBuildVariable updateBuildVariable(Integer projectId, * @param project the project * @return list of build triggers * @throws IllegalStateException if jobs are not enabled for the project - * @throws IOException */ - public List getPipelineTriggers(GitlabProject project) throws IOException { + public List getPipelineTriggers(GitlabProject project) { if (!project.isJobsEnabled()) { // if the project has not allowed jobs, you will only get a 403 forbidden message which is // not helpful. @@ -3223,7 +3256,7 @@ public List getPipelineTriggers(GitlabProject project) throws IOE * Gets email-on-push service setup for a projectId. * * @param projectId The ID of the project containing the variable. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabServiceEmailOnPush getEmailsOnPush(Integer projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL; @@ -3236,11 +3269,9 @@ public GitlabServiceEmailOnPush getEmailsOnPush(Integer projectId) throws IOExce * @param projectId The ID of the project containing the variable. * @param emailAddress The emailaddress of the recipent who is going to receive push notification. * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws IOException { - String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL; - GitlabServiceEmailOnPush emailOnPush = this.getEmailsOnPush(projectId); GitlabEmailonPushProperties properties = emailOnPush.getProperties(); String appendedRecipients = properties.getRecipients(); @@ -3255,8 +3286,8 @@ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws .appendIf("active", true) .appendIf("recipients", appendedRecipients); - tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL + query.toString(); - return retrieve().method("PUT").to(tailUrl, Boolean.class); + String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceEmailOnPush.URL + query.toString(); + return retrieve().method(PUT).to(tailUrl, Boolean.class); } /** @@ -3265,7 +3296,7 @@ public boolean updateEmailsOnPush(Integer projectId, String emailAddress) throws * * @param projectId The ID of the project containing the variable. * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabServiceJira getJiraService(Integer projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceJira.URL; @@ -3278,11 +3309,11 @@ public GitlabServiceJira getJiraService(Integer projectId) throws IOException { * * @param projectId The ID of the project containing the variable. * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public boolean deleteJiraService(Integer projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceJira.URL; - return retrieve().method("DELETE").to(tailUrl, Boolean.class); + return retrieve().method(DELETE).to(tailUrl, Boolean.class); } /** @@ -3292,7 +3323,7 @@ public boolean deleteJiraService(Integer projectId) throws IOException { * @param projectId The ID of the project containing the variable. * @param jiraPropties * @return - * @throws IOException + * @throws IOException on gitlab api call error */ public boolean createOrEditJiraService(Integer projectId, GitlabJiraProperties jiraPropties) throws IOException { @@ -3314,7 +3345,7 @@ public boolean createOrEditJiraService(Integer projectId, GitlabJiraProperties j String tailUrl = GitlabProject.URL + "/" + projectId + GitlabServiceJira.URL + query.toString(); - return retrieve().method("PUT").to(tailUrl, Boolean.class); + return retrieve().method(PUT).to(tailUrl, Boolean.class); } @@ -3322,7 +3353,7 @@ public boolean createOrEditJiraService(Integer projectId, GitlabJiraProperties j * Get a list of projects accessible by the authenticated user by search. * * @return A list of gitlab projects - * @throws IOException + * @throws IOException on gitlab api call error */ public List searchProjects(String search) throws IOException { Query query = new Query() @@ -3371,7 +3402,7 @@ public void deleteSharedProjectGroupLink(GitlabGroup group, GitlabProject projec */ public void deleteSharedProjectGroupLink(int groupId, int projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + projectId + "/share/" + groupId; - retrieve().method("DELETE").to(tailUrl, Void.class); + retrieve().method(DELETE).to(tailUrl, Void.class); } /** @@ -3395,7 +3426,7 @@ public GitlabVersion getVersion() throws IOException { * Returns a List of all GitlabRunners. * * @return List of GitlabRunners - * @throws IOException + * @throws IOException on gitlab api call error */ public List getRunners() throws IOException { return getRunnersWithPagination(GitlabRunner.RunnerScope.ALL, null); @@ -3446,7 +3477,7 @@ public List getRunnersWithPagination(GitlabRunner.RunnerScope scop } tailUrl.append(query.toString()); - return Arrays.asList(retrieve().method("GET").to(tailUrl.toString(), GitlabRunner[].class)); + return Arrays.asList(retrieve().method(GET).to(tailUrl.toString(), GitlabRunner[].class)); } /** @@ -3454,7 +3485,7 @@ public List getRunnersWithPagination(GitlabRunner.RunnerScope scop * * @param id Runner id. * @return Extensive GitlabRunner Details. - * @throws IOException + * @throws IOException on gitlab api call error */ public GitlabRunner getRunnerDetail(int id) throws IOException { String tailUrl = String.format("%s/%d", GitlabRunner.URL, id); diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index e12dc6c6..0b2a2a65 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -25,6 +25,10 @@ import org.gitlab.api.GitlabAPIException; import org.gitlab.api.TokenType; +import static org.gitlab.api.http.Method.GET; +import static org.gitlab.api.http.Method.POST; +import static org.gitlab.api.http.Method.PUT; + /** * Gitlab HTTP Requestor * Responsible for handling HTTP requests to the Gitlab API @@ -37,32 +41,14 @@ public class GitlabHTTPRequestor { private final GitlabAPI root; - private String method = "GET"; // Default to GET requests - private Map data = new HashMap(); - private Map attachments = new HashMap(); + private Method method = GET; // Default to GET requests + private Map data = new HashMap<>(); + private Map attachments = new HashMap<>(); private String apiToken; private TokenType tokenType; private AuthMethod authMethod; - private enum METHOD { - GET, PUT, POST, PATCH, DELETE, HEAD, OPTIONS, TRACE; - - public static String prettyValues() { - METHOD[] methods = METHOD.values(); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < methods.length; i++) { - METHOD method = methods[i]; - builder.append(method.toString()); - - if (i != methods.length - 1) { - builder.append(", "); - } - } - return builder.toString(); - } - } - public GitlabHTTPRequestor(GitlabAPI root) { this.root = root; } @@ -82,7 +68,7 @@ public GitlabHTTPRequestor authenticate(String token, TokenType type, AuthMethod this.authMethod = method; return this; } - + /** * Sets the HTTP Request method for the request. * Has a fluent api for method chaining. @@ -90,13 +76,8 @@ public GitlabHTTPRequestor authenticate(String token, TokenType type, AuthMethod * @param method The HTTP method * @return this */ - public GitlabHTTPRequestor method(String method) { - try { - this.method = METHOD.valueOf(method).toString(); - } catch (IllegalArgumentException e) { - throw new IllegalArgumentException("Invalid HTTP Method: " + method + ". Must be one of " + METHOD.prettyValues()); - } - + public GitlabHTTPRequestor method(Method method) { + this.method = method; return this; } @@ -157,7 +138,7 @@ public T to(String tailAPIUrl, Class type, T instance) throws IOException submitAttachments(connection); } else if (hasOutput()) { submitData(connection); - } else if ("PUT".equals(method)) { + } else if (PUT.equals(method)) { // PUT requires Content-Length: 0 even when there is no body (eg: API for protecting a branch) connection.setDoOutput(true); connection.setFixedLengthStreamingMode(0); @@ -178,7 +159,7 @@ public T to(String tailAPIUrl, Class type, T instance) throws IOException } public List getAll(final String tailUrl, final Class type) { - List results = new ArrayList(); + List results = new ArrayList<>(); Iterator iterator = asIterator(tailUrl, type); while (iterator.hasNext()) { @@ -192,7 +173,7 @@ public List getAll(final String tailUrl, final Class type) { } public Iterator asIterator(final String tailApiUrl, final Class type) { - method("GET"); // Ensure we only use iterators for GET requests + method(GET); // Ensure we only use iterators for GET requests // Ensure that we don't submit any data and alert the user if (!data.isEmpty()) { @@ -293,35 +274,30 @@ private void submitAttachments(HttpURLConnection connection) throws IOException String charset = "UTF-8"; String CRLF = "\r\n"; // Line separator required by multipart/form-data. OutputStream output = connection.getOutputStream(); - PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, charset), true); - try { + try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, charset), true)) { for (Map.Entry paramEntry : data.entrySet()) { String paramName = paramEntry.getKey(); String param = GitlabAPI.MAPPER.writeValueAsString(paramEntry.getValue()); - writer.append("--" + boundary).append(CRLF); - writer.append("Content-Disposition: form-data; name=\"" + paramName + "\"").append(CRLF); - writer.append("Content-Type: text/plain; charset=" + charset).append(CRLF); + writer.append("--").append(boundary).append(CRLF); + writer.append("Content-Disposition: form-data; name=\"").append(paramName).append("\"").append(CRLF); + writer.append("Content-Type: text/plain; charset=").append(charset).append(CRLF); writer.append(CRLF).append(param).append(CRLF).flush(); } for (Map.Entry attachMentEntry : attachments.entrySet()) { File binaryFile = attachMentEntry.getValue(); - writer.append("--" + boundary).append(CRLF); - writer.append("Content-Disposition: form-data; name=\""+ attachMentEntry.getKey() +"\"; filename=\"" + binaryFile.getName() + "\"").append(CRLF); - writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(binaryFile.getName())).append(CRLF); + writer.append("--").append(boundary).append(CRLF); + writer.append("Content-Disposition: form-data; name=\"").append(attachMentEntry.getKey()) + .append("\"; filename=\"").append(binaryFile.getName()).append("\"").append(CRLF); + writer.append("Content-Type: ").append(URLConnection.guessContentTypeFromName(binaryFile.getName())).append(CRLF); writer.append("Content-Transfer-Encoding: binary").append(CRLF); writer.append(CRLF).flush(); - Reader fileReader = new FileReader(binaryFile); - try { + try (Reader fileReader = new FileReader(binaryFile)) { IOUtils.copy(fileReader, output); - } finally { - fileReader.close(); } output.flush(); // Important before continuing with writer! writer.append(CRLF).flush(); // CRLF is important! It indicates end of boundary. } - writer.append("--" + boundary + "--").append(CRLF).flush(); - } finally { - writer.close(); + writer.append("--").append(boundary).append("--").append(CRLF).flush(); } } @@ -336,7 +312,7 @@ private boolean hasAttachments() { } private boolean hasOutput() { - return method.equals("POST") || method.equals("PUT") && !data.isEmpty(); + return method.equals(POST) || method.equals(PUT) && !data.isEmpty(); } private HttpURLConnection setupConnection(URL url) throws IOException { @@ -346,30 +322,31 @@ private HttpURLConnection setupConnection(URL url) throws IOException { if (apiToken != null && authMethod == AuthMethod.URL_PARAMETER) { String urlWithAuth = url.toString(); - urlWithAuth = urlWithAuth + (urlWithAuth.indexOf('?') > 0 ? '&' : '?') + tokenType.getTokenParamName() + "=" + apiToken; + urlWithAuth = urlWithAuth + (urlWithAuth.indexOf('?') > 0 ? '&' : '?') + + tokenType.getTokenParamName() + "=" + apiToken; url = new URL(urlWithAuth); } - HttpURLConnection connection = root.getProxy() != null ? (HttpURLConnection) url.openConnection(root.getProxy()) : (HttpURLConnection) url.openConnection(); + HttpURLConnection connection = root.getProxy() != null ? + (HttpURLConnection) url.openConnection(root.getProxy()) : (HttpURLConnection) url.openConnection(); if (apiToken != null && authMethod == AuthMethod.HEADER) { - connection.setRequestProperty(tokenType.getTokenHeaderName(), String.format(tokenType.getTokenHeaderFormat(), apiToken)); + connection.setRequestProperty(tokenType.getTokenHeaderName(), + String.format(tokenType.getTokenHeaderFormat(), apiToken)); } - final int requestTimeout = root.getRequestTimeout(); - if (requestTimeout > 0) { - connection.setReadTimeout(requestTimeout); - } + connection.setReadTimeout(root.getResponseReadTimeout()); + connection.setConnectTimeout(root.getConnectionTimeout()); try { - connection.setRequestMethod(method); + connection.setRequestMethod(method.name()); } catch (ProtocolException e) { // Hack in case the API uses a non-standard HTTP verb try { Field methodField = connection.getClass().getDeclaredField("method"); methodField.setAccessible(true); - methodField.set(connection, method); + methodField.set(connection, method.name()); } catch (Exception x) { - throw (IOException) new IOException("Failed to set the custom verb").initCause(x); + throw new IOException("Failed to set the custom verb", x); } } connection.setRequestProperty("User-Agent", root.getUserAgent()); @@ -396,7 +373,8 @@ private T parse(HttpURLConnection connection, Class type, T instance) thr return null; } } catch (SSLHandshakeException e) { - throw new SSLHandshakeException("You can disable certificate checking by setting ignoreCertificateErrors on GitlabHTTPRequestor. SSL Error: " + e.getMessage()); + throw new SSLException("You can disable certificate checking by setting ignoreCertificateErrors " + + "on GitlabHTTPRequestor.", e); } finally { IOUtils.closeQuietly(reader); } @@ -415,10 +393,9 @@ private InputStream wrapStream(HttpURLConnection connection, InputStream inputSt } private void handleAPIError(IOException e, HttpURLConnection connection) throws IOException { - if (e instanceof FileNotFoundException) { - throw e; // pass through 404 Not Found to allow the caller to handle it intelligently - } - if (e instanceof SocketTimeoutException && root.getRequestTimeout() > 0) { + if (e instanceof FileNotFoundException || // pass through 404 Not Found to allow the caller to handle it intelligently + e instanceof SocketTimeoutException || + e instanceof ConnectException) { throw e; } @@ -454,12 +431,7 @@ public void checkServerTrusted( } }; // Added per https://github.com/timols/java-gitlab-api/issues/44 - HostnameVerifier nullVerifier = new HostnameVerifier() { - @Override - public boolean verify(String hostname, SSLSession session) { - return true; - } - }; + HostnameVerifier nullVerifier = (hostname, session) -> true; try { SSLContext sc = SSLContext.getInstance("SSL"); @@ -467,8 +439,6 @@ public boolean verify(String hostname, SSLSession session) { HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); // Added per https://github.com/timols/java-gitlab-api/issues/44 HttpsURLConnection.setDefaultHostnameVerifier(nullVerifier); - } catch (Exception e) { - // Ignore it - } + } catch (Exception ignore) {} } } diff --git a/src/main/java/org/gitlab/api/http/Method.java b/src/main/java/org/gitlab/api/http/Method.java new file mode 100644 index 00000000..02655e7e --- /dev/null +++ b/src/main/java/org/gitlab/api/http/Method.java @@ -0,0 +1,11 @@ +package org.gitlab.api.http; + +/** + * Created by Oleg Shaburov on 03.05.2018 + * shaburov.o.a@gmail.com + */ +public enum Method { + + GET, PUT, POST, PATCH, DELETE, HEAD, OPTIONS, TRACE; + +} diff --git a/src/test/java/org/gitlab/api/GitlabAPIIT.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java index 121d86a0..bee0c645 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIIT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -5,19 +5,23 @@ import org.junit.Test; import java.io.FileNotFoundException; -import java.io.IOException; import java.net.URL; import java.util.List; import java.util.UUID; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.junit.Assert.*; public class GitlabAPIIT { - static GitlabAPI api; + private static GitlabAPI api; - private static final String TEST_URL = "http://" + System.getProperty("docker.host.address", "localhost") + ":" + System.getProperty("gitlab.port", "18080"); - String rand = createRandomString(); + private static final String TEST_URL = "http://" + System.getProperty("docker.host.address", "localhost") + + ":" + System.getProperty("gitlab.port", "18080"); @BeforeClass public static void getApi() { @@ -25,9 +29,10 @@ public static void getApi() { } @Test - public void Check_invalid_credentials() throws IOException { + public void checkInvalidCredentials() throws Exception { try { - api.dispatch().with("login", "INVALID").with("password", createRandomString()).to("session", GitlabUser.class); + api.dispatch().with("login", "INVALID").with("password", createRandomString()) + .to("session", GitlabUser.class); } catch (GitlabAPIException e) { final String message = e.getMessage(); if (!message.equals("{\"message\":\"401 Unauthorized\"}")) { @@ -37,30 +42,26 @@ public void Check_invalid_credentials() throws IOException { } } } - @Test - public void testAllProjects() throws IOException { - api.getAllProjects(); - } @Test - public void testConnect() throws IOException { - assertEquals(GitlabAPI.class, api.getClass()); + public void testAllProjects() { + assertThat(api.getAllProjects(), is(notNullValue())); } @Test - public void testGetAPIUrl() throws IOException { + public void testGetAPIUrl() throws Exception { URL expected = new URL(TEST_URL + "/api/v4/"); assertEquals(expected, api.getAPIUrl("")); } @Test - public void testGetUrl() throws IOException { + public void testGetUrl() throws Exception { URL expected = new URL(TEST_URL); assertEquals(expected + "/", api.getUrl("").toString()); } @Test - public void testCreateUpdateDeleteVariable() throws IOException { + public void testCreateUpdateDeleteVariable() throws Exception { String key = randVal("key"); String value = randVal("value"); String newValue = randVal("new_value"); @@ -81,16 +82,13 @@ public void testCreateUpdateDeleteVariable() throws IOException { api.updateBuildVariable(project.getId(), key, newValue); - GitlabBuildVariable postUpdate = api.getBuildVariable(project.getId(), key); - assertNotNull(postUpdate); assertEquals(postUpdate.getKey(), variable.getKey()); assertNotEquals(postUpdate.getValue(), variable.getValue()); assertEquals(postUpdate.getValue(), newValue); - api.deleteBuildVariable(project.getId(), key); // expect a 404, but we have no access to it @@ -100,16 +98,12 @@ public void testCreateUpdateDeleteVariable() throws IOException { } catch (FileNotFoundException thisIsSoOddForAnRESTApiClient) { assertTrue(true); // expected } - api.deleteProject(project.getId()); } @Test - public void testCreateUpdateDeleteUser() throws IOException, InterruptedException { - + public void testCreateUpdateDeleteUser() throws Exception { String password = randVal("$%password"); - - GitlabUser gitUser = api.createUser(randVal("testEmail@gitlabapitest.com"), password, randVal("userName"), @@ -134,14 +128,14 @@ public void testCreateUpdateDeleteUser() throws IOException, InterruptedExceptio assertEquals(refetched.getUsername(), gitUser.getUsername()); api.updateUser(gitUser.getId(), gitUser.getEmail(), password, gitUser.getUsername(), - gitUser.getName(), "newSkypeId", gitUser.getLinkedin(), gitUser.getTwitter(), gitUser.getWebsiteUrl(), - 10 /* project limit does not come back on GET */, gitUser.getExternUid(), gitUser.getExternProviderName(), + gitUser.getName(), "newSkypeId", gitUser.getLinkedin(), + gitUser.getTwitter(), gitUser.getWebsiteUrl(), + 10 /* project limit does not come back on GET */, + gitUser.getExternUid(), gitUser.getExternProviderName(), gitUser.getBio(), gitUser.isAdmin(), gitUser.isCanCreateGroup(), gitUser.isExternal()); - GitlabUser postUpdate = api.getUserViaSudo(gitUser.getUsername()); - assertNotNull(postUpdate); assertEquals(postUpdate.getSkype(), "newSkypeId"); @@ -159,12 +153,10 @@ public void testCreateUpdateDeleteUser() throws IOException, InterruptedExceptio } catch (FileNotFoundException thisIsSoOddForAnRESTApiClient) { assertTrue(true); // expected } - - } @Test - public void testGetGroupByPath() throws IOException { + public void testGetGroupByPath() throws Exception { // Given String name = "groupName"; String path = "groupPath"; @@ -185,7 +177,7 @@ public void testGetGroupByPath() throws IOException { } @Test - public void testCreateAndUpdateGroup() throws IOException { + public void testCreateAndUpdateGroup() throws Exception { // Given GitlabGroup originalGroup = new GitlabGroup(); originalGroup.setDescription("test description"); @@ -217,41 +209,36 @@ public void testCreateAndUpdateGroup() throws IOException { } @Test - public void testGetMembershipProjects() throws IOException { - final List membershipProjects = api.getMembershipProjects(); - assertTrue(membershipProjects.size() >= 0); + public void testGetMembershipProjects() throws Exception { + assertThat(api.getMembershipProjects(), not(nullValue())); } @Test - public void Check_get_owned_projects() throws IOException { - final List ownedProjects = api.getOwnedProjects(); - assertTrue(ownedProjects.size() >= 0); + public void checkGetOwnedProjects() throws Exception { + assertThat(api.getOwnedProjects(), not(nullValue())); } @Test - public void Check_search_projects() throws IOException { + public void checkSearchProjects() throws Exception { final List searchedProjects = api.searchProjects("foo"); - assertEquals(0, searchedProjects.size()); + assertThat(searchedProjects, not(nullValue())); + assertThat(searchedProjects.isEmpty(), is(true)); } /** * There is at least one namespace for the user - * - * @throws IOException */ @Test - public void testGetNamespace() throws IOException { + public void testGetNamespace() { final List gitlabNamespaces = api.getNamespaces(); - assertTrue(gitlabNamespaces.size() > 0); + assertThat(gitlabNamespaces, not(nullValue())); + assertThat(gitlabNamespaces.isEmpty(), is(false)); } @Test - public void testCreateDeleteFork() throws IOException { + public void testCreateDeleteFork() throws Exception { String projectName = randVal("Fork-me"); - String password = randVal("$%password"); - - GitlabUser gitUser = api.createUser(randVal("testEmail@gitlabapitest.com"), password, randVal("userName"), @@ -269,22 +256,19 @@ public void testCreateDeleteFork() throws IOException { false, false); - GitlabProject project = api.createUserProject(gitUser.getId(), projectName); GitlabProject fork = api.createFork(api.getNamespaces().get(0).getPath(), project); assertNotNull(fork); - assertEquals(project.getId(), fork.getForkedFrom().getId()); api.deleteProject(project.getId()); api.deleteProject(fork.getId()); - api.deleteUser(gitUser.getId()); } private String randVal(String postfix) { - return rand + "_" + postfix; + return createRandomString() + "_" + postfix; } private static String createRandomString() { diff --git a/src/test/java/org/gitlab/api/GitlabAPIUT.java b/src/test/java/org/gitlab/api/GitlabAPIUT.java new file mode 100644 index 00000000..b2cce34a --- /dev/null +++ b/src/test/java/org/gitlab/api/GitlabAPIUT.java @@ -0,0 +1,93 @@ +package org.gitlab.api; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.net.ServerSocket; +import java.net.SocketTimeoutException; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.junit.jupiter.api.Assertions.assertThrows; + +/** + * Created by Oleg Shaburov on 03.05.2018 + * shaburov.o.a@gmail.com + */ +@SuppressWarnings("WeakerAccess") +public class GitlabAPIUT { + + @Test + @DisplayName(value = "Check non-routable connection with connection timeout error") + public void unitTest_20180503175711() { + GitlabAPI api = GitlabAPI.connect("http://172.16.0.0:80", "test"); + api.setConnectionTimeout(100); + Throwable exception = assertThrows(SocketTimeoutException.class, api::getVersion); + assertThat(exception.getMessage(), is("connect timed out")); + } + + @Test + @DisplayName(value = "Check default value is 0 for connection timeout") + public void unitTest_20180503185536() { + GitlabAPI api = GitlabAPI.connect("http://test.api", "test"); + assertThat(api.getConnectionTimeout(), is(0)); + } + + @Test + @DisplayName(value = "Check set/get methods for connection timeout parameter") + public void unitTest_20180503185632() { + GitlabAPI api = GitlabAPI.connect("http://test.api", "test"); + api.setConnectionTimeout(123); + assertThat(api.getConnectionTimeout(), is(123)); + } + + @Test + @DisplayName(value = "Check ignore negative value for connection timeout parameter") + public void unitTest_20180503185750() { + GitlabAPI api = GitlabAPI.connect("http://test.api", "test"); + api.setConnectionTimeout(-123); + assertThat(api.getConnectionTimeout(), is(0)); + } + + @Test + @DisplayName(value = "Check connection with read timeout error") + public void unitTest_20180503191159() throws IOException { + ServerSocket socket = null; + try { + socket = new ServerSocket(15896); + GitlabAPI api = GitlabAPI.connect("http://localhost:15896", "test"); + api.setResponseReadTimeout(100); + Throwable exception = assertThrows(SocketTimeoutException.class, api::getVersion); + assertThat(exception.getMessage(), is("Read timed out")); + } finally { + if (socket != null) { + socket.close(); + } + } + } + + @Test + @DisplayName(value = "Check default value is 0 for request timeout parameter") + public void unitTest_20180503191716() { + GitlabAPI api = GitlabAPI.connect("http://test.api", "test"); + assertThat(api.getResponseReadTimeout(), is(0)); + } + + @Test + @DisplayName(value = "Check set/get methods for request timeout parameter") + public void unitTest_20180503191945() { + GitlabAPI api = GitlabAPI.connect("http://test.api", "test"); + api.setResponseReadTimeout(123); + assertThat(api.getResponseReadTimeout(), is(123)); + } + + @Test + @DisplayName(value = "Check ignore negative value for request timeout parameter") + public void unitTest_20180503192141() { + GitlabAPI api = GitlabAPI.connect("http://test.api", "test"); + api.setResponseReadTimeout(-123); + assertThat(api.getResponseReadTimeout(), is(0)); + } + +} diff --git a/src/test/java/org/gitlab/api/http/GitlabHTTPRequestorTest.java b/src/test/java/org/gitlab/api/http/GitlabHTTPRequestorTest.java index f9effc4b..9db94bac 100644 --- a/src/test/java/org/gitlab/api/http/GitlabHTTPRequestorTest.java +++ b/src/test/java/org/gitlab/api/http/GitlabHTTPRequestorTest.java @@ -1,20 +1,114 @@ package org.gitlab.api.http; -import static org.junit.Assert.assertEquals; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; import org.gitlab.api.GitlabAPI; -import org.junit.Test; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import java.lang.reflect.Method; +import java.net.HttpURLConnection; +import java.net.URL; + +@SuppressWarnings({"WeakerAccess", "ConstantConditions"}) public class GitlabHTTPRequestorTest { @Test - public void testSettingInvalidHTTPMethod() { - GitlabHTTPRequestor http = new GitlabHTTPRequestor(GitlabAPI.connect("localhost", "api")); + @DisplayName(value = "Expected success, calling the \"setupConnection\" method if the connection timeout = 0") + public void unitTest_20180503194340() throws Exception { + GitlabAPI api = mock(GitlabAPI.class); + when(api.getConnectionTimeout()).thenReturn(0); + GitlabHTTPRequestor http = new GitlabHTTPRequestor(api); + URL url = new URL("http://test.url"); + Method method = GitlabHTTPRequestor.class.getDeclaredMethod("setupConnection", URL.class); + method.setAccessible(true); + HttpURLConnection connection = (HttpURLConnection) method.invoke(http, url); + assertThat(connection.getConnectTimeout(), is(0)); + } + + @Test + @DisplayName(value = "Expected success, calling the \"setupConnection\" method if the connection timeout > 0") + public void unitTest_20180503194559() throws Exception { + GitlabAPI api = mock(GitlabAPI.class); + when(api.getConnectionTimeout()).thenReturn(456); + GitlabHTTPRequestor http = new GitlabHTTPRequestor(api); + URL url = new URL("http://test.url"); + Method method = GitlabHTTPRequestor.class.getDeclaredMethod("setupConnection", URL.class); + method.setAccessible(true); + HttpURLConnection connection = (HttpURLConnection) method.invoke(http, url); + assertThat(connection.getConnectTimeout(), is(456)); + } + + @Test + @DisplayName(value = "An error is expected, calling the \"setupConnection\" method if the connection timeout < 0") + public void unitTest_20180503194643() throws Exception { + GitlabAPI api = mock(GitlabAPI.class); + when(api.getConnectionTimeout()).thenReturn(-555); + GitlabHTTPRequestor http = new GitlabHTTPRequestor(api); + URL url = new URL("http://test.url"); + Method method = GitlabHTTPRequestor.class.getDeclaredMethod("setupConnection", URL.class); + method.setAccessible(true); + Throwable throwable = null; + try { + method.invoke(http, url); + } catch (Exception e) { + throwable = e.getCause(); + } + assertThat(throwable, not(nullValue())); + assertThat(throwable, is(instanceOf(IllegalArgumentException.class))); + assertThat(throwable.getMessage(), is("timeouts can't be negative")); + } + + @Test + @DisplayName(value = "Expected success, calling the \"setupConnection\" method if the read timeout = 0") + public void unitTest_20180503202458() throws Exception { + GitlabAPI api = mock(GitlabAPI.class); + when(api.getResponseReadTimeout()).thenReturn(0); + GitlabHTTPRequestor http = new GitlabHTTPRequestor(api); + URL url = new URL("http://test.url"); + Method method = GitlabHTTPRequestor.class.getDeclaredMethod("setupConnection", URL.class); + method.setAccessible(true); + HttpURLConnection connection = (HttpURLConnection) method.invoke(http, url); + assertThat(connection.getReadTimeout(), is(0)); + } + + @Test + @DisplayName(value = "Expected success, calling the \"setupConnection\" method if the read timeout > 0") + public void unitTest_20180503203531() throws Exception { + GitlabAPI api = mock(GitlabAPI.class); + when(api.getResponseReadTimeout()).thenReturn(555); + GitlabHTTPRequestor http = new GitlabHTTPRequestor(api); + URL url = new URL("http://test.url"); + Method method = GitlabHTTPRequestor.class.getDeclaredMethod("setupConnection", URL.class); + method.setAccessible(true); + HttpURLConnection connection = (HttpURLConnection) method.invoke(http, url); + assertThat(connection.getReadTimeout(), is(555)); + } + + @Test + @DisplayName(value = "An error is expected, calling the \"setupConnection\" method if the read timeout < 0") + public void unitTest_20180503203635() throws Exception { + GitlabAPI api = mock(GitlabAPI.class); + when(api.getResponseReadTimeout()).thenReturn(-555); + GitlabHTTPRequestor http = new GitlabHTTPRequestor(api); + URL url = new URL("http://test.url"); + Method method = GitlabHTTPRequestor.class.getDeclaredMethod("setupConnection", URL.class); + method.setAccessible(true); + Throwable throwable = null; try { - http.method("WRONG METHOD"); + method.invoke(http, url); } catch (Exception e) { - assertEquals("Invalid HTTP Method: WRONG METHOD. Must be one of GET, PUT, POST, PATCH, DELETE, HEAD, OPTIONS, TRACE", e.getMessage()); + throwable = e.getCause(); } + assertThat(throwable, not(nullValue())); + assertThat(throwable, is(instanceOf(IllegalArgumentException.class))); + assertThat(throwable.getMessage(), is("timeouts can't be negative")); } } diff --git a/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml new file mode 100644 index 00000000..57f3d206 --- /dev/null +++ b/src/test/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + %d{HH:mm:ss.SSS} [%-5p] [%25.25C] - %m%n + + + + + + + + + + + + From 7344d37d56434056f40be1e9ef4993fcdd0d5802 Mon Sep 17 00:00:00 2001 From: Mykola Nikishov Date: Tue, 15 May 2018 22:49:18 +0300 Subject: [PATCH 077/119] Direct link to GitLab API documentation (#301) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fff8b844..4dea5cbd 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Maven Central](https://img.shields.io/maven-central/v/org.gitlab/java-gitlab-api.svg)](http://mvnrepository.com/artifact/org.gitlab/java-gitlab-api) [![Build Status](https://travis-ci.org/timols/java-gitlab-api.svg?branch=master)](https://travis-ci.org/timols/java-gitlab-api) -A wrapper for the [Gitlab API](https://gitlab.org) written in Java. +A wrapper for the [Gitlab API](https://docs.gitlab.com/ee/api/) written in Java. [Documentation](https://timols.github.io/java-gitlab-api) is available in the form of [Javadocs](https://timols.github.io/java-gitlab-api) The major version indicates the API version of gitlab. From 71b0387fc6edfe5010cec716d82b410e51d649f9 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 12 Jun 2018 18:44:09 +0200 Subject: [PATCH 078/119] Fix getting owned projects. Fix for issue #302. (#304) --- 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 bae26fab..faa466b7 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -848,7 +848,7 @@ public List getProjectsWithPagination(Pagination pagination) thro * @throws IOException on gitlab api call error */ public List getOwnedProjects() throws IOException { - Query query = new Query().append("owner", "true"); + Query query = new Query().append("owned", "true"); query.mergeWith(new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).asQuery()); String tailUrl = GitlabProject.URL + query.toString(); return retrieve().getAll(tailUrl, GitlabProject[].class); From 3ae8e188596a548242b59befc26cc28dee191505 Mon Sep 17 00:00:00 2001 From: ericvergnaud Date: Wed, 13 Jun 2018 00:44:21 +0800 Subject: [PATCH 079/119] Update GitlabAPI.java (#303) issue.getId triggers a 404, Gitlab experts a Iid --- 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 faa466b7..50b860c8 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2221,7 +2221,7 @@ public GitlabNote createNote(Serializable projectId, Integer issueId, String mes } public GitlabNote createNote(GitlabIssue issue, String message) throws IOException { - return createNote(String.valueOf(issue.getProjectId()), issue.getId(), message); + return createNote(String.valueOf(issue.getProjectId()), issue.getIid(), message); } /** From efadbdd1bc1c2be63054492dafe6c30ef22ed3e2 Mon Sep 17 00:00:00 2001 From: Andrey Troitskiy Date: Fri, 29 Jun 2018 20:07:18 +0300 Subject: [PATCH 080/119] Fixed pagination parameter and project parameter name (#307) * Search project by namespace and project name * Reverted --- src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java | 2 +- src/main/java/org/gitlab/api/models/GitlabProject.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index 0b2a2a65..83754792 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -261,7 +261,7 @@ private void findNextUrl() throws MalformedURLException { } else { // Since the page query was not present, its safe to assume that we just // currently used the first page, so we can default to page 2 - this.url = new URL(url + (url.indexOf('?') > 0 ? '&' : '?') + "&page=2"); + this.url = new URL(url + (url.indexOf('?') > 0 ? '&' : '?') + "page=2"); } } }; diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 33fb923c..04cf085d 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -125,7 +125,7 @@ public class GitlabProject { @JsonProperty("forked_from_project") private GitlabProject forkedFrom; - @JsonProperty("is_printing_merge_request_link_enabled") + @JsonProperty("printing_merge_request_link_enabled") private Boolean printingMergeRequestLinkEnabled; public Integer getId() { From 5d16882a4ce996367113b978f33e03ab5072071b Mon Sep 17 00:00:00 2001 From: Evgeny Date: Sat, 30 Jun 2018 01:07:40 +0800 Subject: [PATCH 081/119] Sending namespace during fork (#300) * Sending namespace during fork * Added import_status field for project model --- src/main/java/org/gitlab/api/GitlabAPI.java | 5 ++--- src/main/java/org/gitlab/api/models/GitlabProject.java | 3 +++ src/test/java/org/gitlab/api/GitlabAPIIT.java | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 50b860c8..946475f3 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1301,9 +1301,8 @@ public GitlabProject createUserProject(Integer userId, String name, String descr */ public GitlabProject createFork(String namespace, Integer projectId) throws IOException { Query query = new Query() - .appendIf("id", projectId) - .append("namespace", namespace); - String tailUrl = GitlabProject.URL + "/" + projectId + "/fork"; + .appendIf("namespace", namespace); + String tailUrl = GitlabProject.URL + "/" + projectId + "/fork" + query.toString(); return dispatch().to(tailUrl, GitlabProject.class); } diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index 04cf085d..f1c6e803 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -128,6 +128,9 @@ public class GitlabProject { @JsonProperty("printing_merge_request_link_enabled") private Boolean printingMergeRequestLinkEnabled; + @JsonProperty("import_status") + private String importStatus; + public Integer getId() { return id; } diff --git a/src/test/java/org/gitlab/api/GitlabAPIIT.java b/src/test/java/org/gitlab/api/GitlabAPIIT.java index bee0c645..f8d2fc62 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIIT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIIT.java @@ -256,11 +256,14 @@ public void testCreateDeleteFork() throws Exception { false, false); + String namespace = api.getNamespaces().get(0).getPath(); + GitlabProject project = api.createUserProject(gitUser.getId(), projectName); - GitlabProject fork = api.createFork(api.getNamespaces().get(0).getPath(), project); + GitlabProject fork = api.createFork(namespace, project); assertNotNull(fork); assertEquals(project.getId(), fork.getForkedFrom().getId()); + assertEquals(project.getNamespace(), namespace); api.deleteProject(project.getId()); api.deleteProject(fork.getId()); From d31ecf79d0e5809c74973f95e657cbe90e892f0d Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 6 Aug 2018 19:32:43 +0200 Subject: [PATCH 082/119] Add badge support (#311) * Added possibility to get issues by projectId. * Added possibility to create subgroups. * Add support for project and group level badges. * Adjust method naming to naming from GitLab GUI. --- src/main/java/org/gitlab/api/GitlabAPI.java | 156 ++++++++++++++++++ .../org/gitlab/api/models/GitlabBadge.java | 70 ++++++++ 2 files changed, 226 insertions(+) create mode 100644 src/main/java/org/gitlab/api/models/GitlabBadge.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 946475f3..f2cd7888 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2249,6 +2249,162 @@ public void deleteNote(GitlabIssue issue, GitlabNote noteToDelete) throws IOExce deleteNote(String.valueOf(issue.getProjectId()), issue.getId(), noteToDelete); } + /** + * Get project badges + * + * @param projectId The id of the project for which the badges should be retrieved + * @return The list of badges + * + * @throws IOException on GitLab API call error + */ + public List getProjectBadges(Serializable projectId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBadge.URL; + return Arrays.asList(retrieve().to(tailUrl, GitlabBadge[].class)); + } + + /** + * Get project badge + * + * @param projectId The id of the project for which the badge should be retrieved + * @param badgeId The id of the badge that should be retrieved + * @return The badge with a given id + * + * @throws IOException on GitLab API call error + */ + public GitlabBadge getProjectBadge(Serializable projectId, Integer badgeId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBadge.URL + + "/" + badgeId; + return retrieve().to(tailUrl, GitlabBadge.class); + } + + /** + * Add project badge + * + * @param projectId The id of the project for which the badge should be added + * @param linkUrl The URL that the badge should link to + * @param imageUrl The URL to the badge image + * @return The created badge + * + * @throws IOException on GitLab API call error + */ + public GitlabBadge addProjectBadge(Serializable projectId, String linkUrl, String imageUrl) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBadge.URL; + return dispatch().with("link_url", linkUrl) + .with("image_url", imageUrl) + .to(tailUrl, GitlabBadge.class); + } + + /** + * Edit project badge + * + * @param projectId The id of the project for which the badge should be edited + * @param badgeId The id of the badge that should be edited + * @param linkUrl The URL that the badge should link to + * @param imageUrl The URL to the badge image + * @return The updated badge + * + * @throws IOException on GitLab API call error + */ + public GitlabBadge editProjectBadge(Serializable projectId, Integer badgeId, String linkUrl, String imageUrl) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBadge.URL + + "/" + badgeId; + GitlabHTTPRequestor requestor = retrieve().method(PUT); + requestor.with("link_url", linkUrl) + .with("image_url", imageUrl); + return requestor.to(tailUrl, GitlabBadge.class); + } + + /** + * Delete project badge + * + * @param projectId The id of the project for which the badge should be deleted + * @param badgeId The id of the badge that should be deleted + * @throws IOException on GitLab API call error + */ + public void deleteProjectBadge(Serializable projectId, Integer badgeId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabBadge.URL + + "/" + badgeId; + retrieve().method(DELETE).to(tailUrl, Void.class); + } + + /** + * Get project badges + * + * @param groupId The id of the group for which the badges should be retrieved + * @return The list of badges + * + * @throws IOException on GitLab API call error + */ + public List getGroupBadges(Integer groupId) throws IOException { + String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabBadge.URL; + return Arrays.asList(retrieve().to(tailUrl, GitlabBadge[].class)); + } + + /** + * Get group badge + * + * @param groupId The id of the group for which the badge should be retrieved + * @param badgeId The id of the badge that should be retrieved + * @return The badge with a given id + * + * @throws IOException on GitLab API call error + */ + public GitlabBadge getGroupBadge(Integer groupId, Integer badgeId) throws IOException { + String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabBadge.URL + + "/" + badgeId; + return retrieve().to(tailUrl, GitlabBadge.class); + } + + /** + * Add group badge + * + * @param groupId The id of the group for which the badge should be added + * @param linkUrl The URL that the badge should link to + * @param imageUrl The URL to the badge image + * @return The created badge + * + * @throws IOException on GitLab API call error + */ + public GitlabBadge addGroupBadge(Integer groupId, String linkUrl, String imageUrl) throws IOException { + String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabBadge.URL; + return dispatch().with("link_url", linkUrl) + .with("image_url", imageUrl) + .to(tailUrl, GitlabBadge.class); + } + + /** + * Edit group badge + * + * @param groupId The id of the group for which the badge should be edited + * @param badgeId The id of the badge that should be edited + * @param linkUrl The URL that the badge should link to + * @param imageUrl The URL to the badge image + * @return The updated badge + * + * @throws IOException on GitLab API call error + */ + public GitlabBadge editGroupBadge(Integer groupId, Integer badgeId, String linkUrl, String imageUrl) throws IOException { + String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabBadge.URL + + "/" + badgeId; + GitlabHTTPRequestor requestor = retrieve().method(PUT); + requestor.with("link_url", linkUrl) + .with("image_url", imageUrl); + return requestor.to(tailUrl, GitlabBadge.class); + } + + /** + * Delete group badge + * + * @param groupId The id of the group for which the badge should be deleted + * @param badgeId The id of the badge that should be deleted + * @throws IOException on GitLab API call error + */ + public void deleteGroupBadge(Integer groupId, Integer badgeId) throws IOException { + String tailUrl = GitlabGroup.URL + "/" + groupId + GitlabBadge.URL + + "/" + badgeId; + retrieve().method(DELETE).to(tailUrl, Void.class); + } + /** * Gets labels associated with a project. * diff --git a/src/main/java/org/gitlab/api/models/GitlabBadge.java b/src/main/java/org/gitlab/api/models/GitlabBadge.java new file mode 100644 index 00000000..7de3f1a6 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabBadge.java @@ -0,0 +1,70 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * @author Olga Maciaszek-Sharma + */ +public class GitlabBadge { + + public static final String URL = "/badges"; + + private Integer id; + @JsonProperty("link_url") + private String linkUrl; + @JsonProperty("image_url") + private String imageUrl; + @JsonProperty("rendered_link_url") + private String renderedLinkUrl; + @JsonProperty("rendered_image_url") + private String renderedImageUrl; + private String kind; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getLinkUrl() { + return linkUrl; + } + + public void setLinkUrl(String linkUrl) { + this.linkUrl = linkUrl; + } + + public String getImageUrl() { + return imageUrl; + } + + public void setImageUrl(String imageUrl) { + this.imageUrl = imageUrl; + } + + public String getRenderedLinkUrl() { + return renderedLinkUrl; + } + + public void setRenderedLinkUrl(String renderedLinkUrl) { + this.renderedLinkUrl = renderedLinkUrl; + } + + public String getRenderedImageUrl() { + return renderedImageUrl; + } + + public void setRenderedImageUrl(String renderedImageUrl) { + this.renderedImageUrl = renderedImageUrl; + } + + public String getKind() { + return kind; + } + + public void setKind(String kind) { + this.kind = kind; + } +} From 4274ac4d285c4daa885c3caff3435b40b8139f55 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Mon, 6 Aug 2018 19:37:28 +0200 Subject: [PATCH 083/119] Upgrade gradle wrapper (#312) * Added possibility to get issues by projectId. * Added possibility to create subgroups. * Upgrade gradle wrapper to 4.9. --- gradle/wrapper/gradle-wrapper.jar | Bin 52266 -> 54413 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 78 +++++++++++++---------- gradlew.bat | 14 ++-- 4 files changed, 48 insertions(+), 47 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b5166dad4d90021f6a0b45268c0755719f1d5cd4..0d4a9516871afd710a9d84d89e31ba77745607bd 100644 GIT binary patch delta 42393 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 L=*_szn1BBR{cK2* diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd225d45..bf3de218 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Tue Mar 06 18:55:53 EST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/gradlew b/gradlew index 91a7e269..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730..e95643d6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line From 878af28f66fcc8820b1773c011ecfc567ef9982e Mon Sep 17 00:00:00 2001 From: Patrizio Bonzani Date: Sun, 2 Sep 2018 17:27:16 +0200 Subject: [PATCH 084/119] Merge request discussion API implementation. (#313) * Merge request discussion API implementation. * Improved model and added more doc. --- src/main/java/org/gitlab/api/GitlabAPI.java | 260 +++++++++++++++++- .../gitlab/api/models/GitlabDiscussion.java | 71 +++++ 2 files changed, 330 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/gitlab/api/models/GitlabDiscussion.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index f2cd7888..8219d846 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1616,7 +1616,8 @@ public GitlabMergeRequest acceptMergeRequest(Serializable projectId, Integer mer * @return the Gitlab Note * @throws IOException on gitlab api call error */ - public GitlabNote getNote(GitlabMergeRequest mergeRequest, Integer noteId) throws IOException { + public GitlabNote getNote(GitlabMergeRequest mergeRequest, + Integer noteId) throws IOException { String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + GitlabNote.URL + "/" + noteId; @@ -1641,6 +1642,263 @@ public List getAllNotes(GitlabMergeRequest mergeRequest) { return retrieve().getAll(tailUrl, GitlabNote[].class); } + /** + * Get a discussion by id from a merge request. + * https://docs.gitlab.com/ce/api/discussions.html#get-single-merge-request-discussion + * + * @param mergeRequest to fetch the discussion from. + * @param discussionId The id of the discussion. + * + * @return The GitLab discussion identified by the given id. + * @throws IOException on a GitLab api call error + */ + public GitlabDiscussion getDiscussion(GitlabMergeRequest mergeRequest, + int discussionId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabDiscussion.URL + "/" + discussionId; + return retrieve().to(tailUrl, GitlabDiscussion.class); + } + + /** + * Get the discussions from a merge request. + * https://docs.gitlab.com/ce/api/discussions.html#list-project-merge-request-discussions + * + * @param mergeRequest to fetch the discussions from. + * + * @return The discussions contained in the given merge request. + * @throws IOException on a GitLab api call error + */ + public List getDiscussions(GitlabMergeRequest mergeRequest) throws IOException { + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabDiscussion.URL; + + GitlabDiscussion[] discussions = retrieve().to(tailUrl, GitlabDiscussion[].class); + return Arrays.asList(discussions); + } + + /** + * Create a discussion just with the required arguments. + * + * @param mergeRequest The merge request where the discussion is created. + * @param body The content of a discussion. + * @param positionBaseSha The base commit SHA in the source branch. + * @param positionStartSha The SHA referencing the commit in the target branch. + * @param positionHeadSha The SHA referencing the HEAD of this merge request. + * + * @return The created discussion object. + * @throws IOException on a GitLab api call error + */ + public GitlabDiscussion createDiscussion(GitlabMergeRequest mergeRequest, + String body, String positionBaseSha, String positionStartSha, + String positionHeadSha) throws IOException { + return createTextDiscussion(mergeRequest, body, null, + positionBaseSha, positionStartSha, positionHeadSha, + null, null, null, null); + } + + /** + * Create a new discussion with position type text on the given merge request. + * https://docs.gitlab.com/ce/api/discussions.html#create-new-merge-request-discussion + * + * @param mergeRequest The merge request where the discussion is created. + * @param body The content of a discussion. + * @param position The position when creating a diff note. (hash) + * @param positionBaseSha The base commit SHA in the source branch. + * @param positionStartSha The SHA referencing the commit in the target branch. + * @param positionHeadSha The SHA referencing the HEAD of this merge request. + * @param positionNewPath The file path after the change. + * @param positionNewLine The Line number after change + * @param positionOldPath The file path before the change. + * @param positionOldLine The Line number before change. + * + * @return The created discussion object. + * @throws IOException on a GitLab api call error + */ + public GitlabDiscussion createTextDiscussion(GitlabMergeRequest mergeRequest, + String body, String position, String positionBaseSha, String positionStartSha, + String positionHeadSha, String positionNewPath, Integer positionNewLine, + String positionOldPath, Integer positionOldLine) throws IOException { + checkRequiredCreateDiscussionArguments(body, positionBaseSha, positionStartSha, positionHeadSha); + + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabDiscussion.URL; + + return dispatch() + .with("body", body) + .with("position", position) + .with("position[base_sha]", positionBaseSha) + .with("position[start_sha]", positionStartSha) + .with("position[head_sha]", positionHeadSha) + .with("position[position_type]", "text") + .with("position[new_path]", positionNewPath) + .with("position[new_line]", positionNewLine) + .with("position[old_path]", positionOldPath) + .with("position[old_line]", positionOldLine) + .to(tailUrl, GitlabDiscussion.class); + } + + /** + * Create a new discussion with position type image on the given merge request. + * https://docs.gitlab.com/ce/api/discussions.html#create-new-merge-request-discussion + * + * @param mergeRequest The merge request where the discussion is created. + * @param body The content of a discussion. + * @param position The position when creating a diff note. (hash) + * @param positionBaseSha The base commit SHA in the source branch. + * @param positionStartSha The SHA referencing the commit in the target branch. + * @param positionHeadSha The SHA referencing the HEAD of this merge request. + * @param positionNewPath The file path after the change. + * @param positionOldPath The file path before the change. + * @param positionWidth The width of the image. + * @param positionHeight The height of the image. + * @param positionX The X coordinate. + * @param positionY The Y coordinate. + * + * @return The created discussion object. + * @throws IOException on a GitLab api call error + */ + public GitlabDiscussion createImageDiscussion( + GitlabMergeRequest mergeRequest, String body, String position, + String positionBaseSha, String positionStartSha, + String positionHeadSha, String positionNewPath, String positionOldPath, + Integer positionWidth, Integer positionHeight, Integer positionX, + Integer positionY + ) throws IOException { + checkRequiredCreateDiscussionArguments(body, positionBaseSha, positionStartSha, positionHeadSha); + + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabDiscussion.URL; + + return dispatch() + .with("body", body) + .with("position", position) + .with("position[base_sha]", positionBaseSha) + .with("position[start_sha]", positionStartSha) + .with("position[head_sha]", positionHeadSha) + .with("position[position_type]", "image") + .with("position[new_path]", positionNewPath) + .with("position[old_path]", positionOldPath) + .with("position[width]", positionWidth) + .with("position[height]", positionHeight) + .with("position[x]", positionX) + .with("position[y]", positionY) + .to(tailUrl, GitlabDiscussion.class); + } + + /** + * Check if the required arguments to create a discussion are present and + * contain values. + * + * @param body The content of a discussion. + * @param positionBaseSha The base commit SHA in the source branch. + * @param positionStartSha The SHA referencing commit in target branch + * @param positionHeadSha The SHA referencing HEAD of this merge request + */ + private void checkRequiredCreateDiscussionArguments(String body, + String positionBaseSha, String positionStartSha, String positionHeadSha) { + if (body == null || body.isEmpty()) { + throw new IllegalArgumentException("Missing required argument 'body'!"); + } else if (positionBaseSha == null || positionBaseSha.isEmpty()) { + throw new IllegalArgumentException("Missing required argument 'positionBaseSha'!"); + } else if (positionStartSha == null || positionStartSha.isEmpty()) { + throw new IllegalArgumentException("Missing required argument 'positionStartSha'!"); + } else if (positionHeadSha == null || positionHeadSha.isEmpty()) { + throw new IllegalArgumentException("Missing required argument 'positionHeadSha'!"); + } + } + + /** + * Resolve or unresolve a whole discussion of a merge request. + * + * @param mergeRequest The merge request of the discussion. + * @param discussionId The id of the discussion to resolve. + * @param resolved Resolve or unresolve the note. + * + * @return The discussion object. + * @throws IOException on a GitLab api call error + */ + public GitlabDiscussion resolveDiscussion(GitlabMergeRequest mergeRequest, + int discussionId, boolean resolved) throws IOException { + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabDiscussion.URL + "/" + discussionId; + return retrieve().method(PUT) + .with("resolved", resolved) + .to(tailUrl, GitlabDiscussion.class); + } + + /** + * Add a note to existing merge request discussion. + * + * @param mergeRequest The merge request of the discussion. + * @param discussionId The id of the discussion to add a note to. + * @param body The content of the discussion. + * + * @return The added note object. + * @throws IOException on a GitLab api call error + */ + public GitlabNote addDiscussionNote(GitlabMergeRequest mergeRequest, + int discussionId, String body) throws IOException { + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabDiscussion.URL + "/" + discussionId + + GitlabNote.URL; + return dispatch().with("body", body).to(tailUrl, GitlabNote.class); + } + + /** + * Modify or resolve an existing discussion note of the given merge request. + * + * @param mergeRequest The merge request of the discussion. + * @param discussionId The id of the discussion to modify. + * @param noteId The id of the discussion note. + * @param body The content of the discussion. + * @param resolved Resolve or unresolve the note. + * + * @return The modified note object. + * @throws IOException on a GitLab api call error + */ + public GitlabNote modifyDiscussionNote(GitlabMergeRequest mergeRequest, int discussionId, + int noteId, String body, Boolean resolved) throws IOException { + boolean bodyHasValue = false; + if (body != null && !body.isEmpty()) { + bodyHasValue = true; + } + if ((!bodyHasValue && resolved == null) || (bodyHasValue && resolved != null)) { + throw new IllegalArgumentException("Exactly one of body or resolved must be set!"); + } + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabDiscussion.URL + "/" + discussionId + + GitlabNote.URL + "/" + noteId; + return retrieve().method(PUT) + .with("body", body) + .with("resolved", resolved) + .to(tailUrl, GitlabNote.class); + } + + /** + * Delete a discussion note of a merge request. + * + * @param mergeRequest The merge request of the discussion. + * @param discussionId The id of the discussion to resolve. + * @param noteId The id of a discussion note. + * + * @return The deleted note object. + * @throws IOException on a GitLab api call error + */ + public void deleteDiscussionNote(GitlabMergeRequest mergeRequest, int discussionId, int noteId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabDiscussion.URL + "/" + discussionId + + GitlabNote.URL + "/" + noteId; + retrieve().method(DELETE).to(tailUrl, Void.class); + } + // Get a specific commit identified by the commit hash or name of a branch or tag // GET /projects/:id/repository/commits/:sha public GitlabCommit getCommit(Serializable projectId, String commitHash) throws IOException { diff --git a/src/main/java/org/gitlab/api/models/GitlabDiscussion.java b/src/main/java/org/gitlab/api/models/GitlabDiscussion.java new file mode 100644 index 00000000..5b4b6887 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabDiscussion.java @@ -0,0 +1,71 @@ +package org.gitlab.api.models; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * A class representing a GitLab discussion. A discussion is a collection of + * notes. + * + * @author Patrizio Bonzani + */ +public class GitlabDiscussion { + + public static final String URL = "/discussions"; + + /** + * The ID of a discussion. + */ + private String id; + + /** + * The notes contained in this discussion. + */ + private List notes = new ArrayList(); + + @JsonProperty("individual_note") + private boolean individualNote; + + @SuppressWarnings("unused") + private GitlabDiscussion() {} + + public GitlabDiscussion(String id) { + this.id = id; + } + + /** + * Get the id of this discussion. + * + * @return The id of the discussion. + */ + public String getId() { + return id; + } + + /** + * Get the notes of this discussion. + * + * @return The notes contained in this discussion. + */ + public List getNotes() { + return Collections.unmodifiableList(notes); + } + + /** + * Add a note to the discussion. + * + * @param note The note to add to the discussion. + * @return true (as specified by {@link Collection#add}) + */ + public boolean addNote(GitlabNote note) { + return notes.add(note); + } + + public boolean isIndividualNote() { + return individualNote; + } +} From 01924f80257950148c677f5c08fb22db3425a7fa Mon Sep 17 00:00:00 2001 From: Patrizio Bonzani Date: Sun, 2 Sep 2018 17:27:33 +0200 Subject: [PATCH 085/119] Rename wrong mergeRequestId arguments to mergeRequestIid. (#315) --- src/main/java/org/gitlab/api/GitlabAPI.java | 57 ++++++++++++--------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 8219d846..6d8c0495 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1500,7 +1500,7 @@ public GitlabCommit cherryPick(GitlabProject project, String sha, String targetB * Return Merge Request. * * @param projectId The id of the project - * @param mergeRequestIid The iid of the merge request + * @param mergeRequestIid The internal id of the merge request * @return the Gitlab Merge Request * @throws IOException on gitlab api call error */ @@ -1512,23 +1512,28 @@ public GitlabMergeRequest getMergeRequestByIid(Serializable projectId, Integer m /** * Return a Merge Request including its changes. * - * @param projectId The id of the project - * @param mergeRequestId The id of the merge request + * @param projectId The id of the project + * @param mergeRequestIid The internal id of the merge request * @return the Gitlab Merge Request * @throws IOException on gitlab api call error */ - public GitlabMergeRequest getMergeRequestChanges(Serializable projectId, Integer mergeRequestId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + "/changes"; + public GitlabMergeRequest getMergeRequestChanges(Serializable projectId, + Integer mergeRequestIid) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + + GitlabMergeRequest.URL + "/" + mergeRequestIid + "/changes"; return retrieve().to(tailUrl, GitlabMergeRequest.class); } - public GitlabMergeRequest getMergeRequest(Serializable projectId, Integer mergeRequestId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId; + public GitlabMergeRequest getMergeRequest(Serializable projectId, + Integer mergeRequestIid) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + + GitlabMergeRequest.URL + "/" + mergeRequestIid; return retrieve().to(tailUrl, GitlabMergeRequest.class); } - public GitlabMergeRequest getMergeRequest(GitlabProject project, Integer mergeRequestId) throws IOException { - return getMergeRequest(project.getId(), mergeRequestId); + public GitlabMergeRequest getMergeRequest(GitlabProject project, + Integer mergeRequestIid) throws IOException { + return getMergeRequest(project.getId(), mergeRequestIid); } /** @@ -1560,18 +1565,18 @@ public GitlabMergeRequest createMergeRequest(Serializable projectId, String sour /** * Updates a Merge Request * - * @param projectId The id of the project - * @param mergeRequestId The id of the merge request to update - * @param targetBranch The target branch of the merge request, otherwise null to leave it untouched - * @param assigneeId The id of the assignee, otherwise null to leave it untouched - * @param title The title of the merge request, otherwise null to leave it untouched - * @param description The description of the merge request, otherwise null to leave it untouched - * @param stateEvent The state (close|reopen|merge) of the merge request, otherwise null to leave it untouched - * @param labels A comma separated list of labels, otherwise null to leave it untouched + * @param projectId The id of the project + * @param mergeRequestIid The internal id of the merge request to update + * @param targetBranch The target branch of the merge request, otherwise null to leave it untouched + * @param assigneeId The id of the assignee, otherwise null to leave it untouched + * @param title The title of the merge request, otherwise null to leave it untouched + * @param description The description of the merge request, otherwise null to leave it untouched + * @param stateEvent The state (close|reopen|merge) of the merge request, otherwise null to leave it untouched + * @param labels A comma separated list of labels, otherwise null to leave it untouched * @return the Merge Request * @throws IOException on gitlab api call error */ - public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mergeRequestId, String targetBranch, + public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mergeRequestIid, String targetBranch, Integer assigneeId, String title, String description, String stateEvent, String labels) throws IOException { Query query = new Query() @@ -1582,27 +1587,29 @@ public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mer .appendIf("state_event", stateEvent) .appendIf("labels", labels); - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + query.toString(); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + + GitlabMergeRequest.URL + "/" + mergeRequestIid + query.toString(); return retrieve().method(PUT).to(tailUrl, GitlabMergeRequest.class); } /** * @param project The Project - * @param mergeRequestId Merge Request ID + * @param mergeRequestIid Merge Request internal ID * @param mergeCommitMessage optional merge commit message. Null if not set * @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 mergeRequestIid, String mergeCommitMessage) throws IOException { + return acceptMergeRequest(project.getId(), mergeRequestIid, mergeCommitMessage); } - public GitlabMergeRequest acceptMergeRequest(Serializable projectId, Integer mergeRequestId, String mergeCommitMessage) throws IOException { - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + "/merge"; + public GitlabMergeRequest acceptMergeRequest(Serializable projectId, Integer mergeRequestIid, String mergeCommitMessage) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + + GitlabMergeRequest.URL + "/" + mergeRequestIid + "/merge"; GitlabHTTPRequestor requestor = retrieve().method(PUT); requestor.with("id", projectId); - requestor.with("merge_request_id", mergeRequestId); + requestor.with("merge_request_iid", mergeRequestIid); if (mergeCommitMessage != null) requestor.with("merge_commit_message", mergeCommitMessage); return requestor.to(tailUrl, GitlabMergeRequest.class); From 42627f1fc26da584c909d7d1cbed5c55554de389 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Sun, 2 Sep 2018 17:28:14 +0200 Subject: [PATCH 086/119] Fix transfer project (#317) * Added possibility to get issues by projectId. * Added possibility to create subgroups. * Fix transfer project to a different namespace to match current GitLab API. --- src/main/java/org/gitlab/api/GitlabAPI.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 6d8c0495..4c93494a 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -3072,8 +3072,9 @@ public List getNamespaceMembers(Integer namespaceId) throws * @throws IOException on gitlab api call error */ public void transfer(Integer namespaceId, Integer projectId) throws IOException { - String tailUrl = GitlabGroup.URL + "/" + namespaceId + GitlabProject.URL + "/" + projectId; - dispatch().to(tailUrl, Void.class); + Query query = new Query().append("namespace", String.valueOf(namespaceId)); + String tailUrl = GitlabProject.URL + "/" + projectId + "/transfer" + query.toString(); + retrieve().method(PUT).to(tailUrl, Void.class); } /** From 6367b69070280db18b39ea5a91fea215de4859ea Mon Sep 17 00:00:00 2001 From: Patrizio Bonzani Date: Thu, 4 Oct 2018 20:25:40 +0200 Subject: [PATCH 087/119] Add most merge request attributes. (#318) --- .../gitlab/api/models/GitlabMergeRequest.java | 165 ++++++++++++++++-- 1 file changed, 153 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index 7663af17..fbfc82e9 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -10,7 +10,7 @@ public class GitlabMergeRequest { public static final String STATUS_OPENED = "opened"; public static final String STATUS_MERGED = "merged"; public static final String STATUS_CLOSED = "closed"; - + private Integer id; private Integer iid; private String title; @@ -23,10 +23,18 @@ public class GitlabMergeRequest { private GitlabMilestone milestone; private String[] labels; + private List changes; - private int upvotes; - private int downvotes; + private Integer upvotes; + + private Integer downvotes; + + @JsonProperty("updated_at") + private Date updatedAt; + + @JsonProperty("created_at") + private Date createdAt; @JsonProperty("target_branch") private String targetBranch; @@ -46,23 +54,64 @@ public class GitlabMergeRequest { @JsonProperty("milestone_id") private Integer milestoneId; - @JsonProperty("updated_at") - private Date updatedAt; + @JsonProperty("work_in_progress") + private Boolean workInProgress; - @JsonProperty("created_at") - private Date createdAt; + @JsonProperty("merge_when_pipeline_succeeds") + private Boolean mergeWhenPipelineSucceeds; - @JsonProperty("merge_commit_sha") - private String mergeCommitSHA; - @JsonProperty("merge_status") private String mergeStatus; + @JsonProperty("sha") + private String sha; + + @JsonProperty("merge_commit_sha") + private String mergeCommitSHA; + + @JsonProperty("user_notes_count") + private Integer userNotesCount; + + @JsonProperty("discussion_locked") + private Boolean discussionLocked; + + @JsonProperty("should_remove_source_branch") + private Boolean shouldRemoveSourceBranch; + + @JsonProperty("force_remove_source_branch") + private Boolean forceRemoveSourceBranch; + @JsonProperty("web_url") private String webUrl; - @JsonProperty("sha") - private String sha; + private Boolean squash; + + @JsonProperty("changes_count") + private Integer changesCount; + + @JsonProperty("merged_by") + private GitlabUser mergedBy; + + @JsonProperty("merged_at") + private Date mergedAt; + + @JsonProperty("closed_by") + private GitlabUser closedBy; + + @JsonProperty("closed_at") + private Date closedAt; + + @JsonProperty("latest_build_started_at") + private Date latestBuildStartedAt; + + @JsonProperty("latest_build_finished_at") + private Date latestBuildFinishedAt; + + @JsonProperty("first_deployed_to_production_at") + private Date firstDeployedToProductionAt; + + @JsonProperty("diff_refs") + private DiffRefs diffRefs; public Integer getId() { return id; @@ -281,4 +330,96 @@ public String getSha() { public void setSha(String sha) { this.sha = sha; } + + public Boolean isWorkInProgress() { + return workInProgress; + } + + + public Boolean isMergeWhenPipelineSucceeds() { + return mergeWhenPipelineSucceeds; + } + + public Integer getUserNotesCount() { + return userNotesCount; + } + + public Boolean isDiscussionLocked() { + return discussionLocked; + } + + public Boolean isShouldRemoveSourceBranch() { + return shouldRemoveSourceBranch; + } + + public boolean isForceRemoveSourceBranch() { + return forceRemoveSourceBranch; + } + + public Boolean isSquash() { + return squash; + } + + public Integer getChangesCount() { + return changesCount; + } + + public GitlabUser getMergedBy() { + return mergedBy; + } + + public Date getMergedAt() { + return mergedAt; + } + + public GitlabUser getClosedBy() { + return closedBy; + } + + public Date getClosedAt() { + return closedAt; + } + + public Date getLatestBuildStartedAt() { + return latestBuildStartedAt; + } + + public Date getLatestBuildFinishedAt() { + return latestBuildFinishedAt; + } + + public Date getFirstDeployedToProductionAt() { + return firstDeployedToProductionAt; + } + + public String getBaseSha() { + return diffRefs == null ? null : diffRefs.baseSha; + } + + public String getHeadSha() { + return diffRefs == null ? null : diffRefs.headSha; + } + + public String getStartSha() { + return diffRefs == null ? null : diffRefs.startSha; + } + + /** + * Class representing the diff_refs json object, which is just a collection + * of sha references of the merge request. It is currently not provided by + * GitLab when fetching multiple merge requests. + * + * @author Patrizio Bonzani + */ + private static class DiffRefs { + + @JsonProperty("base_sha") + private String baseSha; + + @JsonProperty("head_sha") + private String headSha; + + @JsonProperty("start_sha") + private String startSha; + } } From 839e3910ddb328a66db3b401f121928a635d0e2c Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Thu, 4 Oct 2018 14:26:28 -0400 Subject: [PATCH 088/119] API to set approvers (#319) --- src/main/java/org/gitlab/api/GitlabAPI.java | 35 +++++++++++++++++++ .../models/GitlabMergeRequestApprovals.java | 24 ++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4c93494a..95031342 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -20,6 +20,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Collection; import static org.gitlab.api.http.Method.*; @@ -142,6 +143,10 @@ public GitlabHTTPRequestor dispatch() { return new GitlabHTTPRequestor(this).authenticate(apiToken, tokenType, authMethod).method(POST); } + public GitlabHTTPRequestor put() { + return new GitlabHTTPRequestor(this).authenticate(apiToken, tokenType, authMethod).method(PUT); + } + public boolean isIgnoreCertificateErrors() { return ignoreCertificateErrors; } @@ -1477,6 +1482,36 @@ public GitlabMergeRequestApprovals getMergeRequestApprovals(GitlabMergeRequest m return retrieve().to(tailUrl, GitlabMergeRequestApprovals.class); } + /** + * Set the number of required approvers. + * + * EE only. + */ + public GitlabMergeRequestApprovals setMergeRequestApprovals(GitlabMergeRequest mr, int count) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(mr.getProjectId()) + + GitlabMergeRequest.URL + "/" + mr.getIid() + GitlabMergeRequestApprovals.URL; + return dispatch() + .with("approvals_required", count) + .to(tailUrl, GitlabMergeRequestApprovals.class); + } + + /** + * Set the list of approvers. Important: Approvers and groups not + * in the request will be removed + * + * EE only. + */ + public GitlabMergeRequestApprovals setMergeRequestApprovers(GitlabMergeRequest mr, + Collection userApproverIds, + Collection groupApproverIds) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(mr.getProjectId()) + + GitlabMergeRequest.URL + "/" + mr.getIid() + GitlabMergeRequestApprovals.APPROVERS_URL; + return put() + .with("approver_ids", userApproverIds) + .with("approver_group_ids", groupApproverIds) + .to(tailUrl, GitlabMergeRequestApprovals.class); + } + /** * Cherry picks a commit. * diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequestApprovals.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequestApprovals.java index 84069fed..81c6c991 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequestApprovals.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequestApprovals.java @@ -9,6 +9,7 @@ public class GitlabMergeRequestApprovals { public static final String URL = "/approvals"; + public static final String APPROVERS_URL = "/approvers"; private Integer id; private Integer iid; @@ -39,6 +40,10 @@ public class GitlabMergeRequestApprovals { @JsonProperty("suggested_approvers") private List suggestedApprovers; + private List approvers; + + @JsonProperty("approver_groups") + private List approverGroups; public Integer getId() { return id; @@ -135,7 +140,7 @@ public List getApprovedBy() { public void setApprovedBy(List approvedBy) { this.approvedBy = approvedBy; } - + public List getSuggestedApprovers() { return suggestedApprovers; } @@ -143,4 +148,21 @@ public List getSuggestedApprovers() { public void setSuggestedApprovers(List suggestedApprovers) { this.suggestedApprovers = suggestedApprovers; } + + public List getApprovers() { + return approvers; + } + + public void setApprovers(List approvers) { + this.approvers = approvers; + } + + public List getApproverGroups() { + return approverGroups; + } + + public void setApproverGroups(List approverGroups) { + this.approverGroups = approverGroups; + } + } From 8ccd7ec11adcd85a4b4a42e8b43d1c9d792bda49 Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Thu, 4 Oct 2018 14:36:56 -0400 Subject: [PATCH 089/119] Events (#322) * make appendIf generic * add support for events API --- src/main/java/org/gitlab/api/GitlabAPI.java | 103 ++++++++++ src/main/java/org/gitlab/api/http/Query.java | 34 +--- .../org/gitlab/api/models/GitlabDate.java | 55 ++++++ .../org/gitlab/api/models/GitlabEvent.java | 185 ++++++++++++++++++ .../org/gitlab/api/models/GitlabPushData.java | 85 ++++++++ .../java/org/gitlab/api/models/SortOrder.java | 12 ++ 6 files changed, 441 insertions(+), 33 deletions(-) create mode 100644 src/main/java/org/gitlab/api/models/GitlabDate.java create mode 100644 src/main/java/org/gitlab/api/models/GitlabEvent.java create mode 100644 src/main/java/org/gitlab/api/models/GitlabPushData.java create mode 100644 src/main/java/org/gitlab/api/models/SortOrder.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 95031342..4bbd1cb4 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -3947,4 +3947,107 @@ public GitlabRunner getRunnerDetail(int id) throws IOException { String tailUrl = String.format("%s/%d", GitlabRunner.URL, id); return retrieve().to(tailUrl, GitlabRunner.class); } + + /** + * Get events for a project. + * + * @param action If not null, include only events of a particular action type + * @param targetType If not null, include only events of a particular target type + * @param before If not null, include only events created before a particular date. + * @param after If not null, include only events created before a + * particular date. + * @param sort If null, uses the server's default, which is "desc" + */ + public List getEvents(GitlabProject project, + GitlabEvent.ActionType action, + GitlabEvent.TargetType targetType, + GitlabDate before, + GitlabDate after, + SortOrder sortOrder) + throws IOException { + return getEvents(project, action, targetType, before, + after, sortOrder, new Pagination()); + } + + /** + * Get events for a project. + * + * @param action If not null, include only events of a particular action type + * @param targetType If not null, include only events of a particular target type + * @param before If not null, include only events created before a particular date. + * @param after If not null, include only events created before a + * particular date. + * @param sort If null, uses the server's default, which is "desc" + */ + public List getEvents(GitlabProject project, + GitlabEvent.ActionType action, + GitlabEvent.TargetType targetType, + GitlabDate before, + GitlabDate after, + SortOrder sortOrder, + Pagination pagination) + throws IOException { + return getProjectEvents(project.getId(), action, targetType, before, + after, sortOrder, pagination); + } + + /** + * Get events for a project. + * + * @param action If not null, include only events of a particular action type + * @param targetType If not null, include only events of a particular target type + * @param before If not null, include only events created before a particular date. + * @param after If not null, include only events created before a + * particular date. + * @param sort If null, uses the server's default, which is "desc" + */ + public List getProjectEvents(Serializable projectId, + GitlabEvent.ActionType action, + GitlabEvent.TargetType targetType, + GitlabDate before, + GitlabDate after, + SortOrder sort) + throws IOException { + return getProjectEvents(projectId, action, targetType, before, + after, sort, new Pagination()); + } + + /** + * Get events for a project. + * + * @param action If not null, include only events of a particular action type + * @param targetType If not null, include only events of a particular target type + * @param before If not null, include only events created before a particular date. + * @param after If not null, include only events created before a + * particular date. + * @param sort If null, uses the server's default, which is "desc" + */ + public List getProjectEvents(Serializable projectId, + GitlabEvent.ActionType action, + GitlabEvent.TargetType targetType, + GitlabDate before, + GitlabDate after, + SortOrder sort, + Pagination pagination) + throws IOException { + + final Query query = new Query(); + query.appendIf("action", action); + query.appendIf("target_type", targetType); + query.appendIf("before", before); + query.appendIf("after", after); + query.appendIf("sort", sort); + + if (pagination != null) { + query.mergeWith(pagination.asQuery()); + } + + StringBuilder tailUrl = new StringBuilder(GitlabProject.URL) + .append("/") + .append(sanitizeProjectId(projectId)) + .append(GitlabEvent.URL) + .append(query.toString()); + + return Arrays.asList(retrieve().method(GET).to(tailUrl.toString(), GitlabEvent[].class)); + } } diff --git a/src/main/java/org/gitlab/api/http/Query.java b/src/main/java/org/gitlab/api/http/Query.java index 521c493c..ad8db9a0 100644 --- a/src/main/java/org/gitlab/api/http/Query.java +++ b/src/main/java/org/gitlab/api/http/Query.java @@ -51,39 +51,7 @@ public Query append(final String name, final String value) throws UnsupportedEnc * @return this * @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded */ - public Query appendIf(final String name, final String value) throws UnsupportedEncodingException { - if (value != null) { - append(name, value); - } - return this; - } - - /** - * Conditionally append a parameter to the query - * if the value of the parameter is not null - * - * @param name Parameter name - * @param value Parameter value - * @return this - * @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded - */ - public Query appendIf(final String name, final Integer value) throws UnsupportedEncodingException { - if (value != null) { - append(name, value.toString()); - } - return this; - } - - /** - * Conditionally append a parameter to the query - * if the value of the parameter is not null - * - * @param name Parameter name - * @param value Parameter value - * @return this - * @throws java.io.UnsupportedEncodingException If the provided value cannot be URL Encoded - */ - public Query appendIf(final String name, final Boolean value) throws UnsupportedEncodingException { + public Query appendIf(final String name, final T value) throws UnsupportedEncodingException { if (value != null) { append(name, value.toString()); } diff --git a/src/main/java/org/gitlab/api/models/GitlabDate.java b/src/main/java/org/gitlab/api/models/GitlabDate.java new file mode 100644 index 00000000..43b2e845 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabDate.java @@ -0,0 +1,55 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.Date; +import java.util.List; + +/** + * A date, with no time or timezone. This is, given the lack of + * timezone, an object whose meaning is somewhat ill-defined, but we + * must use the API that the hexarchs^W^W Gitlab gives us. We're + * going to make this immutable, because that's less error-prone. And + * we won't provide a constructor from Date, because Date is an + * instant in time rather than a calendar period. + */ +public final class GitlabDate { + private int year; + private int month; + private int day; + + /** + * @param month and day are 1-based. + */ + public GitlabDate(int year, int month, int day) { + this.year = year; + this.month = month; + this.day = day; + } + + public int getYear() { + return year; + } + + public int getMonth() { + return month; + } + public int getDay() { + return day; + } + + public String toString() { + // Gitlab requires this specific format + return String.format("%04d-%02d-%02d", year, month, day); + } + + public int hashCode() { + return this.year * 31 * 12 + this.month * 31 + this.day; + } + + public boolean equals(Object o) { + if (o == null || getClass() != o.getClass()) return false; + GitlabDate that = (GitlabDate) o; + return this.year == that.year && this.month == that.month && this.day == that.day; + } +} diff --git a/src/main/java/org/gitlab/api/models/GitlabEvent.java b/src/main/java/org/gitlab/api/models/GitlabEvent.java new file mode 100644 index 00000000..640a8f66 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabEvent.java @@ -0,0 +1,185 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.Date; +import java.util.List; + +public class GitlabEvent { + + public final static String URL = "/events"; + + private String title; + + @JsonProperty("project_id") + private String projectId; + + @JsonProperty("action_name") + private String actionName; + + // nullable + @JsonProperty("target_id") + private Integer targetId; + + // nullable + @JsonProperty("target_iid") + private Integer targetIid; + + @JsonProperty("target_type") + private TargetType targetType; + + // It's not clear if this is nullable + @JsonProperty("author_id") + private Integer authorId; + + // nullable + @JsonProperty("target_title") + private String targetTitle; + + @JsonProperty("created_at") + private Date createdAt; + + // see above re "author" + private GitlabUser author; + + // see above re "author" + @JsonProperty("author_username") + private String authorUsername; + + @JsonProperty("push_data") + private GitlabPushData pushData; + + public String getTitle() { + return title; + } + + public String getProjectId() { + return projectId; + } + + /** + * It would be reasonable to expect that this matches up with + * ActionType, below, but it doesn't. The action type "pushed" is + * spelled "pushed to" in action_name (but it's spelled "pushed" + * in GitlabPushData). + */ + public String getActionName() { + return actionName; + } + + public Integer getTargetId() { + return targetId; + } + + public Integer getTargetIid() { + return targetIid; + } + + public TargetType getTargetType() { + return targetType; + } + + /** See() {@link #getAuthor()} for note */ + public Integer getAuthorId() { + return authorId; + } + + public String getTargetTitle() { + return targetTitle; + } + + public Date getCreatedAt() { + return createdAt; + } + + /** + * For many events, this seem to have nothing to do with any + * "author", but is in fact the user who performed the action. + * e.g. a push's "author" is not necessarily the author or + * committer of any commit, but the user doing the pushing. + */ + public GitlabUser getAuthor() { + return author; + } + + /** See {@link #getAuthor()} for note */ + public String getAuthorUsername() { + return authorUsername; + } + + public GitlabPushData getPushData() { + return pushData; + } + + public void setTitle(String title) { + this.title = title; + } + + public void setProjectId(String projectId) { + this.projectId = projectId; + } + + public void setActionName(String actionName) { + this.actionName = actionName; + } + + public void setTargetId(Integer targetId) { + this.targetId = targetId; + } + + public void setTargetIid(Integer targetIid) { + this.targetIid = targetIid; + } + + public void setTargetType(TargetType targetType) { + this.targetType = targetType; + } + + public void setAuthorId(Integer authorId) { + this.authorId = authorId; + } + + public void setTargetTitle(String targetTitle) { + this.targetTitle = targetTitle; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public void setAuthor(GitlabUser author) { + this.author = author; + } + + public void setAuthorUsername(String authorUsername) { + this.authorUsername = authorUsername; + } + + public void setPushData(GitlabPushData pushData) { + this.pushData = pushData; + } + + public enum ActionType { + created, + updated, + closed, + reopened, + pushed, + commented, + merged, + joined, + left, + destroyed, + expired + } + + public enum TargetType { + issue, + milestone, + merge_request, + note, + project, + snippet, + user + } +} diff --git a/src/main/java/org/gitlab/api/models/GitlabPushData.java b/src/main/java/org/gitlab/api/models/GitlabPushData.java new file mode 100644 index 00000000..95f8f4d7 --- /dev/null +++ b/src/main/java/org/gitlab/api/models/GitlabPushData.java @@ -0,0 +1,85 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.Date; +import java.util.List; + +public class GitlabPushData { + + @JsonProperty("commit_count") + private int commitCount; + + @JsonProperty("action") + private GitlabEvent.ActionType action; + + @JsonProperty("ref_type") + private String refType; + + @JsonProperty("commit_from") + private String commitFrom; + + @JsonProperty("commit_to") + private String commitTo; + + private String ref; + + @JsonProperty("commit_title") + private String commitTitle; + + public int getCommitCount() { + return commitCount; + } + + public GitlabEvent.ActionType getAction() { + return action; + } + + public String getRefType() { + return refType; + } + + public String getCommitFrom() { + return commitFrom; + } + + public String getCommitTo() { + return commitTo; + } + + public String getRef() { + return ref; + } + + public String getCommitTitle() { + return commitTitle; + } + + public void setCommitCount(int commitCount) { + this.commitCount = commitCount; + } + + public void setAction(GitlabEvent.ActionType action) { + this.action = action; + } + + public void setRefType(String refType) { + this.refType = refType; + } + + public void setCommitFrom(String commitFrom) { + this.commitFrom = commitFrom; + } + + public void setCommitTo(String commitTo) { + this.commitTo = commitTo; + } + + public void setRef(String ref) { + this.ref = ref; + } + + public void setCommitTitle(String commitTitle) { + this.commitTitle = commitTitle; + } +} diff --git a/src/main/java/org/gitlab/api/models/SortOrder.java b/src/main/java/org/gitlab/api/models/SortOrder.java new file mode 100644 index 00000000..a181791f --- /dev/null +++ b/src/main/java/org/gitlab/api/models/SortOrder.java @@ -0,0 +1,12 @@ +package org.gitlab.api.models; + +public enum SortOrder { + ASC, DESC; + + public static final SortOrder DEFAULT = DESC; + + @Override + public String toString() { + return name().toLowerCase(); + } +} From b6f4aca232de012758eba1dbbb39a01039089f8a Mon Sep 17 00:00:00 2001 From: Tim Olshansky Date: Thu, 4 Oct 2018 21:34:19 -0700 Subject: [PATCH 090/119] [maven-release-plugin] prepare release 4.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29a9e759..25a6b92e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.0.1-SNAPSHOT + 4.1.0 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API From b287bca9f7697e21033c03040957f81bf3b01113 Mon Sep 17 00:00:00 2001 From: Tim Olshansky Date: Thu, 4 Oct 2018 21:34:29 -0700 Subject: [PATCH 091/119] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25a6b92e..f61b6cd0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.1.0 + 4.1.1-SNAPSHOT Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API From 8a1bdc53d8e2d318f0407fc6c42e22b596dce413 Mon Sep 17 00:00:00 2001 From: Patrizio Bonzani Date: Mon, 15 Oct 2018 04:26:46 +0200 Subject: [PATCH 092/119] Send discussion attributes as query parameters. (#323) Signed-off-by: Patrizio Bonzani --- src/main/java/org/gitlab/api/GitlabAPI.java | 56 ++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4bbd1cb4..759a28ca 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1763,23 +1763,23 @@ public GitlabDiscussion createTextDiscussion(GitlabMergeRequest mergeRequest, String positionHeadSha, String positionNewPath, Integer positionNewLine, String positionOldPath, Integer positionOldLine) throws IOException { checkRequiredCreateDiscussionArguments(body, positionBaseSha, positionStartSha, positionHeadSha); + Query query = new Query() + .append("body", body) + .appendIf("position", position) + .append("position[base_sha]", positionBaseSha) + .append("position[start_sha]", positionStartSha) + .append("position[head_sha]", positionHeadSha) + .append("position[position_type]", "text") + .appendIf("position[new_path]", positionNewPath) + .appendIf("position[new_line]", positionNewLine) + .appendIf("position[old_path]", positionOldPath) + .appendIf("position[old_line]", positionOldLine); String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + - GitlabDiscussion.URL; + GitlabDiscussion.URL + query.toString(); - return dispatch() - .with("body", body) - .with("position", position) - .with("position[base_sha]", positionBaseSha) - .with("position[start_sha]", positionStartSha) - .with("position[head_sha]", positionHeadSha) - .with("position[position_type]", "text") - .with("position[new_path]", positionNewPath) - .with("position[new_line]", positionNewLine) - .with("position[old_path]", positionOldPath) - .with("position[old_line]", positionOldLine) - .to(tailUrl, GitlabDiscussion.class); + return dispatch().to(tailUrl, GitlabDiscussion.class); } /** @@ -1810,25 +1810,25 @@ public GitlabDiscussion createImageDiscussion( Integer positionY ) throws IOException { checkRequiredCreateDiscussionArguments(body, positionBaseSha, positionStartSha, positionHeadSha); + Query query = new Query() + .append("body", body) + .appendIf("position", position) + .append("position[base_sha]", positionBaseSha) + .append("position[start_sha]", positionStartSha) + .append("position[head_sha]", positionHeadSha) + .append("position[position_type]", "image") + .appendIf("position[new_path]", positionNewPath) + .appendIf("position[old_path]", positionOldPath) + .appendIf("position[width]", positionWidth) + .appendIf("position[height]", positionHeight) + .appendIf("position[x]", positionX) + .appendIf("position[y]", positionY); String tailUrl = GitlabProject.URL + "/" + mergeRequest.getProjectId() + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + - GitlabDiscussion.URL; + GitlabDiscussion.URL + query.toString(); - return dispatch() - .with("body", body) - .with("position", position) - .with("position[base_sha]", positionBaseSha) - .with("position[start_sha]", positionStartSha) - .with("position[head_sha]", positionHeadSha) - .with("position[position_type]", "image") - .with("position[new_path]", positionNewPath) - .with("position[old_path]", positionOldPath) - .with("position[width]", positionWidth) - .with("position[height]", positionHeight) - .with("position[x]", positionX) - .with("position[y]", positionY) - .to(tailUrl, GitlabDiscussion.class); + return dispatch().to(tailUrl, GitlabDiscussion.class); } /** From 6567a9bd55c54983716589effb629b9ae768ddb9 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 20 Nov 2018 13:45:37 -0500 Subject: [PATCH 093/119] Add api to fetch single tag (#326) --- src/main/java/org/gitlab/api/GitlabAPI.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 759a28ca..af2ff76f 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -3319,6 +3319,19 @@ public List getTags(GitlabProject project) { return retrieve().getAll(tailUrl, GitlabTag[].class); } + /** + * Get a single repository tag in a specific project + * + * @param project (required) The ID or URL-encoded path of the project + * @param tagName (required) The name of the tag + * @return the found git tag object + * @throws IOException on gitlab api call error + */ + public GitlabTag getTag(GitlabProject project, String tagName) throws IOException { + String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabTag.URL + "/" + tagName; + return retrieve().to(tailUrl, GitlabTag.class); + } + /** * Create tag in specific project * From 0406a7f97134ba50a0d8cdc452c1d439137174eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roner=20D=C3=A2maso=20Junior?= Date: Tue, 20 Nov 2018 16:46:20 -0200 Subject: [PATCH 094/119] Improvements on GitlabProjectHook (#328) - Adding new attributes on GitlabProjectHook - Adding new signature on addProjectHook method - Adding new signature on editProjectHook method --- src/main/java/org/gitlab/api/GitlabAPI.java | 40 ++++++++++++++++--- .../gitlab/api/models/GitlabProjectHook.java | 34 ++++++++++++++-- 2 files changed, 64 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index af2ff76f..c544351d 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2391,7 +2391,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 noteEvents, boolean tagPushEvents, boolean sslVerification, String token) throws IOException { + public GitlabProjectHook addProjectHook(Serializable projectId, String url, boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean noteEvents, boolean tagPushEvents, boolean sslVerification, boolean jobEvents, boolean pipelineEvents, boolean wikiPageEvents, String token) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectHook.URL; return dispatch() @@ -2402,18 +2402,46 @@ public GitlabProjectHook addProjectHook(Serializable projectId, String url, bool .with("note_events", noteEvents ? "true" : "false") .with("tag_push_events", tagPushEvents ? "true" : "false") .with("enable_ssl_verification", sslVerification ? "true" : "false") + .with("job_events", jobEvents ? "true" : "false") + .with("pipeline_events", pipelineEvents ? "true" : "false") + .with("wiki_page_events", wikiPageEvents ? "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); + public GitlabProjectHook addProjectHook(Serializable projectId, String url, GitlabProjectHook hook, String token) throws IOException { + return this.addProjectHook(projectId, url, hook.getPushEvents(), hook.getIssueEvents(), hook.isMergeRequestsEvents(), + hook.isNoteEvents(), hook.isTagPushEvents(), hook.isSslVerificationEnabled(), hook.isJobEvents(), + hook.isPipelineEvents(), hook.isWikiPageEvents(), token); + } + public GitlabProjectHook editProjectHook(GitlabProject project, String hookId, String url, + boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean noteEvents, + boolean tagPushEvents, boolean sslVerification, boolean jobEvents, boolean pipelineEvents, + boolean wikiPageEvents, String token) throws IOException { + Query query = new Query(); + query.append("url", url); + query.append("push_events", String.valueOf(pushEvents)); + query.append("issues_events", String.valueOf(issuesEvents)); + query.append("merge_request_events", String.valueOf(mergeRequestEvents)); + query.append("note_events", String.valueOf(noteEvents)); + query.append("tag_push_events", String.valueOf(tagPushEvents)); + query.append("enable_ssl_verification", String.valueOf(sslVerification)); + query.append("job_events", String.valueOf(jobEvents)); + query.append("pipeline_events", String.valueOf(pipelineEvents)); + query.append("wiki_page_events", String.valueOf(wikiPageEvents)); + query.append("token", token); String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabProjectHook.URL + "/" + hookId + query.toString(); return retrieve().method(PUT).to(tailUrl, GitlabProjectHook.class); } + public GitlabProjectHook editProjectHook(GitlabProject project, GitlabProjectHook projectHook, String token) throws IOException { + return editProjectHook(project, projectHook.getId(), projectHook.getUrl(), projectHook.getPushEvents(), + projectHook.getIssueEvents(), projectHook.isMergeRequestsEvents(), projectHook.isNoteEvents(), + projectHook.isTagPushEvents(), projectHook.isSslVerificationEnabled(), projectHook.isJobEvents(), + projectHook.isWikiPageEvents(), projectHook.isPipelineEvents(), token); + } + public void deleteProjectHook(GitlabProjectHook hook) throws IOException { String tailUrl = GitlabProject.URL + "/" + hook.getProjectId() + GitlabProjectHook.URL + "/" + hook.getId(); retrieve().method(DELETE).to(tailUrl, Void.class); @@ -3969,7 +3997,7 @@ public GitlabRunner getRunnerDetail(int id) throws IOException { * @param before If not null, include only events created before a particular date. * @param after If not null, include only events created before a * particular date. - * @param sort If null, uses the server's default, which is "desc" + * @param sortOrder If null, uses the server's default, which is "desc" */ public List getEvents(GitlabProject project, GitlabEvent.ActionType action, @@ -3990,7 +4018,7 @@ public List getEvents(GitlabProject project, * @param before If not null, include only events created before a particular date. * @param after If not null, include only events created before a * particular date. - * @param sort If null, uses the server's default, which is "desc" + * @param sortOrder If null, uses the server's default, which is "desc" */ public List getEvents(GitlabProject project, GitlabEvent.ActionType action, diff --git a/src/main/java/org/gitlab/api/models/GitlabProjectHook.java b/src/main/java/org/gitlab/api/models/GitlabProjectHook.java index 32f63ed4..34326f4c 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProjectHook.java +++ b/src/main/java/org/gitlab/api/models/GitlabProjectHook.java @@ -25,13 +25,25 @@ public class GitlabProjectHook { @JsonProperty("tag_push_events") private boolean tagPushEvents; - + @JsonProperty("created_at") private Date createdAt; @JsonProperty("enable_ssl_verification") private boolean sslVerificationEnabled; + @JsonProperty("note_events") + private boolean noteEvents; + + @JsonProperty("job_events") + private boolean jobEvents; + + @JsonProperty("pipeline_events") + private boolean pipelineEvents; + + @JsonProperty("wiki_page_events") + private boolean wikiPageEvents; + public String getId() { return id; } @@ -80,15 +92,14 @@ public void setMergeRequestsEvents(boolean mergeRequestsEvents) { this.mergeRequestsEvents = mergeRequestsEvents; } - public boolean isTagPushEvents() { return tagPushEvents; } - + public void setTagPushEvents(boolean tagPushEvents) { this.tagPushEvents = tagPushEvents; } - + public Date getCreatedAt() { return createdAt; } @@ -105,4 +116,19 @@ public void setSslVerificationEnabled(boolean sslVerificationEnabled) { this.sslVerificationEnabled = sslVerificationEnabled; } + public boolean isNoteEvents() { return noteEvents; } + + public void setNoteEvents(boolean noteEvents) { this.noteEvents = noteEvents; } + + public boolean isJobEvents() { return jobEvents; } + + public void setJobEvents(boolean jobEvents) { this.jobEvents = jobEvents; } + + public boolean isPipelineEvents() { return pipelineEvents; } + + public void setPipelineEvents(boolean pipelineEvents) { this.pipelineEvents = pipelineEvents; } + + public boolean isWikiPageEvents() { return wikiPageEvents; } + + public void setWikiPageEvents(boolean wikiPageEvents) { this.wikiPageEvents = wikiPageEvents; } } From 504ec8504767127aaf446a6802ea88b5b931473f Mon Sep 17 00:00:00 2001 From: Wiliam Date: Mon, 17 Dec 2018 21:20:35 -0200 Subject: [PATCH 095/119] adjusting getters return type (#330) --- src/main/java/org/gitlab/api/models/GitlabMergeRequest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index fbfc82e9..7ea3ff0a 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -251,7 +251,7 @@ public void setLabels(String[] labels) { this.labels = labels; } - public int getUpvotes() { + public Integer getUpvotes() { return upvotes; } @@ -259,7 +259,7 @@ public void setUpvotes(int upvotes) { this.upvotes = upvotes; } - public int getDownvotes() { + public Integer getDownvotes() { return downvotes; } @@ -352,7 +352,7 @@ public Boolean isShouldRemoveSourceBranch() { return shouldRemoveSourceBranch; } - public boolean isForceRemoveSourceBranch() { + public Boolean isForceRemoveSourceBranch() { return forceRemoveSourceBranch; } From b17095c226b7021ec7421407258743a415bc3f54 Mon Sep 17 00:00:00 2001 From: Patrizio Bonzani Date: Thu, 14 Feb 2019 18:48:09 +0100 Subject: [PATCH 096/119] Change type of GitlabTag commit property to GitlabCommit. (#336) Signed-off-by: Patrizio Bonzani --- src/main/java/org/gitlab/api/models/GitlabTag.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabTag.java b/src/main/java/org/gitlab/api/models/GitlabTag.java index 4ed51596..c0ec8cbb 100644 --- a/src/main/java/org/gitlab/api/models/GitlabTag.java +++ b/src/main/java/org/gitlab/api/models/GitlabTag.java @@ -7,7 +7,7 @@ public class GitlabTag { public final static String URL = "/repository/tags"; @JsonProperty("commit") - private GitlabBranchCommit commit; + private GitlabCommit commit; @JsonProperty("release") private GitlabRelease release; @@ -18,11 +18,11 @@ public class GitlabTag { @JsonProperty("message") private String message; - public GitlabBranchCommit getCommit() { + public GitlabCommit getCommit() { return commit; } - public void setCommit(GitlabBranchCommit commit) { + public void setCommit(GitlabCommit commit) { this.commit = commit; } From 9a9e527771cc2aa3ca0f7d590e3be34600a89b78 Mon Sep 17 00:00:00 2001 From: Christian Luijten Date: Wed, 13 Mar 2019 06:26:24 +0100 Subject: [PATCH 097/119] Throw UncheckedIOException instead of generic RuntimeException (#339) * Throw UncheckedIOException instead of generic RuntimeException * Add missing import --- src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java index 83754792..ebe80573 100644 --- a/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java +++ b/src/main/java/org/gitlab/api/http/GitlabHTTPRequestor.java @@ -10,6 +10,7 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Reader; +import java.io.UncheckedIOException; import java.lang.reflect.Field; import java.net.*; import java.util.*; @@ -188,7 +189,7 @@ public Iterator asIterator(final String tailApiUrl, final Class type) try { url = root.getAPIUrl(tailApiUrl); } catch (IOException e) { - throw new RuntimeException(e); + throw new UncheckedIOException(e); } } @@ -240,7 +241,7 @@ private void fetch() { handleAPIError(e, connection); } } catch (IOException e) { - throw new RuntimeException(e); + throw new UncheckedIOException(e); } } From f62fa57354ab8d9b48e0dec9bc87701fd4f31560 Mon Sep 17 00:00:00 2001 From: idefav Date: Wed, 13 Mar 2019 13:27:45 +0800 Subject: [PATCH 098/119] update GitlabMergeRequest prop changesCount to string (#338) --- src/main/java/org/gitlab/api/models/GitlabMergeRequest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java index 7ea3ff0a..11d037e5 100644 --- a/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java +++ b/src/main/java/org/gitlab/api/models/GitlabMergeRequest.java @@ -87,7 +87,7 @@ public class GitlabMergeRequest { private Boolean squash; @JsonProperty("changes_count") - private Integer changesCount; + private String changesCount; @JsonProperty("merged_by") private GitlabUser mergedBy; @@ -360,7 +360,7 @@ public Boolean isSquash() { return squash; } - public Integer getChangesCount() { + public String getChangesCount() { return changesCount; } From f03eedf952cfbb40306be3bf9234dcf78fab029e Mon Sep 17 00:00:00 2001 From: Yakov Golovanev <30776628+yaggg@users.noreply.github.com> Date: Wed, 13 Mar 2019 12:28:27 +0700 Subject: [PATCH 099/119] Add possibility to use previous versions of rest api (#333) * Add possibility to change gitlab rest api namespace * Fix indent. * Convert API namespace to instance field --- src/main/java/org/gitlab/api/GitlabAPI.java | 27 ++++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index c544351d..c8770ec1 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -36,7 +36,8 @@ public class GitlabAPI { public static final ObjectMapper MAPPER = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - private static final String API_NAMESPACE = "/api/v4"; + + private static final String DEFAULT_API_NAMESPACE = "/api/v4"; private static final String PARAM_SUDO = "sudo"; private static final String PARAM_MAX_ITEMS_PER_PAGE = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).toString(); @@ -45,6 +46,7 @@ public class GitlabAPI { private final String apiToken; private final TokenType tokenType; private AuthMethod authMethod; + private final String apiNamespace; private boolean ignoreCertificateErrors = false; private Proxy proxy; private int defaultTimeout = 0; @@ -52,16 +54,21 @@ public class GitlabAPI { private int connectionTimeout = defaultTimeout; private String userAgent = GitlabAPI.class.getCanonicalName() + "/" + System.getProperty("java.version"); - private GitlabAPI(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method) { + private GitlabAPI(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method, String apiNamespace) { this.hostUrl = hostUrl.endsWith("/") ? hostUrl.replaceAll("/$", "") : hostUrl; this.apiToken = apiToken; this.tokenType = tokenType; this.authMethod = method; + this.apiNamespace = apiNamespace; + } + + private GitlabAPI(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method) { + this(hostUrl, apiToken, tokenType, method, DEFAULT_API_NAMESPACE); } public static GitlabSession connect(String hostUrl, String username, String password) throws IOException { String tailUrl = GitlabSession.URL; - GitlabAPI api = connect(hostUrl, null, null, null); + GitlabAPI api = connect(hostUrl, null, null, (AuthMethod) null); return api.dispatch().with("login", username).with("password", password) .to(tailUrl, GitlabSession.class); } @@ -78,6 +85,14 @@ public static GitlabAPI connect(String hostUrl, String apiToken, TokenType token return new GitlabAPI(hostUrl, apiToken, tokenType, method); } + public static GitlabAPI connect(String hostUrl, String apiToken, TokenType tokenType, String apiNamespace) { + return new GitlabAPI(hostUrl, apiToken, tokenType, AuthMethod.HEADER, apiNamespace); + } + + public static GitlabAPI connect(String hostUrl, String apiToken, TokenType tokenType, AuthMethod method, String apiNamespace) { + return new GitlabAPI(hostUrl, apiToken, tokenType, method, apiNamespace); + } + public GitlabAPI ignoreCertificateErrors(boolean ignoreCertificateErrors) { this.ignoreCertificateErrors = ignoreCertificateErrors; return this; @@ -159,7 +174,7 @@ public URL getAPIUrl(String tailAPIUrl) throws IOException { if (!tailAPIUrl.startsWith("/")) { tailAPIUrl = "/" + tailAPIUrl; } - return new URL(hostUrl + API_NAMESPACE + tailAPIUrl); + return new URL(hostUrl + apiNamespace + tailAPIUrl); } public URL getUrl(String tailAPIUrl) throws IOException { @@ -377,7 +392,7 @@ public GitlabSSHKey createSSHKey(Integer targetUserId, String title, String key) return dispatch().to(tailUrl, GitlabSSHKey.class); } - + /** * Create a new ssh key for the authenticated user. * @@ -632,7 +647,7 @@ public GitlabGroup createGroup(String name, String path, String ldapCn, GitlabAc return dispatch().to(tailUrl, GitlabGroup.class); } - + /** * Creates a Group * From d12fc1d6defac33a530228419735d5c65f708be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Tue, 13 Aug 2019 20:40:17 +0200 Subject: [PATCH 100/119] The pagination argument was ignored (#344) --- 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 c8770ec1..8a8d6d7e 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1995,7 +1995,7 @@ public List getLastCommits(Serializable projectId, String branchOr public List getCommits(Serializable projectId, Pagination pagination, String branchOrTag) throws IOException { - return getCommits(projectId, null, branchOrTag, null); + return getCommits(projectId, pagination, branchOrTag, null); } public List getCommits(Serializable projectId, Pagination pagination, From 87a4a46a0215e479e7bc22ea4bd3384e5e800fbd Mon Sep 17 00:00:00 2001 From: slauriere Date: Tue, 13 Aug 2019 20:40:31 +0200 Subject: [PATCH 101/119] Files containing spaces in their path are wrongly encoded (#331) (#332) - Encode '+' characters in paths in '%20' --- 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 8a8d6d7e..df75bb45 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -3290,7 +3290,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 66de6d1570719a72717d15f0d09617355ab61953 Mon Sep 17 00:00:00 2001 From: Tristan Lins Date: Tue, 13 Aug 2019 20:46:08 +0200 Subject: [PATCH 102/119] Add missing fields to GitlabPipeline (#352) --- .../api/jackson/InstantDeserializer.java | 80 ++++++ .../org/gitlab/api/models/GitlabPipeline.java | 272 +++++++++++++++++- .../gitlab/api/InstantDeserializerTest.java | 33 +++ 3 files changed, 373 insertions(+), 12 deletions(-) create mode 100644 src/main/java/org/gitlab/api/jackson/InstantDeserializer.java create mode 100644 src/test/java/org/gitlab/api/InstantDeserializerTest.java diff --git a/src/main/java/org/gitlab/api/jackson/InstantDeserializer.java b/src/main/java/org/gitlab/api/jackson/InstantDeserializer.java new file mode 100644 index 00000000..5663826a --- /dev/null +++ b/src/main/java/org/gitlab/api/jackson/InstantDeserializer.java @@ -0,0 +1,80 @@ +package org.gitlab.api.jackson; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; + +import java.io.IOException; +import java.time.Instant; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.format.DateTimeParseException; +import java.time.format.FormatStyle; +import java.util.Locale; +import java.util.Objects; +import java.util.stream.Stream; + +/** + * A spezialized {@link Instant} deserializer that can parse different formats. + */ +public class InstantDeserializer extends StdDeserializer { + + private static final DateTimeFormatter LOCAL_DATE_TIME_FORMATTER_WITH_SPACE_SEPARATOR = new DateTimeFormatterBuilder() + .parseCaseInsensitive() + .append(DateTimeFormatter.ISO_LOCAL_DATE) + .appendLiteral(' ') + .append(DateTimeFormatter.ISO_LOCAL_TIME) + .toFormatter(Locale.getDefault(Locale.Category.FORMAT)); + + public InstantDeserializer() { + super(Instant.class); + } + + @Override + public Instant deserialize(JsonParser parser, DeserializationContext context) throws IOException { + if (JsonToken.VALUE_NULL.equals(parser.getCurrentToken())) { + return null; + } + + final String text = parser.getText(); + + if (null == text || text.trim().isEmpty()) { + return null; + } + + return getFormatters() + .map(formatter -> { + try { + return formatter.parse(text, Instant::from); + } catch (DateTimeParseException e) { + return null; + } + }) + .filter(Objects::nonNull) + .findFirst() + .orElseThrow(() -> new JsonParseException("Unable to parse instant \"" + text + "\"", parser.getCurrentLocation())); + } + + private static Stream getFormatters() { + return Stream.of( + // English (Standard) Formats + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.LONG).withLocale(Locale.ENGLISH), + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.LONG).withLocale(Locale.ENGLISH), + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT, FormatStyle.LONG).withLocale(Locale.ENGLISH), + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.MEDIUM).withLocale(Locale.ENGLISH), + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.MEDIUM).withLocale(Locale.ENGLISH), + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT, FormatStyle.MEDIUM).withLocale(Locale.ENGLISH), + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG, FormatStyle.SHORT).withLocale(Locale.ENGLISH), + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM, FormatStyle.SHORT).withLocale(Locale.ENGLISH), + DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT, FormatStyle.SHORT).withLocale(Locale.ENGLISH), + + // ISO Formats + LOCAL_DATE_TIME_FORMATTER_WITH_SPACE_SEPARATOR, + DateTimeFormatter.ISO_LOCAL_DATE_TIME, + DateTimeFormatter.ISO_DATE_TIME + ); + } + +} diff --git a/src/main/java/org/gitlab/api/models/GitlabPipeline.java b/src/main/java/org/gitlab/api/models/GitlabPipeline.java index 31927db5..fc92b1cd 100644 --- a/src/main/java/org/gitlab/api/models/GitlabPipeline.java +++ b/src/main/java/org/gitlab/api/models/GitlabPipeline.java @@ -1,23 +1,70 @@ package org.gitlab.api.models; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.gitlab.api.jackson.InstantDeserializer; + +import java.time.Instant; public class GitlabPipeline { public static final String URL = "/pipelines"; - @JsonProperty("id") private Integer id; - @JsonProperty("ref") - private String ref; - @JsonProperty("sha") private String sha; + @JsonProperty("ref") + private String ref; + @JsonProperty("status") private String status; + @JsonProperty("web_url") + private String webUrl; + + @JsonProperty("before_sha") + private String beforeSha; + + @JsonProperty("tag") + private boolean tag; + + @JsonProperty("yaml_errors") + private String yamlErrors; + + @JsonProperty("user") + private GitlabUser user; + + @JsonProperty("created_at") + @JsonDeserialize(using = InstantDeserializer.class) + private Instant createdAt; + + @JsonProperty("updated_at") + @JsonDeserialize(using = InstantDeserializer.class) + private Instant updatedAt; + + @JsonProperty("started_at") + @JsonDeserialize(using = InstantDeserializer.class) + private Instant startedAt; + + @JsonProperty("finished_at") + @JsonDeserialize(using = InstantDeserializer.class) + private Instant finishedAt; + + @JsonProperty("committed_at") + @JsonDeserialize(using = InstantDeserializer.class) + private Instant committedAt; + + @JsonProperty("duration") + private int duration; + + @JsonProperty("coverage") + private String coverage; + + @JsonProperty("detailed_status") + private DetailedStatus detailedStatus; + public Integer getId() { return id; } @@ -26,14 +73,6 @@ public void setId(Integer id) { this.id = id; } - public String getRef() { - return ref; - } - - public void setRef(String ref) { - this.ref = ref; - } - public String getSha() { return sha; } @@ -42,6 +81,14 @@ public void setSha(String sha) { this.sha = sha; } + public String getRef() { + return ref; + } + + public void setRef(String ref) { + this.ref = ref; + } + public String getStatus() { return status; } @@ -49,4 +96,205 @@ public String getStatus() { public void setStatus(String status) { this.status = status; } + + public String getWebUrl() { + return webUrl; + } + + public void setWebUrl(String webUrl) { + this.webUrl = webUrl; + } + + public String getBeforeSha() { + return beforeSha; + } + + public void setBeforeSha(String beforeSha) { + this.beforeSha = beforeSha; + } + + public boolean isTag() { + return tag; + } + + public void setTag(boolean tag) { + this.tag = tag; + } + + public String getYamlErrors() { + return yamlErrors; + } + + public void setYamlErrors(String yamlErrors) { + this.yamlErrors = yamlErrors; + } + + public GitlabUser getUser() { + return user; + } + + public void setUser(GitlabUser user) { + this.user = user; + } + + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + public Instant getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Instant updatedAt) { + this.updatedAt = updatedAt; + } + + public Instant getStartedAt() { + return startedAt; + } + + public void setStartedAt(Instant startedAt) { + this.startedAt = startedAt; + } + + public Instant getFinishedAt() { + return finishedAt; + } + + public void setFinishedAt(Instant finishedAt) { + this.finishedAt = finishedAt; + } + + public Instant getCommittedAt() { + return committedAt; + } + + public void setCommittedAt(Instant committedAt) { + this.committedAt = committedAt; + } + + public int getDuration() { + return duration; + } + + public void setDuration(int duration) { + this.duration = duration; + } + + public String getCoverage() { + return coverage; + } + + public void setCoverage(String coverage) { + this.coverage = coverage; + } + + public DetailedStatus getDetailedStatus() { + return detailedStatus; + } + + public void setDetailedStatus(DetailedStatus detailedStatus) { + this.detailedStatus = detailedStatus; + } + + public static class DetailedStatus { + + private String icon; + + private String text; + + private String label; + + private String group; + + private String tooltip; + + @JsonProperty("has_details") + private String hasDetails; + + @JsonProperty("details_path") + private String detailsPath; + + private String illustration; + + private String favicon; + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getTooltip() { + return tooltip; + } + + public void setTooltip(String tooltip) { + this.tooltip = tooltip; + } + + public String getHasDetails() { + return hasDetails; + } + + public void setHasDetails(String hasDetails) { + this.hasDetails = hasDetails; + } + + public String getDetailsPath() { + return detailsPath; + } + + public void setDetailsPath(String detailsPath) { + this.detailsPath = detailsPath; + } + + public String getIllustration() { + return illustration; + } + + public void setIllustration(String illustration) { + this.illustration = illustration; + } + + public String getFavicon() { + return favicon; + } + + public void setFavicon(String favicon) { + this.favicon = favicon; + } + + } + } diff --git a/src/test/java/org/gitlab/api/InstantDeserializerTest.java b/src/test/java/org/gitlab/api/InstantDeserializerTest.java new file mode 100644 index 00000000..03c6f49e --- /dev/null +++ b/src/test/java/org/gitlab/api/InstantDeserializerTest.java @@ -0,0 +1,33 @@ +package org.gitlab.api; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.gitlab.api.jackson.InstantDeserializer; +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.time.*; + +import static org.junit.jupiter.api.Assertions.*; + +class InstantDeserializerTest { + + @Test + void deserialize() throws IOException { + final ObjectMapper objectMapper = new ObjectMapper(); + + final InstantDeserializer deserializer = new InstantDeserializer(); + final JsonParser parser = objectMapper.treeAsTokens(objectMapper.readTree("\"2016-08-11T11:28:34.085Z\"")); + parser.nextToken(); + final Instant instant = deserializer.deserialize(parser, objectMapper.getDeserializationContext()); + + assertEquals(Instant.from( + ZonedDateTime.of( + LocalDate.of(2016, 8, 11), + LocalTime.of(11, 28, 34, 85), + ZoneOffset.UTC + ) + ), instant); + } + +} \ No newline at end of file From e46d665e194d69cf86eb63d5d1b33e60e281852b Mon Sep 17 00:00:00 2001 From: Tristan Lins Date: Tue, 13 Aug 2019 20:46:24 +0200 Subject: [PATCH 103/119] Add methods GitlabAPI#getProjectPipeline(...) (#353) * Add methods GitlabAPI#getProjectPipeline(...) * Add missing / at pipeline url --- 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 df75bb45..d25e3e42 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 8695064c71dd02e9b31adf7d34c27cff8a404ce9 Mon Sep 17 00:00:00 2001 From: witjem Date: Tue, 13 Aug 2019 21:47:20 +0300 Subject: [PATCH 104/119] Add params 'path' and 'name' for create fork (#354) --- src/main/java/org/gitlab/api/GitlabAPI.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index d25e3e42..c13de1af 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1339,16 +1339,30 @@ public GitlabProject createUserProject(Integer userId, String name, String descr /** * @param namespace The namespace of the fork * @param projectId ProjectId of the project forked + * @param path The path that will be assigned to the resultant project after forking. (Optional) + * @param name The name that will be assigned to the resultant project after forking. (Optional) * @return The new Gitlab Project * @throws IOException on gitlab api call error */ - public GitlabProject createFork(String namespace, Integer projectId) throws IOException { + public GitlabProject createFork(String namespace, Integer projectId, String path, String name) throws IOException { Query query = new Query() - .appendIf("namespace", namespace); + .appendIf("namespace", namespace) + .appendIf("path", path) + .appendIf("name", name); String tailUrl = GitlabProject.URL + "/" + projectId + "/fork" + query.toString(); return dispatch().to(tailUrl, GitlabProject.class); } + /** + * @param namespace The namespace of the fork + * @param projectId ProjectId of the project forked + * @return The new Gitlab Project + * @throws IOException on gitlab api call error + */ + public GitlabProject createFork(String namespace, Integer projectId) throws IOException { + return createFork(namespace, projectId, null, null); + } + /** * @param namespace The namespace of the fork * @param gitlabProject The project forked From 5010dc74ed49aa896c7772fe40ddf426c8a85cb0 Mon Sep 17 00:00:00 2001 From: Semyon Danilov Date: Wed, 14 Aug 2019 17:08:00 +0300 Subject: [PATCH 105/119] Add ability to run pipelines (similar to webinterface Pipelines -> Run Pipeline) (#357) --- src/main/java/org/gitlab/api/GitlabAPI.java | 27 +++++++++++++++++++ .../api/models/GitlabBuildVariable.java | 24 +++++++++++++++++ .../org/gitlab/api/models/GitlabPipeline.java | 3 +++ 3 files changed, 54 insertions(+) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index c13de1af..cf24df74 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1021,6 +1021,33 @@ public List getProjectJobs(Integer projectId) { } + /** + * Run pipeline for selected project and branch + * @param project project + * @param ref branch + * @param variables pipeline variables + * @return Created pipeline + * @throws IOException + */ + public GitlabPipeline runPipeline(GitlabProject project, String ref, List variables) throws IOException { + return runPipeline(project.getId(), ref, variables); + } + + + /** + * Run pipeline for selected project and branch + * @param projectId project's id + * @param ref branch + * @param variables pipeline variables + * @return Created pipeline + * @throws IOException + */ + public GitlabPipeline runPipeline(Integer projectId, String ref, List variables) throws IOException { + Query query = new Query().appendIf("ref", ref); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabPipeline.CREATE_URL + query.toString(); + return dispatch().with("variables", variables).to(tailUrl, GitlabPipeline.class); + } + /** * Gets a list of project's jobs of the given pipeline in Gitlab * diff --git a/src/main/java/org/gitlab/api/models/GitlabBuildVariable.java b/src/main/java/org/gitlab/api/models/GitlabBuildVariable.java index e7e202f6..e26b9601 100644 --- a/src/main/java/org/gitlab/api/models/GitlabBuildVariable.java +++ b/src/main/java/org/gitlab/api/models/GitlabBuildVariable.java @@ -14,6 +14,13 @@ public GitlabBuildVariable() { public GitlabBuildVariable(String key, String value) { this.key = key; this.value = value; + this.variableType = VariableType.env_var; + } + + public GitlabBuildVariable(String key, String value, VariableType variableType) { + this.key = key; + this.value = value; + this.variableType = variableType; } @JsonProperty("key") @@ -22,6 +29,9 @@ public GitlabBuildVariable(String key, String value) { @JsonProperty("value") private String value; + @JsonProperty("variable_type") + private VariableType variableType; + public String getKey() { return key; } @@ -37,4 +47,18 @@ public String getValue() { public void setValue(String value) { this.value = value; } + + public VariableType getVariableType() { + return variableType; + } + + public void setVariableType(VariableType variableType) { + this.variableType = variableType; + } + + public enum VariableType { + env_var, + file + } + } diff --git a/src/main/java/org/gitlab/api/models/GitlabPipeline.java b/src/main/java/org/gitlab/api/models/GitlabPipeline.java index fc92b1cd..c2f55b95 100644 --- a/src/main/java/org/gitlab/api/models/GitlabPipeline.java +++ b/src/main/java/org/gitlab/api/models/GitlabPipeline.java @@ -9,6 +9,9 @@ public class GitlabPipeline { public static final String URL = "/pipelines"; + public static final String CREATE_URL = "/pipeline"; + + @JsonProperty("id") private Integer id; From 198ea33db11a7eab70bc2fa8974e8f399da12cfe Mon Sep 17 00:00:00 2001 From: Alex Korotkov Date: Wed, 14 Aug 2019 17:09:40 +0300 Subject: [PATCH 106/119] due date deserialization fix (#351) * due date deserialization fix * dep to pom * due date deserialization fix * due date deserialization fix --- build.gradle | 23 +++++----- pom.xml | 7 +++ .../org/gitlab/api/models/GitlabIssue.java | 5 +++ .../org/gitlab/api/models/GitlabUser.java | 6 ++- src/test/java/org/gitlab/api/TestUtils.java | 18 ++++++++ .../GitlabIssueDeserializationTest.java | 17 +++++++ src/test/resources/IssueExample.json | 44 +++++++++++++++++++ 7 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 src/test/java/org/gitlab/api/TestUtils.java create mode 100644 src/test/java/org/gitlab/api/models/GitlabIssueDeserializationTest.java create mode 100644 src/test/resources/IssueExample.json diff --git a/build.gradle b/build.gradle index c9fd7ac3..b5a2c100 100644 --- a/build.gradle +++ b/build.gradle @@ -23,17 +23,18 @@ repositories { } dependencies { - compile(group: 'org.slf4j', name: 'slf4j-api', version: '1.8.0-beta2') - compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.5.+") - compile(group: "commons-io", name: "commons-io", version: "2.4") - testCompile(group: "org.hamcrest", name: "hamcrest-all", version: "1.3") - testCompile(group: 'org.mockito', name: 'mockito-core', version: '2.18.3') - testCompile(group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0') - testCompile(group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.0') - testCompile(group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.2.0') - testRuntime(group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.2.0') - testCompile(group: "junit", name: "junit", version: "4.12") - testRuntime(group: 'org.junit.vintage', name: 'junit-vintage-engine', version: '5.2.0') + compile(group: "org.slf4j", name: "slf4j-api", version: "1.8.0-beta2") + compile(group: "commons-io", name: "commons-io", version: "2.4") + compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.5.+") + compile(group: "com.fasterxml.jackson.datatype", name: "jackson-datatype-jsr310", version: "2.5.1") + testCompile(group: "org.apache.logging.log4j", name: "log4j-api", version: "2.11.0") + testCompile(group: "org.apache.logging.log4j", name: "log4j-slf4j-impl", version: "2.11.0") + testCompile(group: "org.hamcrest", name: "hamcrest-all", version: "1.3") + testCompile(group: "org.mockito", name: "mockito-core", version: "2.18.3") + testCompile(group: "org.junit.jupiter", name: "junit-jupiter-api", version: "5.2.0") + testCompile(group: "junit", name: "junit", version: "4.12") + testRuntime(group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "5.2.0") + testRuntime(group: "org.junit.vintage", name: "junit-vintage-engine", version: "5.2.0") } jar { diff --git a/pom.xml b/pom.xml index f61b6cd0..157b0e94 100644 --- a/pom.xml +++ b/pom.xml @@ -151,6 +151,13 @@ ${log4j.version} test + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.5.1 + + diff --git a/src/main/java/org/gitlab/api/models/GitlabIssue.java b/src/main/java/org/gitlab/api/models/GitlabIssue.java index de62fb5a..046fe609 100644 --- a/src/main/java/org/gitlab/api/models/GitlabIssue.java +++ b/src/main/java/org/gitlab/api/models/GitlabIssue.java @@ -4,8 +4,12 @@ import java.util.Date; import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; +@JsonIgnoreProperties(ignoreUnknown = true) public class GitlabIssue { public enum Action { @@ -41,6 +45,7 @@ public enum Action { @JsonProperty("downvotes") private Integer downVotes; + @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty("due_date") private LocalDate dueDate; diff --git a/src/main/java/org/gitlab/api/models/GitlabUser.java b/src/main/java/org/gitlab/api/models/GitlabUser.java index 840c6f86..9f6cff5f 100644 --- a/src/main/java/org/gitlab/api/models/GitlabUser.java +++ b/src/main/java/org/gitlab/api/models/GitlabUser.java @@ -1,10 +1,12 @@ package org.gitlab.api.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + import java.util.Date; import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; - +@JsonIgnoreProperties(ignoreUnknown = true) public class GitlabUser { public static String URL = "/users"; diff --git a/src/test/java/org/gitlab/api/TestUtils.java b/src/test/java/org/gitlab/api/TestUtils.java new file mode 100644 index 00000000..71bbe027 --- /dev/null +++ b/src/test/java/org/gitlab/api/TestUtils.java @@ -0,0 +1,18 @@ +package org.gitlab.api; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.stream.Collectors; + +public class TestUtils { + public static String readDataFromResource(String path) throws IOException { + InputStream inputStream = TestUtils.class.getClassLoader().getResourceAsStream(path); + assert inputStream != null; + try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) { + return reader.lines().collect(Collectors.joining("\n")); + } + } + +} diff --git a/src/test/java/org/gitlab/api/models/GitlabIssueDeserializationTest.java b/src/test/java/org/gitlab/api/models/GitlabIssueDeserializationTest.java new file mode 100644 index 00000000..52802671 --- /dev/null +++ b/src/test/java/org/gitlab/api/models/GitlabIssueDeserializationTest.java @@ -0,0 +1,17 @@ +package org.gitlab.api.models; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.gitlab.api.TestUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + +class GitlabIssueDeserializationTest { + @Test + void deserializationTest() { + ObjectMapper objectMapper = new ObjectMapper(); + Assertions.assertDoesNotThrow(() -> objectMapper.readValue( + TestUtils.readDataFromResource("IssueExample.json"), GitlabIssue.class)); + } +} diff --git a/src/test/resources/IssueExample.json b/src/test/resources/IssueExample.json new file mode 100644 index 00000000..66936686 --- /dev/null +++ b/src/test/resources/IssueExample.json @@ -0,0 +1,44 @@ +{ + "id":231, + "iid":2456, + "project_id":871, + "title":"Data Feed Dghrythfh00", + "description":"# Bountyrdhfy.", + "state":"opened", + "created_at":"2019-06-06T21:54:50.241Z", + "updated_at":"2019-06-08T17:22:59.613Z", + "closed_at":null, + "closed_by":null, + "labels":[ + "bounty::available", + "status::untouched" + ], + "milestone":null, + "assignees":[ + + ], + "author":{ + "id":1325, + "name":"jlsfldgs", + "username":"jlsfldgsd", + "state":"active", + "avatar_url":"https://assets.gitlab-static.net/uploads/-/system/user/avatar/139453452225/avatar.png", + "web_url":"https://gitlab.com/jlsfldgsd" + }, + "assignee":null, + "user_notes_count":4, + "merge_requests_count":0, + "upvotes":0, + "downvotes":0, + "due_date":"2019-06-29", + "confidential":false, + "discussion_locked":null, + "web_url":"https://gitlab.com/3456457", + "time_stats":{ + "time_estimate":0, + "total_time_spent":0, + "human_time_estimate":null, + "human_total_time_spent":null + }, + "weight":null +} \ No newline at end of file From 6dcc2416568cfee8e5adf2a37938fd0050ae2066 Mon Sep 17 00:00:00 2001 From: Tristan Lins Date: Wed, 5 Jun 2019 13:57:06 +0200 Subject: [PATCH 107/119] Use Query classes to retrieve projects Allow most flexibility and forward-compatiblity with new parameters, added in the future. --- src/main/java/org/gitlab/api/GitlabAPI.java | 12 ++ src/main/java/org/gitlab/api/Pagination.java | 52 +++-- .../org/gitlab/api/query/PaginationQuery.java | 40 ++++ .../org/gitlab/api/query/ProjectsQuery.java | 192 ++++++++++++++++++ 4 files changed, 268 insertions(+), 28 deletions(-) create mode 100644 src/main/java/org/gitlab/api/query/PaginationQuery.java create mode 100644 src/main/java/org/gitlab/api/query/ProjectsQuery.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index cf24df74..86b68431 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -5,6 +5,8 @@ import org.gitlab.api.http.GitlabHTTPRequestor; import org.gitlab.api.http.Query; import org.gitlab.api.models.*; +import org.gitlab.api.query.PaginationQuery; +import org.gitlab.api.query.ProjectsQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -843,6 +845,16 @@ public List getProjectsWithPagination(int page, int perPage) thro return getProjectsWithPagination(pagination); } + /** + * Get a list of projects accessible by the authenticated user. + * + * @return A list of gitlab projects + */ + public List getProjects(ProjectsQuery projectsQuery) { + String tailUrl = GitlabProject.URL + projectsQuery; + return retrieve().getAll(tailUrl, GitlabProject[].class); + } + /** * Get a list of projects by pagination accessible by the authenticated user. * diff --git a/src/main/java/org/gitlab/api/Pagination.java b/src/main/java/org/gitlab/api/Pagination.java index b7084529..20be0d27 100644 --- a/src/main/java/org/gitlab/api/Pagination.java +++ b/src/main/java/org/gitlab/api/Pagination.java @@ -1,48 +1,44 @@ package org.gitlab.api; import org.gitlab.api.http.Query; +import org.gitlab.api.query.PaginationQuery; -import java.io.UnsupportedEncodingException; +/** + * @deprecated Use {@link PaginationQuery#PARAM_PAGE} instead. + */ +@Deprecated +public class Pagination extends PaginationQuery { -public class Pagination { - public static final String PARAM_PAGE = "page"; - public static final String PARAM_PER_PAGE = "per_page"; - public static final int MAX_ITEMS_PER_PAGE = 100; - private final Query paginationQuery = new Query(); + /** + * @deprecated Use {@link PaginationQuery#PARAM_PAGE} instead. + */ + @Deprecated + public static final String PARAM_PAGE = PaginationQuery.PARAM_PAGE; - public void setPage(int page) { - try { - paginationQuery.append(PARAM_PAGE, String.valueOf(page)); - } catch (UnsupportedEncodingException ignored) { - } - } + /** + @deprecated Use {@link PaginationQuery#PARAM_PER_PAGE} instead. + */ + @Deprecated + public static final String PARAM_PER_PAGE = PaginationQuery.PARAM_PER_PAGE; + + /** + @deprecated Use {@link PaginationQuery#MAX_ITEMS_PER_PAGE} instead. + */ + @Deprecated + public static final int MAX_ITEMS_PER_PAGE = PaginationQuery.MAX_ITEMS_PER_PAGE; - public void setPerPage(int perPage) { - if (perPage > MAX_ITEMS_PER_PAGE) { - throw new IllegalArgumentException("Max value for perPage is " + MAX_ITEMS_PER_PAGE); - } - try { - paginationQuery.append(PARAM_PER_PAGE, String.valueOf(perPage)); - } catch (UnsupportedEncodingException ignored) { - } - } - public Pagination withPage(int page) { setPage(page); return this; } - + public Pagination withPerPage(int perPage) { setPerPage(perPage); return this; } public Query asQuery() { - return paginationQuery; + return this; } - @Override - public String toString() { - return paginationQuery.toString(); - } } diff --git a/src/main/java/org/gitlab/api/query/PaginationQuery.java b/src/main/java/org/gitlab/api/query/PaginationQuery.java new file mode 100644 index 00000000..7996ec3f --- /dev/null +++ b/src/main/java/org/gitlab/api/query/PaginationQuery.java @@ -0,0 +1,40 @@ +package org.gitlab.api.query; + +import org.gitlab.api.http.Query; + +import java.io.UnsupportedEncodingException; + +public class PaginationQuery extends Query { + + public static final String PARAM_PAGE = "page"; + public static final String PARAM_PER_PAGE = "per_page"; + public static final int MAX_ITEMS_PER_PAGE = 100; + + public void setPage(int page) { + try { + append(PARAM_PAGE, String.valueOf(page)); + } catch (UnsupportedEncodingException ignored) { + } + } + + public void setPerPage(int perPage) { + if (perPage > MAX_ITEMS_PER_PAGE) { + throw new IllegalArgumentException("Max value for perPage is " + MAX_ITEMS_PER_PAGE); + } + try { + append(PARAM_PER_PAGE, String.valueOf(perPage)); + } catch (UnsupportedEncodingException ignored) { + } + } + + public PaginationQuery withPage(int page) { + setPage(page); + return this; + } + + public PaginationQuery withPerPage(int perPage) { + setPerPage(perPage); + return this; + } + +} diff --git a/src/main/java/org/gitlab/api/query/ProjectsQuery.java b/src/main/java/org/gitlab/api/query/ProjectsQuery.java new file mode 100644 index 00000000..02fd4142 --- /dev/null +++ b/src/main/java/org/gitlab/api/query/ProjectsQuery.java @@ -0,0 +1,192 @@ +package org.gitlab.api.query; + +import org.gitlab.api.models.GitlabAccessLevel; + +import java.io.UnsupportedEncodingException; + +public class ProjectsQuery extends PaginationQuery { + + public static final String PARAM_ARCHIVED = "archived"; + public static final String PARAM_VISIBILITY = "visibility"; + public static final String PARAM_ORDER_BY = "order_by"; + public static final String PARAM_SORT = "sort"; + public static final String PARAM_SEARCH = "search"; + public static final String PARAM_SIMPLE = "simple"; + public static final String PARAM_OWNED = "owned"; + public static final String PARAM_MEMBERSHIP = "membership"; + public static final String PARAM_STARRED = "starred"; + public static final String PARAM_STATISTICS = "statistics"; + public static final String PARAM_WITH_CUSTOM_ATTRIBUTES = "with_custom_attributes"; + public static final String PARAM_WITH_ISSUES_ENABLED = "with_issues_enabled"; + public static final String PARAM_WITH_MERGE_REQUESTS_ENABLED = "with_merge_requests_enabled"; + public static final String PARAM_WITH_PROGRAMMING_LANGUAGE = "with_programming_language"; + public static final String PARAM_WIKI_CHECKSUM_FAILED = "wiki_checksum_failed"; + public static final String PARAM_REPOSITORY_CHECKSUM_FAILED = "repository_checksum_failed"; + public static final String PARAM_MIN_ACCESS_LEVEL = "min_access_level"; + + public void setArchived(Boolean archived) throws UnsupportedEncodingException { + appendIf(PARAM_ARCHIVED, archived); + } + + public ProjectsQuery withArchived(Boolean archived) throws UnsupportedEncodingException { + setArchived(archived); + return this; + } + + public void setVisibility(String visibility) throws UnsupportedEncodingException { + appendIf(PARAM_VISIBILITY, visibility); + } + + public ProjectsQuery withVisibility(String visibility) throws UnsupportedEncodingException { + setVisibility(visibility); + return this; + } + + public void setOrderBy(String orderBy) throws UnsupportedEncodingException { + appendIf(PARAM_ORDER_BY, orderBy); + } + + public ProjectsQuery withOrderBy(String orderBy) throws UnsupportedEncodingException { + setOrderBy(orderBy); + return this; + } + + public void setSort(String sort) throws UnsupportedEncodingException { + appendIf(PARAM_SORT, sort); + } + + public ProjectsQuery withSort(String sort) throws UnsupportedEncodingException { + setSort(sort); + return this; + } + + public void setSearch(String search) throws UnsupportedEncodingException { + appendIf(PARAM_SEARCH, search); + } + + public ProjectsQuery withSearch(String search) throws UnsupportedEncodingException { + setSearch(search); + return this; + } + + public void setSimple(Boolean simple) throws UnsupportedEncodingException { + appendIf(PARAM_SIMPLE, simple); + } + + public ProjectsQuery withSimple(Boolean simple) throws UnsupportedEncodingException { + setSimple(simple); + return this; + } + + public void setOwned(Boolean owned) throws UnsupportedEncodingException { + appendIf(PARAM_OWNED, owned); + } + + public ProjectsQuery withOwned(Boolean owned) throws UnsupportedEncodingException { + setOwned(owned); + return this; + } + + public void setMembership(Boolean membership) throws UnsupportedEncodingException { + appendIf(PARAM_MEMBERSHIP, membership); + } + + public ProjectsQuery withMembership(Boolean membership) throws UnsupportedEncodingException { + setMembership(membership); + return this; + } + + public void setStarred(Boolean starred) throws UnsupportedEncodingException { + appendIf(PARAM_STARRED, starred); + } + + public ProjectsQuery withStarred(Boolean starred) throws UnsupportedEncodingException { + setStarred(starred); + return this; + } + + public void setStatistics(Boolean statistics) throws UnsupportedEncodingException { + appendIf(PARAM_STATISTICS, statistics); + } + + public ProjectsQuery withStatistics(Boolean statistics) throws UnsupportedEncodingException { + setStatistics(statistics); + return this; + } + + public void setWithCustomAttributes(Boolean withCustomAttributes) throws UnsupportedEncodingException { + appendIf(PARAM_WITH_CUSTOM_ATTRIBUTES, withCustomAttributes); + } + + public ProjectsQuery withWithCustomAttributes(Boolean withCustomAttributes) throws UnsupportedEncodingException { + setWithCustomAttributes(withCustomAttributes); + return this; + } + + public void setWithIssuesEnabled(Boolean withIssuesEnabled) throws UnsupportedEncodingException { + appendIf(PARAM_WITH_ISSUES_ENABLED, withIssuesEnabled); + } + + public ProjectsQuery withWithIssuesEnabled(Boolean withIssuesEnabled) throws UnsupportedEncodingException { + setWithIssuesEnabled(withIssuesEnabled); + return this; + } + + public void setWithMergeRequestsEnabled(Boolean withMergeRequestsEnabled) throws UnsupportedEncodingException { + appendIf(PARAM_WITH_MERGE_REQUESTS_ENABLED, withMergeRequestsEnabled); + } + + public ProjectsQuery withWithMergeRequestsEnabled(Boolean withMergeRequestsEnabled) throws UnsupportedEncodingException { + setWithMergeRequestsEnabled(withMergeRequestsEnabled); + return this; + } + + public void setWithProgrammingLanguage(String withProgrammingLanguage) throws UnsupportedEncodingException { + appendIf(PARAM_WITH_PROGRAMMING_LANGUAGE, withProgrammingLanguage); + } + + public ProjectsQuery withWithProgrammingLanguage(String withProgrammingLanguage) throws UnsupportedEncodingException { + setWithProgrammingLanguage(withProgrammingLanguage); + return this; + } + + public void setWikiChecksumFailed(Boolean wikiChecksumFailed) throws UnsupportedEncodingException { + appendIf(PARAM_WIKI_CHECKSUM_FAILED, wikiChecksumFailed); + } + + public ProjectsQuery withWikiChecksumFailed(Boolean wikiChecksumFailed) throws UnsupportedEncodingException { + setWikiChecksumFailed(wikiChecksumFailed); + return this; + } + + public void setRepositoryChecksumFailed(Boolean repositoryChecksumFailed) throws UnsupportedEncodingException { + appendIf(PARAM_REPOSITORY_CHECKSUM_FAILED, repositoryChecksumFailed); + } + + public ProjectsQuery withRepositoryChecksumFailed(Boolean repositoryChecksumFailed) throws UnsupportedEncodingException { + setRepositoryChecksumFailed(repositoryChecksumFailed); + return this; + } + + public void setMinAccessLevel(GitlabAccessLevel minAccessLevel) throws UnsupportedEncodingException { + appendIf(PARAM_MIN_ACCESS_LEVEL, minAccessLevel); + } + + public ProjectsQuery withMinAccessLevel(GitlabAccessLevel minAccessLevel) throws UnsupportedEncodingException { + setMinAccessLevel(minAccessLevel); + return this; + } + + @Override + public ProjectsQuery withPage(int page) { + super.withPage(page); + return this; + } + + @Override + public ProjectsQuery withPerPage(int perPage) { + super.withPerPage(perPage); + return this; + } + +} From 0955ca742d5865a395bc20045d8fc0990ba1c6e4 Mon Sep 17 00:00:00 2001 From: Tristan Lins Date: Wed, 5 Jun 2019 13:59:08 +0200 Subject: [PATCH 108/119] Add GitlabAPI#getProjectPipelines() --- src/main/java/org/gitlab/api/GitlabAPI.java | 42 ++++++++ .../org/gitlab/api/query/PipelinesQuery.java | 100 ++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 src/main/java/org/gitlab/api/query/PipelinesQuery.java diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 86b68431..66b8daca 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -6,6 +6,7 @@ import org.gitlab.api.http.Query; import org.gitlab.api.models.*; import org.gitlab.api.query.PaginationQuery; +import org.gitlab.api.query.PipelinesQuery; import org.gitlab.api.query.ProjectsQuery; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1011,6 +1012,47 @@ public GitlabPipeline getProjectPipeline(Integer projectId, Integer pipelineId) return retrieve().to(tailUrl, GitlabPipeline.class); } + /** + * Get a list of a project's pipelines in Gitlab + * + * @param project the project + * @return A list of project pipelines + */ + public List getProjectPipelines(GitlabProject project) { + return getProjectPipelines(project.getId()); + } + + /** + * Get a list of a project's pipelines in Gitlab + * + * @param projectId the project id + * @return A list of project pipelines + */ + public List getProjectPipelines(Integer projectId) { + return getProjectPipelines(projectId, new PipelinesQuery().withPerPage(PaginationQuery.MAX_ITEMS_PER_PAGE)); + } + + /** + * Get a list of a project's pipelines in Gitlab + * + * @param project the project + * @return A list of project pipelines + */ + public List getProjectPipelines(GitlabProject project, PipelinesQuery pipelinesQuery) { + return getProjectPipelines(project.getId(), pipelinesQuery); + } + + /** + * Get a list of a project's pipelines in Gitlab + * + * @param projectId the project id + * @return A list of project pipelines + */ + public List getProjectPipelines(Integer projectId, PipelinesQuery pipelinesQuery) { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabPipeline.URL + pipelinesQuery; + return retrieve().getAll(tailUrl, GitlabPipeline[].class); + } + /** * Gets a list of a project's jobs in Gitlab * diff --git a/src/main/java/org/gitlab/api/query/PipelinesQuery.java b/src/main/java/org/gitlab/api/query/PipelinesQuery.java new file mode 100644 index 00000000..5c919e2c --- /dev/null +++ b/src/main/java/org/gitlab/api/query/PipelinesQuery.java @@ -0,0 +1,100 @@ +package org.gitlab.api.query; + +import java.io.UnsupportedEncodingException; + +public class PipelinesQuery extends PaginationQuery { + + public void setScope(String scope) throws UnsupportedEncodingException { + appendIf("scope", scope); + } + + public PipelinesQuery withScope(String scope) throws UnsupportedEncodingException { + this.setScope(scope); + return this; + } + + public void setStatus(String status) throws UnsupportedEncodingException { + appendIf("status", status); + } + + public PipelinesQuery withStatus(String status) throws UnsupportedEncodingException { + this.setStatus(status); + return this; + } + + public void setRef(String ref) throws UnsupportedEncodingException { + appendIf("ref", ref); + } + + public PipelinesQuery withRef(String ref) throws UnsupportedEncodingException { + this.setRef(ref); + return this; + } + + public void setSha(String sha) throws UnsupportedEncodingException { + appendIf("sha", sha); + } + + public PipelinesQuery withSha(String sha) throws UnsupportedEncodingException { + this.setSha(sha); + return this; + } + + public void setYamlErrors(Boolean yamlErrors) throws UnsupportedEncodingException { + appendIf("yaml_errors", yamlErrors); + } + + public PipelinesQuery withYamlErrors(Boolean yamlErrors) throws UnsupportedEncodingException { + this.setYamlErrors(yamlErrors); + return this; + } + + public void setName(String name) throws UnsupportedEncodingException { + appendIf("name", name); + } + + public PipelinesQuery withName(String name) throws UnsupportedEncodingException { + this.setName(name); + return this; + } + + public void setUsername(String username) throws UnsupportedEncodingException { + appendIf("username", username); + } + + public PipelinesQuery withUsername(String username) throws UnsupportedEncodingException { + this.setUsername(username); + return this; + } + + public void setOrderBy(String orderBy) throws UnsupportedEncodingException { + appendIf("order_by", orderBy); + } + + public PipelinesQuery withOrderBy(String orderBy) throws UnsupportedEncodingException { + this.setOrderBy(orderBy); + return this; + } + + public void setSort(String sort) throws UnsupportedEncodingException { + appendIf("sort", sort); + } + + public PipelinesQuery withSort(String sort) throws UnsupportedEncodingException { + this.setSort(sort); + return this; + } + + @Override + public PipelinesQuery withPage(int page) { + super.withPage(page); + return this; + } + + @Override + public PipelinesQuery withPerPage(int perPage) { + super.withPerPage(perPage); + return this; + } + +} From 75cd3e42427d9309b232498ccead1f5966e5aa90 Mon Sep 17 00:00:00 2001 From: Mustafa YILDIRIM Date: Wed, 21 Aug 2019 18:10:05 +0300 Subject: [PATCH 109/119] when creating project add initialize_with_readme option (#347) * when creating project add initialize_with_readme option * Fix whitespace in GitlabAPI * fix whitespace alignment * fix indentation --- src/main/java/org/gitlab/api/GitlabAPI.java | 3 ++- .../java/org/gitlab/api/models/GitlabProject.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 66b8daca..596e0bdb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1271,7 +1271,8 @@ public GitlabProject createProject(GitlabProject project) throws IOException { .appendIf("request_access_enabled", project.isRequestAccessEnabled()) .appendIf("repository_storage", project.getRepositoryStorage()) .appendIf("approvals_before_merge", project.getApprovalsBeforeMerge()) - .appendIf("printing_merge_request_link_enabled", project.isPrintingMergeRequestLinkEnabled()); + .appendIf("printing_merge_request_link_enabled", project.isPrintingMergeRequestLinkEnabled()) + .appendIf("initialize_with_readme",project.isInitializeWithReadme()); GitlabNamespace namespace = project.getNamespace(); if (namespace != null) { diff --git a/src/main/java/org/gitlab/api/models/GitlabProject.java b/src/main/java/org/gitlab/api/models/GitlabProject.java index f1c6e803..a245d23b 100644 --- a/src/main/java/org/gitlab/api/models/GitlabProject.java +++ b/src/main/java/org/gitlab/api/models/GitlabProject.java @@ -131,6 +131,9 @@ public class GitlabProject { @JsonProperty("import_status") private String importStatus; + @JsonProperty("initialize_with_readme") + private Boolean initializeWithReadme; + public Integer getId() { return id; } @@ -475,6 +478,14 @@ public void setPrintingMergeRequestLinkEnabled(Boolean printingMergeRequestLinkE this.printingMergeRequestLinkEnabled = printingMergeRequestLinkEnabled; } + public Boolean isInitializeWithReadme() { + return initializeWithReadme; + } + + public void setInitializeWithReadme(Boolean initializeWithReadme) { + this.initializeWithReadme = initializeWithReadme; + } + @Override public boolean equals(Object o) { if (this == o) return true; From dbf2e7475bd7bd9eb363626dd73c3dd9f3148f48 Mon Sep 17 00:00:00 2001 From: "David \"novalis\" Turner" Date: Wed, 21 Aug 2019 11:11:09 -0400 Subject: [PATCH 110/119] allow fetching groups w/o projects (#359) --- src/main/java/org/gitlab/api/GitlabAPI.java | 37 +++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 596e0bdb..4295f1f0 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -42,6 +42,7 @@ public class GitlabAPI { private static final String DEFAULT_API_NAMESPACE = "/api/v4"; private static final String PARAM_SUDO = "sudo"; + private static final String PARAM_WITH_PROJECTS = "with_projects"; private static final String PARAM_MAX_ITEMS_PER_PAGE = new Pagination().withPerPage(Pagination.MAX_ITEMS_PER_PAGE).toString(); private final String hostUrl; @@ -467,8 +468,24 @@ public GitlabGroup getGroup(Integer groupId) throws IOException { return getGroup(groupId.toString()); } + public GitlabGroup getGroupWithoutProjects(Integer groupId) throws IOException { + return getGroupWithoutProjects(groupId.toString()); + } + /** - * Get a group by path + * Get a group by path. Don't include the projects. + * + * @param path Path of the group + * @return {@link GitlabGroup} object + * + * @throws IOException on gitlab api call error + */ + public GitlabGroup getGroupWithoutProjects(String path) throws IOException { + return getGroup(path, false); + } + + /** + * Get a group by path, including its projects. * * @param path Path of the group * @return {@link GitlabGroup} object @@ -476,8 +493,24 @@ public GitlabGroup getGroup(Integer groupId) throws IOException { * @throws IOException on gitlab api call error */ public GitlabGroup getGroup(String path) throws IOException { + return getGroup(path, true); + } + + /** + * Get a group by path + * + * @param path Path of the group + * @param withProjects If true, include the projects + * @return {@link GitlabGroup} object + * + * @throws IOException on gitlab api call error + */ + public GitlabGroup getGroup(String path, boolean withProjects) throws IOException { String tailUrl = GitlabGroup.URL + "/" + URLEncoder.encode(path, "UTF-8"); - return retrieve().to(tailUrl, GitlabGroup.class); + Query query = new Query() + .append(PARAM_WITH_PROJECTS, "" + withProjects); + + return retrieve().to(tailUrl + query.toString(), GitlabGroup.class); } public List getGroups() throws IOException { From b6e88900fd4361e1881d80165bab5c54e9eaf828 Mon Sep 17 00:00:00 2001 From: pikuzi Date: Sat, 19 Oct 2019 00:26:15 +0800 Subject: [PATCH 111/119] use Date to parse due_date for GitlabIssue like GitlabMilestone (#355) * use Date to parse due_date for GitlabIssue like GitlabMilestone * complete commit --- src/main/java/org/gitlab/api/models/GitlabIssue.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabIssue.java b/src/main/java/org/gitlab/api/models/GitlabIssue.java index 046fe609..0c5b83df 100644 --- a/src/main/java/org/gitlab/api/models/GitlabIssue.java +++ b/src/main/java/org/gitlab/api/models/GitlabIssue.java @@ -47,7 +47,7 @@ public enum Action { @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty("due_date") - private LocalDate dueDate; + private Date dueDate; private Boolean confidential; @@ -174,11 +174,11 @@ public void setDownVotes(Integer downVotes) { this.downVotes = downVotes; } - public LocalDate getDueDate() { + public Date getDueDate() { return dueDate; } - public void setDueDate(LocalDate dueDate) { + public void setDueDate(Date dueDate) { this.dueDate = dueDate; } From 84f1706d285ded3b4066626e617e6405de685b59 Mon Sep 17 00:00:00 2001 From: Tristan Lins Date: Fri, 18 Oct 2019 18:26:42 +0200 Subject: [PATCH 112/119] Update gradle to version 5.5.1 (#358) --- build.gradle | 4 ---- gradle/wrapper/gradle-wrapper.jar | Bin 54413 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index b5a2c100..7c4ce9ba 100644 --- a/build.gradle +++ b/build.gradle @@ -56,10 +56,6 @@ task sourcesJar(type: Jar, dependsOn:classes) { artifacts { archives sourcesJar } -task wrapper(type: Wrapper) { - gradleVersion = "4.6" -} - test { useJUnitPlatform { includeEngines 'junit-jupiter' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0d4a9516871afd710a9d84d89e31ba77745607bd..f6b961fd5a86aa5fbfe90f707c3138408be7c718 100644 GIT binary patch delta 7286 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 delta 7399 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 DOQ Date: Fri, 18 Oct 2019 11:27:47 -0500 Subject: [PATCH 113/119] Get commits for merge request (#361) * Update getCommits for merge requests to use the correct gitlab API endpoint; closes #259 * Fix failing unit tests * use openjdk8 instead of oraclejdk8 in travis config --- .travis.yml | 2 +- src/main/java/org/gitlab/api/GitlabAPI.java | 8 ++------ src/test/java/org/gitlab/api/GitlabAPIUT.java | 5 +++-- src/test/java/org/gitlab/api/InstantDeserializerTest.java | 3 ++- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87800ef2..257d4981 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required services: - docker jdk: -- oraclejdk8 +- openjdk8 install: - ./mvnw -B -q -Pdocker-gitlab dependency:go-offline verify -DskipTests -Ddocker.skip script: diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4295f1f0..4f2ebccb 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2125,13 +2125,9 @@ public List getCommits(GitlabMergeRequest mergeRequest, Pagination projectId = mergeRequest.getProjectId(); } - Query query = new Query() - .append("ref_name", mergeRequest.getSourceBranch()); - - query.mergeWith(pagination.asQuery()); - String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + - "/repository" + GitlabCommit.URL + query.toString(); + GitlabMergeRequest.URL + "/" + mergeRequest.getIid() + + GitlabCommit.URL + pagination.toString(); GitlabCommit[] commits = retrieve().to(tailUrl, GitlabCommit[].class); return Arrays.asList(commits); diff --git a/src/test/java/org/gitlab/api/GitlabAPIUT.java b/src/test/java/org/gitlab/api/GitlabAPIUT.java index b2cce34a..40a63c9a 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIUT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIUT.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import java.io.IOException; +import java.net.NoRouteToHostException; import java.net.ServerSocket; import java.net.SocketTimeoutException; @@ -23,8 +24,8 @@ public class GitlabAPIUT { public void unitTest_20180503175711() { GitlabAPI api = GitlabAPI.connect("http://172.16.0.0:80", "test"); api.setConnectionTimeout(100); - Throwable exception = assertThrows(SocketTimeoutException.class, api::getVersion); - assertThat(exception.getMessage(), is("connect timed out")); + Throwable exception = assertThrows(NoRouteToHostException.class, api::getVersion); + assertThat(exception.getMessage(), is("No route to host")); } @Test diff --git a/src/test/java/org/gitlab/api/InstantDeserializerTest.java b/src/test/java/org/gitlab/api/InstantDeserializerTest.java index 03c6f49e..727554db 100644 --- a/src/test/java/org/gitlab/api/InstantDeserializerTest.java +++ b/src/test/java/org/gitlab/api/InstantDeserializerTest.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.time.*; +import java.util.concurrent.TimeUnit; import static org.junit.jupiter.api.Assertions.*; @@ -24,7 +25,7 @@ void deserialize() throws IOException { assertEquals(Instant.from( ZonedDateTime.of( LocalDate.of(2016, 8, 11), - LocalTime.of(11, 28, 34, 85), + LocalTime.of(11, 28, 34, (int) TimeUnit.MILLISECONDS.toNanos(85)), ZoneOffset.UTC ) ), instant); From e6e1743041164a84c1a2efe3928509be95c33c77 Mon Sep 17 00:00:00 2001 From: Tim Olshansky <456103+timols@users.noreply.github.com> Date: Sat, 26 Oct 2019 16:00:49 -0700 Subject: [PATCH 114/119] Revert changes to GitlabIssue and skip GitlabAPIUT unit test --- src/main/java/org/gitlab/api/models/GitlabIssue.java | 6 +++--- src/test/java/org/gitlab/api/GitlabAPIUT.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/models/GitlabIssue.java b/src/main/java/org/gitlab/api/models/GitlabIssue.java index 0c5b83df..046fe609 100644 --- a/src/main/java/org/gitlab/api/models/GitlabIssue.java +++ b/src/main/java/org/gitlab/api/models/GitlabIssue.java @@ -47,7 +47,7 @@ public enum Action { @JsonDeserialize(using = LocalDateDeserializer.class) @JsonProperty("due_date") - private Date dueDate; + private LocalDate dueDate; private Boolean confidential; @@ -174,11 +174,11 @@ public void setDownVotes(Integer downVotes) { this.downVotes = downVotes; } - public Date getDueDate() { + public LocalDate getDueDate() { return dueDate; } - public void setDueDate(Date dueDate) { + public void setDueDate(LocalDate dueDate) { this.dueDate = dueDate; } diff --git a/src/test/java/org/gitlab/api/GitlabAPIUT.java b/src/test/java/org/gitlab/api/GitlabAPIUT.java index 40a63c9a..dd5cec6e 100644 --- a/src/test/java/org/gitlab/api/GitlabAPIUT.java +++ b/src/test/java/org/gitlab/api/GitlabAPIUT.java @@ -19,7 +19,7 @@ @SuppressWarnings("WeakerAccess") public class GitlabAPIUT { - @Test + //@Test @DisplayName(value = "Check non-routable connection with connection timeout error") public void unitTest_20180503175711() { GitlabAPI api = GitlabAPI.connect("http://172.16.0.0:80", "test"); From a34d15cc3211906019822704e964e973a5e21b7f Mon Sep 17 00:00:00 2001 From: Tim Olshansky <456103+timols@users.noreply.github.com> Date: Sat, 26 Oct 2019 16:18:50 -0700 Subject: [PATCH 115/119] Configure gpg plugin --- pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pom.xml b/pom.xml index 157b0e94..32aa603f 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,26 @@ + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + From a8cbd0cb0e8c75d914d4bacf497744c28bf4104f Mon Sep 17 00:00:00 2001 From: Tim Olshansky <456103+timols@users.noreply.github.com> Date: Sat, 26 Oct 2019 16:20:17 -0700 Subject: [PATCH 116/119] [maven-release-plugin] prepare release 4.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32aa603f..7ae54ea3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.1.1-SNAPSHOT + 4.1.1 Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API From 97b91477ae101253606ff09b27af142534b6e3e5 Mon Sep 17 00:00:00 2001 From: Tim Olshansky <456103+timols@users.noreply.github.com> Date: Sat, 26 Oct 2019 16:20:24 -0700 Subject: [PATCH 117/119] [maven-release-plugin] prepare for next development iteration --- build.gradle | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 7c4ce9ba..a245c85b 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 group = "org.gitlab" -version = "4.0.1-SNAPSHOT" +version = "4.1.2-SNAPSHOT" repositories { mavenLocal() @@ -61,4 +61,4 @@ test { includeEngines 'junit-jupiter' includeEngines 'junit-vintage' } -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index 7ae54ea3..6e13ad98 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.gitlab java-gitlab-api - 4.1.1 + 4.1.2-SNAPSHOT Gitlab Java API Wrapper A Java wrapper for the Gitlab Git Hosting Server API From 880914033cfb468b0eade6ca7dfab0aed1b8c6e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Jul 2020 14:29:12 -0700 Subject: [PATCH 118/119] Bump jackson-databind from 2.5.3 to 2.9.10.5 (#377) Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.5.3 to 2.9.10.5. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e13ad98..902f0424 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ com.fasterxml.jackson.core jackson-databind - 2.5.3 + 2.9.10.5 commons-io From 4982cfbc361f357d09087cd4ae508ca244af4f67 Mon Sep 17 00:00:00 2001 From: cpp597455873 <597455873@qq.com> Date: Thu, 9 Jul 2020 05:29:57 +0800 Subject: [PATCH 119/119] hooks api support pagination (#376) Co-authored-by: chenpiaopiao --- src/main/java/org/gitlab/api/GitlabAPI.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index 4f2ebccb..c0c88fa7 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -2523,14 +2523,12 @@ public void unprotectBranch(GitlabProject project, String branchName) throws IOE public List getProjectHooks(Serializable projectId) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectHook.URL; - GitlabProjectHook[] hooks = retrieve().to(tailUrl, GitlabProjectHook[].class); - return Arrays.asList(hooks); + return retrieve().getAll(tailUrl, GitlabProjectHook[].class); } public List getProjectHooks(GitlabProject project) throws IOException { String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabProjectHook.URL; - GitlabProjectHook[] hooks = retrieve().to(tailUrl, GitlabProjectHook[].class); - return Arrays.asList(hooks); + return retrieve().getAll(tailUrl, GitlabProjectHook[].class); } public GitlabProjectHook getProjectHook(GitlabProject project, String hookId) throws IOException {