Skip to content

Commit 02f6d44

Browse files
authored
Eventmesh function admin (#4854)
* own * dependency * finish registry * init * 0419 * 0419 * more discovery and move gRPC * fix dependency
1 parent 02bcd35 commit 02f6d44

File tree

28 files changed

+2608
-94
lines changed

28 files changed

+2608
-94
lines changed

Diff for: eventmesh-admin-server/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
dependencies {
22
implementation project(":eventmesh-spi")
33
implementation project(":eventmesh-common")
4+
implementation project(":eventmesh-registry:eventmesh-registry-api")
5+
implementation project(":eventmesh-registry:eventmesh-registry-nacos")
46
implementation "com.alibaba.nacos:nacos-client"
57
implementation ("org.springframework.boot:spring-boot-starter-web") {
68
exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"

Diff for: eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/AdminServer.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
package com.apache.eventmesh.admin.server;
22

3-
import com.apache.eventmesh.admin.server.registry.EventMeshAdminServerRegisterInfo;
4-
import com.apache.eventmesh.admin.server.registry.RegistryService;
53
import com.apache.eventmesh.admin.server.task.Task;
64
import org.apache.eventmesh.common.utils.PagedList;
5+
import org.apache.eventmesh.registry.RegistryService;
76

87
public class AdminServer implements Admin {
98

109
private RegistryService registryService;
1110

12-
private EventMeshAdminServerRegisterInfo registerInfo;
11+
// private EventMeshAdminServerRegisterInfo registerInfo;
1312

14-
public AdminServer(RegistryService registryService, EventMeshAdminServerRegisterInfo registerInfo) {
13+
public AdminServer(RegistryService registryService) {
1514
this.registryService = registryService;
16-
this.registerInfo = registerInfo;
15+
// this.registerInfo = registerInfo;
1716
}
1817

19-
public static final String ConfigurationKey = "admin-server";
18+
2019
@Override
2120
public boolean createOrUpdateTask(Task task) {
2221
return false;
@@ -44,13 +43,12 @@ public void reportHeartbeat(HeartBeat heartBeat) {
4443

4544
@Override
4645
public void start() {
47-
48-
registryService.register(registerInfo);
46+
registryService.register(null);
4947
}
5048

5149
@Override
5250
public void destroy() {
53-
registryService.unRegister(registerInfo);
51+
registryService.unRegister(null);
5452
registryService.shutdown();
5553
}
5654
}

Diff for: eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/registry/EventMeshAdminServerConfiguration.java renamed to eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/EventMeshAdminServerConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apache.eventmesh.admin.server.registry;
1+
package com.apache.eventmesh.admin.server;
22

33
import lombok.Data;
44
import lombok.EqualsAndHashCode;

Diff for: eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/registry/EventMeshAdminServerRegisterInfo.java

-14
This file was deleted.

Diff for: eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/registry/RegistryService.java

-20
This file was deleted.

Diff for: eventmesh-admin-server/src/main/java/com/apache/eventmesh/admin/server/web/GrpcServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.apache.eventmesh.admin.server.web;
22

33
import com.apache.eventmesh.admin.server.ComponentLifeCycle;
4-
import com.apache.eventmesh.admin.server.web.generated.AdminBiStreamServiceGrpc;
4+
import org.apache.eventmesh.common.protocol.grpc.adminserver.AdminBiStreamServiceGrpc;
55
import org.springframework.stereotype.Controller;
66

77
@Controller

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

+17-8
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,17 @@
1717

1818
package org.apache.eventmesh.common.config;
1919

20-
import static org.apache.eventmesh.common.Constants.HTTP;
21-
20+
import lombok.Data;
21+
import lombok.NoArgsConstructor;
22+
import org.apache.commons.collections4.CollectionUtils;
2223
import org.apache.eventmesh.common.Constants;
2324
import org.apache.eventmesh.common.utils.IPUtils;
24-
25-
import org.apache.commons.collections4.CollectionUtils;
25+
import org.assertj.core.util.Strings;
2626

2727
import java.util.Collections;
2828
import java.util.List;
2929

30-
import org.assertj.core.util.Strings;
31-
32-
import lombok.Data;
33-
import lombok.NoArgsConstructor;
30+
import static org.apache.eventmesh.common.Constants.HTTP;
3431

3532
@Data
3633
@NoArgsConstructor
@@ -115,6 +112,18 @@ public class CommonConfiguration {
115112
@ConfigFiled(field = "server.retry.plugin.type")
116113
private String eventMeshRetryPluginType = Constants.DEFAULT;
117114

115+
@ConfigFiled(field = "registry.plugin.server-addr", notEmpty = true)
116+
private String registryAddr = "";
117+
118+
@ConfigFiled(field = "registry.plugin.type", notEmpty = true)
119+
private String eventMeshRegistryPluginType = "nacos";
120+
121+
@ConfigFiled(field = "registry.plugin.username")
122+
private String eventMeshRegistryPluginUsername = "";
123+
124+
@ConfigFiled(field = "registry.plugin.password")
125+
private String eventMeshRegistryPluginPassword = "";
126+
118127
public void reload() {
119128
this.eventMeshWebhookOrigin = "eventmesh." + eventMeshIDC;
120129

0 commit comments

Comments
 (0)