From ba26bbd936b9ef57982fe349e31b2f94929a26d6 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Fri, 14 Jul 2023 13:09:01 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=95=B4=E7=90=86=20ContentBuilder=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processor/MybatisFlexProcessor.java       |  2 +-
 .../processor/builder/ContentBuilder.java     | 21 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java
index 187ea028..780b20dc 100644
--- a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java
+++ b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java
@@ -204,7 +204,7 @@ public class MybatisFlexProcessor extends AbstractProcessor {
                     String realMapperPackage = StrUtil.isBlank(mapperPackage) ? StrUtil.buildMapperPackage(entityClass) : mapperPackage;
                     String mapperClassName = entityClassName.concat("Mapper");
                     boolean mapperAnnotationEnable = "true".equalsIgnoreCase(mapperAnnotation);
-                    String mapperClassContent = ContentBuilder.buildMapper(entityClass, entityClassName, realMapperPackage, mapperClassName, mapperBaseClass, mapperAnnotationEnable);
+                    String mapperClassContent = ContentBuilder.buildMapper(tableInfo, realMapperPackage, mapperClassName, mapperBaseClass, mapperAnnotationEnable);
                     processGenClass(genPath, realMapperPackage, mapperClassName, mapperClassContent);
                 }
 
diff --git a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java
index 142c9908..3bf30f6c 100644
--- a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java
+++ b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java
@@ -30,7 +30,7 @@ import java.util.StringJoiner;
  * @author 王帅
  * @since 2023-06-23
  */
-@SuppressWarnings("all")
+@SuppressWarnings({"squid:S107", "squid:S1192"})
 public class ContentBuilder {
 
     private ContentBuilder() {
@@ -39,19 +39,16 @@ public class ContentBuilder {
     /**
      * 构建 Mapper 文件内容。
      */
-    public static String buildMapper(String entityClass, String entityClassName,
-                                     String mappersPackage, String mapperClassName, String baseMapperClass, boolean mapperAnnotationEnable) {
+    public static String buildMapper(TableInfo tableInfo, String mappersPackage, String mapperClassName,
+                                     String baseMapperClass, boolean mapperAnnotationEnable) {
+        String entityClass = tableInfo.getEntityName();
         StringBuilder content = new StringBuilder("package ");
         content.append(mappersPackage).append(";\n\n");
-        content.append(mapperAnnotationEnable ? "" : "");
+        content.append("import ").append(baseMapperClass).append(";\n");
+        content.append("import ").append(entityClass).append(";\n\n");
         if (mapperAnnotationEnable) {
-            content.append("import org.apache.ibatis.annotations.Mapper;\n");
-            content.append("import ").append(baseMapperClass).append(";\n");
-            content.append("import ").append(entityClass).append(";\n\n");
+            content.append("import org.apache.ibatis.annotations.Mapper;\n\n");
             content.append("@Mapper\n");
-        } else {
-            content.append("import ").append(baseMapperClass).append(";\n");
-            content.append("import ").append(entityClass).append(";\n\n");
         }
         String realEntityClassName = StrUtil.getClassName(entityClass);
         String baseMapperClassName = StrUtil.getClassName(baseMapperClass);
@@ -82,7 +79,7 @@ public class ContentBuilder {
             content.append("    public static final ").append(tableDefClassName).append(' ').append(StrUtil.buildFieldName(tableInfo.getEntitySimpleName().concat(tableDefInstanceSuffix != null ? tableDefInstanceSuffix.trim() : ""), tableDefPropertiesNameStyle))
                 .append(" = new ").append(tableDefClassName).append("();\n\n");
         }
-        columnInfos.forEach((columnInfo) -> {
+        columnInfos.forEach(columnInfo -> {
             String comment = columnInfo.getComment();
             if (!StrUtil.isBlank(comment)) {
                 content.append("    /**\n")
@@ -103,7 +100,7 @@ public class ContentBuilder {
             .append("     */\n");
         content.append("    public final QueryColumn ").append(StrUtil.buildFieldName("allColumns", tableDefPropertiesNameStyle)).append(" = new QueryColumn(this, \"*\");\n");
         StringJoiner defaultColumnJoiner = new StringJoiner(", ");
-        columnInfos.forEach((columnInfo) -> {
+        columnInfos.forEach(columnInfo -> {
             if (defaultColumns.contains(columnInfo.getColumn())) {
                 defaultColumnJoiner.add(StrUtil.buildFieldName(columnInfo.getProperty(), tableDefPropertiesNameStyle));
             }