处理警告,删除DB初始化.

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisMapperAnnotationBuilder.java

@@ -94,7 +94,6 @@ public class MybatisMapperAnnotationBuilder extends MapperAnnotationBuilder {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public void parse() {
         String resource = type.toString();
         if (!configuration.isResourceLoaded(resource)) {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/override/MybatisMapperMethod.java

@@ -55,7 +55,6 @@ public class MybatisMapperMethod {
         this.method = new MethodSignature(config, mapperInterface, method);
     }
 
-    @SuppressWarnings("unchecked")
     public Object execute(SqlSession sqlSession, Object[] args) {
         Object result;
         switch (command.getType()) {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/ReflectionKit.java

@@ -79,9 +79,6 @@ public class ReflectionKit {
      */
     @Deprecated
     public static String setMethodCapitalize(Field field, final String str) {
-        Class<?> fieldType = field.getType();
-        // type of boolean's field, getter methodname is isGood(),
-        // setter methodname is setGood(boolean)
         return StringUtils.concatCapitalize("set", str);
     }
 

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/test/WrapperTest.java

@@ -56,7 +56,12 @@ class WrapperTest {
 
     @Test
     void test1() {
-        QueryWrapper<User> ew = new QueryWrapper<User>() {{
+        QueryWrapper<User> ew = new QueryWrapper<User>() {
+          /**
+           *  serialVersionUID
+           */
+          private static final long serialVersionUID = 4719966531503901490L;
+        {
             eq("xxx", 123);
             and(i -> i.eq("andx", 65444).le("ande", 66666));
             ne("xxx", 222);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/EnumAnnotationTypeHandler.java

@@ -68,7 +68,7 @@ public class EnumAnnotationTypeHandler<E extends Enum<E>> extends BaseTypeHandle
 
     @SuppressWarnings("Duplicates")
     @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, Enum parameter, JdbcType jdbcType) throws SQLException {
+    public void setNonNullParameter(PreparedStatement ps, int i, E parameter, JdbcType jdbcType) throws SQLException {
         try {
             method.setAccessible(true);
             if (jdbcType == null) {

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/OptimisticLockerInterceptor.java

@@ -66,7 +66,7 @@ public class OptimisticLockerInterceptor implements Interceptor {
     private final Map<Class<?>, List<EntityField>> entityFieldsCache = new ConcurrentHashMap<>();
 
     @Override
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public Object intercept(Invocation invocation) throws Throwable {
         Object[] args = invocation.getArgs();
         MappedStatement ms = (MappedStatement) args[0];

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/DB2DialectTest.java

@@ -11,11 +11,8 @@ class DB2DialectTest {
 
     @Test
     void m1() {
-        String sql = "select * from xxx where id = ? order by id";
-        DB2Dialect db2Dialect = new DB2Dialect();
-        Page<?> page = new Page(2, 10);
+        Page<?> page = new Page<>(2, 10);
         System.out.println(page.offset() + 1);
         System.out.println(page.getSize() + page.offset());
-//        System.out.println(db2Dialect.buildPaginationSql(sql, page.offset(), page.getSize()).getDialectSql());
     }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/db/BaseDb.java

@@ -1,43 +0,0 @@
-package com.baomidou.mybatisplus.test.base.db;
-
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * @author miemie
- * @since 2018-07-06
- */
-public class BaseDb {
-
-    protected static void executeSql(Statement stmt, String path, String sqlFilename) throws SQLException, IOException {
-        try (
-            BufferedReader reader = new BufferedReader(new FileReader(filePath(path, sqlFilename)))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    protected static String readFile(String path, String fileName) {
-        StringBuilder builder = new StringBuilder();
-        try (
-            BufferedReader reader = new BufferedReader(new FileReader(filePath(path, fileName)))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
-    private static String filePath(String path, String fileName) {
-        return BaseDb.class.getResource(path + fileName).getPath();
-    }
-}

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

@@ -20,9 +20,9 @@ import com.baomidou.mybatisplus.test.base.mapper.commons.CommonDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.commons.CommonLogicDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.commons.ResultMapEntityMapper;
 import com.baomidou.mybatisplus.test.base.mapper.mysql.MysqlDataMapper;
-import com.baomidou.mybatisplus.test.mysql.config.MysqlDb;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
@@ -39,6 +39,7 @@ import static java.util.stream.Collectors.toMap;
  * @author hubin
  * @since 2018-06-05
  */
+@DirtiesContext
 @TestMethodOrder(MethodOrderer.Alphanumeric.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:mysql/spring-test-mysql.xml"})
@@ -55,12 +56,6 @@ class MysqlTestDataMapperTest {
     @Resource
     private ResultMapEntityMapper resultMapEntityMapper;
 
-    @BeforeAll
-    static void init() throws Exception {
-        MysqlDb.initMysqlData();
-        System.out.println("init success");
-    }
-
     @Test
     void a1_insertForeach() {
         for (int i = 1; i < 20; i++) {

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

@@ -8,16 +8,16 @@ import com.baomidou.mybatisplus.test.base.entity.CommonData;
 import com.baomidou.mybatisplus.test.base.entity.CommonLogicData;
 import com.baomidou.mybatisplus.test.base.mapper.commons.CommonDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.commons.CommonLogicDataMapper;
-import com.baomidou.mybatisplus.test.mysql.config.MysqlDb;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import javax.annotation.Resource;
-import java.sql.SQLException;
 import java.util.List;
 
+@DirtiesContext
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(locations = {"classpath:mysql/spring-test-mysql.xml"})
@@ -28,12 +28,6 @@ class SelectCountDistinctTest {
     @Resource
     private CommonDataMapper commonDataMapper;
 
-    @BeforeAll
-    static void init() throws SQLException {
-        MysqlDb.initMysqlData();
-        System.out.println("init table and data success");
-    }
-
     @Test
     @Order(1)
     void testCountDistinct() {

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

@@ -2,10 +2,16 @@ package com.baomidou.mybatisplus.test.mysql.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+import org.springframework.jdbc.datasource.init.DataSourceInitializer;
+import org.springframework.jdbc.datasource.init.DatabasePopulator;
+import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import java.io.IOException;
+
 import javax.sql.DataSource;
 
 /**
@@ -30,4 +36,22 @@ public class DBConfig {
     public DataSourceTransactionManager transactionManager(DataSource ds) {
         return new DataSourceTransactionManager(ds);
     }
+
+    @Bean
+    public DataSourceInitializer dataSourceInitializer(DataSource dataSource) throws IOException {
+        final DataSourceInitializer initializer = new DataSourceInitializer();
+        initializer.setDataSource(dataSource);
+        initializer.setDatabasePopulator(databasePopulator());
+        initializer.setEnabled(true);
+        return initializer;
+    }
+
+    private DatabasePopulator databasePopulator() throws IOException {
+        ResourceDatabasePopulator resourceDatabasePopulator = new ResourceDatabasePopulator();
+        resourceDatabasePopulator.setContinueOnError(false);
+        resourceDatabasePopulator.addScripts(
+            new PathMatchingResourcePatternResolver().getResources("classpath:/mysql/*.sql")
+        );
+        return resourceDatabasePopulator;
+    }
 }

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

@@ -1,34 +0,0 @@
-package com.baomidou.mybatisplus.test.mysql.config;
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.test.base.db.BaseDb;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-public class MysqlDb extends BaseDb {
-
-    public static void initMysqlData() throws SQLException {
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:mysql/spring-test-mysql.xml");
-        DataSource ds = context.getBean("dataSource", DataSource.class);
-        try (Connection conn = ds.getConnection()) {
-            initData(conn, "/mysql/", "test_data.ddl.sql");
-        }
-    }
-
-    public static void initData(Connection conn, String path, String ddlFileName)
-        throws SQLException {
-        String createTableSql = readFile(path, ddlFileName);
-        String[] sqls = createTableSql.split(";");
-        Statement stmt = conn.createStatement();
-        for (String sql : sqls) {
-            if (StringUtils.isNotEmpty(sql)) {
-                stmt.execute(sql);
-            }
-        }
-    }
-}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/PostgresTestDataMapperTest.java

@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.test.base.enums.TestEnum;
 import com.baomidou.mybatisplus.test.base.mapper.commons.CommonDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.commons.CommonLogicDataMapper;
 import com.baomidou.mybatisplus.test.base.mapper.pg.PgDataMapper;
-import com.baomidou.mybatisplus.test.postgres.config.PostgresDb;
 import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -43,12 +42,6 @@ class PostgresTestDataMapperTest {
     @Resource
     private PgDataMapper pgMapper;
 
-    @BeforeAll
-    static void init() throws Exception {
-        PostgresDb.initPgData();
-        System.out.println("init success");
-    }
-
     @Test
     void a_insertForeach() {
         for (int i = 1; i < 20; i++) {

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/config/DBConfig.java

@@ -2,10 +2,16 @@ package com.baomidou.mybatisplus.test.postgres.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+import org.springframework.jdbc.datasource.init.DataSourceInitializer;
+import org.springframework.jdbc.datasource.init.DatabasePopulator;
+import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import java.io.IOException;
+
 import javax.sql.DataSource;
 
 /**
@@ -30,4 +36,22 @@ public class DBConfig {
     public DataSourceTransactionManager transactionManager(DataSource ds) {
         return new DataSourceTransactionManager(ds);
     }
+
+    @Bean
+    public DataSourceInitializer dataSourceInitializer(DataSource dataSource) throws IOException {
+        final DataSourceInitializer initializer = new DataSourceInitializer();
+        initializer.setDataSource(dataSource);
+        initializer.setDatabasePopulator(databasePopulator());
+        initializer.setEnabled(true);
+        return initializer;
+    }
+
+    private DatabasePopulator databasePopulator() throws IOException {
+        ResourceDatabasePopulator resourceDatabasePopulator = new ResourceDatabasePopulator();
+        resourceDatabasePopulator.setContinueOnError(false);
+        resourceDatabasePopulator.addScripts(
+            new PathMatchingResourcePatternResolver().getResources("classpath:/postgres/*.sql")
+        );
+        return resourceDatabasePopulator;
+    }
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/postgres/config/PostgresDb.java

@@ -1,34 +0,0 @@
-package com.baomidou.mybatisplus.test.postgres.config;
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.test.base.db.BaseDb;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-public class PostgresDb extends BaseDb {
-
-    public static void initPgData() throws SQLException {
-        ApplicationContext context = new ClassPathXmlApplicationContext("classpath:postgres/spring-test-postgres.xml");
-        DataSource ds = context.getBean("dataSource", DataSource.class);
-        try (Connection conn = ds.getConnection()) {
-            initData(conn, "/postgres/", "test_data.ddl.sql");
-        }
-    }
-
-    public static void initData(Connection conn, String path, String ddlFileName)
-        throws SQLException {
-        String createTableSql = readFile(path, ddlFileName);
-        String[] sqls = createTableSql.split(";");
-        Statement stmt = conn.createStatement();
-        for (String sql : sqls) {
-            if (StringUtils.isNotEmpty(sql)) {
-                stmt.execute(sql);
-            }
-        }
-    }
-}

mybatis-plus/src/test/resources/mysql/test_data.ddl.sql

@@ -46,3 +46,9 @@ CREATE TABLE result_map_entity (
     map        varchar(200)
 )ENGINE = innodb
 DEFAULT CHARSET = utf8;
+
+INSERT INTO common_data (id, test_int, test_str, c_time, test_enum, tenant_id) VALUES (666666666, 25, 'test', now(), 1, 1);
+INSERT INTO common_data (id, test_int, test_str, c_time, test_enum, tenant_id) VALUES (777777777, 25, 'test', now(), 1, 1);
+
+INSERT INTO common_logic_data (id, test_int, test_str, c_time) VALUES (666666666, 25, 'test', now());
+INSERT INTO common_logic_data (id, test_int, test_str, c_time) VALUES (777777777, 25, 'test', now());