完善和Spring的集成，完善Bean的初始化和加载，fixed #51

Author: abel533

activerecord/src/main/java/io/mybatis/activerecord/spring/MapperProvider.java

@@ -19,7 +19,9 @@
 import io.mybatis.mapper.BaseMapper;
 import io.mybatis.provider.EntityClassFinder;
 import org.mybatis.spring.SqlSessionTemplate;
+import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
 
@@ -35,7 +37,7 @@
  * @param <M> 实体对应的 Mapper
  * @author liuzh
  */
-public class MapperProvider<T, I extends Serializable, M extends BaseMapper<T, I>> implements ApplicationListener<ContextRefreshedEvent> {
+public class MapperProvider<T, I extends Serializable, M extends BaseMapper<T, I>> implements ApplicationContextAware, ApplicationListener<ContextRefreshedEvent> {
   /**
    * Spring 上下文
    */
@@ -76,9 +78,17 @@ public static <T, I extends Serializable, M extends BaseMapper<T, I>> MapperProv
     return (MapperProvider<T, I, M>) applicationContext.getBean(instanceName);
   }
 
+  @Override
+  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+    MapperProvider.applicationContext = applicationContext;
+  }
+
   @Override
   public void onApplicationEvent(ContextRefreshedEvent event) {
-    MapperProvider.applicationContext = event.getApplicationContext();
+    this.initMapper();
+  }
+
+  protected void initMapper() {
     this.sqlSessionTemplate.getConfiguration().getMapperRegistry().getMappers().forEach(mapper -> {
       addMapper(mapper, this.sqlSessionTemplate.getMapper(mapper));
     });
@@ -91,9 +101,9 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
    * @param mapper Mapper 实例
    */
   public void addMapper(Class<?> type, Object mapper) {
-    if (type != null && BaseMapper.class.isAssignableFrom(type)) {
+    if (type != null && mapper != null && BaseMapper.class.isAssignableFrom(type)) {
       EntityClassFinder.find(type, null).ifPresent(clazz -> {
-        if (mapper != null) {
+        if (!modelMapper.containsKey(clazz)) {
           modelMapper.put(clazz, (BaseMapper<T, I>) mapper);
         }
       });
@@ -107,6 +117,13 @@ public void addMapper(Class<?> type, Object mapper) {
    * @return Mapper 接口
    */
   public M baseMapper(Class<T> modelClass) {
+    if (!modelMapper.containsKey(modelClass)) {
+      synchronized (this) {
+        if (!modelMapper.containsKey(modelClass)) {
+          this.initMapper();
+        }
+      }
+    }
     if (modelMapper.containsKey(modelClass)) {
       return (M) modelMapper.get(modelClass);
     }

activerecord/src/test/java/io/mybatis/activerecord/spring/SystemTask.java

@@ -0,0 +1,12 @@
+package io.mybatis.activerecord.spring;
+
+import java.util.Optional;
+
+public class SystemTask {
+
+  public void run() {
+    Optional<User> user = new User().baseMapper().wrapper().eq(User::getId, 1).one();
+    user.ifPresent(u -> System.out.println(u.getName()));
+  }
+
+}

activerecord/src/test/java/io/mybatis/activerecord/spring/spring.xml

@@ -18,9 +18,11 @@
 <beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:jdbc="http://www.springframework.org/schema/jdbc"
        xmlns="http://www.springframework.org/schema/beans"
+       xmlns:task="http://www.springframework.org/schema/task"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 						http://www.springframework.org/schema/beans/spring-beans.xsd
-       					http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd"
+       					http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+       					http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd"
        default-lazy-init="false">
 
   <jdbc:embedded-database id="dataSourceRole">
@@ -31,6 +33,10 @@
     <jdbc:script location="classpath:io/mybatis/activerecord/spring/database-schema-user.sql"/>
   </jdbc:embedded-database>
 
+  <task:scheduler id="myScheduler"/>
+
+  <bean id="systemTask" class="io.mybatis.activerecord.spring.SystemTask"/>
+
   <bean id="sqlSessionFactoryRole" class="org.mybatis.spring.SqlSessionFactoryBean">
     <property name="dataSource" ref="dataSourceRole"/>
   </bean>
@@ -76,4 +82,8 @@
     <property name="markerInterface" value="io.mybatis.activerecord.spring.UserMarker"/>
     <property name="sqlSessionFactoryBeanName" value="sqlSessionFactoryUser"/>
   </bean>
+
+  <task:scheduled-tasks scheduler="myScheduler">
+    <task:scheduled ref="systemTask" method="run" fixed-delay="5000"/>
+  </task:scheduled-tasks>
 </beans>