This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 1c9ee4a Use same orchestration instance name for registry, config and
metadata (#6449)
1c9ee4a is described below
commit 1c9ee4a632964b2021986af37bfc876aa14992e7
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 26 19:12:49 2020 +0800
Use same orchestration instance name for registry, config and metadata
(#6449)
* Use same orchestration instance name for registry, config and metadata
* Revise spring boot starter
---
.../sharding-proxy/sharding/conf/server.yaml | 2 +-
.../OrchestrationRepositoryConfigurationUtil.java | 8 +++---
.../resources/META-INF/nacos/cloud/encrypt.yaml | 4 +--
.../META-INF/nacos/cloud/master-slave.yaml | 4 +--
.../resources/META-INF/nacos/cloud/shadow.yaml | 4 +--
.../nacos/cloud/sharding-databases-tables.yaml | 4 +--
.../resources/META-INF/nacos/local/encrypt.yaml | 4 +--
.../META-INF/nacos/local/master-slave.yaml | 4 +--
.../resources/META-INF/nacos/local/shadow.yaml | 4 +--
.../nacos/local/sharding-databases-tables.yaml | 4 +--
.../META-INF/zookeeper/cloud/encrypt.yaml | 2 +-
.../META-INF/zookeeper/cloud/master-slave.yaml | 2 +-
.../resources/META-INF/zookeeper/cloud/shadow.yaml | 2 +-
.../zookeeper/cloud/sharding-databases-tables.yaml | 2 +-
.../META-INF/zookeeper/local/encrypt.yaml | 2 +-
.../META-INF/zookeeper/local/master-slave.yaml | 2 +-
.../resources/META-INF/zookeeper/local/shadow.yaml | 2 +-
.../zookeeper/local/sharding-databases-tables.yaml | 2 +-
.../application-cloud-nacos-encrypt.properties | 24 ++++++++--------
...application-cloud-nacos-master-slave.properties | 24 ++++++++--------
.../application-cloud-nacos-shadow.properties | 24 ++++++++--------
...loud-nacos-sharding-databases-tables.properties | 24 ++++++++--------
.../application-cloud-zookeeper-encrypt.properties | 10 +++----
...ication-cloud-zookeeper-master-slave.properties | 10 +++----
.../application-cloud-zookeeper-shadow.properties | 10 +++----
...-zookeeper-sharding-databases-tables.properties | 10 +++----
.../application-local-nacos-encrypt.properties | 20 +++++++-------
...application-local-nacos-master-slave.properties | 22 +++++++--------
.../application-local-nacos-shadow.properties | 22 +++++++--------
...ocal-nacos-sharding-databases-tables.properties | 20 +++++++-------
.../application-local-zookeeper-encrypt.properties | 10 +++----
...ication-local-zookeeper-master-slave.properties | 10 +++----
.../application-local-zookeeper-shadow.properties | 10 +++----
...-zookeeper-sharding-databases-tables.properties | 10 +++----
.../src/main/resources/conf/server.yaml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../core/facade/OrchestrationFacade.java | 16 ++++-------
.../listener/OrchestrationListenerManager.java | 11 ++++----
.../core/facade/OrchestrationFacadeTest.java | 2 +-
.../facade/OrchestrationListenerManagerTest.java | 2 +-
.../api/config/OrchestrationConfiguration.java | 20 +++-----------
.../config/YamlOrchestrationConfiguration.java | 4 +--
.../OrchestrationConfigurationYamlSwapper.java | 13 ++++-----
.../OrchestrationConfigurationYamlSwapperTest.java | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../test/resources/docker/proxy/conf/server.yaml | 2 +-
...strationRepositoryConfigurationSwapperUtil.java | 8 +++---
.../OrchestrationShardingSphereDataSourceTest.java | 3 +-
.../YamlInstanceConfigurationSwapperUtilTest.java | 2 +-
.../configWithMasterSlaveDataSourceWithProps.yaml | 4 +--
...onfigWithMasterSlaveDataSourceWithoutProps.yaml | 4 +--
.../sharding/configWithDataSourceWithProps.yaml | 4 +--
.../sharding/configWithDataSourceWithoutProps.yaml | 4 +--
.../sharding/configWithoutDataSourceWithProps.yaml | 4 +--
.../configWithoutDataSourceWithoutProps.yaml | 4 +--
.../sharding_ms/configWithDataSourceWithProps.yaml | 4 +--
.../configWithDataSourceWithoutProps.yaml | 4 +--
.../configWithDataSourceWithoutRules.yaml | 4 +--
.../configWithoutDataSourceWithProps.yaml | 4 +--
.../configWithoutDataSourceWithoutProps.yaml | 4 +--
.../yaml/unit/encryptWithRegistryCenter.yaml | 4 +--
.../src/test/resources/yaml/unit/noRule.yaml | 4 +--
.../OrchestrationSpringBootConfiguration.java | 32 +++++++---------------
.../OrchestrationSpringBootRootConfiguration.java | 4 +--
.../test/resources/application-encrypt.properties | 10 +++----
.../resources/application-masterslave.properties | 10 +++----
.../test/resources/application-registry.properties | 10 +++----
.../test/resources/application-sharding.properties | 10 +++----
.../src/main/resources/conf/server.yaml | 2 +-
.../src/test/resources/conf/server.yaml | 2 +-
70 files changed, 233 insertions(+), 308 deletions(-)
diff --git a/examples/docker/sharding-proxy/sharding/conf/server.yaml
b/examples/docker/sharding-proxy/sharding/conf/server.yaml
index 89f15e6..370f3c0 100644
--- a/examples/docker/sharding-proxy/sharding/conf/server.yaml
+++ b/examples/docker/sharding-proxy/sharding/conf/server.yaml
@@ -22,7 +22,7 @@
######################################################################################################
#orchestration:
-# registryCenterName: orchestration_ds
+# name: orchestration_ds
# registryRepositoryConfiguration:
# orchestrationType: registry_center,config_center,metadata_center
# instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/OrchestrationRepositoryConfigurationUtil.java
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/OrchestrationRepositoryConfigurationUtil.java
index 95ccc2b..1b3b4c5 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/OrchestrationRepositoryConfigurationUtil.java
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/java/org/apache/shardingsphere/example/orchestration/raw/jdbc/config/OrchestrationRepositoryConfigurationUtil.java
@@ -71,13 +71,13 @@ public final class OrchestrationRepositoryConfigurationUtil
{
zookeeperResult.setOrchestrationType("registry_center,metadata_center");
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
- return new
OrchestrationConfiguration("orchestration-zookeeper-sharding-data-source",
zookeeperResult, "orchestration-sharding-data-source", nacosResult);
+ return new
OrchestrationConfiguration("orchestration-zookeeper-sharding-data-source",
zookeeperResult, nacosResult);
case MASTER_SLAVE:
- return new
OrchestrationConfiguration("orchestration-zookeeper-ms-data-source",
zookeeperResult, "orchestration-ms-data-source", nacosResult);
+ return new
OrchestrationConfiguration("orchestration-zookeeper-ms-data-source",
zookeeperResult, nacosResult);
case ENCRYPT:
- return new
OrchestrationConfiguration("orchestration-zookeeper-encrypt-data-source",
zookeeperResult, "orchestration-encrypt-data-source", nacosResult);
+ return new
OrchestrationConfiguration("orchestration-zookeeper-encrypt-data-source",
zookeeperResult, nacosResult);
case SHADOW:
- return new
OrchestrationConfiguration("orchestration-zookeeper-shadow-data-source",
zookeeperResult, "orchestration-shadow-data-source", nacosResult);
+ return new
OrchestrationConfiguration("orchestration-zookeeper-shadow-data-source",
zookeeperResult, nacosResult);
default:
throw new
UnsupportedOperationException(shardingType.toString());
}
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/encrypt.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/encrypt.yaml
index 46b048b..db5232b 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/encrypt.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/encrypt.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_zookeeper_yaml_ds_encrypt
+ name: demo_zookeeper_yaml_ds_encrypt
registryRepositoryConfiguration:
orchestrationType: registry_center,metadata_center
instanceType: zookeeper
@@ -24,8 +24,6 @@ orchestration:
namespace: orchestration-yaml-demo
props:
overwrite: false
-
- additionalConfigCenterName: demo_naocs_yaml_ds_encrypt
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: nacos
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/master-slave.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/master-slave.yaml
index 36cc949..21751f1 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/master-slave.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/master-slave.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_zookeeper_yaml_ds_ms
+ name: demo_zookeeper_yaml_ds_ms
registryRepositoryConfiguration:
orchestrationType: registry_center,metadata_center
instanceType: zookeeper
@@ -24,8 +24,6 @@ orchestration:
namespace:
props:
overwrite: false
-
- additionalConfigCenterName: demo_nacos_yaml_ds_ms
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: nacos
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/shadow.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/shadow.yaml
index ad897c9..922f99f 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/shadow.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/shadow.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_zookeeper_yaml_ds_shadow
+ name: demo_zookeeper_yaml_ds_shadow
registryRepositoryConfiguration:
orchestrationType: registry_center,metadata_center
instanceType: zookeeper
@@ -24,8 +24,6 @@ orchestration:
namespace:
props:
overwrite: false
-
- additionalConfigCenterName: demo_nacos_yaml_ds_shadow
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: nacos
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/sharding-databases-tables.yaml
index 8928bf6..f68f4ff 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/sharding-databases-tables.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_zookeeper_yaml_ds_sharding
+ name: demo_zookeeper_yaml_ds_sharding
registryRepositoryConfiguration:
orchestrationType: registry_center,metadata_center
instanceType: zookeeper
@@ -24,8 +24,6 @@ orchestration:
namespace:
props:
overwrite: false
-
- additionalConfigCenterName: demo_nacos_yaml_ds_sharding
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: nacos
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/encrypt.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/encrypt.yaml
index cece9f5..54b1e52 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/encrypt.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/encrypt.yaml
@@ -41,7 +41,7 @@ props:
sql.show: false
orchestration:
- registryCenterName: demo_zookeeper_yaml_ds_encrypt
+ name: demo_zookeeper_yaml_ds_encrypt
registryRepositoryConfiguration:
orchestrationType: registry_center,metadata_center
instanceType: zookeeper
@@ -49,8 +49,6 @@ orchestration:
namespace: orchestration-yaml-demo
props:
overwrite: true
-
- additionalConfigCenterName: demo_nacos_yaml_ds_encrypt
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: nacos
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/master-slave.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/master-slave.yaml
index 265fb66..0e9ebaa 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/master-slave.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/master-slave.yaml
@@ -44,7 +44,7 @@ props:
sql.show: true
orchestration:
- registryCenterName: demo_zookeeper_yaml_ds_ms
+ name: demo_zookeeper_yaml_ds_ms
registryRepositoryConfiguration:
orchestrationType: registry_center,metadata_center
instanceType: zookeeper
@@ -52,8 +52,6 @@ orchestration:
namespace:
props:
overwrite: true
-
- additionalConfigCenterName: demo_nacos_yaml_ds_ms
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: nacos
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/shadow.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/shadow.yaml
index 5ae39e8..5f6bed5 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/shadow.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/shadow.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_zookeeper_yaml_ds_shadow
+ name: demo_zookeeper_yaml_ds_shadow
registryRepositoryConfiguration:
orchestrationType: registry_center,metadata_center
instanceType: zookeeper
@@ -24,8 +24,6 @@ orchestration:
namespace:
props:
overwrite: false
-
- additionalConfigCenterName: demo_nacos_yaml_ds_shadow
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: nacos
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/sharding-databases-tables.yaml
index 7aa7bab..8dcd714 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/sharding-databases-tables.yaml
@@ -81,7 +81,7 @@ props:
sql.show: true
orchestration:
- registryCenterName: demo_zookeeper_yaml_ds_sharding
+ name: demo_zookeeper_yaml_ds_sharding
registryRepositoryConfiguration:
orchestrationType: registry_center,metadata_center
instanceType: zookeeper
@@ -89,8 +89,6 @@ orchestration:
namespace:
props:
overwrite: true
-
- additionalConfigCenterName: demo_nacos_yaml_ds_sharding
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: nacos
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
index 123935c..72fa805 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_yaml_ds_encrypt
+ name: demo_yaml_ds_encrypt
registryRepositoryConfiguration:
orchestrationType: config_center,registry_center,metadata_center
instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/master-slave.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/master-slave.yaml
index a18b4b0..2841b3a 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/master-slave.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/master-slave.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_yaml_ds_ms
+ name: demo_yaml_ds_ms
registryRepositoryConfiguration:
orchestrationType: config_center,registry_center,metadata_center
instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
index 334399b..d93e183 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_yaml_ds_shadow
+ name: demo_yaml_ds_shadow
registryRepositoryConfiguration:
orchestrationType: config_center,registry_center,metadata_center
instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
index ca98429..4bb33e6 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_yaml_ds_sharding
+ name: demo_yaml_ds_sharding
registryRepositoryConfiguration:
orchestrationType: config_center,registry_center,metadata_center
instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
index 76261a7..7ce6b2b 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_yaml_ds_encrypt
+ name: demo_yaml_ds_encrypt
registryRepositoryConfiguration:
orchestrationType: config_center,registry_center,metadata_center
instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/master-slave.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/master-slave.yaml
index 7c9f913..c0cf594 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/master-slave.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/master-slave.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_yaml_ds_ms
+ name: demo_yaml_ds_ms
registryRepositoryConfiguration:
orchestrationType: config_center,registry_center,metadata_center
instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
index 1edc9bc..80be622 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_yaml_ds_shadow
+ name: demo_yaml_ds_shadow
registryRepositoryConfiguration:
orchestrationType: config_center,registry_center,metadata_center
instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
index 2f7727e..e85a01a 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: demo_yaml_ds_sharding
+ name: demo_yaml_ds_sharding
registryRepositoryConfiguration:
orchestrationType: config_center,registry_center,metadata_center
instanceType: zookeeper
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-encrypt.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-encrypt.properties
index cd13ccf..d736184 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-encrypt.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-encrypt.properties
@@ -15,16 +15,16 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.orchestration-type=config_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.instance-type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.props.overwrite=false
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.props.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.props.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.orchestration-type=config_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.namespace=
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.props.operationTimeoutMilliseconds=3000
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.orchestration-type=registry_center,metadata_center
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.props.overwrite=false
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.orchestration-type=registry_center,metadata_center
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.props.overwrite=false
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-master-slave.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-master-slave.properties
index ed8b0f7..7c1c390 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-master-slave.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-master-slave.properties
@@ -15,16 +15,16 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.orchestration-type=config_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.instance-type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.props.overwrite=false
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.props.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.props.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.orchestration-type=config_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.instance-type=nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.namespace=
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.props.operationTimeoutMilliseconds=3000
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.orchestration-type=registry_center,metadata_center
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.props.overwrite=false
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.orchestration-type=registry_center,metadata_center
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.props.overwrite=false
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-shadow.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-shadow.properties
index 7d978b1..06fb8e6 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-shadow.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-shadow.properties
@@ -15,16 +15,16 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.orchestration-type=config_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.instance-type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.props.overwrite=false
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.props.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.props.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.orchestration-type=config_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.instance-type=nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.namespace=
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.props.operationTimeoutMilliseconds=3000
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.orchestration-type=registry_center,metadata_center
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.props.overwrite=false
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.orchestration-type=registry_center,metadata_center
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.props.overwrite=false
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-sharding-databases-tables.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-sharding-databases-tables.properties
index 1b063a2..35a3b2a 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-sharding-databases-tables.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-sharding-databases-tables.properties
@@ -15,16 +15,16 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.orchestration-type=config_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.instance-type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.props.overwrite=false
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.props.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.props.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.orchestration-type=config_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.instance-type=nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.namespace=
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.props.operationTimeoutMilliseconds=3000
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.orchestration-type=registry_center,metadata_center
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.props.overwrite=false
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.orchestration-type=registry_center,metadata_center
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.props.overwrite=false
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
index 8477df3e..e27a146 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.orchestration-type=registry_center,config_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.orchestration-type=registry_center,config_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.props.overwrite=false
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-master-slave.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-master-slave.properties
index 7bc6b29..a7f10b2 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-master-slave.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-master-slave.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.orchestration-type=registry_center,config_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.orchestration-type=registry_center,config_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.props.overwrite=false
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
index 228a48b..33d1a29 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.orchestration-type=registry_center,config_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.orchestration-type=registry_center,config_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.props.overwrite=false
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
index 62cc07a..7696853 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.orchestration-type=registry_center,config_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.orchestration-type=registry_center,config_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.props.overwrite=false
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-encrypt.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-encrypt.properties
index 9d16734..df4275e 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-encrypt.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-encrypt.properties
@@ -31,14 +31,14 @@
spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.encryptor-name
spring.shardingsphere.props.query.with.cipher.comlum=true
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.orchestration-type=config_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.instance-type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.orchestration-type=config_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.namespace=
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.props.overwrite=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.orchestration-type=registry_center,metadata_center
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.props.overwrite=true
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.orchestration-type=registry_center,metadata_center
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.props.overwrite=true
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-master-slave.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-master-slave.properties
index 083076b..3c79c17 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-master-slave.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-master-slave.properties
@@ -33,14 +33,14 @@
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.master-data-source-n
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.slave-data-source-names=ds_slave_0,ds_slave_1
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.load-balancer-name=round_robin
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.orchestration-type=config_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.instance-type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.props.overwrite=true
-
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.orchestration-type=registry_center,metadata_center
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.orchestration-type=config_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.instance-type=nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.namespace=
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.props.overwrite=true
+
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.orchestration-type=registry_center,metadata_center
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.props.overwrite=true
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-shadow.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-shadow.properties
index 93ef127..e946bba 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-shadow.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-shadow.properties
@@ -31,14 +31,14 @@
spring.shardingsphere.rules.shadow.shadow-mappings.ds=shadow_ds
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.orchestration-type=config_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.instance-type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.props.overwrite=true
-
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.orchestration-type=registry_center,metadata_center
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.orchestration-type=config_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.instance-type=nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.namespace=
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.props.overwrite=true
+
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.orchestration-type=registry_center,metadata_center
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-repository-configuration.props.overwrite=true
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-sharding-databases-tables.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-sharding-databases-tables.properties
index df34085..5601235 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-sharding-databases-tables.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-sharding-databases-tables.properties
@@ -57,14 +57,14 @@
spring.shardingsphere.rules.sharding.sharding-algorithms.t_order_item_inline.pro
spring.shardingsphere.rules.sharding.key-generators.snowflake.type=SNOWFLAKE
spring.shardingsphere.rules.sharding.key-generators.snowflake.props.worker.id=123
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.orchestration-type=config_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.instance-type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.orchestration-type=config_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.instance-type=nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.namespace=
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.props.overwrite=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.orchestration-type=registry_center,metadata_center
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.props.overwrite=true
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.orchestration-type=registry_center,metadata_center
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.props.overwrite=true
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-encrypt.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-encrypt.properties
index 8b4a300..63ba608 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-encrypt.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-encrypt.properties
@@ -31,8 +31,8 @@
spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.encryptor-name
spring.shardingsphere.props.query.with.cipher.comlum=true
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.orchestration-type=registry_center,config_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.orchestration-type=registry_center,config_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.props.overwrite=true
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-master-slave.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-master-slave.properties
index 90d97de..d09a8a0 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-master-slave.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-master-slave.properties
@@ -33,8 +33,8 @@
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.master-data-source-n
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.slave-data-source-names=ds_slave_0,ds_slave_1
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.load-balancer-name=round_robin
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.orchestration-type=registry_center,config_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.orchestration-type=registry_center,config_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.props.overwrite=true
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
index 4458481..ed0f788 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
@@ -31,8 +31,8 @@
spring.shardingsphere.rules.shadow.shadow-mappings.ds=shadow_ds
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.orchestration-type=registry_center,config_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.orchestration-type=registry_center,config_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.props.overwrite=true
diff --git
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
index 06830ef..d124167 100644
---
a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
+++
b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
@@ -57,11 +57,11 @@
spring.shardingsphere.rules.sharding.sharding-algorithms.t_order_item_inline.pro
spring.shardingsphere.rules.sharding.key-generators.snowflake.type=SNOWFLAKE
spring.shardingsphere.rules.sharding.key-generators.snowflake.props.worker.id=123
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.orchestration-type=registry_center,config_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.instance-type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.orchestration-type=registry_center,config_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.instance-type=zookeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.server-lists=localhost:2181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.props.overwrite=true
spring.shardingsphere.rules.encrypt.encryptors.status_encryptor.type=AES
spring.shardingsphere.rules.encrypt.encryptors.status_encryptor.props.aes.key.value=123456
diff --git
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
index e8871bb..27de301 100644
---
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
+++
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
@@ -22,7 +22,7 @@
######################################################################################################
#
#orchestration:
-# registryCenterName: orchestration_ds
+# name: orchestration_ds
# registryRepositoryConfiguration:
# orchestrationType: registry_center,config_center,metadata_center
# instanceType: zookeeper
diff --git
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
index f227f27..f64c4a2 100644
---
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
+++
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
@@ -22,7 +22,7 @@
######################################################################################################
#
#orchestration:
-# registryCenterName: orchestration_ds
+# name: orchestration_ds
# registryRepositoryConfiguration:
# orchestrationType: registry_center,config_center,metadata_center
# instanceType: zookeeper
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacade.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacade.java
index b1b0bdd..91ae9a5 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacade.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacade.java
@@ -72,9 +72,7 @@ public final class OrchestrationFacade implements
AutoCloseable {
private OrchestrationListenerManager listenerManager;
- private String configCenterName;
-
- private String registryCenterName;
+ private String name;
/**
* Initialize orchestration facade.
@@ -83,6 +81,7 @@ public final class OrchestrationFacade implements
AutoCloseable {
* @param shardingSchemaNames sharding schema names
*/
public void init(final OrchestrationConfiguration orchestrationConfig,
final Collection<String> shardingSchemaNames) {
+ name = orchestrationConfig.getName();
initConfigCenter(orchestrationConfig);
initRegistryCenter(orchestrationConfig);
initMetaDataCenter();
@@ -90,33 +89,30 @@ public final class OrchestrationFacade implements
AutoCloseable {
}
private void initConfigCenter(final OrchestrationConfiguration
orchestrationConfig) {
- configCenterName =
orchestrationConfig.getAdditionalConfigCenterName().orElse(orchestrationConfig.getRegistryCenterName());
OrchestrationRepositoryConfiguration configRepositoryConfiguration
=
orchestrationConfig.getAdditionalConfigurationRepositoryConfiguration().orElse(orchestrationConfig.getRegistryRepositoryConfiguration());
Preconditions.checkNotNull(configRepositoryConfiguration, "Config
center configuration cannot be null.");
configurationRepository =
TypedSPIRegistry.getRegisteredService(ConfigurationRepository.class,
configRepositoryConfiguration.getType(),
configRepositoryConfiguration.getProps());
configurationRepository.init(configRepositoryConfiguration);
isOverwrite = new
OrchestrationProperties(configRepositoryConfiguration.getProps()).getValue(OrchestrationPropertyKey.OVERWRITE);
- configCenter = new ConfigCenter(configCenterName,
configurationRepository);
+ configCenter = new ConfigCenter(name, configurationRepository);
}
private void initRegistryCenter(final OrchestrationConfiguration
orchestrationConfig) {
- registryCenterName = orchestrationConfig.getRegistryCenterName();
OrchestrationRepositoryConfiguration regRepositoryConfiguration =
orchestrationConfig.getRegistryRepositoryConfiguration();
Preconditions.checkNotNull(regRepositoryConfiguration, "Registry
center configuration cannot be null.");
registryRepository =
TypedSPIRegistry.getRegisteredService(RegistryRepository.class,
regRepositoryConfiguration.getType(), regRepositoryConfiguration.getProps());
registryRepository.init(regRepositoryConfiguration);
- registryCenter = new RegistryCenter(registryCenterName,
registryRepository);
+ registryCenter = new RegistryCenter(name, registryRepository);
}
private void initMetaDataCenter() {
- metaDataCenter = new MetaDataCenter(configCenterName,
configurationRepository);
+ metaDataCenter = new MetaDataCenter(name, configurationRepository);
}
private void initListenerManager(final Collection<String>
shardingSchemaNames) {
listenerManager = new OrchestrationListenerManager(
- registryCenterName, registryRepository, configCenterName,
configurationRepository,
- shardingSchemaNames.isEmpty() ?
configCenter.getAllShardingSchemaNames() : shardingSchemaNames);
+ name, registryRepository, configurationRepository,
shardingSchemaNames.isEmpty() ? configCenter.getAllShardingSchemaNames() :
shardingSchemaNames);
}
/**
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/listener/OrchestrationListenerManager.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/listener/OrchestrationListenerManager.java
index 88b3b59..0cc9d3f 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/listener/OrchestrationListenerManager.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/main/java/org/apache/shardingsphere/orchestration/core/facade/listener/OrchestrationListenerManager.java
@@ -36,12 +36,11 @@ public final class OrchestrationListenerManager {
private final MetaDataListenerManager metaDataListenerManager;
- public OrchestrationListenerManager(final String registryRepositoryName,
final RegistryRepository registryRepository,
- final String
configurationRepositoryName, final ConfigurationRepository
configurationRepository,
- final Collection<String>
shardingSchemaNames) {
- configurationChangedListenerManager = new
ConfigurationChangedListenerManager(configurationRepositoryName,
configurationRepository, shardingSchemaNames);
- registryListenerManager = new
RegistryListenerManager(registryRepositoryName, registryRepository);
- metaDataListenerManager = new
MetaDataListenerManager(configurationRepositoryName, configurationRepository,
shardingSchemaNames);
+ public OrchestrationListenerManager(final String name,
+ final RegistryRepository
registryRepository, final ConfigurationRepository configurationRepository,
final Collection<String> shardingSchemaNames) {
+ configurationChangedListenerManager = new
ConfigurationChangedListenerManager(name, configurationRepository,
shardingSchemaNames);
+ registryListenerManager = new RegistryListenerManager(name,
registryRepository);
+ metaDataListenerManager = new MetaDataListenerManager(name,
configurationRepository, shardingSchemaNames);
}
/**
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacadeTest.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacadeTest.java
index 3087de5..12e0cf8 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacadeTest.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationFacadeTest.java
@@ -74,7 +74,7 @@ public final class OrchestrationFacadeTest {
OrchestrationRepositoryConfiguration configuration2 = new
OrchestrationRepositoryConfiguration("CONFIG_TEST", new Properties());
configuration2.setOrchestrationType("config_center");
configuration2.setNamespace("namespace_2");
- OrchestrationConfiguration orchestrationConfiguration = new
OrchestrationConfiguration("test_name_1", configuration1, "test_name_2",
configuration2);
+ OrchestrationConfiguration orchestrationConfiguration = new
OrchestrationConfiguration("test_name", configuration1, configuration2);
orchestrationFacade.init(orchestrationConfiguration,
Arrays.asList("sharding_db", "masterslave_db"));
FieldUtil.setField(orchestrationFacade, "registryRepository",
registryRepository);
FieldUtil.setField(orchestrationFacade, "configCenter", configCenter);
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationListenerManagerTest.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationListenerManagerTest.java
index d7b5d5d..abd390c 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationListenerManagerTest.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/OrchestrationListenerManagerTest.java
@@ -54,7 +54,7 @@ public final class OrchestrationListenerManagerTest {
@Test
public void assertInitListeners() {
- OrchestrationListenerManager actual = new
OrchestrationListenerManager("testRegCenter", registryRepository,
"FirstTestConfigCenter", configurationRepository, Collections.emptyList());
+ OrchestrationListenerManager actual = new
OrchestrationListenerManager("test_name", registryRepository,
configurationRepository, Collections.emptyList());
FieldUtil.setField(actual, "configurationChangedListenerManager",
configurationChangedListenerManager);
FieldUtil.setField(actual, "registryListenerManager",
registryListenerManager);
FieldUtil.setField(actual, "metaDataListenerManager",
metaDataListenerManager);
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/OrchestrationConfiguration.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/Orchestrat
[...]
index b4386a7..da5902b 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/OrchestrationConfiguration.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/OrchestrationConfiguration.java
@@ -26,29 +26,17 @@ import java.util.Optional;
* Orchestration configuration.
*/
@RequiredArgsConstructor
+@Getter
public final class OrchestrationConfiguration {
- @Getter
- private final String registryCenterName;
+ private final String name;
- @Getter
private final OrchestrationRepositoryConfiguration
registryRepositoryConfiguration;
- private final String additionalConfigCenterName;
-
private final OrchestrationRepositoryConfiguration
additionalConfigurationRepositoryConfiguration;
- public OrchestrationConfiguration(final String registryCenterName, final
OrchestrationRepositoryConfiguration registryRepositoryConfiguration) {
- this(registryCenterName, registryRepositoryConfiguration, null, null);
- }
-
- /**
- * Get additional config center name.
- *
- * @return additional config center name
- */
- public Optional<String> getAdditionalConfigCenterName() {
- return Optional.ofNullable(additionalConfigCenterName);
+ public OrchestrationConfiguration(final String name, final
OrchestrationRepositoryConfiguration registryRepositoryConfiguration) {
+ this(name, registryRepositoryConfiguration, null);
}
/**
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repository/common/configuration/config/YamlOrchestrationConfiguration.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repos
[...]
index f6d6cda..25ff225 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repository/common/configuration/config/YamlOrchestrationConfiguration.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repository/common/configuration/config/YamlOrchestrationConfiguration.java
@@ -28,11 +28,9 @@ import
org.apache.shardingsphere.infra.yaml.config.YamlConfiguration;
@Setter
public final class YamlOrchestrationConfiguration implements YamlConfiguration
{
- private String registryCenterName;
+ private String name;
private YamlOrchestrationRepositoryConfiguration
registryRepositoryConfiguration;
- private String additionalConfigCenterName;
-
private YamlOrchestrationRepositoryConfiguration
additionalConfigurationRepositoryConfiguration;
}
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repository/common/configuration/swapper/OrchestrationConfigurationYamlSwapper.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestrati
[...]
index 1e96826..d9bb9aa 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repository/common/configuration/swapper/OrchestrationConfigurationYamlSwapper.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestration/repository/common/configuration/swapper/OrchestrationConfigurationYamlSwapper.java
@@ -31,10 +31,9 @@ public final class OrchestrationConfigurationYamlSwapper
implements YamlSwapper<
@Override
public YamlOrchestrationConfiguration swapToYamlConfiguration(final
OrchestrationConfiguration configuration) {
YamlOrchestrationConfiguration result = new
YamlOrchestrationConfiguration();
- result.setRegistryCenterName(configuration.getRegistryCenterName());
+ result.setName(configuration.getName());
result.setRegistryRepositoryConfiguration(swapper.swapToYamlConfiguration(configuration.getRegistryRepositoryConfiguration()));
- if (configuration.getAdditionalConfigCenterName().isPresent() &&
configuration.getAdditionalConfigurationRepositoryConfiguration().isPresent()) {
-
result.setAdditionalConfigCenterName(configuration.getAdditionalConfigCenterName().get());
+ if
(configuration.getAdditionalConfigurationRepositoryConfiguration().isPresent())
{
result.setAdditionalConfigurationRepositoryConfiguration(swapper.swapToYamlConfiguration(configuration.getAdditionalConfigurationRepositoryConfiguration().get()));
}
return result;
@@ -42,10 +41,10 @@ public final class OrchestrationConfigurationYamlSwapper
implements YamlSwapper<
@Override
public OrchestrationConfiguration swapToObject(final
YamlOrchestrationConfiguration configuration) {
- if (null != configuration.getAdditionalConfigCenterName() && null !=
configuration.getAdditionalConfigurationRepositoryConfiguration()) {
- return new
OrchestrationConfiguration(configuration.getRegistryCenterName(),
swapper.swapToObject(configuration.getRegistryRepositoryConfiguration()),
- configuration.getAdditionalConfigCenterName(),
swapper.swapToObject(configuration.getAdditionalConfigurationRepositoryConfiguration()));
+ if (null !=
configuration.getAdditionalConfigurationRepositoryConfiguration()) {
+ return new OrchestrationConfiguration(configuration.getName(),
swapper.swapToObject(configuration.getRegistryRepositoryConfiguration()),
+
swapper.swapToObject(configuration.getAdditionalConfigurationRepositoryConfiguration()));
}
- return new
OrchestrationConfiguration(configuration.getRegistryCenterName(),
swapper.swapToObject(configuration.getRegistryRepositoryConfiguration()));
+ return new OrchestrationConfiguration(configuration.getName(),
swapper.swapToObject(configuration.getRegistryRepositoryConfiguration()));
}
}
diff --git
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphere/orchestration/repository/common/configuration/swapper/OrchestrationConfigurationYamlSwapperTest.java
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphere/orchest
[...]
index 95e4a3c..dbb8430 100644
---
a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphere/orchestration/repository/common/configuration/swapper/OrchestrationConfigurationYamlSwapperTest.java
+++
b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphere/orchestration/repository/common/configuration/swapper/OrchestrationConfigurationYamlSwapperTest.java
@@ -70,7 +70,7 @@ public final class OrchestrationConfigurationYamlSwapperTest {
registryRepositoryConfiguration.setServerLists("127.0.0.1:2181,127.0.0.1:2182");
registryRepositoryConfiguration.setNamespace("orchestration");
YamlOrchestrationConfiguration result = new
YamlOrchestrationConfiguration();
- result.setRegistryCenterName(LOGIC_SCHEMA);
+ result.setName(LOGIC_SCHEMA);
result.setRegistryRepositoryConfiguration(registryRepositoryConfiguration);
return result;
}
diff --git
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/server.yaml
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/server.yaml
index 50d9bfe..114e232 100644
---
a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/server.yaml
+++
b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/server.yaml
@@ -22,7 +22,7 @@
######################################################################################################
#
#orchestration:
-# registryCenterName: orchestration_ds
+# name: orchestration_ds
# registryRepositoryConfiguration:
# orchestrationType: registry_center,config_center,metadata_center
# instanceType: zookeeper
diff --git
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/docker/proxy/conf/server.yaml
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/docker/proxy/conf/server.yaml
index df13240..35d40de 100644
---
a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/docker/proxy/conf/server.yaml
+++
b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/docker/proxy/conf/server.yaml
@@ -22,7 +22,7 @@
######################################################################################################
#
#orchestration:
-# registryCenterName: orchestration_ds
+# name: orchestration_ds
# registryRepositoryConfiguration:
# orchestrationType: registry_center,config_center,metadata_center
# instanceType: zookeeper
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/util/YamlOrchestrationRepositoryConfigurationSwapperUtil.java
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/util/YamlOrchestrationRepositoryConfigurationSwapperUtil.java
index 86d369e..07628d5 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/util/YamlOrchestrationRepositoryConfigurationSwapperUtil.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/util/YamlOrchestrationRepositoryConfigurationSwapperUtil.java
@@ -38,10 +38,10 @@ public final class
YamlOrchestrationRepositoryConfigurationSwapperUtil {
* @return orchestration repository configuration map
*/
public static OrchestrationConfiguration marshal(final
YamlOrchestrationConfiguration orchestration) {
- if (null == orchestration.getAdditionalConfigCenterName() && null ==
orchestration.getAdditionalConfigurationRepositoryConfiguration()) {
- return new
OrchestrationConfiguration(orchestration.getRegistryCenterName(),
SWAPPER.swapToObject(orchestration.getRegistryRepositoryConfiguration()));
+ if (null ==
orchestration.getAdditionalConfigurationRepositoryConfiguration()) {
+ return new OrchestrationConfiguration(orchestration.getName(),
SWAPPER.swapToObject(orchestration.getRegistryRepositoryConfiguration()));
}
- return new
OrchestrationConfiguration(orchestration.getRegistryCenterName(),
SWAPPER.swapToObject(orchestration.getRegistryRepositoryConfiguration()),
- orchestration.getAdditionalConfigCenterName(),
SWAPPER.swapToObject(orchestration.getAdditionalConfigurationRepositoryConfiguration()));
+ return new OrchestrationConfiguration(orchestration.getName(),
+
SWAPPER.swapToObject(orchestration.getRegistryRepositoryConfiguration()),
SWAPPER.swapToObject(orchestration.getAdditionalConfigurationRepositoryConfiguration()));
}
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSourceTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSourceTest.java
index 8bbe501..4100b49 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSourceTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSourceTest.java
@@ -72,8 +72,7 @@ public final class OrchestrationShardingSphereDataSourceTest {
}
private static OrchestrationConfiguration getOrchestrationConfiguration() {
- return new OrchestrationConfiguration(
- "test_sharding_registry_name",
getRegistryOrchestrationRepositoryConfiguration(), "test_sharding_config_name",
getConfigOrchestrationRepositoryConfiguration());
+ return new OrchestrationConfiguration("test_name",
getRegistryOrchestrationRepositoryConfiguration(),
getConfigOrchestrationRepositoryConfiguration());
}
private static OrchestrationRepositoryConfiguration
getRegistryOrchestrationRepositoryConfiguration() {
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/util/YamlInstanceConfigurationSwapperUtilTest.java
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/util/YamlInstanceConfigurationSwapperUtilTest.java
index f1d658a..3f5ad09 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/util/YamlInstanceConfigurationSwapperUtilTest.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/internal/util/YamlInstanceConfigurationSwapperUtilTest.java
@@ -34,7 +34,7 @@ public final class YamlInstanceConfigurationSwapperUtilTest {
public void marshal() {
YamlOrchestrationRepositoryConfiguration
yamlOrchestrationRepositoryConfiguration =
getYamlOrchestrationRepositoryConfiguration();
YamlOrchestrationConfiguration yamlConfiguration = new
YamlOrchestrationConfiguration();
- yamlConfiguration.setRegistryCenterName("test");
+ yamlConfiguration.setName("test");
yamlConfiguration.setRegistryRepositoryConfiguration(yamlOrchestrationRepositoryConfiguration);
OrchestrationConfiguration orchestrationConfiguration =
YamlOrchestrationRepositoryConfigurationSwapperUtil.marshal(yamlConfiguration);
OrchestrationRepositoryConfiguration configuration =
orchestrationConfiguration.getRegistryRepositoryConfiguration();
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml
index e55774c..348a779 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithProps.yaml
@@ -46,7 +46,7 @@ rules:
- db_slave_1
orchestration:
- registryCenterName: test_ms_registry_name
+ name: test_ms_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -58,8 +58,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_ms_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml
index 5641625..4ba8b37 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml
@@ -46,7 +46,7 @@ rules:
- db_slave_1
orchestration:
- registryCenterName: test_ms_registry_name
+ name: test_ms_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -58,8 +58,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_ms_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
index dfcdb9d..bb322b5 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml
@@ -85,7 +85,7 @@ rules:
type: INCREMENT
orchestration:
- registryCenterName: test_sharding_registry_name
+ name: test_sharding_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -97,8 +97,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
index 849bdcd..684d75d 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml
@@ -85,7 +85,7 @@ rules:
type: INCREMENT
orchestration:
- registryCenterName: test_sharding_registry_name
+ name: test_sharding_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -97,8 +97,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
index 90f90d7..7ca8697 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml
@@ -69,7 +69,7 @@ rules:
type: INCREMENT
orchestration:
- registryCenterName: test_sharding_registry_name
+ name: test_sharding_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -81,8 +81,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
index 26d1808..b7ef6c8 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml
@@ -71,7 +71,7 @@ rules:
type: INCREMENT
orchestration:
- registryCenterName: test_sharding_registry_name
+ name: test_sharding_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -83,8 +83,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
index 2f1b143..0a2671a 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml
@@ -119,7 +119,7 @@ rules:
type: ROUND_ROBIN
orchestration:
- registryCenterName: test_sharding_ms_registry_name
+ name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -131,8 +131,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_ms_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
index 5a7f899..9b2b400 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml
@@ -121,7 +121,7 @@ rules:
type: ROUND_ROBIN
orchestration:
- registryCenterName: test_sharding_ms_registry_name
+ name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -133,8 +133,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_ms_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutRules.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutRules.yaml
index 713b04b..96ab677 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutRules.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutRules.yaml
@@ -42,7 +42,7 @@ dataSources:
maxTotal: 100
orchestration:
- registryCenterName: test_sharding_ms_registry_name
+ name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -54,8 +54,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_ms_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
index a356824..4bd6a1b 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml
@@ -82,7 +82,7 @@ rules:
- db1_slave
orchestration:
- registryCenterName: test_sharding_ms_registry_name
+ name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -94,8 +94,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_ms_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
index aef167a..4bd52ff 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml
@@ -86,7 +86,7 @@ rules:
type: ROUND_ROBIN
orchestration:
- registryCenterName: test_sharding_ms_registry_name
+ name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -98,8 +98,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_sharding_ms_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
index 51996ef..eb78ac4 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: test_encrypt_registry_name
+ name: test_encrypt_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: REG_TEST
@@ -28,8 +28,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_encrypt_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: CONFIG_TEST
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/noRule.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/noRule.yaml
index 1eba059..f036f4b 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/noRule.yaml
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/resources/yaml/unit/noRule.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: test_encrypt_registry_name
+ name: test_encrypt_registry_name
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: FirstTestRegistryCenter
@@ -28,8 +28,6 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
-
- additionalConfigCenterName: test_encrypt_config_name
additionalConfigurationRepositoryConfiguration:
orchestrationType: config_center
instanceType: FirstTestConfigCenter
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/OrchestrationSpringBootConfiguration.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/OrchestrationSpringB
[...]
index 0af9fae..502e608 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/OrchestrationSpringBootConfiguration.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/OrchestrationSpringBootConfiguration.java
@@ -18,15 +18,13 @@
package org.apache.shardingsphere.spring.boot.orchestration;
import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.cluster.configuration.swapper.ClusterConfigurationYamlSwapper;
import
org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
import
org.apache.shardingsphere.driver.orchestration.internal.datasource.OrchestrationShardingSphereDataSource;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import
org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationConfiguration;
-import
org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
-import
org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationRepositoryConfiguration;
+import
org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationConfiguration;
import
org.apache.shardingsphere.orchestration.repository.common.configuration.swapper.OrchestrationRepositoryConfigurationYamlSwapper;
import org.apache.shardingsphere.spring.boot.datasource.DataSourceMapSetter;
import
org.apache.shardingsphere.spring.boot.orchestration.common.OrchestrationSpringBootRootConfiguration;
@@ -78,28 +76,18 @@ public class OrchestrationSpringBootConfiguration
implements EnvironmentAware {
* @return orchestration configuration
*/
@Bean
+ // TODO only can support one OrchestrationConfiguration, should support
multiple
public OrchestrationConfiguration orchestrationConfiguration() {
- Preconditions.checkState(isValidOrchestrationConfiguration(), "The
orchestration configuration is invalid, please configure orchestration");
- String registryCenterName = null;
- OrchestrationRepositoryConfiguration registryRepositoryConfiguration =
null;
- String additionalConfigCenterName = null;
- OrchestrationRepositoryConfiguration
additionalConfigurationRepositoryConfiguration = null;
- for (Entry<String, YamlOrchestrationRepositoryConfiguration> entry :
root.getOrchestration().entrySet()) {
- OrchestrationRepositoryConfiguration configuration =
swapper.swapToObject(entry.getValue());
- List<String> orchestrationTypes =
Splitter.on(",").omitEmptyStrings().trimResults().splitToList(configuration.getOrchestrationType());
- if (orchestrationTypes.contains("registry_center")) {
- registryCenterName = entry.getKey();
- registryRepositoryConfiguration = configuration;
- } else if (orchestrationTypes.contains("config_center")) {
- additionalConfigCenterName = entry.getKey();
- additionalConfigurationRepositoryConfiguration = configuration;
+
Preconditions.checkState(!CollectionUtils.isEmpty(root.getOrchestration()),
"The orchestration configuration is invalid, please configure orchestration");
+ for (Entry<String, YamlOrchestrationConfiguration> entry :
root.getOrchestration().entrySet()) {
+ if (null ==
entry.getValue().getAdditionalConfigurationRepositoryConfiguration()) {
+ return new OrchestrationConfiguration(entry.getKey(),
swapper.swapToObject(entry.getValue().getRegistryRepositoryConfiguration()));
}
+ return new OrchestrationConfiguration(entry.getKey(),
+
swapper.swapToObject(entry.getValue().getRegistryRepositoryConfiguration()),
swapper.swapToObject(entry.getValue().getAdditionalConfigurationRepositoryConfiguration()));
}
- return new OrchestrationConfiguration(registryCenterName,
registryRepositoryConfiguration, additionalConfigCenterName,
additionalConfigurationRepositoryConfiguration);
- }
-
- private boolean isValidOrchestrationConfiguration() {
- return !CollectionUtils.isEmpty(root.getOrchestration());
+ // TODO should return map when support multiple
OrchestrationConfiguration
+ return null;
}
/**
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/common/OrchestrationSpringBootRootConfiguration.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/common/Or
[...]
index 7ae03f0..603bc5b 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/common/OrchestrationSpringBootRootConfiguration.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/common/OrchestrationSpringBootRootConfiguration.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.spring.boot.orchestration.common;
import lombok.Getter;
import lombok.Setter;
import
org.apache.shardingsphere.cluster.configuration.yaml.YamlClusterConfiguration;
-import
org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationRepositoryConfiguration;
+import
org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.Map;
@@ -36,7 +36,7 @@ public final class OrchestrationSpringBootRootConfiguration {
private Properties props = new Properties();
- private Map<String, YamlOrchestrationRepositoryConfiguration>
orchestration;
+ private Map<String, YamlOrchestrationConfiguration> orchestration;
private YamlClusterConfiguration cluster;
}
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-encrypt.properties
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-encrypt.properties
index a692b04..94c90e0 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-encrypt.properties
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-encrypt.properties
@@ -32,8 +32,8 @@
spring.shardingsphere.rules.encrypt.tables.t_order.columns.order_id.encryptor-na
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.orchestration-type=config_center,registry_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.instance-type=TestRegistry
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.server-lists=localhost:3181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-master-slave-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.orchestration-type=config_center,registry_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=TestRegistry
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.server-lists=localhost:3181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.namespace=orchestration-spring-boot-master-slave-test
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.props.overwrite=true
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-masterslave.properties
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-masterslave.properties
index 724a210..ff5f306 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-masterslave.properties
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-masterslave.properties
@@ -42,8 +42,8 @@ spring.shardingsphere.datasource.ds_slave_1.max-total=16
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.master-data-source-name=ds_master
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.slave-data-source-names=ds_slave_0,ds_slave_1
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.orchestration-type=config_center,registry_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.instance-type=TestRegistry
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.server-lists=localhost:3181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=orchestration-spring-boot-master-slave-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.orchestration-type=config_center,registry_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.instance-type=TestRegistry
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.server-lists=localhost:3181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.namespace=orchestration-spring-boot-master-slave-test
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.props.overwrite=true
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-registry.properties
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-registry.properties
index 0264ef0..7f60a61 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-registry.properties
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-registry.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.orchestration-type=config_center,registry_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.instance-type=TestRegistry
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.server-lists=localhost:3181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.namespace=orchestration-spring-boot-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-repository-configuration.orchestration-type=config_center,registry_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-repository-configuration.instance-type=TestRegistry
+spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-repository-configuration.server-lists=localhost:3181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-repository-configuration.namespace=orchestration-spring-boot-test
+spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-repository-configuration.props.overwrite=true
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-sharding.properties
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-sharding.properties
index 1b550b2..91cba8e 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-sharding.properties
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-sharding.properties
@@ -69,8 +69,8 @@
spring.shardingsphere.rules.sharding.key-generators.snowflake.props.worker.id=12
spring.shardingsphere.props.sql.show=true
spring.shardingsphere.props.executor.size=100
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.orchestration-type=config_center,registry_center,metadata_center
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.instance-type=TestRegistry
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.server-lists=localhost:3181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=orchestration-spring-boot-sharding-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.props.overwrite=true
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.orchestration-type=config_center,registry_center,metadata_center
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.instance-type=TestRegistry
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.server-lists=localhost:3181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.namespace=orchestration-spring-boot-sharding-test
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.props.overwrite=true
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
index e5286fc..5823eef 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
@@ -22,7 +22,7 @@
######################################################################################################
#
#orchestration:
-# registryCenterName: orchestration_ds
+# name: orchestration_ds
# registryRepositoryConfiguration:
# orchestrationType: registry_center,config_center,metadata_center
# instanceType: zookeeper
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
index 7de48a7..f4d12d5 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
+++
b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
@@ -16,7 +16,7 @@
#
orchestration:
- registryCenterName: test_name_1
+ name: test_name_1
registryRepositoryConfiguration:
orchestrationType: registry_center
instanceType: zookeeper
