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/07/26 15:58:30 UTC
[shardingsphere] branch master updated: Rename instanceType to type
(#6453)
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 ddcec7f Rename instanceType to type (#6453)
ddcec7f is described below
commit ddcec7faa48812bc1beef8ce5ced5ab7e64212fe
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Jul 26 23:58:19 2020 +0800
Rename instanceType to type (#6453)
---
.../configuration/java-api/governance.cn.md | 2 +-
.../configuration/java-api/governance.en.md | 2 +-
.../spring-boot-starter/governance.cn.md | 20 +++++++++---------
.../spring-boot-starter/governance.en.md | 2 +-
.../spring-namespace/governance.cn.md | 4 ++--
.../spring-namespace/governance.en.md | 11 ++--------
.../configuration/yaml/governance.cn.md | 24 +++++++++++-----------
.../configuration/yaml/governance.en.md | 2 +-
.../usage/governance/spring-boot-starter.cn.md | 2 +-
.../usage/governance/spring-boot-starter.en.md | 2 +-
.../usage/governance/spring-namespace.cn.md | 2 +-
.../usage/governance/spring-namespace.en.md | 2 +-
.../usage/governance/yaml.cn.md | 5 +++--
.../usage/governance/yaml.en.md | 2 +-
.../sharding-proxy/sharding/conf/server.yaml | 2 +-
.../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 | 4 ++--
...application-cloud-nacos-master-slave.properties | 4 ++--
.../application-cloud-nacos-shadow.properties | 4 ++--
...loud-nacos-sharding-databases-tables.properties | 4 ++--
.../application-cloud-zookeeper-encrypt.properties | 2 +-
...ication-cloud-zookeeper-master-slave.properties | 2 +-
.../application-cloud-zookeeper-shadow.properties | 2 +-
...-zookeeper-sharding-databases-tables.properties | 2 +-
.../application-local-nacos-encrypt.properties | 4 ++--
...application-local-nacos-master-slave.properties | 4 ++--
.../application-local-nacos-shadow.properties | 4 ++--
...ocal-nacos-sharding-databases-tables.properties | 4 ++--
.../application-local-zookeeper-encrypt.properties | 2 +-
...ication-local-zookeeper-master-slave.properties | 2 +-
.../application-local-zookeeper-shadow.properties | 2 +-
...-zookeeper-sharding-databases-tables.properties | 2 +-
.../resources/META-INF/nacos/registry-center.xml | 4 ++--
.../META-INF/zookeeper/registry-center.xml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../YamlOrchestrationRepositoryConfiguration.java | 2 +-
...strationRepositoryConfigurationYamlSwapper.java | 4 ++--
.../OrchestrationConfigurationYamlSwapperTest.java | 6 +++---
...tionRepositoryConfigurationYamlSwapperTest.java | 6 +++---
.../src/main/resources/conf/server.yaml | 2 +-
.../test/resources/docker/proxy/conf/server.yaml | 2 +-
.../YamlInstanceConfigurationSwapperUtilTest.java | 4 ++--
.../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 ++--
.../test/resources/application-encrypt.properties | 2 +-
.../resources/application-masterslave.properties | 2 +-
.../test/resources/application-registry.properties | 2 +-
.../test/resources/application-sharding.properties | 2 +-
.../constants/InstanceBeanDefinitionTag.java | 2 +-
.../resources/META-INF/namespace/orchestration.xsd | 2 +-
.../META-INF/rdb/encryptOrchestration.xml | 2 +-
.../META-INF/rdb/masterSlaveOrchestration.xml | 2 +-
.../rdb/shardingMasterSlaveOrchestration.xml | 2 +-
.../META-INF/rdb/shardingOrchestration.xml | 2 +-
.../src/main/resources/conf/server.yaml | 2 +-
.../src/test/resources/conf/server.yaml | 2 +-
83 files changed, 143 insertions(+), 149 deletions(-)
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.cn.md
index 7d99fa1..52d3d12 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.cn.md
@@ -25,7 +25,7 @@ weight = 6
| *名称* | *数据类型* | *说明* |
| ------------- | ---------- | -------------------------------------------------------------------------- |
-| instanceType | String | 治理实例类型，如：zookeeper, etcd, apollo, nacos |
+| type | String | 治理实例类型，如：zookeeper, etcd, apollo, nacos |
| serverLists | String | 治理服务列表，包括 IP 地址和端口号，多个地址用逗号分隔，如: host1:2181,host2:2181 |
| namespace (?) | String | 治理命名空间 |
| props | Properties | 配置本实例需要的其他参数，例如 ZooKeeper 的连接参数等 |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.en.md
index ccbcde2..4a0b4e7 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/java-api/governance.en.md
@@ -25,7 +25,7 @@ Attributes:
| *Name* | *Data Type* | *Description* |
| ------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
-| instanceType | String | Orchestration instance type, such as: zookeeper, etcd, apollo, nacos |
+| type | String | Orchestration instance type, such as: zookeeper, etcd, apollo, nacos |
| serverLists | String | The list of servers that connect to orchestration instance, including IP and port number, use commas to separate, such as: host1:2181,host2:2181 |
| namespace (?) | String | Orchestration namespace |
| props | Properties | Properties for center instance config, such as options of zookeeper |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.cn.md
index 0b23069..8f6fabf 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.cn.md
@@ -8,19 +8,19 @@ weight = 6
### 治理
```properties
-spring.shardingsphere.orchestration.spring_boot_ds_sharding.instance-type= #治理实例类型。如：zookeeper, etcd, apollo, nacos
-spring.shardingsphere.orchestration.spring_boot_ds_sharding.server-lists= #治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181
-spring.shardingsphere.orchestration.spring_boot_ds_sharding.namespace= #治理命名空间
-spring.shardingsphere.orchestration.spring_boot_ds_sharding.props.overwrite= #本地配置是否覆盖配置中心配置。如果可覆盖，每次启动都以本地配置为准
+spring.shardingsphere.orchestration.spring_boot_ds_sharding.type= # 治理持久化类型。如：zookeeper, etcd, apollo, nacos
+spring.shardingsphere.orchestration.spring_boot_ds_sharding.server-lists= # 治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181
+spring.shardingsphere.orchestration.spring_boot_ds_sharding.namespace= # 治理命名空间
+spring.shardingsphere.orchestration.spring_boot_ds_sharding.props.overwrite= # 本地配置是否覆盖配置中心配置。如果可覆盖，每次启动都以本地配置为准
```
### 集群管理
```properties
-spring.shardingsphere.cluster.heartbeat.sql= #心跳检测 SQL
-spring.shardingsphere.cluster.heartbeat.interval= #心跳检测间隔时间 (s)
-spring.shardingsphere.cluster.heartbeat.threadCount= #心跳检测线程池大小
-spring.shardingsphere.cluster.heartbeat.retryEnable= #是否支持失败重试，可设置 true 或 false
-spring.shardingsphere.cluster.heartbeat.retryInterval= #重试间隔时间 (s)
-spring.shardingsphere.cluster.heartbeat.retryMaximum= #最大重试次数
+spring.shardingsphere.cluster.heartbeat.sql= # 心跳检测 SQL
+spring.shardingsphere.cluster.heartbeat.interval= # 心跳检测间隔秒数
+spring.shardingsphere.cluster.heartbeat.threadCount= # 心跳检测线程池大小
+spring.shardingsphere.cluster.heartbeat.retryEnable= # 是否支持失败重试
+spring.shardingsphere.cluster.heartbeat.retryInterval= # 重试间隔秒数
+spring.shardingsphere.cluster.heartbeat.retryMaximum= # 最大重试次数
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.en.md
index 6763896..8a3df3a 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-boot-starter/governance.en.md
@@ -8,7 +8,7 @@ weight = 6
### Management
```properties
-spring.shardingsphere.orchestration.spring_boot_ds_sharding.instance-type= #Orchestration instance type. Example:zookeeper, etcd, apollo, nacos
+spring.shardingsphere.orchestration.spring_boot_ds_sharding.type= #Orchestration instance type. Example:zookeeper, etcd, apollo, nacos
spring.shardingsphere.orchestration.spring_boot_ds_sharding.server-lists= #The list of servers that connect to orchestration instance, including IP and port number; use commas to separate
spring.shardingsphere.orchestration.spring_boot_ds_sharding.namespace= #Orchestration namespace
spring.shardingsphere.orchestration.spring_boot_ds_sharding.properties.overwrite= #Whether to overwrite local configurations with config center configurations; if it can, each initialization should refer to local configurations
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.cn.md
index e208dab..00d598a 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.cn.md
@@ -18,7 +18,7 @@ weight = 6
http://shardingsphere.apache.org/schema/shardingsphere/orchestration/orchestration.xsd
">
- <orchestration:instance id="regCenter" instance-type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo">
+ <orchestration:instance id="regCenter" type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo">
<props>
<prop key="overwrite">true</prop>
</props>
@@ -33,7 +33,7 @@ weight = 6
| *名称* | *类型* | *说明* |
| ------------- | ------ | -------------------------------------------------------------------------- |
| id | 属性 | 治理实例名称 |
-| instance-type | 属性 | 治理实例类型。如：zookeeper, etcd, apollo, nacos |
+| type | 属性 | 治理实例类型。如：zookeeper, etcd, apollo, nacos |
| server-lists | 属性 | 治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181 |
| namespace (?) | 属性 | 治理命名空间 |
| props (?) | 属性 | 配置本实例需要的其他参数，例如 ZooKeeper 的连接参数等 |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.en.md
index c1b0e4b..122b62c 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/spring-namespace/governance.en.md
@@ -11,20 +11,13 @@ weight = 6
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sharding="http://shardingsphere.apache.org/schema/shardingsphere/orchestration/sharding"
- xmlns:master-slave="http://shardingsphere.apache.org/schema/shardingsphere/orchestration/masterslave"
xmlns:orchestration="http://shardingsphere.apache.org/schema/shardingsphere/orchestration"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://shardingsphere.apache.org/schema/shardingsphere/datasource
- http://shardingsphere.apache.org/schema/shardingsphere/datasource/datasource.xsd
- http://shardingsphere.apache.org/schema/shardingsphere/sharding
- http://shardingsphere.apache.org/schema/shardingsphere/sharding/sharding.xsd
http://shardingsphere.apache.org/schema/shardingsphere/orchestration
http://shardingsphere.apache.org/schema/shardingsphere/orchestration/orchestration.xsd
">
-
- <orchestration:instance id="regCenter" instance-type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo">
+ <orchestration:instance id="regCenter" type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo">
<props>
<prop key="overwrite">true</prop>
</props>
@@ -39,7 +32,7 @@ Namespace: [http://shardingsphere.apache.org/schema/shardingsphere/orchestration
| *Name* | *Type* | *Description* |
| ------------- | ---------- | ---------------------------------------------------------------------------------------------------------------- |
| id | Attribute | Orchestration instance name |
-| instance-type | Attribute | Orchestration instance type. Example:zookeeper, etcd, apollo, nacos |
+| type | Attribute | Orchestration instance type. Example:zookeeper, etcd, apollo, nacos |
| server-lists | Attribute | The list of servers that connect to orchestration instance, including IP and port number; use commas to separate |
| namespace (?) | Attribute | Orchestration namespace |
| props (?) | Attribute | Properties for center instance config, such as options of zookeeper |
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.cn.md
index dd13044..e4d7e1d 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.cn.md
@@ -9,12 +9,12 @@ weight = 6
```yaml
orchestration:
- demo_yaml_ds_sharding: #治理实例名称
- instanceType: #治理实例类型。如：zookeeper, etcd, apollo, nacos
- serverLists: #治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181
- namespace: #治理命名空间
- props: #配置本实例需要的其他参数，例如 ZooKeeper 的连接参数等
- overwrite: #本地配置是否覆盖配置中心配置。如果可覆盖，每次启动都以本地配置为准
+ demo_yaml_ds_sharding: # 治理实例名称
+ type: # 治理持久化类型。如：zookeeper, etcd, apollo, nacos
+ serverLists: # 治理服务列表。包括 IP 地址和端口号。多个地址用逗号分隔。如: host1:2181,host2:2181
+ namespace: # 治理命名空间
+ props: # 配置本实例需要的其他参数，例如 ZooKeeper 的连接参数等
+ overwrite: # 本地配置是否覆盖配置中心配置。如果可覆盖，每次启动都以本地配置为准
```
### 集群管理
@@ -22,10 +22,10 @@ orchestration:
```yaml
cluster:
heartbeat:
- sql: #心跳检测 SQL
- threadCount: #心跳检测线程池大小
- interval: #心跳检测间隔时间 (s)
- retryEnable: #是否支持失败重试，可设置 true 或 false
- retryMaximum: #最大重试次数
- retryInterval: #重试间隔时间 (s)
+ sql: # 心跳检测 SQL
+ threadCount: # 心跳检测线程池大小
+ interval: # 心跳检测间隔秒数
+ retryEnable: # 是否支持失败重试
+ retryMaximum: # 最大重试次数
+ retryInterval: # 重试间隔秒数
```
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.en.md
index 75346e0..46e5421 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/configuration/yaml/governance.en.md
@@ -10,7 +10,7 @@ weight = 6
```yaml
orchestration:
demo_yaml_ds_sharding: #Orchestration instance name
- instanceType: #Orchestration instance type. Example:zookeeper, etcd, apollo, nacos
+ type: #Orchestration instance type. Example:zookeeper, etcd, apollo, nacos
serverLists: #The list of servers that connect to orchestration instance, including IP and port number; use commas to separate
namespace: #Orchestration namespace
props: #Properties for center instance config, such as options of zookeeper
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.cn.md
index db1c55d..e2d1e3f 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.cn.md
@@ -30,7 +30,7 @@ weight = 3
## 规则配置
```properties
-spring.shardingsphere.orchestration.spring_boot_ds.instance-type=zookeeper
+spring.shardingsphere.orchestration.spring_boot_ds.type=zookeeper
spring.shardingsphere.orchestration.spring_boot_ds.server-lists=localhost:2181
spring.shardingsphere.orchestration.spring_boot_ds.namespace=orchestration-spring-boot-shardingsphere-test
spring.shardingsphere.orchestration.spring_boot_ds.properties.overwrite=true
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.en.md
index 588629e..83a40c2 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-boot-starter.en.md
@@ -30,7 +30,7 @@ weight = 3
## Configure Rule
```properties
-spring.shardingsphere.orchestration.spring_boot_ds.instance-type=zookeeper
+spring.shardingsphere.orchestration.spring_boot_ds.type=zookeeper
spring.shardingsphere.orchestration.spring_boot_ds.server-lists=localhost:2181
spring.shardingsphere.orchestration.spring_boot_ds.namespace=orchestration-spring-boot-shardingsphere-test
spring.shardingsphere.orchestration.spring_boot_ds.properties.overwrite=true
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.cn.md
index d465448..11d623a 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.cn.md
@@ -42,7 +42,7 @@ weight = 4
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
</util:properties>
- <orchestration:instance id="regCenter" instance-type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo" properties-ref="instance-properties" />
+ <orchestration:instance id="regCenter" type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo" properties-ref="instance-properties" />
<orchestration:data-source id="shardingDatabasesTablesDataSource" data-source-ref="realShardingDatabasesTablesDataSource" instance-ref="regCenter" overwrite="true" />
<orchestration:slave-data-source id="masterSlaveDataSource" data-source-ref="realMasterSlaveDataSource" instance-ref="regCenter" overwrite="true" />
<orchestration:data-source id="encryptDataSource" data-source-ref="realEncryptDataSource" instance-ref="regCenter" overwrite="true" />
diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.en.md
index 7b27a83..19f4d8a 100644
--- a/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.en.md
+++ b/docs/document/content/user-manual/shardingsphere-jdbc/usage/governance/spring-namespace.en.md
@@ -42,7 +42,7 @@ weight = 4
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
</util:properties>
- <orchestration:instance id="regCenter" instance-type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo" properties-ref="instance-properties" />
+ <orchestration:instance id="regCenter" type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo" properties-ref="instance-properties" />
<orchestration:data-source id="shardingDatabasesTablesDataSource" data-source-ref="realShardingDatabasesTablesDataSource" instance-ref="regCenter" overwrite="true" />
<orchestration:slave-data-source id="masterSlaveDataSource" data-source-ref="realMasterSlaveDataSource" instance-ref="regCenter" overwrite="true" />
<orchestration:data-source id="encryptDataSource" data-source-ref="realEncryptDataSource" instance-ref="regCenter" overwrite="true" />
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 a3154c4..74c3a46 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
@@ -33,8 +33,9 @@ weight = 2
```yaml
orchestration:
- orchestration_ds:
- instanceType: zookeeper
+ name: orchestration_ds
+ registryRepositoryConfiguration:
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration
props:
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 685e786..a4e258a 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
@@ -35,7 +35,7 @@ Using ZooKeeper as config center and registry center for example.
orchestration:
name: orchestration_ds
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration
props:
diff --git a/examples/docker/sharding-proxy/sharding/conf/server.yaml b/examples/docker/sharding-proxy/sharding/conf/server.yaml
index 33a3de6..f62b195 100644
--- a/examples/docker/sharding-proxy/sharding/conf/server.yaml
+++ b/examples/docker/sharding-proxy/sharding/conf/server.yaml
@@ -24,7 +24,7 @@
#orchestration:
# name: orchestration_ds
# registryRepositoryConfiguration:
-# instanceType: zookeeper
+# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
# props:
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 4095246..916c247 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/encrypt.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/encrypt.yaml
@@ -18,13 +18,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_encrypt
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
overwrite: false
additionalConfigurationRepositoryConfiguration:
- instanceType: nacos
+ type: nacos
serverLists: localhost:8848
namespace:
props:
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 2f5a9af..5b38e13 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/master-slave.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/master-slave.yaml
@@ -18,13 +18,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_ms
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: false
additionalConfigurationRepositoryConfiguration:
- instanceType: nacos
+ type: nacos
serverLists: localhost:8848
namespace:
props:
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 078425d..823b1b2 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/shadow.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/shadow.yaml
@@ -18,13 +18,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_shadow
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: false
additionalConfigurationRepositoryConfiguration:
- instanceType: nacos
+ type: nacos
serverLists: localhost:8848
namespace:
props:
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 98af2d3..baeb678 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/cloud/sharding-databases-tables.yaml
@@ -18,13 +18,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_sharding
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: false
additionalConfigurationRepositoryConfiguration:
- instanceType: nacos
+ type: nacos
serverLists: localhost:8848
namespace:
props:
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 252ea7b..b740a10 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/encrypt.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/encrypt.yaml
@@ -43,13 +43,13 @@ props:
orchestration:
name: demo_zookeeper_yaml_ds_encrypt
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
overwrite: true
additionalConfigurationRepositoryConfiguration:
- instanceType: nacos
+ type: nacos
serverLists: localhost:8848
namespace:
props:
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 745f264..91631ec 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/master-slave.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/master-slave.yaml
@@ -46,13 +46,13 @@ props:
orchestration:
name: demo_zookeeper_yaml_ds_ms
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: true
additionalConfigurationRepositoryConfiguration:
- instanceType: nacos
+ type: nacos
serverLists: localhost:8848
namespace:
props:
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 9e28bbc..da8f96d 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/shadow.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/shadow.yaml
@@ -18,13 +18,13 @@
orchestration:
name: demo_zookeeper_yaml_ds_shadow
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: false
additionalConfigurationRepositoryConfiguration:
- instanceType: nacos
+ type: nacos
serverLists: localhost:8848
namespace:
props:
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 cc3b621..c13dcb4 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/nacos/local/sharding-databases-tables.yaml
@@ -83,13 +83,13 @@ props:
orchestration:
name: demo_zookeeper_yaml_ds_sharding
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace:
props:
overwrite: true
additionalConfigurationRepositoryConfiguration:
- instanceType: nacos
+ type: nacos
serverLists: localhost:8848
namespace:
props:
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 03e878d..8d9a9c7 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/encrypt.yaml
@@ -18,7 +18,7 @@
orchestration:
name: demo_yaml_ds_encrypt
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
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 a610c08..c2eff96 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/master-slave.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/master-slave.yaml
@@ -18,7 +18,7 @@
orchestration:
name: demo_yaml_ds_ms
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
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 01365b1..8835f6e 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/shadow.yaml
@@ -18,7 +18,7 @@
orchestration:
name: demo_yaml_ds_shadow
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
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 d8793b6..bc80152 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/cloud/sharding-databases-tables.yaml
@@ -18,7 +18,7 @@
orchestration:
name: demo_yaml_ds_sharding
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
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 58d320f..5f80323 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/encrypt.yaml
@@ -18,7 +18,7 @@
orchestration:
name: demo_yaml_ds_encrypt
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
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 44d0164..c29d78d 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/master-slave.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/master-slave.yaml
@@ -18,7 +18,7 @@
orchestration:
name: demo_yaml_ds_ms
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
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 7e7b839..19f2298 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/shadow.yaml
@@ -18,7 +18,7 @@
orchestration:
name: demo_yaml_ds_shadow
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
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 6a50fea..658c5e1 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-raw-jdbc-example/src/main/resources/META-INF/zookeeper/local/sharding-databases-tables.yaml
@@ -18,7 +18,7 @@
orchestration:
name: demo_yaml_ds_sharding
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: orchestration-yaml-demo
props:
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 d3b9c19..d66c601 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.instance-type=nacos
+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.demo1_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=zookeeper
+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
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 a032698..7285622 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.instance-type=nacos
+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.demo1_spring_boot_ds_ms.registry-repository-configuration.instance-type=zookeeper
+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
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 fcaa52a..6065b88 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.instance-type=nacos
+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.demo1_spring_boot_ds_shadow.registry-repository-configuration.instance-type=zookeeper
+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
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 aac8da6..21b99bd 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.instance-type=nacos
+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.demo1_spring_boot_ds_sharding.registry-repository-configuration.instance-type=zookeeper
+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
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 e16a629..2d5eff4 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.instance-type=zookeeper
+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
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 4cd2b31..059afff 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.instance-type=zookeeper
+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
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 4315809..bd564bb 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.instance-type=zookeeper
+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
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 a86bfd3..29aa584 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.instance-type=zookeeper
+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
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 76872aa..631d086 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.instance-type=nacos
+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.demo1_spring_boot_ds_encrypt.registry-repository-configuration.instance-type=zookeeper
+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
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 27178c3..247acac 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.instance-type=nacos
+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.instance-type=zookeeper
+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
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 5526427..24b5527 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.instance-type=nacos
+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.instance-type=zookeeper
+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
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 d2d5787..cd42296 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.instance-type=nacos
+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.demo1_spring_boot_ds_sharding.registry-repository-configuration.instance-type=zookeeper
+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
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 c46f6e8..883cba4 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.instance-type=zookeeper
+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
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 0ae7b00..de4895c 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.instance-type=zookeeper
+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
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 5c6e297..dd1c611 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.instance-type=zookeeper
+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
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 18bfbf3..5946d5c 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,7 +57,7 @@ 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.instance-type=zookeeper
+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
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/nacos/registry-center.xml b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/nacos/registry-center.xml
index 6d4be1e..267bda7 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/nacos/registry-center.xml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/nacos/registry-center.xml
@@ -24,7 +24,7 @@
http://shardingsphere.apache.org/schema/shardingsphere/orchestration
http://shardingsphere.apache.org/schema/shardingsphere/orchestration/orchestration.xsd
">
- <orchestration:instance id="confCenter" instance-type="nacos" server-lists="localhost:8848" namespace="">
+ <orchestration:instance id="confCenter" type="nacos" server-lists="localhost:8848" namespace="">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
@@ -32,7 +32,7 @@
</props>
</orchestration:instance>
- <orchestration:instance id="regCenter" instance-type="zookeeper" server-lists="localhost:2181" namespace="">
+ <orchestration:instance id="regCenter" type="zookeeper" server-lists="localhost:2181" namespace="">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml
index 4755fb6..6973070 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/registry-center.xml
@@ -24,7 +24,7 @@
http://shardingsphere.apache.org/schema/shardingsphere/orchestration
http://shardingsphere.apache.org/schema/shardingsphere/orchestration/orchestration.xsd
">
- <orchestration:instance id="regCenter" instance-type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo">
+ <orchestration:instance id="regCenter" type="zookeeper" server-lists="localhost:2181" namespace="orchestration-spring-namespace-demo">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">3000</prop>
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
index 31de98c..b95ede7 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-boot-mybatis-example/src/main/resources/conf/server.yaml
@@ -24,7 +24,7 @@
#orchestration:
# name: orchestration_ds
# registryRepositoryConfiguration:
-# instanceType: zookeeper
+# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
# props:
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 3bf1bc4..cfcb5dd 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/server.yaml
@@ -24,7 +24,7 @@
#orchestration:
# name: orchestration_ds
# registryRepositoryConfiguration:
-# instanceType: zookeeper
+# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
# props:
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/YamlOrchestrationRepositoryConfiguration.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-repository/shardingsphere-orchestration-repository-common/src/main/java/org/apache/shardingsphere/orchestra [...]
index 068dc96..3ddfcda 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/YamlOrchestrationRepositoryConfiguration.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/YamlOrchestrationRepositoryConfiguration.java
@@ -30,7 +30,7 @@ import java.util.Properties;
@Setter
public final class YamlOrchestrationRepositoryConfiguration implements YamlConfiguration {
- private String instanceType;
+ private String type;
private String serverLists;
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 ec9e74c..3e7094b 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
@@ -29,7 +29,7 @@ public final class OrchestrationRepositoryConfigurationYamlSwapper implements Ya
@Override
public YamlOrchestrationRepositoryConfiguration swapToYamlConfiguration(final OrchestrationRepositoryConfiguration configuration) {
YamlOrchestrationRepositoryConfiguration result = new YamlOrchestrationRepositoryConfiguration();
- result.setInstanceType(configuration.getType());
+ result.setType(configuration.getType());
result.setServerLists(configuration.getServerLists());
result.setNamespace(configuration.getNamespace());
result.setProps(configuration.getProps());
@@ -38,6 +38,6 @@ public final class OrchestrationRepositoryConfigurationYamlSwapper implements Ya
@Override
public OrchestrationRepositoryConfiguration swapToObject(final YamlOrchestrationRepositoryConfiguration yamlConfiguration) {
- return new OrchestrationRepositoryConfiguration(yamlConfiguration.getInstanceType(), yamlConfiguration.getServerLists(), yamlConfiguration.getNamespace(), yamlConfiguration.getProps());
+ return new OrchestrationRepositoryConfiguration(yamlConfiguration.getType(), yamlConfiguration.getServerLists(), yamlConfiguration.getNamespace(), yamlConfiguration.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 786ab7c..960e3ac 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
@@ -36,7 +36,7 @@ public final class OrchestrationConfigurationYamlSwapperTest {
public void assertSwapToYamlOrchestrationConfiguration() {
OrchestrationConfiguration data = getOrchestrationConfiguration();
YamlOrchestrationConfiguration result = new OrchestrationConfigurationYamlSwapper().swapToYamlConfiguration(data);
- assertThat(result.getRegistryRepositoryConfiguration().getInstanceType(), is(data.getRegistryRepositoryConfiguration().getType()));
+ 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()));
@@ -50,7 +50,7 @@ public final class OrchestrationConfigurationYamlSwapperTest {
public void assertSwapToOrchestrationConfiguration() {
YamlOrchestrationConfiguration data = getYamlOrchestrationConfiguration();
OrchestrationConfiguration result = new OrchestrationConfigurationYamlSwapper().swapToObject(data);
- assertThat(result.getRegistryRepositoryConfiguration().getType(), is(data.getRegistryRepositoryConfiguration().getInstanceType()));
+ 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()));
@@ -58,7 +58,7 @@ public final class OrchestrationConfigurationYamlSwapperTest {
private YamlOrchestrationConfiguration getYamlOrchestrationConfiguration() {
YamlOrchestrationRepositoryConfiguration registryRepositoryConfiguration = new YamlOrchestrationRepositoryConfiguration();
- registryRepositoryConfiguration.setInstanceType("zookeeper");
+ registryRepositoryConfiguration.setType("zookeeper");
registryRepositoryConfiguration.setProps(new Properties());
registryRepositoryConfiguration.setServerLists("127.0.0.1:2181,127.0.0.1:2182");
registryRepositoryConfiguration.setNamespace("orchestration");
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 3a7f313..4e49a42 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
@@ -32,7 +32,7 @@ public final class OrchestrationRepositoryConfigurationYamlSwapperTest {
public void assertToYamlConfiguration() {
OrchestrationRepositoryConfiguration configuration = getConfiguration();
YamlOrchestrationRepositoryConfiguration yamlConfiguration = new OrchestrationRepositoryConfigurationYamlSwapper().swapToYamlConfiguration(configuration);
- assertThat(yamlConfiguration.getInstanceType(), is(configuration.getType()));
+ assertThat(yamlConfiguration.getType(), is(configuration.getType()));
assertThat(yamlConfiguration.getServerLists(), is(configuration.getServerLists()));
assertThat(yamlConfiguration.getNamespace(), is(configuration.getNamespace()));
assertThat(yamlConfiguration.getProps(), is(configuration.getProps()));
@@ -46,7 +46,7 @@ public final class OrchestrationRepositoryConfigurationYamlSwapperTest {
public void assertSwapToObject() {
YamlOrchestrationRepositoryConfiguration yamlConfiguration = getYamlInstanceConfiguration();
OrchestrationRepositoryConfiguration instanceConfiguration = new OrchestrationRepositoryConfigurationYamlSwapper().swapToObject(yamlConfiguration);
- assertThat(instanceConfiguration.getType(), is(yamlConfiguration.getInstanceType()));
+ assertThat(instanceConfiguration.getType(), is(yamlConfiguration.getType()));
assertThat(instanceConfiguration.getServerLists(), is(yamlConfiguration.getServerLists()));
assertThat(instanceConfiguration.getNamespace(), is(yamlConfiguration.getNamespace()));
assertThat(instanceConfiguration.getProps(), is(yamlConfiguration.getProps()));
@@ -54,7 +54,7 @@ public final class OrchestrationRepositoryConfigurationYamlSwapperTest {
private YamlOrchestrationRepositoryConfiguration getYamlInstanceConfiguration() {
YamlOrchestrationRepositoryConfiguration result = new YamlOrchestrationRepositoryConfiguration();
- result.setInstanceType("zookeeper");
+ result.setType("zookeeper");
result.setProps(new Properties());
result.setServerLists("127.0.0.1:2181,127.0.0.1:2182");
result.setNamespace("orchestration");
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 39a1546..9537550 100644
--- a/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/server.yaml
+++ b/shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/resources/conf/server.yaml
@@ -24,7 +24,7 @@
#orchestration:
# name: orchestration_ds
# registryRepositoryConfiguration:
-# instanceType: zookeeper
+# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
# props:
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 791ddae..065b223 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/docker/proxy/conf/server.yaml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/docker/proxy/conf/server.yaml
@@ -24,7 +24,7 @@
#orchestration:
# name: orchestration_ds
# registryRepositoryConfiguration:
-# instanceType: zookeeper
+# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
# props:
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 adf9bd3..5a32a22 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
@@ -37,7 +37,7 @@ public final class YamlInstanceConfigurationSwapperUtilTest {
yamlConfiguration.setRegistryRepositoryConfiguration(yamlOrchestrationRepositoryConfiguration);
OrchestrationConfiguration orchestrationConfiguration = YamlOrchestrationRepositoryConfigurationSwapperUtil.marshal(yamlConfiguration);
OrchestrationRepositoryConfiguration configuration = orchestrationConfiguration.getRegistryRepositoryConfiguration();
- assertEquals(configuration.getType(), yamlOrchestrationRepositoryConfiguration.getInstanceType());
+ assertEquals(configuration.getType(), yamlOrchestrationRepositoryConfiguration.getType());
assertEquals(configuration.getNamespace(), yamlOrchestrationRepositoryConfiguration.getNamespace());
assertEquals(configuration.getServerLists(), yamlOrchestrationRepositoryConfiguration.getServerLists());
assertEquals(configuration.getProps(), yamlOrchestrationRepositoryConfiguration.getProps());
@@ -45,7 +45,7 @@ public final class YamlInstanceConfigurationSwapperUtilTest {
private YamlOrchestrationRepositoryConfiguration getYamlOrchestrationRepositoryConfiguration() {
YamlOrchestrationRepositoryConfiguration yamlConfiguration = new YamlOrchestrationRepositoryConfiguration();
- yamlConfiguration.setInstanceType("zookeeper");
+ yamlConfiguration.setType("zookeeper");
yamlConfiguration.setNamespace("test");
yamlConfiguration.setServerLists("localhost:2181");
yamlConfiguration.setProps(new Properties());
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 80efff5..a490352 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
@@ -48,7 +48,7 @@ rules:
orchestration:
name: test_ms_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_ms_registry
props:
@@ -58,7 +58,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_ms_config
props:
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 b4d0b21..b73209a 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
@@ -48,7 +48,7 @@ rules:
orchestration:
name: test_ms_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_ms_registry
props:
@@ -58,7 +58,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_ms_center
props:
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 cf39331..d421413 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
@@ -87,7 +87,7 @@ rules:
orchestration:
name: test_sharding_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
props:
@@ -97,7 +97,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
props:
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 1239068..fa66cec 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
@@ -87,7 +87,7 @@ rules:
orchestration:
name: test_sharding_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
props:
@@ -97,7 +97,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
props:
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 5840f79..961d2d1 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
@@ -71,7 +71,7 @@ rules:
orchestration:
name: test_sharding_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
props:
@@ -81,7 +81,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
props:
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 3ff8f6e..adcc2d7 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
@@ -73,7 +73,7 @@ rules:
orchestration:
name: test_sharding_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_registry
props:
@@ -83,7 +83,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_config
props:
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 1a0df83..5491e84 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
@@ -121,7 +121,7 @@ rules:
orchestration:
name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -131,7 +131,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
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 fe15eb5..f947817 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
@@ -123,7 +123,7 @@ rules:
orchestration:
name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -133,7 +133,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
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 525dd64..3beefa4 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
@@ -44,7 +44,7 @@ dataSources:
orchestration:
name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -54,7 +54,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
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 db48387..e08d2ff 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
@@ -84,7 +84,7 @@ rules:
orchestration:
name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -94,7 +94,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
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 2e1049d..5128308 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
@@ -88,7 +88,7 @@ rules:
orchestration:
name: test_sharding_ms_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_registry
props:
@@ -98,7 +98,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_sharding_ms_config
props:
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 076eb21..3ec112e 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
@@ -18,7 +18,7 @@
orchestration:
name: test_encrypt_registry_name
registryRepositoryConfiguration:
- instanceType: REG_TEST
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_encrypt_registry
props:
@@ -28,7 +28,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: CONFIG_TEST
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_encrypt_config
props:
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 efea914..b366b8e 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
@@ -18,7 +18,7 @@
orchestration:
name: test_encrypt_registry_name
registryRepositoryConfiguration:
- instanceType: FirstTestRegistryCenter
+ type: REG_TEST
serverLists: localhost:3181
namespace: test_encrypt_registry_no
props:
@@ -28,7 +28,7 @@ orchestration:
maxRetries: 10
operationTimeoutMilliseconds: 10
additionalConfigurationRepositoryConfiguration:
- instanceType: FirstTestConfigCenter
+ type: CONFIG_TEST
serverLists: localhost:3181
namespace: test_encrypt_config_no
props:
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 9f35f0d..8e11fbb 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.instance-type=TestRegistry
+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
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 7439622..d199af6 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.instance-type=TestRegistry
+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
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 9b10a00..ae8562f 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.instance-type=TestRegistry
+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
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 822a159..3b1f577 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.instance-type=TestRegistry
+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
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/constants/InstanceBeanDefinitionTag.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/constants/Instanc [...]
index 5b5e1ea..7b3498c 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/constants/InstanceBeanDefinitionTag.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/constants/InstanceBeanDefinitionTag.java
@@ -28,7 +28,7 @@ public final class InstanceBeanDefinitionTag {
public static final String ROOT_TAG = "instance";
- public static final String TYPE_TAG = "instance-type";
+ public static final String TYPE_TAG = "type";
public static final String SERVER_LISTS_TAG = "server-lists";
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/orchestration.xsd b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/orchestration.xsd
index 1b66c1c..8210989 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/orchestration.xsd
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/main/resources/META-INF/namespace/orchestration.xsd
@@ -38,7 +38,7 @@
<xsd:element ref="beans:props" minOccurs="0" />
</xsd:all>
<xsd:attribute name="id" type="xsd:string" use="required" />
- <xsd:attribute name="instance-type" type="xsd:string" use="required" />
+ <xsd:attribute name="type" type="xsd:string" use="required" />
<xsd:attribute name="server-lists" type="xsd:string" use="required" />
<xsd:attribute name="namespace" type="xsd:string" />
</xsd:complexType>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/encryptOrchestration.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/encryptOrchestration.xml
index 5615ebb..e61e4c1 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/encryptOrchestration.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/encryptOrchestration.xml
@@ -25,7 +25,7 @@
">
<import resource="namespace/encryptDataSourceNamespace.xml" />
- <orchestration:instance id="regCenter" instance-type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
+ <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveOrchestration.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveOrchestration.xml
index 0343f6f..d0725c8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveOrchestration.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/masterSlaveOrchestration.xml
@@ -26,7 +26,7 @@
">
<import resource="namespace/masterSlaveDataSourceNamespace.xml" />
- <orchestration:instance id="regCenter" instance-type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
+ <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml
index 5af84ad..03a4118 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingMasterSlaveOrchestration.xml
@@ -26,7 +26,7 @@
">
<import resource="namespace/shardingMasterSlaveNamespace.xml" />
- <orchestration:instance id="regCenter" instance-type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
+ <orchestration:instance id="regCenter" type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml
index 6ff8451..9d8d7ac 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-namespace/src/test/resources/META-INF/rdb/shardingOrchestration.xml
@@ -34,7 +34,7 @@
<prop key="operation-timeout-milliseconds">1000</prop>
</util:properties>
- <orchestration:instance id="centerRepository" instance-type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
+ <orchestration:instance id="centerRepository" type="TestRegistry" server-lists="localhost:3181" namespace="orchestration-spring-namespace-test">
<props>
<prop key="max-retries">3</prop>
<prop key="operation-timeout-milliseconds">1000</prop>
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
index 52f8f3d..707b4c3 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
@@ -24,7 +24,7 @@
#orchestration:
# name: orchestration_ds
# registryRepositoryConfiguration:
-# instanceType: zookeeper
+# type: zookeeper
# serverLists: localhost:2181
# namespace: orchestration
# props:
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 642b6c4..6d660b1 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/server.yaml
@@ -18,7 +18,7 @@
orchestration:
name: test_name_1
registryRepositoryConfiguration:
- instanceType: zookeeper
+ type: zookeeper
serverLists: localhost:2181
namespace: test_namespace_1
props: