format

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

@@ -193,7 +193,7 @@ public class OptimisticLockerInterceptor implements Interceptor {
             }
             // 缓存类信息
             EntityField field = this.getVersionFieldRegular(parameterClass);
-            if(field != null) {
+            if (field != null) {
                 versionFieldCache.put(parameterClass, field);
                 return field;
             }

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

@@ -113,7 +113,7 @@ public class PerformanceInterceptor implements Interceptor {
                 } else {
                     Class<?> clazz = Class.forName(stmtClassName);
                     oracleGetOriginalSqlMethod = getMethodRegular(clazz, "getOriginalSql");
-                    if(oracleGetOriginalSqlMethod!=null) {
+                    if (oracleGetOriginalSqlMethod != null) {
                         oracleGetOriginalSqlMethod.setAccessible(true);//OraclePreparedStatementWrapper is not a public class, need set this.
                         if (oracleGetOriginalSqlMethod != null) {
                             Object stmtSql = oracleGetOriginalSqlMethod.invoke(statement);

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

@@ -23,12 +23,11 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import com.baomidou.mybatisplus.entity.Columns;
-
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.baomidou.mybatisplus.entity.Column;
+import com.baomidou.mybatisplus.entity.Columns;
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -127,7 +126,7 @@ public class EntityWrapperTest {
 
     @Test
     public void testNoTSQL() {
-		/*
+        /*
 		 * 实体 filter orderby
 		 */
         ew.setEntity(new User(1));

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

@@ -106,7 +106,7 @@ public class H2LogicDeleteTest extends H2Test {
     }
 
     @Test
-    public void testDelete(){
+    public void testDelete() {
         H2UserLogicDelete user = new H2UserLogicDelete();
         user.setAge(1);
         user.setPrice(new BigDecimal("9.99"));

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

@@ -203,15 +203,15 @@ public class H2MetaObjAndVersionAndOptLockTest extends H2Test {
     }
 
     @Test
-    public void testLogicDeleteRecordWithAutoFill(){
+    public void testLogicDeleteRecordWithAutoFill() {
         H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
         user.setAge(1);
         user.setPrice(new BigDecimal("9.99"));
         user.setVersion(1);
         userMapper.insert(user);
-        Assert.assertNotNull("testType should be auto filled",user.getTestType());
+        Assert.assertNotNull("testType should be auto filled", user.getTestType());
         userMapper.deleteById(user);
-        Assert.assertNotNull("logicDelete should call update(), lastUpdateDt should be auto filled",user.getLastUpdatedDt());
+        Assert.assertNotNull("logicDelete should call update(), lastUpdateDt should be auto filled", user.getLastUpdatedDt());
     }
 
     @Test

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

@@ -5,9 +5,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.Date;
 
 import javax.sql.DataSource;
 

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

@@ -52,6 +52,6 @@ public class H2Test {
         System.out.println("after update: testDate=" + lastUpdatedDt);
         String versionDateStr = sdf.format(lastUpdatedDt);
         //MyMetaObjectHandler.updateFill() : set lastUpdatedDt=currentTimestamp
-        Assert.assertEquals("lastUpdateDt will be updated by H2MetaObjectHandler.updateFill()",sdf.format(new Date()), versionDateStr);//before update: lastUpdatedDt=currentTimestamp-1day
+        Assert.assertEquals("lastUpdateDt will be updated by H2MetaObjectHandler.updateFill()", sdf.format(new Date()), versionDateStr);//before update: lastUpdatedDt=currentTimestamp-1day
     }
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuSuperEntity.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.enums.FieldFill;
  */
 public abstract class SuSuperEntity {
 
-    @TableField(value = "last_updated_dt",fill = FieldFill.UPDATE)
+    @TableField(value = "last_updated_dt", fill = FieldFill.UPDATE)
     private Date lastUpdatedDt;
 
     public Date getLastUpdatedDt() {

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserMapper.java

@@ -60,18 +60,17 @@ public interface H2UserMapper extends SuperMapper<H2User> {
     @Select(" select test_id as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
             " from h2user " +
             " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2User> selectUserWithParamInSelectStatememt(Map<String,Object> param);
+    List<H2User> selectUserWithParamInSelectStatememt(Map<String, Object> param);
 
     @Select(" select test_id as id, power(#{ageFrom},2), 'abc?zhazha', CAST(#{nameParam} AS VARCHAR) as name " +
             " from h2user " +
             " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2User> selectUserWithParamInSelectStatememt4Page(Map<String,Object> param, Page<H2User> page);
+    List<H2User> selectUserWithParamInSelectStatememt4Page(Map<String, Object> param, Page<H2User> page);
 
     @Select(" select test_id as id, power(${ageFrom},2), '${nameParam}' as name " +
             " from h2user " +
             " where age>#{ageFrom} and age<#{ageTo} ")
-    List<H2User> selectUserWithDollarParamInSelectStatememt4Page(Map<String,Object> param, Page<H2User> page);
-
+    List<H2User> selectUserWithDollarParamInSelectStatememt4Page(Map<String, Object> param, Page<H2User> page);
 
 
     @Select("select count(1) from (" +
@@ -79,5 +78,5 @@ public interface H2UserMapper extends SuperMapper<H2User> {
             " from h2user " +
             " where age>#{ageFrom} and age<#{ageTo} " +
             ") a")
-    int selectCountWithParamInSelectItems(Map<String,Object> param);
+    int selectCountWithParamInSelectItems(Map<String, Object> param);
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/service/IH2UserLogicDeleteService.java

@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserLogicDelete;
  */
 public interface IH2UserLogicDeleteService extends IService<H2UserLogicDelete> {
 
-    public H2UserLogicDelete selectByIdMy(Long id);
+    H2UserLogicDelete selectByIdMy(Long id);
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/h2/service/IH2UserService.java

@@ -40,9 +40,9 @@ public interface IH2UserService extends IService<H2User> {
 
     int myUpdate(Long id, String name);
 
-    List<H2User> queryWithParamInSelectStatememt(Map<String,Object> param);
+    List<H2User> queryWithParamInSelectStatememt(Map<String, Object> param);
 
-    Page<H2User> queryWithParamInSelectStatememt4Page(Map<String,Object> param, Page<H2User> page);
+    Page<H2User> queryWithParamInSelectStatememt4Page(Map<String, Object> param, Page<H2User> page);
 
-    int selectCountWithParamInSelectItems(Map<String,Object> param);
+    int selectCountWithParamInSelectItems(Map<String, Object> param);
 }

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

@@ -6,8 +6,8 @@ import org.junit.Test;
 
 import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
-import com.baomidou.mybatisplus.plugins.parser.tenant.TenantSqlParser;
 import com.baomidou.mybatisplus.plugins.parser.tenant.TenantHandler;
+import com.baomidou.mybatisplus.plugins.parser.tenant.TenantSqlParser;
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;

mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java

@@ -31,6 +31,8 @@ import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.baomidou.mybatisplus.generator.config.ConstVal;
 import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
@@ -44,8 +46,6 @@ import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.toolkit.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * 生成文件

mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/rules/QuerySQL.java

@@ -62,8 +62,8 @@ public enum QuerySQL {
     POSTGRE_SQL("postgre_sql", "select tablename from pg_tables where schemaname='%s' ORDER BY tablename",
             "SELECT A.tablename, obj_description(relfilenode, 'pg_class') AS comments FROM pg_tables A, pg_class B WHERE A.schemaname='%s' AND A.tablename = B.relname",
             "SELECT A.attname AS name, format_type(A.atttypid, A.atttypmod) AS type,col_description(A.attrelid, A.attnum) AS comment, (CASE C.contype WHEN 'p' THEN 'PRI' ELSE '' END) AS key " +
-            "FROM pg_attribute A LEFT JOIN pg_constraint C ON A.attnum = C.conkey[1] AND A.attrelid = C.conrelid " +
-            "WHERE  A.attrelid = '%s.%s'::regclass AND A.attnum > 0 AND NOT A.attisdropped ORDER  BY A.attnum",
+                    "FROM pg_attribute A LEFT JOIN pg_constraint C ON A.attnum = C.conkey[1] AND A.attrelid = C.conrelid " +
+                    "WHERE  A.attrelid = '%s.%s'::regclass AND A.attnum > 0 AND NOT A.attisdropped ORDER  BY A.attnum",
             "tablename", "comments", "name", "type", "comment", "key");
 
     private final String dbType;

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/MybatisSqlSessionTemplate.java

@@ -34,9 +34,9 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.MyBatisExceptionTranslator;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.util.Assert;
 
 import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
-import org.springframework.util.Assert;
 
 /**
  * Copy SqlSessionTemplate

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -669,7 +669,7 @@ public class AutoSqlInjector implements ISqlInjector {
      */
     protected String sqlSelectObjsColumns(TableInfo table) {
         StringBuilder columns = new StringBuilder();
-		/*
+        /*
 		 * 普通查询
 		 */
         columns.append("<choose><when test=\"ew != null and ew.sqlSelect != null\">${ew.sqlSelect}</when><otherwise>");

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/mapper/SqlHelper.java

@@ -15,10 +15,8 @@
  */
 package com.baomidou.mybatisplus.mapper;
 
-import com.baomidou.mybatisplus.entity.TableInfo;
-import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.toolkit.*;
+import java.util.List;
+
 import org.apache.ibatis.logging.Log;
 import org.apache.ibatis.logging.LogFactory;
 import org.apache.ibatis.session.Configuration;
@@ -26,7 +24,14 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 
-import java.util.List;
+import com.baomidou.mybatisplus.entity.TableInfo;
+import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.toolkit.GlobalConfigUtils;
+import com.baomidou.mybatisplus.toolkit.MapUtils;
+import com.baomidou.mybatisplus.toolkit.StringUtils;
+import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
 
 /**
  * <p>

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/mapper/Wrapper.java

@@ -120,6 +120,7 @@ public abstract class Wrapper<T> implements Serializable {
      * 使用字符串数组封装sqlSelect，便于在不需要指定 AS 的情况下通过实体类自动生成的列静态字段快速组装 sqlSelect，<br/>
      * 减少手动录入的错误率
      * </p>
+     *
      * @param columns 字段
      * @return
      */

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/plugins/Page.java

@@ -56,7 +56,7 @@ public class Page<T> extends Pagination {
         this.setOrderByField(orderByField);
     }
 
-	public Page(int current, int size, String orderByField, boolean isAsc) {
+    public Page(int current, int size, String orderByField, boolean isAsc) {
         this(current, size, orderByField);
         this.setAsc(isAsc);
     }

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/toolkit/Sequence.java

@@ -15,15 +15,16 @@
  */
 package com.baomidou.mybatisplus.toolkit;
 
-import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
-import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.logging.LogFactory;
-
 import java.lang.management.ManagementFactory;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.util.concurrent.ThreadLocalRandom;
 
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+
+import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+
 /**
  * <p>
  * 分布式高效有序ID生产黑科技(sequence) <br>

mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/toolkit/SqlUtils.java

@@ -17,9 +17,9 @@ package com.baomidou.mybatisplus.toolkit;
 
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.plugins.pagination.Pagination;
 import com.baomidou.mybatisplus.plugins.parser.ISqlParser;
 import com.baomidou.mybatisplus.plugins.parser.SqlInfo;
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
 
 /**
  * <p>
@@ -43,6 +43,7 @@ public class SqlUtils {
             //skip
         }
     }
+
     /**
      * <p>
      * 获取CountOptimize
@@ -62,7 +63,7 @@ public class SqlUtils {
                 // 默认 JsqlParser 优化 COUNT
                 try {
                     // TODO: 2017/11/20 这里我改动了下.
-                    COUNT_SQL_PARSER =  DEFAULT_CLASS.newInstance();
+                    COUNT_SQL_PARSER = DEFAULT_CLASS.newInstance();
                 } catch (Exception e) {
                     throw new MybatisPlusException(e);
                 }