fix: Bean instantiation failed

SequenceCustomizer 类型转换出错

Author: myoss

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/H2DataBaseIntTest.java

@@ -22,7 +22,6 @@
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 
-import app.myoss.cloud.mybatis.table.Sequence;
 import lombok.extern.slf4j.Slf4j;
 
 /**
@@ -38,11 +37,4 @@ public class H2DataBaseIntTest {
     @Configuration
     public static class IntAutoConfig {
     }
-
-    public static class SequenceCustomizer implements Sequence {
-        @Override
-        public Object nextValue(Object parameter) {
-            return null;
-        }
-    }
 }

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/test1/UserControllerIntTests.java

@@ -52,7 +52,7 @@
 import app.myoss.cloud.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
 import app.myoss.cloud.mybatis.spring.mapper.MapperFactoryBean;
 import app.myoss.cloud.mybatis.test.integration.h2.H2DataBaseIntTest.IntAutoConfig;
-import app.myoss.cloud.mybatis.test.integration.h2.test1.UserControllerIntTests.MyConfig;
+import app.myoss.cloud.mybatis.test.integration.h2.test1.UserControllerIntTests.MyConfig1;
 import app.myoss.cloud.mybatis.test.integration.h2.test1.constants.UserStatusEnum;
 import app.myoss.cloud.mybatis.test.integration.h2.test1.entity.User;
 import app.myoss.cloud.mybatis.test.integration.h2.test1.mapper.UserMapper;
@@ -71,7 +71,7 @@
 @Slf4j
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { DataSourceAutoConfiguration.class, IntAutoConfig.class, MybatisAutoConfiguration.class,
-        MyConfig.class })
+        MyConfig1.class })
 public class UserControllerIntTests {
     @Autowired
     private UserController userController;
@@ -361,7 +361,7 @@ public void createBatchAndWhereExtraConditionTest1() {
     @ComponentScan(basePackageClasses = UserControllerIntTests.class)
     @Profile("UserControllerIntTests")
     @Configuration
-    public static class MyConfig {
+    public static class MyConfig1 {
         @Bean
         public ParameterHandlerCustomizer persistenceParameterHandler() {
             return new ParameterHandlerCustomizer() {

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/test2/UserHistoryControllerIntTests.java

@@ -52,7 +52,7 @@
 import app.myoss.cloud.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
 import app.myoss.cloud.mybatis.spring.mapper.MapperFactoryBean;
 import app.myoss.cloud.mybatis.test.integration.h2.H2DataBaseIntTest.IntAutoConfig;
-import app.myoss.cloud.mybatis.test.integration.h2.test2.UserHistoryControllerIntTests.MyConfig;
+import app.myoss.cloud.mybatis.test.integration.h2.test2.UserHistoryControllerIntTests.MyConfig2;
 import app.myoss.cloud.mybatis.test.integration.h2.test2.constants.AccountStatusEnum;
 import app.myoss.cloud.mybatis.test.integration.h2.test2.entity.UserHistory;
 import app.myoss.cloud.mybatis.test.integration.h2.test2.service.UserHistoryService;
@@ -70,7 +70,7 @@
 @Slf4j
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { DataSourceAutoConfiguration.class, IntAutoConfig.class, MybatisAutoConfiguration.class,
-        MyConfig.class })
+        MyConfig2.class })
 public class UserHistoryControllerIntTests {
     @Autowired
     private UserHistoryController userHistoryController;
@@ -292,7 +292,7 @@ public void crudTest2() {
     @ComponentScan(basePackageClasses = UserHistoryControllerIntTests.class)
     @Profile("UserHistoryControllerIntTests")
     @Configuration
-    public static class MyConfig {
+    public static class MyConfig2 {
         @Bean
         public ParameterHandlerCustomizer persistenceParameterHandler() {
             return new ParameterHandlerCustomizer() {

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/test3/UserLogControllerIntTests.java

@@ -52,9 +52,9 @@
 import app.myoss.cloud.mybatis.repository.entity.AuditIdEntity;
 import app.myoss.cloud.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
 import app.myoss.cloud.mybatis.spring.mapper.MapperFactoryBean;
+import app.myoss.cloud.mybatis.table.Sequence;
 import app.myoss.cloud.mybatis.test.integration.h2.H2DataBaseIntTest.IntAutoConfig;
-import app.myoss.cloud.mybatis.test.integration.h2.H2DataBaseIntTest.SequenceCustomizer;
-import app.myoss.cloud.mybatis.test.integration.h2.test3.UserLogControllerIntTests.MyConfig;
+import app.myoss.cloud.mybatis.test.integration.h2.test3.UserLogControllerIntTests.MyConfig3;
 import app.myoss.cloud.mybatis.test.integration.h2.test3.entity.UserLog;
 import app.myoss.cloud.mybatis.test.integration.h2.test3.service.UserLogService;
 import app.myoss.cloud.mybatis.test.integration.h2.test3.web.UserLogController;
@@ -71,7 +71,7 @@
 @Slf4j
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { DataSourceAutoConfiguration.class, IntAutoConfig.class, MybatisAutoConfiguration.class,
-        MyConfig.class })
+        MyConfig3.class })
 public class UserLogControllerIntTests {
     @Autowired
     private UserLogController userLogController;
@@ -283,7 +283,7 @@ public void crudTest2() {
     @ComponentScan(basePackageClasses = UserLogControllerIntTests.class)
     @Profile("UserLogControllerIntTests")
     @Configuration
-    public static class MyConfig {
+    public static class MyConfig3 {
         @Bean
         public ParameterHandlerCustomizer persistenceParameterHandler() {
             return new ParameterHandlerCustomizer() {
@@ -319,4 +319,11 @@ public Object nextValue(Object parameter) {
             };
         }
     }
+
+    public static class SequenceCustomizer implements Sequence {
+        @Override
+        public Object nextValue(Object parameter) {
+            return null;
+        }
+    }
 }

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/test3/entity/UserLog.java

@@ -24,7 +24,7 @@
 import app.myoss.cloud.mybatis.table.annotation.SequenceGenerator.Order;
 import app.myoss.cloud.mybatis.table.annotation.SequenceKey;
 import app.myoss.cloud.mybatis.table.annotation.Table;
-import app.myoss.cloud.mybatis.test.integration.h2.H2DataBaseIntTest.SequenceCustomizer;
+import app.myoss.cloud.mybatis.test.integration.h2.test3.UserLogControllerIntTests.SequenceCustomizer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/test4/SysUserLogControllerIntTests.java

@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.assertj.core.api.Assertions;
@@ -37,12 +36,14 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.context.event.EventListener;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -62,7 +63,7 @@
 import app.myoss.cloud.mybatis.table.Sequence;
 import app.myoss.cloud.mybatis.table.TableMetaObject;
 import app.myoss.cloud.mybatis.test.integration.h2.H2DataBaseIntTest.IntAutoConfig;
-import app.myoss.cloud.mybatis.test.integration.h2.test4.SysUserLogControllerIntTests.MyConfig;
+import app.myoss.cloud.mybatis.test.integration.h2.test4.SysUserLogControllerIntTests.MyConfig4;
 import app.myoss.cloud.mybatis.test.integration.h2.test4.entity.SysUserLog;
 import app.myoss.cloud.mybatis.test.integration.h2.test4.mapper.SysUserLogMapper;
 import app.myoss.cloud.mybatis.test.integration.h2.test4.service.SysUserLogService;
@@ -81,7 +82,7 @@
 @Slf4j
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { DataSourceAutoConfiguration.class, IntAutoConfig.class, MybatisAutoConfiguration.class,
-        MyConfig.class })
+        MyConfig4.class })
 public class SysUserLogControllerIntTests {
     @Autowired
     private SysUserLogController userLogController;
@@ -591,14 +592,15 @@ public Object nextValue(Object parameter) {
     @ComponentScan(basePackageClasses = SysUserLogControllerIntTests.class)
     @Profile("SysUserLogControllerIntTests")
     @Configuration
-    public static class MyConfig {
+    public static class MyConfig4 {
         @Bean
         public ParameterHandlerCustomizer persistenceParameterHandler() {
             return new DefaultParameterHandlerCustomizer();
         }
 
-        @Bean
-        public Optional initSequence(JdbcTemplate jdbcTemplate) {
+        @EventListener
+        public void initSequence(ApplicationReadyEvent event) {
+            JdbcTemplate jdbcTemplate = event.getApplicationContext().getBean(JdbcTemplate.class);
             Sequence sequenceBean = parameter -> {
                 Long nextId = jdbcTemplate.queryForObject("select ifnull(max(`id`) ,0) + 1 from t_sys_user_log",
                         Long.class);
@@ -608,10 +610,14 @@ public Optional initSequence(JdbcTemplate jdbcTemplate) {
 
             Map<String, Sequence> sequenceBeanMap = TableMetaObject.getSequenceBeanMap();
             for (Entry<String, Sequence> entry : sequenceBeanMap.entrySet()) {
-                SequenceCustomizer value = (SequenceCustomizer) entry.getValue();
-                value.setSequence(sequenceBean);
+                Sequence entryValue = entry.getValue();
+                if (entryValue instanceof SequenceCustomizer) {
+                    SequenceCustomizer value = (SequenceCustomizer) entryValue;
+                    value.setSequence(sequenceBean);
+                } else {
+                    log.warn("entryValue is not instanceof SequenceCustomizer: {}", entryValue);
+                }
             }
-            return Optional.empty();
         }
     }
 }