add props for spring boot starter

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/SpringBootConfiguration.java

 package io.shardingjdbc.spring.boot;
 
+import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import io.shardingjdbc.core.api.MasterSlaveDataSourceFactory;
 import io.shardingjdbc.core.api.ShardingDataSourceFactory;
+import io.shardingjdbc.core.constant.ShardingPropertiesConstant;
+import io.shardingjdbc.core.exception.ShardingJdbcException;
+import io.shardingjdbc.core.util.DataSourceUtil;
 import io.shardingjdbc.spring.boot.masterslave.SpringBootMasterSlaveRuleConfigurationProperties;
 import io.shardingjdbc.spring.boot.sharding.SpringBootShardingRuleConfigurationProperties;
-import io.shardingjdbc.spring.boot.util.EnvironmentAwareUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.bind.RelaxedPropertyResolver;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.Bean;
@@ -16,6 +21,7 @@ import javax.sql.DataSource;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 
 /**
  * Spring boot sharding and master-slave configuration.
@@ -32,16 +38,46 @@ public class SpringBootConfiguration implements EnvironmentAware {
     @Autowired
     private SpringBootMasterSlaveRuleConfigurationProperties masterSlaveProperties;
     
-    private Map<String, DataSource> dataSourceMap = new HashMap<>();
+    private final Map<String, DataSource> dataSourceMap = new HashMap<>();
+    
+    private final Properties props = new Properties();
     
     @Bean
     public DataSource dataSource() throws SQLException {
-        return null == masterSlaveProperties.getMasterDataSourceName() ? ShardingDataSourceFactory.createDataSource(dataSourceMap, shardingProperties.getShardingRuleConfiguration())
+        return null == masterSlaveProperties.getMasterDataSourceName() ? ShardingDataSourceFactory.createDataSource(dataSourceMap, shardingProperties.getShardingRuleConfiguration(), props)
                 : MasterSlaveDataSourceFactory.createDataSource(dataSourceMap, masterSlaveProperties.getMasterSlaveRuleConfiguration());
     }
     
     @Override
     public void setEnvironment(final Environment environment) {
-        EnvironmentAwareUtil.setDataSourceMap(dataSourceMap, environment);
+        setDataSourceMap(environment);
+        setShardingProperties(environment);
+    }
+    
+    private void setDataSourceMap(final Environment environment) {
+        RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(environment, "sharding.jdbc.datasource.");
+        String dataSources = propertyResolver.getProperty("names");
+        for (String each : dataSources.split(",")) {
+            try {
+                Map<String, Object> dataSourceProps = propertyResolver.getSubProperties(each + ".");
+                Preconditions.checkState(!dataSourceProps.isEmpty(), "Wrong datasource properties!");
+                DataSource dataSource = DataSourceUtil.getDataSource(dataSourceProps.get("type").toString(), dataSourceProps);
+                dataSourceMap.put(each, dataSource);
+            } catch (final ReflectiveOperationException ex) {
+                throw new ShardingJdbcException("Can't find datasource type!", ex);
+            }
+        }
+    }
+    
+    private void setShardingProperties(final Environment environment) {
+        RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(environment, "sharding.jdbc.config.sharding.props.");
+        String showSQL = propertyResolver.getProperty(ShardingPropertiesConstant.SQL_SHOW.getKey());
+        if (!Strings.isNullOrEmpty(showSQL)) {
+            props.setProperty(ShardingPropertiesConstant.SQL_SHOW.getKey(), showSQL);
+        }
+        String executorSize = propertyResolver.getProperty(ShardingPropertiesConstant.EXECUTOR_SIZE.getKey());
+        if (!Strings.isNullOrEmpty(executorSize)) {
+            props.setProperty(ShardingPropertiesConstant.EXECUTOR_SIZE.getKey(), executorSize);
+        }
     }
 }

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/util/EnvironmentAwareUtil.java

-package io.shardingjdbc.spring.boot.util;
-
-import com.google.common.base.Preconditions;
-import io.shardingjdbc.core.exception.ShardingJdbcException;
-import io.shardingjdbc.core.util.DataSourceUtil;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.core.env.Environment;
-
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * Sharding jdbc spring boot environment aware util.
- *
- * @author caohao
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class EnvironmentAwareUtil {
-    
-    /**
-     * Set data source map.
-     * 
-     * @param dataSourceMap data source map
-     * @param environment environment for spring boot
-     */
-    public static void setDataSourceMap(final Map<String, DataSource> dataSourceMap, final Environment environment) {
-        RelaxedPropertyResolver propertyResolver = new RelaxedPropertyResolver(environment, "sharding.jdbc.datasource.");
-        String dataSources = propertyResolver.getProperty("names");
-        for (String each : dataSources.split(",")) {
-            try {
-                Map<String, Object> dataSourceProps = propertyResolver.getSubProperties(each + ".");
-                Preconditions.checkState(!dataSourceProps.isEmpty(), "Wrong datasource properties!");
-                DataSource dataSource = DataSourceUtil.getDataSource(dataSourceProps.get("type").toString(), dataSourceProps);
-                dataSourceMap.put(each, dataSource);
-            } catch (final ReflectiveOperationException ex) {
-                throw new ShardingJdbcException("Can't find datasource type!", ex);
-            }
-        }
-    }
-}

sharding-jdbc-spring/sharding-jdbc-spring-boot-starter/src/test/java/io.shardingjdbc.spring.boot/type/SpringBootShardingTest.java

@@ -36,5 +36,6 @@ public class SpringBootShardingTest {
         for (DataSource each : shardingContext.getShardingRule().getDataSourceMap().values()) {
             assertThat(((BasicDataSource) each).getMaxActive(), is(16));
         }
+        assertTrue(shardingContext.isShowSQL());
     }
 }

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

@@ -31,3 +31,6 @@ sharding.jdbc.config.sharding.tables.t_order_item.actualDataNodes=ds_${0..1}.t_o
 sharding.jdbc.config.sharding.tables.t_order_item.tableStrategy.inline.shardingColumn=order_id
 sharding.jdbc.config.sharding.tables.t_order_item.tableStrategy.inline.algorithmInlineExpression=t_order_item_${order_id % 2}
 sharding.jdbc.config.sharding.tables.t_order_item.keyGeneratorColumnName=order_item_id
+
+sharding.jdbc.config.sharding.props.sql.show=true
+sharding.jdbc.config.sharding.props.executor.size=100