fix ci check error

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

@@ -78,17 +78,17 @@ public class CommonConfiguration {
     @ConfigFiled(field = "security.validation.type.token", notEmpty = true)
     private boolean eventMeshSecurityValidateTypeToken = false;
 
-    @ConfigFiled(field = "registry.plugin.username")
-    private String eventMeshRegistryPluginUsername = "";
+    @ConfigFiled(field = "metaStorage.plugin.username")
+    private String eventMeshMetaStoragePluginUsername = "";
 
-    @ConfigFiled(field = "registry.plugin.password")
-    private String eventMeshRegistryPluginPassword = "";
+    @ConfigFiled(field = "metaStorage.plugin.password")
+    private String eventMeshMetaStoragePluginPassword = "";
 
-    @ConfigFiled(field = "server.registry.registerIntervalInMills")
-    private Integer eventMeshRegisterIntervalInMills = 10 * 1000;
+    @ConfigFiled(field = "server.metaStorage.metaStorageIntervalInMills")
+    private Integer eventMeshMetaStorageIntervalInMills = 10 * 1000;
 
-    @ConfigFiled(field = "server.registry.fetchRegistryAddrIntervalInMills")
-    private Integer eventMeshFetchRegistryAddrInterval = 10 * 1000;
+    @ConfigFiled(field = "server.metaStorage.fetchMetaStorageAddrIntervalInMills")
+    private Integer eventMeshFetchMetaStorageAddrInterval = 10 * 1000;
 
 
     @ConfigFiled(field = "server.trace.enabled")
@@ -97,8 +97,8 @@ public class CommonConfiguration {
     @ConfigFiled(field = "server.security.enabled")
     private boolean eventMeshServerSecurityEnable = false;
 
-    @ConfigFiled(field = "server.registry.enabled")
-    private boolean eventMeshServerRegistryEnable = false;
+    @ConfigFiled(field = "server.metaStorage.enabled")
+    private boolean eventMeshServerMetaStorageEnable = false;
 
     @ConfigFiled(field = "security.publickey")
     private String eventMeshSecurityPublickey = "";

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

@@ -49,14 +49,14 @@ public void testGetCommonConfiguration() {
         Assert.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
         Assert.assertEquals("storage-succeed!!!", config.getEventMeshStoragePluginType());
         Assert.assertEquals("security-succeed!!!", config.getEventMeshSecurityPluginType());
-        Assert.assertEquals("registry-succeed!!!", config.getEventMeshMetaStoragePluginType());
+        Assert.assertEquals("metaStorage-succeed!!!", config.getEventMeshMetaStoragePluginType());
         Assert.assertEquals("trace-succeed!!!", config.getEventMeshTracePluginType());
         Assert.assertEquals("hostIp-succeed!!!", config.getEventMeshServerIp());
-        Assert.assertEquals("username-succeed!!!", config.getEventMeshRegistryPluginUsername());
-        Assert.assertEquals("password-succeed!!!", config.getEventMeshRegistryPluginPassword());
+        Assert.assertEquals("username-succeed!!!", config.getEventMeshMetaStoragePluginUsername());
+        Assert.assertEquals("password-succeed!!!", config.getEventMeshMetaStoragePluginPassword());
 
-        Assert.assertEquals(Integer.valueOf(816), config.getEventMeshRegisterIntervalInMills());
-        Assert.assertEquals(Integer.valueOf(1816), config.getEventMeshFetchRegistryAddrInterval());
+        Assert.assertEquals(Integer.valueOf(816), config.getEventMeshMetaStorageIntervalInMills());
+        Assert.assertEquals(Integer.valueOf(1816), config.getEventMeshFetchMetaStorageAddrInterval());
 
         List<String> list = new ArrayList<>();
         list.add("metrics-succeed1!!!");
@@ -71,7 +71,7 @@ public void testGetCommonConfiguration() {
         Assert.assertEquals(list1, config.getEventMeshProvideServerProtocols());
 
         Assert.assertTrue(config.isEventMeshServerSecurityEnable());
-        Assert.assertTrue(config.isEventMeshServerRegistryEnable());
+        Assert.assertTrue(config.isEventMeshServerMetaStorageEnable());
         Assert.assertTrue(config.isEventMeshServerTraceEnable());
 
         Assert.assertEquals("eventmesh.idc-succeed!!!", config.getEventMeshWebhookOrigin());

eventmesh-common/src/test/resources/configuration.properties

@@ -25,8 +25,8 @@ eventMesh.storage.plugin.type=storage-succeed!!!
 eventMesh.security.plugin.type=security-succeed!!!
 eventMesh.metaStorage.plugin.type=metaStorage-succeed!!!
 eventMesh.trace.plugin=trace-succeed!!!
-eventMesh.server.metaStorage.registerIntervalInMills=816
-eventMesh.server.metaStorage.fetchRegistryAddrIntervalInMills=1816
+eventMesh.server.metaStorage.metaStorageIntervalInMills=816
+eventMesh.server.metaStorage.fetchMetaStorageAddrIntervalInMills=1816
 eventMesh.metrics.plugin=metrics-succeed1!!!,metrics-succeed2!!!,metrics-succeed3!!!
 eventMesh.metaStorage.plugin.server-addr=server-addr-succeed1!!!
 

eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaService.java

@@ -93,8 +93,8 @@ public void init() throws MetaException {
                 throw new MetaException("namesrvAddr cannot be null");
             }
             this.serverAddr = commonConfiguration.getNamesrvAddr();
-            this.username = commonConfiguration.getEventMeshRegistryPluginUsername();
-            this.password = commonConfiguration.getEventMeshRegistryPluginPassword();
+            this.username = commonConfiguration.getEventMeshMetaStoragePluginUsername();
+            this.password = commonConfiguration.getEventMeshMetaStoragePluginPassword();
             break;
         }
         etcdRegistryMonitorExecutorService = ThreadPoolFactory.createSingleScheduledExecutor(

eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/service/NacosMetaService.java

@@ -93,8 +93,8 @@ public void init() throws MetaException {
             }
 
             this.serverAddr = commonConfiguration.getNamesrvAddr();
-            this.username = commonConfiguration.getEventMeshRegistryPluginUsername();
-            this.password = commonConfiguration.getEventMeshRegistryPluginPassword();
+            this.username = commonConfiguration.getEventMeshMetaStoragePluginUsername();
+            this.password = commonConfiguration.getEventMeshMetaStoragePluginPassword();
             break;
         }
         ConfigService configService = ConfigService.getInstance();

eventmesh-runtime/conf/eventmesh.properties

@@ -58,8 +58,8 @@ eventMesh.server.retry.pushRetryQueueSize=10000
 #admin
 eventMesh.server.admin.http.port=10106
 #metaStorage
-eventMesh.server.metaStorage.registerIntervalInMills=10000
-eventMesh.server.metaStorage.fetchRegistryAddrIntervalInMills=20000
+eventMesh.server.metaStorage.metaStorageIntervalInMills=10000
+eventMesh.server.metaStorage.fetchMetaStorageAddrIntervalInMills=20000
 #auto-ack
 #eventMesh.server.defibus.client.comsumeTimeoutInMin=5
 

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

@@ -121,7 +121,7 @@ void get(HttpExchange httpExchange) throws IOException {
                     eventMeshTCPConfiguration.getEventMeshName(),
                     eventMeshTCPConfiguration.getEventMeshWebhookOrigin(),
                     eventMeshTCPConfiguration.isEventMeshServerSecurityEnable(),
-                    eventMeshTCPConfiguration.isEventMeshServerRegistryEnable(),
+                    eventMeshTCPConfiguration.isEventMeshServerMetaStorageEnable(),
                     // TCP Configuration
                     eventMeshTCPConfiguration.getEventMeshTcpServerPort(),
                     // HTTP Configuration

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

@@ -80,7 +80,7 @@ public QueryRecommendEventMeshHandler(EventMeshTCPServer eventMeshTCPServer, Htt
     public void handle(HttpExchange httpExchange) throws IOException {
         String result = "";
         try (OutputStream out = httpExchange.getResponseBody()) {
-            if (!eventMeshTCPServer.getEventMeshTCPConfiguration().isEventMeshServerRegistryEnable()) {
+            if (!eventMeshTCPServer.getEventMeshTCPConfiguration().isEventMeshServerMetaStorageEnable()) {
                 throw new Exception("registry enable config is false, not support");
             }
             String queryString = httpExchange.getRequestURI().getQuery();

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshGrpcServer.java

@@ -142,7 +142,7 @@ public void start() throws Exception {
         grpcRetryer.start();
         server.start();
 
-        if (eventMeshGrpcConfiguration.isEventMeshServerRegistryEnable()) {
+        if (eventMeshGrpcConfiguration.isEventMeshServerMetaStorageEnable()) {
             this.register();
         }
 
@@ -162,7 +162,7 @@ public void shutdown() throws Exception {
 
         server.shutdown();
 
-        if (eventMeshGrpcConfiguration.isEventMeshServerRegistryEnable()) {
+        if (eventMeshGrpcConfiguration.isEventMeshServerMetaStorageEnable()) {
             this.unRegister();
         }
 

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshHTTPServer.java

@@ -162,7 +162,7 @@ public void start() throws Exception {
         producerManager.start();
         httpRetryer.start();
 
-        if (eventMeshHttpConfiguration.isEventMeshServerRegistryEnable()) {
+        if (eventMeshHttpConfiguration.isEventMeshServerMetaStorageEnable()) {
             this.register();
         }
         if (log.isInfoEnabled()) {
@@ -185,7 +185,7 @@ public void shutdown() throws Exception {
 
         httpRetryer.shutdown();
 
-        if (eventMeshHttpConfiguration.isEventMeshServerRegistryEnable()) {
+        if (eventMeshHttpConfiguration.isEventMeshServerMetaStorageEnable()) {
             this.unRegister();
         }
         if (log.isInfoEnabled()) {

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshServer.java

@@ -103,7 +103,7 @@ public void init() throws Exception {
         if (configuration.isEventMeshServerSecurityEnable()) {
             acl.init();
         }
-        if (configuration.isEventMeshServerRegistryEnable()) {
+        if (configuration.isEventMeshServerMetaStorageEnable()) {
             metaStorage.init();
         }
         if (configuration.isEventMeshServerTraceEnable()) {
@@ -156,7 +156,7 @@ public void start() throws Exception {
                 acl.start();
             }
             // registry start
-            if (configuration.isEventMeshServerRegistryEnable()) {
+            if (configuration.isEventMeshServerMetaStorageEnable()) {
                 metaStorage.start();
             }
         }
@@ -186,7 +186,7 @@ public void shutdown() throws Exception {
             eventMeshBootstrap.shutdown();
         }
 
-        if (configuration != null && configuration.isEventMeshServerRegistryEnable()) {
+        if (configuration != null && configuration.isEventMeshServerMetaStorageEnable()) {
             metaStorage.shutdown();
         }
 

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java

@@ -115,7 +115,7 @@ public void init() throws Exception {
         super.setEventMeshTcpMonitor(new EventMeshTcpMonitor(this, metricsRegistries));
         super.getEventMeshTcpMonitor().init();
 
-        if (eventMeshTCPConfiguration.isEventMeshServerRegistryEnable()) {
+        if (eventMeshTCPConfiguration.isEventMeshServerMetaStorageEnable()) {
             eventMeshRebalanceService = new EventMeshRebalanceService(this, new EventMeshRebalanceImpl(this));
             eventMeshRebalanceService.init();
         }
@@ -138,7 +138,7 @@ public void start() throws Exception {
         clientSessionGroupMapping.start();
         tcpRetryer.start();
 
-        if (eventMeshTCPConfiguration.isEventMeshServerRegistryEnable()) {
+        if (eventMeshTCPConfiguration.isEventMeshServerMetaStorageEnable()) {
             this.register();
             eventMeshRebalanceService.start();
         }
@@ -159,7 +159,7 @@ public void shutdown() throws Exception {
 
         tcpRetryer.shutdown();
 
-        if (eventMeshTCPConfiguration.isEventMeshServerRegistryEnable()) {
+        if (eventMeshTCPConfiguration.isEventMeshServerMetaStorageEnable()) {
             eventMeshRebalanceService.shutdown();
             this.unRegister();
         }

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java

@@ -76,7 +76,7 @@ public AbstractEventProcessor(EventMeshHTTPServer eventMeshHTTPServer) {
      * Add a topic with subscribers to the service's metadata.
      */
     protected void updateMetadata() {
-        if (!eventMeshHTTPServer.getEventMeshHttpConfiguration().isEventMeshServerRegistryEnable()) {
+        if (!eventMeshHTTPServer.getEventMeshHttpConfiguration().isEventMeshServerMetaStorageEnable()) {
             return;
         }
 
@@ -122,7 +122,7 @@ protected String getTargetMesh(String consumerGroup, List<SubscriptionItem> subs
         throws Exception {
         // Currently only supports http
         CommonConfiguration httpConfiguration = eventMeshHTTPServer.getEventMeshHttpConfiguration();
-        if (!httpConfiguration.isEventMeshServerRegistryEnable()) {
+        if (!httpConfiguration.isEventMeshServerMetaStorageEnable()) {
             return "";
         }
 

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/producer/ProducerTopicManager.java

@@ -58,7 +58,7 @@ public void start() {
             synchronized (ProducerTopicManager.class) {
                 scheduledTask = scheduler.scheduleAtFixedRate(() -> {
                     try {
-                        if (!eventMeshServer.getConfiguration().isEventMeshServerRegistryEnable()) {
+                        if (!eventMeshServer.getConfiguration().isEventMeshServerMetaStorageEnable()) {
                             return;
                         }
                         List<EventMeshServicePubTopicInfo> pubTopicInfoList = eventMeshServer.getMetaStorage().findEventMeshServicePubTopicInfos();

eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/processor/RecommendProcessor.java

@@ -55,7 +55,7 @@ public void process(final Package pkg, final ChannelHandlerContext ctx, long sta
         long taskExecuteTime = System.currentTimeMillis();
         Package res = new Package();
         try {
-            if (!eventMeshTCPServer.getEventMeshTCPConfiguration().isEventMeshServerRegistryEnable()) {
+            if (!eventMeshTCPServer.getEventMeshTCPConfiguration().isEventMeshServerMetaStorageEnable()) {
                 throw new Exception("registry enable config is false, not support");
             }
             UserAgent user = (UserAgent) pkg.getBody();