Skip to content

Commit ef16253

Browse files
authored
[ISSUE #4825] Deprecate Webhook function of EventMesh Runtime(v1) (#5153)
1 parent 52a1bb1 commit ef16253

File tree

72 files changed

+4
-3486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4
-3486
lines changed

build.gradle

+1-4
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,7 @@ tasks.register('dist') {
174174
"eventmesh-spi",
175175
"eventmesh-starter",
176176
"eventmesh-storage-plugin:eventmesh-storage-api",
177-
"eventmesh-trace-plugin:eventmesh-trace-api",
178-
"eventmesh-webhook:eventmesh-webhook-api",
179-
"eventmesh-webhook:eventmesh-webhook-admin",
180-
"eventmesh-webhook:eventmesh-webhook-receive"]
177+
"eventmesh-trace-plugin:eventmesh-trace-api"]
181178
doLast {
182179
includedProjects.each {
183180
def subProject = findProject(it)

eventmesh-common/src/main/java/org/apache/eventmesh/common/config/CommonConfiguration.java

-4
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ public class CommonConfiguration {
9797
@ConfigField(field = "server.provide.protocols", reload = true)
9898
private List<String> eventMeshProvideServerProtocols;
9999

100-
@ConfigField(reload = true)
101-
private String eventMeshWebhookOrigin;
102-
103100
@ConfigField(reload = true)
104101
private String meshGroup;
105102

@@ -122,7 +119,6 @@ public class CommonConfiguration {
122119
private boolean eventMeshRegistryPluginEnabled = false;
123120

124121
public void reload() {
125-
this.eventMeshWebhookOrigin = "eventmesh." + eventMeshIDC;
126122

127123
if (Strings.isNullOrEmpty(this.eventMeshServerIp)) {
128124
this.eventMeshServerIp = IPUtils.getLocalAddress();

eventmesh-common/src/test/java/org/apache/eventmesh/common/config/CommonConfigurationTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,5 @@ public void testGetCommonConfiguration() {
6969
Assertions.assertTrue(config.isEventMeshServerSecurityEnable());
7070
Assertions.assertTrue(config.isEventMeshServerMetaStorageEnable());
7171
Assertions.assertTrue(config.isEventMeshServerTraceEnable());
72-
73-
Assertions.assertEquals("eventmesh.idc-succeed!!!", config.getEventMeshWebhookOrigin());
7472
}
7573
}

eventmesh-protocol-plugin/eventmesh-protocol-webhook/build.gradle

-22
This file was deleted.

eventmesh-protocol-plugin/eventmesh-protocol-webhook/gradle.properties

-18
This file was deleted.

eventmesh-protocol-plugin/eventmesh-protocol-webhook/src/main/java/org/apache/eventmesh/protocol/webhook/WebHookProtocolAdaptor.java

-90
This file was deleted.

eventmesh-protocol-plugin/eventmesh-protocol-webhook/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.protocol.api.ProtocolAdaptor

-16
This file was deleted.

eventmesh-runtime/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,13 @@ dependencies {
6565
implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-meshmessage")
6666
implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-openmessage")
6767
implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-http")
68-
implementation project(":eventmesh-protocol-plugin:eventmesh-protocol-webhook")
6968

7069
implementation project(":eventmesh-metrics-plugin:eventmesh-metrics-api")
7170
implementation project(":eventmesh-metrics-plugin:eventmesh-metrics-prometheus")
7271

7372
implementation project(":eventmesh-trace-plugin:eventmesh-trace-api")
7473
implementation project(":eventmesh-trace-plugin:eventmesh-trace-zipkin")
7574

76-
implementation project(":eventmesh-webhook:eventmesh-webhook-admin")
77-
implementation project(":eventmesh-webhook:eventmesh-webhook-api")
78-
implementation project(":eventmesh-webhook:eventmesh-webhook-receive")
79-
8075
implementation project(":eventmesh-retry:eventmesh-retry-api")
8176

8277
testImplementation "org.mockito:mockito-inline"

eventmesh-runtime/conf/eventmesh.properties

+1-14
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,4 @@ eventMesh.metrics.plugin=prometheus
156156

157157
# trace plugin
158158
eventMesh.server.trace.enabled=false
159-
eventMesh.trace.plugin=zipkin
160-
161-
# webhook
162-
# Start webhook admin service
163-
eventMesh.webHook.admin.start=true
164-
# Webhook event configuration storage mode. Currently, only file and nacos are supported
165-
eventMesh.webHook.operationMode=file
166-
# The file storage path of the file storage mode. If #{eventMeshHome} is written, it is in the EventMesh root directory
167-
eventMesh.webHook.fileMode.filePath= #{eventMeshHome}/webhook
168-
# Nacos storage mode, and the configuration naming rule is EventMesh webHook. nacosMode. {nacos native configuration key} please see the specific configuration [nacos github api](https://github.com/alibaba/nacos/blob/develop/api/src/main/java/com/alibaba/nacos/api/SystemPropertyKeyConst.java)
169-
## Address of Nacos
170-
eventMesh.webHook.nacosMode.serverAddr=127.0.0.1:8848
171-
# Webhook CloudEvent sending mode. This property is the same as the eventMesh.storage.plugin.type configuration.
172-
eventMesh.webHook.producer.storage=standalone
159+
eventMesh.trace.plugin=zipkin

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/AdminHandlerManager.java

-19
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@
1818
package org.apache.eventmesh.runtime.admin.handler;
1919

2020
import org.apache.eventmesh.runtime.admin.handler.v1.ConfigurationHandlerV1;
21-
import org.apache.eventmesh.runtime.admin.handler.v1.DeleteWebHookConfigHandler;
2221
import org.apache.eventmesh.runtime.admin.handler.v1.EventHandler;
2322
import org.apache.eventmesh.runtime.admin.handler.v1.GrpcClientHandler;
2423
import org.apache.eventmesh.runtime.admin.handler.v1.HTTPClientHandler;
25-
import org.apache.eventmesh.runtime.admin.handler.v1.InsertWebHookConfigHandler;
2624
import org.apache.eventmesh.runtime.admin.handler.v1.MetaHandler;
2725
import org.apache.eventmesh.runtime.admin.handler.v1.QueryRecommendEventMeshHandler;
28-
import org.apache.eventmesh.runtime.admin.handler.v1.QueryWebHookConfigByIdHandler;
29-
import org.apache.eventmesh.runtime.admin.handler.v1.QueryWebHookConfigByManufacturerHandler;
3026
import org.apache.eventmesh.runtime.admin.handler.v1.RedirectClientByIpPortHandler;
3127
import org.apache.eventmesh.runtime.admin.handler.v1.RedirectClientByPathHandler;
3228
import org.apache.eventmesh.runtime.admin.handler.v1.RedirectClientBySubSystemHandler;
@@ -38,19 +34,15 @@
3834
import org.apache.eventmesh.runtime.admin.handler.v1.ShowListenClientByTopicHandler;
3935
import org.apache.eventmesh.runtime.admin.handler.v1.TCPClientHandler;
4036
import org.apache.eventmesh.runtime.admin.handler.v1.TopicHandler;
41-
import org.apache.eventmesh.runtime.admin.handler.v1.UpdateWebHookConfigHandler;
4237
import org.apache.eventmesh.runtime.admin.handler.v2.ConfigurationHandler;
4338
import org.apache.eventmesh.runtime.boot.EventMeshGrpcServer;
4439
import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
4540
import org.apache.eventmesh.runtime.boot.EventMeshServer;
4641
import org.apache.eventmesh.runtime.boot.EventMeshTCPServer;
4742
import org.apache.eventmesh.runtime.common.EventMeshHttpHandler;
4843
import org.apache.eventmesh.runtime.meta.MetaStorage;
49-
import org.apache.eventmesh.webhook.admin.AdminWebHookConfigOperationManager;
50-
import org.apache.eventmesh.webhook.api.WebHookConfigOperation;
5144

5245
import java.util.Map;
53-
import java.util.Objects;
5446
import java.util.Optional;
5547
import java.util.concurrent.ConcurrentHashMap;
5648

@@ -67,8 +59,6 @@ public class AdminHandlerManager {
6759

6860
private MetaStorage eventMeshMetaStorage;
6961

70-
private AdminWebHookConfigOperationManager adminWebHookConfigOperationManage;
71-
7262
private final Map<String, HttpHandler> httpHandlerMap = new ConcurrentHashMap<>();
7363

7464
public AdminHandlerManager(EventMeshServer eventMeshServer) {
@@ -77,7 +67,6 @@ public AdminHandlerManager(EventMeshServer eventMeshServer) {
7767
this.eventMeshGrpcServer = eventMeshServer.getEventMeshGrpcServer();
7868
this.eventMeshHTTPServer = eventMeshServer.getEventMeshHTTPServer();
7969
this.eventMeshMetaStorage = eventMeshServer.getMetaStorage();
80-
this.adminWebHookConfigOperationManage = eventMeshTCPServer.getAdminWebHookConfigOperationManage();
8170
}
8271

8372
public void registerHttpHandler() {
@@ -102,14 +91,6 @@ public void registerHttpHandler() {
10291
initHandler(new TopicHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshStoragePluginType()));
10392
initHandler(new EventHandler(eventMeshTCPServer.getEventMeshTCPConfiguration().getEventMeshStoragePluginType()));
10493
initHandler(new MetaHandler(eventMeshMetaStorage));
105-
if (Objects.nonNull(adminWebHookConfigOperationManage.getWebHookConfigOperation())) {
106-
WebHookConfigOperation webHookConfigOperation = adminWebHookConfigOperationManage.getWebHookConfigOperation();
107-
initHandler(new InsertWebHookConfigHandler(webHookConfigOperation));
108-
initHandler(new UpdateWebHookConfigHandler(webHookConfigOperation));
109-
initHandler(new DeleteWebHookConfigHandler(webHookConfigOperation));
110-
initHandler(new QueryWebHookConfigByIdHandler(webHookConfigOperation));
111-
initHandler(new QueryWebHookConfigByManufacturerHandler(webHookConfigOperation));
112-
}
11394

11495
// v2 endpoints
11596
initHandler(new ConfigurationHandler(

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/v1/ConfigurationHandlerV1.java

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ protected void get(HttpRequest httpRequest, ChannelHandlerContext ctx) throws Ex
7676
eventMeshTCPConfiguration.getEventMeshCluster(),
7777
eventMeshTCPConfiguration.getEventMeshServerIp(),
7878
eventMeshTCPConfiguration.getEventMeshName(),
79-
eventMeshTCPConfiguration.getEventMeshWebhookOrigin(),
8079
eventMeshTCPConfiguration.isEventMeshServerSecurityEnable(),
8180
eventMeshTCPConfiguration.isEventMeshServerMetaStorageEnable(),
8281
// TCP Configuration

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/admin/handler/v1/DeleteWebHookConfigHandler.java

-82
This file was deleted.

0 commit comments

Comments
 (0)