From 74d939480966b818bf882b98686ee4956f7fece2 Mon Sep 17 00:00:00 2001
From: Greg Messner <greg@messners.com>
Date: Wed, 17 Apr 2019 15:47:20 -0700
Subject: [PATCH] Added event_type property.
---
.../api/systemhooks/MergeRequestSystemHookEvent.java | 10 ++++++++++
.../gitlab4j/api/merge-request-system-hook-event.json | 1 +
2 files changed, 11 insertions(+)
diff --git a/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java b/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java
index 4f03966c..fdee2a44 100644
--- a/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java
+++ b/src/main/java/org/gitlab4j/api/systemhooks/MergeRequestSystemHookEvent.java
@@ -7,6 +7,8 @@ public class MergeRequestSystemHookEvent extends MergeRequestEvent implements Sy
public static final String X_GITLAB_EVENT = "System Hook";
public static final String MERGE_REQUEST_EVENT = "merge_request";
+ private String eventType;
+
@Override
public String getObjectKind() {
return (MERGE_REQUEST_EVENT);
@@ -16,4 +18,12 @@ public class MergeRequestSystemHookEvent extends MergeRequestEvent implements Sy
public String getEventName() {
return (MERGE_REQUEST_EVENT);
}
+
+ public String getEventType() {
+ return eventType;
+ }
+
+ public void setEvent_type(String eventType) {
+ this.eventType = eventType;
+ }
}
diff --git a/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json b/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json
index d9fb5e04..8b3d8f57 100644
--- a/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json
+++ b/src/test/resources/org/gitlab4j/api/merge-request-system-hook-event.json
@@ -1,5 +1,6 @@
{
"object_kind": "merge_request",
+ "event_type": "merge_request",
"event_name": "merge_request",
"user": {
"name": "Administrator",
--
GitLab