Add configuration map support 5th.

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/core/datasource/ShardingDataSource.java

@@ -50,7 +50,9 @@ public class ShardingDataSource extends AbstractDataSourceAdapter implements Aut
     
     public ShardingDataSource(final ShardingRule shardingRule, final Map<String, Object> configMap, final Properties props) throws SQLException {
         super(shardingRule.getDataSourceMap().values());
-        ConfigMapContext.getInstance().getConfigMap().putAll(configMap);
+        if (!configMap.isEmpty()) {
+            ConfigMapContext.getInstance().getConfigMap().putAll(configMap);
+        }
         shardingProperties = new ShardingProperties(null == props ? new Properties() : props);
         int executorSize = shardingProperties.getValue(ShardingPropertiesConstant.EXECUTOR_SIZE);
         executorEngine = new ExecutorEngine(executorSize);

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/resources/application-masterslave.properties

@@ -5,14 +5,14 @@ sharding.jdbc.datasource.ds_master.driver-class-name=org.h2.Driver
 sharding.jdbc.datasource.ds_master.url=jdbc:h2:mem:ds_master;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
 sharding.jdbc.datasource.ds_master.username=root
 sharding.jdbc.datasource.ds_master.password=
-sharding.jdbc.datasource.ds_master.maxActive=16
+sharding.jdbc.datasource.ds_master.max-active=16
 
 sharding.jdbc.datasource.ds_slave_0.type=org.apache.commons.dbcp.BasicDataSource
 sharding.jdbc.datasource.ds_slave_0.driver-class-name=org.h2.Driver
 sharding.jdbc.datasource.ds_slave_0.url=jdbc:h2:mem:demo_ds_slave_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
 sharding.jdbc.datasource.ds_slave_0.username=root
 sharding.jdbc.datasource.ds_slave_0.password=
-sharding.jdbc.datasource.ds_slave_0.maxActive=16
+sharding.jdbc.datasource.ds_slave_0.max-active=16
 
 sharding.jdbc.datasource.ds_slave_1.type=org.apache.commons.dbcp.BasicDataSource
 sharding.jdbc.datasource.ds_slave_1.driver-class-name=org.h2.Driver
@@ -22,7 +22,7 @@ sharding.jdbc.datasource.ds_slave_1.password=
 sharding.jdbc.datasource.ds_slave_1.maxActive=16
 
 sharding.jdbc.config.masterslave.name=ds_ms
-sharding.jdbc.config.masterslave.masterDataSourceName=ds_master
-sharding.jdbc.config.masterslave.slaveDataSourceNames=ds_slave_0,ds_slave_1
+sharding.jdbc.config.masterslave.master-data-source-name=ds_master
+sharding.jdbc.config.masterslave.slave-data-source-names=ds_slave_0,ds_slave_1
 
 sharding.jdbc.config.masterslave.data.key1=value1

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/resources/application-sharding.properties

@@ -11,26 +11,26 @@ sharding.jdbc.datasource.ds_0.driver-class-name=org.h2.Driver
 sharding.jdbc.datasource.ds_0.url=jdbc:h2:mem:ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
 sharding.jdbc.datasource.ds_0.username=sa
 sharding.jdbc.datasource.ds_0.password=
-sharding.jdbc.datasource.ds_0.maxActive=16
+sharding.jdbc.datasource.ds_0.max-active=16
 
 sharding.jdbc.datasource.ds_1.type=org.apache.commons.dbcp.BasicDataSource
 sharding.jdbc.datasource.ds_1.driver-class-name=com.mysql.jdbc.Driver
 sharding.jdbc.datasource.ds_1.url=jdbc:h2:mem:ds_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
 sharding.jdbc.datasource.ds_1.username=sa
 sharding.jdbc.datasource.ds_1.password=
-sharding.jdbc.datasource.ds_1.maxActive=16
+sharding.jdbc.datasource.ds_1.max-active=16
 
 sharding.jdbc.config.sharding.default-data-source-name=ds
 sharding.jdbc.config.sharding.default-database-strategy.inline.sharding-column=user_id
 sharding.jdbc.config.sharding.default-database-strategy.inline.algorithm-expression=ds_${user_id % 2}
-sharding.jdbc.config.sharding.tables.t_order.actualDataNodes=ds_${0..1}.t_order_${0..1}
-sharding.jdbc.config.sharding.tables.t_order.tableStrategy.inline.shardingColumn=order_id
-sharding.jdbc.config.sharding.tables.t_order.tableStrategy.inline.algorithmExpression=t_order_${order_id % 2}
-sharding.jdbc.config.sharding.tables.t_order.keyGeneratorColumnName=order_id
-sharding.jdbc.config.sharding.tables.t_order_item.actualDataNodes=ds_${0..1}.t_order_item_${0..1}
-sharding.jdbc.config.sharding.tables.t_order_item.tableStrategy.inline.shardingColumn=order_id
-sharding.jdbc.config.sharding.tables.t_order_item.tableStrategy.inline.algorithmExpression=t_order_item_${order_id % 2}
-sharding.jdbc.config.sharding.tables.t_order_item.keyGeneratorColumnName=order_item_id
+sharding.jdbc.config.sharding.tables.t_order.actual-data-nodes=ds_${0..1}.t_order_${0..1}
+sharding.jdbc.config.sharding.tables.t_order.table-strategy.inline.sharding-column=order_id
+sharding.jdbc.config.sharding.tables.t_order.table-strategy.inline.algorithm-expression=t_order_${order_id % 2}
+sharding.jdbc.config.sharding.tables.t_order.key-generator-column-name=order_id
+sharding.jdbc.config.sharding.tables.t_order_item.actual-data-nodes=ds_${0..1}.t_order_item_${0..1}
+sharding.jdbc.config.sharding.tables.t_order_item.table-strategy.inline.sharding-column=order_id
+sharding.jdbc.config.sharding.tables.t_order_item.table-strategy.inline.algorithm-expression=t_order_item_${order_id % 2}
+sharding.jdbc.config.sharding.tables.t_order_item.key-generator-column-name=order_item_id
 
 sharding.jdbc.config.sharding.props.sql.show=true
 sharding.jdbc.config.sharding.props.executor.size=100