From 2ffa46529110ff42f00d3a6af83091e7eee2c151 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Mon, 15 Jan 2018 15:26:00 +0200 Subject: [PATCH 1/3] Added attributes 'token' and 'note_events' to add project hook method --- src/main/java/org/gitlab/api/GitlabAPI.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index a9806d23..eac645c6 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1873,7 +1873,7 @@ public GitlabProjectHook addProjectHook(GitlabProject project, String url, Strin .to(tailUrl, GitlabProjectHook.class); } - public GitlabProjectHook addProjectHook(Serializable projectId, String url, boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean tagPushEvents, boolean sslVerification) throws IOException { + public GitlabProjectHook addProjectHook(Serializable projectId, String url, boolean pushEvents, boolean issuesEvents, boolean mergeRequestEvents, boolean noteEvents, boolean tagPushEvents, boolean sslVerification, String token) throws IOException { String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabProjectHook.URL; return dispatch() @@ -1881,8 +1881,10 @@ public GitlabProjectHook addProjectHook(Serializable projectId, String url, bool .with("push_events", pushEvents ? "true" : "false") .with("issues_events", issuesEvents ? "true" : "false") .with("merge_requests_events", mergeRequestEvents ? "true" : "false") + .with("note_events", noteEvents ? "true" : "false") .with("tag_push_events", tagPushEvents ? "true" : "false") .with("enable_ssl_verification", sslVerification ? "true" : "false") + .with("token", token) .to(tailUrl, GitlabProjectHook.class); } From 8d6b93cbaf5039a90a79d563bcfee03106d72b30 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Mon, 15 Jan 2018 15:50:23 +0200 Subject: [PATCH 2/3] Added possibility to use Serializable projectId in bunch of methods --- src/main/java/org/gitlab/api/GitlabAPI.java | 45 +++++++++++++++------ 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index eac645c6..cea8a0c7 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1331,12 +1331,15 @@ public GitlabMergeRequest getMergeRequestChanges(Serializable projectId, Integer String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + "/changes"; return retrieve().to(tailUrl, GitlabMergeRequest.class); } - - public GitlabMergeRequest getMergeRequest(GitlabProject project, Integer mergeRequestId) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + "/" + mergeRequestId; + + public GitlabMergeRequest getMergeRequest(Serializable projectId, Integer mergeRequestId) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId; return retrieve().to(tailUrl, GitlabMergeRequest.class); } - + + public GitlabMergeRequest getMergeRequest(GitlabProject project, Integer mergeRequestId) throws IOException { + return getMergeRequest(project.getId(), mergeRequestId); + } /** * Create a new MergeRequest @@ -1402,9 +1405,13 @@ public GitlabMergeRequest updateMergeRequest(Serializable projectId, Integer mer * @throws IOException on gitlab api call error */ public GitlabMergeRequest acceptMergeRequest(GitlabProject project, Integer mergeRequestId, String mergeCommitMessage) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabMergeRequest.URL + "/" + mergeRequestId + "/merge"; + return acceptMergeRequest(project.getId(), mergeRequestId, mergeCommitMessage); + } + + public GitlabMergeRequest acceptMergeRequest(Serializable projectId, Integer mergeRequestId, String mergeCommitMessage) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabMergeRequest.URL + "/" + mergeRequestId + "/merge"; GitlabHTTPRequestor requestor = retrieve().method("PUT"); - requestor.with("id", project.getId()); + requestor.with("id", projectId); requestor.with("merge_request_id", mergeRequestId); if (mergeCommitMessage != null) requestor.with("merge_commit_message", mergeCommitMessage); @@ -1559,12 +1566,21 @@ public GitlabCommitComparison compareCommits(Serializable projectId, String comm // List commit statuses for a project ID and commit hash // GET /projects/:id/repository/commits/:sha/statuses public List getCommitStatuses(GitlabProject project, String commitHash) throws IOException { - return getCommitStatuses(project, commitHash, new Pagination()); + return getCommitStatuses(project.getId(), commitHash, new Pagination()); + } + + public List getCommitStatuses(Serializable projectId, String commitHash) throws IOException { + return getCommitStatuses(projectId, commitHash, new Pagination()); } public List getCommitStatuses(GitlabProject project, String commitHash, Pagination pagination) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + "/repository" + GitlabCommit.URL + "/" + + return getCommitStatuses(project.getId(), commitHash, pagination); + } + + public List getCommitStatuses(Serializable projectId, String commitHash, + Pagination pagination) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository" + GitlabCommit.URL + "/" + commitHash + GitlabCommitStatus.URL + pagination; GitlabCommitStatus[] statuses = retrieve().to(tailUrl, GitlabCommitStatus[].class); return Arrays.asList(statuses); @@ -1574,7 +1590,12 @@ public List getCommitStatuses(GitlabProject project, String // GET /projects/:id/statuses/:sha public GitlabCommitStatus createCommitStatus(GitlabProject project, String commitHash, String state, String ref, String name, String targetUrl, String description) throws IOException { - String tailUrl = GitlabProject.URL + "/" + project.getId() + GitlabCommitStatus.URL + "/" + commitHash; + return createCommitStatus(project.getId(), commitHash, state, ref, name, targetUrl, description); + } + + public GitlabCommitStatus createCommitStatus(Serializable projectId, String commitHash, String state, String ref, + String name, String targetUrl, String description) throws IOException { + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + GitlabCommitStatus.URL + "/" + commitHash; return dispatch() .with("state", state) .with("ref", ref) @@ -1604,11 +1625,11 @@ public byte[] getRawFileContent(GitlabProject project, String sha, String filepa * @param filepath The path of the file * @throws IOException on gitlab api call error */ - public byte[] getRawFileContent(Integer projectId, String sha, String filepath) throws IOException { + public byte[] getRawFileContent(Serializable projectId, String sha, String filepath) throws IOException { Query query = new Query() .append("ref", sha); - String tailUrl = GitlabProject.URL + "/" + projectId + "/repository/files/" + sanitizePath(filepath) + "/raw" + query.toString(); + String tailUrl = GitlabProject.URL + "/" + sanitizeProjectId(projectId) + "/repository/files/" + sanitizePath(filepath) + "/raw" + query.toString(); return retrieve().to(tailUrl, byte[].class); } @@ -2559,7 +2580,7 @@ private String sanitizePath(String branch) { * @throws IOException on gitlab api call error * @see http://doc.gitlab.com/ce/api/commits.html#post-comment-to-commit */ - public CommitComment createCommitComment(Integer projectId, String sha, String note, + public CommitComment createCommitComment(Serializable projectId, String sha, String note, String path, String line, String line_type) throws IOException { Query query = new Query() From de206cfc44b256205e2ac06a11a284cc94d777d2 Mon Sep 17 00:00:00 2001 From: Artem Gubanov Date: Thu, 18 Jan 2018 16:01:37 +0200 Subject: [PATCH 3/3] Added attribute 'path' to get commits method. --- src/main/java/org/gitlab/api/GitlabAPI.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gitlab/api/GitlabAPI.java b/src/main/java/org/gitlab/api/GitlabAPI.java index cea8a0c7..a07faf6b 100644 --- a/src/main/java/org/gitlab/api/GitlabAPI.java +++ b/src/main/java/org/gitlab/api/GitlabAPI.java @@ -1490,11 +1490,18 @@ public List getLastCommits(Serializable projectId, String branchOr public List getCommits(Serializable projectId, Pagination pagination, String branchOrTag) throws IOException { + return getCommits(projectId, null, branchOrTag, null); + } + + public List getCommits(Serializable projectId, Pagination pagination, + String branchOrTag, String path) throws IOException { final Query query = new Query(); if (branchOrTag != null) { query.append("ref_name", branchOrTag); } - + if (path != null) { + query.append("path", path); + } if (pagination != null) { query.mergeWith(pagination.asQuery()); }