admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

!136 optimize ContentBuilder

Browse Source 
Merge pull request !136 from 王帅/main
This commit is contained in:
Michael Yang 2023-07-14 05:17:21 +00:00 committed by Gitee
commit c984880c93
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mybatis-flex-processor/src/main/java/com/mybatisflex/processor/MybatisFlexProcessor.java
View File

@ -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);
}

21
mybatis-flex-processor/src/main/java/com/mybatisflex/processor/builder/ContentBuilder.java
View File

@ -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));
}