From b6a035fe302ecb7fef2d1096749d07daeff2c453 Mon Sep 17 00:00:00 2001 From: lesiak Date: Mon, 25 Mar 2019 16:40:55 +0100 Subject: [PATCH 1/2] Added EventMergeRequest.mergeCommitSha field (#323) --- .../java/org/gitlab4j/api/webhook/EventMergeRequest.java | 9 +++++++++ .../resources/org/gitlab4j/api/merge-request-event.json | 1 + 2 files changed, 10 insertions(+) diff --git a/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java b/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java index 4332b4b07..ecb997483 100644 --- a/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java +++ b/src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java @@ -18,6 +18,7 @@ public class EventMergeRequest { private String description; private Integer id; private Integer iid; + private String mergeCommitSha; private String mergeStatus; private Integer milestoneId; private Integer position; @@ -97,6 +98,14 @@ public void setIid(Integer iid) { this.iid = iid; } + public String getMergeCommitSha() { + return mergeCommitSha; + } + + public void setMergeCommitSha(String mergeCommitSha) { + this.mergeCommitSha = mergeCommitSha; + } + public String getMergeStatus() { return this.mergeStatus; } diff --git a/src/test/resources/org/gitlab4j/api/merge-request-event.json b/src/test/resources/org/gitlab4j/api/merge-request-event.json index a76594680..35d970b47 100644 --- a/src/test/resources/org/gitlab4j/api/merge-request-event.json +++ b/src/test/resources/org/gitlab4j/api/merge-request-event.json @@ -40,6 +40,7 @@ "merge_status": "unchecked", "target_project_id": 14, "iid": 1, + "merge_commit_sha": "5f72688f7af57df23ee7510cec59b909289964f1", "description": "", "source":{ "name":"Awesome Project", From 0e2231f6a7c24de87230d81df501788e04bdb299 Mon Sep 17 00:00:00 2001 From: lesiak Date: Mon, 25 Mar 2019 16:50:56 +0100 Subject: [PATCH 2/2] Optimized imports in WebHookListener --- src/main/java/org/gitlab4j/api/webhook/WebHookListener.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/gitlab4j/api/webhook/WebHookListener.java b/src/main/java/org/gitlab4j/api/webhook/WebHookListener.java index dd888fbc4..2ea990dbf 100644 --- a/src/main/java/org/gitlab4j/api/webhook/WebHookListener.java +++ b/src/main/java/org/gitlab4j/api/webhook/WebHookListener.java @@ -1,10 +1,6 @@ package org.gitlab4j.api.webhook; -import org.gitlab4j.api.webhook.IssueEvent; -import org.gitlab4j.api.webhook.MergeRequestEvent; -import org.gitlab4j.api.webhook.PushEvent; - /** * This interface defines an event listener for the event fired when * a WebHook notification has been received from a GitLab server.