Add the typeAliasesSuperType on MybatisProperties

Fixes gh-230

Author: kazuki43zoo

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

@@ -143,6 +143,9 @@ public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Excepti
     if (StringUtils.hasLength(this.properties.getTypeAliasesPackage())) {
       factory.setTypeAliasesPackage(this.properties.getTypeAliasesPackage());
     }
+    if (this.properties.getTypeAliasesSuperType() != null) {
+      factory.setTypeAliasesSuperType(this.properties.getTypeAliasesSuperType());
+    }
     if (StringUtils.hasLength(this.properties.getTypeHandlersPackage())) {
       factory.setTypeHandlersPackage(this.properties.getTypeHandlersPackage());
     }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2015-2017 the original author or authors.
+ *    Copyright 2015-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -56,6 +56,12 @@ public class MybatisProperties {
    */
   private String typeAliasesPackage;
 
+  /**
+   * The super class for filtering type alias.
+   * If this not specifies, the MyBatis deal as type alias all classes that searched from typeAliasesPackage.
+   */
+  private Class<?> typeAliasesSuperType;
+
   /**
    * Packages to search for type handlers. (Package delimiters are ",; \t\n")
    */
@@ -131,6 +137,20 @@ public void setTypeAliasesPackage(String typeAliasesPackage) {
     this.typeAliasesPackage = typeAliasesPackage;
   }
 
+  /**
+   * @since 1.3.3
+   */
+  public Class<?> getTypeAliasesSuperType() {
+    return typeAliasesSuperType;
+  }
+
+  /**
+   * @since 1.3.3
+   */
+  public void setTypeAliasesSuperType(Class<?> typeAliasesSuperType) {
+    this.typeAliasesSuperType = typeAliasesSuperType;
+  }
+
   public boolean isCheckConfigLocation() {
     return this.checkConfigLocation;
   }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2015-2017 the original author or authors.
+ *    Copyright 2015-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -314,6 +314,8 @@ public void testMixedWithConfigurationFileAndTypeAliasesPackageAndMapperLocation
 		assertThat(configuration.getDefaultFetchSize()).isEqualTo(1000);
 		assertThat(configuration.getMappedStatementNames()).contains("selectCityById");
 		assertThat(configuration.getMappedStatementNames()).contains("org.mybatis.spring.boot.autoconfigure.repository.CityMapperImpl.selectCityById");
+		assertThat(configuration.getTypeAliasRegistry().getTypeAliases()).containsKey("city");
+		assertThat(configuration.getTypeAliasRegistry().getTypeAliases()).containsKey("name");
 	}
 
 	@Test
@@ -509,6 +511,23 @@ public void testMySqlSessionTemplate() {
 		assertThat(this.context.getBean(SqlSessionTemplate.class)).isInstanceOf(MySqlSessionTemplate.class);
 	}
 
+	@Test
+	public void testTypeAliasesSuperTypeIsSpecify() {
+		EnvironmentTestUtils
+			.addEnvironment(
+				this.context,
+				"mybatis.type-aliases-package:org.mybatis.spring.boot.autoconfigure.domain",
+				"mybatis.type-aliases-super-type:org.mybatis.spring.boot.autoconfigure.domain.Domain");
+		this.context.register(EmbeddedDataSourceConfiguration.class,
+			MybatisBootMapperScanAutoConfiguration.class);
+		this.context.refresh();
+
+		org.apache.ibatis.session.Configuration configuration = this.context.getBean(
+			SqlSessionFactory.class).getConfiguration();
+		assertThat(configuration.getTypeAliasRegistry().getTypeAliases()).containsKey("city");
+		assertThat(configuration.getTypeAliasRegistry().getTypeAliases()).doesNotContainKey("name");
+	}
+
 	@Configuration
 	@EnableAutoConfiguration
 	@MapperScan("org.mybatis.spring.boot.autoconfigure.mapper")

mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/domain/City.java

@@ -15,7 +15,7 @@
  */
 package org.mybatis.spring.boot.autoconfigure.domain;
 
-public class City {
+public class City implements Domain {
 
 	private Long id;
 

mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/domain/Domain.java

@@ -0,0 +1,19 @@
+/**
+ *    Copyright 2015-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.spring.boot.autoconfigure.domain;
+
+interface Domain {
+}

mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/domain/Name.java

@@ -0,0 +1,40 @@
+/**
+ *    Copyright 2015-2018 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.spring.boot.autoconfigure.domain;
+
+public class Name {
+
+	private Long first;
+
+	private String last;
+
+	public Long getFirst() {
+		return first;
+	}
+
+	public void setFirst(Long first) {
+		this.first = first;
+	}
+
+	public String getLast() {
+		return last;
+	}
+
+	public void setLast(String last) {
+		this.last = last;
+	}
+
+}