You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/07/27 06:06:20 UTC
[shardingsphere] branch master updated: Rename
OrchestrationRepositoryConfiguration to OrchestrationCenterConfiguration
(#6457)
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 805e3e8 Rename OrchestrationRepositoryConfiguration to OrchestrationCenterConfiguration (#6457)
805e3e8 is described below
commit 805e3e86b9172796b5d1bc57a68158625bed7f39
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Jul 27 14:06:03 2020 +0800
Rename OrchestrationRepositoryConfiguration to OrchestrationCenterConfiguration (#6457)
* Rename OrchestrationRepositoryConfiguration to OrchestrationCenterConfiguration
* Rename getRegistryRepositoryConfiguration to getRegistryCenterConfiguration
---
.../usage/governance/yaml.cn.md | 2 +-
.../usage/governance/yaml.en.md | 2 +-
.../sharding-proxy/sharding/conf/server.yaml | 2 +-
.../OrchestrationRepositoryConfigurationUtil.java | 24 +++++++--------
.../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 | 20 ++++++-------
...application-cloud-nacos-master-slave.properties | 20 ++++++-------
.../application-cloud-nacos-shadow.properties | 20 ++++++-------
...loud-nacos-sharding-databases-tables.properties | 20 ++++++-------
.../application-cloud-zookeeper-encrypt.properties | 8 ++---
...ication-cloud-zookeeper-master-slave.properties | 8 ++---
.../application-cloud-zookeeper-shadow.properties | 8 ++---
...-zookeeper-sharding-databases-tables.properties | 8 ++---
.../application-local-nacos-encrypt.properties | 16 +++++-----
...application-local-nacos-master-slave.properties | 18 +++++------
.../application-local-nacos-shadow.properties | 18 +++++------
...ocal-nacos-sharding-databases-tables.properties | 16 +++++-----
.../application-local-zookeeper-encrypt.properties | 8 ++---
...ication-local-zookeeper-master-slave.properties | 8 ++---
.../application-local-zookeeper-shadow.properties | 8 ++---
...-zookeeper-sharding-databases-tables.properties | 8 ++---
.../src/main/resources/conf/server.yaml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../core/facade/OrchestrationFacade.java | 35 +++++++++++-----------
.../core/facade/OrchestrationFacadeTest.java | 8 ++---
.../fixture/TestConfigurationRepository.java | 4 +--
.../facade/fixture/TestRegistryRepository.java | 4 +--
.../repository/api/OrchestrationRepository.java | 8 ++---
....java => OrchestrationCenterConfiguration.java} | 6 ++--
.../api/config/OrchestrationConfiguration.java | 16 +++++-----
.../api/fixture/TestConfigurationRepository.java | 4 +--
.../config/YamlOrchestrationConfiguration.java | 4 +--
.../OrchestrationConfigurationYamlSwapper.java | 14 ++++-----
...strationRepositoryConfigurationYamlSwapper.java | 18 +++++------
.../OrchestrationConfigurationYamlSwapperTest.java | 32 ++++++++++----------
...tionRepositoryConfigurationYamlSwapperTest.java | 28 ++++++++---------
.../repository/apollo/ApolloRepository.java | 4 +--
.../apollo/wrapper/ApolloConfigWrapper.java | 4 +--
.../apollo/wrapper/ApolloOpenApiWrapper.java | 4 +--
.../repository/apollo/ApolloRepositoryTest.java | 8 ++---
.../apollo/wrapper/ApolloConfigWrapperTest.java | 4 +--
.../apollo/wrapper/ApolloOpenApiWrapperTest.java | 4 +--
.../repository/etcd/EtcdRepository.java | 4 +--
.../repository/nacos/NacosRepository.java | 4 +--
.../repository/nacos/NacosRepositoryTest.java | 6 ++--
.../zookeeper/CuratorZookeeperRepository.java | 6 ++--
.../zookeeper/CuratorZookeeperRepositoryTest.java | 25 ++++++++--------
.../src/main/resources/conf/server.yaml | 2 +-
.../test/resources/docker/proxy/conf/server.yaml | 2 +-
...strationRepositoryConfigurationSwapperUtil.java | 6 ++--
.../fixture/TestConfigurationRepository.java | 4 +--
.../fixture/TestRegistryRepository.java | 4 +--
.../OrchestrationShardingSphereDataSourceTest.java | 12 ++++----
.../YamlInstanceConfigurationSwapperUtilTest.java | 14 ++++-----
.../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 | 6 ++--
.../registry/TestOrchestrationRepository.java | 4 +--
.../test/resources/application-encrypt.properties | 8 ++---
.../resources/application-masterslave.properties | 8 ++---
.../test/resources/application-registry.properties | 8 ++---
.../test/resources/application-sharding.properties | 8 ++---
.../parser/InstanceBeanDefinitionParser.java | 4 +--
.../registry/TestOrchestrationRepository.java | 4 +--
.../src/main/resources/conf/server.yaml | 2 +-
.../config/ShardingConfigurationLoaderTest.java | 2 +-
.../src/test/resources/conf/server.yaml | 2 +-
93 files changed, 347 insertions(+), 353 deletions(-)
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.cn.md
index 74c3a46..fc067a6 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.cn.md
@@ -34,7 +34,7 @@ weight = 2
```yaml
orchestration:
name: orchestration_ds
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.en.md
index a4e258a..a1bc0f7 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/yaml.en.md
@@ -34,7 +34,7 @@ Using ZooKeeper as config center and registry center for example.
```yaml
orchestration:
name: orchestration_ds
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration
diff --git a/examples/docker/sharding-proxy/sharding/conf/server.yaml b/examples/docker/sharding-proxy/sharding/conf/server.yaml
index f62b195..ee7261e 100644
--- a/examples/docker/sharding-proxy/sharding/conf/server.yaml
+++ b/examples/docker/sharding-proxy/sharding/conf/server.yaml
@@ -23,7 +23,7 @@
#orchestration:
# name: orchestration_ds
-# registryRepositoryConfiguration:
+# registryCenter:
# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
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 701fdbf..4891444 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
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.example.orchestration.raw.jdbc.config;
import org.apache.shardingsphere.example.type.ShardingType;
import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import java.util.Properties;
@@ -36,16 +36,16 @@ public final class OrchestrationRepositoryConfigurationUtil {
public static OrchestrationConfiguration getZooKeeperConfiguration(final String overwrite, final ShardingType shardingType) {
Properties props = new Properties();
props.setProperty("overwrite", overwrite);
- OrchestrationRepositoryConfiguration orchestrationRepositoryConfiguration = new OrchestrationRepositoryConfiguration("zookeeper", ZOOKEEPER_CONNECTION_STRING, NAMESPACE, props);
+ OrchestrationCenterConfiguration orchestrationCenterConfig = new OrchestrationCenterConfiguration("zookeeper", ZOOKEEPER_CONNECTION_STRING, NAMESPACE, props);
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
- return new OrchestrationConfiguration("orchestration-sharding-data-source", orchestrationRepositoryConfiguration);
+ return new OrchestrationConfiguration("orchestration-sharding-data-source", orchestrationCenterConfig);
case MASTER_SLAVE:
- return new OrchestrationConfiguration("orchestration-ms-data-source", orchestrationRepositoryConfiguration);
+ return new OrchestrationConfiguration("orchestration-ms-data-source", orchestrationCenterConfig);
case ENCRYPT:
- return new OrchestrationConfiguration("orchestration-encrypt-data-source", orchestrationRepositoryConfiguration);
+ return new OrchestrationConfiguration("orchestration-encrypt-data-source", orchestrationCenterConfig);
case SHADOW:
- return new OrchestrationConfiguration("orchestration-shadow-data-source", orchestrationRepositoryConfiguration);
+ return new OrchestrationConfiguration("orchestration-shadow-data-source", orchestrationCenterConfig);
default:
throw new UnsupportedOperationException(shardingType.toString());
}
@@ -56,19 +56,19 @@ public final class OrchestrationRepositoryConfigurationUtil {
nacosProperties.setProperty("group", "SHARDING_SPHERE_DEFAULT_GROUP");
nacosProperties.setProperty("timeout", "3000");
nacosProperties.setProperty("overwrite", overwrite);
- OrchestrationRepositoryConfiguration nacosResult = new OrchestrationRepositoryConfiguration("nacos", NACOS_CONNECTION_STRING, NACOS_NAMESPACE, nacosProperties);
+ OrchestrationCenterConfiguration nacosConfig = new OrchestrationCenterConfiguration("nacos", NACOS_CONNECTION_STRING, NACOS_NAMESPACE, nacosProperties);
Properties zookeeperProperties = new Properties();
zookeeperProperties.setProperty("overwrite", overwrite);
- OrchestrationRepositoryConfiguration zookeeperResult = new OrchestrationRepositoryConfiguration("zookeeper", ZOOKEEPER_CONNECTION_STRING, NAMESPACE, zookeeperProperties);
+ OrchestrationCenterConfiguration zookeeperConfig = new OrchestrationCenterConfiguration("zookeeper", ZOOKEEPER_CONNECTION_STRING, NAMESPACE, zookeeperProperties);
switch (shardingType) {
case SHARDING_DATABASES_AND_TABLES:
- return new OrchestrationConfiguration("orchestration-zookeeper-sharding-data-source", zookeeperResult, nacosResult);
+ return new OrchestrationConfiguration("orchestration-zookeeper-sharding-data-source", zookeeperConfig, nacosConfig);
case MASTER_SLAVE:
- return new OrchestrationConfiguration("orchestration-zookeeper-ms-data-source", zookeeperResult, nacosResult);
+ return new OrchestrationConfiguration("orchestration-zookeeper-ms-data-source", zookeeperConfig, nacosConfig);
case ENCRYPT:
- return new OrchestrationConfiguration("orchestration-zookeeper-encrypt-data-source", zookeeperResult, nacosResult);
+ return new OrchestrationConfiguration("orchestration-zookeeper-encrypt-data-source", zookeeperConfig, nacosConfig);
case SHADOW:
- return new OrchestrationConfiguration("orchestration-zookeeper-shadow-data-source", zookeeperResult, nacosResult);
+ return new OrchestrationConfiguration("orchestration-zookeeper-shadow-data-source", zookeeperConfig, nacosConfig);
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 916c247..9085162 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
@@ -17,13 +17,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_encrypt
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
overwrite: false
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: nacos
serverLists: localhost:8848
namespace:
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 5b38e13..9b6500e 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
@@ -17,13 +17,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_ms
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: false
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: nacos
serverLists: localhost:8848
namespace:
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 823b1b2..ebad943 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
@@ -17,13 +17,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_shadow
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: false
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: nacos
serverLists: localhost:8848
namespace:
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 baeb678..c08c17c 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
@@ -17,13 +17,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_sharding
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: false
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: nacos
serverLists: localhost:8848
namespace:
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 b740a10..9224f22 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
@@ -42,13 +42,13 @@ props:
orchestration:
name: demo_zookeeper_yaml_ds_encrypt
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
overwrite: true
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: nacos
serverLists: localhost:8848
namespace:
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 91631ec..b4cef50 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
@@ -45,13 +45,13 @@ props:
orchestration:
name: demo_zookeeper_yaml_ds_ms
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: true
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: nacos
serverLists: localhost:8848
namespace:
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 da8f96d..2dc457a 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
@@ -17,13 +17,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_shadow
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: false
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: nacos
serverLists: localhost:8848
namespace:
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 c13dcb4..014cd7c 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
@@ -82,13 +82,13 @@ props:
orchestration:
name: demo_zookeeper_yaml_ds_sharding
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: true
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: nacos
serverLists: localhost:8848
namespace:
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 8d9a9c7..98de673 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
@@ -17,7 +17,7 @@
orchestration:
name: demo_yaml_ds_encrypt
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
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 c2eff96..6cefdc2 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
@@ -17,7 +17,7 @@
orchestration:
name: demo_yaml_ds_ms
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
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 8835f6e..bd598b1 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
@@ -17,7 +17,7 @@
orchestration:
name: demo_yaml_ds_shadow
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
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 bc80152..5e25e78 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
@@ -17,7 +17,7 @@
orchestration:
name: demo_yaml_ds_sharding
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
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 5f80323..68aac93 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
@@ -17,7 +17,7 @@
orchestration:
name: demo_yaml_ds_encrypt
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
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 c29d78d..249c9e8 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
@@ -17,7 +17,7 @@
orchestration:
name: demo_yaml_ds_ms
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
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 19f2298..97dc0a8 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
@@ -17,7 +17,7 @@
orchestration:
name: demo_yaml_ds_shadow
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
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 658c5e1..9caef1b 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
@@ -17,7 +17,7 @@
orchestration:
name: demo_yaml_ds_sharding
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
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 d66c601..91be345 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,14 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.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.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.registry-center.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-center.props.operationTimeoutMilliseconds=3000
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.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
+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.registry-center.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 7285622..48a8ff5 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,14 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.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.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.registry-center.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-center.props.operationTimeoutMilliseconds=3000
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-repository-configuration.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
+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.registry-center.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 6065b88..f1c3a2b 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,14 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.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.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.registry-center.props.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.registry-repository-configuration.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
+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.registry-center.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 21b99bd..8bbafc0 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,14 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.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.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.registry-center.props.overwrite=false
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.props.operationTimeoutMilliseconds=3000
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.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
+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.registry-center.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 2d5eff4..3d8a9ee 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,7 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.registry-repository-configuration.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
+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.registry-center.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 059afff..d7b1cb9 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,7 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.registry-repository-configuration.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
+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.registry-center.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 bd564bb..10d5a42 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,7 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.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
+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.registry-center.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 29aa584..fc70e7f 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,7 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-repository-configuration.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
+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.registry-center.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 631d086..b5f41f3 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,12 @@ 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-repository-configuration.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.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.registry-center.props.overwrite=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.registry-repository-configuration.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
+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.registry-center.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 247acac..7e51b7d 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,12 @@ 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-repository-configuration.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.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
+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.registry-center.props.overwrite=true
+
+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.registry-center.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 24b5527..f20cb87 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,12 @@ spring.shardingsphere.rules.shadow.shadow-mappings.ds=shadow_ds
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.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.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
+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.registry-center.props.overwrite=true
+
+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.registry-center.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 cd42296..5f1ed67 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,12 @@ 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-repository-configuration.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.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.registry-center.props.overwrite=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.registry-repository-configuration.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
+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.registry-center.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 883cba4..9502ae6 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,7 @@ 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-repository-configuration.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
+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.registry-center.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 de4895c..c1262f1 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,7 @@ 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-repository-configuration.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
+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.registry-center.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 dd1c611..fd6540e 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,7 @@ spring.shardingsphere.rules.shadow.shadow-mappings.ds=shadow_ds
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.registry-repository-configuration.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
+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.registry-center.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 5946d5c..171dc85 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,10 +57,10 @@ 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-repository-configuration.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.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.registry-center.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 b95ede7..678daad 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
@@ -23,7 +23,7 @@
#
#orchestration:
# name: orchestration_ds
-# registryRepositoryConfiguration:
+# registryCenter:
# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
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 cfcb5dd..97c3083 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
@@ -23,7 +23,7 @@
#
#orchestration:
# name: orchestration_ds
-# registryRepositoryConfiguration:
+# registryCenter:
# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
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 91ae9a5..88c9a1b 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
@@ -36,7 +36,7 @@ import org.apache.shardingsphere.orchestration.core.registry.RegistryCenter;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import java.util.Collection;
import java.util.Map;
@@ -55,10 +55,10 @@ public final class OrchestrationFacade implements AutoCloseable {
ShardingSphereServiceLoader.register(RegistryRepository.class);
}
- private ConfigurationRepository configurationRepository;
-
private RegistryRepository registryRepository;
+ private ConfigurationRepository configurationRepository;
+
private boolean isOverwrite;
@Getter
@@ -82,30 +82,29 @@ public final class OrchestrationFacade implements AutoCloseable {
*/
public void init(final OrchestrationConfiguration orchestrationConfig, final Collection<String> shardingSchemaNames) {
name = orchestrationConfig.getName();
- initConfigCenter(orchestrationConfig);
initRegistryCenter(orchestrationConfig);
+ initConfigCenter(orchestrationConfig);
initMetaDataCenter();
initListenerManager(shardingSchemaNames);
}
- private void initConfigCenter(final OrchestrationConfiguration orchestrationConfig) {
- 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(name, configurationRepository);
- }
-
private void initRegistryCenter(final OrchestrationConfiguration orchestrationConfig) {
- 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);
+ OrchestrationCenterConfiguration registryCenterConfig = orchestrationConfig.getRegistryCenterConfiguration();
+ Preconditions.checkNotNull(registryCenterConfig, "Registry center configuration cannot be null.");
+ registryRepository = TypedSPIRegistry.getRegisteredService(RegistryRepository.class, registryCenterConfig.getType(), registryCenterConfig.getProps());
+ registryRepository.init(registryCenterConfig);
registryCenter = new RegistryCenter(name, registryRepository);
}
+ private void initConfigCenter(final OrchestrationConfiguration orchestrationConfig) {
+ OrchestrationCenterConfiguration additionalConfigCenterConfig = orchestrationConfig.getAdditionalConfigCenterConfiguration().orElse(orchestrationConfig.getRegistryCenterConfiguration());
+ Preconditions.checkNotNull(additionalConfigCenterConfig, "Config center configuration cannot be null.");
+ configurationRepository = TypedSPIRegistry.getRegisteredService(ConfigurationRepository.class, additionalConfigCenterConfig.getType(), additionalConfigCenterConfig.getProps());
+ configurationRepository.init(additionalConfigCenterConfig);
+ isOverwrite = new OrchestrationProperties(additionalConfigCenterConfig.getProps()).getValue(OrchestrationPropertyKey.OVERWRITE);
+ configCenter = new ConfigCenter(name, configurationRepository);
+ }
+
private void initMetaDataCenter() {
metaDataCenter = new MetaDataCenter(name, configurationRepository);
}
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 426c033..73435d4 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
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.orchestration.core.metadata.MetaDataCenter;
import org.apache.shardingsphere.orchestration.core.registry.RegistryCenter;
import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -68,9 +68,9 @@ public final class OrchestrationFacadeTest {
@Before
public void setUp() {
- OrchestrationRepositoryConfiguration configuration1 = new OrchestrationRepositoryConfiguration("REG_TEST", "127.0.0.1", "namespace_1", new Properties());
- OrchestrationRepositoryConfiguration configuration2 = new OrchestrationRepositoryConfiguration("CONFIG_TEST", "127.0.0.1", "namespace_2", new Properties());
- OrchestrationConfiguration orchestrationConfiguration = new OrchestrationConfiguration("test_name", configuration1, configuration2);
+ OrchestrationCenterConfiguration regCenterConfig = new OrchestrationCenterConfiguration("REG_TEST", "127.0.0.1", "namespace_1", new Properties());
+ OrchestrationCenterConfiguration additionalConfigCenterConfig = new OrchestrationCenterConfiguration("CONFIG_TEST", "127.0.0.1", "namespace_2", new Properties());
+ OrchestrationConfiguration orchestrationConfiguration = new OrchestrationConfiguration("test_name", regCenterConfig, additionalConfigCenterConfig);
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/fixture/TestConfigurationRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestConfigurationRepository.java
index 0324574..0d8407c 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestConfigurationRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestConfigurationRepository.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import java.util.Collections;
import java.util.List;
@@ -34,7 +34,7 @@ public final class TestConfigurationRepository implements ConfigurationRepositor
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
}
@Override
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestRegistryRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestRegistryRepository.java
index cf88792..c925616 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestRegistryRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-facade/src/test/java/org/apache/shardingsphere/orchestration/core/facade/fixture/TestRegistryRepository.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import java.util.Collections;
import java.util.List;
@@ -34,7 +34,7 @@ public final class TestRegistryRepository implements RegistryRepository {
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
}
@Override
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/OrchestrationRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/OrchestrationRepository.java
index b95cd40..df64481 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/OrchestrationRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/OrchestrationRepository.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.orchestration.repository.api;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
import org.apache.shardingsphere.infra.spi.type.TypedSPI;
@@ -29,11 +29,11 @@ import java.util.List;
public interface OrchestrationRepository extends TypedSPI {
/**
- * Initialize config center.
+ * Initialize orchestration center.
*
- * @param config config center configuration
+ * @param config orchestration center configuration
*/
- void init(OrchestrationRepositoryConfiguration config);
+ void init(OrchestrationCenterConfiguration config);
/**
* Get data from config center.
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/OrchestrationRepositoryConfiguration.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/ [...]
similarity index 81%
rename from shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/OrchestrationRepositoryConfiguration.java
rename to shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/OrchestrationCenterConfiguration.java
index af3e2a9..29e4922 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/OrchestrationRepositoryConfiguration.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/main/java/org/apache/shardingsphere/orchestration/repository/api/config/OrchestrationCenterConfiguration.java
@@ -23,16 +23,16 @@ import org.apache.shardingsphere.infra.config.TypedSPIConfiguration;
import java.util.Properties;
/**
- * Orchestration repository configuration.
+ * Orchestration center configuration.
*/
@Getter
-public final class OrchestrationRepositoryConfiguration extends TypedSPIConfiguration {
+public final class OrchestrationCenterConfiguration extends TypedSPIConfiguration {
private final String serverLists;
private final String namespace;
- public OrchestrationRepositoryConfiguration(final String type, final String serverLists, final String namespace, final Properties props) {
+ public OrchestrationCenterConfiguration(final String type, final String serverLists, final String namespace, final Properties props) {
super(type, props);
this.serverLists = serverLists;
this.namespace = namespace;
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 da5902b..d4b08a9 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
@@ -31,20 +31,20 @@ public final class OrchestrationConfiguration {
private final String name;
- private final OrchestrationRepositoryConfiguration registryRepositoryConfiguration;
+ private final OrchestrationCenterConfiguration registryCenterConfiguration;
- private final OrchestrationRepositoryConfiguration additionalConfigurationRepositoryConfiguration;
+ private final OrchestrationCenterConfiguration additionalConfigCenterConfiguration;
- public OrchestrationConfiguration(final String name, final OrchestrationRepositoryConfiguration registryRepositoryConfiguration) {
- this(name, registryRepositoryConfiguration, null);
+ public OrchestrationConfiguration(final String name, final OrchestrationCenterConfiguration orchestrationCenterConfig) {
+ this(name, orchestrationCenterConfig, null);
}
/**
- * Get additional configuration repository configuration.
+ * Get additional config center configuration.
*
- * @return additional configuration repository configuration
+ * @return additional config center configuration
*/
- public Optional<OrchestrationRepositoryConfiguration> getAdditionalConfigurationRepositoryConfiguration() {
- return Optional.ofNullable(additionalConfigurationRepositoryConfiguration);
+ public Optional<OrchestrationCenterConfiguration> getAdditionalConfigCenterConfiguration() {
+ return Optional.ofNullable(additionalConfigCenterConfiguration);
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/TestConfigurationRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/TestCon [...]
index e0890e2..50894cb 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/TestConfigurationRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-api/src/test/java/org/apache/shardingsphere/orchestration/repository/api/fixture/TestConfigurationRepository.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.orchestration.repository.api.fixture;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
@@ -35,7 +35,7 @@ public final class TestConfigurationRepository implements ConfigurationRepositor
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
}
@Override
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 25ff225..52827a6 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
@@ -30,7 +30,7 @@ public final class YamlOrchestrationConfiguration implements YamlConfiguration {
private String name;
- private YamlOrchestrationRepositoryConfiguration registryRepositoryConfiguration;
+ private YamlOrchestrationRepositoryConfiguration registryCenter;
- private YamlOrchestrationRepositoryConfiguration additionalConfigurationRepositoryConfiguration;
+ private YamlOrchestrationRepositoryConfiguration additionalConfigCenter;
}
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 d9bb9aa..6a27020 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
@@ -32,19 +32,19 @@ public final class OrchestrationConfigurationYamlSwapper implements YamlSwapper<
public YamlOrchestrationConfiguration swapToYamlConfiguration(final OrchestrationConfiguration configuration) {
YamlOrchestrationConfiguration result = new YamlOrchestrationConfiguration();
result.setName(configuration.getName());
- result.setRegistryRepositoryConfiguration(swapper.swapToYamlConfiguration(configuration.getRegistryRepositoryConfiguration()));
- if (configuration.getAdditionalConfigurationRepositoryConfiguration().isPresent()) {
- result.setAdditionalConfigurationRepositoryConfiguration(swapper.swapToYamlConfiguration(configuration.getAdditionalConfigurationRepositoryConfiguration().get()));
+ result.setRegistryCenter(swapper.swapToYamlConfiguration(configuration.getRegistryCenterConfiguration()));
+ if (configuration.getAdditionalConfigCenterConfiguration().isPresent()) {
+ result.setAdditionalConfigCenter(swapper.swapToYamlConfiguration(configuration.getAdditionalConfigCenterConfiguration().get()));
}
return result;
}
@Override
public OrchestrationConfiguration swapToObject(final YamlOrchestrationConfiguration configuration) {
- if (null != configuration.getAdditionalConfigurationRepositoryConfiguration()) {
- return new OrchestrationConfiguration(configuration.getName(), swapper.swapToObject(configuration.getRegistryRepositoryConfiguration()),
- swapper.swapToObject(configuration.getAdditionalConfigurationRepositoryConfiguration()));
+ if (null != configuration.getAdditionalConfigCenter()) {
+ return new OrchestrationConfiguration(configuration.getName(), swapper.swapToObject(configuration.getRegistryCenter()),
+ swapper.swapToObject(configuration.getAdditionalConfigCenter()));
}
- return new OrchestrationConfiguration(configuration.getName(), swapper.swapToObject(configuration.getRegistryRepositoryConfiguration()));
+ return new OrchestrationConfiguration(configuration.getName(), swapper.swapToObject(configuration.getRegistryCenter()));
}
}
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/OrchestrationRepositoryConfigurationYamlSwapper.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/o [...]
index 3e7094b..c368f5f 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/OrchestrationRepositoryConfigurationYamlSwapper.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/OrchestrationRepositoryConfigurationYamlSwapper.java
@@ -18,26 +18,26 @@
package org.apache.shardingsphere.orchestration.repository.common.configuration.swapper;
import org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationRepositoryConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.infra.yaml.swapper.YamlSwapper;
/**
* Orchestration repository configuration YAML swapper.
*/
-public final class OrchestrationRepositoryConfigurationYamlSwapper implements YamlSwapper<YamlOrchestrationRepositoryConfiguration, OrchestrationRepositoryConfiguration> {
+public final class OrchestrationRepositoryConfigurationYamlSwapper implements YamlSwapper<YamlOrchestrationRepositoryConfiguration, OrchestrationCenterConfiguration> {
@Override
- public YamlOrchestrationRepositoryConfiguration swapToYamlConfiguration(final OrchestrationRepositoryConfiguration configuration) {
+ public YamlOrchestrationRepositoryConfiguration swapToYamlConfiguration(final OrchestrationCenterConfiguration config) {
YamlOrchestrationRepositoryConfiguration result = new YamlOrchestrationRepositoryConfiguration();
- result.setType(configuration.getType());
- result.setServerLists(configuration.getServerLists());
- result.setNamespace(configuration.getNamespace());
- result.setProps(configuration.getProps());
+ result.setType(config.getType());
+ result.setServerLists(config.getServerLists());
+ result.setNamespace(config.getNamespace());
+ result.setProps(config.getProps());
return result;
}
@Override
- public OrchestrationRepositoryConfiguration swapToObject(final YamlOrchestrationRepositoryConfiguration yamlConfiguration) {
- return new OrchestrationRepositoryConfiguration(yamlConfiguration.getType(), yamlConfiguration.getServerLists(), yamlConfiguration.getNamespace(), yamlConfiguration.getProps());
+ public OrchestrationCenterConfiguration swapToObject(final YamlOrchestrationRepositoryConfiguration yamlConfig) {
+ return new OrchestrationCenterConfiguration(yamlConfig.getType(), yamlConfig.getServerLists(), yamlConfig.getNamespace(), yamlConfig.getProps());
}
}
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 960e3ac..8ed66da 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
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.orchestration.repository.common.configuration.swapper;
import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationConfiguration;
import org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationRepositoryConfiguration;
import org.junit.Test;
@@ -36,35 +36,35 @@ public final class OrchestrationConfigurationYamlSwapperTest {
public void assertSwapToYamlOrchestrationConfiguration() {
OrchestrationConfiguration data = getOrchestrationConfiguration();
YamlOrchestrationConfiguration result = new OrchestrationConfigurationYamlSwapper().swapToYamlConfiguration(data);
- assertThat(result.getRegistryRepositoryConfiguration().getType(), is(data.getRegistryRepositoryConfiguration().getType()));
- assertThat(result.getRegistryRepositoryConfiguration().getNamespace(), is(data.getRegistryRepositoryConfiguration().getNamespace()));
- assertThat(result.getRegistryRepositoryConfiguration().getServerLists(), is(data.getRegistryRepositoryConfiguration().getServerLists()));
- assertThat(result.getRegistryRepositoryConfiguration().getProps(), is(data.getRegistryRepositoryConfiguration().getProps()));
+ assertThat(result.getRegistryCenter().getType(), is(data.getRegistryCenterConfiguration().getType()));
+ assertThat(result.getRegistryCenter().getNamespace(), is(data.getRegistryCenterConfiguration().getNamespace()));
+ assertThat(result.getRegistryCenter().getServerLists(), is(data.getRegistryCenterConfiguration().getServerLists()));
+ assertThat(result.getRegistryCenter().getProps(), is(data.getRegistryCenterConfiguration().getProps()));
}
private OrchestrationConfiguration getOrchestrationConfiguration() {
- return new OrchestrationConfiguration(LOGIC_SCHEMA, new OrchestrationRepositoryConfiguration("zookeeper", "127.0.0.1:2181,127.0.0.1:2182", "orchestration", new Properties()));
+ return new OrchestrationConfiguration(LOGIC_SCHEMA, new OrchestrationCenterConfiguration("zookeeper", "127.0.0.1:2181,127.0.0.1:2182", "orchestration", new Properties()));
}
@Test
public void assertSwapToOrchestrationConfiguration() {
YamlOrchestrationConfiguration data = getYamlOrchestrationConfiguration();
OrchestrationConfiguration result = new OrchestrationConfigurationYamlSwapper().swapToObject(data);
- assertThat(result.getRegistryRepositoryConfiguration().getType(), is(data.getRegistryRepositoryConfiguration().getType()));
- assertThat(result.getRegistryRepositoryConfiguration().getNamespace(), is(data.getRegistryRepositoryConfiguration().getNamespace()));
- assertThat(result.getRegistryRepositoryConfiguration().getServerLists(), is(data.getRegistryRepositoryConfiguration().getServerLists()));
- assertThat(result.getRegistryRepositoryConfiguration().getProps(), is(data.getRegistryRepositoryConfiguration().getProps()));
+ assertThat(result.getRegistryCenterConfiguration().getType(), is(data.getRegistryCenter().getType()));
+ assertThat(result.getRegistryCenterConfiguration().getNamespace(), is(data.getRegistryCenter().getNamespace()));
+ assertThat(result.getRegistryCenterConfiguration().getServerLists(), is(data.getRegistryCenter().getServerLists()));
+ assertThat(result.getRegistryCenterConfiguration().getProps(), is(data.getRegistryCenter().getProps()));
}
private YamlOrchestrationConfiguration getYamlOrchestrationConfiguration() {
- YamlOrchestrationRepositoryConfiguration registryRepositoryConfiguration = new YamlOrchestrationRepositoryConfiguration();
- registryRepositoryConfiguration.setType("zookeeper");
- registryRepositoryConfiguration.setProps(new Properties());
- registryRepositoryConfiguration.setServerLists("127.0.0.1:2181,127.0.0.1:2182");
- registryRepositoryConfiguration.setNamespace("orchestration");
+ YamlOrchestrationRepositoryConfiguration registryCenterConfig = new YamlOrchestrationRepositoryConfiguration();
+ registryCenterConfig.setType("zookeeper");
+ registryCenterConfig.setProps(new Properties());
+ registryCenterConfig.setServerLists("127.0.0.1:2181,127.0.0.1:2182");
+ registryCenterConfig.setNamespace("orchestration");
YamlOrchestrationConfiguration result = new YamlOrchestrationConfiguration();
result.setName(LOGIC_SCHEMA);
- result.setRegistryRepositoryConfiguration(registryRepositoryConfiguration);
+ result.setRegistryCenter(registryCenterConfig);
return result;
}
}
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 4e49a42..a4a0100 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
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.orchestration.repository.common.configuration.swapper;
import org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationRepositoryConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.junit.Test;
import java.util.Properties;
@@ -30,26 +30,22 @@ public final class OrchestrationRepositoryConfigurationYamlSwapperTest {
@Test
public void assertToYamlConfiguration() {
- OrchestrationRepositoryConfiguration configuration = getConfiguration();
- YamlOrchestrationRepositoryConfiguration yamlConfiguration = new OrchestrationRepositoryConfigurationYamlSwapper().swapToYamlConfiguration(configuration);
- assertThat(yamlConfiguration.getType(), is(configuration.getType()));
- assertThat(yamlConfiguration.getServerLists(), is(configuration.getServerLists()));
- assertThat(yamlConfiguration.getNamespace(), is(configuration.getNamespace()));
- assertThat(yamlConfiguration.getProps(), is(configuration.getProps()));
- }
-
- private OrchestrationRepositoryConfiguration getConfiguration() {
- return new OrchestrationRepositoryConfiguration("zookeeper", "127.0.0.1:2181,127.0.0.1:2182", "orchestration", new Properties());
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration("zookeeper", "127.0.0.1:2181,127.0.0.1:2182", "orchestration", new Properties());
+ YamlOrchestrationRepositoryConfiguration yamlConfiguration = new OrchestrationRepositoryConfigurationYamlSwapper().swapToYamlConfiguration(config);
+ assertThat(yamlConfiguration.getType(), is(config.getType()));
+ assertThat(yamlConfiguration.getServerLists(), is(config.getServerLists()));
+ assertThat(yamlConfiguration.getNamespace(), is(config.getNamespace()));
+ assertThat(yamlConfiguration.getProps(), is(config.getProps()));
}
@Test
public void assertSwapToObject() {
YamlOrchestrationRepositoryConfiguration yamlConfiguration = getYamlInstanceConfiguration();
- OrchestrationRepositoryConfiguration instanceConfiguration = new OrchestrationRepositoryConfigurationYamlSwapper().swapToObject(yamlConfiguration);
- assertThat(instanceConfiguration.getType(), is(yamlConfiguration.getType()));
- assertThat(instanceConfiguration.getServerLists(), is(yamlConfiguration.getServerLists()));
- assertThat(instanceConfiguration.getNamespace(), is(yamlConfiguration.getNamespace()));
- assertThat(instanceConfiguration.getProps(), is(yamlConfiguration.getProps()));
+ OrchestrationCenterConfiguration orchestrationCenterConfig = new OrchestrationRepositoryConfigurationYamlSwapper().swapToObject(yamlConfiguration);
+ assertThat(orchestrationCenterConfig.getType(), is(yamlConfiguration.getType()));
+ assertThat(orchestrationCenterConfig.getServerLists(), is(yamlConfiguration.getServerLists()));
+ assertThat(orchestrationCenterConfig.getNamespace(), is(yamlConfiguration.getNamespace()));
+ assertThat(orchestrationCenterConfig.getProps(), is(yamlConfiguration.getProps()));
}
private YamlOrchestrationRepositoryConfiguration getYamlInstanceConfiguration() {
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 f17f268..7ed1586 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
@@ -30,7 +30,7 @@ import org.apache.shardingsphere.orchestration.repository.apollo.wrapper.ApolloO
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
import org.apache.shardingsphere.orchestration.repository.api.util.ConfigKeyUtils;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import java.util.Collections;
import java.util.HashMap;
@@ -55,7 +55,7 @@ public final class ApolloRepository implements ConfigurationRepository {
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
ApolloProperties apolloProperties = new ApolloProperties(props);
configWrapper = new ApolloConfigWrapper(config, apolloProperties);
openApiWrapper = new ApolloOpenApiWrapper(config, apolloProperties);
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/wrapper/ApolloConfigWrapper.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-rep [...]
index 8723093..155f191 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/wrapper/ApolloConfigWrapper.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/wrapper/ApolloConfigWrapper.java
@@ -23,7 +23,7 @@ import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.core.ConfigConsts;
import org.apache.shardingsphere.orchestration.repository.apollo.ApolloProperties;
import org.apache.shardingsphere.orchestration.repository.apollo.ApolloPropertyKey;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import java.util.Set;
@@ -38,7 +38,7 @@ public final class ApolloConfigWrapper {
private final Config apolloConfig;
- public ApolloConfigWrapper(final OrchestrationRepositoryConfiguration config, final ApolloProperties props) {
+ public ApolloConfigWrapper(final OrchestrationCenterConfiguration config, final ApolloProperties props) {
String appId = props.getValue(ApolloPropertyKey.APP_ID);
String env = props.getValue(ApolloPropertyKey.ENV);
String clusterName = props.getValue(ApolloPropertyKey.CLUSTER_NAME);
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/wrapper/ApolloOpenApiWrapper.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-re [...]
index 6685afd..d50ddeb 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/wrapper/ApolloOpenApiWrapper.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/wrapper/ApolloOpenApiWrapper.java
@@ -22,7 +22,7 @@ import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO;
import org.apache.shardingsphere.orchestration.repository.apollo.ApolloProperties;
import org.apache.shardingsphere.orchestration.repository.apollo.ApolloPropertyKey;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
/**
* Apollo open api client wrapper.
@@ -41,7 +41,7 @@ public final class ApolloOpenApiWrapper {
private final String administrator;
- public ApolloOpenApiWrapper(final OrchestrationRepositoryConfiguration config, final ApolloProperties props) {
+ public ApolloOpenApiWrapper(final OrchestrationCenterConfiguration config, final ApolloProperties props) {
namespace = config.getNamespace();
appId = props.getValue(ApolloPropertyKey.APP_ID);
env = props.getValue(ApolloPropertyKey.ENV);
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 cdbf47f..fd5d11c0 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
@@ -25,7 +25,7 @@ import org.apache.shardingsphere.orchestration.repository.apollo.wrapper.ApolloC
import org.apache.shardingsphere.orchestration.repository.apollo.wrapper.ApolloOpenApiWrapper;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.orchestration.repository.api.util.ConfigKeyUtils;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
@@ -68,10 +68,10 @@ public final class ApolloRepositoryTest {
Properties props = new Properties();
props.setProperty(ApolloPropertyKey.PORTAL_URL.getKey(), PORTAL_URL);
props.setProperty(ApolloPropertyKey.TOKEN.getKey(), TOKEN);
- OrchestrationRepositoryConfiguration configuration = new OrchestrationRepositoryConfiguration("apollo", "http://config-service-url", "orchestration", props);
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration("apollo", "http://config-service-url", "orchestration", props);
REPOSITORY.setProps(props);
- REPOSITORY.init(configuration);
- ApolloConfigWrapper configWrapper = new ApolloConfigWrapper(configuration, new ApolloProperties(props));
+ REPOSITORY.init(config);
+ ApolloConfigWrapper configWrapper = new ApolloConfigWrapper(config, new ApolloProperties(props));
FieldSetter.setField(REPOSITORY, ApolloRepository.class.getDeclaredField("configWrapper"), configWrapper);
FieldSetter.setField(REPOSITORY, ApolloRepository.class.getDeclaredField("openApiWrapper"), OPEN_API_WRAPPER);
}
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 b1d1e74..7735d04 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
@@ -23,7 +23,7 @@ import com.ctrip.framework.apollo.mockserver.EmbeddedApollo;
import com.ctrip.framework.apollo.model.ConfigChangeEvent;
import com.google.common.util.concurrent.SettableFuture;
import org.apache.shardingsphere.orchestration.repository.apollo.ApolloProperties;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Test;
@@ -52,7 +52,7 @@ public final class ApolloConfigWrapperTest {
@Before
public void setup() {
configWrapper = new ApolloConfigWrapper(
- new OrchestrationRepositoryConfiguration("apollo", "http://config-service-url", "orchestration", new Properties()), new ApolloProperties(new Properties()));
+ new OrchestrationCenterConfiguration("apollo", "http://config-service-url", "orchestration", 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-apollo/src/test/java/org/apache/shardingsphere/orchestration/repository/apollo/wrapper/ApolloOpenApiWrapperTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestratio [...]
index b77f821..2d4e51e 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/ApolloOpenApiWrapperTest.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/ApolloOpenApiWrapperTest.java
@@ -21,7 +21,7 @@ import com.ctrip.framework.apollo.openapi.client.ApolloOpenApiClient;
import com.ctrip.framework.apollo.openapi.dto.NamespaceReleaseDTO;
import com.ctrip.framework.apollo.openapi.dto.OpenItemDTO;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.apollo.ApolloProperties;
import org.apache.shardingsphere.orchestration.repository.apollo.ApolloPropertyKey;
import org.apache.shardingsphere.orchestration.repository.api.util.ConfigKeyUtils;
@@ -64,7 +64,7 @@ public final class ApolloOpenApiWrapperTest {
Properties props = new Properties();
props.setProperty(ApolloPropertyKey.PORTAL_URL.getKey(), PORTAL_URL);
props.setProperty(ApolloPropertyKey.TOKEN.getKey(), TOKEN);
- apolloOpenApiWrapper = new ApolloOpenApiWrapper(new OrchestrationRepositoryConfiguration("apollo", "127.0.0.1", null, new Properties()), new ApolloProperties(props));
+ apolloOpenApiWrapper = new ApolloOpenApiWrapper(new OrchestrationCenterConfiguration("apollo", "127.0.0.1", null, new Properties()), new ApolloProperties(props));
FieldSetter.setField(apolloOpenApiWrapper, ApolloOpenApiWrapper.class.getDeclaredField("client"), client);
FieldSetter.setField(apolloOpenApiWrapper, ApolloOpenApiWrapper.class.getDeclaredField("namespace"), NAME_SPACE);
FieldSetter.setField(apolloOpenApiWrapper, ApolloOpenApiWrapper.class.getDeclaredField("appId"), ApolloPropertyKey.APP_ID.getDefaultValue());
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-etcd/src/main/java/org/apache/shardingsphere/orchestration/repository/etcd/EtcdRepository.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-etcd/src/ [...]
index ffee97c..4ea2e21 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-etcd/src/main/java/org/apache/shardingsphere/orchestration/repository/etcd/EtcdRepository.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-etcd/src/main/java/org/apache/shardingsphere/orchestration/repository/etcd/EtcdRepository.java
@@ -33,7 +33,7 @@ import lombok.Setter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
@@ -56,7 +56,7 @@ public final class EtcdRepository implements ConfigurationRepository, RegistryRe
private EtcdProperties etcdProperties;
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
this.etcdProperties = new EtcdProperties(props);
client = Client.builder().endpoints(Util.toURIs(Splitter.on(",").trimResults().splitToList(config.getServerLists()))).build();
}
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 6c1bb33..bc6d6cf 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
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepos
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
import org.apache.shardingsphere.orchestration.repository.api.util.ConfigKeyUtils;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import java.util.List;
import java.util.Properties;
@@ -55,7 +55,7 @@ public final class NacosRepository implements ConfigurationRepository {
* @param config config center configuration
*/
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
try {
nacosProperties = new NacosProperties(props);
Properties props = new Properties();
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/test/java/org/apache/shardingsphere/orchestration/repository/nacos/NacosRepositoryTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-na [...]
index 41635b8..b216d46 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/test/java/org/apache/shardingsphere/orchestration/repository/nacos/NacosRepositoryTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-nacos/src/test/java/org/apache/shardingsphere/orchestration/repository/nacos/NacosRepositoryTest.java
@@ -24,7 +24,7 @@ import lombok.SneakyThrows;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEvent.ChangedType;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.junit.Before;
import org.junit.Test;
import org.mockito.AdditionalAnswers;
@@ -60,8 +60,8 @@ public final class NacosRepositoryTest {
Properties props = new Properties();
props.setProperty("group", group);
props.setProperty("timeout", "3000");
- OrchestrationRepositoryConfiguration configuration = new OrchestrationRepositoryConfiguration(REPOSITORY.getType(), "127.0.0.1:8848", "", props);
- REPOSITORY.init(configuration);
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration(REPOSITORY.getType(), "127.0.0.1:8848", "", props);
+ REPOSITORY.init(config);
setConfigService(configService);
}
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 d5b6c42..294c8e7 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
@@ -34,7 +34,7 @@ import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository
import org.apache.shardingsphere.orchestration.repository.zookeeper.handler.CuratorZookeeperExceptionHandler;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException.OperationTimeoutException;
import org.apache.zookeeper.ZooDefs;
@@ -62,13 +62,13 @@ public final class CuratorZookeeperRepository implements ConfigurationRepository
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
ZookeeperProperties zookeeperProperties = new ZookeeperProperties(props);
client = buildCuratorClient(config, zookeeperProperties);
initCuratorClient(zookeeperProperties);
}
- private CuratorFramework buildCuratorClient(final OrchestrationRepositoryConfiguration config, final ZookeeperProperties zookeeperProperties) {
+ private CuratorFramework buildCuratorClient(final OrchestrationCenterConfiguration config, final ZookeeperProperties zookeeperProperties) {
int retryIntervalMilliseconds = zookeeperProperties.getValue(ZookeeperPropertyKey.RETRY_INTERVAL_MILLISECONDS);
int maxRetries = zookeeperProperties.getValue(ZookeeperPropertyKey.MAX_RETRIES);
int timeToLiveSeconds = zookeeperProperties.getValue(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS);
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/test/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepositoryTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere- [...]
index f824c37..4b90dbb 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/test/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepositoryTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-provider/shardingsphere-orchestration-repository-zookeeper-curator/src/test/java/org/apache/shardingsphere/orchestration/repository/zookeeper/CuratorZookeeperRepositoryTest.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.orchestration.repository.zookeeper;
import org.apache.curator.framework.CuratorFramework;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.exception.OrchestrationException;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEvent;
import org.junit.Assert;
@@ -46,8 +46,7 @@ public final class CuratorZookeeperRepositoryTest {
public static void init() {
EmbedTestingServer.start();
serverLists = EmbedTestingServer.getTestingServerConnectionString();
- OrchestrationRepositoryConfiguration configuration = new OrchestrationRepositoryConfiguration(REPOSITORY.getType(), serverLists, null, new Properties());
- REPOSITORY.init(configuration);
+ REPOSITORY.init(new OrchestrationCenterConfiguration(REPOSITORY.getType(), serverLists, null, new Properties()));
}
@Test
@@ -135,9 +134,9 @@ public final class CuratorZookeeperRepositoryTest {
props.setProperty(ZookeeperPropertyKey.MAX_RETRIES.getKey(), "1");
props.setProperty(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS.getKey(), "1000");
props.setProperty(ZookeeperPropertyKey.OPERATION_TIMEOUT_MILLISECONDS.getKey(), "2000");
- OrchestrationRepositoryConfiguration configuration = new OrchestrationRepositoryConfiguration(repository.getType(), serverLists, null, new Properties());
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration(repository.getType(), serverLists, null, new Properties());
repository.setProps(props);
- repository.init(configuration);
+ repository.init(config);
assertThat(repository.getProps().getProperty(ZookeeperPropertyKey.RETRY_INTERVAL_MILLISECONDS.getKey()), is("1000"));
assertThat(repository.getProps().getProperty(ZookeeperPropertyKey.MAX_RETRIES.getKey()), is("1"));
assertThat(repository.getProps().getProperty(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS.getKey()), is("1000"));
@@ -151,9 +150,9 @@ public final class CuratorZookeeperRepositoryTest {
final CuratorZookeeperRepository repository = new CuratorZookeeperRepository();
Properties props = new Properties();
props.setProperty(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS.getKey(), "0");
- OrchestrationRepositoryConfiguration configuration = new OrchestrationRepositoryConfiguration(repository.getType(), serverLists, null, new Properties());
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration(repository.getType(), serverLists, null, new Properties());
repository.setProps(props);
- repository.init(configuration);
+ repository.init(config);
assertThat(repository.getProps().getProperty(ZookeeperPropertyKey.TIME_TO_LIVE_SECONDS.getKey()), is("0"));
repository.persist("/test/children/build/2", "value1");
assertThat(repository.get("/test/children/build/2"), is("value1"));
@@ -164,9 +163,9 @@ public final class CuratorZookeeperRepositoryTest {
final CuratorZookeeperRepository repository = new CuratorZookeeperRepository();
Properties props = new Properties();
props.setProperty(ZookeeperPropertyKey.OPERATION_TIMEOUT_MILLISECONDS.getKey(), "0");
- OrchestrationRepositoryConfiguration configuration = new OrchestrationRepositoryConfiguration(repository.getType(), serverLists, null, new Properties());
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration(repository.getType(), serverLists, null, new Properties());
repository.setProps(props);
- repository.init(configuration);
+ repository.init(config);
assertThat(repository.getProps().getProperty(ZookeeperPropertyKey.OPERATION_TIMEOUT_MILLISECONDS.getKey()), is("0"));
repository.persist("/test/children/build/3", "value1");
assertThat(repository.get("/test/children/build/3"), is("value1"));
@@ -177,9 +176,9 @@ public final class CuratorZookeeperRepositoryTest {
final CuratorZookeeperRepository repository = new CuratorZookeeperRepository();
Properties props = new Properties();
props.setProperty(ZookeeperPropertyKey.DIGEST.getKey(), "any");
- OrchestrationRepositoryConfiguration configuration = new OrchestrationRepositoryConfiguration(repository.getType(), serverLists, null, new Properties());
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration(repository.getType(), serverLists, null, new Properties());
repository.setProps(props);
- repository.init(configuration);
+ repository.init(config);
assertThat(repository.getProps().getProperty(ZookeeperPropertyKey.DIGEST.getKey()), is("any"));
repository.persist("/test/children/build/4", "value1");
assertThat(repository.get("/test/children/build/4"), is("value1"));
@@ -199,11 +198,11 @@ public final class CuratorZookeeperRepositoryTest {
@Test
public void assertZKCloseAndException() {
CuratorZookeeperRepository repository = new CuratorZookeeperRepository();
- OrchestrationRepositoryConfiguration configuration = new OrchestrationRepositoryConfiguration(repository.getType(), serverLists, null, new Properties());
+ OrchestrationCenterConfiguration config = new OrchestrationCenterConfiguration(repository.getType(), serverLists, null, new Properties());
Properties props = new Properties();
props.setProperty(ZookeeperPropertyKey.DIGEST.getKey(), "digest");
repository.setProps(props);
- repository.init(configuration);
+ repository.init(config);
repository.close();
try {
repository.get("/test/children/1");
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 9537550..40cf67c 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
@@ -23,7 +23,7 @@
#
#orchestration:
# name: orchestration_ds
-# registryRepositoryConfiguration:
+# registryCenter:
# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
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 065b223..08b8a8f 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
@@ -23,7 +23,7 @@
#
#orchestration:
# name: orchestration_ds
-# registryRepositoryConfiguration:
+# registryCenter:
# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
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 07628d5..1c2c5b6 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.getAdditionalConfigurationRepositoryConfiguration()) {
- return new OrchestrationConfiguration(orchestration.getName(), SWAPPER.swapToObject(orchestration.getRegistryRepositoryConfiguration()));
+ if (null == orchestration.getAdditionalConfigCenter()) {
+ return new OrchestrationConfiguration(orchestration.getName(), SWAPPER.swapToObject(orchestration.getRegistryCenter()));
}
return new OrchestrationConfiguration(orchestration.getName(),
- SWAPPER.swapToObject(orchestration.getRegistryRepositoryConfiguration()), SWAPPER.swapToObject(orchestration.getAdditionalConfigurationRepositoryConfiguration()));
+ SWAPPER.swapToObject(orchestration.getRegistryCenter()), SWAPPER.swapToObject(orchestration.getAdditionalConfigCenter()));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestConfigurationRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestConfigurationRepository.java
index 3d2e0b4..6baf337 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestConfigurationRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestConfigurationRepository.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.driver.orchestration.fixture;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
import java.util.Collections;
@@ -38,7 +38,7 @@ public final class TestConfigurationRepository implements ConfigurationRepositor
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
}
@Override
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestRegistryRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestRegistryRepository.java
index 3e74027..f09a268 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestRegistryRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/TestRegistryRepository.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
import java.util.Collections;
@@ -39,7 +39,7 @@ public final class TestRegistryRepository implements RegistryRepository, Configu
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
}
@Override
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 1a197a8..3b35a75 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
@@ -33,7 +33,7 @@ import org.apache.shardingsphere.orchestration.core.common.event.RuleConfigurati
import org.apache.shardingsphere.orchestration.core.registry.event.DisabledStateChangedEvent;
import org.apache.shardingsphere.orchestration.core.registry.schema.OrchestrationSchema;
import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.sharding.api.config.ShardingRuleConfiguration;
import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
@@ -71,19 +71,19 @@ public final class OrchestrationShardingSphereDataSourceTest {
}
private static OrchestrationConfiguration getOrchestrationConfiguration() {
- return new OrchestrationConfiguration("test_name", getRegistryOrchestrationRepositoryConfiguration(), getConfigOrchestrationRepositoryConfiguration());
+ return new OrchestrationConfiguration("test_name", getRegistryCenterConfiguration(), getConfigRepositoryConfiguration());
}
- private static OrchestrationRepositoryConfiguration getRegistryOrchestrationRepositoryConfiguration() {
+ private static OrchestrationCenterConfiguration getRegistryCenterConfiguration() {
Properties properties = new Properties();
properties.setProperty("overwrite", "true");
- return new OrchestrationRepositoryConfiguration("REG_TEST", "localhost:3181", "test_sharding_registry", properties);
+ return new OrchestrationCenterConfiguration("REG_TEST", "localhost:3181", "test_sharding_registry", properties);
}
- private static OrchestrationRepositoryConfiguration getConfigOrchestrationRepositoryConfiguration() {
+ private static OrchestrationCenterConfiguration getConfigRepositoryConfiguration() {
Properties properties = new Properties();
properties.setProperty("overwrite", "true");
- return new OrchestrationRepositoryConfiguration("CONFIG_TEST", "localhost:3181", "test_sharding_config", properties);
+ return new OrchestrationCenterConfiguration("CONFIG_TEST", "localhost:3181", "test_sharding_config", properties);
}
@Test
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 5a32a22..480edc5 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
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.driver.orchestration.internal.util;
import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationConfiguration;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationConfiguration;
import org.apache.shardingsphere.orchestration.repository.common.configuration.config.YamlOrchestrationRepositoryConfiguration;
import org.junit.Test;
@@ -34,13 +34,13 @@ public final class YamlInstanceConfigurationSwapperUtilTest {
YamlOrchestrationRepositoryConfiguration yamlOrchestrationRepositoryConfiguration = getYamlOrchestrationRepositoryConfiguration();
YamlOrchestrationConfiguration yamlConfiguration = new YamlOrchestrationConfiguration();
yamlConfiguration.setName("test");
- yamlConfiguration.setRegistryRepositoryConfiguration(yamlOrchestrationRepositoryConfiguration);
+ yamlConfiguration.setRegistryCenter(yamlOrchestrationRepositoryConfiguration);
OrchestrationConfiguration orchestrationConfiguration = YamlOrchestrationRepositoryConfigurationSwapperUtil.marshal(yamlConfiguration);
- OrchestrationRepositoryConfiguration configuration = orchestrationConfiguration.getRegistryRepositoryConfiguration();
- assertEquals(configuration.getType(), yamlOrchestrationRepositoryConfiguration.getType());
- assertEquals(configuration.getNamespace(), yamlOrchestrationRepositoryConfiguration.getNamespace());
- assertEquals(configuration.getServerLists(), yamlOrchestrationRepositoryConfiguration.getServerLists());
- assertEquals(configuration.getProps(), yamlOrchestrationRepositoryConfiguration.getProps());
+ OrchestrationCenterConfiguration config = orchestrationConfiguration.getRegistryCenterConfiguration();
+ assertEquals(config.getType(), yamlOrchestrationRepositoryConfiguration.getType());
+ assertEquals(config.getNamespace(), yamlOrchestrationRepositoryConfiguration.getNamespace());
+ assertEquals(config.getServerLists(), yamlOrchestrationRepositoryConfiguration.getServerLists());
+ assertEquals(config.getProps(), yamlOrchestrationRepositoryConfiguration.getProps());
}
private YamlOrchestrationRepositoryConfiguration getYamlOrchestrationRepositoryConfiguration() {
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 a490352..0a98e9d 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
@@ -47,7 +47,7 @@ rules:
orchestration:
name: test_ms_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_ms_registry
@@ -57,7 +57,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_ms_config
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 b73209a..6cfdb30 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
@@ -47,7 +47,7 @@ rules:
orchestration:
name: test_ms_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_ms_registry
@@ -57,7 +57,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_ms_center
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 d421413..4e16c2b 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
@@ -86,7 +86,7 @@ rules:
orchestration:
name: test_sharding_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
@@ -96,7 +96,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
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 fa66cec..9446165 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
@@ -86,7 +86,7 @@ rules:
orchestration:
name: test_sharding_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
@@ -96,7 +96,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
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 961d2d1..928540a 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
@@ -70,7 +70,7 @@ rules:
orchestration:
name: test_sharding_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
@@ -80,7 +80,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
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 adcc2d7..4142325 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
@@ -72,7 +72,7 @@ rules:
orchestration:
name: test_sharding_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
@@ -82,7 +82,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
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 5491e84..5341467 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
@@ -120,7 +120,7 @@ rules:
orchestration:
name: test_sharding_ms_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
@@ -130,7 +130,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
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 f947817..87c97a0 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
@@ -122,7 +122,7 @@ rules:
orchestration:
name: test_sharding_ms_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
@@ -132,7 +132,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
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 3beefa4..b273514 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
@@ -43,7 +43,7 @@ dataSources:
orchestration:
name: test_sharding_ms_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
@@ -53,7 +53,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
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 e08d2ff..43aca20 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
@@ -83,7 +83,7 @@ rules:
orchestration:
name: test_sharding_ms_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
@@ -93,7 +93,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
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 5128308..8fa0151 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
@@ -87,7 +87,7 @@ rules:
orchestration:
name: test_sharding_ms_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
@@ -97,7 +97,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
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 3ec112e..129b5f8 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
@@ -17,7 +17,7 @@
orchestration:
name: test_encrypt_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_encrypt_registry
@@ -27,7 +27,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_encrypt_config
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 b366b8e..0177d3c 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
@@ -17,7 +17,7 @@
orchestration:
name: test_encrypt_registry_name
- registryRepositoryConfiguration:
+ registryCenter:
type: REG_TEST
serverLists: localhost:3181
namespace: test_encrypt_registry_no
@@ -27,7 +27,7 @@ orchestration:
timeToLiveSeconds: 10
maxRetries: 10
operationTimeoutMilliseconds: 10
- additionalConfigurationRepositoryConfiguration:
+ additionalConfigCenter:
type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_encrypt_config_no
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 502e608..8490c8c 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
@@ -80,11 +80,11 @@ public class OrchestrationSpringBootConfiguration implements EnvironmentAware {
public OrchestrationConfiguration orchestrationConfiguration() {
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()));
+ if (null == entry.getValue().getAdditionalConfigCenter()) {
+ return new OrchestrationConfiguration(entry.getKey(), swapper.swapToObject(entry.getValue().getRegistryCenter()));
}
return new OrchestrationConfiguration(entry.getKey(),
- swapper.swapToObject(entry.getValue().getRegistryRepositoryConfiguration()), swapper.swapToObject(entry.getValue().getAdditionalConfigurationRepositoryConfiguration()));
+ swapper.swapToObject(entry.getValue().getRegistryCenter()), swapper.swapToObject(entry.getValue().getAdditionalConfigCenter()));
}
// 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/test/java/org/apache/shardingsphere/spring/boot/orchestration/registry/TestOrchestrationRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/registry/TestOrchest [...]
index 0f760be..e709553 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/registry/TestOrchestrationRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/registry/TestOrchestrationRepository.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
import java.util.Collections;
@@ -39,7 +39,7 @@ public final class TestOrchestrationRepository implements RegistryRepository, Co
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
}
@Override
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 8e11fbb..ebcf989 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,7 @@ 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.registry-repository-configuration.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
+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.registry-center.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 d199af6..8c3f139 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,7 @@ 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.registry-repository-configuration.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
+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.registry-center.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 ae8562f..bb75546 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,7 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.registry-repository-configuration.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
+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.registry-center.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 3b1f577..e4d5ea0 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,7 +69,7 @@ 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.registry-repository-configuration.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
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.type=TestRegistry
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.server-lists=localhost:3181
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.namespace=orchestration-spring-boot-sharding-test
+spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.registry-center.props.overwrite=true
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/parser/InstanceBeanDefinitionParser.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/parser/InstanceBe [...]
index 8883c71..2525a79 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/parser/InstanceBeanDefinitionParser.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/java/org/apache/shardingsphere/spring/namespace/orchestration/parser/InstanceBeanDefinitionParser.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.spring.namespace.orchestration.parser;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.spring.namespace.orchestration.constants.InstanceBeanDefinitionTag;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -35,7 +35,7 @@ public final class InstanceBeanDefinitionParser extends AbstractBeanDefinitionPa
@Override
protected AbstractBeanDefinition parseInternal(final Element element, final ParserContext parserContext) {
- BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(OrchestrationRepositoryConfiguration.class);
+ BeanDefinitionBuilder factory = BeanDefinitionBuilder.rootBeanDefinition(OrchestrationCenterConfiguration.class);
factory.addConstructorArgValue(element.getAttribute(InstanceBeanDefinitionTag.TYPE_TAG));
factory.addConstructorArgValue(element.getAttribute(InstanceBeanDefinitionTag.SERVER_LISTS_TAG));
factory.addConstructorArgValue(element.getAttribute(InstanceBeanDefinitionTag.NAMESPACE_TAG));
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/registry/TestOrchestrationRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/registry/TestOrc [...]
index f1b4725..5074e30 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/registry/TestOrchestrationRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/orchestration/registry/TestOrchestrationRepository.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.orchestration.repository.api.ConfigurationRepository;
import org.apache.shardingsphere.orchestration.repository.api.RegistryRepository;
-import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationRepositoryConfiguration;
+import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationCenterConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.listener.DataChangedEventListener;
import java.util.Collections;
@@ -35,7 +35,7 @@ public final class TestOrchestrationRepository implements RegistryRepository, Co
private Properties props = new Properties();
@Override
- public void init(final OrchestrationRepositoryConfiguration config) {
+ public void init(final OrchestrationCenterConfiguration config) {
}
@Override
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 707b4c3..79e4b7c 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
@@ -23,7 +23,7 @@
#
#orchestration:
# name: orchestration_ds
-# registryRepositoryConfiguration:
+# registryCenter:
# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoaderTest.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoaderTest.java
index e5d91e7..ad40086 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoaderTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/java/org/apache/shardingsphere/proxy/config/ShardingConfigurationLoaderTest.java
@@ -52,7 +52,7 @@ public final class ShardingConfigurationLoaderTest {
}
private void assertOrchestrationConfiguration(final YamlOrchestrationConfiguration orchestration) {
- YamlOrchestrationRepositoryConfiguration actual = orchestration.getRegistryRepositoryConfiguration();
+ YamlOrchestrationRepositoryConfiguration actual = orchestration.getRegistryCenter();
assertThat(actual.getNamespace(), is("test_namespace_1"));
assertThat(actual.getServerLists(), is("localhost:2181"));
}
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 6d660b1..2a51582 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
@@ -17,7 +17,7 @@
orchestration:
name: test_name_1
- registryRepositoryConfiguration:
+ registryCenter:
type: zookeeper
serverLists: localhost:2181
namespace: test_namespace_1