Skip to content

Commit 2f9098b

Browse files
bdgouldbdgould
committed
system hooks using @JsonProperty and @jsonformat 
1 parent d92a24e commit 2f9098b

10 files changed

+172
-1
lines changed

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/AbstractSystemHookEvent.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
package org.gitlab4j.api.systemhooks;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
45

56
public abstract class AbstractSystemHookEvent implements SystemHookEvent {
67
private static final long serialVersionUID = 1L;
78

9+
@JsonProperty("request_url")
810
private String requestUrl;
11+
12+
@JsonProperty("request_query_string")
913
private String requestQueryString;
14+
15+
@JsonProperty("request_secret_token")
1016
private String requestSecretToken;
1117

1218
@Override

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupMemberSystemHookEvent.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Date;
44

5+
import com.fasterxml.jackson.annotation.JsonFormat;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
57
import org.gitlab4j.models.utils.JacksonJson;
68

79
public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
@@ -10,16 +12,39 @@ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent {
1012
public static final String NEW_GROUP_MEMBER_EVENT = "user_add_to_group";
1113
public static final String GROUP_MEMBER_REMOVED_EVENT = "user_remove_from_group";
1214

15+
@JsonProperty("created_at")
16+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1317
private Date createdAt;
18+
19+
@JsonProperty("updated_at")
20+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1421
private Date updatedAt;
22+
23+
@JsonProperty("event_name")
1524
private String eventName;
25+
26+
@JsonProperty("group_access")
1627
private String groupAccess;
28+
29+
@JsonProperty("group_name")
1730
private String groupName;
31+
32+
@JsonProperty("group_path")
1833
private String groupPath;
34+
35+
@JsonProperty("group_id")
1936
private Long groupId;
37+
38+
@JsonProperty("user_email")
2039
private String userEmail;
40+
41+
@JsonProperty("user_name")
2142
private String userName;
43+
44+
@JsonProperty("user_username")
2245
private String userUsername;
46+
47+
@JsonProperty("user_id")
2348
private Long userId;
2449

2550
public Date getCreatedAt() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/GroupSystemHookEvent.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Date;
44

5+
import com.fasterxml.jackson.annotation.JsonFormat;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
57
import org.gitlab4j.models.utils.JacksonJson;
68

79
public class GroupSystemHookEvent extends AbstractSystemHookEvent {
@@ -11,16 +13,39 @@ public class GroupSystemHookEvent extends AbstractSystemHookEvent {
1113
public static final String GROUP_DESTROY_EVENT = "group_destroy";
1214
public static final String GROUP_RENAME_EVENT = "group_rename";
1315

16+
@JsonProperty("created_at")
17+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1418
private Date createdAt;
19+
20+
@JsonProperty("updated_at")
21+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1522
private Date updatedAt;
23+
24+
@JsonProperty("event_name")
1625
private String eventName;
26+
27+
@JsonProperty("name")
1728
private String name;
29+
30+
@JsonProperty("path")
1831
private String path;
32+
33+
@JsonProperty("full_path")
1934
private String fullPath;
35+
36+
@JsonProperty("group_id")
2037
private Long groupId;
38+
39+
@JsonProperty("owner_email")
2140
private String ownerEmail;
41+
42+
@JsonProperty("owner_name")
2243
private String ownerName;
44+
45+
@JsonProperty("old_path")
2346
private String oldPath;
47+
48+
@JsonProperty("old_full_path")
2449
private String oldFullPath;
2550

2651
public Date getCreatedAt() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/KeySystemHookEvent.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Date;
44

5+
import com.fasterxml.jackson.annotation.JsonFormat;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
57
import org.gitlab4j.models.utils.JacksonJson;
68

79
public class KeySystemHookEvent extends AbstractSystemHookEvent {
@@ -10,11 +12,24 @@ public class KeySystemHookEvent extends AbstractSystemHookEvent {
1012
public static final String KEY_CREATE_EVENT = "key_create";
1113
public static final String KEY_DESTROY_EVENT = "key_destroy";
1214

15+
@JsonProperty("created_at")
16+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1317
private Date createdAt;
18+
19+
@JsonProperty("updated_at")
20+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1421
private Date updatedAt;
22+
23+
@JsonProperty("event_name")
1524
private String eventName;
25+
26+
@JsonProperty("username")
1627
private String username;
28+
29+
@JsonProperty("key")
1730
private String key;
31+
32+
@JsonProperty("id")
1833
private Long id;
1934

2035
public Date getCreatedAt() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.gitlab4j.api.systemhooks;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
34
import org.gitlab4j.api.webhook.MergeRequestEvent;
45

56
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -10,7 +11,10 @@ public class MergeRequestSystemHookEvent extends MergeRequestEvent implements Sy
1011
public static final String X_GITLAB_EVENT = "System Hook";
1112
public static final String MERGE_REQUEST_EVENT = "merge_request";
1213

14+
@JsonProperty("event_type")
1315
private String eventType;
16+
17+
@JsonProperty("event_name")
1418
private String eventName;
1519

1620
@Override

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/ProjectSystemHookEvent.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Date;
44

5+
import com.fasterxml.jackson.annotation.JsonFormat;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
57
import org.gitlab4j.api.models.Visibility;
68
import org.gitlab4j.models.utils.JacksonJson;
79

@@ -14,16 +16,39 @@ public class ProjectSystemHookEvent extends AbstractSystemHookEvent {
1416
public static final String PROJECT_TRANSFER_EVENT = "project_transfer";
1517
public static final String PROJECT_UPDATE_EVENT = "project_update";
1618

19+
@JsonProperty("created_at")
20+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1721
private Date createdAt;
22+
23+
@JsonProperty("updated_at")
24+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1825
private Date updatedAt;
26+
27+
@JsonProperty("event_name")
1928
private String eventName;
29+
30+
@JsonProperty("name")
2031
private String name;
32+
33+
@JsonProperty("owner_email")
2134
private String ownerEmail;
35+
36+
@JsonProperty("owner_name")
2237
private String ownerName;
38+
39+
@JsonProperty("path")
2340
private String path;
41+
42+
@JsonProperty("project_id")
2443
private Long projectId;
44+
45+
@JsonProperty("path_with_namespace")
2546
private String pathWithNamespace;
47+
48+
@JsonProperty("project_visibility")
2649
private Visibility projectVisibility;
50+
51+
@JsonProperty("old_path_with_namespace")
2752
private String oldPathWithNamespace;
2853

2954
public Date getCreatedAt() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositoryChange.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
package org.gitlab4j.api.systemhooks;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
34
import org.gitlab4j.models.utils.JacksonJson;
45

56
public class RepositoryChange {
67

8+
@JsonProperty("after")
79
private String after;
10+
11+
@JsonProperty("before")
812
private String before;
13+
14+
@JsonProperty("ref")
915
private String ref;
1016

1117
public String getAfter() {

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/RepositorySystemHookEvent.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,39 @@
22

33
import java.util.List;
44

5+
import com.fasterxml.jackson.annotation.JsonProperty;
56
import org.gitlab4j.api.webhook.EventProject;
67
import org.gitlab4j.models.utils.JacksonJson;
78

89
public class RepositorySystemHookEvent extends AbstractSystemHookEvent {
910

1011
public static final String REPOSITORY_UPDATE_EVENT = "repository_update";
1112

13+
@JsonProperty("event_name")
1214
private String eventName;
15+
16+
@JsonProperty("user_id")
1317
private Long userId;
18+
19+
@JsonProperty("user_name")
1420
private String userName;
21+
22+
@JsonProperty("user_email")
1523
private String userEmail;
24+
25+
@JsonProperty("user_avatar")
1626
private String userAvatar;
1727

28+
@JsonProperty("project_id")
1829
private Long projectId;
30+
31+
@JsonProperty("project")
1932
private EventProject project;
2033

34+
@JsonProperty("changes")
2135
private List<RepositoryChange> changes;
36+
37+
@JsonProperty("refs")
2238
private List<String> refs;
2339

2440
@Override

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Date;
44

5+
import com.fasterxml.jackson.annotation.JsonFormat;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
57
import org.gitlab4j.api.models.Visibility;
68
import org.gitlab4j.models.utils.JacksonJson;
79

@@ -11,20 +13,46 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
1113
public static final String NEW_TEAM_MEMBER_EVENT = "user_add_to_team";
1214
public static final String TEAM_MEMBER_REMOVED_EVENT = "user_remove_from_team";
1315

16+
@JsonProperty("created_at")
17+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1418
private Date createdAt;
19+
20+
@JsonProperty("updated_at")
21+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1522
private Date updatedAt;
23+
24+
@JsonProperty("event_name")
1625
private String eventName;
26+
27+
@JsonProperty("access_level")
1728
private String accessLevel;
29+
30+
@JsonProperty("project_name")
1831
private String projectName;
32+
33+
@JsonProperty("project_path")
1934
private String projectPath;
35+
36+
@JsonProperty("project_id")
2037
private Long projectId;
38+
39+
@JsonProperty("project_path_with_namespace")
2140
private String projectPathWithNamespace;
41+
42+
@JsonProperty("user_email")
2243
private String userEmail;
44+
45+
@JsonProperty("user_name")
2346
private String userName;
47+
48+
@JsonProperty("user_username")
2449
private String userUsername;
50+
51+
@JsonProperty("user_id")
2552
private Long userId;
26-
private Visibility projectVisibility;
2753

54+
@JsonProperty("project_visibility")
55+
private Visibility projectVisibility;
2856
public Date getCreatedAt() {
2957
return createdAt;
3058
}

‎gitlab4j-models/src/main/java/org/gitlab4j/api/systemhooks/UserSystemHookEvent.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Date;
44

5+
import com.fasterxml.jackson.annotation.JsonFormat;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
57
import org.gitlab4j.models.utils.JacksonJson;
68

79
public class UserSystemHookEvent extends AbstractSystemHookEvent {
@@ -12,14 +14,33 @@ public class UserSystemHookEvent extends AbstractSystemHookEvent {
1214
public static final String USER_RENAME_EVENT = "user_rename";
1315
public static final String USER_FAILED_LOGIN_EVENT = "user_failed_login";
1416

17+
@JsonProperty("event_name")
1518
private String eventName;
19+
20+
@JsonProperty("created_at")
21+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1622
private Date createdAt;
23+
24+
@JsonProperty("updated_at")
25+
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssXXX")
1726
private Date updatedAt;
27+
28+
@JsonProperty("email")
1829
private String email;
30+
31+
@JsonProperty("name")
1932
private String name;
33+
34+
@JsonProperty("username")
2035
private String username;
36+
37+
@JsonProperty("user_id")
2138
private Long userId;
39+
40+
@JsonProperty("old_username")
2241
private String oldUsername;
42+
43+
@JsonProperty("state")
2344
private String state;
2445

2546
@Override

0 commit comments

Comments
 (0)