Simply the configuration for orchestration #1335

tristaZero · 2018-10-11T14:03:05Z

Changes proposed in this pull request:

Modify loadMasterSlaveRuleConfiguration()
Modify loadShardingRuleConfiguration()
Modify OrchestrationSpringBootConfiguration
Modify check for loadMasterSlaveRuleConfiguration and loadShardingRuleConfiguration
Modify some tests

…rvice();

coveralls · 2018-10-11T14:28:18Z

Pull Request Test Coverage Report for Build 5337

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationMasterSlaveDataSource.java	0	1	0.0%
sharding-jdbc/sharding-jdbc-orchestration/src/main/java/io/shardingsphere/shardingjdbc/orchestration/internal/datasource/OrchestrationShardingDataSource.java	0	1	0.0%
sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/yaml/YamlOrchestrationConfiguration.java	0	1	0.0%
sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/state/datasource/DataSourceService.java	0	2	0.0%
sharding-orchestration/sharding-orchestration-core/src/main/java/io/shardingsphere/orchestration/internal/config/ConfigurationService.java	0	4	0.0%
sharding-jdbc/sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-boot-starter/src/main/java/io/shardingsphere/shardingjdbc/orchestration/spring/boot/OrchestrationSpringBootConfiguration.java	8	16	50.0%

Files with Coverage Reduction	New Missed Lines	%
sharding-orchestration/sharding-orchestration-reg/src/main/java/io/shardingsphere/orchestration/reg/newzk/client/zookeeper/base/Holder.java	3	70.49%

tristaZero added 23 commits October 11, 2018 18:27

modify dataSource()

6bb9297

add Preconditions.checkState

1ddbe5d

delete type

fc09c20

delete type

a8951a8

modify parser

a879eb7

delete sharding.jdbc.config.orchestration.type for ms

3cc9083

delete sharding.jdbc.config.orchestration.type for sharding

b1b7fc6

add isValidRuleConfiguration()

2f9da60

delete check state

54f4962

add check state

6023285

add check state

fc3c261

delete ms check state

030fbd2

add ms check state

0950664

add ms check state

1268653

add get orchestration type

8d2a943

getOrchestrationTypeByRegistry()

5742746

ConfigurationService configService = orchestrationFacade.getConfigSe…

507ef5f

…rvice();

adjust position

82e164c

use getOrchestrationType

a11f95e

for checkstyle

6e144fc

return new ShardingRuleConfiguration();

dbcfffc

modify RELEASE-NOTES.md

e013026

modify RELEASE-NOTES-ZH.md

65be51d

terrymanu merged commit 53485b5 into apache:dev Oct 11, 2018