From a7de94cf12a2807f2604abad1aee8ae894a84792 Mon Sep 17 00:00:00 2001
From: Ganesh Datta <gsdatta@users.noreply.github.com>
Date: Sat, 25 Apr 2020 07:36:02 -0700
Subject: [PATCH] Update commit API to be conformant to spec (#556)

---
 src/main/java/org/gitlab4j/api/models/Commit.java |  9 +++++++++
 src/test/resources/org/gitlab4j/api/commit.json   |  4 +++-
 src/test/resources/org/gitlab4j/api/event.json    | 15 ++++++++++++---
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gitlab4j/api/models/Commit.java b/src/main/java/org/gitlab4j/api/models/Commit.java
index 8a6a0de7..8a1b41d2 100644
--- a/src/main/java/org/gitlab4j/api/models/Commit.java
+++ b/src/main/java/org/gitlab4j/api/models/Commit.java
@@ -25,6 +25,7 @@ public class Commit {
     private Date timestamp;
     private String title;
     private String url;
+    private String webUrl;
     private Pipeline lastPipeline;
 
     public Author getAuthor() {
@@ -163,6 +164,14 @@ public class Commit {
         this.url = url;
     }
 
+    public String getwebUrl() {
+        return webUrl;
+    }
+
+    public void setwebUrl(String webUrl) {
+        this.webUrl = webUrl;
+    }
+
     public Pipeline getLastPipeline() {
 	return lastPipeline;
     }
diff --git a/src/test/resources/org/gitlab4j/api/commit.json b/src/test/resources/org/gitlab4j/api/commit.json
index beb3c477..9f99984b 100644
--- a/src/test/resources/org/gitlab4j/api/commit.json
+++ b/src/test/resources/org/gitlab4j/api/commit.json
@@ -18,5 +18,7 @@
     "deletions": 10,
     "total": 25
   },
-  "status": "running"
+  "status": "running",
+  "url": "http://localhost/diaspora/diaspora-project-site/-/commit/9df4dd1f0dfae80c05eac4b2bd461b86db5c8e2d",
+  "web_url": "http://localhost/diaspora/diaspora-project-site/-/commit/9df4dd1f0dfae80c05eac4b2bd461b86db5c8e2d"
 }
diff --git a/src/test/resources/org/gitlab4j/api/event.json b/src/test/resources/org/gitlab4j/api/event.json
index 2a62af80..558e4904 100644
--- a/src/test/resources/org/gitlab4j/api/event.json
+++ b/src/test/resources/org/gitlab4j/api/event.json
@@ -1,9 +1,9 @@
 {
     "title": "this is a title",
     "project_id": 15,
-    "action_name": "opened",
+    "action_name": "pushed",
     "target_id": 830,
-    "target_type": "Issue",
+    "target_type": "MergeRequest",
     "author_id": 1,
     "author": {
       "name": "Dmitriy Zaporozhets",
@@ -40,5 +40,14 @@
       ],
       "total_commits_count": 1
     },
-    "target_title": "target title"
+    "push_data": {
+      "commit_count": 1,
+      "action": "pushed",
+      "ref_type": "branch",
+      "commit_from": "50d4420237a9de7be1304607147aec22e4a14af7",
+      "commit_to": "c5feabde2d8cd023215af4d2ceeb7a64839fc428",
+      "ref": "master",
+      "commit_title": "Add simple search to projects in public area"
+    },
+  "target_title": "target title"
 }
\ No newline at end of file
-- 
GitLab