This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new defdde8b6 refactor shenyu reigstry (#4838)
defdde8b6 is described below
commit defdde8b67e3ea60e4dd636942122d91c403ef02
Author: xiaoyu <[email protected]>
AuthorDate: Thu Jul 13 17:46:53 2023 +0800
refactor shenyu reigstry (#4838)
* refactor plugin and springboot starter pom
* refactor plugin and springboot starter pom
* fix
* fix
* fix
* fix
* fix
---
pom.xml | 1 +
shenyu-bootstrap/pom.xml | 6 +++---
.../shenyu-examples-sdk-grpc-consumer/pom.xml | 2 +-
.../shenyu-examples-sdk-springcloud-consumer/pom.xml | 2 +-
.../shenyu-integrated-test-sdk-alibaba-dubbo/pom.xml | 2 +-
.../shenyu-integrated-test-sdk-apache-dubbo/pom.xml | 2 +-
.../shenyu-integrated-test-sdk-http/pom.xml | 2 +-
.../pom.xml | 2 +-
shenyu-register-center/pom.xml | 1 -
...ter.instance.api.ShenyuInstanceRegisterRepository | 17 -----------------
.../pom.xml | 20 ++++++++++----------
.../shenyu-registry-api}/pom.xml | 4 ++--
.../api/ShenyuInstanceRegisterRepository.java | 6 +++---
.../shenyu/registry}/api/config/RegisterConfig.java | 2 +-
.../shenyu/registry}/api/entity/InstanceEntity.java | 2 +-
.../registry}/api/path/InstancePathConstants.java | 2 +-
.../shenyu-registry-apollo}/pom.xml | 6 +++---
.../apache/shenyu/registry}/apollo/ApolloClient.java | 2 +-
.../apache/shenyu/registry}/apollo/ApolloConfig.java | 2 +-
.../apollo/ApolloInstanceRegisterRepository.java | 10 +++++-----
...nyu.registry.api.ShenyuInstanceRegisterRepository | 2 +-
.../shenyu-registry-consul}/pom.xml | 6 +++---
.../consul/ConsulInstanceRegisterRepository.java | 8 ++++----
.../apache/shenyu/registry}/consul/TtlScheduler.java | 2 +-
...nyu.registry.api.ShenyuInstanceRegisterRepository | 2 +-
.../consul/ConsulInstanceRegisterRepositoryTest.java | 10 +++++-----
.../shenyu-registry-core}/pom.xml | 14 +++++++-------
.../ShenyuInstanceRegisterRepositoryFactory.java | 6 +++---
.../ShenyuInstanceRegisterRepositoryFactoryTest.java | 4 ++--
.../shenyu-registry-etcd}/pom.xml | 6 +++---
.../org/apache/shenyu/registry}/etcd/EtcdClient.java | 2 +-
.../etcd/EtcdInstanceRegisterRepository.java | 10 +++++-----
...nyu.registry.api.ShenyuInstanceRegisterRepository | 2 +-
.../apache/shenyu/registry}/etcd/EtcdClientTest.java | 2 +-
.../etcd/EtcdInstanceRegisterRepositoryTest.java | 8 ++++----
.../shenyu-registry-eureka}/pom.xml | 6 +++---
.../eureka/EurekaInstanceRegisterRepository.java | 8 ++++----
...nyu.registry.api.ShenyuInstanceRegisterRepository | 2 +-
.../eureka/EurekaInstanceRegisterRepositoryTest.java | 4 ++--
.../shenyu-registry-nacos}/pom.xml | 6 +++---
.../nacos/NacosInstanceRegisterRepository.java | 8 ++++----
...nyu.registry.api.ShenyuInstanceRegisterRepository | 2 +-
.../nacos/NacosInstanceRegisterRepositoryTest.java | 4 ++--
.../shenyu-registry-zookeeper}/pom.xml | 6 +++---
.../shenyu/registry}/zookeeper/ZookeeperClient.java | 2 +-
.../shenyu/registry}/zookeeper/ZookeeperConfig.java | 2 +-
.../ZookeeperInstanceRegisterRepository.java | 10 +++++-----
...nyu.registry.api.ShenyuInstanceRegisterRepository | 2 +-
.../registry}/zookeeper/ZookeeperClientTest.java | 2 +-
.../ZookeeperInstanceRegisterRepositoryTest.java | 8 ++++----
shenyu-sdk/shenyu-sdk-core/pom.xml | 2 +-
.../sdk/core/client/AbstractShenyuSdkClient.java | 6 +++---
.../shenyu/sdk/core/client/ShenyuSdkClient.java | 4 ++--
.../shenyu/sdk/okhttp/OkHttpShenyuSdkClientTest.java | 6 +++---
shenyu-spring-boot-starter/pom.xml | 2 +-
.../src/main/resources/META-INF/spring.provides | 1 -
.../pom.xml | 4 ++--
.../starter/registry/RegistryListener.java} | 14 +++++++-------
.../registry/ShenyuRegistryConfiguration.java} | 12 ++++++------
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/META-INF/spring.provides | 1 +
.../starter/sdk/ShenyuSdkAutoConfiguration.java | 6 +++---
62 files changed, 146 insertions(+), 163 deletions(-)
diff --git a/pom.xml b/pom.xml
index 27d66e554..71f5d08f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
<module>shenyu-alert</module>
<module>shenyu-sdk</module>
<module>shenyu-discovery</module>
+ <module>shenyu-registry</module>
<module>shenyu-kubernetes-controller</module>
</modules>
diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
index 9f3e6c974..462b65520 100644
--- a/shenyu-bootstrap/pom.xml
+++ b/shenyu-bootstrap/pom.xml
@@ -507,13 +507,13 @@
<artifactId>shenyu-spring-boot-starter-sync-data-consul</artifactId>
<version>${project.version}</version>
</dependency>
- <!--shenyu instance start-->
+ <!--shenyu registry start-->
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-instance</artifactId>
+ <artifactId>shenyu-spring-boot-starter-registry</artifactId>
<version>${project.version}</version>
</dependency>
- <!--shenyu instance end-->
+ <!--shenyu registry end-->
<!--shenyu logging-rocketmq plugin start-->
<dependency>
diff --git
a/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-grpc/shenyu-examples-sdk-grpc-consumer/pom.xml
b/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-grpc/shenyu-examples-sdk-grpc-consumer/pom.xml
index 766bb62fa..b95eba5b4 100644
---
a/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-grpc/shenyu-examples-sdk-grpc-consumer/pom.xml
+++
b/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-grpc/shenyu-examples-sdk-grpc-consumer/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-eureka</artifactId>
+ <artifactId>shenyu-registry-eureka</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
diff --git
a/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-springcloud/shenyu-examples-sdk-springcloud-consumer/pom.xml
b/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-springcloud/shenyu-examples-sdk-springcloud-consumer/pom.xml
index 833ec4290..d6c6b7a52 100644
---
a/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-springcloud/shenyu-examples-sdk-springcloud-consumer/pom.xml
+++
b/shenyu-examples/shenyu-examples-sdk/shenyu-examples-sdk-springcloud/shenyu-examples-sdk-springcloud-consumer/pom.xml
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-eureka</artifactId>
+ <artifactId>shenyu-registry-eureka</artifactId>
<version>2.6.0-SNAPSHOT</version>
<exclusions>
<exclusion>
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-sdk-alibaba-dubbo/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-sdk-alibaba-dubbo/pom.xml
index eef6a4e3d..964e10ce5 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sdk-alibaba-dubbo/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sdk-alibaba-dubbo/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-instance</artifactId>
+ <artifactId>shenyu-spring-boot-starter-registry</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/pom.xml
index d952be5e5..2fd3dd7f3 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sdk-apache-dubbo/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-instance</artifactId>
+ <artifactId>shenyu-spring-boot-starter-registry</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/shenyu-integrated-test/shenyu-integrated-test-sdk-http/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-sdk-http/pom.xml
index e3f40be0f..a8fdd9200 100644
--- a/shenyu-integrated-test/shenyu-integrated-test-sdk-http/pom.xml
+++ b/shenyu-integrated-test/shenyu-integrated-test-sdk-http/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-instance</artifactId>
+ <artifactId>shenyu-spring-boot-starter-registry</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/shenyu-integrated-test/shenyu-integrated-test-upload-plugin/shenyu-integrated-test-upload-plugin-case/pom.xml
b/shenyu-integrated-test/shenyu-integrated-test-upload-plugin/shenyu-integrated-test-upload-plugin-case/pom.xml
index cad5f51d2..39749fe9d 100644
---
a/shenyu-integrated-test/shenyu-integrated-test-upload-plugin/shenyu-integrated-test-upload-plugin-case/pom.xml
+++
b/shenyu-integrated-test/shenyu-integrated-test-upload-plugin/shenyu-integrated-test-upload-plugin-case/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-spring-boot-starter-instance</artifactId>
+ <artifactId>shenyu-spring-boot-starter-registry</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/shenyu-register-center/pom.xml b/shenyu-register-center/pom.xml
index bf4e9bd52..5160dc993 100644
--- a/shenyu-register-center/pom.xml
+++ b/shenyu-register-center/pom.xml
@@ -30,7 +30,6 @@
<module>shenyu-register-common</module>
<module>shenyu-register-client</module>
<module>shenyu-register-client-server</module>
- <module>shenyu-register-instance</module>
</modules>
</project>
\ No newline at end of file
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
b/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
deleted file mode 100644
index 92fbfb1d3..000000000
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-zookeeper=org.apache.shenyu.register.instance.zookeeper.ZookeeperInstanceRegisterRepository
diff --git a/shenyu-register-center/shenyu-register-instance/pom.xml
b/shenyu-registry/pom.xml
similarity index 69%
rename from shenyu-register-center/shenyu-register-instance/pom.xml
rename to shenyu-registry/pom.xml
index c00de6c15..689d8d0a4 100644
--- a/shenyu-register-center/shenyu-register-instance/pom.xml
+++ b/shenyu-registry/pom.xml
@@ -19,22 +19,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-center</artifactId>
+ <artifactId>shenyu</artifactId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<packaging>pom</packaging>
<modules>
- <module>shenyu-register-instance-api</module>
- <module>shenyu-register-instance-core</module>
- <module>shenyu-register-instance-zookeeper</module>
- <module>shenyu-register-instance-etcd</module>
- <module>shenyu-register-instance-consul</module>
- <module>shenyu-register-instance-nacos</module>
- <module>shenyu-register-instance-apollo</module>
- <module>shenyu-register-instance-eureka</module>
+ <module>shenyu-registry-api</module>
+ <module>shenyu-registry-core</module>
+ <module>shenyu-registry-zookeeper</module>
+ <module>shenyu-registry-etcd</module>
+ <module>shenyu-registry-consul</module>
+ <module>shenyu-registry-nacos</module>
+ <module>shenyu-registry-apollo</module>
+ <module>shenyu-registry-eureka</module>
</modules>
</project>
\ No newline at end of file
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/pom.xml
b/shenyu-registry/shenyu-registry-api/pom.xml
similarity index 92%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/pom.xml
rename to shenyu-registry/shenyu-registry-api/pom.xml
index e0b56d385..490e61ee7 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/pom.xml
+++ b/shenyu-registry/shenyu-registry-api/pom.xml
@@ -19,11 +19,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance-api</artifactId>
+ <artifactId>shenyu-registry-api</artifactId>
<dependencies>
<dependency>
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/ShenyuInstanceRegisterRepository.java
b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java
similarity index 89%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/ShenyuInstanceRegisterRepository.java
rename to
shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java
index 7d951f60b..acf831610 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/ShenyuInstanceRegisterRepository.java
+++
b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/ShenyuInstanceRegisterRepository.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.api;
+package org.apache.shenyu.registry.api;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
import org.apache.shenyu.spi.SPI;
import java.util.Collections;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/config/RegisterConfig.java
b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/config/RegisterConfig.java
similarity index 98%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/config/RegisterConfig.java
rename to
shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/config/RegisterConfig.java
index cd72729f2..619cad1be 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/config/RegisterConfig.java
+++
b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/config/RegisterConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.api.config;
+package org.apache.shenyu.registry.api.config;
import java.util.Properties;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/entity/InstanceEntity.java
b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java
similarity index 98%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/entity/InstanceEntity.java
rename to
shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java
index 5fcc6bca9..065c30a26 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/entity/InstanceEntity.java
+++
b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/entity/InstanceEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.api.entity;
+package org.apache.shenyu.registry.api.entity;
import java.util.Objects;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/path/InstancePathConstants.java
b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/path/InstancePathConstants.java
similarity index 97%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/path/InstancePathConstants.java
rename to
shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/path/InstancePathConstants.java
index df1a293f8..b17721f63 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-api/src/main/java/org/apache/shenyu/register/instance/api/path/InstancePathConstants.java
+++
b/shenyu-registry/shenyu-registry-api/src/main/java/org/apache/shenyu/registry/api/path/InstancePathConstants.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.api.path;
+package org.apache.shenyu.registry.api.path;
/**
* zookeeper register center.
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/pom.xml
b/shenyu-registry/shenyu-registry-apollo/pom.xml
similarity index 90%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/pom.xml
rename to shenyu-registry/shenyu-registry-apollo/pom.xml
index 26ea608df..404ae230a 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/pom.xml
+++ b/shenyu-registry/shenyu-registry-apollo/pom.xml
@@ -19,16 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance-apollo</artifactId>
+ <artifactId>shenyu-registry-apollo</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-api</artifactId>
+ <artifactId>shenyu-registry-api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloClient.java
b/shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloClient.java
similarity index 98%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloClient.java
rename to
shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloClient.java
index 10c9f04ab..23b6915fb 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloClient.java
+++
b/shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloClient.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.apollo;
+package org.apache.shenyu.registry.apollo;
import com.ctrip.framework.apollo.openapi.client.ApolloOpenApiClient;
import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloConfig.java
b/shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloConfig.java
similarity index 98%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloConfig.java
rename to
shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloConfig.java
index 04933f8e8..6eb3c10cd 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloConfig.java
+++
b/shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.apollo;
+package org.apache.shenyu.registry.apollo;
public class ApolloConfig {
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloInstanceRegisterRepository.java
b/shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloInstanceRegisterRepository.java
similarity index 95%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloInstanceRegisterRepository.java
rename to
shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloInstanceRegisterRepository.java
index 9c3dcecfb..8a5a56190 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/java/org/apache/shenyu/register/instance/apollo/ApolloInstanceRegisterRepository.java
+++
b/shenyu-registry/shenyu-registry-apollo/src/main/java/org/apache/shenyu/registry/apollo/ApolloInstanceRegisterRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.apollo;
+package org.apache.shenyu.registry.apollo;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigChangeListener;
@@ -24,10 +24,10 @@ import com.ctrip.framework.apollo.core.ConfigConsts;
import com.google.common.collect.Maps;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.utils.GsonUtils;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
-import org.apache.shenyu.register.instance.api.path.InstancePathConstants;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.path.InstancePathConstants;
import org.apache.shenyu.spi.Join;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
b/shenyu-registry/shenyu-registry-apollo/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
similarity index 91%
copy from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
copy to
shenyu-registry/shenyu-registry-apollo/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
index d17f66abd..76f995b68 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
+++
b/shenyu-registry/shenyu-registry-apollo/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-etcd=org.apache.shenyu.register.instance.etcd.EtcdInstanceRegisterRepository
+apollo=org.apache.shenyu.registry.apollo.ApolloInstanceRegisterRepository
\ No newline at end of file
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/pom.xml
b/shenyu-registry/shenyu-registry-consul/pom.xml
similarity index 89%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/pom.xml
rename to shenyu-registry/shenyu-registry-consul/pom.xml
index 68d0c76f2..71273ba3a 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/pom.xml
+++ b/shenyu-registry/shenyu-registry-consul/pom.xml
@@ -18,17 +18,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<groupId>org.apache.shenyu</groupId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance-consul</artifactId>
+ <artifactId>shenyu-registry-consul</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-api</artifactId>
+ <artifactId>shenyu-registry-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/java/org/apache/shenyu/register/instance/consul/ConsulInstanceRegisterRepository.java
b/shenyu-registry/shenyu-registry-consul/src/main/java/org/apache/shenyu/registry/consul/ConsulInstanceRegisterRepository.java
similarity index 96%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/java/org/apache/shenyu/register/instance/consul/ConsulInstanceRegisterRepository.java
rename to
shenyu-registry/shenyu-registry-consul/src/main/java/org/apache/shenyu/registry/consul/ConsulInstanceRegisterRepository.java
index 478a6146e..4551bf1b3 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/java/org/apache/shenyu/register/instance/consul/ConsulInstanceRegisterRepository.java
+++
b/shenyu-registry/shenyu-registry-consul/src/main/java/org/apache/shenyu/registry/consul/ConsulInstanceRegisterRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.consul;
+package org.apache.shenyu.registry.consul;
import com.ecwid.consul.v1.ConsulClient;
import com.ecwid.consul.v1.QueryParams;
@@ -29,9 +29,9 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shenyu.common.concurrent.ShenyuThreadFactory;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.utils.GsonUtils;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
import org.apache.shenyu.spi.Join;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/java/org/apache/shenyu/register/instance/consul/TtlScheduler.java
b/shenyu-registry/shenyu-registry-consul/src/main/java/org/apache/shenyu/registry/consul/TtlScheduler.java
similarity index 98%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/java/org/apache/shenyu/register/instance/consul/TtlScheduler.java
rename to
shenyu-registry/shenyu-registry-consul/src/main/java/org/apache/shenyu/registry/consul/TtlScheduler.java
index 80c919869..a4aec6d5d 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/java/org/apache/shenyu/register/instance/consul/TtlScheduler.java
+++
b/shenyu-registry/shenyu-registry-consul/src/main/java/org/apache/shenyu/registry/consul/TtlScheduler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.consul;
+package org.apache.shenyu.registry.consul;
import com.ecwid.consul.v1.ConsulClient;
import org.apache.commons.logging.Log;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
b/shenyu-registry/shenyu-registry-consul/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
similarity index 90%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
rename to
shenyu-registry/shenyu-registry-consul/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
index 3a403842a..a1f417b87 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
+++
b/shenyu-registry/shenyu-registry-consul/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-nacos=org.apache.shenyu.register.instance.nacos.NacosInstanceRegisterRepository
+consul=org.apache.shenyu.registry.consul.ConsulInstanceRegisterRepository
\ No newline at end of file
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/test/java/org/apache/shenyu/register/instance/consul/ConsulInstanceRegisterRepositoryTest.java
b/shenyu-registry/shenyu-registry-consul/src/test/java/org/apache/shenyu/registry/consul/ConsulInstanceRegisterRepositoryTest.java
similarity index 93%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/test/java/org/apache/shenyu/register/instance/consul/ConsulInstanceRegisterRepositoryTest.java
rename to
shenyu-registry/shenyu-registry-consul/src/test/java/org/apache/shenyu/registry/consul/ConsulInstanceRegisterRepositoryTest.java
index 2f914953a..15e532070 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/test/java/org/apache/shenyu/register/instance/consul/ConsulInstanceRegisterRepositoryTest.java
+++
b/shenyu-registry/shenyu-registry-consul/src/test/java/org/apache/shenyu/registry/consul/ConsulInstanceRegisterRepositoryTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.consul;
+package org.apache.shenyu.registry.consul;
import com.ecwid.consul.v1.ConsulClient;
import com.ecwid.consul.v1.agent.model.NewService;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
-import org.apache.shenyu.register.instance.api.path.InstancePathConstants;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.path.InstancePathConstants;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.MockedConstruction;
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.mockConstruction;
import static org.mockito.Mockito.when;
-class ConsulInstanceRegisterRepositoryTest {
+public final class ConsulInstanceRegisterRepositoryTest {
private ConsulInstanceRegisterRepository repository;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/pom.xml
b/shenyu-registry/shenyu-registry-core/pom.xml
similarity index 82%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/pom.xml
rename to shenyu-registry/shenyu-registry-core/pom.xml
index 0f70a8b22..45be7f256 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/pom.xml
+++ b/shenyu-registry/shenyu-registry-core/pom.xml
@@ -19,11 +19,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance-core</artifactId>
+ <artifactId>shenyu-registry-core</artifactId>
<dependencies>
<dependency>
@@ -33,27 +33,27 @@
</dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-zookeeper</artifactId>
+ <artifactId>shenyu-registry-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-etcd</artifactId>
+ <artifactId>shenyu-registry-etcd</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-consul</artifactId>
+ <artifactId>shenyu-registry-consul</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-nacos</artifactId>
+ <artifactId>shenyu-registry-nacos</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-apollo</artifactId>
+ <artifactId>shenyu-registry-apollo</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/src/main/java/org/apache/shenyu/register/instance/core/ShenyuInstanceRegisterRepositoryFactory.java
b/shenyu-registry/shenyu-registry-core/src/main/java/org/apache/shenyu/registry/core/ShenyuInstanceRegisterRepositoryFactory.java
similarity index 92%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/src/main/java/org/apache/shenyu/register/instance/core/ShenyuInstanceRegisterRepositoryFactory.java
rename to
shenyu-registry/shenyu-registry-core/src/main/java/org/apache/shenyu/registry/core/ShenyuInstanceRegisterRepositoryFactory.java
index c3e87ff27..2984467d3 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/src/main/java/org/apache/shenyu/register/instance/core/ShenyuInstanceRegisterRepositoryFactory.java
+++
b/shenyu-registry/shenyu-registry-core/src/main/java/org/apache/shenyu/registry/core/ShenyuInstanceRegisterRepositoryFactory.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.core;
+package org.apache.shenyu.registry.core;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
import org.apache.shenyu.spi.ExtensionLoader;
import java.util.Map;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/src/test/java/org/apache/shenyu/register/instance/core/ShenyuInstanceRegisterRepositoryFactoryTest.java
b/shenyu-registry/shenyu-registry-core/src/test/java/org/apache/shenyu/registry/core/ShenyuInstanceRegisterRepositoryFactoryTest.java
similarity index 94%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/src/test/java/org/apache/shenyu/register/instance/core/ShenyuInstanceRegisterRepositoryFactoryTest.java
rename to
shenyu-registry/shenyu-registry-core/src/test/java/org/apache/shenyu/registry/core/ShenyuInstanceRegisterRepositoryFactoryTest.java
index fe13c94e3..d7c40e9fe 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-core/src/test/java/org/apache/shenyu/register/instance/core/ShenyuInstanceRegisterRepositoryFactoryTest.java
+++
b/shenyu-registry/shenyu-registry-core/src/test/java/org/apache/shenyu/registry/core/ShenyuInstanceRegisterRepositoryFactoryTest.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.core;
+package org.apache.shenyu.registry.core;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
import org.apache.shenyu.spi.ExtensionLoader;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/pom.xml
b/shenyu-registry/shenyu-registry-etcd/pom.xml
similarity index 93%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/pom.xml
rename to shenyu-registry/shenyu-registry-etcd/pom.xml
index a45d54616..49fda35b3 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/pom.xml
+++ b/shenyu-registry/shenyu-registry-etcd/pom.xml
@@ -19,16 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance-etcd</artifactId>
+ <artifactId>shenyu-registry-etcd</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-api</artifactId>
+ <artifactId>shenyu-registry-api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/java/org/apache/shenyu/register/instance/etcd/EtcdClient.java
b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java
similarity index 99%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/java/org/apache/shenyu/register/instance/etcd/EtcdClient.java
rename to
shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java
index 242468bfb..283626a07 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/java/org/apache/shenyu/register/instance/etcd/EtcdClient.java
+++
b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdClient.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.etcd;
+package org.apache.shenyu.registry.etcd;
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/java/org/apache/shenyu/register/instance/etcd/EtcdInstanceRegisterRepository.java
b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java
similarity index 93%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/java/org/apache/shenyu/register/instance/etcd/EtcdInstanceRegisterRepository.java
rename to
shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java
index 5e043ca70..24b37ea2b 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/java/org/apache/shenyu/register/instance/etcd/EtcdInstanceRegisterRepository.java
+++
b/shenyu-registry/shenyu-registry-etcd/src/main/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepository.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.etcd;
+package org.apache.shenyu.registry.etcd;
import io.etcd.jetcd.Watch;
import io.etcd.jetcd.watch.WatchEvent;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.utils.GsonUtils;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
-import org.apache.shenyu.register.instance.api.path.InstancePathConstants;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.path.InstancePathConstants;
import org.apache.shenyu.spi.Join;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
b/shenyu-registry/shenyu-registry-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
similarity index 90%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
rename to
shenyu-registry/shenyu-registry-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
index 8ab67f606..a9742e259 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-apollo/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
+++
b/shenyu-registry/shenyu-registry-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apollo=org.apache.shenyu.register.instance.apollo.ApolloInstanceRegisterRepository
\ No newline at end of file
+etcd=org.apache.shenyu.registry.etcd.EtcdInstanceRegisterRepository
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/test/java/org/apache/shenyu/register/instance/etcd/EtcdClientTest.java
b/shenyu-registry/shenyu-registry-etcd/src/test/java/org/apache/shenyu/registry/etcd/EtcdClientTest.java
similarity index 99%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/test/java/org/apache/shenyu/register/instance/etcd/EtcdClientTest.java
rename to
shenyu-registry/shenyu-registry-etcd/src/test/java/org/apache/shenyu/registry/etcd/EtcdClientTest.java
index 2b7b9a74d..d357e9775 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/test/java/org/apache/shenyu/register/instance/etcd/EtcdClientTest.java
+++
b/shenyu-registry/shenyu-registry-etcd/src/test/java/org/apache/shenyu/registry/etcd/EtcdClientTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.etcd;
+package org.apache.shenyu.registry.etcd;
import io.etcd.jetcd.Client;
import io.etcd.jetcd.ClientBuilder;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/test/java/org/apache/shenyu/register/instance/etcd/EtcdInstanceRegisterRepositoryTest.java
b/shenyu-registry/shenyu-registry-etcd/src/test/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepositoryTest.java
similarity index 95%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/test/java/org/apache/shenyu/register/instance/etcd/EtcdInstanceRegisterRepositoryTest.java
rename to
shenyu-registry/shenyu-registry-etcd/src/test/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepositoryTest.java
index b94cec729..bdd631ec9 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/test/java/org/apache/shenyu/register/instance/etcd/EtcdInstanceRegisterRepositoryTest.java
+++
b/shenyu-registry/shenyu-registry-etcd/src/test/java/org/apache/shenyu/registry/etcd/EtcdInstanceRegisterRepositoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.etcd;
+package org.apache.shenyu.registry.etcd;
import io.etcd.jetcd.Client;
import io.etcd.jetcd.ClientBuilder;
@@ -23,9 +23,9 @@ import io.etcd.jetcd.Lease;
import io.etcd.jetcd.lease.LeaseGrantResponse;
import org.apache.shenyu.common.exception.ShenyuException;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
-import org.apache.shenyu.register.instance.api.path.InstancePathConstants;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.path.InstancePathConstants;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/pom.xml
b/shenyu-registry/shenyu-registry-eureka/pom.xml
similarity index 88%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/pom.xml
rename to shenyu-registry/shenyu-registry-eureka/pom.xml
index f7904000b..515c4a262 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/pom.xml
+++ b/shenyu-registry/shenyu-registry-eureka/pom.xml
@@ -19,16 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance-eureka</artifactId>
+ <artifactId>shenyu-registry-eureka</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-api</artifactId>
+ <artifactId>shenyu-registry-api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/main/java/org/apache/shenyu/register/instance/eureka/EurekaInstanceRegisterRepository.java
b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java
similarity index 94%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/main/java/org/apache/shenyu/register/instance/eureka/EurekaInstanceRegisterRepository.java
rename to
shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java
index a7b0dcef6..e87b0d694 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/main/java/org/apache/shenyu/register/instance/eureka/EurekaInstanceRegisterRepository.java
+++
b/shenyu-registry/shenyu-registry-eureka/src/main/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.eureka;
+package org.apache.shenyu.registry.eureka;
import com.netflix.appinfo.ApplicationInfoManager;
import com.netflix.appinfo.DataCenterInfo;
@@ -33,9 +33,9 @@ import
com.netflix.discovery.shared.transport.EurekaHttpResponse;
import com.netflix.discovery.shared.transport.jersey.JerseyApplicationClient;
import com.sun.jersey.client.apache4.ApacheHttpClient4;
import org.apache.shenyu.common.utils.IpUtils;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
import org.apache.shenyu.spi.Join;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
b/shenyu-registry/shenyu-registry-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
similarity index 90%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
rename to
shenyu-registry/shenyu-registry-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
index 8e3e3d6f3..a0bf57c67 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-consul/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
+++
b/shenyu-registry/shenyu-registry-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-consul=org.apache.shenyu.register.instance.consul.ConsulInstanceRegisterRepository
\ No newline at end of file
+eureka=org.apache.shenyu.registry.eureka.EurekaInstanceRegisterRepository
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/test/java/org/apache/shenyu/register/instance/eureka/EurekaInstanceRegisterRepositoryTest.java
b/shenyu-registry/shenyu-registry-eureka/src/test/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepositoryTest.java
similarity index 97%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/test/java/org/apache/shenyu/register/instance/eureka/EurekaInstanceRegisterRepositoryTest.java
rename to
shenyu-registry/shenyu-registry-eureka/src/test/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepositoryTest.java
index 48f90928f..e54be5a72 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/test/java/org/apache/shenyu/register/instance/eureka/EurekaInstanceRegisterRepositoryTest.java
+++
b/shenyu-registry/shenyu-registry-eureka/src/test/java/org/apache/shenyu/registry/eureka/EurekaInstanceRegisterRepositoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.eureka;
+package org.apache.shenyu.registry.eureka;
import com.netflix.appinfo.InstanceInfo;
import com.netflix.discovery.DiscoveryClient;
@@ -24,7 +24,7 @@ import com.netflix.discovery.EurekaEventListener;
import com.netflix.discovery.shared.transport.EurekaHttpClient;
import com.netflix.discovery.shared.transport.EurekaHttpResponse;
import com.netflix.discovery.shared.transport.jersey.JerseyApplicationClient;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/pom.xml
b/shenyu-registry/shenyu-registry-nacos/pom.xml
similarity index 89%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/pom.xml
rename to shenyu-registry/shenyu-registry-nacos/pom.xml
index 4b33d26d7..73699423d 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/pom.xml
+++ b/shenyu-registry/shenyu-registry-nacos/pom.xml
@@ -19,16 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance-nacos</artifactId>
+ <artifactId>shenyu-registry-nacos</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-api</artifactId>
+ <artifactId>shenyu-registry-api</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/main/java/org/apache/shenyu/register/instance/nacos/NacosInstanceRegisterRepository.java
b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java
similarity index 94%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/main/java/org/apache/shenyu/register/instance/nacos/NacosInstanceRegisterRepository.java
rename to
shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java
index 6f1dc830d..24bf04f0e 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/main/java/org/apache/shenyu/register/instance/nacos/NacosInstanceRegisterRepository.java
+++
b/shenyu-registry/shenyu-registry-nacos/src/main/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepository.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.nacos;
+package org.apache.shenyu.registry.nacos;
import com.alibaba.nacos.api.PropertyKeyConst;
import com.alibaba.nacos.api.exception.NacosException;
@@ -24,9 +24,9 @@ import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.exception.ShenyuException;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
import org.apache.shenyu.spi.Join;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
b/shenyu-registry/shenyu-registry-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
similarity index 91%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
rename to
shenyu-registry/shenyu-registry-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
index d17f66abd..e9623557a 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-etcd/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
+++
b/shenyu-registry/shenyu-registry-nacos/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-etcd=org.apache.shenyu.register.instance.etcd.EtcdInstanceRegisterRepository
+nacos=org.apache.shenyu.registry.nacos.NacosInstanceRegisterRepository
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/test/java/org/apache/shenyu/register/instance/nacos/NacosInstanceRegisterRepositoryTest.java
b/shenyu-registry/shenyu-registry-nacos/src/test/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepositoryTest.java
similarity index 96%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/test/java/org/apache/shenyu/register/instance/nacos/NacosInstanceRegisterRepositoryTest.java
rename to
shenyu-registry/shenyu-registry-nacos/src/test/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepositoryTest.java
index d7e9a0378..07c13bbdb 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-nacos/src/test/java/org/apache/shenyu/register/instance/nacos/NacosInstanceRegisterRepositoryTest.java
+++
b/shenyu-registry/shenyu-registry-nacos/src/test/java/org/apache/shenyu/registry/nacos/NacosInstanceRegisterRepositoryTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.nacos;
+package org.apache.shenyu.registry.nacos;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/pom.xml
b/shenyu-registry/shenyu-registry-zookeeper/pom.xml
similarity index 90%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/pom.xml
rename to shenyu-registry/shenyu-registry-zookeeper/pom.xml
index 13029fcde..477a18744 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/pom.xml
+++ b/shenyu-registry/shenyu-registry-zookeeper/pom.xml
@@ -19,16 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance</artifactId>
+ <artifactId>shenyu-registry</artifactId>
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-register-instance-zookeeper</artifactId>
+ <artifactId>shenyu-registry-zookeeper</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-api</artifactId>
+ <artifactId>shenyu-registry-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperClient.java
b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java
similarity index 99%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperClient.java
rename to
shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java
index 3812073cf..907b37ec5 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperClient.java
+++
b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperClient.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.zookeeper;
+package org.apache.shenyu.registry.zookeeper;
import org.apache.commons.lang3.StringUtils;
import org.apache.curator.framework.CuratorFramework;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperConfig.java
b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperConfig.java
similarity index 98%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperConfig.java
rename to
shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperConfig.java
index 1e98892ce..b60151a51 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperConfig.java
+++
b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.zookeeper;
+package org.apache.shenyu.registry.zookeeper;
public class ZookeeperConfig {
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperInstanceRegisterRepository.java
b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java
similarity index 94%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperInstanceRegisterRepository.java
rename to
shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java
index 89d4cc1cb..ac579cc77 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/main/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperInstanceRegisterRepository.java
+++
b/shenyu-registry/shenyu-registry-zookeeper/src/main/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepository.java
@@ -15,17 +15,17 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.zookeeper;
+package org.apache.shenyu.registry.zookeeper;
import org.apache.commons.lang3.StringUtils;
import org.apache.curator.framework.api.CuratorWatcher;
import org.apache.curator.framework.state.ConnectionState;
import org.apache.shenyu.common.constant.Constants;
import org.apache.shenyu.common.utils.GsonUtils;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
-import org.apache.shenyu.register.instance.api.path.InstancePathConstants;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.path.InstancePathConstants;
import org.apache.shenyu.spi.Join;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.WatchedEvent;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
b/shenyu-registry/shenyu-registry-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
similarity index 92%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
rename to
shenyu-registry/shenyu-registry-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
index bb12f6d98..b3a761eeb 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-eureka/src/main/resources/META-INF/shenyu/org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository
+++
b/shenyu-registry/shenyu-registry-zookeeper/src/main/resources/META-INF/shenyu/org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-eureka=org.apache.shenyu.register.instance.eureka.EurekaInstanceRegisterRepository
+zookeeper=org.apache.shenyu.registry.zookeeper.ZookeeperInstanceRegisterRepository
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/test/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperClientTest.java
b/shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperClientTest.java
similarity index 99%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/test/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperClientTest.java
rename to
shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperClientTest.java
index cc84ee5e2..55d4bc537 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/test/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperClientTest.java
+++
b/shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperClientTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.zookeeper;
+package org.apache.shenyu.registry.zookeeper;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
diff --git
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/test/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperInstanceRegisterRepositoryTest.java
b/shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepositoryTest.java
similarity index 94%
rename from
shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/test/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperInstanceRegisterRepositoryTest.java
rename to
shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepositoryTest.java
index c9a7ce79a..0531f4710 100644
---
a/shenyu-register-center/shenyu-register-instance/shenyu-register-instance-zookeeper/src/test/java/org/apache/shenyu/register/instance/zookeeper/ZookeeperInstanceRegisterRepositoryTest.java
+++
b/shenyu-registry/shenyu-registry-zookeeper/src/test/java/org/apache/shenyu/registry/zookeeper/ZookeeperInstanceRegisterRepositoryTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.register.instance.zookeeper;
+package org.apache.shenyu.registry.zookeeper;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.api.CuratorWatcher;
@@ -23,9 +23,9 @@ import org.apache.curator.framework.listen.Listenable;
import org.apache.curator.framework.state.ConnectionState;
import org.apache.curator.framework.state.ConnectionStateListener;
import org.apache.shenyu.common.utils.GsonUtils;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
-import org.apache.shenyu.register.instance.api.path.InstancePathConstants;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.path.InstancePathConstants;
import org.apache.zookeeper.WatchedEvent;
import org.junit.jupiter.api.Test;
import org.mockito.MockedConstruction;
diff --git a/shenyu-sdk/shenyu-sdk-core/pom.xml
b/shenyu-sdk/shenyu-sdk-core/pom.xml
index f65215259..733356c66 100644
--- a/shenyu-sdk/shenyu-sdk-core/pom.xml
+++ b/shenyu-sdk/shenyu-sdk-core/pom.xml
@@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-core</artifactId>
+ <artifactId>shenyu-registry-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git
a/shenyu-sdk/shenyu-sdk-core/src/main/java/org/apache/shenyu/sdk/core/client/AbstractShenyuSdkClient.java
b/shenyu-sdk/shenyu-sdk-core/src/main/java/org/apache/shenyu/sdk/core/client/AbstractShenyuSdkClient.java
index f4e9880ff..a95918717 100644
---
a/shenyu-sdk/shenyu-sdk-core/src/main/java/org/apache/shenyu/sdk/core/client/AbstractShenyuSdkClient.java
+++
b/shenyu-sdk/shenyu-sdk-core/src/main/java/org/apache/shenyu/sdk/core/client/AbstractShenyuSdkClient.java
@@ -24,9 +24,9 @@ import org.apache.shenyu.common.exception.ShenyuException;
import org.apache.shenyu.common.utils.UriUtils;
import org.apache.shenyu.loadbalancer.entity.Upstream;
import org.apache.shenyu.loadbalancer.factory.LoadBalancerFactory;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
import org.apache.shenyu.sdk.core.ShenyuRequest;
import org.apache.shenyu.sdk.core.ShenyuResponse;
import org.apache.shenyu.sdk.core.interceptor.ShenyuSdkRequestInterceptor;
diff --git
a/shenyu-sdk/shenyu-sdk-core/src/main/java/org/apache/shenyu/sdk/core/client/ShenyuSdkClient.java
b/shenyu-sdk/shenyu-sdk-core/src/main/java/org/apache/shenyu/sdk/core/client/ShenyuSdkClient.java
index 8842d40bc..1eb67b326 100644
---
a/shenyu-sdk/shenyu-sdk-core/src/main/java/org/apache/shenyu/sdk/core/client/ShenyuSdkClient.java
+++
b/shenyu-sdk/shenyu-sdk-core/src/main/java/org/apache/shenyu/sdk/core/client/ShenyuSdkClient.java
@@ -17,8 +17,8 @@
package org.apache.shenyu.sdk.core.client;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
import org.apache.shenyu.sdk.core.ShenyuRequest;
import org.apache.shenyu.sdk.core.ShenyuResponse;
import org.apache.shenyu.sdk.core.interceptor.ShenyuSdkRequestInterceptor;
diff --git
a/shenyu-sdk/shenyu-sdk-okhttp/src/test/java/org/apache/shenyu/sdk/okhttp/OkHttpShenyuSdkClientTest.java
b/shenyu-sdk/shenyu-sdk-okhttp/src/test/java/org/apache/shenyu/sdk/okhttp/OkHttpShenyuSdkClientTest.java
index bf90acd12..971a94460 100644
---
a/shenyu-sdk/shenyu-sdk-okhttp/src/test/java/org/apache/shenyu/sdk/okhttp/OkHttpShenyuSdkClientTest.java
+++
b/shenyu-sdk/shenyu-sdk-okhttp/src/test/java/org/apache/shenyu/sdk/okhttp/OkHttpShenyuSdkClientTest.java
@@ -17,17 +17,17 @@
package org.apache.shenyu.sdk.okhttp;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
import org.apache.shenyu.sdk.core.ShenyuRequest;
import org.junit.Ignore;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Collections;
import static org.mockito.Mockito.mock;
diff --git a/shenyu-spring-boot-starter/pom.xml
b/shenyu-spring-boot-starter/pom.xml
index a7949dca8..d877e70c4 100644
--- a/shenyu-spring-boot-starter/pom.xml
+++ b/shenyu-spring-boot-starter/pom.xml
@@ -31,7 +31,7 @@
<module>shenyu-spring-boot-starter-plugin</module>
<module>shenyu-spring-boot-starter-sync-data-center</module>
<module>shenyu-spring-boot-starter-client</module>
- <module>shenyu-spring-boot-starter-instance</module>
+ <module>shenyu-spring-boot-starter-registry</module>
<module>shenyu-spring-boot-starter-sdk</module>
<module>shenyu-spring-boot-starter-k8s</module>
</modules>
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/resources/META-INF/spring.provides
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/resources/META-INF/spring.provides
deleted file mode 100644
index 23291ecff..000000000
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/resources/META-INF/spring.provides
+++ /dev/null
@@ -1 +0,0 @@
-provides: shenyu-spring-boot-starter-instance
\ No newline at end of file
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/pom.xml
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/pom.xml
similarity index 91%
rename from
shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/pom.xml
rename to shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/pom.xml
index 40b24ad5c..d0346c5dd 100644
--- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/pom.xml
+++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/pom.xml
@@ -23,12 +23,12 @@
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-spring-boot-starter-instance</artifactId>
+ <artifactId>shenyu-spring-boot-starter-registry</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-register-instance-core</artifactId>
+ <artifactId>shenyu-registry-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/java/org/apache/shenyu/springboot/starter/instance/InstanceRegisterListener.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/java/org/apache/shenyu/springboot/starter/registry/RegistryListener.java
similarity index 85%
rename from
shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/java/org/apache/shenyu/springboot/starter/instance/InstanceRegisterListener.java
rename to
shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/java/org/apache/shenyu/springboot/starter/registry/RegistryListener.java
index 4d73d69dd..365055489 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/java/org/apache/shenyu/springboot/starter/instance/InstanceRegisterListener.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/java/org/apache/shenyu/springboot/starter/registry/RegistryListener.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shenyu.springboot.starter.instance;
+package org.apache.shenyu.springboot.starter.registry;
import org.apache.commons.lang3.StringUtils;
import org.apache.shenyu.common.exception.ShenyuException;
import org.apache.shenyu.common.utils.IpUtils;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import org.apache.shenyu.register.instance.api.entity.InstanceEntity;
-import
org.apache.shenyu.register.instance.core.ShenyuInstanceRegisterRepositoryFactory;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.entity.InstanceEntity;
+import org.apache.shenyu.registry.core.ShenyuInstanceRegisterRepositoryFactory;
import org.springframework.boot.web.context.WebServerInitializedEvent;
import org.springframework.context.ApplicationListener;
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
/**
* The type Instance register listener.
*/
-public class InstanceRegisterListener implements
ApplicationListener<WebServerInitializedEvent> {
+public class RegistryListener implements
ApplicationListener<WebServerInitializedEvent> {
private final AtomicBoolean registered = new AtomicBoolean(false);
@@ -50,7 +50,7 @@ public class InstanceRegisterListener implements
ApplicationListener<WebServerIn
*
* @param config the config
*/
- public InstanceRegisterListener(final RegisterConfig config) {
+ public RegistryListener(final RegisterConfig config) {
String registerType = config.getRegisterType();
String serverLists = config.getServerLists();
if (StringUtils.isBlank(registerType) ||
StringUtils.isBlank(serverLists)) {
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/java/org/apache/shenyu/springboot/starter/instance/ShenyuInstanceConfiguration.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/java/org/apache/shenyu/springboot/starter/registry/ShenyuRegistryConfiguration.java
similarity index 79%
rename from
shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/java/org/apache/shenyu/springboot/starter/instance/ShenyuInstanceConfiguration.java
rename to
shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/java/org/apache/shenyu/springboot/starter/registry/ShenyuRegistryConfiguration.java
index f40c0c4fe..c70518443 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/java/org/apache/shenyu/springboot/starter/instance/ShenyuInstanceConfiguration.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/java/org/apache/shenyu/springboot/starter/registry/ShenyuRegistryConfiguration.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shenyu.springboot.starter.instance;
+package org.apache.shenyu.springboot.starter.registry;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -27,7 +27,8 @@ import org.springframework.context.annotation.Configuration;
* The type Shenyu instance configuration.
*/
@Configuration
-public class ShenyuInstanceConfiguration {
+@ConditionalOnProperty(name = "shenyu.register.enabled", havingValue = "true")
+public class ShenyuRegistryConfiguration {
/**
* Register config register config.
@@ -47,8 +48,7 @@ public class ShenyuInstanceConfiguration {
* @return the instance register listener
*/
@Bean
- @ConditionalOnProperty(name = "shenyu.register.enabled", havingValue =
"true")
- public InstanceRegisterListener instanceRegisterListener(final
RegisterConfig config) {
- return new InstanceRegisterListener(config);
+ public RegistryListener instanceRegisterListener(final RegisterConfig
config) {
+ return new RegistryListener(config);
}
}
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/resources/META-INF/spring.factories
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/resources/META-INF/spring.factories
similarity index 58%
rename from
shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/resources/META-INF/spring.factories
rename to
shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/resources/META-INF/spring.factories
index 4b4777cf4..860196af7 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-instance/src/main/resources/META-INF/spring.factories
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,3 @@
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.shenyu.springboot.starter.instance.ShenyuInstanceConfiguration
+org.apache.shenyu.springboot.starter.registry.ShenyuRegistryConfiguration
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/resources/META-INF/spring.provides
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/resources/META-INF/spring.provides
new file mode 100644
index 000000000..349f39a16
--- /dev/null
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-registry/src/main/resources/META-INF/spring.provides
@@ -0,0 +1 @@
+provides: shenyu-spring-boot-starter-registry
\ No newline at end of file
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sdk/src/main/java/org/apache/shenyu/springboot/starter/sdk/ShenyuSdkAutoConfiguration.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sdk/src/main/java/org/apache/shenyu/springboot/starter/sdk/ShenyuSdkAutoConfiguration.java
index 0dcecd5e5..5ee196c92 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sdk/src/main/java/org/apache/shenyu/springboot/starter/sdk/ShenyuSdkAutoConfiguration.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-sdk/src/main/java/org/apache/shenyu/springboot/starter/sdk/ShenyuSdkAutoConfiguration.java
@@ -18,9 +18,9 @@
package org.apache.shenyu.springboot.starter.sdk;
import org.apache.shenyu.common.utils.VersionUtils;
-import
org.apache.shenyu.register.instance.api.ShenyuInstanceRegisterRepository;
-import org.apache.shenyu.register.instance.api.config.RegisterConfig;
-import
org.apache.shenyu.register.instance.core.ShenyuInstanceRegisterRepositoryFactory;
+import org.apache.shenyu.registry.api.ShenyuInstanceRegisterRepository;
+import org.apache.shenyu.registry.api.config.RegisterConfig;
+import org.apache.shenyu.registry.core.ShenyuInstanceRegisterRepositoryFactory;
import org.apache.shenyu.sdk.core.client.ShenyuSdkClient;
import org.apache.shenyu.sdk.core.client.ShenyuSdkClientFactory;
import org.apache.shenyu.sdk.core.interceptor.ShenyuSdkRequestInterceptor;
