[maven-release-plugin] prepare release V1.2.16

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>com.itfsw</groupId>
     <artifactId>mybatis-generator-plugin</artifactId>
-    <version>1.2.15</version>
+    <version>1.2.16</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -97,16 +97,24 @@
             <version>[1.18.2,)</version>
             <scope>test</scope>
         </dependency>
-        <!-- lombok dependency -->
+        <!-- lombok 的测试用例依赖tools.jar, 但直接使用以下方式配置会导致gradle报错
+        解决办法：把tools.jar 安装进本地仓库！！
+        mvn install:install-file -DgroupId=jdk.tools -DartifactId=jdk.tools -Dpackaging=jar -Dversion=1.8 -Dfile=tools.jar
         <dependency>
             <groupId>com.sun</groupId>
             <artifactId>tools</artifactId>
             <version>1.8</version>
             <scope>system</scope>
             <optional>true</optional>
-            <!-- jdk path -->
             <systemPath>${env.JAVA_HOME}/lib/tools.jar</systemPath>
         </dependency>
+        -->
+        <dependency>
+            <groupId>jdk.tools</groupId>
+            <artifactId>jdk.tools</artifactId>
+            <version>1.8</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++profiles++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
@@ -234,7 +242,7 @@
         <connection>scm:git:https://github.com/itfsw/mybatis-generator-plugin.git</connection>
         <developerConnection>scm:git:https://github.com/itfsw/mybatis-generator-plugin.git</developerConnection>
         <url>https://github.com/itfsw/mybatis-generator-plugin</url>
-      <tag>V1.2.15</tag>
+      <tag>V1.2.16</tag>
   </scm>
 
     <!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++distribution++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->

src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java

@@ -177,10 +177,10 @@ public class LogicalDeletePlugin extends BasePlugin {
                             warnings.add("itfsw(逻辑删除插件):" + introspectedTable.getFullyQualifiedTable() + "没有找到您配置的逻辑删除值，请全局或者局部配置logicalDeleteValue和logicalUnDeleteValue值！");
                         } else {
                             // 兼容处理以前一些老用户配置的Long 和 Float配置问题
-                            if (this.logicalDeleteColumn.getFullyQualifiedJavaType().getFullyQualifiedName().equals(Long.class.getName())){
+                            if (this.logicalDeleteColumn.getFullyQualifiedJavaType().getFullyQualifiedName().equals(Long.class.getName())) {
                                 this.logicalUnDeleteValue = this.logicalUnDeleteValue.replaceAll("L|l", "");
                                 this.logicalDeleteValue = this.logicalDeleteValue.replaceAll("L|l", "");
-                            } else if (this.logicalDeleteColumn.getFullyQualifiedJavaType().getFullyQualifiedName().equals(Float.class.getName())){
+                            } else if (this.logicalDeleteColumn.getFullyQualifiedJavaType().getFullyQualifiedName().equals(Float.class.getName())) {
                                 this.logicalUnDeleteValue = this.logicalUnDeleteValue.replaceAll("F|f", "");
                                 this.logicalDeleteValue = this.logicalDeleteValue.replaceAll("F|f", "");
                             }
@@ -485,8 +485,8 @@ public class LogicalDeletePlugin extends BasePlugin {
 
                     // 常量放在字段开头
                     ArrayList<Field> fields = (ArrayList<Field>) topLevelClass.getFields();
-                    fields.add(logicalUnDeleteConstField);
-                    fields.add(logicalDeleteConstField);
+                    fields.add(0, logicalUnDeleteConstField);
+                    fields.add(0, logicalDeleteConstField);
                 }
             }
         }

src/test/java/com/itfsw/mybatis/generator/plugins/CommentPluginTest.java

