Merge pull request #792 from tuohai666/dev

recover proxy config

sharding-core/src/main/java/io/shardingjdbc/core/yaml/sharding/YamlShardingConfigurationForProxy.java

@@ -42,7 +42,7 @@ import java.util.Map;
 @Setter
 public class YamlShardingConfigurationForProxy {
     
-    private Map<String, DataSourceParameter> dataSourceParameters = new HashMap<>();
+    private Map<String, DataSourceParameter> dataSources = new HashMap<>();
     
     private YamlShardingRuleConfiguration shardingRule;
     
@@ -82,6 +82,6 @@ public class YamlShardingConfigurationForProxy {
      * @return sharding rule from yaml
      */
     public ShardingRule getShardingRule(final Collection<String> dataSourceNames) {
-        return new ShardingRule(shardingRule.getShardingRuleConfiguration(), dataSourceNames.isEmpty() ? dataSourceParameters.keySet() : dataSourceNames);
+        return new ShardingRule(shardingRule.getShardingRuleConfiguration(), dataSourceNames.isEmpty() ? dataSources.keySet() : dataSourceNames);
     }
 }

sharding-proxy/src/main/java/io/shardingjdbc/proxy/config/ShardingRuleRegistry.java

@@ -59,7 +59,7 @@ public final class ShardingRuleRegistry {
             throw new ShardingJdbcException(ex);
         }
         dataSourceMap = new HashMap<>(128, 1);
-        Map<String, DataSourceParameter> dataSourceParameters = yamlShardingConfigurationForProxy.getDataSourceParameters();
+        Map<String, DataSourceParameter> dataSourceParameters = yamlShardingConfigurationForProxy.getDataSources();
         for (String each : dataSourceParameters.keySet()) {
             dataSourceMap.put(each, getDataSource(dataSourceParameters.get(each)));
         }