Unverified Commit 48b9c1ac authored by 张亮's avatar 张亮 Committed by GitHub
Browse files

Merge pull request #18 from ma-xiao-guang-64/dev 

增加从注册中心获取配置创建datasource的测试用例
parents 91e4a359 638aaea7

sharding-jdbc-orchestration-example/sharding-jdbc-orchestration-etcd-java-example/src/main/java/io/shardingjdbc/example/orchestration/OrchestrationEtcdMasterSlaveMain.java

+12 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ public final class OrchestrationEtcdMasterSlaveMain { 
    // CHECKSTYLE:OFF

    public static void main(final String[] args) throws IOException, SQLException {

    // CHECKSTYLE:ON

        DataSource dataSource = OrchestrationMasterSlaveDataSourceFactory.createDataSource(

                createDataSourceMap(), crateMasterSlaveRuleConfig(), new ConcurrentHashMap<String, Object>(), new OrchestrationConfiguration("orchestration-master-slave-data-source", getRegistryCenterConfiguration(), false));

        DataSource dataSource = getDataSourceByLocalConfig();

//        DataSource dataSource = getDataSourceByCloudConfig();

        createTable(dataSource);

        insertData(dataSource);

        printSimpleSelect(dataSource);
@@ -57,6 +57,16 @@ public final class OrchestrationEtcdMasterSlaveMain { 
        OrchestrationDataSourceCloseableUtil.closeQuietly(dataSource);

    }

    

    private static DataSource getDataSourceByLocalConfig() throws SQLException {

        return OrchestrationMasterSlaveDataSourceFactory.createDataSource(

                createDataSourceMap(), crateMasterSlaveRuleConfig(), new ConcurrentHashMap<String, Object>(), new OrchestrationConfiguration("orchestration-master-slave-data-source", getRegistryCenterConfiguration(), true, OrchestrationConfiguration.MASTER_SLAVE));

    }

    

    private static DataSource getDataSourceByCloudConfig() throws SQLException {

        return OrchestrationMasterSlaveDataSourceFactory.createDataSource(

                null, null, null, new OrchestrationConfiguration("orchestration-master-slave-data-source", getRegistryCenterConfiguration(), false, OrchestrationConfiguration.MASTER_SLAVE));

    }

    

    private static RegistryCenterConfiguration getRegistryCenterConfiguration() {

        EtcdConfiguration result = new EtcdConfiguration();

        result.setServerLists(ETCD_CONNECTION_STRING);

sharding-jdbc-orchestration-example/sharding-jdbc-orchestration-etcd-java-example/src/main/java/io/shardingjdbc/example/orchestration/OrchestrationEtcdShardingMain.java

+12 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ public final class OrchestrationEtcdShardingMain { 
    // CHECKSTYLE:OFF

    public static void main(final String[] args) throws IOException, SQLException {

    // CHECKSTYLE:ON

        DataSource dataSource = OrchestrationShardingDataSourceFactory.createDataSource(

            createDataSourceMap(), createShardingRuleConfig(), new ConcurrentHashMap<String, Object>(), new Properties(), new OrchestrationConfiguration("orchestration-sharding-data-source", getRegistryCenterConfiguration(), false));

        DataSource dataSource = getDataSourceByLocalConfig();

//        DataSource dataSource = getDataSourceByCloudConfig();

        createTable(dataSource);

        insertData(dataSource);

        printSimpleSelect(dataSource);
@@ -61,6 +61,16 @@ public final class OrchestrationEtcdShardingMain { 
        OrchestrationDataSourceCloseableUtil.closeQuietly(dataSource);

    }

    

    private static DataSource getDataSourceByLocalConfig() throws SQLException {

        return OrchestrationShardingDataSourceFactory.createDataSource(

                createDataSourceMap(), createShardingRuleConfig(), new ConcurrentHashMap<String, Object>(), new Properties(), new OrchestrationConfiguration("orchestration-sharding-data-source", getRegistryCenterConfiguration(), true, OrchestrationConfiguration.SHARDING));

    }

    

    private static DataSource getDataSourceByCloudConfig() throws SQLException {

        return OrchestrationShardingDataSourceFactory.createDataSource(

                null, null, null, null, new OrchestrationConfiguration("orchestration-sharding-data-source", getRegistryCenterConfiguration(), false, OrchestrationConfiguration.SHARDING));

    }

    

    private static RegistryCenterConfiguration getRegistryCenterConfiguration() {

        EtcdConfiguration result = new EtcdConfiguration();

        result.setServerLists(ETCD_CONNECTION_STRING);

sharding-jdbc-orchestration-example/sharding-jdbc-orchestration-etcd-java-example/src/main/java/io/shardingjdbc/example/orchestration/OrchestrationEtcdShardingMasterSlaveMain.java

+12 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ public final class OrchestrationEtcdShardingMasterSlaveMain { 
    // CHECKSTYLE:OFF

    public static void main(final String[] args) throws IOException, SQLException {

        // CHECKSTYLE:ON

        DataSource dataSource = OrchestrationShardingDataSourceFactory.createDataSource(

                createDataSourceMap(), createShardingRuleConfig(), new ConcurrentHashMap<String, Object>(), new Properties(), new OrchestrationConfiguration("orchestration-sharding-master-slave-data-source", getRegistryCenterConfiguration(), false));

        DataSource dataSource = getDataSourceByLocalConfig();

//        DataSource dataSource = getDataSourceByCloudConfig();

        createTable(dataSource);

        insertData(dataSource);

        printSimpleSelect(dataSource);
@@ -65,6 +65,16 @@ public final class OrchestrationEtcdShardingMasterSlaveMain { 
        OrchestrationDataSourceCloseableUtil.closeQuietly(dataSource);

    }

    

    private static DataSource getDataSourceByLocalConfig() throws SQLException {

        return OrchestrationShardingDataSourceFactory.createDataSource(

                createDataSourceMap(), createShardingRuleConfig(), new ConcurrentHashMap<String, Object>(), new Properties(), new OrchestrationConfiguration("orchestration-sharding-master-slave-data-source", getRegistryCenterConfiguration(), true, OrchestrationConfiguration.SHARDING));

    }

    

    private static DataSource getDataSourceByCloudConfig() throws SQLException {

        return OrchestrationShardingDataSourceFactory.createDataSource(

                null, null, null, null, new OrchestrationConfiguration("orchestration-sharding-master-slave-data-source", getRegistryCenterConfiguration(), false, OrchestrationConfiguration.SHARDING));

    }

    

    private static RegistryCenterConfiguration getRegistryCenterConfiguration() {

        EtcdConfiguration result = new EtcdConfiguration();

        result.setServerLists(ETCD_CONNECTION_STRING);

sharding-jdbc-orchestration-example/sharding-jdbc-orchestration-etcd-yaml-example/src/main/java/io/shardingjdbc/example/orchestration/yaml/OrchestrationEtcdYamlMasterSlaveMain.java

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ public final class OrchestrationEtcdYamlMasterSlaveMain { 
    public static void main(final String[] args) throws Exception {

    // CHECKSTYLE:ON

        DataSource dataSource = OrchestrationMasterSlaveDataSourceFactory.createDataSource(new File(

                OrchestrationEtcdYamlMasterSlaveMain.class.getResource("/META-INF/yamlMasterSlave.yaml").getFile()));

                OrchestrationEtcdYamlMasterSlaveMain.class.getResource("/META-INF/yamlMasterSlaveByLocalConfig.yaml").getFile()));

//        DataSource dataSource = OrchestrationMasterSlaveDataSourceFactory.createDataSource(new File(

//                OrchestrationEtcdYamlMasterSlaveMain.class.getResource("/META-INF/yamlMasterSlaveByCloudConfig.yaml").getFile()));

        new OrchestrationYamlRepository(dataSource).demo();

        OrchestrationDataSourceCloseableUtil.closeQuietly(dataSource);

    }

sharding-jdbc-orchestration-example/sharding-jdbc-orchestration-etcd-yaml-example/src/main/java/io/shardingjdbc/example/orchestration/yaml/OrchestrationEtcdYamlShardingAndMasterSlaveMain.java

+3 −1
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ public final class OrchestrationEtcdYamlShardingAndMasterSlaveMain { 
    // CHECKSTYLE:OFF

    public static void main(final String[] args) throws Exception {

    // CHECKSTYLE:ON

//        DataSource dataSource = OrchestrationShardingDataSourceFactory.createDataSource(new File(

//                OrchestrationEtcdYamlShardingAndMasterSlaveMain.class.getResource("/META-INF/yamlShardingAndMasterSlaveByLocalConfig.yaml").getFile()));

        DataSource dataSource = OrchestrationShardingDataSourceFactory.createDataSource(new File(

                OrchestrationEtcdYamlShardingAndMasterSlaveMain.class.getResource("/META-INF/yamlShardingAndMasterSlave.yaml").getFile()));

                OrchestrationEtcdYamlShardingAndMasterSlaveMain.class.getResource("/META-INF/yamlShardingAndMasterSlaveByCloudConfig.yaml").getFile()));

        new OrchestrationYamlRepository(dataSource).demo();

        OrchestrationDataSourceCloseableUtil.closeQuietly(dataSource);

    }