This is an automated email from the ASF dual-hosted git repository.
mxsm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 3652000f7 [ISSUE #4243] Optimize Webhook Manufacturer source
Hard-coding (#4273)
3652000f7 is described below
commit 3652000f7ba5449a5aef100dbc63b1c23ec4bf0a
Author: Pil0tXia <[email protected]>
AuthorDate: Thu Jul 27 18:55:53 2023 +0800
[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
---
.../runtime/core/protocol/http/processor/WebHookProcessor.java | 3 ++-
.../runtime/protocol/processor/WebHookProcessorTest.java | 2 +-
.../webhook/admin/FileWebHookConfigOperationTest.java | 2 +-
.../java/org/apache/eventmesh/webhook/api/WebHookConfig.java | 10 +++++-----
.../apache/eventmesh/webhook/receive/WebHookController.java | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/WebHookProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/WebHookProcessor.java
index 15f222a8e..885d5cbd9 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/WebHookProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/WebHookProcessor.java
@@ -19,6 +19,7 @@ package
org.apache.eventmesh.runtime.core.protocol.http.processor;
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/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/protocol/processor/WebHookProcessorTest.java
b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/protocol/processor/WebHookProcessorTest.java
index a828d70a0..7ea4a8eec 100644
---
a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/protocol/processor/WebHookProcessorTest.java
+++
b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/protocol/processor/WebHookProcessorTest.java
@@ -107,10 +107,10 @@ public class WebHookProcessorTest {
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/eventmesh-webhook/eventmesh-webhook-admin/src/test/java/org/apache/eventmesh/webhook/admin/FileWebHookConfigOperationTest.java
b/eventmesh-webhook/eventmesh-webhook-admin/src/test/java/org/apache/eventmesh/webhook/admin/FileWebHookConfigOperationTest.java
index 0c6450fb7..74d88884c 100644
---
a/eventmesh-webhook/eventmesh-webhook-admin/src/test/java/org/apache/eventmesh/webhook/admin/FileWebHookConfigOperationTest.java
+++
b/eventmesh-webhook/eventmesh-webhook-admin/src/test/java/org/apache/eventmesh/webhook/admin/FileWebHookConfigOperationTest.java
@@ -42,10 +42,10 @@ public class FileWebHookConfigOperationTest {
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/eventmesh-webhook/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/WebHookConfig.java
b/eventmesh-webhook/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/WebHookConfig.java
index 840724d67..3f1d26c87 100644
---
a/eventmesh-webhook/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/WebHookConfig.java
+++
b/eventmesh-webhook/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/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookController.java
b/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookController.java
index d7c2474c4..0c9ae2bcc 100644
---
a/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookController.java
+++
b/eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookController.java
@@ -114,7 +114,7 @@ public class WebHookController {
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
