Skip to content

Commit d53f2d3

Browse files
nodozegmessner
nodoze
authored and
gmessner
committed
Add repository and project to the MergeRequestEvent (#207)
1 parent 3a9d02f commit d53f2d3

File tree

2 files changed

+110
-70
lines changed

2 files changed

+110
-70
lines changed

‎src/main/java/org/gitlab4j/api/webhook/MergeRequestEvent.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ public class MergeRequestEvent implements Event {
1212
public static final String OBJECT_KIND = "merge_request";
1313

1414
private User user;
15+
private EventProject project;
1516
private ObjectAttributes objectAttributes;
17+
private EventRepository repository;
1618

1719
public String getObjectKind() {
1820
return (OBJECT_KIND);
@@ -31,6 +33,14 @@ public void setUser(User user) {
3133
this.user = user;
3234
}
3335

36+
public EventProject getProject() {
37+
return project;
38+
}
39+
40+
public void setProject(EventProject project) {
41+
this.project = project;
42+
}
43+
3444
public ObjectAttributes getObjectAttributes() {
3545
return this.objectAttributes;
3646
}
@@ -39,6 +49,14 @@ public void setObjectAttributes(ObjectAttributes objectAttributes) {
3949
this.objectAttributes = objectAttributes;
4050
}
4151

52+
public EventRepository getRepository() {
53+
return repository;
54+
}
55+
56+
public void setRepository(EventRepository repository) {
57+
this.repository = repository;
58+
}
59+
4260
@XmlAccessorType(XmlAccessType.FIELD)
4361
public static class ObjectAttributes extends EventMergeRequest {
4462
}

‎src/test/resources/org/gitlab4j/api/merge-request-event.json‎

Lines changed: 92 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,94 @@
11
{
2-
"object_kind": "merge_request",
3-
"user": {
4-
"name": "Administrator",
5-
"username": "root",
6-
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
7-
},
8-
"object_attributes": {
9-
"id": 99,
10-
"target_branch": "master",
11-
"source_branch": "ms-viewport",
12-
"source_project_id": 14,
13-
"author_id": 51,
14-
"assignee_id": 6,
15-
"title": "MS-Viewport",
16-
"created_at": "2013-12-03T17:23:34Z",
17-
"updated_at": "2013-12-03T17:23:34Z",
18-
"state": "opened",
19-
"merge_status": "unchecked",
20-
"target_project_id": 14,
21-
"iid": 1,
22-
"description": "",
23-
"source":{
24-
"name":"Awesome Project",
25-
"description":"Aut reprehenderit ut est.",
26-
"web_url":"http://example.com/awesome_space/awesome_project",
27-
"git_ssh_url":"[email protected]:awesome_space/awesome_project.git",
28-
"git_http_url":"http://example.com/awesome_space/awesome_project.git",
29-
"namespace":"Awesome Space",
30-
"visibility_level":20,
31-
"path_with_namespace":"awesome_space/awesome_project",
32-
"default_branch":"master",
33-
"homepage":"http://example.com/awesome_space/awesome_project",
34-
"url":"http://example.com/awesome_space/awesome_project.git",
35-
"ssh_url":"[email protected]:awesome_space/awesome_project.git",
36-
"http_url":"http://example.com/awesome_space/awesome_project.git"
37-
},
38-
"target": {
39-
"name":"Awesome Project",
40-
"description":"Aut reprehenderit ut est.",
41-
"web_url":"http://example.com/awesome_space/awesome_project",
42-
"git_ssh_url":"[email protected]:awesome_space/awesome_project.git",
43-
"git_http_url":"http://example.com/awesome_space/awesome_project.git",
44-
"namespace":"Awesome Space",
45-
"visibility_level":20,
46-
"path_with_namespace":"awesome_space/awesome_project",
47-
"default_branch":"master",
48-
"homepage":"http://example.com/awesome_space/awesome_project",
49-
"url":"http://example.com/awesome_space/awesome_project.git",
50-
"ssh_url":"[email protected]:awesome_space/awesome_project.git",
51-
"http_url":"http://example.com/awesome_space/awesome_project.git"
52-
},
53-
"last_commit": {
54-
"id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
55-
"message": "fixed readme",
56-
"timestamp": "2012-01-03T23:36:29Z",
57-
"url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
58-
"author": {
59-
"name": "GitLab dev user",
60-
"email": "gitlabdev@dv6700.(none)"
61-
}
62-
},
63-
"work_in_progress": false,
64-
"url": "http://example.com/diaspora/merge_requests/1",
65-
"action": "open",
66-
"assignee": {
67-
"name": "User1",
68-
"username": "user1",
69-
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
70-
}
71-
}
2+
"object_kind": "merge_request",
3+
"user": {
4+
"name": "Administrator",
5+
"username": "root",
6+
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
7+
},
8+
"project": {
9+
"name": "awesome_project",
10+
"description": "",
11+
"web_url": "http://example.com/awesome_space/awesome_project",
12+
"avatar_url": null,
13+
"git_ssh_url": "[email protected]:awesome_space/awesome_project.git",
14+
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
15+
"namespace": "awesome_space",
16+
"visibility_level": 20,
17+
"path_with_namespace": "awesome_space/awesome_project",
18+
"default_branch": "master",
19+
"homepage": "http://example.com/awesome_space/awesome_project",
20+
"url": "[email protected]:awesome_space/awesome_project.git",
21+
"ssh_url": "[email protected]:awesome_space/awesome_project.git",
22+
"http_url": "http://example.com/awesome_space/awesome_project.git"
23+
},
24+
"object_attributes": {
25+
"id": 99,
26+
"target_branch": "master",
27+
"source_branch": "ms-viewport",
28+
"source_project_id": 14,
29+
"author_id": 51,
30+
"assignee_id": 6,
31+
"title": "MS-Viewport",
32+
"created_at": "2013-12-03T17:23:34Z",
33+
"updated_at": "2013-12-03T17:23:34Z",
34+
"state": "opened",
35+
"merge_status": "unchecked",
36+
"target_project_id": 14,
37+
"iid": 1,
38+
"description": "",
39+
"source": {
40+
"name": "Awesome Project",
41+
"description": "Aut reprehenderit ut est.",
42+
"web_url": "http://example.com/awesome_space/awesome_project",
43+
"git_ssh_url": "[email protected]:awesome_space/awesome_project.git",
44+
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
45+
"namespace": "Awesome Space",
46+
"visibility_level": 20,
47+
"path_with_namespace": "awesome_space/awesome_project",
48+
"default_branch": "master",
49+
"homepage": "http://example.com/awesome_space/awesome_project",
50+
"url": "http://example.com/awesome_space/awesome_project.git",
51+
"ssh_url": "[email protected]:awesome_space/awesome_project.git",
52+
"http_url": "http://example.com/awesome_space/awesome_project.git"
53+
},
54+
"target": {
55+
"name": "Awesome Project",
56+
"description": "Aut reprehenderit ut est.",
57+
"web_url": "http://example.com/awesome_space/awesome_project",
58+
"git_ssh_url": "[email protected]:awesome_space/awesome_project.git",
59+
"git_http_url": "http://example.com/awesome_space/awesome_project.git",
60+
"namespace": "Awesome Space",
61+
"visibility_level": 20,
62+
"path_with_namespace": "awesome_space/awesome_project",
63+
"default_branch": "master",
64+
"homepage": "http://example.com/awesome_space/awesome_project",
65+
"url": "http://example.com/awesome_space/awesome_project.git",
66+
"ssh_url": "[email protected]:awesome_space/awesome_project.git",
67+
"http_url": "http://example.com/awesome_space/awesome_project.git"
68+
},
69+
"last_commit": {
70+
"id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
71+
"message": "fixed readme",
72+
"timestamp": "2012-01-03T23:36:29Z",
73+
"url": "http://example.com/awesome_space/awesome_project/commits/da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
74+
"author": {
75+
"name": "GitLab dev user",
76+
"email": "gitlabdev@dv6700.(none)"
77+
}
78+
},
79+
"work_in_progress": false,
80+
"url": "http://example.com/diaspora/merge_requests/1",
81+
"action": "open",
82+
"assignee": {
83+
"name": "User1",
84+
"username": "user1",
85+
"avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
86+
}
87+
},
88+
"repository": {
89+
"name": "awesome_project",
90+
"url": "[email protected]:awesome_space/awesome_project.git",
91+
"description": "",
92+
"homepage": "http://example.com/awesome_space/awesome_project"
93+
}
7294
}

0 commit comments

Comments
 (0)