The Unified and Autonomous Development Platform
feat: Add event type field to Webhook events (OD-2697)
Robin Shen32d91e85c7f8
diff --git a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.javaindex b4d1ec7b20..7d35674133 100644--- a/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/project/ProjectEvent.java@@ -1,21 +1,24 @@package io.onedev.server.event.project;+import java.io.Serializable;+import java.util.Date;+import java.util.Optional;++import org.jspecify.annotations.Nullable;++import com.fasterxml.jackson.annotation.JsonProperty;+import io.onedev.server.OneDev;-import io.onedev.server.service.ProjectService;-import io.onedev.server.service.UrlService;-import io.onedev.server.service.UserService;import io.onedev.server.event.Event;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.LastActivity;import io.onedev.server.notification.ActivityDetail;+import io.onedev.server.service.ProjectService;+import io.onedev.server.service.UrlService;+import io.onedev.server.service.UserService;import io.onedev.server.util.commenttext.CommentText;-import org.jspecify.annotations.Nullable;-import java.io.Serializable;-import java.util.Date;-import java.util.Optional;-public abstract class ProjectEvent extends Event implements Serializable {private static final long serialVersionUID = 1L;@@ -117,4 +120,9 @@ public abstract class ProjectEvent extends Event implements Serializable {return false;}+ @JsonProperty("type")+ public String getType() {+ return getClass().getSimpleName();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.javaindex 0e844d13c0..7e491c1263 100644--- a/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/project/build/BuildEvent.java@@ -3,17 +3,16 @@ package io.onedev.server.event.project.build;import java.util.Date;import org.eclipse.jgit.lib.ObjectId;+import org.jspecify.annotations.Nullable;import io.onedev.server.OneDev;-import io.onedev.server.service.BuildService;-import io.onedev.server.service.UrlService;import io.onedev.server.event.project.ProjectEvent;import io.onedev.server.model.Build;import io.onedev.server.model.User;-import io.onedev.server.util.ProjectScopedCommitAware;+import io.onedev.server.service.BuildService;+import io.onedev.server.service.UrlService;import io.onedev.server.util.ProjectScopedCommit;--import org.jspecify.annotations.Nullable;+import io.onedev.server.util.ProjectScopedCommitAware;public abstract class BuildEvent extends ProjectEvent implements ProjectScopedCommitAware {diff --git a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.javaindex fa0a2ad10b..0b073e7718 100644--- a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java@@ -43,9 +43,9 @@ public class WebHookManager {@Sessional@Listenpublic void on(ProjectEvent event) {- String jsonOfEvent;+ String eventJson;try {- jsonOfEvent = mapper.writeValueAsString(event);+ eventJson = mapper.writeValueAsString(event);} catch (JsonProcessingException e) {throw new RuntimeException(e);}@@ -57,7 +57,7 @@ public class WebHookManager {try (var client = HttpClients.createDefault()) {HttpPost httpPost = new HttpPost(webHook.getPostUrl());- StringEntity entity = new StringEntity(jsonOfEvent, UTF_8.name());+ StringEntity entity = new StringEntity(eventJson, UTF_8.name());httpPost.setEntity(entity);httpPost.setHeader(HttpHeaders.ACCEPT, APPLICATION_JSON);httpPost.setHeader(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON);