format

src/main/java/com/baomidou/mybatisplus/MybatisDefaultParameterHandler.java

@@ -138,12 +138,12 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
                     if (map.containsKey("et")) {
                         Object et = map.get("et");
                         if (et != null) {
-                            if(et instanceof Map){
+                            if (et instanceof Map) {
                                 Map realEtMap = (Map) et;
-                                if(realEtMap.containsKey("MP_OPTLOCK_ET_ORIGINAL")){//refer to OptimisticLockerInterceptor.MP_OPTLOCK_ET_ORIGINAL
+                                if (realEtMap.containsKey("MP_OPTLOCK_ET_ORIGINAL")) {//refer to OptimisticLockerInterceptor.MP_OPTLOCK_ET_ORIGINAL
                                     tableInfo = TableInfoHelper.getTableInfo(realEtMap.get("MP_OPTLOCK_ET_ORIGINAL").getClass());
                                 }
-                            }else {
+                            } else {
                                 tableInfo = TableInfoHelper.getTableInfo(et.getClass());
                             }
                         }

src/main/java/com/baomidou/mybatisplus/entity/GlobalConfiguration.java

@@ -121,6 +121,7 @@ public class GlobalConfiguration implements Serializable {
     public void setDbTypeOfJdbcUrl(String jdbcUrl) {
         this.dbType = JdbcUtils.getDbType(jdbcUrl);
     }
+
     public void setDbType(String dbType) {
         this.dbType = DBType.getDBType(dbType);
     }

src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java

@@ -370,8 +370,8 @@ public class AutoGenerator {
         return !file.exists() || config.getGlobalConfig().isFileOverride();
     }
 
-
     // ==================================  相关配置  ==================================
+
     /**
      * 初始化配置
      */

src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java

@@ -307,7 +307,7 @@ public class ConfigBuilder {
     }
 
     /**
-     * <P>
+     * <p>
      * 处理表对应的类名称
      * </P>
      *

src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -588,7 +588,7 @@ public class AutoSqlInjector implements ISqlInjector {
     protected String sqlSelectColumns(TableInfo table, boolean entityWrapper) {
         StringBuilder columns = new StringBuilder();
         if (null != table.getResultMap()) {
-			/*
+            /*
 			 * 存在 resultMap 映射返回
 			 */
             if (entityWrapper) {

src/main/java/com/baomidou/mybatisplus/parser/AbstractSqlParser.java

@@ -36,7 +36,7 @@ public abstract class AbstractSqlParser {
      * 获取优化 SQL 方法
      * </p>
      *
-     * @param sql    SQL 语句
+     * @param sql SQL 语句
      * @return SQL 信息
      */
     public abstract SqlInfo optimizeSql(String sql);

src/main/java/com/baomidou/mybatisplus/plugins/OptimisticLockerInterceptor.java

@@ -83,7 +83,7 @@ public class OptimisticLockerInterceptor implements Interceptor {
             //    return invocation.proceed();
             //}
             Object et = null;
-            if(map.containsKey(NAME_ENTITY)){
+            if (map.containsKey(NAME_ENTITY)) {
                 et = map.get(NAME_ENTITY);
             }
             if (ew != null) {
@@ -98,7 +98,7 @@ public class OptimisticLockerInterceptor implements Interceptor {
                         }
                     }
                 }
-            } else if(et!=null) {
+            } else if (et != null) {
                 String methodId = ms.getId();
                 String updateMethodName = methodId.substring(ms.getId().lastIndexOf(".") + 1);
                 if (PARAM_UPDATE_METHOD_NAME.equals(updateMethodName)) {//update(entity, null) -->> update all. ignore version

src/main/java/com/baomidou/mybatisplus/plugins/PerformanceInterceptor.java

@@ -92,7 +92,7 @@ public class PerformanceInterceptor implements Interceptor {
 
         String originalSql = null;
         String stmtClassName = statement.getClass().getName();
-        if(DruidPooledPreparedStatement.equals(stmtClassName)){
+        if (DruidPooledPreparedStatement.equals(stmtClassName)) {
             try {
                 if (druidGetSQLMethod == null) {
                     Class<?> clazz = Class.forName(DruidPooledPreparedStatement);
@@ -104,7 +104,7 @@ public class PerformanceInterceptor implements Interceptor {
                 }
             } catch (Exception e) {
             }
-        }else if (T4CPreparedStatement.equals(stmtClassName)) {
+        } else if (T4CPreparedStatement.equals(stmtClassName)) {
             try {
                 if (oracleGetOriginalSqlMethod != null) {
                     Object stmtSql = oracleGetOriginalSqlMethod.invoke(statement);

src/main/java/com/baomidou/mybatisplus/plugins/pagination/DialectFactory.java

@@ -47,7 +47,7 @@ public class DialectFactory {
      *
      * @param page         翻页对象
      * @param buildSql     执行 SQL
-     * @param dbType  数据库类型
+     * @param dbType       数据库类型
      * @param dialectClazz 自定义方言实现类
      * @return
      * @throws Exception

src/main/java/com/baomidou/mybatisplus/plugins/tenancy/handler/RegxTenancyHandler.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.toolkit.PluginUtils;
  * @since 2017-06-20
  */
 public class RegxTenancyHandler implements TenancyHandler {
+
     //默认过滤还是忽略 true表示按租户过滤
     private boolean filterDefault = false;
     private Pattern tablePatterns[];

src/main/java/com/baomidou/mybatisplus/toolkit/JdbcUtils.java

@@ -50,7 +50,7 @@ public class JdbcUtils {
             return DBType.MYSQL;
         } else if (jdbcUrl.startsWith("jdbc:oracle:") || jdbcUrl.startsWith("jdbc:log4jdbc:oracle:")) {
             return DBType.ORACLE;
-        } else if (jdbcUrl.startsWith("jdbc:sqlserver:") || jdbcUrl.startsWith("jdbc:microsoft:") ) {
+        } else if (jdbcUrl.startsWith("jdbc:sqlserver:") || jdbcUrl.startsWith("jdbc:microsoft:")) {
             return DBType.SQLSERVER2005;
         } else if (jdbcUrl.startsWith("jdbc:sqlserver2012:")) {
             return DBType.SQLSERVER;

src/test/java/com/baomidou/mybatisplus/test/EntityWrapperTest.java

@@ -94,7 +94,7 @@ public class EntityWrapperTest {
 
     @Test
     public void test21() {
-		/*
+        /*
 		 * 无实体 where ifneed orderby
 		 */
         ew.where("name={0}", "'123'").addFilterIfNeed(false, "id=1").orderBy("id");

src/test/java/com/baomidou/mybatisplus/test/StringUtilsTest.java

@@ -31,8 +31,8 @@ import com.baomidou.mybatisplus.toolkit.StringUtils;
 public class StringUtilsTest {
 
     @Test
-    public void removePrefixAfterPrefixToLower(){
-        Assert.assertEquals("user", StringUtils.removePrefixAfterPrefixToLower( "isUser", 2 ));
-        Assert.assertEquals("userInfo", StringUtils.removePrefixAfterPrefixToLower( "isUserInfo", 2 ));
+    public void removePrefixAfterPrefixToLower() {
+        Assert.assertEquals("user", StringUtils.removePrefixAfterPrefixToLower("isUser", 2));
+        Assert.assertEquals("userInfo", StringUtils.removePrefixAfterPrefixToLower("isUserInfo", 2));
     }
 }

src/test/java/com/baomidou/mybatisplus/test/h2/H2LogicDeleteTest.java

@@ -83,7 +83,7 @@ public class H2LogicDeleteTest extends H2Test {
         Page page = new Page();
 
         page.setOrderByField("desc");
-        userService.selectPage(page, Condition.create().eq("desc","111"));
+        userService.selectPage(page, Condition.create().eq("desc", "111"));
         userService.deleteById(id);
         list = userService.selectList(ew);
         System.out.println("************************************");

src/test/java/com/baomidou/mybatisplus/test/h2/H2MetaObjAndVersionAndOptLockTest.java

@@ -36,7 +36,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserVersionAndLogicD
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {DBConfig.class, MybatisConfigMetaObjOptLockConfig.class})
-public class H2MetaObjAndVersionAndOptLockTest extends H2Test{
+public class H2MetaObjAndVersionAndOptLockTest extends H2Test {
 
     @BeforeClass
     public static void initDB() throws SQLException, IOException {
@@ -60,7 +60,7 @@ public class H2MetaObjAndVersionAndOptLockTest extends H2Test{
     H2UserVersionAndLogicDeleteMapper userMapper;
 
     @Test
-    public void testInsert(){
+    public void testInsert() {
         Long id = 991L;
         H2UserVersionAndLogicDeleteEntity user = new H2UserVersionAndLogicDeleteEntity();
         user.setId(id);

src/test/java/com/baomidou/mybatisplus/test/h2/H2MetaObjectHandlerTest.java

@@ -86,20 +86,20 @@ public class H2MetaObjectHandlerTest extends H2Test {
 
 
     @Test
-    public void testInsertMy(){
-        String name="QiPa";
-        int version =1;
+    public void testInsertMy() {
+        String name = "QiPa";
+        int version = 1;
         int row = userMapper.myInsertWithNameVersion(name, version);
         Assert.assertEquals(1, row);
     }
 
     @Test
-    public void testUpdateMy(){
+    public void testUpdateMy() {
         H2UserMetaObj user = new H2UserMetaObj();
         user.setName("myUpdate");
         user.setVersion(1);
         userMapper.insert(user);
-        Long id =user.getId();
+        Long id = user.getId();
         H2UserMetaObj dbUser = userMapper.selectById(id);
         Assert.assertNotNull(dbUser);
         Assert.assertEquals("myUpdate", dbUser.getName());

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserAutoincrementTest.java

@@ -77,20 +77,20 @@ public class H2UserAutoincrementTest extends H2Test {
 
 
     @Test
-    public void testInsertMy(){
-        String name="QiPa";
-        int version =1;
+    public void testInsertMy() {
+        String name = "QiPa";
+        int version = 1;
         int row = userMapper.myInsertWithNameVersion(name, version);
         Assert.assertEquals(1, row);
     }
 
     @Test
-    public void testUpdateMy(){
+    public void testUpdateMy() {
         H2UserMetaObj user = new H2UserMetaObj();
         user.setName("myUpdate");
         user.setVersion(1);
         userMapper.insert(user);
-        Long id =user.getId();
+        Long id = user.getId();
         H2UserMetaObj dbUser = userMapper.selectById(id);
         Assert.assertNotNull(dbUser);
         Assert.assertEquals("myUpdate", dbUser.getName());

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserExtendsTest.java

@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.test.h2.service.IH2UserExtendsService;
 
 /**
  * <p>
- *     #328 实体继承属性测试
+ * #328 实体继承属性测试
  * </p>
  *
  * @author yuxiaobin
@@ -37,7 +37,7 @@ import com.baomidou.mybatisplus.test.h2.service.IH2UserExtendsService;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = {ServiceConfig.class})
-public class H2UserExtendsTest extends H2Test{
+public class H2UserExtendsTest extends H2Test {
 
     @Autowired
     IH2UserExtendsService userService;
@@ -59,7 +59,7 @@ public class H2UserExtendsTest extends H2Test{
     }
 
     @Test
-    public void testInsert(){
+    public void testInsert() {
         H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
         user.setAge(1);
         user.setPrice(new BigDecimal("9.99"));
@@ -72,7 +72,7 @@ public class H2UserExtendsTest extends H2Test{
     }
 
     @Test
-    public void testUpdate(){
+    public void testUpdate() {
         H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
         user.setAge(1);
         user.setPrice(new BigDecimal("9.99"));
@@ -95,7 +95,7 @@ public class H2UserExtendsTest extends H2Test{
 
 
     @Test
-    public void testDelete(){
+    public void testDelete() {
         H2UserIntVersionExtendTO user = new H2UserIntVersionExtendTO();
         user.setAge(1);
         user.setPrice(new BigDecimal("9.91"));
@@ -164,7 +164,6 @@ public class H2UserExtendsTest extends H2Test{
     }
 
 
-
     @Test
     public void testUpdateByEntityWrapperOptLockWithoutVersionVal() {
         Long id = 993L;

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserNoOptLockTest.java

@@ -281,15 +281,15 @@ public class H2UserNoOptLockTest extends H2Test {
 
 
     @Test
-    public void testInsertMy(){
-        String name="QiPa";
-        int version =1;
+    public void testInsertMy() {
+        String name = "QiPa";
+        int version = 1;
         int row = userService.myInsert(name, version);
         Assert.assertEquals(1, row);
     }
 
     @Test
-    public void testUpdateMy(){
+    public void testUpdateMy() {
         Long id = 10087L;
         H2User user = new H2User();
         user.setId(id);
@@ -301,7 +301,7 @@ public class H2UserNoOptLockTest extends H2Test {
         Assert.assertNotNull(dbUser);
         Assert.assertEquals("myUpdate", dbUser.getName());
 
-        Assert.assertEquals(1,userService.myUpdate(id, "updateMy"));
+        Assert.assertEquals(1, userService.myUpdate(id, "updateMy"));
 
         dbUser = userService.selectById(id);
         Assert.assertNotNull(dbUser);

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserNoVersionTest.java

@@ -208,15 +208,15 @@ public class H2UserNoVersionTest extends H2Test {
 
 
     @Test
-    public void testInsertMy(){
-        String name="QiPa";
-        int version =1;
+    public void testInsertMy() {
+        String name = "QiPa";
+        int version = 1;
         int row = userMapper.myInsertWithNameVersion(name, version);
         Assert.assertEquals(1, row);
     }
 
     @Test
-    public void testUpdateMy(){
+    public void testUpdateMy() {
         Long id = 10087L;
         H2UserNoVersion user = new H2UserNoVersion();
         user.setId(id);

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -355,15 +355,15 @@ public class H2UserTest extends H2Test {
     }
 
     @Test
-    public void testInsertMy(){
-        String name="QiPa";
-        int version =1;
+    public void testInsertMy() {
+        String name = "QiPa";
+        int version = 1;
         int row = userService.myInsert(name, version);
         Assert.assertEquals(1, row);
     }
 
     @Test
-    public void testUpdateMy(){
+    public void testUpdateMy() {
         Long id = 10087L;
         H2User user = new H2User();
         user.setId(id);
@@ -375,7 +375,7 @@ public class H2UserTest extends H2Test {
         Assert.assertNotNull(dbUser);
         Assert.assertEquals("myUpdate", dbUser.getName());
 
-        Assert.assertEquals(1,userService.myUpdate(id, "updateMy"));
+        Assert.assertEquals(1, userService.myUpdate(id, "updateMy"));
 
         dbUser = userService.selectById(id);
         Assert.assertNotNull(dbUser);
@@ -386,13 +386,13 @@ public class H2UserTest extends H2Test {
 
 
     @Test
-    public void testCondition(){
-        Page<H2User> page = new Page<>(1,3);
-        Map<String,Object> condition = new HashMap<>();
-        condition.put("test_type",1);
+    public void testCondition() {
+        Page<H2User> page = new Page<>(1, 3);
+        Map<String, Object> condition = new HashMap<>();
+        condition.put("test_type", 1);
         page.setCondition(condition);
         Page<H2User> pageResult = userService.selectPage(page);
-        for(H2User u: pageResult.getRecords()){
+        for (H2User u : pageResult.getRecords()) {
             System.out.println(u);
         }
         System.out.println(pageResult.getTotal());

src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserVersionAndLogicDeleteMapper.java

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserVersionAndLogicD
  * @author yuxiaobin
  * @date 2017/6/29
  */
-public interface H2UserVersionAndLogicDeleteMapper extends BaseMapper<H2UserVersionAndLogicDeleteEntity>{
+public interface H2UserVersionAndLogicDeleteMapper extends BaseMapper<H2UserVersionAndLogicDeleteEntity> {
 
 }

src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2User.java

@@ -39,6 +39,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName
 public class H2User extends SuperEntity {
+
     /* 测试忽略验证 */
     private String name;
 

src/test/java/com/baomidou/mybatisplus/test/h2/service/IH2UserMetaobjService.java

@@ -10,6 +10,6 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserMetaObj;
  * @author yuxiaobin
  * @date 2017/6/27
  */
-public interface IH2UserMetaobjService extends IService<H2UserMetaObj>{
+public interface IH2UserMetaobjService extends IService<H2UserMetaObj> {
 
 }

src/test/java/com/baomidou/mybatisplus/test/h2/service/impl/H2UserSequenceServiceImpl.java

@@ -15,6 +15,6 @@ import com.baomidou.mybatisplus.test.h2.service.IH2UserSequenceService;
  * @date 2017/6/26
  */
 @Service
-public class H2UserSequenceServiceImpl extends ServiceImpl<H2UserSequenceMapper,H2UserSequence> implements IH2UserSequenceService {
+public class H2UserSequenceServiceImpl extends ServiceImpl<H2UserSequenceMapper, H2UserSequence> implements IH2UserSequenceService {
 
 }

src/test/java/com/baomidou/mybatisplus/test/oracle/OracleDruidTest.java

@@ -46,7 +46,7 @@ public class OracleDruidTest {
     }
 
     @Test
-    public void testInsert(){
+    public void testInsert() {
         TestSequser user = new TestSequser();
         user.setName("seqtest0627");
         user.setAge(12);

src/test/java/com/baomidou/mybatisplus/test/oracle/OracleUserTest.java

@@ -47,7 +47,7 @@ public class OracleUserTest {
     }
 
     @Test
-    public void testInsert(){
+    public void testInsert() {
         TestSequser user = new TestSequser();
         user.setName("seqtest0627");
         user.setAge(12);

src/test/java/com/baomidou/mybatisplus/test/oracle/config/DruidOracleDBConfig.java

@@ -21,7 +21,7 @@ import com.alibaba.druid.pool.DruidDataSource;
 public class DruidOracleDBConfig {
 
     @Bean
-    public DataSource getDruidDataSource(){
+    public DataSource getDruidDataSource() {
         DruidDataSource dataSource = new DruidDataSource();
         dataSource.setUrl("jdbc:oracle:thin:@192.168.10.169:1521:orcl");
         dataSource.setUsername("sa");

src/test/java/com/baomidou/mybatisplus/test/oracle/entity/BaseTestEntity.java

@@ -22,7 +22,7 @@ public class BaseTestEntity implements Serializable {
     @TableId(value = "TEST_ID", type = IdType.INPUT)
     private Long id;
 
-//    public BaseTestEntity() {
+    //    public BaseTestEntity() {
 //
 //    }
 //