Use yaml instead of json for registry center & Support registry center for Proxy.

sharding-core/src/main/java/io/shardingsphere/core/yaml/masterslave/YamlMasterSlaveRuleConfiguration.java

@@ -23,6 +23,7 @@
 import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
 import io.shardingsphere.core.exception.ShardingConfigurationException;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.ArrayList;
@@ -34,7 +35,9 @@
  * Master-slave rule configuration for yaml.
  *
  * @author caohao
+ * @author panjuan
  */
+@NoArgsConstructor
 @Getter
 @Setter
 public class YamlMasterSlaveRuleConfiguration {
@@ -51,6 +54,15 @@ public class YamlMasterSlaveRuleConfiguration {
 
     private Map<String, Object> configMap = new ConcurrentHashMap<>();
 
+    public YamlMasterSlaveRuleConfiguration(final MasterSlaveRuleConfiguration masterSlaveRuleConfiguration, final Map<String, Object> configMap) {
+        name = masterSlaveRuleConfiguration.getName();
+        masterDataSourceName = masterSlaveRuleConfiguration.getMasterDataSourceName();
+        slaveDataSourceNames = masterSlaveRuleConfiguration.getSlaveDataSourceNames();
+        loadBalanceAlgorithmClassName = null == masterSlaveRuleConfiguration.getLoadBalanceAlgorithm()
+                ? null : masterSlaveRuleConfiguration.getLoadBalanceAlgorithm().getClass().getName();
+        this.configMap = configMap;
+    }
+
     /**
      * Get master-slave rule configuration from yaml.
      *

sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlShardingRuleConfiguration.java

@@ -19,13 +19,16 @@
 
 import io.shardingsphere.core.api.config.MasterSlaveRuleConfiguration;
 import io.shardingsphere.core.api.config.ShardingRuleConfiguration;
+import io.shardingsphere.core.api.config.TableRuleConfiguration;
 import io.shardingsphere.core.keygen.KeyGeneratorFactory;
 import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -37,7 +40,9 @@
  * Sharding rule configuration for yaml.
  *
  * @author caohao
+ * @author panjuan
  */
+@NoArgsConstructor
 @Getter
 @Setter
 public class YamlShardingRuleConfiguration {
@@ -60,6 +65,24 @@ public class YamlShardingRuleConfiguration {
 
     private Properties props = new Properties();
 
+    public YamlShardingRuleConfiguration(final ShardingRuleConfiguration shardingRuleConfiguration,
+                                         final Map<String, Object> configMap, final Properties props) {
+        defaultDataSourceName = shardingRuleConfiguration.getDefaultDataSourceName();
+        for (TableRuleConfiguration each : shardingRuleConfiguration.getTableRuleConfigs()) {
+            tables.put(each.getLogicTable(), new YamlTableRuleConfiguration(each));
+        }
+        bindingTables.addAll(shardingRuleConfiguration.getBindingTableGroups());
+        defaultDatabaseStrategy = new YamlShardingStrategyConfiguration(shardingRuleConfiguration.getDefaultDatabaseShardingStrategyConfig());
+        defaultTableStrategy = new YamlShardingStrategyConfiguration(shardingRuleConfiguration.getDefaultTableShardingStrategyConfig());
+        defaultKeyGeneratorClassName = null == shardingRuleConfiguration.getDefaultKeyGenerator()
+                ? null : shardingRuleConfiguration.getDefaultKeyGenerator().getClass().getName();
+        for (MasterSlaveRuleConfiguration each : shardingRuleConfiguration.getMasterSlaveRuleConfigs()) {
+            masterSlaveRules.put(each.getName(), new YamlMasterSlaveRuleConfiguration(each, new HashMap<String, Object>()));
+        }
+        this.configMap = configMap;
+        this.props = props;
+    }
+
     /**
      * Get sharding rule configuration.
      *

sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlShardingStrategyConfiguration.java

@@ -35,13 +35,16 @@
 import io.shardingsphere.core.yaml.sharding.strategy.YamlNoneShardingStrategyConfiguration;
 import io.shardingsphere.core.yaml.sharding.strategy.YamlStandardShardingStrategyConfiguration;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
  * Configuration for yaml sharding strategy.
  *
  * @author caohao
+ * @author panjuan
  */
+@NoArgsConstructor
 @Getter
 @Setter
 public class YamlShardingStrategyConfiguration {
@@ -56,6 +59,33 @@ public class YamlShardingStrategyConfiguration {
 
     private YamlNoneShardingStrategyConfiguration none;
 
+    public YamlShardingStrategyConfiguration(final ShardingStrategyConfiguration shardingStrategyConfiguration) {
+        if (shardingStrategyConfiguration instanceof StandardShardingStrategyConfiguration) {
+            standard = new YamlStandardShardingStrategyConfiguration();
+            StandardShardingStrategyConfiguration config = (StandardShardingStrategyConfiguration) shardingStrategyConfiguration;
+            standard.setShardingColumn(config.getShardingColumn());
+            standard.setPreciseAlgorithmClassName(config.getPreciseShardingAlgorithm().getClass().getName());
+            standard.setRangeAlgorithmClassName(null == config.getRangeShardingAlgorithm()
+                    ? null : config.getRangeShardingAlgorithm().getClass().getName());
+        }
+        if (shardingStrategyConfiguration instanceof ComplexShardingStrategyConfiguration) {
+            complex = new YamlComplexShardingStrategyConfiguration();
+            ComplexShardingStrategyConfiguration config = (ComplexShardingStrategyConfiguration) shardingStrategyConfiguration;
+            complex.setShardingColumns(config.getShardingColumns());
+            complex.setAlgorithmClassName(config.getShardingAlgorithm().getClass().getName());
+        }
+        if (shardingStrategyConfiguration instanceof HintShardingStrategyConfiguration) {
+            hint = new YamlHintShardingStrategyConfiguration();
+            hint.setAlgorithmClassName(((HintShardingStrategyConfiguration) shardingStrategyConfiguration).getShardingAlgorithm().getClass().getName());
+        }
+        if (shardingStrategyConfiguration instanceof InlineShardingStrategyConfiguration) {
+            inline = new YamlInlineShardingStrategyConfiguration();
+            InlineShardingStrategyConfiguration config = (InlineShardingStrategyConfiguration) shardingStrategyConfiguration;
+            inline.setShardingColumn(config.getShardingColumn());
+            inline.setAlgorithmExpression(config.getAlgorithmExpression());
+        }
+    }
+
     /**
      * Build sharding strategy configuration.
      * 

sharding-core/src/main/java/io/shardingsphere/core/yaml/sharding/YamlTableRuleConfiguration.java

@@ -22,13 +22,16 @@
 import io.shardingsphere.core.api.config.TableRuleConfiguration;
 import io.shardingsphere.core.keygen.KeyGeneratorFactory;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
  * Yaml table rule configuration.
  *
  * @author caohao
+ * @author panjuan
  */
+@NoArgsConstructor
 @Getter
 @Setter
 public class YamlTableRuleConfiguration {
@@ -47,6 +50,17 @@ public class YamlTableRuleConfiguration {
 
     private String logicIndex;
 
+    public YamlTableRuleConfiguration(final TableRuleConfiguration tableRuleConfiguration) {
+        logicTable = tableRuleConfiguration.getLogicTable();
+        actualDataNodes = tableRuleConfiguration.getActualDataNodes();
+        databaseStrategy = new YamlShardingStrategyConfiguration(tableRuleConfiguration.getDatabaseShardingStrategyConfig());
+        tableStrategy = new YamlShardingStrategyConfiguration(tableRuleConfiguration.getTableShardingStrategyConfig());
+        keyGeneratorColumnName = tableRuleConfiguration.getKeyGeneratorColumnName();
+        keyGeneratorClassName = null == tableRuleConfiguration.getKeyGenerator()
+                ? null : tableRuleConfiguration.getKeyGenerator().getClass().getName();
+        logicTable = tableRuleConfiguration.getLogicTable();
+    }
+
     /**
      * Build table rule configuration.
      *

sharding-jdbc-orchestration/pom.xml

@@ -21,7 +21,11 @@
             <artifactId>sharding-jdbc</artifactId>
             <version>${sharding-sphere.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-core</artifactId>
+            <version>${sharding-sphere.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationFacade.java

@@ -48,6 +48,7 @@
  *
  * @author zhangliang
  * @author caohao
+ * @author panjuan
  */
 @Slf4j
 public final class OrchestrationFacade implements AutoCloseable {
@@ -129,6 +130,18 @@ public void init(final Map<String, DataSource> dataSourceMap, final MasterSlaveR
         listenerManager.initMasterSlaveListeners(masterSlaveDataSource);
     }
 
+    /**
+     * Initialize for proxy orchestration.
+     *
+     * @param orchestrationProxyConfiguration yaml proxy configuration
+     */
+    public void init(final OrchestrationProxyConfiguration orchestrationProxyConfiguration) {
+        configService.persistProxyConfiguration(orchestrationProxyConfiguration, isOverwrite);
+        instanceStateService.persistProxyInstanceOnline();
+        dataSourceService.persistDataSourcesNode();
+        listenerManager.initProxyListeners();
+    }
+
     private void reviseShardingRuleConfigurationForMasterSlave(final Map<String, DataSource> dataSourceMap, final ShardingRuleConfiguration shardingRuleConfig) {
         for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
             if (entry.getValue() instanceof MasterSlaveDataSource) {

sharding-jdbc-orchestration/src/main/java/io/shardingsphere/jdbc/orchestration/internal/OrchestrationProxyConfiguration.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2016-2018 shardingsphere.io.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * </p>
+ */
+
+package io.shardingsphere.jdbc.orchestration.internal;
+
+import io.shardingsphere.core.rule.DataSourceParameter;
+import io.shardingsphere.core.rule.ProxyAuthority;
+import io.shardingsphere.core.yaml.masterslave.YamlMasterSlaveRuleConfiguration;
+import io.shardingsphere.core.yaml.sharding.YamlShardingRuleConfiguration;
+import io.shardingsphere.jdbc.orchestration.yaml.YamlOrchestrationConfiguration;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Orchestration proxy configuration.
+ *
+ * @author panjuan
+ */
+@Getter
+@Setter
+public class OrchestrationProxyConfiguration {
+
+    private Map<String, DataSourceParameter> dataSources = new HashMap<>();
+
+    private YamlMasterSlaveRuleConfiguration masterSlaveRule = new YamlMasterSlaveRuleConfiguration();
+
+    private YamlShardingRuleConfiguration shardingRule = new YamlShardingRuleConfiguration();
+
+    private ProxyAuthority proxyAuthority = new ProxyAuthority();
+
+    private boolean withoutJdbc;
+
+    private String transactionMode;
+
+    private int maxWorkingThreads;
+
+    private YamlOrchestrationConfiguration orchestration;
+}