From 5487b3d3eb97369a232d85a05234d6b651762615 Mon Sep 17 00:00:00 2001 From: Adam Snyder Date: Mon, 22 Jan 2018 10:37:31 -0800 Subject: [PATCH] Support New "Job Hook" Hook Renaming (#131) * fix #130 support new hook name * rename BuildEvent consts to be more descriptive --- src/main/java/org/gitlab4j/api/webhook/BuildEvent.java | 5 ++++- src/main/java/org/gitlab4j/api/webhook/WebHookManager.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java b/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java index f83a0022..5bb94515 100644 --- a/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java +++ b/src/main/java/org/gitlab4j/api/webhook/BuildEvent.java @@ -10,7 +10,10 @@ import org.gitlab4j.api.models.User; @XmlAccessorType(XmlAccessType.FIELD) public class BuildEvent implements Event { - public static final String X_GITLAB_EVENT = "Build Hook"; + /** X-Gitlab-Event header value pre GitLab v9.3.0 */ + public static final String BUILD_HOOK_X_GITLAB_EVENT = "Build Hook"; + /** X-Gitlab-Event header value post GitLab v9.3.0 */ + public static final String JOB_HOOK_X_GITLAB_EVENT = "Job Hook"; public static final String OBJECT_KIND = "build"; private String ref; diff --git a/src/main/java/org/gitlab4j/api/webhook/WebHookManager.java b/src/main/java/org/gitlab4j/api/webhook/WebHookManager.java index 0f67aa2c..bd855577 100644 --- a/src/main/java/org/gitlab4j/api/webhook/WebHookManager.java +++ b/src/main/java/org/gitlab4j/api/webhook/WebHookManager.java @@ -61,7 +61,8 @@ public class WebHookManager extends HookManager { LOG.info("handleEvent: X-Gitlab-Event=" + eventName); switch (eventName) { - case BuildEvent.X_GITLAB_EVENT: + case BuildEvent.BUILD_HOOK_X_GITLAB_EVENT: + case BuildEvent.JOB_HOOK_X_GITLAB_EVENT: case IssueEvent.X_GITLAB_EVENT: case MergeRequestEvent.X_GITLAB_EVENT: case NoteEvent.X_GITLAB_EVENT: -- GitLab