[ISSUE #4243] Optimize Webhook Manufacturer source Hard-coding (#4273)

* feat: Add manufacturerDomain field and its setter * chore: fix hard-coding in WebHookProcessor * feat: Remove redundant cloudEventSource field which shouldn't belong to WebHookConfig
apache · Jul 27, 2023 · 3652000 · 3652000
1 parent e5915f7
commit 3652000
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/...main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/WebHookProcessor.java b/...main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/WebHookProcessor.java
@@ -19,6 +19,7 @@
 
 import org.apache.eventmesh.runtime.common.EventMeshTrace;
 import org.apache.eventmesh.runtime.util.HttpResponseUtils;
+import org.apache.eventmesh.webhook.api.WebHookOperationConstant;
 import org.apache.eventmesh.webhook.receive.WebHookController;
 
 import java.util.HashMap;
@@ -40,7 +41,7 @@ public class WebHookProcessor implements HttpProcessor {
 
     @Override
     public String[] paths() {
-        return new String[]{"/webhook"};
+        return new String[]{WebHookOperationConstant.CALLBACK_PATH_PREFIX};
     }
 
     @Override

diff --git a/...e/src/test/java/org/apache/eventmesh/runtime/protocol/processor/WebHookProcessorTest.java b/...e/src/test/java/org/apache/eventmesh/runtime/protocol/processor/WebHookProcessorTest.java
@@ -107,10 +107,10 @@ private WebHookConfig buildMockWebhookConfig() {
         WebHookConfig config = new WebHookConfig();
         config.setCallbackPath("/webhook/github/eventmesh/all");
         config.setManufacturerName("github");
+        config.setManufacturerDomain("www.github.com");
         config.setManufacturerEventName("ForkEvent");
         config.setContentType("application/json");
         config.setSecret("secret");
-        config.setCloudEventSource("github");
         config.setCloudEventName("github-eventmesh");
         config.setCloudEventIdGenerateMode("uuid");
         return config;

diff --git a/...dmin/src/test/java/org/apache/eventmesh/webhook/admin/FileWebHookConfigOperationTest.java b/...dmin/src/test/java/org/apache/eventmesh/webhook/admin/FileWebHookConfigOperationTest.java
@@ -42,10 +42,10 @@ public void testInsertWebHookConfig() {
         WebHookConfig config = new WebHookConfig();
         config.setCallbackPath("/webhook/github/eventmesh/all");
         config.setManufacturerName("github");
+        config.setManufacturerDomain("www.github.com");
         config.setManufacturerEventName("all");
         config.setSecret("eventmesh");
         config.setCloudEventName("github-eventmesh");
-        config.setCloudEventSource("github");
 
         try {
             FileWebHookConfigOperation fileWebHookConfigOperation = new FileWebHookConfigOperation(properties);

diff --git a/...k/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/WebHookConfig.java b/...k/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/WebHookConfig.java
@@ -32,6 +32,11 @@ public class WebHookConfig {
      */
     private String manufacturerName;
 
+    /**
+     * manufacturer domain name, like www.github.com
+     */
+    private String manufacturerDomain;
+
     /**
      * webhook event name, like rep-push
      */
@@ -82,11 +87,6 @@ public class WebHookConfig {
      */
     private String dataContentType = "application/json";
 
-    /**
-     * source of event
-     */
-    private String cloudEventSource;
-
     /**
      * id of cloudEvent, like uuid/manufacturerEventId
      */

diff --git a/...webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookController.java b/...webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookController.java
@@ -114,7 +114,7 @@ public void execute(String path, Map<String, String> header, byte[] body) throws
 
         WebhookProtocolTransportObject webhookProtocolTransportObject = WebhookProtocolTransportObject.builder()
             .cloudEventId(cloudEventId).eventType(eventType).cloudEventName(webHookConfig.getCloudEventName())
-            .cloudEventSource("www." + webHookConfig.getManufacturerName() + ".com")
+            .cloudEventSource(webHookConfig.getManufacturerDomain())
             .dataContentType(webHookConfig.getDataContentType()).body(body).build();
 
         // 4. send cloudEvent