Selaa lähdekoodia

optimization codes

Caratacus 8 vuotta sitten
vanhempi
commit
c30a059f99
23 muutettua tiedostoa jossa 51 lisäystä ja 84 poistoa
  1. 1 1
      src/main/java/com/baomidou/mybatisplus/MybatisConfiguration.java
  2. 1 1
      src/main/java/com/baomidou/mybatisplus/entity/TableFieldInfo.java
  3. 2 2
      src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java
  4. 1 1
      src/main/java/com/baomidou/mybatisplus/generator/config/rules/QuerySQL.java
  5. 1 1
      src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java
  6. 1 1
      src/main/java/com/baomidou/mybatisplus/mapper/EntityWrapper.java
  7. 0 31
      src/main/java/com/baomidou/mybatisplus/plugins/pagination/dialects/DB2Dialect.java
  8. 1 1
      src/main/java/com/baomidou/mybatisplus/toolkit/Sequence.java
  9. 3 3
      src/test/java/com/baomidou/mybatisplus/test/EntityWrapperTest.java
  10. 1 1
      src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java
  11. 1 1
      src/test/java/com/baomidou/mybatisplus/test/h2/H2LogicDeleteTest.java
  12. 0 2
      src/test/java/com/baomidou/mybatisplus/test/h2/H2UserAddrJoinTest.java
  13. 0 2
      src/test/java/com/baomidou/mybatisplus/test/h2/H2UserAutoincrementTest.java
  14. 0 2
      src/test/java/com/baomidou/mybatisplus/test/h2/H2UserDateVersionTest.java
  15. 16 14
      src/test/java/com/baomidou/mybatisplus/test/h2/H2UserNoOptLockTest.java
  16. 15 13
      src/test/java/com/baomidou/mybatisplus/test/h2/H2UserNoVersionTest.java
  17. 1 1
      src/test/java/com/baomidou/mybatisplus/test/h2/config/MybatisPlusLoginDeleteConfig.java
  18. 1 1
      src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserLogicDeleteMapper.java
  19. 1 1
      src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2UserLogicDelete.java
  20. 1 1
      src/test/java/com/baomidou/mybatisplus/test/h2/service/impl/H2UserLogicDeleteServiceImpl.java
  21. 1 1
      src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapperTest.java
  22. 1 1
      src/test/java/com/baomidou/mybatisplus/test/oracle/TestUserMapperTest.java
  23. 1 1
      src/test/java/com/baomidou/mybatisplus/test/oracle/mapper/TestSequserMapper.java

+ 1 - 1
src/main/java/com/baomidou/mybatisplus/MybatisConfiguration.java

@@ -72,7 +72,7 @@ public class MybatisConfiguration extends Configuration {
         } else {
             if (this.mappedStatements.containsKey(ms.getId())) {
                 /*
-				 * 说明已加载了xml中的节点; 忽略mapper中的SqlProvider数据
+                 * 说明已加载了xml中的节点; 忽略mapper中的SqlProvider数据
 				 */
                 logger.error("mapper[" + ms.getId() + "] is ignored, because it's exists, maybe from xml file");
                 return;

+ 1 - 1
src/main/java/com/baomidou/mybatisplus/entity/TableFieldInfo.java

@@ -118,7 +118,7 @@ public class TableFieldInfo {
         }
         tableInfo.setLogicDelete(this.initLogicDelete(globalConfig, field));
         /*
-		 * 保存当前字段的插入忽略,更新忽略值
+         * 保存当前字段的插入忽略,更新忽略值
 		 */
         this.fieldIgnore = tableField.ignore();
     }

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

@@ -428,9 +428,9 @@ public class ConfigBuilder {
             if ("auto_increment".equals(extra)) {
                 return true;
             }
-        }else if(QuerySQL.SQL_SERVER == this.querySQL){
+        } else if (QuerySQL.SQL_SERVER == this.querySQL) {
             int isIdentity = results.getInt("isIdentity");
-            return 1==isIdentity;
+            return 1 == isIdentity;
         }
         return false;
     }

