Refactor orchestration yaml configuration.

sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/yaml/YamlOrchestrationConfiguration.java

@@ -18,7 +18,8 @@
 package io.shardingjdbc.orchestration.yaml;
 
 import io.shardingjdbc.orchestration.api.config.OrchestrationConfiguration;
-import io.shardingjdbc.orchestration.reg.api.RegistryCenterConfiguration;
+import io.shardingjdbc.orchestration.reg.etcd.EtcdConfiguration;
+import io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -33,7 +34,9 @@ public class YamlOrchestrationConfiguration {
     
     private String name;
     
-    private RegistryCenterConfiguration registryCenter;
+    private EtcdConfiguration etcd;
+    
+    private ZookeeperConfiguration zookeeper;
     
     private boolean overwrite;
     
@@ -43,6 +46,6 @@ public class YamlOrchestrationConfiguration {
      * @return orchestration master-slave rule configuration from yaml
      */
     public OrchestrationConfiguration getOrchestrationConfiguration() {
-        return new OrchestrationConfiguration(getName(), registryCenter, overwrite);
+        return new OrchestrationConfiguration(getName(), null != etcd ? etcd : zookeeper, overwrite);
     }
 }

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/ms/configWithMasterSlaveDataSourceWithoutProps.yaml

@@ -28,6 +28,6 @@ masterSlaveRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper: 
     namespace: orchestration-yaml-test
     serverLists: localhost:3181

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithProps.yaml

@@ -58,6 +58,6 @@ shardingRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper:
     namespace: orchestration-yaml-test
     serverLists: localhost:3181

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithDataSourceWithoutProps.yaml

@@ -55,6 +55,6 @@ shardingRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper:
     namespace: orchestration-yaml-test
     serverLists: localhost:3181

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithProps.yaml

@@ -44,6 +44,6 @@ shardingRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper:
     namespace: orchestration-yaml-test
     serverLists: localhost:3181

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding/configWithoutDataSourceWithoutProps.yaml

@@ -39,6 +39,6 @@ shardingRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper:
     namespace: orchestration-yaml-test
     serverLists: localhost:3181

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithProps.yaml

@@ -83,6 +83,6 @@ shardingRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper:
     namespace: orchestration-yaml-test
     serverLists: localhost:3181

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithDataSourceWithoutProps.yaml

@@ -81,6 +81,6 @@ shardingRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper:
     namespace: orchestration-yaml-test
     serverLists: localhost:3181

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithProps.yaml

@@ -54,6 +54,6 @@ shardingRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper:
     namespace: orchestration-yaml-test
     serverLists: localhost:3181

sharding-jdbc-orchestration/src/test/resources/yaml/integrate/sharding_ms/configWithoutDataSourceWithoutProps.yaml

@@ -54,6 +54,6 @@ shardingRule:
 orchestration:
   name: demo_ds_ms
   overwrite: true
-  registryCenter: !!io.shardingjdbc.orchestration.reg.zookeeper.ZookeeperConfiguration
+  zookeeper:
     namespace: orchestration-yaml-test
     serverLists: localhost:3181