处理jsqlparser版本(不兼容改动,需要自行引入模块).

#6497
baomidou · Oct 19, 2024 · 37251cf · 37251cf
1 parent 9ae6730
commit 37251cf
Show file tree

Hide file tree

Showing 78 changed files with 5,817 additions and 11 deletions.
diff --git a/mybatis-plus-core/build.gradle b/mybatis-plus-core/build.gradle
@@ -1,6 +1,5 @@
 dependencies {
     api project(":mybatis-plus-annotation")
-    api "${lib.'jsqlparser'}"
     api "${lib.mybatis}"
 
     implementation "${lib.cglib}"

diff --git a/mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java b/mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/pom/GeneratePomTest.java
@@ -47,9 +47,6 @@ void test() throws IOException {
             Dependency mybatis = dependenciesMap.get("mybatis");
             Assertions.assertEquals("compile", mybatis.getScope());
             Assertions.assertFalse(mybatis.isOptional());
-            Dependency jsqlParser = dependenciesMap.get("jsqlparser");
-            Assertions.assertEquals("compile", jsqlParser.getScope());
-            Assertions.assertFalse(jsqlParser.isOptional());
             Dependency cglib = dependenciesMap.get("cglib");
             Assertions.assertEquals("compile", cglib.getScope());
             Assertions.assertTrue(cglib.isOptional());

diff --git a/mybatis-plus-extension/build.gradle b/mybatis-plus-extension/build.gradle
@@ -17,9 +17,6 @@ dependencies {
     implementation "${lib['mybatis-thymeleaf']}"
     implementation "${lib.'mybatis-velocity'}"
     implementation "${lib.'mybatis-freemarker'}"
-    implementation "de.ruedigermoeller:fst:3.0.4-jdk17"
-    implementation "com.github.ben-manes.caffeine:caffeine:2.9.3"
-    testImplementation "io.github.classgraph:classgraph:4.8.176"
     testImplementation "${lib."spring-context-support"}"
     testImplementation "${lib.h2}"
     testImplementation "${lib.mysql}"

diff --git a/...ava/com/baomidou/mybatisplus/test/extension/plugins/pagination/dialects/IDialectTest.java b/...ava/com/baomidou/mybatisplus/test/extension/plugins/pagination/dialects/IDialectTest.java
@@ -2,11 +2,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.DialectModel;
 import com.baomidou.mybatisplus.extension.plugins.pagination.dialects.IDialect;
-import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.util.ReflectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -36,7 +36,9 @@ void singleRealize() {
             DialectModel model = o.buildPaginationSql("select * from table", 1, 10);
             String sql = model.getDialectSql();
             if (!map.containsKey(sql)) {
-                map.put(sql, Lists.newArrayList(i));
+                ArrayList<Class<?>> list = new ArrayList<>();
+                list.add(i);
+                map.put(sql,list);
             } else {
                 map.get(sql).add(i);
             }

diff --git a/mybatis-plus-jsqlparser/build.gradle b/mybatis-plus-jsqlparser/build.gradle
@@ -0,0 +1 @@
+tasks.matching {it.group == 'publishing' || it.group == 'central publish' }.each { it.enabled = false }
diff --git a/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/build.gradle b/mybatis-plus-jsqlparser/mybatis-plus-jsqlparser-4.9/build.gradle
@@ -0,0 +1,14 @@
+dependencies {
+    api "com.github.jsqlparser:jsqlparser:4.9"
+    api project(":mybatis-plus-jsqlparser:mybatis-plus-jsqlparser-common")
+    implementation "${lib."slf4j-api"}"
+    implementation "de.ruedigermoeller:fst:3.0.3"
+    implementation "com.github.ben-manes.caffeine:caffeine:2.9.3"
+    testImplementation "io.github.classgraph:classgraph:4.8.176"
+    testImplementation "${lib."spring-context-support"}"
+    testImplementation "${lib.h2}"
+    testImplementation group: 'com.google.guava', name: 'guava', version: '33.3.1-jre'
+
+}
+
+compileJava.dependsOn(processResources)
diff --git a/.../extension/parser/JsqlParserFunction.java → .../extension/parser/JsqlParserFunction.java b/.../extension/parser/JsqlParserFunction.java → .../extension/parser/JsqlParserFunction.java
diff --git a/...us/extension/parser/JsqlParserGlobal.java → ...us/extension/parser/JsqlParserGlobal.java b/...us/extension/parser/JsqlParserGlobal.java → ...us/extension/parser/JsqlParserGlobal.java
diff --git a/...s/extension/parser/JsqlParserSupport.java → ...s/extension/parser/JsqlParserSupport.java b/...s/extension/parser/JsqlParserSupport.java → ...s/extension/parser/JsqlParserSupport.java
diff --git a/...cache/AbstractCaffeineJsqlParseCache.java → ...cache/AbstractCaffeineJsqlParseCache.java b/...cache/AbstractCaffeineJsqlParseCache.java → ...cache/AbstractCaffeineJsqlParseCache.java
diff --git a/...lparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java b/...lparser-4.9/src/main/java/com/baomidou/mybatisplus/extension/parser/cache/FstFactory.java
diff --git a/...ache/FstSerialCaffeineJsqlParseCache.java → ...ache/FstSerialCaffeineJsqlParseCache.java b/...ache/FstSerialCaffeineJsqlParseCache.java → ...ache/FstSerialCaffeineJsqlParseCache.java
diff --git a/...ache/JdkSerialCaffeineJsqlParseCache.java → ...ache/JdkSerialCaffeineJsqlParseCache.java b/...ache/JdkSerialCaffeineJsqlParseCache.java → ...ache/JdkSerialCaffeineJsqlParseCache.java
diff --git a/...xtension/parser/cache/JsqlParseCache.java → ...xtension/parser/cache/JsqlParseCache.java b/...xtension/parser/cache/JsqlParseCache.java → ...xtension/parser/cache/JsqlParseCache.java
diff --git a/...lugins/handler/DataPermissionHandler.java → ...lugins/handler/DataPermissionHandler.java b/...lugins/handler/DataPermissionHandler.java → ...lugins/handler/DataPermissionHandler.java
diff --git a/...s/handler/MultiDataPermissionHandler.java → ...s/handler/MultiDataPermissionHandler.java b/...s/handler/MultiDataPermissionHandler.java → ...s/handler/MultiDataPermissionHandler.java
diff --git a/...on/plugins/handler/TenantLineHandler.java → ...on/plugins/handler/TenantLineHandler.java b/...on/plugins/handler/TenantLineHandler.java → ...on/plugins/handler/TenantLineHandler.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		tasks.matching {it.group == 'publishing' \|\| it.group == 'central publish' }.each { it.enabled = false }