+ 1 - 1
src/main/java/com/baomidou/mybatisplus/generator/config/rules/QuerySQL.java

@@ -52,7 +52,7 @@ public enum QuerySQL {
                     + " AND sysobjects.NAME = sysindexes.NAME AND sysindexkeys.id = syscolumns.id "
                     + " AND sysindexkeys.indid = sysindexes.indid "
                     + " AND syscolumns.colid = sysindexkeys.colid AND syscolumns.NAME = B.NAME) as 'KEY',"
-                    +"  b.is_identity isIdentity "
+                    + "  b.is_identity isIdentity "
                     + " FROM sys.TABLES a " + " INNER JOIN sys.COLUMNS b ON b.object_id = a.object_id "
                     + " LEFT JOIN sys.types ON b.user_type_id = sys.types.user_type_id   "
                     + " LEFT JOIN sys.extended_properties c ON c.major_id = b.object_id AND c.minor_id = b.column_id "

+ 1 - 1
src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -143,7 +143,7 @@ public class AutoSqlInjector implements ISqlInjector {
         this.injectDeleteByMapSql(mapperClass, table);
         /* 修改 */
         this.injectUpdateSql(mapperClass, modelClass, table);
-		/* 查询 */
+        /* 查询 */
         this.injectSelectByMapSql(mapperClass, modelClass, table);
         this.injectSelectOneSql(mapperClass, modelClass, table);
         this.injectSelectCountSql(mapperClass, modelClass, table);

+ 1 - 1
src/main/java/com/baomidou/mybatisplus/mapper/EntityWrapper.java

@@ -60,7 +60,7 @@ public class EntityWrapper<T> extends Wrapper<T> {
     @Override
     public String getSqlSegment() {
         /*
-		 * 无条件
+         * 无条件
 		 */
         String sqlWhere = sql.toString();
         if (StringUtils.isEmpty(sqlWhere)) {

+ 0 - 31
src/main/java/com/baomidou/mybatisplus/plugins/pagination/dialects/DB2Dialect.java

@@ -1,34 +1,3 @@
-/**
- * Copyright &copy; 2015-2015  Jeedcp All rights reserved.
- * <p>
- * Copyright (c) 2011-2014, hubin (jobob@qq.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- * <p>
- * Copyright (c) 2011-2014, hubin (jobob@qq.com).
- * <p>
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
 /**
  * Copyright (c) 2011-2014, hubin (jobob@qq.com).
  *

+ 1 - 1
src/main/java/com/baomidou/mybatisplus/toolkit/Sequence.java

@@ -95,7 +95,7 @@ public class Sequence {
 			 */
             mpid.append(name.split("@")[0]);
         }
-		/*
+        /*
 		 * MAC + PID 的 hashcode 获取16个低位
 		 */
         return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1);

+ 3 - 3
src/test/java/com/baomidou/mybatisplus/test/EntityWrapperTest.java

@@ -58,7 +58,7 @@ public class EntityWrapperTest {
         /*
          * 无条件测试
 		 */
-        Assert.assertEquals("",ew.originalSql());
+        Assert.assertEquals("", ew.originalSql());
     }
 
     @Test
@@ -75,7 +75,7 @@ public class EntityWrapperTest {
 
     @Test
     public void test12() {
-		/*
+        /*
 		 * 实体带where orderby
 		 */
         ew.setEntity(new User(1));
@@ -169,7 +169,7 @@ public class EntityWrapperTest {
     public void testNull() {
         ew.orderBy(null);
         String sqlPart = ew.originalSql();
-        Assert.assertEquals("",sqlPart);
+        Assert.assertEquals("", sqlPart);
     }
 
     @Test

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java

@@ -98,7 +98,7 @@ public class MysqlGenerator {
         // 自定义实体父类
         // strategy.setSuperEntityClass("com.baomidou.demo.TestEntity");
         // 自定义实体,公共字段
-        strategy.setSuperEntityColumns(new String[] { "test_id", "age" });
+        strategy.setSuperEntityColumns(new String[]{"test_id", "age"});
         // 自定义 mapper 父类
         // strategy.setSuperMapperClass("com.baomidou.demo.TestMapper");
         // 自定义 service 父类

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/h2/H2LogicDeleteTest.java

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

+ 0 - 2
src/test/java/com/baomidou/mybatisplus/test/h2/H2UserAddrJoinTest.java

@@ -1,7 +1,5 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;

+ 0 - 2
src/test/java/com/baomidou/mybatisplus/test/h2/H2UserAutoincrementTest.java

@@ -1,7 +1,5 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.Connection;

+ 0 - 2
src/test/java/com/baomidou/mybatisplus/test/h2/H2UserDateVersionTest.java

@@ -1,7 +1,5 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.Connection;

+ 16 - 14
src/test/java/com/baomidou/mybatisplus/test/h2/H2UserNoOptLockTest.java

@@ -1,9 +1,17 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.test.h2.service.IH2UserService;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import javax.sql.DataSource;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -14,16 +22,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.sql.DataSource;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.test.h2.service.IH2UserService;
 
 /**
  * <p>

+ 15 - 13
src/test/java/com/baomidou/mybatisplus/test/h2/H2UserNoVersionTest.java

@@ -1,9 +1,16 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserNoVersion;
-import com.baomidou.mybatisplus.test.h2.service.IH2UserNoVersionService;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.sql.DataSource;
+
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -14,15 +21,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.sql.DataSource;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserNoVersion;
+import com.baomidou.mybatisplus.test.h2.service.IH2UserNoVersionService;
 
 /**
  * <p>

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/h2/config/MybatisPlusLoginDeleteConfig.java

@@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean;
 
 /**
  * <p>
- *     逻辑删除boot方式注入
+ * 逻辑删除boot方式注入
  * </p>
  *
  * @author yuxiaobin

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserLogicDeleteMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserLogicDelete;
 
 /**
  * <p>
- *
+ * <p>
  * </p>
  *
  * @author yuxiaobin

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2UserLogicDelete.java

@@ -43,7 +43,7 @@ public class H2UserLogicDelete {
 
     private String desc;
 
-//    @Version
+    //    @Version
     @TableLogic
     private Integer version;
 

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/h2/service/impl/H2UserLogicDeleteServiceImpl.java

@@ -15,6 +15,6 @@ import com.baomidou.mybatisplus.test.h2.service.IH2UserLogicDeleteService;
  * @date 2017/6/15
  */
 @Service
-public class H2UserLogicDeleteServiceImpl extends ServiceImpl<H2UserLogicDeleteMapper, H2UserLogicDelete> implements IH2UserLogicDeleteService{
+public class H2UserLogicDeleteServiceImpl extends ServiceImpl<H2UserLogicDeleteMapper, H2UserLogicDelete> implements IH2UserLogicDeleteService {
 
 }

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapperTest.java

@@ -177,7 +177,7 @@ public class UserMapperTest {
         session.commit();
 
 		/*
-		 * 删除
+         * 删除
 		 */
         rlt = userMapper.deleteById(id);
         System.err.println("---------deleteById------- delete id=" + id + " ,result=" + rlt + "\n\n");

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/oracle/TestUserMapperTest.java

@@ -117,7 +117,7 @@ public class TestUserMapperTest {
             print(page.getRecords().get(i));
         }
         System.err.println(" 翻页:" + page.toString());
-		
+
 		/* 删除测试数据  */
         rlt = session.delete("deleteAll");
         System.err.println("清空测试数据! rlt=" + rlt);

+ 1 - 1
src/test/java/com/baomidou/mybatisplus/test/oracle/mapper/TestSequserMapper.java

@@ -13,5 +13,5 @@ import com.baomidou.mybatisplus.test.oracle.entity.TestSequser;
 public interface TestSequserMapper extends BaseMapper<TestSequser> {
 
     @Select("select * from TEST_SEQUSER")
-    public List<TestSequser> getList();
+    List<TestSequser> getList();
 }