Skip to content
GitLab
Commit d53f2d32 authored by nodoze's avatar nodoze Committed by Greg Messner
Browse files

Add repository and project to the MergeRequestEvent (#207)

parent 3a9d02fc
Hide whitespace changes
Inline Side-by-side
src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java
View file @ d53f2d32
...@@ -12,7 +12,9 @@ public class MergeRequestEvent implements Event { ...@@ -12,7 +12,9 @@ public class MergeRequestEvent implements Event {
public static final String OBJECT_KIND = "merge_request"; public static final String OBJECT_KIND = "merge_request";
private User user; private User user;
private EventProject project;
private ObjectAttributes objectAttributes; private ObjectAttributes objectAttributes;
private EventRepository repository;
public String getObjectKind() { public String getObjectKind() {
return (OBJECT_KIND); return (OBJECT_KIND);
...@@ -31,6 +33,14 @@ public class MergeRequestEvent implements Event { ...@@ -31,6 +33,14 @@ public class MergeRequestEvent implements Event {
this.user = user; this.user = user;
} }
public EventProject getProject() {
return project;
}
public void setProject(EventProject project) {
this.project = project;
}
public ObjectAttributes getObjectAttributes() { public ObjectAttributes getObjectAttributes() {
return this.objectAttributes; return this.objectAttributes;
} }
...@@ -39,6 +49,14 @@ public class MergeRequestEvent implements Event { ...@@ -39,6 +49,14 @@ public class MergeRequestEvent implements Event {
this.objectAttributes = objectAttributes; this.objectAttributes = objectAttributes;
} }
public EventRepository getRepository() {
return repository;
}
public void setRepository(EventRepository repository) {
this.repository = repository;
}
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public static class ObjectAttributes extends EventMergeRequest { public static class ObjectAttributes extends EventMergeRequest {
} }
......
src/test/resources/org/gitlab4j/api/merge-request-event.json
View file @ d53f2d32
{ {
"object_kind": "merge_request", "object_kind": "merge_request",
"user": { "user": {
"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"
}, },
"object_attributes": { "project": {
"id": 99, "name": "awesome_project",
"target_branch": "master", "description": "",
"source_branch": "ms-viewport", "web_url": "http://example.com/awesome_space/awesome_project",
"source_project_id": 14, "avatar_url": null,
"author_id": 51, "git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
"assignee_id": 6, "git_http_url": "http://example.com/awesome_space/awesome_project.git",
"title": "MS-Viewport", "namespace": "awesome_space",
"created_at": "2013-12-03T17:23:34Z", "visibility_level": 20,
"updated_at": "2013-12-03T17:23:34Z", "path_with_namespace": "awesome_space/awesome_project",
"state": "opened", "default_branch": "master",
"merge_status": "unchecked", "homepage": "http://example.com/awesome_space/awesome_project",
"target_project_id": 14, "url": "git@example.com:awesome_space/awesome_project.git",
"iid": 1, "ssh_url": "git@example.com:awesome_space/awesome_project.git",
"description": "", "http_url": "http://example.com/awesome_space/awesome_project.git"
"source":{ },
"name":"Awesome Project", "object_attributes": {
"description":"Aut reprehenderit ut est.", "id": 99,
"web_url":"http://example.com/awesome_space/awesome_project", "target_branch": "master",
"git_ssh_url":"git@example.com:awesome_space/awesome_project.git", "source_branch": "ms-viewport",
"git_http_url":"http://example.com/awesome_space/awesome_project.git", "source_project_id": 14,
"namespace":"Awesome Space", "author_id": 51,
"visibility_level":20, "assignee_id": 6,
"path_with_namespace":"awesome_space/awesome_project", "title": "MS-Viewport",
"default_branch":"master", "created_at": "2013-12-03T17:23:34Z",
"homepage":"http://example.com/awesome_space/awesome_project", "updated_at": "2013-12-03T17:23:34Z",
"url":"http://example.com/awesome_space/awesome_project.git", "state": "opened",
"ssh_url":"git@example.com:awesome_space/awesome_project.git", "merge_status": "unchecked",
"http_url":"http://example.com/awesome_space/awesome_project.git" "target_project_id": 14,
}, "iid": 1,
"target": { "description": "",
"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", "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": { },
"id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "target": {
"message": "fixed readme", "name": "Awesome Project",
"timestamp": "2012-01-03T23:36:29Z", "description": "Aut reprehenderit ut est.",
"url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7", "web_url": "http://example.com/awesome_space/awesome_project",
"author": { "git_ssh_url": "git@example.com:awesome_space/awesome_project.git",
"name": "GitLab dev user", "git_http_url": "http://example.com/awesome_space/awesome_project.git",
"email": "gitlabdev@dv6700.(none)" "namespace": "Awesome Space",
} "visibility_level": 20,
}, "path_with_namespace": "awesome_space/awesome_project",
"work_in_progress": false, "default_branch": "master",
"url": "http://example.com/diaspora/merge_requests/1", "homepage": "http://example.com/awesome_space/awesome_project",
"action": "open", "url": "http://example.com/awesome_space/awesome_project.git",
"assignee": { "ssh_url": "git@example.com:awesome_space/awesome_project.git",
"name": "User1", "http_url": "http://example.com/awesome_space/awesome_project.git"
"username": "user1", },
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon" "last_commit": {
} "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
} "message": "fixed readme",
"timestamp": "2012-01-03T23:36:29Z",
"url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
"author": {
"name": "GitLab dev user",
"email": "gitlabdev@dv6700.(none)"
}
},
"work_in_progress": false,
"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"
}
},
"repository": {
"name": "awesome_project",
"url": "git@example.com:awesome_space/awesome_project.git",
"description": "",
"homepage": "http://example.com/awesome_space/awesome_project"
}
} }
\ 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