Code specification adjustment

build.gradle

@@ -16,7 +16,7 @@ ext {
 }
 
 group = 'com.baomidou'
-version = '2.1-beta'
+version = '2.1.0'
 
 description = "Mybatis 增强工具包 - 只做增强不做改变，简化CRUD操作"
 

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baomidou</groupId>
     <artifactId>mybatis-plus</artifactId>
-    <version>2.1-gamma</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
 
     <name>mybatis-plus</name>

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

@@ -589,7 +589,7 @@ public class AutoSqlInjector implements ISqlInjector {
         StringBuilder columns = new StringBuilder();
         if (null != table.getResultMap()) {
             /*
-			 * 存在 resultMap 映射返回
+             * 存在 resultMap 映射返回
 			 */
             if (entityWrapper) {
                 columns.append("<choose><when test=\"ew != null and ew.sqlSelect != null\">${ew.sqlSelect}</when><otherwise>");

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

@@ -178,7 +178,7 @@ public class LogicSqlInjector extends AutoSqlInjector {
         for (TableFieldInfo fieldInfo : fieldList) {
             if (fieldInfo.isLogicDelete()) {
                 sql.append(" AND ").append(fieldInfo.getColumn());
-                if ("java.lang.String".equals(fieldInfo.getPropertyType())) {
+                if (StringUtils.isCharSequence(fieldInfo.getPropertyType())) {
                     sql.append("='").append(fieldInfo.getLogicNotDeleteValue()).append("'");
                 } else {
                     sql.append("=").append(fieldInfo.getLogicNotDeleteValue());
@@ -206,7 +206,7 @@ public class LogicSqlInjector extends AutoSqlInjector {
                     set.append(",");
                 }
                 set.append(fieldInfo.getColumn()).append("=");
-                if ("java.lang.String".equals(fieldInfo.getPropertyType())) {
+                if (StringUtils.isCharSequence(fieldInfo.getPropertyType())) {
                     set.append("'").append(fieldInfo.getLogicDeleteValue()).append("'");
                 } else {
                     set.append(fieldInfo.getLogicDeleteValue());

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

@@ -102,7 +102,7 @@ public class PerformanceInterceptor implements Interceptor {
                 if (stmtSql != null && stmtSql instanceof String) {
                     originalSql = (String) stmtSql;
                 }
-            } catch (Exception e) {
+            } catch (Exception ignored) {
             }
         } else if (T4CPreparedStatement.equals(stmtClassName)) {
             try {

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

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

src/test/java/com/baomidou/mybatisplus/test/generator/MysqlGenerator.java

@@ -16,9 +16,9 @@
 package com.baomidou.mybatisplus.test.generator;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Arrays;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.enums.FieldFill;
@@ -142,7 +142,7 @@ public class MysqlGenerator {
                         map.put("abc", this.getConfig().getGlobalConfig().getAuthor() + "-mp");
                         this.setMap(map);
                     }
-                }.setFileOutConfigList(Arrays.<FileOutConfig>asList(new FileOutConfig("/templates/mapper.xml.vm") {
+                }.setFileOutConfigList(Collections.<FileOutConfig>singletonList(new FileOutConfig("/templates/mapper.xml.vm") {
                     // 自定义输出文件目录
                     @Override
                     public String outputFile(TableInfo tableInfo) {

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

@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.List;
 
 import javax.sql.DataSource;
 
@@ -18,10 +17,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2uuidMapper;
-import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Addr;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2uuid;
 
 /**

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

@@ -20,10 +20,10 @@ public interface H2UserDateVersionMapper extends BaseMapper<H2UserDateVersion> {
     @Insert(
             "insert into h2user(name,version) values(#{name},#{version})"
     )
-    public int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
+    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
 
     @Update(
             "update h2user set name=#{name} where test_id=#{id}"
     )
-    public int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
+    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
 }

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

@@ -19,10 +19,10 @@ public interface H2UserExtendsMapper extends BaseMapper<H2UserIntVersionExtendTO
     @Insert(
             "insert into h2user(name,version) values(#{name},#{version})"
     )
-    public int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
+    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
 
     @Update(
             "update h2user set name=#{name} where test_id=#{id}"
     )
-    public int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
+    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
 }

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

@@ -20,10 +20,10 @@ public interface H2UserLogicDeleteMapper extends BaseMapper<H2UserLogicDelete> {
     @Insert(
             "insert into h2user(name,version) values(#{name},#{version})"
     )
-    public int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
+    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
 
     @Update(
             "update h2user set name=#{name} where test_id=#{id}"
     )
-    public int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
+    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
 }

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

@@ -37,11 +37,11 @@ public interface H2UserMapper extends SuperMapper<H2User> {
     @Insert(
             "insert into h2user(name,version) values(#{name},#{version})"
     )
-    public int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
+    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
 
     @Update(
             "update h2user set name=#{name} where test_id=#{id}"
     )
-    public int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
+    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
 
 }

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

@@ -19,10 +19,10 @@ public interface H2UserMetaobjMapper extends BaseMapper<H2UserMetaObj> {
     @Insert(
             "insert into h2user(name,version) values(#{name},#{version})"
     )
-    public int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
+    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
 
     @Update(
             "update h2user set name=#{name} where test_id=#{id}"
     )
-    public int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
+    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
 }

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

@@ -20,10 +20,10 @@ public interface H2UserNoVersionMapper extends BaseMapper<H2UserNoVersion> {
     @Insert(
             "insert into h2user(name,version) values(#{name},#{version})"
     )
-    public int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
+    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
 
     @Update(
             "update h2user set name=#{name} where test_id=#{id}"
     )
-    public int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
+    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
 }

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

@@ -19,10 +19,10 @@ public interface H2UserSequenceExtendsMapper extends BaseMapper<H2UserSequenceEx
     @Insert(
             "insert into h2user(name,version) values(#{name},#{version})"
     )
-    public int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
+    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
 
     @Update(
             "update h2user set name=#{name} where test_id=#{id}"
     )
-    public int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
+    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
 }

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

@@ -19,10 +19,10 @@ public interface H2UserSequenceMapper extends BaseMapper<H2UserSequence> {
     @Insert(
             "insert into h2user(name,version) values(#{name},#{version})"
     )
-    public int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
+    int myInsertWithNameVersion(@Param("name") String name, @Param("version") int version);
 
     @Update(
             "update h2user set name=#{name} where test_id=#{id}"
     )
-    public int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
+    int myUpdateWithNameId(@Param("id") Long id, @Param("name") String name);
 }

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

@@ -16,9 +16,7 @@
 package com.baomidou.mybatisplus.test.h2.entity.persistent;
 
 import java.io.Serializable;
-import java.util.Date;
 
-import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;

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

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
  */
 public interface IH2UserService extends IService<H2User> {
 
-    public int myInsert(String name, int version);
+    int myInsert(String name, int version);
 
-    public int myUpdate(Long id, String name);
+    int myUpdate(Long id, String name);
 }