Merge pull request #101 from kazuki43zoo/configuration-properties

Add configurationProperties on MybatisProperties

Author: kazuki43zoo

mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfiguration.java

@@ -117,6 +117,9 @@ public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Excepti
       factory.setConfigLocation(this.resourceLoader.getResource(this.properties.getConfigLocation()));
     }
     factory.setConfiguration(properties.getConfiguration());
+    if (this.properties.getConfigurationProperties() != null) {
+      factory.setConfigurationProperties(this.properties.getConfigurationProperties());
+    }
     if (!ObjectUtils.isEmpty(this.interceptors)) {
       factory.setPlugins(this.interceptors);
     }

mybatis-spring-boot-autoconfigure/src/main/java/org/mybatis/spring/boot/autoconfigure/MybatisProperties.java

@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Properties;
 
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.ExecutorType;
@@ -69,6 +70,11 @@ public class MybatisProperties {
    */
   private ExecutorType executorType;
 
+  /**
+   * Global properties for configuration.
+   */
+  private Properties configurationProperties;
+
   /**
    * A Configuration object for customize default settings. If {@link #configLocation}
    * is specified, this property is not used.
@@ -142,6 +148,14 @@ public void setExecutorType(ExecutorType executorType) {
     this.executorType = executorType;
   }
 
+  public Properties getConfigurationProperties() {
+    return configurationProperties;
+  }
+
+  public void setConfigurationProperties(Properties configurationProperties) {
+    this.configurationProperties = configurationProperties;
+  }
+
   public Configuration getConfiguration() {
     return configuration;
   }

mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/MybatisAutoConfigurationTest.java

@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
 
 import java.math.BigInteger;
 import java.util.Map;
@@ -407,6 +408,77 @@ public void testConfigFileAndConfigurationWithTogether() {
 		this.context.refresh();
 	}
 
+	@Test
+	public void testWithoutConfigurationVariablesAndProperties() {
+		EnvironmentTestUtils.addEnvironment(this.context);
+		this.context.register(EmbeddedDataSourceConfiguration.class,
+				MybatisAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+
+		Properties variables = this.context.getBean(SqlSessionFactory.class).getConfiguration().getVariables();
+		assertNull(variables);
+	}
+
+	@Test
+	public void testWithConfigurationVariablesOnly() {
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"mybatis.configuration.variables.key1:value1");
+		this.context.register(EmbeddedDataSourceConfiguration.class,
+				MybatisAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+
+		Properties variables = this.context.getBean(SqlSessionFactory.class).getConfiguration().getVariables();
+		assertEquals(1, variables.size());
+		assertEquals("value1", variables.get("key1"));
+	}
+
+	@Test
+	public void testWithConfigurationPropertiesOnly() {
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"mybatis.configuration-properties.key2:value2");
+		this.context.register(EmbeddedDataSourceConfiguration.class,
+				MybatisAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+
+		Properties variables = this.context.getBean(SqlSessionFactory.class).getConfiguration().getVariables();
+		assertEquals(1, variables.size());
+		assertEquals("value2", variables.get("key2"));
+	}
+
+	@Test
+	public void testWithConfigurationVariablesAndPropertiesOtherKey() {
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"mybatis.configuration.variables.key1:value1",
+				"mybatis.configuration-properties.key2:value2");
+		this.context.register(EmbeddedDataSourceConfiguration.class,
+				MybatisAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+
+		Properties variables = this.context.getBean(SqlSessionFactory.class).getConfiguration().getVariables();
+		assertEquals(2, variables.size());
+		assertEquals("value1", variables.get("key1"));
+		assertEquals("value2", variables.get("key2"));
+	}
+
+	@Test
+	public void testWithConfigurationVariablesAndPropertiesSameKey() {
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"mybatis.configuration.variables.key:value1",
+				"mybatis.configuration-properties.key:value2");
+		this.context.register(EmbeddedDataSourceConfiguration.class,
+				MybatisAutoConfiguration.class,
+				PropertyPlaceholderAutoConfiguration.class);
+		this.context.refresh();
+
+		Properties variables = this.context.getBean(SqlSessionFactory.class).getConfiguration().getVariables();
+		assertEquals(1, variables.size());
+		assertEquals("value2", variables.get("key"));
+	}
+
 	@Configuration
 	@EnableAutoConfiguration
 	@MapperScan("org.mybatis.spring.boot.autoconfigure.mapper")