@@ -51,7 +51,7 @@ public class CommentPluginTest {
      */
     @BeforeClass
     public static void init() throws Exception {
-        DBHelper.createDB("scripts/ComentPlugin/init.sql");
+        DBHelper.createDB("scripts/CommentPlugin/init.sql");
     }
 
     /**
@@ -59,7 +59,7 @@ public class CommentPluginTest {
      */
     @Test
     public void testGenerateWithoutTemplate() throws Exception {
-        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/ComentPlugin/mybatis-generator-without-template.xml");
+        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/CommentPlugin/mybatis-generator-without-template.xml");
         MyBatisGenerator myBatisGenerator = tool.generate();
         // 是否在使用系统默认模板
         int count = 0;
@@ -76,7 +76,7 @@ public class CommentPluginTest {
      */
     @Test
     public void testGenerateWithTemplate() throws Exception {
-        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/ComentPlugin/mybatis-generator.xml");
+        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/CommentPlugin/mybatis-generator.xml");
         MyBatisGenerator myBatisGenerator = tool.generate();
 
         // java中的注释
@@ -105,4 +105,31 @@ public class CommentPluginTest {
         String comment = ((TextElement) els.get(0)).getContent();
         Assert.assertEquals(comment, "addComment:BaseResultMap");
     }
+
+    /**
+     * 测试配置了模板参数转换
+     */
+    @Test
+    public void testGenerateWithOutComment() throws Exception {
+        MyBatisGeneratorTool tool = MyBatisGeneratorTool.create("scripts/CommentPlugin/mybatis-generator-without-comment.xml");
+        MyBatisGenerator myBatisGenerator = tool.generate();
+
+        // java中的注释
+        for (GeneratedJavaFile file : myBatisGenerator.getGeneratedJavaFiles()) {
+            if (file.getFileName().equals("Tb.java")) {
+                TopLevelClass topLevelClass = (TopLevelClass) file.getCompilationUnit();
+                // addJavaFileComment
+                Assert.assertEquals(topLevelClass.getFileCommentLines().size(), 0);
+                // addFieldComment
+                Field id = topLevelClass.getFields().get(0);
+                Assert.assertEquals(id.getJavaDocLines().size(), 0);
+                // addGeneralMethodComment
+                Method cons = topLevelClass.getMethods().get(0);
+                Assert.assertEquals(cons.getJavaDocLines().size(), 0);
+                // addSetterComment
+                Method setter = topLevelClass.getMethods().get(5);
+                Assert.assertEquals(setter.getJavaDocLines().size(), 0);
+            }
+        }
+    }
 }

src/test/resources/scripts/CommentPlugin/mybatis-generator-without-comment.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2019.
+  ~
+  ~ 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
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
+  -->
+
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+    <properties resource="db.properties"/>
+
+    <!--导入属性配置 -->
+    <context id="default" targetRuntime="MyBatis3">
+        <!-- 插件 -->
+        <!-- 注释插件 -->
+        <plugin type="com.itfsw.mybatis.generator.plugins.CommentPlugin"/>
+
+        <commentGenerator>
+            <property name="suppressAllComments" value="true"/>
+        </commentGenerator>
+        <!--jdbc的数据库连接 -->
+        <jdbcConnection driverClass="${driver}" connectionURL="${url}" userId="${username}" password="${password}" />
+        <!-- Model模型生成器,用来生成含有主键key的类，记录类 以及查询Example类
+            targetPackage     指定生成的model生成所在的包名
+            targetProject     指定在该项目下所在的路径  -->
+        <javaModelGenerator targetPackage="" targetProject="">
+            <!-- 是否对model添加 构造函数 -->
+            <property name="constructorBased" value="true"/>
+            <!-- 给Model添加一个父类 -->
+            <!--<property name="rootClass" value="com.itfsw.base"/>-->
+        </javaModelGenerator>
+        <!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
+        <sqlMapGenerator targetPackage="" targetProject="" />
+        <!-- 客户端代码，生成易于使用的针对Model对象和XML配置文件 的代码
+            type="ANNOTATEDMAPPER",生成Java Model 和基于注解的Mapper对象
+            type="MIXEDMAPPER",生成基于注解的Java Model 和相应的Mapper对象
+            type="XMLMAPPER",生成SQLMap XML文件和独立的Mapper接口 -->
+        <javaClientGenerator targetPackage="" targetProject="" type="XMLMAPPER"/>
+
+        <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 要自动生成的表 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+        <table tableName="tb">
+            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
+        </table>
+    </context>
+</generatorConfiguration>

src/test/resources/scripts/CommentPlugin/mybatis-generator.xml

@@ -26,7 +26,7 @@
         <!-- 插件 -->
         <!-- 注释插件 -->
         <plugin type="com.itfsw.mybatis.generator.plugins.CommentPlugin">
-            <property name="template" value="src/test/resources/scripts/ComentPlugin/test-comment.ftl"/>
+            <property name="template" value="src/test/resources/scripts/CommentPlugin/test-comment.ftl"/>
         </plugin>
 
         <commentGenerator>