You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by ch...@apache.org on 2022/07/28 10:53:48 UTC
[incubator-eventmesh] branch master updated (e7ba6e2d -> 22f43615)
This is an automated email from the ASF dual-hosted git repository.
chenguangsheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
from e7ba6e2d Merge pull request #1034 from kirinzhu/fix-patch-docs
add 9bcbf4e7 fix(.git):1. 排除bin目录
add 698cf3a6 WebHookController 实现
add 62d8649e webhook receive module
add 2e9db2fb [ISSUE #865] support webhook
add 9175c65b fix: 参数名修正
add f490530b fix: webhook依赖引入修正
add ea7d575d fix: webhook配置写入nacos、file方式实现
add 3f985c59 Merge pull request #886 from JellyBo/webhook
add 5035dfbd Merge remote-tracking branch 'apache/webhook' into webhook
add a59ac367 conflict resolution and improve the code
add ecd946fb Merge pull request #897 from eight-nines/webhook
add 6c4e0a9c Convert comments to English and improve the code
add 3b525370 Merge pull request #903 from eight-nines/webhook
add 7f04f589 fix(runtime):1. 基本完成handlerService设计与开发
add 2d9236d0 Merge pull request #1 from apache/webhook
add 99255247 feat: optimize webHookConfig CURD logic
add 1b09463d feat: FileWebHookConfigOperation writeToFile method add lock, getWebhookConfigFilePath method use MD5
add bc8ffffa feat: add License
add 45faaff4 feat: optimize the code
add 7d6e4d68 feat: WebHookConfigOperation add License
add f1b5598a Repair exception Handling
add bd4c3c42 Send webhook CloudEvents
add 5326bb94 add license header
add 7578fe9d fix gradle
add 906c6f5f fix gradle again
add 2112533c fix gradle again
add 979c9c47 fix code style
add 92e849b3 fix gradle
add 7c1cdf86 fix license
add e4fe4e0d Improve the functionality of the code
add b45b8308 fix the code
add b2efdbc5 fix the gradle
add ed9279b4 Modify the parameter passing when WebHookController creates HookConfigOperationManage
add 7edbff65 Integrate AdminWebHookConfigOperationManage into HttpServer of eventmesh-runtime
add f91d7e69 Merge pull request #914 from eight-nines/webhook
add c66e49ee add HTTPTrace for the branch webhook
add f9a9c54f 将errorTrace与exceptionTrace合并 & 修改HttpReqTrace方法名为requestInfoTrace
add 14135d1d Merge pull request #929 from yiyuquan/webhook
add 537f08bc Add HttpProcessor & WebHookProcessor
add 41057cef Update HttpProcessor & WebHookProcessor
add 5a879d0b Merge pull request #934 from 111-dep/webhook
add 5fb631ef Merge branch 'webhook_remote' into webhook_jelly_fix
add c62bda6c feat: add comments
add f27d8aa5 feat: add License Header
add 36215fd0 Merge pull request #921 from JellyBo/webhook_jelly_fix
add dc9bdc77 fix(webhook and httpservice):1. 完成webhook与httpservice联调
add 19a6da91 fix(webhook): 1. 添加使用说明 2. eventcloud适配器
add 7caac5d3 fix(*):1.处理代码样式
add 7007c521 1. 格式化代码
add 38a60a89 1. 删除.checkstyle 2. 在.gitignore 添加排除.checkstyle
add 5b34c530 fix(webhook):1. review 修正，2. 打包修正 3. 文档补齐
add 40894cd6 fix(*):1. 修正review问题
add e5736b0f fix(*):1. 修正review问题
add 14d76f31 fix(*):1.修正review问题
add 243f5093 Merge remote-tracking branch 'apache/master' into webhook
add 00ce7dfe update HandlerService
add 69f5e557 update HandlerService
add 7b1f77a3 update AsyncHttpProcessor.java update EventMeshRetCode.java update HandlerService.java update SendAsyncEventProcessorV2.java
add 069f3417 update SendAsyncEventProcessorV2 update SendAsyncMessageProcessor
add 9f7b14d6 update AsyncHttpProcessor.java update EventMeshHTTPServer.java update HandlerService.java
add f92124e0 delete SendAsyncEventProcessorV2 update SendAsyncEventProcessor update EventMeshHttpServer update HTTPTrace
add da888661 fix checkstyle
add 3d1898b0 update http processors supported trace annotation
add a02d632f fix checkStyle
add bed90cee Merge pull request #937 from githublaohu/webhook
add 2e216e38 Merge pull request #1042 from xwm1992/webhook
add 295b7e24 Merge pull request #1045 from xwm1992/webhook
add ae29871a Merge branch 'webhook' of https://github.com/apache/incubator-eventmesh into webhook
add 1adee518 add apache header
new 22f43615 Merge pull request #1048 from apache/webhook
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +
build.gradle | 6 +-
.../design-document/webhook/webhook-github-add.png | Bin 0 -> 82039 bytes
.../webhook/webhook-github-info.png | Bin 0 -> 49447 bytes
.../webhook/webhook-github-setting.png | Bin 0 -> 26731 bytes
.../webhook/webhook-github-webhooks.png | Bin 0 -> 49447 bytes
docs/zh/desing-document/webhook.md | 268 +++++++++++++++
.../eventmesh/admin/rocketmq/util/JsonUtils.java | 9 +
.../common/config/CommonConfiguration.java | 5 +
.../common/config/ConfigurationWrapper.java | 28 +-
.../WebhookProtocolTransportObject.java} | 27 +-
.../protocol/http/common/EventMeshRetCode.java | 29 +-
.../demo/pub/cloudevents/AsyncPublishInstance.java | 6 +-
.../cloudevents/WebHookProtocolAdaptor.java} | 36 +-
...g.apache.eventmesh.protocol.api.ProtocolAdaptor | 3 +-
eventmesh-runtime/build.gradle | 4 +
eventmesh-runtime/conf/eventmesh.properties | 15 +-
.../admin/controller/ClientManageController.java | 24 ++
.../admin/handler/DeleteWebHookConfigHandler.java | 63 ++++
.../admin/handler/InsertWebHookConfigHandler.java | 62 ++++
.../handler/QueryWebHookConfigByIdHandler.java | 62 ++++
.../QueryWebHookConfigByManufacturerHandler.java | 67 ++++
.../admin/handler/UpdateWebHookConfigHandler.java | 62 ++++
.../eventmesh/runtime/boot/AbstractHTTPServer.java | 68 ++--
.../runtime/boot/EventMeshHTTPServer.java | 49 ++-
.../eventmesh/runtime/boot/EventMeshTCPServer.java | 7 +
.../apache/eventmesh/runtime/boot/HTTPTrace.java | 138 ++++++++
.../eventmesh/runtime/common/EventMeshTrace.java | 49 +--
.../configuration/EventMeshHTTPConfiguration.java | 2 +
.../protocol/grpc/push/WebhookPushRequest.java | 65 ++--
.../protocol/grpc/service/ProducerService.java | 2 +-
...EventProcessor.java => AsyncHttpProcessor.java} | 20 +-
.../protocol/http/processor/HandlerService.java | 365 +++++++++++++++++++++
.../protocol/http/processor/HttpProcessor.java | 13 +-
.../processor/LocalSubscribeEventProcessor.java | 97 ++----
.../processor/LocalUnSubscribeEventProcessor.java | 83 ++---
.../processor/RemoteSubscribeEventProcessor.java | 101 ++----
.../processor/RemoteUnSubscribeEventProcessor.java | 73 ++---
.../http/processor/SendAsyncEventProcessor.java | 177 ++++------
.../http/processor/SendAsyncMessageProcessor.java | 4 +-
.../processor/SendAsyncRemoteEventProcessor.java | 179 ++++------
.../protocol/http/processor/WebHookProcessor.java | 58 ++++
.../http/processor/inf/AbstractEventProcessor.java | 2 +-
.../core/protocol/http/push/HTTPClientPool.java | 19 +-
.../eventmesh/runtime/util/EventMeshUtil.java | 1 +
.../eventmesh/runtime/util/HttpResponseUtils.java | 67 ++++
.../apache/eventmesh/runtime/util/WebhookUtil.java | 5 +-
.../grpc/producer/EventMeshGrpcProducer.java | 4 +-
.../build.gradle | 30 +-
.../eventmesh-webhook-admin/bin/.gitignore | 1 +
.../eventmesh-webhook-admin}/build.gradle | 12 +-
.../eventmesh-webhook-admin}/gradle.properties | 0
.../admin/AdminWebHookConfigOperationManage.java | 80 +++++
.../webhook/admin/FileWebHookConfigOperation.java | 193 +++++++++++
.../webhook/admin/NacosWebHookConfigOperation.java | 205 ++++++++++++
.../eventmesh-webhook-api/bin/.gitignore | 1 +
.../eventmesh-webhook-api}/build.gradle | 6 +-
.../eventmesh-webhook-api}/gradle.properties | 0
.../eventmesh/webhook/api/ManufacturerObject.java | 64 ++++
.../eventmesh/webhook/api/WebHookConfig.java | 95 ++++++
.../webhook/api/WebHookConfigOperation.java | 21 +-
.../webhook/api/WebHookOperationConstant.java | 51 +++
.../eventmesh-webhook-receive/bin/.gitignore | 1 +
.../eventmesh-webhook-receive}/build.gradle | 17 +-
.../eventmesh-webhook-receive}/gradle.properties | 0
.../webhook/receive/ManufacturerProtocol.java | 28 +-
.../webhook/receive/WebHookController.java | 131 ++++++++
.../webhook/receive/WebHookMQProducer.java | 64 +---
.../eventmesh/webhook/receive/WebHookRequest.java | 27 +-
.../webhook/receive/protocol/GithubProtocol.java | 99 ++++++
.../webhook/receive/protocol/ProtocolManage.java | 25 +-
.../storage/AbstractWebHookConfigOperation.java | 14 +-
.../receive/storage/HookConfigOperationManage.java | 120 +++++++
.../receive/storage/WebhookFileListener.java | 194 +++++++++++
.../gradle.properties | 0
eventmesh-webhook/webhook.jmx | 122 +++++++
settings.gradle | 7 +
77 files changed, 3261 insertions(+), 773 deletions(-)
create mode 100644 docs/images/design-document/webhook/webhook-github-add.png
create mode 100644 docs/images/design-document/webhook/webhook-github-info.png
create mode 100644 docs/images/design-document/webhook/webhook-github-setting.png
create mode 100644 docs/images/design-document/webhook/webhook-github-webhooks.png
create mode 100644 docs/zh/desing-document/webhook.md
copy eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/{tcp/Package.java => http/WebhookProtocolTransportObject.java} (67%)
copy eventmesh-protocol-plugin/{eventmesh-protocol-openmessage/src/main/java/org/apache/eventmesh/protocol/openmessage/OpenMessageProtocolAdaptor.java => eventmesh-protocol-cloudevents/src/main/java/org/apache/eventmesh/protocol/cloudevents/WebHookProtocolAdaptor.java} (52%)
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/DeleteWebHookConfigHandler.java
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/InsertWebHookConfigHandler.java
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByIdHandler.java
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/QueryWebHookConfigByManufacturerHandler.java
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/UpdateWebHookConfigHandler.java
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/HTTPTrace.java
copy eventmesh-common/src/main/java/org/apache/eventmesh/common/loadbalance/LoadBalanceType.java => eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/common/EventMeshTrace.java (51%)
copy eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/{inf/EventProcessor.java => AsyncHttpProcessor.java} (65%)
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HandlerService.java
copy eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/RequestReplyCallback.java => eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/HttpProcessor.java (73%)
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/WebHookProcessor.java
create mode 100644 eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/HttpResponseUtils.java
copy eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/util/ValueComparator.java => eventmesh-webhook/build.gradle (53%)
create mode 100644 eventmesh-webhook/eventmesh-webhook-admin/bin/.gitignore
copy {eventmesh-admin/eventmesh-admin-rocketmq => eventmesh-webhook/eventmesh-webhook-admin}/build.gradle (77%)
copy {eventmesh-admin => eventmesh-webhook/eventmesh-webhook-admin}/gradle.properties (100%)
create mode 100644 eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/AdminWebHookConfigOperationManage.java
create mode 100644 eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/FileWebHookConfigOperation.java
create mode 100644 eventmesh-webhook/eventmesh-webhook-admin/src/main/java/org/apache/eventmesh/webhook/admin/NacosWebHookConfigOperation.java
create mode 100644 eventmesh-webhook/eventmesh-webhook-api/bin/.gitignore
copy {eventmesh-metrics-plugin/eventmesh-metrics-api => eventmesh-webhook/eventmesh-webhook-api}/build.gradle (92%)
copy {eventmesh-admin => eventmesh-webhook/eventmesh-webhook-api}/gradle.properties (100%)
create mode 100644 eventmesh-webhook/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/ManufacturerObject.java
create mode 100644 eventmesh-webhook/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/WebHookConfig.java
copy eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/recommend/EventMeshRecommendStrategy.java => eventmesh-webhook/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/WebHookConfigOperation.java (58%)
create mode 100644 eventmesh-webhook/eventmesh-webhook-api/src/main/java/org/apache/eventmesh/webhook/api/WebHookOperationConstant.java
create mode 100644 eventmesh-webhook/eventmesh-webhook-receive/bin/.gitignore
copy {eventmesh-admin/eventmesh-admin-rocketmq => eventmesh-webhook/eventmesh-webhook-receive}/build.gradle (66%)
copy {eventmesh-admin => eventmesh-webhook/eventmesh-webhook-receive}/gradle.properties (100%)
copy eventmesh-spi/src/main/java/org/apache/eventmesh/spi/loader/ExtensionClassLoader.java => eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/ManufacturerProtocol.java (56%)
create mode 100644 eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookController.java
copy eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/plugin/MQProducerWrapper.java => eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookMQProducer.java (51%)
copy eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/patch/EventMeshConsumeConcurrentlyStatus.java => eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/WebHookRequest.java (69%)
create mode 100644 eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/protocol/GithubProtocol.java
copy eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/body/BaseRequestBody.java => eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/protocol/ProtocolManage.java (58%)
copy eventmesh-connector-plugin/eventmesh-connector-api/src/main/java/org/apache/eventmesh/api/RequestReplyCallback.java => eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/storage/AbstractWebHookConfigOperation.java (77%)
create mode 100644 eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/storage/HookConfigOperationManage.java
create mode 100644 eventmesh-webhook/eventmesh-webhook-receive/src/main/java/org/apache/eventmesh/webhook/receive/storage/WebhookFileListener.java
copy {eventmesh-admin => eventmesh-webhook}/gradle.properties (100%)
create mode 100644 eventmesh-webhook/webhook.jmx
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org
[incubator-eventmesh] 01/01: Merge pull request #1048 from apache/webhook
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chenguangsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
commit 22f436157b0c1bbe9d46dc0f847e5a9522784f76
Merge: e7ba6e2d 1adee518
Author: Eason Chen <qq...@gmail.com>
AuthorDate: Thu Jul 28 18:53:42 2022 +0800
Merge pull request #1048 from apache/webhook
.gitignore | 2 +
build.gradle | 6 +-
.../design-document/webhook/webhook-github-add.png | Bin 0 -> 82039 bytes
.../webhook/webhook-github-info.png | Bin 0 -> 49447 bytes
.../webhook/webhook-github-setting.png | Bin 0 -> 26731 bytes
.../webhook/webhook-github-webhooks.png | Bin 0 -> 49447 bytes
docs/zh/desing-document/webhook.md | 268 +++++++++++++++
.../eventmesh/admin/rocketmq/util/JsonUtils.java | 9 +
.../common/config/CommonConfiguration.java | 5 +
.../common/config/ConfigurationWrapper.java | 28 +-
.../http/WebhookProtocolTransportObject.java | 43 +++
.../protocol/http/common/EventMeshRetCode.java | 29 +-
.../demo/pub/cloudevents/AsyncPublishInstance.java | 6 +-
.../cloudevents/WebHookProtocolAdaptor.java | 62 ++++
...g.apache.eventmesh.protocol.api.ProtocolAdaptor | 3 +-
eventmesh-runtime/build.gradle | 4 +
eventmesh-runtime/conf/eventmesh.properties | 15 +-
.../admin/controller/ClientManageController.java | 24 ++
.../admin/handler/DeleteWebHookConfigHandler.java | 63 ++++
.../admin/handler/InsertWebHookConfigHandler.java | 62 ++++
.../handler/QueryWebHookConfigByIdHandler.java | 62 ++++
.../QueryWebHookConfigByManufacturerHandler.java | 67 ++++
.../admin/handler/UpdateWebHookConfigHandler.java | 62 ++++
.../eventmesh/runtime/boot/AbstractHTTPServer.java | 68 ++--
.../runtime/boot/EventMeshHTTPServer.java | 49 ++-
.../eventmesh/runtime/boot/EventMeshTCPServer.java | 7 +
.../apache/eventmesh/runtime/boot/HTTPTrace.java | 138 ++++++++
.../eventmesh/runtime/common/EventMeshTrace.java | 36 ++
.../configuration/EventMeshHTTPConfiguration.java | 2 +
.../protocol/grpc/push/WebhookPushRequest.java | 65 ++--
.../protocol/grpc/service/ProducerService.java | 2 +-
.../http/processor/AsyncHttpProcessor.java | 35 ++
.../protocol/http/processor/HandlerService.java | 365 +++++++++++++++++++++
.../protocol/http/processor/HttpProcessor.java | 31 ++
.../processor/LocalSubscribeEventProcessor.java | 97 ++----
.../processor/LocalUnSubscribeEventProcessor.java | 83 ++---
.../processor/RemoteSubscribeEventProcessor.java | 101 ++----
.../processor/RemoteUnSubscribeEventProcessor.java | 73 ++---
.../http/processor/SendAsyncEventProcessor.java | 177 ++++------
.../http/processor/SendAsyncMessageProcessor.java | 4 +-
.../processor/SendAsyncRemoteEventProcessor.java | 179 ++++------
.../protocol/http/processor/WebHookProcessor.java | 58 ++++
.../http/processor/inf/AbstractEventProcessor.java | 2 +-
.../core/protocol/http/push/HTTPClientPool.java | 19 +-
.../eventmesh/runtime/util/EventMeshUtil.java | 1 +
.../eventmesh/runtime/util/HttpResponseUtils.java | 67 ++++
.../apache/eventmesh/runtime/util/WebhookUtil.java | 5 +-
.../grpc/producer/EventMeshGrpcProducer.java | 4 +-
eventmesh-webhook/build.gradle | 38 +++
.../eventmesh-webhook-admin/bin/.gitignore | 1 +
.../eventmesh-webhook-admin/build.gradle | 32 ++
.../eventmesh-webhook-admin/gradle.properties | 4 +-
.../admin/AdminWebHookConfigOperationManage.java | 80 +++++
.../webhook/admin/FileWebHookConfigOperation.java | 193 +++++++++++
.../webhook/admin/NacosWebHookConfigOperation.java | 205 ++++++++++++
.../eventmesh-webhook-api/bin/.gitignore | 1 +
.../eventmesh-webhook-api/build.gradle | 26 ++
.../eventmesh-webhook-api/gradle.properties | 4 +-
.../eventmesh/webhook/api/ManufacturerObject.java | 64 ++++
.../eventmesh/webhook/api/WebHookConfig.java | 95 ++++++
.../webhook/api/WebHookConfigOperation.java | 37 +++
.../webhook/api/WebHookOperationConstant.java | 51 +++
.../eventmesh-webhook-receive/bin/.gitignore | 1 +
.../eventmesh-webhook-receive/build.gradle | 39 +++
.../eventmesh-webhook-receive/gradle.properties | 4 +-
.../webhook/receive/ManufacturerProtocol.java | 42 +++
.../webhook/receive/WebHookController.java | 131 ++++++++
.../webhook/receive/WebHookMQProducer.java | 61 ++++
.../eventmesh/webhook/receive/WebHookRequest.java | 44 +++
.../webhook/receive/protocol/GithubProtocol.java | 99 ++++++
.../webhook/receive/protocol/ProtocolManage.java | 43 +++
.../storage/AbstractWebHookConfigOperation.java | 26 ++
.../receive/storage/HookConfigOperationManage.java | 120 +++++++
.../receive/storage/WebhookFileListener.java | 194 +++++++++++
.../gradle.properties | 4 +-
eventmesh-webhook/webhook.jmx | 122 +++++++
settings.gradle | 7 +
77 files changed, 3671 insertions(+), 585 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org