Commit 17289461 authored by terrymanu's avatar terrymanu
Browse files

For #647: refactor MasterSlaveDataSourceFactory

parent 4889d6a3

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/MasterSlaveDataSourceFactory.java

+11 −11
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public final class MasterSlaveDataSourceFactory { 
     */

    public static DataSource createDataSource(final File yamlFile) throws SQLException, IOException {

        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlFile);

        return new MasterSlaveDataSource(config.getDataSources(), config.getMasterSlaveRule().getMasterSlaveRuleConfiguration().build(), config.getMasterSlaveRule().getConfigMap());

        return createDataSource(config.getDataSources(), config.getMasterSlaveRule().getMasterSlaveRuleConfiguration(), config.getMasterSlaveRule().getConfigMap());

    }

    

    /**
@@ -73,15 +73,14 @@ public final class MasterSlaveDataSourceFactory { 
     *

     * <p>One master data source can configure multiple slave data source.</p>

     *

     * @param dataSourceMap data source map

     * @param yamlFile yaml file for master-slave rule configuration without data sources

     * @param yamlBytes yaml bytes for master-slave rule configuration with data sources

     * @return master-slave data source

     * @throws SQLException SQL exception

     * @throws IOException IO exception

     */

    public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final File yamlFile) throws SQLException, IOException {

        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlFile);

        return new MasterSlaveDataSource(dataSourceMap, config.getMasterSlaveRule().getMasterSlaveRuleConfiguration().build(), config.getMasterSlaveRule().getConfigMap());

    public static DataSource createDataSource(final byte[] yamlBytes) throws SQLException, IOException {

        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlBytes);

        return createDataSource(config.getDataSources(), config.getMasterSlaveRule().getMasterSlaveRuleConfiguration(), config.getMasterSlaveRule().getConfigMap());

    }

    

    /**
@@ -89,14 +88,15 @@ public final class MasterSlaveDataSourceFactory { 
     *

     * <p>One master data source can configure multiple slave data source.</p>

     *

     * @param yamlBytes yaml bytes for master-slave rule configuration with data sources

     * @param dataSourceMap data source map

     * @param yamlFile yaml file for master-slave rule configuration without data sources

     * @return master-slave data source

     * @throws SQLException SQL exception

     * @throws IOException IO exception

     */

    public static DataSource createDataSource(final byte[] yamlBytes) throws SQLException, IOException {

        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlBytes);

        return new MasterSlaveDataSource(config.getDataSources(), config.getMasterSlaveRule().getMasterSlaveRuleConfiguration().build(), config.getMasterSlaveRule().getConfigMap());

    public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final File yamlFile) throws SQLException, IOException {

        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlFile);

        return createDataSource(dataSourceMap, config.getMasterSlaveRule().getMasterSlaveRuleConfiguration(), config.getMasterSlaveRule().getConfigMap());

    }

    

    /**
@@ -112,6 +112,6 @@ public final class MasterSlaveDataSourceFactory { 
     */

    public static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final byte[] yamlBytes) throws SQLException, IOException {

        YamlMasterSlaveConfiguration config = YamlMasterSlaveConfiguration.unmarshal(yamlBytes);

        return new MasterSlaveDataSource(dataSourceMap, config.getMasterSlaveRule().getMasterSlaveRuleConfiguration().build(), config.getMasterSlaveRule().getConfigMap());

        return createDataSource(dataSourceMap, config.getMasterSlaveRule().getMasterSlaveRuleConfiguration(), config.getMasterSlaveRule().getConfigMap());

    }

}