You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ki...@apache.org on 2020/08/08 16:36:26 UTC
[shardingsphere] branch master updated: Use name instead of
namespace for orchestration springboot configuration (#6722)
This is an automated email from the ASF dual-hosted git repository.
kimmking 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 de4e772 Use name instead of namespace for orchestration springboot configuration (#6722)
de4e772 is described below
commit de4e7725d723b61c0ebb688230500151b87a7db7
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Sun Aug 9 00:36:01 2020 +0800
Use name instead of namespace for orchestration springboot configuration (#6722)
---
.../application-cloud-nacos-encrypt.properties | 20 +++++++++-----------
.../application-cloud-nacos-master-slave.properties | 16 ++++++++--------
.../application-cloud-nacos-shadow.properties | 16 ++++++++--------
...-cloud-nacos-sharding-databases-tables.properties | 16 ++++++++--------
.../application-cloud-zookeeper-encrypt.properties | 8 ++++----
...plication-cloud-zookeeper-master-slave.properties | 8 ++++----
.../application-cloud-zookeeper-shadow.properties | 8 ++++----
...ud-zookeeper-sharding-databases-tables.properties | 8 ++++----
.../application-local-nacos-encrypt.properties | 12 ++++++------
.../application-local-nacos-master-slave.properties | 12 ++++++------
.../application-local-nacos-shadow.properties | 12 ++++++------
...-local-nacos-sharding-databases-tables.properties | 12 ++++++------
.../application-local-zookeeper-encrypt.properties | 8 ++++----
...plication-local-zookeeper-master-slave.properties | 8 ++++----
.../application-local-zookeeper-shadow.properties | 8 ++++----
...al-zookeeper-sharding-databases-tables.properties | 8 ++++----
.../OrchestrationSpringBootConfiguration.java | 19 ++++++-------------
.../OrchestrationSpringBootRootConfiguration.java | 3 +--
.../OrchestrationSpringBootRegistryEncryptTest.java | 8 ++++----
...chestrationSpringBootRegistryMasterSlaveTest.java | 8 ++++----
.../OrchestrationSpringBootRegistryShardingTest.java | 8 ++++----
.../test/resources/application-encrypt.properties | 8 ++++----
.../resources/application-masterslave.properties | 8 ++++----
.../test/resources/application-registry.properties | 8 ++++----
.../test/resources/application-sharding.properties | 8 ++++----
25 files changed, 124 insertions(+), 134 deletions(-)
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 34a9e86..1978af2 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
@@ -13,17 +13,15 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+#OrchestrationSpringBootRegistryShardingTest
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.overwrite=false
+spring.shardingsphere.orchestration.name=demo1_spring_boot_ds_encrypt
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.additional-config-center.type=Nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.additional-config-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=false
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.additional-config-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.additional-config-center.props.operationTimeoutMilliseconds=3000
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-master-slave.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-master-slave.properties
index f37721f..aad34ff 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,13 +15,13 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.overwrite=false
+spring.shardingsphere.orchestration.name=demo1_spring_boot_ds_ms
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.type=Nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.props.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.additional-config-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.additional-config-center.props.operationTimeoutMilliseconds=3000
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-shadow.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-shadow.properties
index 8701e29..36fcdd8 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,13 +15,13 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.overwrite=false
+spring.shardingsphere.orchestration.name=demo1_spring_boot_ds_shadow
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.type=Nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.props.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.additional-config-center.props.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.additional-config-center.props.operationTimeoutMilliseconds=3000
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-nacos-sharding-databases-tables.properties
index bf7d5f2..a46c1c6 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,13 +15,13 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.overwrite=false
+spring.shardingsphere.orchestration.name=demo1_spring_boot_ds_sharding
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.additional-config-center.type=Nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.additional-config-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.group=SHARDING_SPHERE_DEFAULT_GROUP
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.operationTimeoutMilliseconds=3000
+spring.shardingsphere.orchestration.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.additional-config-center.group=SHARDING_SPHERE_DEFAULT_GROUP
+spring.shardingsphere.orchestration.additional-config-center.operationTimeoutMilliseconds=3000
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
index 5eb33f9..7097e8b 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-encrypt.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=false
+spring.shardingsphere.orchestration.name=demo_spring_boot_ds_encrypt
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-master-slave.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-master-slave.properties
index 12a51cf..b0a9381 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-master-slave.properties
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-master-slave.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.overwrite=false
+spring.shardingsphere.orchestration.name=demo_spring_boot_ds_ms
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
index afd1a24..fd5ddbb 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-shadow.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.overwrite=false
+spring.shardingsphere.orchestration.name=demo_spring_boot_ds_shadow
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
index 02d77bb..bd27b0e 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-cloud-zookeeper-sharding-databases-tables.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.overwrite=false
+spring.shardingsphere.orchestration.name=demo_spring_boot_ds_sharding
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-encrypt.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-encrypt.properties
index f83f8ea..dfa980a 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,11 +31,11 @@ spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.encryptor-name
spring.shardingsphere.props.query.with.cipher.comlum=true
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_encrypt.overwrite=true
+spring.shardingsphere.orchestration.name=demo1_spring_boot_ds_encrypt
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.additional-config-center.type=Nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.additional-config-center.server-lists=localhost:8848
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-master-slave.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-master-slave.properties
index 8daf9dd..41f6e98 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,11 +33,11 @@ spring.shardingsphere.rules.master-slave.data-sources.ds_ms.master-data-source-n
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.slave-data-source-names=ds_slave_0,ds_slave_1
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.load-balancer-name=round_robin
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.overwrite=true
+spring.shardingsphere.orchestration.name=demo1_spring_boot_ds_ms
+spring.shardingsphere.orchestration.overwrite=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.type=Nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.additional-config-center.server-lists=localhost:8848
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.type=ZooKeeper
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_ms.registry-center.server-lists=localhost:2181
+spring.shardingsphere.orchestration.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-shadow.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-shadow.properties
index fcb8862..44dc7f3 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,11 +31,11 @@ spring.shardingsphere.rules.shadow.shadow-mappings.ds=shadow_ds
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_shadow.overwrite=true
+spring.shardingsphere.orchestration.name=demo1_spring_boot_ds_shadow
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.type=Nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.additional-config-center.server-lists=localhost:8848
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-nacos-sharding-databases-tables.properties
index 6929923..cf1ee7a 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,11 +57,11 @@ spring.shardingsphere.rules.sharding.sharding-algorithms.t_order_item_inline.pro
spring.shardingsphere.rules.sharding.key-generators.snowflake.type=SNOWFLAKE
spring.shardingsphere.rules.sharding.key-generators.snowflake.props.worker.id=123
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo1_spring_boot_ds_sharding.overwrite=true
+spring.shardingsphere.orchestration.name=demo1_spring_boot_ds_sharding
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.additional-config-center.type=Nacos
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.additional-config-center.server-lists=localhost:8848
+spring.shardingsphere.orchestration.additional-config-center.type=Nacos
+spring.shardingsphere.orchestration.additional-config-center.server-lists=localhost:8848
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-encrypt.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-encrypt.properties
index 54cc89a..d9d72d2 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,9 +31,9 @@ spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.encryptor-name
spring.shardingsphere.props.query.with.cipher.comlum=true
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=true
+spring.shardingsphere.orchestration.name=demo_spring_boot_ds_encrypt
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-master-slave.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-master-slave.properties
index b7bc569..6329961 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,9 +33,9 @@ spring.shardingsphere.rules.master-slave.data-sources.ds_ms.master-data-source-n
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.slave-data-source-names=ds_slave_0,ds_slave_1
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.load-balancer-name=round_robin
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.overwrite=true
+spring.shardingsphere.orchestration.name=demo_spring_boot_ds_ms
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
index 484c02f..82b5447 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-shadow.properties
@@ -31,8 +31,8 @@ spring.shardingsphere.rules.shadow.shadow-mappings.ds=shadow_ds
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_shadow.overwrite=true
+spring.shardingsphere.orchestration.name=demo_spring_boot_ds_shadow
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-boot-example/src/main/resources/application-local-zookeeper-sharding-databases-tables.properties
index 307cf3f..ddd6348 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
@@ -62,8 +62,8 @@ spring.shardingsphere.rules.encrypt.encryptors.status_encryptor.props.aes.key.va
spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.cipher-column=status
spring.shardingsphere.rules.encrypt.tables.t_order.columns.status.encryptor-name=status_encryptor
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.namespace=orchestration-spring-boot-demo
-spring.shardingsphere.orchestration.demo_spring_boot_ds_sharding.overwrite=true
+spring.shardingsphere.orchestration.name=demo_spring_boot_ds_sharding
+spring.shardingsphere.orchestration.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.registry-center.type=ZooKeeper
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:2181
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 882d5df..7450d35 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
@@ -24,7 +24,6 @@ import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataS
import org.apache.shardingsphere.driver.orchestration.internal.datasource.OrchestrationShardingSphereDataSource;
import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.orchestration.repository.api.config.OrchestrationConfiguration;
-import org.apache.shardingsphere.orchestration.core.common.yaml.config.YamlOrchestrationConfiguration;
import org.apache.shardingsphere.orchestration.core.common.yaml.swapper.OrchestrationCenterConfigurationYamlSwapper;
import org.apache.shardingsphere.spring.boot.datasource.DataSourceMapSetter;
import org.apache.shardingsphere.spring.boot.orchestration.common.OrchestrationSpringBootRootConfiguration;
@@ -42,7 +41,6 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
-import org.springframework.util.CollectionUtils;
import javax.sql.DataSource;
import java.sql.SQLException;
@@ -50,7 +48,7 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Optional;
/**
@@ -76,18 +74,13 @@ public class OrchestrationSpringBootConfiguration implements EnvironmentAware {
* @return orchestration configuration
*/
@Bean
- // TODO only can support one OrchestrationConfiguration, should support multiple
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().getAdditionalConfigCenter()) {
- return new OrchestrationConfiguration(entry.getKey(), swapper.swapToObject(entry.getValue().getRegistryCenter()), entry.getValue().isOverwrite());
- }
- return new OrchestrationConfiguration(entry.getKey(),
- swapper.swapToObject(entry.getValue().getRegistryCenter()), swapper.swapToObject(entry.getValue().getAdditionalConfigCenter()), entry.getValue().isOverwrite());
+ Preconditions.checkState(Objects.nonNull(root.getOrchestration()), "The orchestration configuration is invalid, please configure orchestration");
+ if (null == root.getOrchestration().getAdditionalConfigCenter()) {
+ return new OrchestrationConfiguration(root.getOrchestration().getName(), swapper.swapToObject(root.getOrchestration().getRegistryCenter()), root.getOrchestration().isOverwrite());
}
- // TODO should return map when support multiple OrchestrationConfiguration
- return null;
+ return new OrchestrationConfiguration(root.getOrchestration().getName(),
+ swapper.swapToObject(root.getOrchestration().getRegistryCenter()), swapper.swapToObject(root.getOrchestration().getAdditionalConfigCenter()), root.getOrchestration().isOverwrite());
}
/**
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/common/OrchestrationSpringBootRootConfiguration.java b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/common/Or [...]
index 48b3d66..c1078b9 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/common/OrchestrationSpringBootRootConfiguration.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/orchestration/common/OrchestrationSpringBootRootConfiguration.java
@@ -23,7 +23,6 @@ import org.apache.shardingsphere.cluster.configuration.yaml.YamlClusterConfigura
import org.apache.shardingsphere.orchestration.core.common.yaml.config.YamlOrchestrationConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import java.util.Map;
import java.util.Properties;
/**
@@ -36,7 +35,7 @@ public final class OrchestrationSpringBootRootConfiguration {
private Properties props = new Properties();
- private Map<String, YamlOrchestrationConfiguration> orchestration;
+ private YamlOrchestrationConfiguration orchestration;
private YamlClusterConfiguration cluster;
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/java/org/apache/shardingsphere/spring/boot/orchestration/type/OrchestrationSpringBootRegistryEncryptTest.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/type/Orch [...]
index 0cb5b25..ab6c938 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/type/OrchestrationSpringBootRegistryEncryptTest.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/type/OrchestrationSpringBootRegistryEncryptTest.java
@@ -64,10 +64,10 @@ public class OrchestrationSpringBootRegistryEncryptTest {
String dataSource = readYAML(DATA_SOURCE_FILE);
String encryptRule = readYAML(ENCRYPT_RULE_FILE);
TestOrchestrationRepository repository = new TestOrchestrationRepository();
- repository.persist("/demo_spring_boot_ds_center/config/schema/logic_db/datasource", dataSource);
- repository.persist("/demo_spring_boot_ds_center/config/schema/logic_db/rule", encryptRule);
- repository.persist("/demo_spring_boot_ds_center/config/props", "sql.show: 'true'\n");
- repository.persist("/demo_spring_boot_ds_center/registry/datasources", "");
+ repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/datasource", dataSource);
+ repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/rule", encryptRule);
+ repository.persist("/orchestration-spring-boot-test/config/props", "sql.show: 'true'\n");
+ repository.persist("/orchestration-spring-boot-test/registry/datasources", "");
}
@Test
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/type/OrchestrationSpringBootRegistryMasterSlaveTest.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/type/ [...]
index b2d1bb8..9020ba7 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/type/OrchestrationSpringBootRegistryMasterSlaveTest.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/type/OrchestrationSpringBootRegistryMasterSlaveTest.java
@@ -53,7 +53,7 @@ public class OrchestrationSpringBootRegistryMasterSlaveTest {
public static void init() {
EmbedTestingServer.start();
TestOrchestrationRepository repository = new TestOrchestrationRepository();
- repository.persist("/demo_spring_boot_ds_center/config/schema/logic_db/datasource", ""
+ repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/datasource", ""
+ "ds_master: !!" + YamlDataSourceConfiguration.class.getName() + "\n"
+ " dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource\n"
+ " props:\n"
@@ -75,7 +75,7 @@ public class OrchestrationSpringBootRegistryMasterSlaveTest {
+ " maxTotal: 16\n"
+ " password: ''\n"
+ " username: root\n");
- repository.persist("/demo_spring_boot_ds_center/config/schema/logic_db/rule", ""
+ repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/rule", ""
+ "rules:\n"
+ "- !MASTER_SLAVE\n"
+ " loadBalancers:\n"
@@ -89,8 +89,8 @@ public class OrchestrationSpringBootRegistryMasterSlaveTest {
+ " slaveDataSourceNames: \n"
+ " - ds_slave_0\n"
+ " - ds_slave_1\n");
- repository.persist("/demo_spring_boot_ds_center/config/props", "{}\n");
- repository.persist("/demo_spring_boot_ds_center/registry/datasources", "");
+ repository.persist("/orchestration-spring-boot-test/config/props", "{}\n");
+ repository.persist("/orchestration-spring-boot-test/registry/datasources", "");
}
@Test
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/type/OrchestrationSpringBootRegistryShardingTest.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/type/Orc [...]
index 684da58..d787071 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/type/OrchestrationSpringBootRegistryShardingTest.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/type/OrchestrationSpringBootRegistryShardingTest.java
@@ -68,12 +68,12 @@ public class OrchestrationSpringBootRegistryShardingTest {
String shardingDatabases = readYAML(SHARDING_DATABASES_FILE);
String shardingRule = readYAML(SHARDING_RULE_FILE);
TestOrchestrationRepository repository = new TestOrchestrationRepository();
- repository.persist("/demo_spring_boot_ds_center/config/schema/logic_db/datasource", shardingDatabases);
- repository.persist("/demo_spring_boot_ds_center/config/schema/logic_db/rule", shardingRule);
- repository.persist("/demo_spring_boot_ds_center/config/props", ""
+ repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/datasource", shardingDatabases);
+ repository.persist("/orchestration-spring-boot-test/config/schema/logic_db/rule", shardingRule);
+ repository.persist("/orchestration-spring-boot-test/config/props", ""
+ "executor.size: '100'\n"
+ "sql.show: 'true'\n");
- repository.persist("/demo_spring_boot_ds_center/registry/datasources", "");
+ repository.persist("/orchestration-spring-boot-test/registry/datasources", "");
}
@Test
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 c4e0244..537cb83 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-encrypt.properties
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-encrypt.properties
@@ -32,8 +32,8 @@ spring.shardingsphere.rules.encrypt.tables.t_order.columns.order_id.encryptor-na
spring.shardingsphere.props.sql.show=true
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.namespace=orchestration-spring-boot-master-slave-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_encrypt.overwrite=true
+spring.shardingsphere.orchestration.name=orchestration-spring-boot-master-slave-test
+spring.shardingsphere.orchestration.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.registry-center.type=TestRegistry
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:3181
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 9eca4a1..95cee52 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,9 +42,9 @@ spring.shardingsphere.datasource.ds_slave_1.max-total=16
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.master-data-source-name=ds_master
spring.shardingsphere.rules.master-slave.data-sources.ds_ms.slave-data-source-names=ds_slave_0,ds_slave_1
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.namespace=orchestration-spring-boot-master-slave-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_ms.overwrite=true
+spring.shardingsphere.orchestration.name=orchestration-spring-boot-master-slave-test
+spring.shardingsphere.orchestration.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.registry-center.type=TestRegistry
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:3181
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 14c6ff4..417eca9 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-registry.properties
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/application-registry.properties
@@ -15,8 +15,8 @@
# limitations under the License.
#
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.namespace=orchestration-spring-boot-test
-spring.shardingsphere.orchestration.demo_spring_boot_ds_center.overwrite=true
+spring.shardingsphere.orchestration.name=orchestration-spring-boot-test
+spring.shardingsphere.orchestration.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.registry-center.type=TestRegistry
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:3181
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 e727dd5..972a2c8 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-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.overwrite=true
+spring.shardingsphere.orchestration.name=orchestration-spring-boot-sharding-test
+spring.shardingsphere.orchestration.registry-center.type=TestRegistry
+spring.shardingsphere.orchestration.registry-center.server-lists=localhost:3181
+spring.shardingsphere.orchestration.overwrite=true