test

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/BaseDbTest.java

@@ -1,12 +1,12 @@
 package com.baomidou.mybatisplus.test;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import java.util.function.Consumer;
-
-import javax.sql.DataSource;
-
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
+import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.apache.ibatis.builder.xml.XMLMapperBuilder;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.logging.slf4j.Slf4jImpl;
@@ -16,20 +16,18 @@ import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
-import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
+import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
 import org.apache.ibatis.type.TypeReference;
 import org.h2.Driver;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils;
-import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.function.Consumer;
 
 /**
  * @author miemie
@@ -65,7 +63,7 @@ public abstract class BaseDbTest<T> extends TypeReference<T> {
             jdbcTemplate.execute(tableDataSql);
         }
         MybatisSqlSessionFactoryBuilder builder = new MybatisSqlSessionFactoryBuilder();
-        Environment environment = new Environment("test", new JdbcTransactionFactory(), ds);
+        Environment environment = new Environment("test", new ManagedTransactionFactory(), ds);
         MybatisConfiguration configuration = new MybatisConfiguration(environment);
         configuration.setUseDeprecatedExecutor(false);
         if (consumer != null) {
@@ -77,7 +75,7 @@ public abstract class BaseDbTest<T> extends TypeReference<T> {
             try {
                 InputStream inputStream = Resources.getResourceAsStream(mapperXml);
                 XMLMapperBuilder xmlMapperBuilder = new XMLMapperBuilder(inputStream,
-                        configuration, mapperXml, configuration.getSqlFragments());
+                    configuration, mapperXml, configuration.getSqlFragments());
                 xmlMapperBuilder.parse();
             } catch (IOException e) {
                 throw ExceptionUtils.mpe(e);

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2MetaObjectHandler.java

@@ -15,11 +15,11 @@
  */
 package com.baomidou.mybatisplus.test.h2;
 
-import java.sql.Timestamp;
-
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
 
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import java.sql.Timestamp;
+import java.util.Date;
 
 
 /**
@@ -44,8 +44,8 @@ public class H2MetaObjectHandler implements MetaObjectHandler {
         // System.out.println("testType=" + testType);
         if (testType == null) {
             //测试实体没有的字段，配置在公共填充，不应该set到实体里面
-            this.setInsertFieldValByName("testType1", 3, metaObject);
-            this.setInsertFieldValByName("testType", 3, metaObject);
+            this.strictInsertFill(metaObject, "testType1", Integer.class, 3);
+            this.strictInsertFill(metaObject, "testType", Integer.class, 3);
         }
     }
 
@@ -55,8 +55,8 @@ public class H2MetaObjectHandler implements MetaObjectHandler {
         // System.out.println("update fill");
         // System.out.println("*************************");
         //测试实体没有的字段，配置在公共填充，不应该set到实体里面
-        this.setUpdateFieldValByName("lastUpdatedDt1", new Timestamp(System.currentTimeMillis()), metaObject);
-        this.setUpdateFieldValByName("lastUpdatedDt", new Timestamp(System.currentTimeMillis()), metaObject);
+        this.strictUpdateFill(metaObject, "lastUpdatedDt1", Date.class, new Timestamp(System.currentTimeMillis()));
+        this.strictUpdateFill(metaObject, "lastUpdatedDt", Date.class, new Timestamp(System.currentTimeMillis()));
     }
 }
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/config/MybatisPlusConfig.java

@@ -134,8 +134,7 @@ public class MybatisPlusConfig {
         conf.setEnableSqlRunner(true)
             .setDbConfig(new GlobalConfig.DbConfig()
                 .setLogicDeleteValue("1")
-                .setLogicNotDeleteValue("0")
-                .setIdType(IdType.ID_WORKER));
+                .setLogicNotDeleteValue("0"));
         return conf;
     }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/MysqlMetaObjectHandler.java

@@ -15,11 +15,10 @@
  */
 package com.baomidou.mybatisplus.test.mysql;
 
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
 
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import java.time.LocalDateTime;
 
 /**
  * 测试，自定义元对象字段填充控制器，实现公共字段自动写入
@@ -42,8 +41,8 @@ public class MysqlMetaObjectHandler implements MetaObjectHandler {
         System.out.println("createDatetime=" + createDatetime);
         if (createDatetime == null) {
             //测试实体没有的字段，配置在公共填充，不应该set到实体里面
-            this.setInsertFieldValByName("createDatetime1", LocalDateTime.now(), metaObject)
-                .setInsertFieldValByName("createDatetime", LocalDateTime.now(), metaObject);
+            this.strictInsertFill(metaObject, "createDatetime1", LocalDateTime.class, LocalDateTime.now())
+                .strictInsertFill(metaObject, "createDatetime", LocalDateTime.class, LocalDateTime.now());
         }
     }
 
@@ -53,8 +52,8 @@ public class MysqlMetaObjectHandler implements MetaObjectHandler {
         System.out.println("update of mysql fill");
         System.out.println("*************************");
         //测试实体没有的字段，配置在公共填充，不应该set到实体里面
-        this.setUpdateFieldValByName("updateDatetime1", LocalDateTime.now(), metaObject)
-            .setUpdateFieldValByName("updateDatetime", LocalDateTime.now(), metaObject);
+        this.strictUpdateFill(metaObject, "updateDatetime1", LocalDateTime.class, LocalDateTime.now())
+            .strictUpdateFill(metaObject, "updateDatetime", LocalDateTime.class, LocalDateTime.now());
     }
 }