From 372281520bf482bc64d3786d20f006f4364c6ace Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Fri, 7 Jul 2023 21:34:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=94=B9=20apt=20=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=86=85=E5=AE=B9=EF=BC=8C=E4=BD=BF=E4=B9=8B=E6=9B=B4?=
 =?UTF-8?q?=E5=8A=A0=E5=90=88=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processor/builder/ContentBuilder.java     | 38 ++++++++-----------
 1 file changed, 16 insertions(+), 22 deletions(-)

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 069388d0..a0935216 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
@@ -65,17 +65,11 @@ public class ContentBuilder {
         content.append("// Auto generate by mybatis-flex, do not modify it.\n");
         content.append("public class ").append(tableDefClassName).append(" extends TableDef {\n\n");
         if (!allInTablesEnable) {
-            String schema = !StrUtil.isBlank(table.schema())
-                    ? table.schema()
-                    : "";
-            String tableName = !StrUtil.isBlank(table.value())
-                    ? table.value()
-                    : StrUtil.firstCharToLowerCase(entityClassName);
             content.append("    public static final ").append(tableDefClassName).append(' ').append(StrUtil.buildFieldName(entityClassName.concat(tableDefInstanceSuffix != null ? tableDefInstanceSuffix.trim() : ""), tableDefPropertiesNameStyle))
-                    .append(" = new ").append(tableDefClassName).append("(\"").append(schema).append("\", \"").append(tableName).append("\");\n\n");
+                    .append(" = new ").append(tableDefClassName).append("();\n\n");
         }
         columnInfos.forEach((columnInfo) -> {
-            content.append("    public QueryColumn ")
+            content.append("    public final QueryColumn ")
                     .append(StrUtil.buildFieldName(columnInfo.getProperty(), tableDefPropertiesNameStyle))
                     .append(" = new QueryColumn(this, \"")
                     .append(columnInfo.getColumn()).append("\"");
@@ -84,16 +78,22 @@ public class ContentBuilder {
             }
             content.append(");\n");
         });
-        content.append("    public QueryColumn ").append(StrUtil.buildFieldName("allColumns", tableDefPropertiesNameStyle)).append(" = new QueryColumn(this, \"*\");\n");
+        content.append("\n    public final QueryColumn ").append(StrUtil.buildFieldName("allColumns", tableDefPropertiesNameStyle)).append(" = new QueryColumn(this, \"*\");\n");
         StringJoiner defaultColumnJoiner = new StringJoiner(", ");
         columnInfos.forEach((columnInfo) -> {
             if (defaultColumns.contains(columnInfo.getColumn())) {
                 defaultColumnJoiner.add(StrUtil.buildFieldName(columnInfo.getProperty(), tableDefPropertiesNameStyle));
             }
         });
-        content.append("    public QueryColumn[] ").append(StrUtil.buildFieldName("defaultColumns", tableDefPropertiesNameStyle)).append(" = new QueryColumn[]{").append(defaultColumnJoiner).append("};\n\n");
-        content.append("    public ").append(tableDefClassName).append("(String schema, String tableName) {\n")
-                .append("       super(schema, tableName);\n")
+        content.append("    public final QueryColumn[] ").append(StrUtil.buildFieldName("defaultColumns", tableDefPropertiesNameStyle)).append(" = new QueryColumn[]{").append(defaultColumnJoiner).append("};\n\n");
+        String schema = !StrUtil.isBlank(table.schema())
+                ? table.schema()
+                : "";
+        String tableName = !StrUtil.isBlank(table.value())
+                ? table.value()
+                : StrUtil.firstCharToLowerCase(entityClassName);
+        content.append("    public ").append(tableDefClassName).append("() {\n")
+                .append("        super").append("(\"").append(schema).append("\", \"").append(tableName).append("\");\n")
                 .append("    }\n\n}\n");
         return content.toString();
     }
@@ -107,8 +107,8 @@ public class ContentBuilder {
                 importBuilder.toString() +
                 "\n// Auto generate by mybatis-flex, do not modify it.\n" +
                 "public class " + tablesClassName + " {\n\n" +
-                "   private " + tablesClassName + "() {\n" +
-                "   }\n\n" +
+                "    private " + tablesClassName + "() {\n" +
+                "    }\n\n" +
                 fieldBuilder.toString() +
                 "\n}\n";
     }
@@ -121,15 +121,9 @@ public class ContentBuilder {
         String tableDefPackage = StrUtil.buildTableDefPackage(entityClass);
         String tableDefClassName = entityClassName.concat(tableDefClassSuffix);
         importBuilder.append("import ").append(tableDefPackage).append('.').append(tableDefClassName).append(";\n");
-        String schema = !StrUtil.isBlank(table.schema())
-                ? table.schema()
-                : "";
-        String tableName = !StrUtil.isBlank(table.value())
-                ? table.value()
-                : StrUtil.firstCharToLowerCase(entityClassName);
-        fieldBuilder.append("   public static final ").append(tableDefClassName).append(' ')
+        fieldBuilder.append("    public static final ").append(tableDefClassName).append(' ')
                 .append(StrUtil.buildFieldName(entityClassName.concat(tableDefInstanceSuffix != null ? tableDefInstanceSuffix.trim() : ""), tableDefPropertiesNameStyle))
-                .append(" = new ").append(tableDefClassName).append("(\"").append(schema).append("\", \"").append(tableName).append("\");\n");
+                .append(" = new ").append(tableDefClassName).append("();\n");
     }
 
 }
\ No newline at end of file