Skip to content
GitLab
Unverified Commit dc0f9f25 authored by Michael Fitoussi's avatar Michael Fitoussi Committed by GitHub
Browse files

add reviewers related fields to MergeRequestEvent webhook event (#916) 



Co-authored-by: default avatarJeremie Bresson <jeremie.bresson@unblu.com>
parent 1e112a56
Hide whitespace changes
Inline Side-by-side
src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java
View file @ dc0f9f25
...@@ -60,6 +60,7 @@ public class EventMergeRequest { ...@@ -60,6 +60,7 @@ public class EventMergeRequest {
private Integer timeEstimate; private Integer timeEstimate;
private Duration humanTimeEstimate; private Duration humanTimeEstimate;
private List<Long> assigneeIds; private List<Long> assigneeIds;
private List<Long> reviewerIds;
public Long getAssigneeId() { public Long getAssigneeId() {
return this.assigneeId; return this.assigneeId;
...@@ -437,6 +438,14 @@ public class EventMergeRequest { ...@@ -437,6 +438,14 @@ public class EventMergeRequest {
this.assigneeIds = assigneeIds; this.assigneeIds = assigneeIds;
} }
public List<Long> getReviewerIds() {
return reviewerIds;
}
public void setReviewerIds(List<Long> reviewerIds) {
this.reviewerIds = reviewerIds;
}
@Override @Override
public String toString() { public String toString() {
return (JacksonJson.toJsonString(this)); return (JacksonJson.toJsonString(this));
......
src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java
View file @ dc0f9f25
...@@ -3,6 +3,7 @@ package org.gitlab4j.api.webhook; ...@@ -3,6 +3,7 @@ package org.gitlab4j.api.webhook;
import java.util.List; import java.util.List;
import org.gitlab4j.api.models.Assignee; import org.gitlab4j.api.models.Assignee;
import org.gitlab4j.api.models.Reviewer;
import org.gitlab4j.api.models.User; import org.gitlab4j.api.models.User;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
...@@ -18,6 +19,7 @@ public class MergeRequestEvent extends AbstractEvent { ...@@ -18,6 +19,7 @@ public class MergeRequestEvent extends AbstractEvent {
private List<EventLabel> labels; private List<EventLabel> labels;
private MergeRequestChanges changes; private MergeRequestChanges changes;
private List<Assignee> assignees; private List<Assignee> assignees;
private List<Reviewer> reviewers;
public String getObjectKind() { public String getObjectKind() {
return (OBJECT_KIND); return (OBJECT_KIND);
...@@ -84,6 +86,14 @@ public class MergeRequestEvent extends AbstractEvent { ...@@ -84,6 +86,14 @@ public class MergeRequestEvent extends AbstractEvent {
this.assignees = assignees; this.assignees = assignees;
} }
public List<Reviewer> getReviewers() {
return reviewers;
}
public void setReviewers(List<Reviewer> reviewers) {
this.reviewers = reviewers;
}
public static class ObjectAttributes extends EventMergeRequest { public static class ObjectAttributes extends EventMergeRequest {
} }
......
src/test/resources/org/gitlab4j/api/merge-request-event.json
View file @ dc0f9f25
{ {
"object_kind": "merge_request", "object_kind": "merge_request",
"user": { "user": {
"id": 1,
"name": "Administrator", "name": "Administrator",
"username": "root", "username": "root",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon" "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
"email": "admin@example.com"
}, },
"project": { "project": {
"name": "awesome_project", "id": 1,
"description": "", "name": "Gitlab Test",
"web_url": "http://example.com/awesome_space/awesome_project", "description": "Aut reprehenderit ut est.",
"git_ssh_url": "git@example.com:awesome_space/awesome_project.git", "web_url": "http://example.com/gitlabhq/gitlab-test",
"git_http_url": "http://example.com/awesome_space/awesome_project.git", "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
"namespace": "awesome_space", "git_ssh_url": "git@example.com:gitlabhq/gitlab-test.git",
"git_http_url": "http://example.com/gitlabhq/gitlab-test.git",
"namespace": "GitlabHQ",
"visibility_level": 20, "visibility_level": 20,
"path_with_namespace": "awesome_space/awesome_project", "path_with_namespace": "gitlabhq/gitlab-test",
"default_branch": "master", "default_branch": "master",
"homepage": "http://example.com/awesome_space/awesome_project", "homepage": "http://example.com/gitlabhq/gitlab-test",
"url": "git@example.com:awesome_space/awesome_project.git", "url": "http://example.com/gitlabhq/gitlab-test.git",
"ssh_url": "git@example.com:awesome_space/awesome_project.git", "ssh_url": "git@example.com:gitlabhq/gitlab-test.git",
"http_url": "http://example.com/awesome_space/awesome_project.git" "http_url": "http://example.com/gitlabhq/gitlab-test.git"
}, },
"repository": { "repository": {
"name": "awesome_project", "name": "Gitlab Test",
"url": "git@example.com:awesome_space/awesome_project.git", "url": "http://example.com/gitlabhq/gitlab-test.git",
"description": "", "description": "Aut reprehenderit ut est.",
"homepage": "http://example.com/awesome_space/awesome_project" "homepage": "http://example.com/gitlabhq/gitlab-test"
}, },
"object_attributes": { "object_attributes": {
"id": 99, "id": 99,
"iid": 1,
"target_branch": "master", "target_branch": "master",
"source_branch": "ms-viewport", "source_branch": "ms-viewport",
"source_project_id": 14, "source_project_id": 14,
"author_id": 51, "author_id": 51,
"assignee_ids": [
6
],
"assignee_id": 6, "assignee_id": 6,
"reviewer_ids": [
6
],
"title": "MS-Viewport", "title": "MS-Viewport",
"created_at": "2013-12-03T17:23:34Z", "created_at": "2013-12-03T17:23:34Z",
"updated_at": "2013-12-03T17:23:34Z", "updated_at": "2013-12-03T17:23:34Z",
"state": "opened", "state": "opened",
"work_in_progress": false,
"merge_status": "unchecked", "merge_status": "unchecked",
"target_project_id": 14, "target_project_id": 14,
"iid": 1,
"merge_commit_sha": "5f72688f7af57df23ee7510cec59b909289964f1",
"description": "", "description": "",
"source":{ "url": "http://example.com/diaspora/merge_requests/1",
"name":"Awesome Project", "source": {
"description":"Aut reprehenderit ut est.", "name": "Awesome Project",
"web_url":"http://example.com/awesome_space/awesome_project", "description": "Aut reprehenderit ut est.",
"git_ssh_url":"git@example.com:awesome_space/awesome_project.git", "web_url": "http://example.com/awesome_space/awesome_project",
"git_http_url":"http://example.com/awesome_space/awesome_project.git", "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
"namespace":"Awesome Space", "git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
"visibility_level":20, "git_http_url": "http://example.com/awesome_space/awesome_project.git",
"path_with_namespace":"awesome_space/awesome_project", "namespace": "Awesome Space",
"default_branch":"master", "visibility_level": 20,
"homepage":"http://example.com/awesome_space/awesome_project", "path_with_namespace": "awesome_space/awesome_project",
"url":"http://example.com/awesome_space/awesome_project.git", "default_branch": "master",
"ssh_url":"git@example.com:awesome_space/awesome_project.git", "homepage": "http://example.com/awesome_space/awesome_project",
"http_url":"http://example.com/awesome_space/awesome_project.git" "url": "http://example.com/awesome_space/awesome_project.git",
"ssh_url": "git@example.com:awesome_space/awesome_project.git",
"http_url": "http://example.com/awesome_space/awesome_project.git"
}, },
"target": { "target": {
"name":"Awesome Project", "name": "Awesome Project",
"description":"Aut reprehenderit ut est.", "description": "Aut reprehenderit ut est.",
"web_url":"http://example.com/awesome_space/awesome_project", "web_url": "http://example.com/awesome_space/awesome_project",
"git_ssh_url":"git@example.com:awesome_space/awesome_project.git", "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon",
"git_http_url":"http://example.com/awesome_space/awesome_project.git", "git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
"namespace":"Awesome Space", "git_http_url": "http://example.com/awesome_space/awesome_project.git",
"visibility_level":20, "namespace": "Awesome Space",
"path_with_namespace":"awesome_space/awesome_project", "visibility_level": 20,
"default_branch":"master", "path_with_namespace": "awesome_space/awesome_project",
"homepage":"http://example.com/awesome_space/awesome_project", "default_branch": "master",
"url":"http://example.com/awesome_space/awesome_project.git", "homepage": "http://example.com/awesome_space/awesome_project",
"ssh_url":"git@example.com:awesome_space/awesome_project.git", "url": "http://example.com/awesome_space/awesome_project.git",
"http_url":"http://example.com/awesome_space/awesome_project.git" "ssh_url": "git@example.com:awesome_space/awesome_project.git",
"http_url": "http://example.com/awesome_space/awesome_project.git"
}, },
"last_commit": { "last_commit": {
"id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
...@@ -82,32 +95,28 @@ ...@@ -82,32 +95,28 @@
"email": "gitlabdev@dv6700.(none)" "email": "gitlabdev@dv6700.(none)"
} }
}, },
"work_in_progress": false, "action": "open"
"url": "http://example.com/diaspora/merge_requests/1",
"action": "open",
"assignee": {
"name": "User1",
"username": "user1",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
}
}, },
"labels": [{ "labels": [
"id": 206, {
"title": "API", "id": 206,
"color": "#ffffff", "title": "API",
"project_id": 14, "color": "#ffffff",
"created_at": "2013-12-03T17:15:43Z", "project_id": 14,
"updated_at": "2013-12-03T17:15:43Z", "created_at": "2013-12-03T17:15:43Z",
"template": false, "updated_at": "2013-12-03T17:15:43Z",
"description": "API related issues", "template": false,
"type": "ProjectLabel", "description": "API related issues",
"group_id": 41 "type": "ProjectLabel",
}], "group_id": 41
}
],
"changes": { "changes": {
"author_id": { "author_id": {
"current":2 "current":2
}, },
"updated_at": { "updated_at": {
"previous": "2013-09-15T16:50:55Z",
"current": "2013-12-03T17:23:34Z" "current": "2013-12-03T17:23:34Z"
}, },
"updated_by_id": { "updated_by_id": {
...@@ -155,5 +164,21 @@ ...@@ -155,5 +164,21 @@
"group_id": 41 "group_id": 41
}] }]
} }
} },
"assignees": [
{
"id": 6,
"name": "User1",
"username": "user1",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
}
],
"reviewers": [
{
"id": 6,
"name": "User1",
"username": "user1",
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
}
]
} }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment