You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by xi...@apache.org on 2020/07/27 14:45:23 UTC
[shardingsphere] branch master updated: Unify orchestration center
type
This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c34e047 Unify orchestration center type
new 1b3823e Merge pull request #6472 from terrymanu/dev
c34e047 is described below
commit c34e0475f45a1c7417f059e4505441e276ae5dd5
Author: terrymanu <te...@163.com>
AuthorDate: Mon Jul 27 22:40:47 2020 +0800
Unify orchestration center type
---
.../docker/sharding-proxy/sharding/conf/server.yaml | 2 +-
.../OrchestrationRepositoryConfigurationUtil.java | 6 +++---
.../main/resources/META-INF/nacos/cloud/encrypt.yaml | 4 ++--
.../resources/META-INF/nacos/cloud/master-slave.yaml | 6 ++----
.../src/main/resources/META-INF/nacos/cloud/shadow.yaml | 6 ++----
.../META-INF/nacos/cloud/sharding-databases-tables.yaml | 7 +++----
.../main/resources/META-INF/nacos/local/encrypt.yaml | 4 ++--
.../resources/META-INF/nacos/local/master-slave.yaml | 6 ++----
.../src/main/resources/META-INF/nacos/local/shadow.yaml | 6 ++----
.../META-INF/nacos/local/sharding-databases-tables.yaml | 7 +++----
.../resources/META-INF/zookeeper/cloud/encrypt.yaml | 2 +-
.../META-INF/zookeeper/cloud/master-slave.yaml | 2 +-
.../main/resources/META-INF/zookeeper/cloud/shadow.yaml | 2 +-
.../zookeeper/cloud/sharding-databases-tables.yaml | 2 +-
.../resources/META-INF/zookeeper/local/encrypt.yaml | 2 +-
.../META-INF/zookeeper/local/master-slave.yaml | 2 +-
.../main/resources/META-INF/zookeeper/local/shadow.yaml | 2 +-
.../zookeeper/local/sharding-databases-tables.yaml | 2 +-
.../application-cloud-nacos-encrypt.properties | 17 +++++++++--------
.../application-cloud-nacos-master-slave.properties | 17 ++++++++---------
.../resources/application-cloud-nacos-shadow.properties | 17 ++++++++---------
...ion-cloud-nacos-sharding-databases-tables.properties | 17 ++++++++---------
.../application-cloud-zookeeper-encrypt.properties | 7 ++++---
.../application-cloud-zookeeper-master-slave.properties | 7 ++++---
.../application-cloud-zookeeper-shadow.properties | 7 ++++---
...cloud-zookeeper-sharding-databases-tables.properties | 7 ++++---
.../application-local-nacos-encrypt.properties | 13 ++++++-------
.../application-local-nacos-master-slave.properties | 13 ++++++-------
.../resources/application-local-nacos-shadow.properties | 13 ++++++-------
...ion-local-nacos-sharding-databases-tables.properties | 13 ++++++-------
.../application-local-zookeeper-encrypt.properties | 8 +++++---
.../application-local-zookeeper-master-slave.properties | 8 +++++---
.../application-local-zookeeper-shadow.properties | 7 ++++---
...local-zookeeper-sharding-databases-tables.properties | 13 +++++++------
.../main/resources/META-INF/nacos/registry-center.xml | 4 ++--
.../resources/META-INF/zookeeper/registry-center.xml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../OrchestrationConfigurationYamlSwapperTest.java | 4 ++--
...estrationRepositoryConfigurationYamlSwapperTest.java | 8 ++++----
.../repository/apollo/ApolloRepository.java | 2 +-
.../repository/apollo/ApolloRepositoryTest.java | 4 ++--
.../apollo/wrapper/ApolloConfigWrapperTest.java | 2 +-
.../orchestration/repository/nacos/NacosRepository.java | 2 +-
.../zookeeper/CuratorZookeeperRepository.java | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../src/test/resources/docker/proxy/conf/server.yaml | 2 +-
.../util/YamlInstanceConfigurationSwapperUtilTest.java | 2 +-
.../src/test/resources/application-encrypt.properties | 5 +++--
.../test/resources/application-masterslave.properties | 6 ++++--
.../src/test/resources/application-registry.properties | 5 +++--
.../main/resources/META-INF/namespace/orchestration.xsd | 1 -
.../resources/META-INF/rdb/encryptOrchestration.xml | 2 +-
.../resources/META-INF/rdb/masterSlaveOrchestration.xml | 2 +-
.../META-INF/rdb/shardingMasterSlaveOrchestration.xml | 2 +-
.../resources/META-INF/rdb/shardingOrchestration.xml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../src/test/resources/conf/server.yaml | 2 +-
.../OrchestrationConfigurationConverter.java | 2 +-
.../resume/ZookeeperResumablePositionManager.java | 2 +-
60 files changed, 162 insertions(+), 165 deletions(-)
diff --git a/examples/docker/sharding-proxy/sharding/conf/server.yaml b/examples/docker/sharding-proxy/sharding/conf/server.yaml
index eb7951c..6698c90 100644
--- a/examples/docker/sharding-proxy/sharding/conf/server.yaml
+++ b/examples/docker/sharding-proxy/sharding/conf/server.yaml
@@ -24,7 +24,7 @@
#orchestration:
# namespace: orchestration_ds
# registryCenter:
-# type: zookeeper
+# type: ZooKeeper
# serverLists: localhost:2181
# overwrite: false
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 a0b83b2..82c6fbf 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
@@ -30,7 +30,7 @@ public final class OrchestrationRepositoryConfigurationUtil {
private static final String NACOS_CONNECTION_STRING = "localhost:8848";
public static OrchestrationConfiguration getZooKeeperConfiguration(final boolean overwrite, final ShardingType shardingType) {
- OrchestrationCenterConfiguration orchestrationCenterConfig = new OrchestrationCenterConfiguration("zookeeper", ZOOKEEPER_CONNECTION_STRING, new Properties());
+ OrchestrationCenterConfiguration orchestrationCenterConfig = new OrchestrationCenterConfiguration("ZooKeeper", ZOOKEEPER_CONNECTION_STRING, new Properties());
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
return new OrchestrationConfiguration("orchestration-sharding-data-source", orchestrationCenterConfig, overwrite);
@@ -49,9 +49,9 @@ public final class OrchestrationRepositoryConfigurationUtil {
Properties nacosProperties = new Properties();
nacosProperties.setProperty("group", "SHARDING_SPHERE_DEFAULT_GROUP");
nacosProperties.setProperty("timeout", "3000");
- OrchestrationCenterConfiguration nacosConfig = new OrchestrationCenterConfiguration("nacos", NACOS_CONNECTION_STRING, nacosProperties);
+ OrchestrationCenterConfiguration nacosConfig = new OrchestrationCenterConfiguration("Nacos", NACOS_CONNECTION_STRING, nacosProperties);
Properties zookeeperProperties = new Properties();
- OrchestrationCenterConfiguration zookeeperConfig = new OrchestrationCenterConfiguration("zookeeper", ZOOKEEPER_CONNECTION_STRING, zookeeperProperties);
+ OrchestrationCenterConfiguration zookeeperConfig = new OrchestrationCenterConfiguration("ZooKeeper", ZOOKEEPER_CONNECTION_STRING, zookeeperProperties);
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
return new OrchestrationConfiguration("orchestration-zookeeper-sharding-data-source", zookeeperConfig, nacosConfig, overwrite);
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 5d7945e..dc0e98c 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
@@ -18,10 +18,10 @@
orchestration:
namespace: demo_zookeeper_yaml_ds_encrypt
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
additionalConfigCenter:
- type: nacos
+ type: Nacos
serverLists: localhost:8848
props:
group: SHARDING_SPHERE_DEFAULT_GROUP
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 96512a6..2b104ba 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
@@ -18,13 +18,11 @@
orchestration:
namespace: demo_zookeeper_yaml_ds_ms
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
- namespace:
additionalConfigCenter:
- type: nacos
+ type: Nacos
serverLists: localhost:8848
- namespace:
props:
group: SHARDING_SPHERE_DEFAULT_GROUP
timeout: 3000
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 9e313ac..2768c9f 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
@@ -18,14 +18,12 @@
orchestration:
namespace: demo_zookeeper_yaml_ds_shadow
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
- namespace:
props:
additionalConfigCenter:
- type: nacos
+ type: Nacos
serverLists: localhost:8848
- namespace:
props:
group: SHARDING_SPHERE_DEFAULT_GROUP
timeout: 3000
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 7070372..503d7d1 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
@@ -18,13 +18,12 @@
orchestration:
namespace: demo_zookeeper_yaml_ds_sharding
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
additionalConfigCenter:
- type: nacos
+ type: Nacos
serverLists: localhost:8848
- namespace:
props:
group: SHARDING_SPHERE_DEFAULT_GROUP
timeout: 3000
- overwrite: false
\ No newline at end of file
+ overwrite: false
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 f805aa8..7645e58 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
@@ -43,10 +43,10 @@ props:
orchestration:
namespace: demo_zookeeper_yaml_ds_encrypt
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
additionalConfigCenter:
- type: nacos
+ type: Nacos
serverLists: localhost:8848
props:
group: SHARDING_SPHERE_DEFAULT_GROUP
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 a3ad78d..f8feb41 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
@@ -46,13 +46,11 @@ props:
orchestration:
namespace: demo_zookeeper_yaml_ds_ms
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
- namespace:
additionalConfigCenter:
- type: nacos
+ type: Nacos
serverLists: localhost:8848
- namespace:
props:
group: SHARDING_SPHERE_DEFAULT_GROUP
timeout: 3000
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 dbe0a18..4ce6411 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
@@ -18,13 +18,11 @@
orchestration:
namespace: demo_zookeeper_yaml_ds_shadow
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
- namespace:
additionalConfigCenter:
- type: nacos
+ type: Nacos
serverLists: localhost:8848
- namespace:
props:
group: SHARDING_SPHERE_DEFAULT_GROUP
timeout: 3000
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 7a71105..4eaa58a 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
@@ -83,13 +83,12 @@ props:
orchestration:
namespace: demo_zookeeper_yaml_ds_sharding
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
- namespace:
additionalConfigCenter:
- type: nacos
+ type: Nacos
serverLists: localhost:8848
- namespace:
+ props:
group: SHARDING_SPHERE_DEFAULT_GROUP
timeout: 3000
overwrite: true
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 ed72567..b494b87 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
@@ -18,6 +18,6 @@
orchestration:
namespace: demo_yaml_ds_encrypt
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: false
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 d3e1b60..d24cd4d 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
@@ -18,6 +18,6 @@
orchestration:
namespace: demo_yaml_ds_ms
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: false
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 7ec3c75..58acc61 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
@@ -18,6 +18,6 @@
orchestration:
namespace: demo_yaml_ds_shadow
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: false
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 d55c6cd..ec2f459 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
@@ -18,6 +18,6 @@
orchestration:
namespace: demo_yaml_ds_sharding
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: false
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 0a2fb24..b21a17f 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
@@ -18,7 +18,7 @@
orchestration:
namespace: demo_yaml_ds_encrypt
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: true
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 a6d1b13..619ca04 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
@@ -18,7 +18,7 @@
orchestration:
namespace: demo_yaml_ds_ms
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: true
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 67e65fd..9a050f8 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
@@ -18,7 +18,7 @@
orchestration:
namespace: demo_yaml_ds_shadow
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: true
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 eb06beb..cc67567 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
@@ -18,7 +18,7 @@
orchestration:
namespace: demo_yaml_ds_sharding
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: true
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 bad0734..34a9e86 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,14 +15,15 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.namespace=
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.overwrite=false
+
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.server-lists=localhost:2181
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=
spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=false
spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.group=SHARDING_SPHERE_DEFAULT_GROUP
spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.operationTimeoutMilliseconds=3000
-
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.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 bb0887d..f37721f 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,14 +15,13 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.overwrite=false
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.overwrite=false
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.type=ZooKeeper
spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.overwrite=false
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.props.operationTimeoutMilliseconds=3000
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 9e69b46..8701e29 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,14 +15,13 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.overwrite=false
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.props.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.overwrite=false
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-center.type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-center.type=ZooKeeper
spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.overwrite=false
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.props.operationTimeoutMilliseconds=3000
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 9f60859..bf7d5f2 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,14 +15,13 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.overwrite=false
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.overwrite=false
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-center.type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-center.type=ZooKeeper
spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.overwrite=false
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.operationTimeoutMilliseconds=3000
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 be586c1..5eb33f9 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,7 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=false
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.server-lists=localhost:2181
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 e818542..12a51cf 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,7 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.overwrite=false
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.server-lists=localhost:2181
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 98cf46a..afd1a24 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,7 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.overwrite=false
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.server-lists=localhost:2181
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 df08745..02d77bb 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,7 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.overwrite=false
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.server-lists=localhost:2181
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 0eab0ac..f83f8ea 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,12 +31,11 @@ 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.registry-center.type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=true
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.overwrite=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.type=ZooKeeper
spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.overwrite=true
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.additional-config-center.server-lists=localhost:8848
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 db65517..8daf9dd 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,12 +33,11 @@ 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.registry-center.type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.overwrite=true
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.overwrite=true
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.type=ZooKeeper
spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.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 5d39019..fcb8862 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,12 +31,11 @@ spring.shardingsphere.rules.shadow.shadow-mappings.ds=shadow_ds
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.overwrite=true
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.overwrite=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-center.type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-center.type=ZooKeeper
spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.overwrite=true
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.server-lists=localhost:8848
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 f976042..6929923 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,12 +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.registry-center.type=nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.overwrite=true
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.overwrite=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-center.type=zookeeper
+spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-center.type=ZooKeeper
spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.overwrite=true
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.additional-config-center.server-lists=localhost:8848
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 7ce6e9c..54cc89a 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,7 +31,9 @@ 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.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=true
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.server-lists=localhost:2181
+
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 c3e38e1..b7bc569 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,7 +33,9 @@ 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.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.overwrite=true
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.server-lists=localhost:2181
+
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 e97a929..484c02f 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,7 +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.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.overwrite=true
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-center.server-lists=localhost:2181
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 e28c3bc..307cf3f 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,12 +57,13 @@ 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.registry-center.type=zookeeper
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.overwrite=true
-
spring.shardingsphere.rules.encrypt.encryptors.status_encryptor.type=AES
spring.shardingsphere.rules.encrypt.encryptors.status_encryptor.props.aes.key.value=123456
spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.cipher-column=status
-spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.encryptor-name=status_encryptor
\ No newline at end of file
+spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.encryptor-name=status_encryptor
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.overwrite=true
+
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/nacos/registry-center.xml b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/nacos/registry-center.xml
index e2de660..0a13524 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/nacos/registry-center.xml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/nacos/registry-center.xml
@@ -24,14 +24,14 @@
http://shardingsphere.apache.org/schema/shardingsphere/orchestration
http://shardingsphere.apache.org/schema/shardingsphere/orchestration/orchestration.xsd
">
- <orchestration:instance id="confCenter" type="nacos" server-lists="localhost:8848" namespace="">
+ <orchestration:instance id="confCenter" type="Nacos" server-lists="localhost:8848">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
</props>
</orchestration:instance>
- <orchestration:instance id="regCenter" type="zookeeper" server-lists="localhost:2181" namespace="">
+ <orchestration:instance id="regCenter" type="ZooKeeper" server-lists="localhost:2181">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml
index 41d746d..54a94a3 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml
@@ -24,7 +24,7 @@
http://shardingsphere.apache.org/schema/shardingsphere/orchestration
http://shardingsphere.apache.org/schema/shardingsphere/orchestration/orchestration.xsd
">
- <orchestration:instance id="regCenter" type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo">
+ <orchestration:instance id="regCenter" type="ZooKeeper" server-lists="localhost:2181">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
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 d7b5f19..1ab16bb 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
@@ -24,7 +24,7 @@
#orchestration:
# namespace: orchestration_ds
# registryCenter:
-# type: zookeeper
+# type: ZooKeeper
# serverLists: localhost:2181
# props:
# retryIntervalMilliseconds: 500
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 0be5557..9d3a9dd 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
@@ -24,7 +24,7 @@
#orchestration:
# namespace: orchestration_ds
# registryCenter:
-# type: zookeeper
+# type: ZooKeeper
# serverLists: localhost:2181
# props:
# retryIntervalMilliseconds: 500
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 3fce79b..daf6b22 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
@@ -42,7 +42,7 @@ public final class OrchestrationConfigurationYamlSwapperTest {
}
private OrchestrationConfiguration getOrchestrationConfiguration() {
- return new OrchestrationConfiguration(LOGIC_SCHEMA, new OrchestrationCenterConfiguration("zookeeper", "127.0.0.1:2181,127.0.0.1:2182", new Properties()), false);
+ return new OrchestrationConfiguration(LOGIC_SCHEMA, new OrchestrationCenterConfiguration("ZooKeeper", "127.0.0.1:2181,127.0.0.1:2182", new Properties()), false);
}
@Test
@@ -56,7 +56,7 @@ public final class OrchestrationConfigurationYamlSwapperTest {
private YamlOrchestrationConfiguration getYamlOrchestrationConfiguration() {
YamlOrchestrationCenterConfiguration registryCenterConfig = new YamlOrchestrationCenterConfiguration();
- registryCenterConfig.setType("zookeeper");
+ registryCenterConfig.setType("ZooKeeper");
registryCenterConfig.setProps(new Properties());
registryCenterConfig.setServerLists("127.0.0.1:2181,127.0.0.1:2182");
YamlOrchestrationConfiguration result = new YamlOrchestrationConfiguration();
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/OrchestrationRepositoryConfigurationYamlSwapperTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/test/java/org/apache/shardingsphe [...]
index 37139c8..74574b9 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/OrchestrationRepositoryConfigurationYamlSwapperTest.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/OrchestrationRepositoryConfigurationYamlSwapperTest.java
@@ -30,7 +30,7 @@ public final class OrchestrationRepositoryConfigurationYamlSwapperTest {
@Test
public void assertToYamlConfiguration() {
- OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration("zookeeper", "127.0.0.1:2181,127.0.0.1:2182", new Properties());
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration("ZooKeeper", "127.0.0.1:2181,127.0.0.1:2182", new Properties());
YamlOrchestrationCenterConfiguration yamlConfiguration = new OrchestrationCenterConfigurationYamlSwapper().swapToYamlConfiguration(config);
assertThat(yamlConfiguration.getType(), is(config.getType()));
assertThat(yamlConfiguration.getServerLists(), is(config.getServerLists()));
@@ -39,16 +39,16 @@ public final class OrchestrationRepositoryConfigurationYamlSwapperTest {
@Test
public void assertSwapToObject() {
- YamlOrchestrationCenterConfiguration yamlConfiguration = getYamlInstanceConfiguration();
+ YamlOrchestrationCenterConfiguration yamlConfiguration = getYamlOrchestrationCenterConfiguration();
OrchestrationCenterConfiguration orchestrationCenterConfig = new OrchestrationCenterConfigurationYamlSwapper().swapToObject(yamlConfiguration);
assertThat(orchestrationCenterConfig.getType(), is(yamlConfiguration.getType()));
assertThat(orchestrationCenterConfig.getServerLists(), is(yamlConfiguration.getServerLists()));
assertThat(orchestrationCenterConfig.getProps(), is(yamlConfiguration.getProps()));
}
- private YamlOrchestrationCenterConfiguration getYamlInstanceConfiguration() {
+ private YamlOrchestrationCenterConfiguration getYamlOrchestrationCenterConfiguration() {
YamlOrchestrationCenterConfiguration result = new YamlOrchestrationCenterConfiguration();
- result.setType("zookeeper");
+ result.setType("ZooKeeper");
result.setProps(new Properties());
result.setServerLists("127.0.0.1:2181,127.0.0.1:2182");
return result;
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/main/java/org/apache/shardingsphere/orchestration/repository/apollo/ApolloRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apo [...]
index 59eac2e..34a92c9 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/main/java/org/apache/shardingsphere/orchestration/repository/apollo/ApolloRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/main/java/org/apache/shardingsphere/orchestration/repository/apollo/ApolloRepository.java
@@ -120,6 +120,6 @@ public final class ApolloRepository implements ConfigurationRepository {
@Override
public String getType() {
- return "apollo";
+ return "Apollo";
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/test/java/org/apache/shardingsphere/orchestration/repository/apollo/ApolloRepositoryTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository [...]
index 3e16bdc..408a7f8 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/test/java/org/apache/shardingsphere/orchestration/repository/apollo/ApolloRepositoryTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/test/java/org/apache/shardingsphere/orchestration/repository/apollo/ApolloRepositoryTest.java
@@ -68,7 +68,7 @@ public final class ApolloRepositoryTest {
Properties props = new Properties();
props.setProperty(ApolloPropertyKey.PORTAL_URL.getKey(), PORTAL_URL);
props.setProperty(ApolloPropertyKey.TOKEN.getKey(), TOKEN);
- OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration("apollo", "http://config-service-url", props);
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration("Apollo", "http://config-service-url", props);
REPOSITORY.setProps(props);
REPOSITORY.init("orchestration", config);
ApolloConfigWrapper configWrapper = new ApolloConfigWrapper("orchestration", config, new ApolloProperties(props));
@@ -152,6 +152,6 @@ public final class ApolloRepositoryTest {
@Test
public void assertGetType() {
- assertThat(REPOSITORY.getType(), is("apollo"));
+ assertThat(REPOSITORY.getType(), is("Apollo"));
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/test/java/org/apache/shardingsphere/orchestration/repository/apollo/wrapper/ApolloConfigWrapperTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration [...]
index 292b27c..539a1f8 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/test/java/org/apache/shardingsphere/orchestration/repository/apollo/wrapper/ApolloConfigWrapperTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-apollo/src/test/java/org/apache/shardingsphere/orchestration/repository/apollo/wrapper/ApolloConfigWrapperTest.java
@@ -52,7 +52,7 @@ public final class ApolloConfigWrapperTest {
@Before
public void setup() {
configWrapper = new ApolloConfigWrapper(
- "orchestration", new OrchestrationCenterConfiguration("apollo", "http://config-service-url", new Properties()), new ApolloProperties(new Properties()));
+ "orchestration", new OrchestrationCenterConfiguration("Apollo", "http://config-service-url", new Properties()), new ApolloProperties(new Properties()));
}
@Test
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/main/java/org/apache/shardingsphere/orchestration/repository/nacos/NacosRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/ [...]
index 4a09070..788b7f7 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/main/java/org/apache/shardingsphere/orchestration/repository/nacos/NacosRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/main/java/org/apache/shardingsphere/orchestration/repository/nacos/NacosRepository.java
@@ -163,6 +163,6 @@ public final class NacosRepository implements ConfigurationRepository {
*/
@Override
public String getType() {
- return "nacos";
+ return "Nacos";
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orch [...]
index 4130a77..4ca4f13 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepository.java
@@ -288,6 +288,6 @@ public final class CuratorZookeeperRepository implements ConfigurationRepository
@Override
public String getType() {
- return "zookeeper";
+ return "ZooKeeper";
}
}
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 d4f00a2..42d22a1 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
@@ -24,7 +24,7 @@
#orchestration:
# namespace: orchestration_ds
# registryCenter:
-# type: zookeeper
+# type: ZooKeeper
# serverLists: localhost:2181
# props:
# retryIntervalMilliseconds: 500
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 bc99698..15ddec9 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
@@ -24,7 +24,7 @@
#orchestration:
# namespace: orchestration_ds
# registryCenter:
-# type: zookeeper
+# type: ZooKeeper
# serverLists: localhost:2181
# props:
# retryIntervalMilliseconds: 500
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 ac1b70a..ccae39b 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
@@ -47,7 +47,7 @@ public final class YamlInstanceConfigurationSwapperUtilTest {
private YamlOrchestrationCenterConfiguration createYamlOrchestrationRepositoryConfiguration() {
YamlOrchestrationCenterConfiguration result = new YamlOrchestrationCenterConfiguration();
- result.setType("zookeeper");
+ result.setType("ZooKeeper");
result.setServerLists("localhost:2181");
result.setProps(new Properties());
return result;
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 50cfae9..c4e0244 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,7 +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.namespace=orchestration-spring-boot-master-slave-test
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=true
+
spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.type=TestRegistry
spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.server-lists=localhost:3181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.namespace=orchestration-spring-boot-master-slave-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.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 772957a..9eca4a1 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,7 +42,9 @@ 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.namespace=orchestration-spring-boot-master-slave-test
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.overwrite=true
+
spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.type=TestRegistry
spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.server-lists=localhost:3181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.namespace=orchestration-spring-boot-master-slave-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.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 59947be..14c6ff4 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,7 +15,8 @@
# limitations under the License.
#
+spring.shardingsphere.orchestration.demo_spring_boot_ds_center.namespace=orchestration-spring-boot-test
+spring.shardingsphere.orchestration.demo_spring_boot_ds_center.overwrite=true
+
spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-center.type=TestRegistry
spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-center.server-lists=localhost:3181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-center.namespace=orchestration-spring-boot-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.overwrite=true
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/orchestration.xsd b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/orchestration.xsd
index 1431217..596677d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/orchestration.xsd
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/orchestration.xsd
@@ -41,7 +41,6 @@
<xsd:attribute name="id" type="xsd:string" use="required" />
<xsd:attribute name="type" type="xsd:string" use="required" />
<xsd:attribute name="server-lists" type="xsd:string" use="required" />
- <xsd:attribute name="namespace" type="xsd:string" />
</xsd:complexType>
</xsd:element>
</xsd:schema>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/encryptOrchestration.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/encryptOrchestration.xml
index e61e4c1..69d2c3b 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/encryptOrchestration.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/encryptOrchestration.xml
@@ -25,7 +25,7 @@
">
<import resource="namespace/encryptDataSourceNamespace.xml" />
- <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
+ <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveOrchestration.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveOrchestration.xml
index d0725c8..59390f3 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveOrchestration.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveOrchestration.xml
@@ -26,7 +26,7 @@
">
<import resource="namespace/masterSlaveDataSourceNamespace.xml" />
- <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
+ <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml
index 03a4118..8446426 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml
@@ -26,7 +26,7 @@
">
<import resource="namespace/shardingMasterSlaveNamespace.xml" />
- <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
+ <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml
index 9d8d7ac..0d8dd7d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml
@@ -34,7 +34,7 @@
<prop key="operation-timeout-milliseconds">1000</prop>
</util:properties>
- <orchestration:instance id="centerRepository" type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
+ <orchestration:instance id="centerRepository" type="TestRegistry" server-lists="localhost:3181">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
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 50c0ff9..b6fe268 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
@@ -24,7 +24,7 @@
#orchestration:
# namespace: orchestration_ds
# registryCenter:
-# type: zookeeper
+# type: ZooKeeper
# serverLists: localhost:2181
# props:
# retryIntervalMilliseconds: 500
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 2cba326..89c0d4d 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
@@ -18,7 +18,7 @@
orchestration:
namespace: test_name_1
registryCenter:
- type: zookeeper
+ type: ZooKeeper
serverLists: localhost:2181
overwrite: false
diff --git a/shardingsphere-proxy/shardingsphere-proxy-orchestration/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationConfigurationConverter.java b/shardingsphere-proxy/shardingsphere-proxy-orchestration/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationConfigurationConverter.java
index a2cdefa..7c63514 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-orchestration/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationConfigurationConverter.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-orchestration/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationConfigurationConverter.java
@@ -49,7 +49,7 @@ import java.util.Set;
/**
* Orchestration configuration converter.
*/
-public class OrchestrationConfigurationConverter extends AbstractConfigurationConverter {
+public final class OrchestrationConfigurationConverter extends AbstractConfigurationConverter {
private final OrchestrationFacade orchestrationFacade = OrchestrationFacade.getInstance();
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ZookeeperResumablePositionManager.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ZookeeperResumablePositionManager.java
index 9d77ed6..7792072 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ZookeeperResumablePositionManager.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/job/position/resume/ZookeeperResumablePositionManager.java
@@ -67,7 +67,7 @@ public final class ZookeeperResumablePositionManager extends AbstractResumablePo
}
private OrchestrationCenterConfiguration getCenterConfiguration(final ResumeConfiguration resumeConfiguration) {
- return new OrchestrationCenterConfiguration("zookeeper", resumeConfiguration.getServerLists(), new Properties());
+ return new OrchestrationCenterConfiguration("ZooKeeper", resumeConfiguration.getServerLists(), new Properties());
}
@Override