Enhance assertion for typehandler package scaning

Fixes gh-370

Author: kazuki43zoo

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

@@ -22,6 +22,8 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 import javax.sql.DataSource;
 
@@ -54,6 +56,7 @@
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.annotation.MapperScan;
+import org.mybatis.spring.boot.autoconfigure.handler.AtomicNumberTypeHandler;
 import org.mybatis.spring.boot.autoconfigure.handler.DummyTypeHandler;
 import org.mybatis.spring.boot.autoconfigure.mapper.CityMapper;
 import org.mybatis.spring.boot.autoconfigure.repository.CityMapperImpl;
@@ -246,6 +249,8 @@ void testWithTypeHandlersPackage() {
     TypeHandlerRegistry typeHandlerRegistry = this.context.getBean(SqlSessionFactory.class).getConfiguration()
         .getTypeHandlerRegistry();
     assertThat(typeHandlerRegistry.hasTypeHandler(BigInteger.class)).isTrue();
+    assertThat(typeHandlerRegistry.hasTypeHandler(AtomicInteger.class)).isTrue();
+    assertThat(typeHandlerRegistry.hasTypeHandler(AtomicLong.class)).isTrue();
   }
 
   @Test
@@ -360,6 +365,12 @@ void testMixedWithConfigurationFileAndTypeHandlersPackage() {
     assertThat(configuration.getDefaultFetchSize()).isEqualTo(1000);
     assertThat(configuration.getTypeHandlerRegistry().getTypeHandler(BigInteger.class))
         .isInstanceOf(DummyTypeHandler.class);
+    assertThat(configuration.getTypeHandlerRegistry().getTypeHandler(AtomicInteger.class))
+        .isInstanceOf(AtomicNumberTypeHandler.class);
+    assertThat(configuration.getTypeHandlerRegistry().getTypeHandler(AtomicLong.class))
+        .isInstanceOf(AtomicNumberTypeHandler.class);
+    assertThat(configuration.getTypeHandlerRegistry().getTypeHandler(AtomicInteger.class).toString())
+        .isEqualTo("type=" + AtomicInteger.class);
   }
 
   @Test
@@ -388,7 +399,7 @@ void testMixedWithConfigurationFileAndTypeAliasesPackageAndMapperLocations() {
   @Test
   void testMixedWithFullConfigurations() {
     TestPropertyValues.of("mybatis.config-location:mybatis-config-settings-only.xml",
-        "mybatis.type-handlers-package:org.mybatis.spring.boot.autoconfigure.handler",
+        "mybatis.type-handlers-package:org.mybatis.spring.**.handler",
         "mybatis.type-aliases-package:org.mybatis.spring.boot.autoconfigure.domain",
         "mybatis.mapper-locations:classpath:org/mybatis/spring/boot/autoconfigure/repository/CityMapper.xml",
         "mybatis.executor-type=REUSE").applyTo(this.context);
@@ -404,6 +415,10 @@ void testMixedWithFullConfigurations() {
     assertThat(configuration.getDefaultFetchSize()).isEqualTo(1000);
     assertThat(configuration.getTypeHandlerRegistry().getTypeHandler(BigInteger.class))
         .isInstanceOf(DummyTypeHandler.class);
+    assertThat(configuration.getTypeHandlerRegistry().getTypeHandler(AtomicInteger.class))
+        .isInstanceOf(AtomicNumberTypeHandler.class);
+    assertThat(configuration.getTypeHandlerRegistry().getTypeHandler(AtomicLong.class))
+        .isInstanceOf(AtomicNumberTypeHandler.class);
     assertThat(configuration.getMappedStatementNames()).hasSize(4);
     assertThat(configuration.getMappedStatementNames()).contains("selectCityById");
     assertThat(configuration.getMappedStatementNames())

mybatis-spring-boot-autoconfigure/src/test/java/org/mybatis/spring/boot/autoconfigure/handler/AtomicNumberTypeHandler.java

@@ -0,0 +1,58 @@
+/**
+ *    Copyright 2015-2019 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.handler;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedTypes;
+import org.apache.ibatis.type.TypeHandler;
+
+@MappedTypes({ AtomicInteger.class, AtomicLong.class })
+public class AtomicNumberTypeHandler implements TypeHandler<Number> {
+
+  private final Class<? extends Number> type;
+
+  public AtomicNumberTypeHandler(Class<? extends Number> type) {
+    this.type = type;
+  }
+
+  public void setParameter(PreparedStatement ps, int i, Number parameter, JdbcType jdbcType) throws SQLException {
+  }
+
+  public Number getResult(ResultSet rs, String columnName) throws SQLException {
+    return null;
+  }
+
+  public Number getResult(CallableStatement cs, int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public Number getResult(ResultSet rs, int columnIndex) throws SQLException {
+    return null;
+  }
+
+  @Override
+  public String toString() {
+    return "type=" + type;
+  }
+
+}