From a54b1709f6f6cb994824f61bd69534cad268f32f Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Fri, 16 Jun 2023 18:31:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=87=BD=E6=95=B0=E5=90=8D=E9=94=99?=
=?UTF-8?q?=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/mybatisflex/core/constant/SqlConsts.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/constant/SqlConsts.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/constant/SqlConsts.java
index 414b2564..bfd85606 100644
--- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/constant/SqlConsts.java
+++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/constant/SqlConsts.java
@@ -136,7 +136,7 @@ public final class SqlConsts {
// === SQL 函数名 ===
public static final String SUM = "SUM";
- public static final String MAX = "MIX";
+ public static final String MAX = "MAX";
public static final String MIN = "MIN";
public static final String AVG = "AVG";
public static final String DAY = "DAY";
From 5407a3384edbc938e8366e9271976ede282b8473 Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Fri, 16 Jun 2023 18:32:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=A6=82=E6=9E=9C=E5=AE=9E=E4=BD=93?=
=?UTF-8?q?=E7=B1=BB=E5=9C=A8=E5=A4=9A=E4=B8=AA=E5=8C=85=EF=BC=8C=E8=87=AA?=
=?UTF-8?q?=E5=8A=A8=E7=94=9F=E6=88=90=E8=BE=85=E5=8A=A9=E7=B1=BB=E4=BB=8D?=
=?UTF-8?q?=E5=9C=A8=E4=B8=80=E4=B8=AA=E5=8C=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processor/QueryEntityProcessor.java | 63 ++++++++++---------
1 file changed, 34 insertions(+), 29 deletions(-)
diff --git a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/QueryEntityProcessor.java b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/QueryEntityProcessor.java
index 7a803795..19c1d052 100644
--- a/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/QueryEntityProcessor.java
+++ b/mybatis-flex-processor/src/main/java/com/mybatisflex/processor/QueryEntityProcessor.java
@@ -1,17 +1,17 @@
-/**
- * Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
- *
- * 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.
+/*
+ * Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *
+ * 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.
*/
package com.mybatisflex.processor;
@@ -41,6 +41,7 @@ import java.sql.Timestamp;
import java.time.*;
import java.time.chrono.JapaneseDate;
import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
@@ -162,23 +163,14 @@ public class QueryEntityProcessor extends AbstractProcessor {
String[] entityIgnoreSuffixes = props.getProperties().getProperty("processor.entity.ignoreSuffixes", "").split(",");
- StringBuilder guessPackage = new StringBuilder();
+ AtomicReference entityClassName = new AtomicReference<>();
StringBuilder tablesContent = new StringBuilder();
roundEnv.getElementsAnnotatedWith(Table.class).forEach((Consumer) entityClassElement -> {
Table table = entityClassElement.getAnnotation(Table.class);
- //init genPackage
- if ((genTablesPackage == null || genTablesPackage.trim().length() == 0)
- && guessPackage.length() == 0) {
- String entityClassName = entityClassElement.toString();
- if (!entityClassName.contains(".")) {
- guessPackage.append("table");// = "table";
- } else {
- guessPackage.append(entityClassName.substring(0, entityClassName.lastIndexOf(".")) + ".table");
- }
- }
+ entityClassName.set(entityClassElement.toString());
String schema = table != null && table.value().trim().length() != 0
? table.schema()
@@ -216,7 +208,7 @@ public class QueryEntityProcessor extends AbstractProcessor {
}
//每一个 entity 生成一个独立的文件
else {
- String realGenPackage = genTablesPackage == null || genTablesPackage.trim().length() == 0 ? guessPackage.toString() : genTablesPackage;
+ String realGenPackage = isEmpty(genMappersPackage) ? guessTablesPackage(entityClassName.get()) : genTablesPackage;
String content = buildTablesClass(entitySimpleName, schema, tableName, propertyAndColumns, defaultColumns, tablesNameStyle
, tablesDefSuffix, realGenPackage, allInTables);
genClass(genPath, realGenPackage, entitySimpleName + "TableDef", content);
@@ -224,14 +216,13 @@ public class QueryEntityProcessor extends AbstractProcessor {
//是否开启 mapper 生成功能
if ("true".equalsIgnoreCase(mappersGenerateEnable) && table.mapperGenerateEnable()) {
- String realMapperPackage = genMappersPackage == null || genMappersPackage.trim().length() == 0
- ? guessMapperPackage(entityClassElement.toString()) : genMappersPackage;
+ String realMapperPackage = isEmpty(genMappersPackage) ? guessMapperPackage(entityClassElement.toString()) : genMappersPackage;
genMapperClass(genPath, realMapperPackage, entityClassElement.toString(), baseMapperClass, entitySimpleName);
}
});
if (allInTables && tablesContent.length() > 0) {
- String realGenPackage = genTablesPackage == null || genTablesPackage.trim().length() == 0 ? guessPackage.toString() : genTablesPackage;
+ String realGenPackage = isEmpty(genTablesPackage) ? guessTablesPackage(entityClassName.get()) : genTablesPackage;
genTablesClass(genPath, realGenPackage, className, tablesContent.toString());
}
@@ -240,6 +231,20 @@ public class QueryEntityProcessor extends AbstractProcessor {
return false;
}
+ private static boolean isEmpty(String str) {
+ return str == null || str.trim().length() == 0;
+ }
+
+ private String guessTablesPackage(String entityClassName) {
+ StringBuilder guessPackage = new StringBuilder();
+ if (!entityClassName.contains(".")) {
+ guessPackage.append("table");// = "table";
+ } else {
+ guessPackage.append(entityClassName, 0, entityClassName.lastIndexOf(".")).append(".table");
+ }
+ return guessPackage.toString();
+ }
+
private void fillPropertyAndColumns(Map propertyAndColumns, List defaultColumns, TypeElement classElement, boolean camelToUnderline) {
for (Element fieldElement : classElement.getEnclosedElements()) {
From 97ba1827df63f8a70732280896ae4d55c1ed65cf Mon Sep 17 00:00:00 2001
From: Suomm <1474983351@qq.com>
Date: Fri, 16 Jun 2023 18:32:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?test:=20=E6=B5=8B=E8=AF=95=E8=BE=85?=
=?UTF-8?q?=E5=8A=A9=E7=B1=BB=E7=94=9F=E6=88=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/mybatisflex/test/entity/Test.java | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/entity/Test.java
diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/entity/Test.java b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/entity/Test.java
new file mode 100644
index 00000000..966961c1
--- /dev/null
+++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/src/main/java/com/mybatisflex/test/entity/Test.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2022-2023, Mybatis-Flex (fuhai999@gmail.com).
+ *
+ * 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.
+ */
+
+package com.mybatisflex.test.entity;
+
+import com.mybatisflex.annotation.Table;
+
+/**
+ * @author 王帅
+ * @since 2023-06-16
+ */
+@Table("test")
+public class Test {
+}
\ No newline at end of file