This is an automated email from the ASF dual-hosted git repository.
mikexue 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 1644984ad [ISSUE #4423] Fix the meta-file error in the meta module
(#4424)
1644984ad is described below
commit 1644984adedc5c68079950fcbe0caec37d1dfc3d
Author: mike_xwm <[email protected]>
AuthorDate: Wed Aug 30 15:56:19 2023 +0800
[ISSUE #4423] Fix the meta-file error in the meta module (#4424)
* [ISSUE #4423] Fix the meta-file error in the meta module
* fix ci check error
---
build.gradle | 3 +--
.../{registry => meta}/consul/config/ConsulTLSConfig.java | 2 +-
.../{registry => meta}/consul/service/ConsulMetaService.java | 4 ++--
.../{registry => meta}/consul/service/HeatBeatScheduler.java | 2 +-
.../eventmesh/org.apache.eventmesh.api.meta.MetaService | 2 +-
.../src/test/java/ConsulMetaServiceTest.java | 2 +-
.../{registry => meta}/etcd/constant/EtcdConstant.java | 2 +-
.../{registry => meta}/etcd/factory/EtcdClientFactory.java | 4 ++--
.../{registry => meta}/etcd/factory/EtcdClientWrapper.java | 2 +-
.../eventmesh/{registry => meta}/etcd/factory/EtcdLeaseId.java | 2 +-
.../{registry => meta}/etcd/factory/EtcdStreamObserver.java | 2 +-
.../{registry => meta}/etcd/service/EtcdCustomService.java | 4 ++--
.../{registry => meta}/etcd/service/EtcdMetaService.java | 6 +++---
.../eventmesh/org.apache.eventmesh.api.meta.MetaService | 2 +-
.../eventmesh/registry/etcd/service/EtcdMetaServiceTest.java | 1 +
.../nacos/config/NacosRegistryConfiguration.java | 2 +-
.../{registry => meta}/nacos/constant/NacosConstant.java | 2 +-
.../{registry => meta}/nacos/service/NacosMetaService.java | 6 +++---
.../eventmesh/org.apache.eventmesh.api.meta.MetaService | 2 +-
.../eventmesh/registry/nacos/service/NacosMetaServiceTest.java | 1 +
.../zookeeper/config/ZKRegistryConfiguration.java | 2 +-
.../zookeeper/constant/ZookeeperConstant.java | 2 +-
.../{registry => meta}/zookeeper/pojo/EventMeshInstance.java | 2 +-
.../zookeeper/service/ZookeeperMetaService.java} | 10 +++++-----
.../eventmesh/org.apache.eventmesh.api.meta.MetaService | 2 +-
.../registry/zookeeper/service/ZookeeperMetaServiceTest.java | 7 ++++---
.../protocol/http/processor/inf/AbstractEventProcessor.java | 2 +-
27 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/build.gradle b/build.gradle
index 8f2293ae0..72789ba9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -279,10 +279,9 @@ subprojects {
Set<String> rootProject = ["eventmesh-admin",
"eventmesh-admin-rocketmq",
"eventmesh-common",
- "eventmesh-connector-api",
"eventmesh-storage-api",
"eventmesh-metrics-api",
- "eventmesh-registry-api",
+ "eventmesh-meta-api",
"eventmesh-trace-api",
"eventmesh-runtime",
"eventmesh-security-api",
diff --git
a/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/config/ConsulTLSConfig.java
b/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/config/ConsulTLSConfig.java
similarity index 96%
rename from
eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/config/ConsulTLSConfig.java
rename to
eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/config/ConsulTLSConfig.java
index a2096666a..1664a014d 100644
---
a/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/config/ConsulTLSConfig.java
+++
b/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/config/ConsulTLSConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.consul.config;
+package org.apache.eventmesh.meta.consul.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git
a/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/service/ConsulMetaService.java
b/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/service/ConsulMetaService.java
similarity index 98%
rename from
eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/service/ConsulMetaService.java
rename to
eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/service/ConsulMetaService.java
index 9267a3f78..2e3dbba18 100644
---
a/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/service/ConsulMetaService.java
+++
b/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/service/ConsulMetaService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.consul.service;
+package org.apache.eventmesh.meta.consul.service;
import org.apache.eventmesh.api.exception.MetaException;
import org.apache.eventmesh.api.meta.MetaService;
@@ -25,7 +25,7 @@ import
org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.config.ConfigService;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
-import org.apache.eventmesh.registry.consul.config.ConsulTLSConfig;
+import org.apache.eventmesh.meta.consul.config.ConsulTLSConfig;
import org.apache.commons.lang3.StringUtils;
diff --git
a/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/service/HeatBeatScheduler.java
b/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/service/HeatBeatScheduler.java
similarity index 98%
rename from
eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/service/HeatBeatScheduler.java
rename to
eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/service/HeatBeatScheduler.java
index d08a0f375..9ffc92de6 100644
---
a/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/registry/consul/service/HeatBeatScheduler.java
+++
b/eventmesh-meta/eventmesh-meta-consul/src/main/java/org/apache/eventmesh/meta/consul/service/HeatBeatScheduler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.consul.service;
+package org.apache.eventmesh.meta.consul.service;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
diff --git
a/eventmesh-meta/eventmesh-meta-consul/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
b/eventmesh-meta/eventmesh-meta-consul/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
index 25a808414..d4718366a 100644
---
a/eventmesh-meta/eventmesh-meta-consul/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
+++
b/eventmesh-meta/eventmesh-meta-consul/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-consul=org.apache.eventmesh.metaStorage.consul.service.ConsulMetaService
\ No newline at end of file
+consul=org.apache.eventmesh.meta.consul.service.ConsulMetaService
\ No newline at end of file
diff --git
a/eventmesh-meta/eventmesh-meta-consul/src/test/java/ConsulMetaServiceTest.java
b/eventmesh-meta/eventmesh-meta-consul/src/test/java/ConsulMetaServiceTest.java
index ae074f3fd..9bfbe6631 100644
---
a/eventmesh-meta/eventmesh-meta-consul/src/test/java/ConsulMetaServiceTest.java
+++
b/eventmesh-meta/eventmesh-meta-consul/src/test/java/ConsulMetaServiceTest.java
@@ -21,7 +21,7 @@ import
org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
-import org.apache.eventmesh.registry.consul.service.ConsulMetaService;
+import org.apache.eventmesh.meta.consul.service.ConsulMetaService;
import java.lang.reflect.Field;
import java.util.List;
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/constant/EtcdConstant.java
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/constant/EtcdConstant.java
similarity index 95%
rename from
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/constant/EtcdConstant.java
rename to
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/constant/EtcdConstant.java
index 16c31306d..7dbc08ee4 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/constant/EtcdConstant.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/constant/EtcdConstant.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.etcd.constant;
+package org.apache.eventmesh.meta.etcd.constant;
/**
* EtcdConstant.
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdClientFactory.java
similarity index 97%
rename from
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
rename to
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdClientFactory.java
index 797d68770..976b81221 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientFactory.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdClientFactory.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.etcd.factory;
+package org.apache.eventmesh.meta.etcd.factory;
import org.apache.eventmesh.api.exception.MetaException;
import org.apache.eventmesh.common.Constants;
-import org.apache.eventmesh.registry.etcd.constant.EtcdConstant;
+import org.apache.eventmesh.meta.etcd.constant.EtcdConstant;
import org.apache.commons.lang3.StringUtils;
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientWrapper.java
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdClientWrapper.java
similarity index 97%
rename from
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientWrapper.java
rename to
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdClientWrapper.java
index 5e0b8507b..a8f66798e 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdClientWrapper.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdClientWrapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.etcd.factory;
+package org.apache.eventmesh.meta.etcd.factory;
import io.etcd.jetcd.Auth;
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdLeaseId.java
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdLeaseId.java
similarity index 97%
rename from
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdLeaseId.java
rename to
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdLeaseId.java
index 28ee89f87..7b6c93a73 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdLeaseId.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdLeaseId.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.etcd.factory;
+package org.apache.eventmesh.meta.etcd.factory;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdStreamObserver.java
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdStreamObserver.java
similarity index 96%
rename from
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdStreamObserver.java
rename to
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdStreamObserver.java
index 91a403397..a8a5ce799 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/factory/EtcdStreamObserver.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/factory/EtcdStreamObserver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.etcd.factory;
+package org.apache.eventmesh.meta.etcd.factory;
import io.etcd.jetcd.lease.LeaseKeepAliveResponse;
import io.grpc.stub.StreamObserver;
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdCustomService.java
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdCustomService.java
similarity index 97%
rename from
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdCustomService.java
rename to
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdCustomService.java
index f804cb36b..6f81751a9 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdCustomService.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdCustomService.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.etcd.service;
+package org.apache.eventmesh.meta.etcd.service;
import org.apache.eventmesh.api.exception.MetaException;
import org.apache.eventmesh.api.meta.bo.EventMeshAppSubTopicInfo;
import org.apache.eventmesh.api.meta.bo.EventMeshServicePubTopicInfo;
import org.apache.eventmesh.common.Constants;
import org.apache.eventmesh.common.utils.JsonUtils;
-import org.apache.eventmesh.registry.etcd.constant.EtcdConstant;
+import org.apache.eventmesh.meta.etcd.constant.EtcdConstant;
import org.apache.commons.collections4.CollectionUtils;
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaService.java
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdMetaService.java
similarity index 98%
rename from
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaService.java
rename to
eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdMetaService.java
index 20acfee32..8e1d9af97 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaService.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/java/org/apache/eventmesh/meta/etcd/service/EtcdMetaService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.etcd.service;
+package org.apache.eventmesh.meta.etcd.service;
import org.apache.eventmesh.api.exception.MetaException;
import org.apache.eventmesh.api.meta.MetaService;
@@ -27,8 +27,8 @@ import org.apache.eventmesh.common.ThreadPoolFactory;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.common.utils.JsonUtils;
-import org.apache.eventmesh.registry.etcd.constant.EtcdConstant;
-import org.apache.eventmesh.registry.etcd.factory.EtcdClientFactory;
+import org.apache.eventmesh.meta.etcd.constant.EtcdConstant;
+import org.apache.eventmesh.meta.etcd.factory.EtcdClientFactory;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
b/eventmesh-meta/eventmesh-meta-etcd/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
index 75a8931ac..5f964d6f2 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-etcd=org.apache.eventmesh.metaStorage.etcd.service.EtcdRegistryService
\ No newline at end of file
+etcd=org.apache.eventmesh.meta.etcd.service.EtcdMetaService
\ No newline at end of file
diff --git
a/eventmesh-meta/eventmesh-meta-etcd/src/test/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaServiceTest.java
b/eventmesh-meta/eventmesh-meta-etcd/src/test/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaServiceTest.java
index 7a955f7ec..7a7da117a 100644
---
a/eventmesh-meta/eventmesh-meta-etcd/src/test/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaServiceTest.java
+++
b/eventmesh-meta/eventmesh-meta-etcd/src/test/java/org/apache/eventmesh/registry/etcd/service/EtcdMetaServiceTest.java
@@ -23,6 +23,7 @@ import
org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
+import org.apache.eventmesh.meta.etcd.service.EtcdMetaService;
import java.lang.reflect.Field;
import java.util.List;
diff --git
a/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/config/NacosRegistryConfiguration.java
b/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/config/NacosRegistryConfiguration.java
similarity index 97%
rename from
eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/config/NacosRegistryConfiguration.java
rename to
eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/config/NacosRegistryConfiguration.java
index 1c4a078eb..0f72ede9b 100644
---
a/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/config/NacosRegistryConfiguration.java
+++
b/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/config/NacosRegistryConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.nacos.config;
+package org.apache.eventmesh.meta.nacos.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git
a/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/constant/NacosConstant.java
b/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/constant/NacosConstant.java
similarity index 95%
rename from
eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/constant/NacosConstant.java
rename to
eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/constant/NacosConstant.java
index 0164dc133..94281723a 100644
---
a/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/constant/NacosConstant.java
+++
b/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/constant/NacosConstant.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.nacos.constant;
+package org.apache.eventmesh.meta.nacos.constant;
/**
* NacosConstant.
diff --git
a/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/service/NacosMetaService.java
b/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/service/NacosMetaService.java
similarity index 98%
rename from
eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/service/NacosMetaService.java
rename to
eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/service/NacosMetaService.java
index db28301d0..b64d5ccca 100644
---
a/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/registry/nacos/service/NacosMetaService.java
+++
b/eventmesh-meta/eventmesh-meta-nacos/src/main/java/org/apache/eventmesh/meta/nacos/service/NacosMetaService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.nacos.service;
+package org.apache.eventmesh.meta.nacos.service;
import org.apache.eventmesh.api.exception.MetaException;
import org.apache.eventmesh.api.meta.MetaService;
@@ -25,8 +25,8 @@ import
org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.config.ConfigService;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
-import org.apache.eventmesh.registry.nacos.config.NacosRegistryConfiguration;
-import org.apache.eventmesh.registry.nacos.constant.NacosConstant;
+import org.apache.eventmesh.meta.nacos.config.NacosRegistryConfiguration;
+import org.apache.eventmesh.meta.nacos.constant.NacosConstant;
import org.apache.commons.lang3.StringUtils;
diff --git
a/eventmesh-meta/eventmesh-meta-nacos/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
b/eventmesh-meta/eventmesh-meta-nacos/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
index 9966eee4d..44b15a519 100644
---
a/eventmesh-meta/eventmesh-meta-nacos/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
+++
b/eventmesh-meta/eventmesh-meta-nacos/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-nacos=org.apache.eventmesh.metaStorage.nacos.service.NacosMetaService
\ No newline at end of file
+nacos=org.apache.eventmesh.meta.nacos.service.NacosMetaService
\ No newline at end of file
diff --git
a/eventmesh-meta/eventmesh-meta-nacos/src/test/java/org/apache/eventmesh/registry/nacos/service/NacosMetaServiceTest.java
b/eventmesh-meta/eventmesh-meta-nacos/src/test/java/org/apache/eventmesh/registry/nacos/service/NacosMetaServiceTest.java
index bfdf990d6..778ffaccb 100644
---
a/eventmesh-meta/eventmesh-meta-nacos/src/test/java/org/apache/eventmesh/registry/nacos/service/NacosMetaServiceTest.java
+++
b/eventmesh-meta/eventmesh-meta-nacos/src/test/java/org/apache/eventmesh/registry/nacos/service/NacosMetaServiceTest.java
@@ -22,6 +22,7 @@ import
org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
+import org.apache.eventmesh.meta.nacos.service.NacosMetaService;
import java.lang.reflect.Field;
diff --git
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/config/ZKRegistryConfiguration.java
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/config/ZKRegistryConfiguration.java
similarity index 97%
rename from
eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/config/ZKRegistryConfiguration.java
rename to
eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/config/ZKRegistryConfiguration.java
index 13023f0cb..bec8faae7 100644
---
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/config/ZKRegistryConfiguration.java
+++
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/config/ZKRegistryConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.zookeeper.config;
+package org.apache.eventmesh.meta.zookeeper.config;
import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.common.config.ConfigFiled;
diff --git
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/constant/ZookeeperConstant.java
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/constant/ZookeeperConstant.java
similarity index 94%
rename from
eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/constant/ZookeeperConstant.java
rename to
eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/constant/ZookeeperConstant.java
index 4369ff14f..6e142848f 100644
---
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/constant/ZookeeperConstant.java
+++
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/constant/ZookeeperConstant.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.zookeeper.constant;
+package org.apache.eventmesh.meta.zookeeper.constant;
public class ZookeeperConstant {
diff --git
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/pojo/EventMeshInstance.java
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/pojo/EventMeshInstance.java
similarity index 95%
rename from
eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/pojo/EventMeshInstance.java
rename to
eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/pojo/EventMeshInstance.java
index 46f0eb27e..178ec95e2 100644
---
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/pojo/EventMeshInstance.java
+++
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/pojo/EventMeshInstance.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.zookeeper.pojo;
+package org.apache.eventmesh.meta.zookeeper.pojo;
import java.io.Serializable;
diff --git
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperRegistryService.java
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/service/ZookeeperMetaService.java
similarity index 97%
rename from
eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperRegistryService.java
rename to
eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/service/ZookeeperMetaService.java
index d9f40bd4b..701a6a918 100644
---
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperRegistryService.java
+++
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/java/org/apache/eventmesh/meta/zookeeper/service/ZookeeperMetaService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.eventmesh.registry.zookeeper.service;
+package org.apache.eventmesh.meta.zookeeper.service;
import org.apache.eventmesh.api.exception.MetaException;
@@ -28,9 +28,9 @@ import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.config.ConfigService;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.common.utils.JsonUtils;
-import org.apache.eventmesh.registry.zookeeper.config.ZKRegistryConfiguration;
-import org.apache.eventmesh.registry.zookeeper.constant.ZookeeperConstant;
-import org.apache.eventmesh.registry.zookeeper.pojo.EventMeshInstance;
+import org.apache.eventmesh.meta.zookeeper.config.ZKRegistryConfiguration;
+import org.apache.eventmesh.meta.zookeeper.constant.ZookeeperConstant;
+import org.apache.eventmesh.meta.zookeeper.pojo.EventMeshInstance;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -59,7 +59,7 @@ import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@Slf4j
-public class ZookeeperRegistryService implements MetaService {
+public class ZookeeperMetaService implements MetaService {
private final AtomicBoolean initStatus = new AtomicBoolean(false);
diff --git
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
index 81956651d..66bf19b4f 100644
---
a/eventmesh-meta/eventmesh-meta-zookeeper/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
+++
b/eventmesh-meta/eventmesh-meta-zookeeper/src/main/resources/META-INF/eventmesh/org.apache.eventmesh.api.meta.MetaService
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-zookeeper=org.apache.eventmesh.metaStorage.zookeeper.service.ZookeeperRegistryService
\ No newline at end of file
+zookeeper=org.apache.eventmesh.meta.zookeeper.service.ZookeeperMetaService
\ No newline at end of file
diff --git
a/eventmesh-meta/eventmesh-meta-zookeeper/src/test/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperMetaServiceTest.java
b/eventmesh-meta/eventmesh-meta-zookeeper/src/test/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperMetaServiceTest.java
index 593a6023f..ede35a75e 100644
---
a/eventmesh-meta/eventmesh-meta-zookeeper/src/test/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperMetaServiceTest.java
+++
b/eventmesh-meta/eventmesh-meta-zookeeper/src/test/java/org/apache/eventmesh/registry/zookeeper/service/ZookeeperMetaServiceTest.java
@@ -22,6 +22,7 @@ import
org.apache.eventmesh.api.meta.dto.EventMeshRegisterInfo;
import org.apache.eventmesh.api.meta.dto.EventMeshUnRegisterInfo;
import org.apache.eventmesh.common.config.CommonConfiguration;
import org.apache.eventmesh.common.utils.ConfigurationContextUtil;
+import org.apache.eventmesh.meta.zookeeper.service.ZookeeperMetaService;
import org.apache.curator.test.TestingServer;
@@ -49,7 +50,7 @@ public class ZookeeperMetaServiceTest {
@Mock
private EventMeshUnRegisterInfo eventMeshUnRegisterInfo;
- private ZookeeperRegistryService zkRegistryService;
+ private ZookeeperMetaService zkRegistryService;
private TestingServer testingServer;
@@ -58,7 +59,7 @@ public class ZookeeperMetaServiceTest {
testingServer = new TestingServer(1500, true);
testingServer.start();
- zkRegistryService = new ZookeeperRegistryService();
+ zkRegistryService = new ZookeeperMetaService();
CommonConfiguration configuration = new CommonConfiguration();
configuration.setNamesrvAddr("127.0.0.1:1500");
configuration.setEventMeshName("eventmesh");
@@ -103,7 +104,7 @@ public class ZookeeperMetaServiceTest {
zkRegistryService.start();
zkRegistryService.shutdown();
- Class<ZookeeperRegistryService> zkRegistryServiceClass =
ZookeeperRegistryService.class;
+ Class<ZookeeperMetaService> zkRegistryServiceClass =
ZookeeperMetaService.class;
Field initStatus =
zkRegistryServiceClass.getDeclaredField("initStatus");
initStatus.setAccessible(true);
Object initStatusField = initStatus.get(zkRegistryService);
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
index d960981dc..9ca2403fe 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/processor/inf/AbstractEventProcessor.java
@@ -30,7 +30,7 @@ import
org.apache.eventmesh.common.utils.ConfigurationContextUtil;
import org.apache.eventmesh.common.utils.IPUtils;
import org.apache.eventmesh.common.utils.JsonUtils;
import org.apache.eventmesh.common.utils.ThreadUtils;
-import org.apache.eventmesh.registry.nacos.constant.NacosConstant;
+import org.apache.eventmesh.meta.nacos.constant.NacosConstant;
import org.apache.eventmesh.runtime.boot.EventMeshHTTPServer;
import org.apache.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
