From 14ea2c45b0dd0467b623a6e8b4687e4a3b3f8f9f Mon Sep 17 00:00:00 2001 From: yulichang <570810310@qq.com> Date: Sun, 27 Oct 2024 21:45:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsqlparser/v46/JSqlParserHelperV46.java | 8 +- .../adapter/jsqlparser/JSqlParserHelper.java | 7 +- .../yulichang/adapter/base/IAdapter.java | 4 + .../base/tookit/CharSequenceUtils.java | 12 +++ .../mybatis-plus-join-adapter-v320/pom.xml | 49 ++++++++++ .../yulichang/adapter/v320/Adapter320.java | 98 +++++++++++++++++++ .../yulichang/adapter/v33x/Adapter33x.java | 8 +- .../yulichang/adapter/v3431/Adapter3431.java | 3 +- mybatis-plus-join-adapter/pom.xml | 1 + .../MybatisPlusJoinAutoConfiguration.java | 3 +- mybatis-plus-join-core/pom.xml | 5 + .../yulichang/adapter/AdapterHelper.java | 7 +- .../yulichang/config/enums/IfExistsEnum.java | 6 +- .../extension/apt/AptAbstractWrapper.java | 22 ++--- .../extension/apt/AptQueryWrapper.java | 3 +- .../extension/apt/JoinAbstractWrapper.java | 13 +-- .../extension/apt/resultmap/Result.java | 4 +- .../apt/toolkit/AptWrapperUtils.java | 24 ++--- .../extension/kt/KtAbstractLambdaWrapper.java | 9 +- .../extension/kt/KtAbstractWrapper.java | 17 ++-- .../extension/kt/KtDeleteJoinWrapper.java | 9 +- .../extension/kt/KtLambdaWrapper.java | 3 +- .../extension/kt/KtUpdateJoinWrapper.java | 9 +- .../extension/kt/interfaces/QueryLabel.java | 6 +- .../extension/kt/resultmap/Result.java | 4 +- .../extension/kt/toolkit/KtWrapperUtils.java | 22 ++--- .../yulichang/interceptor/MPJInterceptor.java | 9 +- .../yulichang/method/MPJBaseMethod.java | 12 +-- .../yulichang/method/mp/SelectList.java | 4 +- .../yulichang/method/mp/SelectMaps.java | 4 +- .../yulichang/method/mp/SelectMapsPage.java | 4 +- .../yulichang/method/mp/SelectObjs.java | 4 +- .../github/yulichang/method/mp/SelectOne.java | 4 +- .../yulichang/method/mp/SelectPage.java | 4 +- .../query/MPJLambdaQueryWrapper.java | 5 +- .../yulichang/query/MPJQueryWrapper.java | 5 +- .../toolkit/MPJTableMapperHelper.java | 3 +- .../{MPJStringUtils.java => StrUtils.java} | 26 ++--- .../yulichang/toolkit/WrapperUtils.java | 13 ++- .../yulichang/toolkit/sql/SqlScriptUtils.java | 20 ++-- .../yulichang/wrapper/DeleteJoinWrapper.java | 9 +- .../wrapper/JoinAbstractLambdaWrapper.java | 11 +-- .../wrapper/JoinAbstractWrapper.java | 16 +-- .../yulichang/wrapper/MPJLambdaWrapper.java | 6 +- .../yulichang/wrapper/UpdateJoinWrapper.java | 6 +- .../wrapper/interfaces/QueryLabel.java | 6 +- .../yulichang/wrapper/resultmap/Result.java | 4 +- .../wrapper/segments/SelectCache.java | 4 +- .../mapping/mapper/MPJMappingWrapper.java | 12 +-- .../mapping/mapper/MPJTableFieldInfo.java | 24 +++-- .../test/config/MybatisPlusConfig.java | 6 +- .../yulichang/test/util/ThreadLocalUtils.java | 8 +- .../test/join/LambdaWrapperTest.java | 8 +- .../test/join/apt/AptWrapperTest.java | 8 +- .../yulichang/test/kt/LambdaWrapperTest.kt | 8 +- 55 files changed, 390 insertions(+), 219 deletions(-) create mode 100644 mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/tookit/CharSequenceUtils.java create mode 100644 mybatis-plus-join-adapter/mybatis-plus-join-adapter-v320/pom.xml create mode 100644 mybatis-plus-join-adapter/mybatis-plus-join-adapter-v320/src/main/java/com/github/yulichang/adapter/v320/Adapter320.java rename mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/{MPJStringUtils.java => StrUtils.java} (95%) diff --git a/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/src/main/java/com/github/yulichang/adapter/jsqlparser/v46/JSqlParserHelperV46.java b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/src/main/java/com/github/yulichang/adapter/jsqlparser/v46/JSqlParserHelperV46.java index 81b397c..b5feeb9 100644 --- a/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/src/main/java/com/github/yulichang/adapter/jsqlparser/v46/JSqlParserHelperV46.java +++ b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser-v46/src/main/java/com/github/yulichang/adapter/jsqlparser/v46/JSqlParserHelperV46.java @@ -2,7 +2,6 @@ package com.github.yulichang.adapter.jsqlparser.v46; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import net.sf.jsqlparser.parser.CCJSqlParserUtil; import net.sf.jsqlparser.schema.Column; import net.sf.jsqlparser.statement.Statement; @@ -41,7 +40,7 @@ public class JSqlParserHelperV46 { } else { col = selectExpressionItem.getAlias().getName(); } - if (StringUtils.isNotBlank(col)) { + if (isNotBlank(col)) { columConsumer.accept(col); } } @@ -56,4 +55,9 @@ public class JSqlParserHelperV46 { throw new RuntimeException(throwable); } } + + + public static boolean isNotBlank(String str) { + return str != null && !str.trim().isEmpty(); + } } diff --git a/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/src/main/java/com/github/yulichang/adapter/jsqlparser/JSqlParserHelper.java b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/src/main/java/com/github/yulichang/adapter/jsqlparser/JSqlParserHelper.java index ba461ee..af69761 100644 --- a/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/src/main/java/com/github/yulichang/adapter/jsqlparser/JSqlParserHelper.java +++ b/mybatis-plus-join-adapter/jsqlparser/mybatis-plus-join-adapter-jsqlparser/src/main/java/com/github/yulichang/adapter/jsqlparser/JSqlParserHelper.java @@ -2,7 +2,6 @@ package com.github.yulichang.adapter.jsqlparser; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import net.sf.jsqlparser.parser.CCJSqlParserUtil; import net.sf.jsqlparser.schema.Column; import net.sf.jsqlparser.statement.Statement; @@ -38,7 +37,7 @@ public class JSqlParserHelper { } else { col = item.getAlias().getName(); } - if (StringUtils.isNotBlank(col)) { + if (isNotBlank(col)) { columConsumer.accept(col); } } @@ -51,4 +50,8 @@ public class JSqlParserHelper { throw new RuntimeException(throwable); } } + + public static boolean isNotBlank(String str) { + return str != null && !str.trim().isEmpty(); + } } diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java index fe32e09..f3bad91 100644 --- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java +++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/IAdapter.java @@ -38,6 +38,10 @@ public interface IAdapter { return tableFieldInfo.isPrimitive(); } + default boolean isWithUpdateFill(TableFieldInfo tableFieldInfo) { + return tableFieldInfo.isWithUpdateFill(); + } + default String mpjMapping(TableFieldInfo tableFieldInfo) { return tableFieldInfo.getMapping(); } diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/tookit/CharSequenceUtils.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/tookit/CharSequenceUtils.java new file mode 100644 index 0000000..43c06c9 --- /dev/null +++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-base/src/main/java/com/github/yulichang/adapter/base/tookit/CharSequenceUtils.java @@ -0,0 +1,12 @@ +package com.github.yulichang.adapter.base.tookit; + +public class CharSequenceUtils { + + public static boolean isBlank(String str) { + return str == null || str.trim().isEmpty(); + } + + public static boolean isNotBlank(String str) { + return !isBlank(str); + } +} diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v320/pom.xml b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v320/pom.xml new file mode 100644 index 0000000..fbf176b --- /dev/null +++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v320/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + com.github.yulichang + mybatis-plus-join-adapter + ${revision} + + mybatis-plus-join-adapter-v320 + ${revision} + mybatis-plus-join-adapter-v320 + + An enhanced toolkit of Mybatis-Plus to simplify development. + https://github.com/yulichang/mybatis-plus-join + + + The Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + mybatis-plus-join + yulichang + yu_lichang@qq.com + + + + scm:git:https://github.com/yulichang/mybatis-plus-join.git + scm:git:https://github.com/yulichang/mybatis-plus-join.git + https://github.com/yulichang/mybatis-plus-join + + + + + com.github.yulichang + mybatis-plus-join-adapter-base + ${revision} + + + com.baomidou + mybatis-plus-boot-starter + 3.2.0 + provided + + + diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v320/src/main/java/com/github/yulichang/adapter/v320/Adapter320.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v320/src/main/java/com/github/yulichang/adapter/v320/Adapter320.java new file mode 100644 index 0000000..3b5eca6 --- /dev/null +++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v320/src/main/java/com/github/yulichang/adapter/v320/Adapter320.java @@ -0,0 +1,98 @@ +package com.github.yulichang.adapter.v320; + +import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import com.baomidou.mybatisplus.core.toolkit.StringPool; +import com.github.yulichang.adapter.base.IAdapter; +import com.github.yulichang.adapter.base.metadata.OrderFieldInfo; +import com.github.yulichang.adapter.base.tookit.CharSequenceUtils; +import com.github.yulichang.adapter.jsqlparser.v46.JSqlParserHelperV46; +import org.apache.ibatis.plugin.Interceptor; +import org.apache.ibatis.session.Configuration; +import org.apache.ibatis.type.TypeHandler; +import org.apache.ibatis.type.TypeHandlerRegistry; + +import java.lang.reflect.Field; +import java.util.List; +import java.util.Objects; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.function.Supplier; + +/** + * @author yulichang + * @since 1.4.3 + */ +public class Adapter320 implements IAdapter { + + @Override + public boolean mpjHasLogic(TableInfo tableInfo) { + return tableInfo.isLogicDelete(); + } + + @Override + public boolean mpjIsPrimitive(TableFieldInfo tableFieldInfo) { + return tableFieldInfo.getPropertyType().isPrimitive(); + } + + @Override + public boolean isWithUpdateFill(TableFieldInfo tableFieldInfo) { + return false; + } + + @Override + public String mpjMapping(TableFieldInfo tableFieldInfo) { + String el = tableFieldInfo.getEl(); + if (el != null && el.contains(StringPool.COMMA)) { + return el.substring(el.indexOf(StringPool.COMMA) + 1); + } + return null; + } + + @Override + public TableFieldInfo mpjGetLogicField(TableInfo tableInfo) { + return tableInfo.getFieldList().stream().filter(f -> Objects.nonNull(f.getLogicDeleteValue()) + || Objects.nonNull(f.getLogicNotDeleteValue())).findFirst().orElse(null); + } + + @Override + public boolean mpjHasPK(TableInfo tableInfo) { + return CharSequenceUtils.isNotBlank(tableInfo.getKeyProperty()) || + CharSequenceUtils.isNotBlank(tableInfo.getKeyColumn()); + } + + @Override + public Configuration mpjGetConfiguration(TableInfo tableInfo) { + return tableInfo.getConfiguration(); + } + + @Override + public Field mpjGetField(TableFieldInfo fieldInfo, Supplier supplier) { + return supplier.get(); + } + + @Override + public List mpjGetOrderField(TableInfo tableInfo) { + throw new UnsupportedOperationException("不支持排序"); + } + + @Override + public void parserColum(String alias, String from, String selectSql, Consumer columConsumer) { + JSqlParserHelperV46.parserColum(alias, from, selectSql, columConsumer); + } + + @Override + public TypeHandler getTypeHandler(Configuration configuration, Class propertyType, Class> typeHandlerClass, Field field) { + TypeHandlerRegistry registry = configuration.getTypeHandlerRegistry(); + TypeHandler typeHandler = registry.getMappingTypeHandler(typeHandlerClass); + if (typeHandler == null) { + typeHandler = registry.getInstance(propertyType, typeHandlerClass); + } + return typeHandler; + } + + @Override + public void wrapperInnerPage(Interceptor interceptor, Predicate predicate, Function function) { + } +} diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/Adapter33x.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/Adapter33x.java index da166f4..3c8f3f4 100644 --- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/Adapter33x.java +++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v33x/src/main/java/com/github/yulichang/adapter/v33x/Adapter33x.java @@ -3,9 +3,9 @@ package com.github.yulichang.adapter.v33x; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.base.IAdapter; import com.github.yulichang.adapter.base.metadata.OrderFieldInfo; +import com.github.yulichang.adapter.base.tookit.CharSequenceUtils; import com.github.yulichang.adapter.base.tookit.VersionUtils; import com.github.yulichang.adapter.jsqlparser.v46.JSqlParserHelperV46; import org.apache.ibatis.plugin.Interceptor; @@ -42,7 +42,7 @@ public class Adapter33x implements IAdapter { @Override public String mpjMapping(TableFieldInfo tableFieldInfo) { String el = tableFieldInfo.getEl(); - if (StringUtils.isNotBlank(el) && el.contains(StringPool.COMMA)) { + if (el != null && el.contains(StringPool.COMMA)) { return el.substring(el.indexOf(StringPool.COMMA) + 1); } return null; @@ -56,8 +56,8 @@ public class Adapter33x implements IAdapter { @Override public boolean mpjHasPK(TableInfo tableInfo) { - return StringUtils.isNotBlank(tableInfo.getKeyProperty()) || - StringUtils.isNotBlank(tableInfo.getKeyColumn()); + return CharSequenceUtils.isNotBlank(tableInfo.getKeyProperty()) || + CharSequenceUtils.isNotBlank(tableInfo.getKeyColumn()); } @Override diff --git a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/Adapter3431.java b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/Adapter3431.java index 04f3f84..4480b37 100644 --- a/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/Adapter3431.java +++ b/mybatis-plus-join-adapter/mybatis-plus-join-adapter-v3431/src/main/java/com/github/yulichang/adapter/v3431/Adapter3431.java @@ -3,7 +3,6 @@ package com.github.yulichang.adapter.v3431; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.base.IAdapter; import com.github.yulichang.adapter.base.metadata.OrderFieldInfo; import com.github.yulichang.adapter.base.tookit.VersionUtils; @@ -34,7 +33,7 @@ public class Adapter3431 implements IAdapter { public String mpjMapping(TableFieldInfo tableFieldInfo) { if (v) { String el = tableFieldInfo.getEl(); - if (StringUtils.isNotBlank(el) && el.contains(StringPool.COMMA)) { + if (el != null && el.contains(StringPool.COMMA)) { return el.substring(el.indexOf(StringPool.COMMA) + 1); } return null; diff --git a/mybatis-plus-join-adapter/pom.xml b/mybatis-plus-join-adapter/pom.xml index 32e3645..0db57ed 100644 --- a/mybatis-plus-join-adapter/pom.xml +++ b/mybatis-plus-join-adapter/pom.xml @@ -14,6 +14,7 @@ mybatis-plus-join-adapter-base + mybatis-plus-join-adapter-v320 mybatis-plus-join-adapter-v33x mybatis-plus-join-adapter-v3431 mybatis-plus-join-adapter-v352 diff --git a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java index ff650db..c628747 100644 --- a/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java +++ b/mybatis-plus-join-boot-starter/src/main/java/com/github/yulichang/autoconfigure/MybatisPlusJoinAutoConfiguration.java @@ -1,6 +1,5 @@ package com.github.yulichang.autoconfigure; -import com.baomidou.mybatisplus.autoconfigure.MybatisPlusLanguageDriverAutoConfiguration; import com.baomidou.mybatisplus.core.injector.ISqlInjector; import com.github.yulichang.autoconfigure.conditional.JoinSqlInjectorCondition; import com.github.yulichang.autoconfigure.consumer.MybatisPlusJoinIfExistsConsumer; @@ -54,7 +53,7 @@ import java.util.Optional; @ConditionalOnClass({SqlSessionFactory.class, SqlSessionFactoryBean.class}) @ConditionalOnSingleCandidate(DataSource.class) @EnableConfigurationProperties(MybatisPlusJoinProperties.class) -@AutoConfigureAfter({DataSourceAutoConfiguration.class, MybatisPlusLanguageDriverAutoConfiguration.class}) +@AutoConfigureAfter(DataSourceAutoConfiguration.class) public class MybatisPlusJoinAutoConfiguration { private static final Logger logger = LoggerFactory.getLogger(MybatisPlusJoinAutoConfiguration.class); diff --git a/mybatis-plus-join-core/pom.xml b/mybatis-plus-join-core/pom.xml index 39886ce..4e143b4 100644 --- a/mybatis-plus-join-core/pom.xml +++ b/mybatis-plus-join-core/pom.xml @@ -39,6 +39,11 @@ mybatis-plus-join-annotation ${revision} + + com.github.yulichang + mybatis-plus-join-adapter-v320 + ${revision} + com.github.yulichang mybatis-plus-join-adapter-v33x diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java index 128ef6a..a05fe00 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/adapter/AdapterHelper.java @@ -3,6 +3,7 @@ package com.github.yulichang.adapter; import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils; import com.github.yulichang.adapter.base.IAdapter; import com.github.yulichang.adapter.base.tookit.VersionUtils; +import com.github.yulichang.adapter.v320.Adapter320; import com.github.yulichang.adapter.v33x.Adapter33x; import com.github.yulichang.adapter.v3431.Adapter3431; import com.github.yulichang.adapter.v355.Adapter355; @@ -21,7 +22,7 @@ public class AdapterHelper { static { - String lastAdapter = "3.5.8"; + String lastAdapter = "3.5.9"; String version = Optional.ofNullable(VersionUtils.getVersion()).orElse(lastAdapter); if (VersionUtils.compare(version, "3.5.6") >= 0) { @@ -32,8 +33,10 @@ public class AdapterHelper { adapter = new Adapter3431(); } else if (VersionUtils.compare(version, "3.3.0") >= 0) { adapter = new Adapter33x(); + } else if (VersionUtils.compare(version, "3.2.0") >= 0) { + adapter = new Adapter320(); } else { - throw ExceptionUtils.mpe("MPJ需要MP版本3.3.0+，当前MP版本%s", version); + throw ExceptionUtils.mpe("MPJ需要MP版本3.2.0+，当前MP版本%s", version); } } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfExistsEnum.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfExistsEnum.java index 1d79b6f..3aeef2e 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfExistsEnum.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/config/enums/IfExistsEnum.java @@ -1,6 +1,6 @@ package com.github.yulichang.config.enums; -import com.github.yulichang.toolkit.MPJStringUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.wrapper.interfaces.MPredicate; import java.io.Serializable; @@ -21,11 +21,11 @@ public enum IfExistsEnum implements MPredicate, Serializable { /** * 非空字符串 例： "" -> false, " " -> true ... */ - NOT_EMPTY(val -> NOT_NULL.and(v -> !(v instanceof CharSequence) || MPJStringUtils.isNotEmpty((CharSequence) v)).test(val)), + NOT_EMPTY(val -> NOT_NULL.and(v -> !(v instanceof CharSequence) || StrUtils.isNotEmpty((CharSequence) v)).test(val)), /** * NOT_BLANK 非空白字符串 例： "" -> false, " " -> false, "\r" -> false, "abc" -> true ... */ - NOT_BLANK(val -> NOT_NULL.and(v -> !(v instanceof CharSequence) || MPJStringUtils.isNotBlank((CharSequence) v)).test(val)); + NOT_BLANK(val -> NOT_NULL.and(v -> !(v instanceof CharSequence) || StrUtils.isNotBlank((CharSequence) v)).test(val)); private final MPredicate predicate; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptAbstractWrapper.java index a3f8292..1b82c6b 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptAbstractWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptAbstractWrapper.java @@ -6,18 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.adapter.AdapterHelper; -import com.github.yulichang.extension.apt.matedata.BaseColumn; -import com.github.yulichang.extension.apt.matedata.Column; import com.github.yulichang.config.ConfigProperties; import com.github.yulichang.config.enums.LogicDelTypeEnum; import com.github.yulichang.extension.apt.interfaces.QueryJoin; -import com.github.yulichang.toolkit.Constant; -import com.github.yulichang.toolkit.LogicInfoUtils; -import com.github.yulichang.toolkit.TableHelper; -import com.github.yulichang.toolkit.TableMap; +import com.github.yulichang.extension.apt.matedata.BaseColumn; +import com.github.yulichang.extension.apt.matedata.Column; +import com.github.yulichang.toolkit.*; import com.github.yulichang.toolkit.support.ColumnCache; import com.github.yulichang.wrapper.interfaces.MFunction; import com.github.yulichang.wrapper.segments.PageInfo; @@ -124,7 +120,7 @@ public abstract class AptAbstractWrapper baseColumn) { - this.alias = StringUtils.isNotBlank(baseColumn.getAlias()) ? baseColumn.getAlias() : this.alias; + this.alias = StrUtils.isNotBlank(baseColumn.getAlias()) ? baseColumn.getAlias() : this.alias; setEntityClass(baseColumn.getColumnClass()); this.baseColumn = baseColumn; initNeed(); @@ -136,7 +132,7 @@ public abstract class AptAbstractWrapper baseColumn, T entity) { - this.alias = StringUtils.isNotBlank(baseColumn.getAlias()) ? baseColumn.getAlias() : this.alias; + this.alias = StrUtils.isNotBlank(baseColumn.getAlias()) ? baseColumn.getAlias() : this.alias; setEntity(entity); this.baseColumn = baseColumn; initNeed(); @@ -310,10 +306,10 @@ public abstract class AptAbstractWrapper extends AptAbstractWrapper */ @Override public String getSqlSelect() { - if (StringUtils.isBlank(sqlSelect.getStringValue()) && CollectionUtils.isNotEmpty(selectColumns)) { + if (StrUtils.isBlank(sqlSelect.getStringValue()) && CollectionUtils.isNotEmpty(selectColumns)) { String s = selectColumns.stream().map(i -> { if (i.isStr()) { return i.getColumn(); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/JoinAbstractWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/JoinAbstractWrapper.java index 46eaf9d..33d3aa0 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/JoinAbstractWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/JoinAbstractWrapper.java @@ -19,6 +19,7 @@ import com.github.yulichang.extension.apt.interfaces.OnCompare; import com.github.yulichang.extension.apt.matedata.Column; import com.github.yulichang.toolkit.LambdaUtils; import com.github.yulichang.toolkit.MPJSqlInjectionUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.Ref; import com.github.yulichang.toolkit.sql.SqlScriptUtils; import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum; @@ -170,7 +171,7 @@ public abstract class JoinAbstractWrapper val != null && StringUtils.isNotBlank(val)) + * .IfExists(val -> val != null && StrUtils.isNotBlank(val)) * * @param IfExists 判断 * @return Children @@ -579,7 +580,7 @@ public abstract class JoinAbstractWrapper Children allEqStr(boolean condition, Map params, boolean null2IsNull) { if (condition && CollectionUtils.isNotEmpty(params)) { params.forEach((k, v) -> { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { @@ -880,7 +881,7 @@ public abstract class JoinAbstractWrapper { if (filter.test(k, v)) { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/Result.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/Result.java index 215b18d..d106651 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/Result.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/resultmap/Result.java @@ -1,10 +1,10 @@ package com.github.yulichang.extension.apt.resultmap; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.extension.apt.matedata.BaseColumn; import com.github.yulichang.extension.apt.matedata.Column; import com.github.yulichang.toolkit.LambdaUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.support.ColumnCache; import com.github.yulichang.wrapper.resultmap.IResult; import com.github.yulichang.wrapper.segments.SelectCache; @@ -93,7 +93,7 @@ public class Result implements IResult { SelectCache normal = normalMap.get(column.getProperty()); result.selectNormal = normal; result.column = column; - if (StringUtils.isBlank(result.property)) { + if (StrUtils.isBlank(result.property)) { result.property = normal.getColumProperty(); } if (Objects.isNull(result.javaType)) { diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrapperUtils.java index 109452a..0115ddd 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrapperUtils.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/toolkit/AptWrapperUtils.java @@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.AdapterHelper; +import com.github.yulichang.extension.apt.AptQueryWrapper; import com.github.yulichang.toolkit.LogicInfoUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.sql.SqlScriptUtils; -import com.github.yulichang.extension.apt.AptQueryWrapper; import java.util.Objects; import java.util.Optional; @@ -26,18 +26,18 @@ public class AptWrapperUtils { String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); - if (StringUtils.isNotBlank(entityWhere)) { + if (StrUtils.isNotBlank(entityWhere)) { hasWhere = true; } String mainLogic = mainLogic(hasWhere, clazz, wrapper); - if (StringUtils.isNotBlank(mainLogic)) { + if (StrUtils.isNotBlank(mainLogic)) { hasWhere = true; } String subLogic = subLogic(hasWhere, wrapper); - if (StringUtils.isNotBlank(subLogic)) { + if (StrUtils.isNotBlank(subLogic)) { hasWhere = true; } - String sqlSegment = (wrapper.getSqlSegment() != null && StringUtils.isNotBlank(wrapper.getSqlSegment())) ? + String sqlSegment = (wrapper.getSqlSegment() != null && StrUtils.isNotBlank(wrapper.getSqlSegment())) ? ((wrapper.isEmptyOfNormal() ? StringPool.EMPTY : (hasWhere ? " AND " : " WHERE ")) + wrapper.getSqlSegment()) : StringPool.EMPTY; String sqlComment = Optional.ofNullable(wrapper.getSqlComment()).orElse(StringPool.EMPTY); @@ -59,18 +59,18 @@ public class AptWrapperUtils { String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); - if (StringUtils.isNotBlank(entityWhere)) { + if (StrUtils.isNotBlank(entityWhere)) { hasWhere = true; } String mainLogic = mainLogic(hasWhere, clazz, wrapper); - if (StringUtils.isNotBlank(mainLogic)) { + if (StrUtils.isNotBlank(mainLogic)) { hasWhere = true; } String subLogic = subLogic(hasWhere, wrapper); - if (StringUtils.isNotBlank(subLogic)) { + if (StrUtils.isNotBlank(subLogic)) { hasWhere = true; } - String sqlSegment = (wrapper.getSqlSegment() != null && StringUtils.isNotBlank(wrapper.getSqlSegment())) ? + String sqlSegment = (wrapper.getSqlSegment() != null && StrUtils.isNotBlank(wrapper.getSqlSegment())) ? ((wrapper.isEmptyOfNormal() ? StringPool.EMPTY : (hasWhere ? " AND " : " WHERE ")) + wrapper.getSqlSegment()) : StringPool.EMPTY; String sqlComment = Optional.ofNullable(wrapper.getSqlComment()).orElse(StringPool.EMPTY); @@ -129,7 +129,7 @@ public class AptWrapperUtils { return StringPool.EMPTY; } String info = LogicInfoUtils.getLogicInfo(null, clazz, true, wrapper.getAlias()); - if (StringUtils.isNotBlank(info)) { + if (StrUtils.isNotBlank(info)) { if (hasWhere) { return " AND " + info; } @@ -140,7 +140,7 @@ public class AptWrapperUtils { private static String subLogic(boolean hasWhere, AptQueryWrapper wrapper) { String sql = wrapper.getSubLogicSql(); - if (StringUtils.isNotBlank(sql)) { + if (StrUtils.isNotBlank(sql)) { if (hasWhere) { return sql; } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractLambdaWrapper.java index 6fc124a..dc4e06d 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractLambdaWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractLambdaWrapper.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.config.ConfigProperties; import com.github.yulichang.config.enums.LogicDelTypeEnum; @@ -363,10 +362,10 @@ public abstract class KtAbstractLambdaWrapper, ?> params, boolean null2IsNull) { if (condition && CollectionUtils.isNotEmpty(params)) { params.forEach((k, v) -> { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { @@ -601,7 +598,7 @@ public abstract class KtAbstractWrapper Children allEqStr(boolean condition, Map params, boolean null2IsNull) { if (condition && CollectionUtils.isNotEmpty(params)) { params.forEach((k, v) -> { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { @@ -856,7 +853,7 @@ public abstract class KtAbstractWrapper { if (filter.test(k, v)) { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtDeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtDeleteJoinWrapper.java index 2a2e703..7573fc5 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtDeleteJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtDeleteJoinWrapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.toolkit.LogicInfoUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.TableList; import com.github.yulichang.wrapper.interfaces.DeleteChain; @@ -71,7 +72,7 @@ public class KtDeleteJoinWrapper extends KtAbstractLambdaWrapper extends KtAbstractLambdaWrapper extends KtAbstractLambdaWrapper extends KtAbstractLambdaWrapper extends KtAbstractLambdaWrapper { if (i.isStr()) { return i.getColumn(); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtUpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtUpdateJoinWrapper.java index 7c0a239..9d5d6f9 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtUpdateJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtUpdateJoinWrapper.java @@ -7,11 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.extension.kt.interfaces.Update; -import com.github.yulichang.toolkit.Constant; -import com.github.yulichang.toolkit.KtUtils; +import com.github.yulichang.toolkit.*; import com.github.yulichang.toolkit.ReflectionKit; -import com.github.yulichang.toolkit.TableHelper; -import com.github.yulichang.toolkit.TableList; import com.github.yulichang.wrapper.interfaces.UpdateChain; import kotlin.reflect.KProperty; import lombok.AllArgsConstructor; @@ -142,7 +139,7 @@ public class KtUpdateJoinWrapper extends KtAbstractLambdaWrapper setSql(boolean condition, String sql) { - if (condition && StringUtils.isNotBlank(sql)) { + if (condition && StrUtils.isNotBlank(sql)) { if (Objects.isNull(sqlSet)) { sqlSet = new ArrayList<>(); } @@ -153,7 +150,7 @@ public class KtUpdateJoinWrapper extends KtAbstractLambdaWrapper { FieldCache field = fieldMap.get(dtoFieldName); Assert.isFalse(Collection.class.isAssignableFrom(field.getType()), "association 不支持集合类"); MybatisLabel.Builder builder; - builder = new MybatisLabel.Builder<>(StringUtils.isBlank(prefix) ? null : prefix, + builder = new MybatisLabel.Builder<>(StrUtils.isBlank(prefix) ? null : prefix, dtoFieldName, child, field.getType(), (Class) field.getType(), true); addLabel(builder.build(), false); return getChildren(); @@ -169,7 +169,7 @@ public interface QueryLabel { String dtoFieldName = dtoField.getName(); FieldCache field = MPJReflectionKit.getFieldMap(KtUtils.ref(dtoField)).get(dtoFieldName); Assert.isFalse(Collection.class.isAssignableFrom(field.getType()), "association 不支持集合类"); - MybatisLabel.Builder builder = new MybatisLabel.Builder<>(StringUtils.isBlank(prefix) ? null : prefix, + MybatisLabel.Builder builder = new MybatisLabel.Builder<>(StrUtils.isBlank(prefix) ? null : prefix, dtoFieldName, child, field.getType(), (Class) field.getType(), false); MybatisLabel.Builder cfBuilder = collection.apply(builder); addLabel(cfBuilder.build(), false); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/Result.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/Result.java index aba7b79..8e906c1 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/Result.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/resultmap/Result.java @@ -1,7 +1,7 @@ package com.github.yulichang.extension.kt.resultmap; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.toolkit.KtUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.support.ColumnCache; import com.github.yulichang.wrapper.resultmap.IResult; import com.github.yulichang.wrapper.segments.SelectCache; @@ -71,7 +71,7 @@ public class Result implements IResult { String name = column.getName(); SelectCache normal = normalMap.get(name); result.selectNormal = normal; - if (StringUtils.isBlank(result.property)) { + if (StrUtils.isBlank(result.property)) { result.property = normal.getColumProperty(); } if (Objects.isNull(result.javaType)) { diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrapperUtils.java index b333da7..c6c9d21 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrapperUtils.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/toolkit/KtWrapperUtils.java @@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.extension.kt.KtLambdaWrapper; import com.github.yulichang.toolkit.LogicInfoUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.sql.SqlScriptUtils; @@ -26,18 +26,18 @@ public class KtWrapperUtils { String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); - if (StringUtils.isNotBlank(entityWhere)) { + if (StrUtils.isNotBlank(entityWhere)) { hasWhere = true; } String mainLogic = mainLogic(hasWhere, clazz, wrapper); - if (StringUtils.isNotBlank(mainLogic)) { + if (StrUtils.isNotBlank(mainLogic)) { hasWhere = true; } String subLogic = subLogic(hasWhere, wrapper); - if (StringUtils.isNotBlank(subLogic)) { + if (StrUtils.isNotBlank(subLogic)) { hasWhere = true; } - String sqlSegment = (wrapper.getSqlSegment() != null && StringUtils.isNotBlank(wrapper.getSqlSegment())) ? + String sqlSegment = (wrapper.getSqlSegment() != null && StrUtils.isNotBlank(wrapper.getSqlSegment())) ? ((wrapper.isEmptyOfNormal() ? StringPool.EMPTY : (hasWhere ? " AND " : " WHERE ")) + wrapper.getSqlSegment()) : StringPool.EMPTY; String sqlComment = Optional.ofNullable(wrapper.getSqlComment()).orElse(StringPool.EMPTY); @@ -59,18 +59,18 @@ public class KtWrapperUtils { String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); - if (StringUtils.isNotBlank(entityWhere)) { + if (StrUtils.isNotBlank(entityWhere)) { hasWhere = true; } String mainLogic = mainLogic(hasWhere, clazz, wrapper); - if (StringUtils.isNotBlank(mainLogic)) { + if (StrUtils.isNotBlank(mainLogic)) { hasWhere = true; } String subLogic = subLogic(hasWhere, wrapper); - if (StringUtils.isNotBlank(subLogic)) { + if (StrUtils.isNotBlank(subLogic)) { hasWhere = true; } - String sqlSegment = (wrapper.getSqlSegment() != null && StringUtils.isNotBlank(wrapper.getSqlSegment())) ? + String sqlSegment = (wrapper.getSqlSegment() != null && StrUtils.isNotBlank(wrapper.getSqlSegment())) ? ((wrapper.isEmptyOfNormal() ? StringPool.EMPTY : (hasWhere ? " AND " : " WHERE ")) + wrapper.getSqlSegment()) : StringPool.EMPTY; String sqlComment = Optional.ofNullable(wrapper.getSqlComment()).orElse(StringPool.EMPTY); @@ -128,7 +128,7 @@ public class KtWrapperUtils { return StringPool.EMPTY; } String info = LogicInfoUtils.getLogicInfo(null, clazz, true, wrapper.getAlias()); - if (StringUtils.isNotBlank(info)) { + if (StrUtils.isNotBlank(info)) { if (hasWhere) { return " AND " + info; } @@ -139,7 +139,7 @@ public class KtWrapperUtils { private static String subLogic(boolean hasWhere, KtLambdaWrapper wrapper) { String sql = wrapper.getSubLogicSql(); - if (StringUtils.isNotBlank(sql)) { + if (StrUtils.isNotBlank(sql)) { if (hasWhere) { return sql; } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java index 4f96c3a..1f3882c 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/interceptor/MPJInterceptor.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.adapter.base.tookit.VersionUtils; import com.github.yulichang.config.ConfigProperties; @@ -167,7 +166,7 @@ public class MPJInterceptor implements Interceptor { } } else { FieldCache field = fieldMap.get(i.getColumProperty()); - if (StringUtils.isNotBlank(i.getTagColumn())) { + if (StrUtils.isNotBlank(i.getTagColumn())) { columnSet.add(i.getTagColumn()); if (Objects.nonNull(field)) { ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), i.getColumProperty(), @@ -176,7 +175,7 @@ public class MPJInterceptor implements Interceptor { } } else if (wrapper.isResultMap()) { AdapterHelper.getAdapter().parserColum(wrapper.getAlias(), wrapper.getFrom(), i.getColumn(), col -> { - String tagCol = MPJStringUtils.getTargetColumn(col); + String tagCol = StrUtils.getTargetColumn(col); FieldCache strField = fieldMap.get(tagCol); columnSet.add(tagCol); if (Objects.nonNull(strField)) { @@ -240,10 +239,10 @@ public class MPJInterceptor implements Interceptor { String index = r.getIndex(); if (columnSet.contains(columnName)) { columnName = getColumn(columnSet, columnName, 0); - label = new SelectLabel(r.getSelectNormal(), null, mybatisLabel.getOfType(), columnName, StringUtils.isNotBlank(index), index, r.getBaseColumn()); + label = new SelectLabel(r.getSelectNormal(), null, mybatisLabel.getOfType(), columnName, StrUtils.isNotBlank(index), index, r.getBaseColumn()); } else { columnSet.add(columnName); - label = new SelectLabel(r.getSelectNormal(), null, mybatisLabel.getOfType(), StringUtils.isNotBlank(index), index, r.getBaseColumn()); + label = new SelectLabel(r.getSelectNormal(), null, mybatisLabel.getOfType(), StrUtils.isNotBlank(index), index, r.getBaseColumn()); } columnList.add(label); ResultMapping.Builder builder = new ResultMapping.Builder(ms.getConfiguration(), r.getProperty(), columnName, r.getJavaType()); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java index 1cf149c..1d36f08 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/MPJBaseMethod.java @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.adapter.base.metadata.OrderFieldInfo; import com.github.yulichang.config.ConfigProperties; +import com.github.yulichang.toolkit.StrUtils; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -102,7 +102,7 @@ public interface MPJBaseMethod extends Constants { return true; }) .map(i -> getSqlWhere(i, newPrefix)).filter(Objects::nonNull).collect(joining(NEWLINE)); - if (!withId || StringUtils.isBlank(tableInfo.getKeyProperty())) { + if (!withId || StrUtils.isBlank(tableInfo.getKeyProperty())) { return filedSqlScript; } String newKeyProperty = newPrefix + tableInfo.getKeyProperty(); @@ -138,7 +138,7 @@ public interface MPJBaseMethod extends Constants { } default String convertIfProperty(String prefix, String property) { - return StringUtils.isNotBlank(prefix) ? prefix.substring(0, prefix.length() - 1) + "['" + property + "']" : property; + return StrUtils.isNotBlank(prefix) ? prefix.substring(0, prefix.length() - 1) + "['" + property + "']" : property; } @@ -249,7 +249,7 @@ public interface MPJBaseMethod extends Constants { final String newPrefix = prefix == null ? EMPTY : prefix; // 默认: column= String sqlSet = "${ew.alias}." + tableFieldInfo.getColumn() + EQUALS; - if (StringUtils.isNotBlank(tableFieldInfo.getUpdate())) { + if (StrUtils.isNotBlank(tableFieldInfo.getUpdate())) { sqlSet += String.format(tableFieldInfo.getUpdate(), tableFieldInfo.getColumn()); } else { sqlSet += SqlScriptUtils.safeParam(newPrefix + tableFieldInfo.getEl()); @@ -258,7 +258,7 @@ public interface MPJBaseMethod extends Constants { if (ignoreIf) { return sqlSet; } - if (tableFieldInfo.isWithUpdateFill()) { + if (AdapterHelper.getAdapter().isWithUpdateFill(tableFieldInfo)) { // 不进行 if 包裹 return sqlSet; } @@ -266,7 +266,7 @@ public interface MPJBaseMethod extends Constants { } default String mpjConvertIfProperty(String prefix, String property) { - return StringUtils.isNotBlank(prefix) ? prefix.substring(0, prefix.length() - 1) + "['" + property + "']" : property; + return StrUtils.isNotBlank(prefix) ? prefix.substring(0, prefix.length() - 1) + "['" + property + "']" : property; } default String mpjConvertIf(TableFieldInfo tableFieldInfo, final String sqlScript, final String property, final FieldStrategy fieldStrategy) { diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectList.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectList.java index bfa8ed5..b62d136 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectList.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectList.java @@ -3,9 +3,9 @@ package com.github.yulichang.method.mp; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import com.github.yulichang.interfaces.MPJBaseJoin; +import com.github.yulichang.toolkit.StrUtils; import org.apache.ibatis.mapping.MappedStatement; /** @@ -37,7 +37,7 @@ public class SelectList extends com.baomidou.mybatisplus.core.injector.methods.S @Override protected String sqlOrderBy(TableInfo table) { String orderBy = super.sqlOrderBy(table); - if (StringUtils.isBlank(orderBy)) { + if (StrUtils.isBlank(orderBy)) { return orderBy; } return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()), diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMaps.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMaps.java index ed4ab63..94e4c9e 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMaps.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMaps.java @@ -3,9 +3,9 @@ package com.github.yulichang.method.mp; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import com.github.yulichang.interfaces.MPJBaseJoin; +import com.github.yulichang.toolkit.StrUtils; import org.apache.ibatis.mapping.MappedStatement; /** @@ -37,7 +37,7 @@ public class SelectMaps extends com.baomidou.mybatisplus.core.injector.methods.S @Override protected String sqlOrderBy(TableInfo table) { String orderBy = super.sqlOrderBy(table); - if (StringUtils.isBlank(orderBy)) { + if (StrUtils.isBlank(orderBy)) { return orderBy; } return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()), diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMapsPage.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMapsPage.java index e22e3a6..c3959ae 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMapsPage.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectMapsPage.java @@ -3,9 +3,9 @@ package com.github.yulichang.method.mp; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import com.github.yulichang.interfaces.MPJBaseJoin; +import com.github.yulichang.toolkit.StrUtils; import org.apache.ibatis.mapping.MappedStatement; /** @@ -37,7 +37,7 @@ public class SelectMapsPage extends com.baomidou.mybatisplus.core.injector.metho @Override protected String sqlOrderBy(TableInfo table) { String orderBy = super.sqlOrderBy(table); - if (StringUtils.isBlank(orderBy)) { + if (StrUtils.isBlank(orderBy)) { return orderBy; } return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()), diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectObjs.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectObjs.java index 546793b..ae15f4c 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectObjs.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectObjs.java @@ -3,9 +3,9 @@ package com.github.yulichang.method.mp; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import com.github.yulichang.interfaces.MPJBaseJoin; +import com.github.yulichang.toolkit.StrUtils; import org.apache.ibatis.mapping.MappedStatement; /** @@ -52,7 +52,7 @@ public class SelectObjs extends com.baomidou.mybatisplus.core.injector.methods.S @Override protected String sqlOrderBy(TableInfo table) { String orderBy = super.sqlOrderBy(table); - if (StringUtils.isBlank(orderBy)) { + if (StrUtils.isBlank(orderBy)) { return orderBy; } return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()), diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectOne.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectOne.java index b8503e2..4918605 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectOne.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectOne.java @@ -3,9 +3,9 @@ package com.github.yulichang.method.mp; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import com.github.yulichang.interfaces.MPJBaseJoin; +import com.github.yulichang.toolkit.StrUtils; import org.apache.ibatis.mapping.MappedStatement; /** @@ -49,7 +49,7 @@ public class SelectOne extends com.baomidou.mybatisplus.core.injector.methods.Se @Override protected String sqlOrderBy(TableInfo table) { String orderBy = super.sqlOrderBy(table); - if (StringUtils.isBlank(orderBy)) { + if (StrUtils.isBlank(orderBy)) { return orderBy; } return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()), diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectPage.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectPage.java index adf9e34..4c73332 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectPage.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/method/mp/SelectPage.java @@ -3,9 +3,9 @@ package com.github.yulichang.method.mp; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import com.github.yulichang.interfaces.MPJBaseJoin; +import com.github.yulichang.toolkit.StrUtils; import org.apache.ibatis.mapping.MappedStatement; /** @@ -37,7 +37,7 @@ public class SelectPage extends com.baomidou.mybatisplus.core.injector.methods.S @Override protected String sqlOrderBy(TableInfo table) { String orderBy = super.sqlOrderBy(table); - if (StringUtils.isBlank(orderBy)) { + if (StrUtils.isBlank(orderBy)) { return orderBy; } return SqlScriptUtils.convertChoose(String.format("%s == null or !(%s instanceof %s)", Constants.WRAPPER, Constants.WRAPPER, MPJBaseJoin.class.getName()), diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java index 593da16..e348b5b 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJLambdaQueryWrapper.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.config.ConfigProperties; import com.github.yulichang.query.interfaces.CompareIfExists; import com.github.yulichang.query.interfaces.StringJoin; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.ThrowOptional; import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum; @@ -237,7 +238,7 @@ public class MPJLambdaQueryWrapper extends AbstractLambdaWrapper extends AbstractLambdaWrapper setAlias(String alias) { - Assert.isTrue(StringUtils.isNotBlank(alias), "别名不能为空"); + Assert.isTrue(StrUtils.isNotBlank(alias), "别名不能为空"); this.alias = alias; return typedThis; } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java index 5ec189f..bb768e8 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/query/MPJQueryWrapper.java @@ -14,6 +14,7 @@ import com.github.yulichang.config.ConfigProperties; import com.github.yulichang.query.interfaces.CompareIfExists; import com.github.yulichang.query.interfaces.StringJoin; import com.github.yulichang.toolkit.MPJSqlInjectionUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.ThrowOptional; import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum; @@ -249,7 +250,7 @@ public class MPJQueryWrapper extends AbstractWrapper extends AbstractWrapper setAlias(String alias) { - Assert.isTrue(StringUtils.isNotBlank(alias), "别名不能为空"); + Assert.isTrue(StrUtils.isNotBlank(alias), "别名不能为空"); this.alias = alias; return this; } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJTableMapperHelper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJTableMapperHelper.java index 4145fd6..287d2c0 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJTableMapperHelper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJTableMapperHelper.java @@ -1,6 +1,5 @@ package com.github.yulichang.toolkit; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.base.JoinMapper; import java.util.Map; @@ -39,7 +38,7 @@ public class MPJTableMapperHelper { } public static Class getMapperForName(String name) { - if (StringUtils.isBlank(name)) { + if (StrUtils.isBlank(name)) { return null; } return CACHE_MAPPER.get(name); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJStringUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/StrUtils.java similarity index 95% rename from mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJStringUtils.java rename to mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/StrUtils.java index 790c7d4..f765593 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/MPJStringUtils.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/StrUtils.java @@ -34,7 +34,7 @@ import static java.util.stream.Collectors.joining; * @since 2016-08-18 */ @SuppressWarnings("unused") -public final class MPJStringUtils { +public final class StrUtils { /** * 判断是否是中文 @@ -237,7 +237,7 @@ public final class MPJStringUtils { * @param args 填充参数 */ public static String sqlArgsFill(String content, Object... args) { - if (MPJStringUtils.isNotBlank(content) && ArrayUtils.isNotEmpty(args)) { + if (StrUtils.isNotBlank(content) && ArrayUtils.isNotEmpty(args)) { // 索引不能使用，因为 SQL 中的占位符数字与索引不相同 BiIntFunction handler = (m, i) -> sqlParam(args[Integer.parseInt(m.group("idx"))]); return replace(content, MP_SQL_PLACE_HOLDER, handler).toString(); @@ -280,9 +280,9 @@ public final class MPJStringUtils { public static String sqlParam(Object obj) { String repStr; if (obj instanceof Collection) { - repStr = MPJStringUtils.quotaMarkList((Collection) obj); + repStr = StrUtils.quotaMarkList((Collection) obj); } else { - repStr = MPJStringUtils.quotaMark(obj); + repStr = StrUtils.quotaMark(obj); } return repStr; } @@ -309,7 +309,7 @@ public final class MPJStringUtils { * @return 单引号包含的原字符串的集合形式 */ public static String quotaMarkList(Collection coll) { - return coll.stream().map(MPJStringUtils::quotaMark) + return coll.stream().map(StrUtils::quotaMark) .collect(joining(StringPool.COMMA, StringPool.LEFT_BRACKET, StringPool.RIGHT_BRACKET)); } @@ -440,8 +440,8 @@ public final class MPJStringUtils { /** * 删除字符前缀之后,首字母小写,之后字符大小写的不变 - *

StringUtils.removePrefixAfterPrefixToLower( "isUser", 2 ) = user

- *

StringUtils.removePrefixAfterPrefixToLower( "isUserInfo", 2 ) = userInfo

+ *

StrUtils.removePrefixAfterPrefixToLower( "isUser", 2 ) = user

+ *

StrUtils.removePrefixAfterPrefixToLower( "isUserInfo", 2 ) = userInfo

* * @param rawString 需要处理的字符串 * @param index 删除多少个字符(从左至右) @@ -453,7 +453,7 @@ public final class MPJStringUtils { /** * 驼峰转连字符 - *

StringUtils.camelToHyphen( "managerAdminUserService" ) = manager-admin-user-service

+ *

StrUtils.camelToHyphen( "managerAdminUserService" ) = manager-admin-user-service

* * @param input ignore * @return 以'-'分隔 @@ -525,11 +525,11 @@ public final class MPJStringUtils { *

对字符串大小写敏感

* * 
-     * StringUtils.equals(null, null)   = true
-     * StringUtils.equals(null, "abc")  = false
-     * StringUtils.equals("abc", null)  = false
-     * StringUtils.equals("abc", "abc") = true
-     * StringUtils.equals("abc", "ABC") = false
+     * StrUtils.equals(null, null)   = true
+     * StrUtils.equals(null, "abc")  = false
+     * StrUtils.equals("abc", null)  = false
+     * StrUtils.equals("abc", "abc") = true
+     * StrUtils.equals("abc", "ABC") = false
      *
* * @param cs1 第一个字符串, 可为 {@code null} diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java index 7167b85..d963111 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/WrapperUtils.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.toolkit.sql.SqlScriptUtils; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -28,18 +27,18 @@ public class WrapperUtils { String first = Optional.ofNullable(wrapper.getSqlFirst()).orElse(StringPool.EMPTY); boolean hasWhere = false; String entityWhere = getEntitySql(tableInfo, wrapper); - if (StringUtils.isNotBlank(entityWhere)) { + if (StrUtils.isNotBlank(entityWhere)) { hasWhere = true; } String mainLogic = mainLogic(hasWhere, clazz, wrapper); - if (StringUtils.isNotBlank(mainLogic)) { + if (StrUtils.isNotBlank(mainLogic)) { hasWhere = true; } String subLogic = subLogic(hasWhere, wrapper); - if (StringUtils.isNotBlank(subLogic)) { + if (StrUtils.isNotBlank(subLogic)) { hasWhere = true; } - String sqlSegment = (wrapper.getSqlSegment() != null && StringUtils.isNotBlank(wrapper.getSqlSegment())) ? + String sqlSegment = (wrapper.getSqlSegment() != null && StrUtils.isNotBlank(wrapper.getSqlSegment())) ? ((wrapper.isEmptyOfNormal() ? StringPool.EMPTY : (hasWhere ? " AND " : " WHERE ")) + wrapper.getSqlSegment()) : StringPool.EMPTY; String sqlComment = Optional.ofNullable(wrapper.getSqlComment()).orElse(StringPool.EMPTY); @@ -97,7 +96,7 @@ public class WrapperUtils { return StringPool.EMPTY; } String info = LogicInfoUtils.getLogicInfo(null, clazz, true, wrapper.getAlias()); - if (StringUtils.isNotBlank(info)) { + if (StrUtils.isNotBlank(info)) { if (hasWhere) { return " AND " + info; } @@ -108,7 +107,7 @@ public class WrapperUtils { private static String subLogic(boolean hasWhere, MPJLambdaWrapper wrapper) { String sql = wrapper.getSubLogicSql(); - if (StringUtils.isNotBlank(sql)) { + if (StrUtils.isNotBlank(sql)) { if (hasWhere) { return sql; } diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/sql/SqlScriptUtils.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/sql/SqlScriptUtils.java index a69ddf8..ea98d00 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/sql/SqlScriptUtils.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/sql/SqlScriptUtils.java @@ -1,7 +1,7 @@ package com.github.yulichang.toolkit.sql; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.github.yulichang.toolkit.StrUtils; import org.apache.ibatis.type.JdbcType; import org.apache.ibatis.type.TypeHandler; @@ -42,16 +42,16 @@ public abstract class SqlScriptUtils implements Constants { public static String convertTrim(final String sqlScript, final String prefix, final String suffix, final String prefixOverrides, final String suffixOverrides) { StringBuilder sb = new StringBuilder("").toString(); @@ -89,16 +89,16 @@ public abstract class SqlScriptUtils implements Constants { public static String convertForeach(final String sqlScript, final String collection, final String index, final String item, final String separator) { StringBuilder sb = new StringBuilder("").toString(); @@ -151,7 +151,7 @@ public abstract class SqlScriptUtils implements Constants { */ public static String safeParam(final String param, final String mapping) { String target = HASH_LEFT_BRACE + param; - if (StringUtils.isBlank(mapping)) { + if (StrUtils.isBlank(mapping)) { return target + RIGHT_BRACE; } return target + COMMA + mapping + RIGHT_BRACE; diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java index f2c3e62..3b05987 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/DeleteJoinWrapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.*; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.toolkit.LogicInfoUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.TableList; import com.github.yulichang.wrapper.interfaces.DeleteChain; @@ -71,7 +72,7 @@ public class DeleteJoinWrapper extends JoinAbstractLambdaWrapper extends JoinAbstractLambdaWrapper extends JoinAbstractLambdaWrapper extends JoinAbstractLambdaWrapper val != null && StringUtils.isNotBlank(val)) + * .IfExists(val -> val != null && StrUtils.isNotBlank(val)) * * @param IfExists 判断 * @return Children @@ -237,7 +237,7 @@ public abstract class JoinAbstractWrapper Children allEq(boolean condition, Map, V> params, boolean null2IsNull) { if (condition && CollectionUtils.isNotEmpty(params)) { params.forEach((k, v) -> { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { @@ -254,7 +254,7 @@ public abstract class JoinAbstractWrapper { if (filter.test(k, v)) { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { @@ -839,7 +839,7 @@ public abstract class JoinAbstractWrapper Children allEqStr(boolean condition, Map params, boolean null2IsNull) { if (condition && CollectionUtils.isNotEmpty(params)) { params.forEach((k, v) -> { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { @@ -1093,7 +1093,7 @@ public abstract class JoinAbstractWrapper { if (filter.test(k, v)) { - if (StringUtils.checkValNotNull(v)) { + if (StrUtils.checkValNotNull(v)) { eq(k, v); } else { if (null2IsNull) { diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java index a71002b..44045eb 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/MPJLambdaWrapper.java @@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.config.ConfigProperties; -import com.github.yulichang.toolkit.Constant; +import com.github.yulichang.toolkit.*; import com.github.yulichang.toolkit.LambdaUtils; -import com.github.yulichang.toolkit.TableList; -import com.github.yulichang.toolkit.WrapperUtils; import com.github.yulichang.toolkit.support.ColumnCache; import com.github.yulichang.wrapper.enums.IfExistsSqlKeyWordEnum; import com.github.yulichang.wrapper.interfaces.*; @@ -322,7 +320,7 @@ public class MPJLambdaWrapper extends JoinAbstractLambdaWrapper { if (i.isStr()) { return i.getColumn(); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java index 82782b6..d4eae6b 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/UpdateJoinWrapper.java @@ -129,7 +129,7 @@ public class UpdateJoinWrapper extends JoinAbstractLambdaWrapper setApply(boolean condition, String applySql, MFunction consumerFunction, Object... values) { - if (condition && StringUtils.isNotBlank(applySql)) { + if (condition && StrUtils.isNotBlank(applySql)) { FuncConsumer funcConsumer = consumerFunction.apply(new FuncConsumer()); UpdateSet set = new UpdateSet(); set.setApply(true); @@ -143,7 +143,7 @@ public class UpdateJoinWrapper extends JoinAbstractLambdaWrapper setSql(boolean condition, String sql) { - if (condition && StringUtils.isNotBlank(sql)) { + if (condition && StrUtils.isNotBlank(sql)) { if (Objects.isNull(sqlSet)) { sqlSet = new ArrayList<>(); } @@ -155,7 +155,7 @@ public class UpdateJoinWrapper extends JoinAbstractLambdaWrapper { FieldCache field = fieldMap.get(dtoFieldName); Assert.isFalse(Collection.class.isAssignableFrom(field.getType()), "association 不支持集合类"); MybatisLabel.Builder builder; - builder = new MybatisLabel.Builder<>(StringUtils.isBlank(prefix) ? null : prefix, + builder = new MybatisLabel.Builder<>(StrUtils.isBlank(prefix) ? null : prefix, dtoFieldName, child, field.getType(), (Class) field.getType(), true); addLabel(builder.build(), false); return getChildren(); @@ -186,7 +186,7 @@ public interface QueryLabel { Class dtoClass = LambdaUtils.getEntityClass(dtoField); FieldCache field = MPJReflectionKit.getFieldMap(dtoClass).get(dtoFieldName); Assert.isFalse(Collection.class.isAssignableFrom(field.getType()), "association 不支持集合类"); - MybatisLabel.Builder builder = new MybatisLabel.Builder<>(StringUtils.isBlank(prefix) ? null : prefix, + MybatisLabel.Builder builder = new MybatisLabel.Builder<>(StrUtils.isBlank(prefix) ? null : prefix, dtoFieldName, child, field.getType(), (Class) field.getType(), false); MybatisLabel.Builder cfBuilder = collection.apply(builder); addLabel(cfBuilder.build(), false); diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/Result.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/Result.java index 2ac52db..6fe51e5 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/Result.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/resultmap/Result.java @@ -1,8 +1,8 @@ package com.github.yulichang.wrapper.resultmap; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.github.yulichang.toolkit.LambdaUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.support.ColumnCache; import com.github.yulichang.wrapper.segments.SelectCache; import lombok.AccessLevel; @@ -71,7 +71,7 @@ public class Result implements IResult { String name = LambdaUtils.getName(column); SelectCache normal = normalMap.get(name); result.selectNormal = normal; - if (StringUtils.isBlank(result.property)) { + if (StrUtils.isBlank(result.property)) { result.property = normal.getColumProperty(); } if (Objects.isNull(result.javaType)) { diff --git a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java index 130744e..1630f05 100644 --- a/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java +++ b/mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/SelectCache.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.github.yulichang.adapter.AdapterHelper; -import com.github.yulichang.toolkit.MPJStringUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.ReflectionKit; import com.github.yulichang.toolkit.TableHelper; import lombok.Getter; @@ -82,7 +82,7 @@ public class SelectCache implements Serializable { this.column = column; this.columnType = columnType; this.columProperty = columProperty; - this.tagColumn = MPJStringUtils.getTargetColumn(column); + this.tagColumn = StrUtils.getTargetColumn(column); this.isSelect = isSelect; if (Objects.isNull(tableFieldInfo)) { this.hasTypeHandle = false; diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJMappingWrapper.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJMappingWrapper.java index a9a69e1..d5f0d91 100644 --- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJMappingWrapper.java +++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJMappingWrapper.java @@ -3,7 +3,7 @@ package com.github.yulichang.extension.mapping.mapper; import com.baomidou.mybatisplus.core.enums.SqlKeyword; import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.support.ColumnCache; import com.github.yulichang.wrapper.segments.SelectCache; import lombok.AllArgsConstructor; @@ -44,12 +44,12 @@ public class MPJMappingWrapper { public MPJMappingWrapper(Class joinClass, String first, String select, com.github.yulichang.annotation.Apply[] applyArr, com.github.yulichang.annotation.Condition[] conditions, String last, String[] orderByAsc, String[] orderByDesc) { - this.hasFirst = StringUtils.isNotBlank(first); + this.hasFirst = StrUtils.isNotBlank(first); if (this.hasFirst) { this.first = first; } - this.hasSelect = StringUtils.isNotBlank(select); + this.hasSelect = StrUtils.isNotBlank(select); if (this.hasSelect) { this.select = select; } @@ -78,7 +78,7 @@ public class MPJMappingWrapper { } } - this.hasLast = StringUtils.isNotBlank(last); + this.hasLast = StrUtils.isNotBlank(last); if (this.hasLast) { this.last = last; } @@ -91,7 +91,7 @@ public class MPJMappingWrapper { for (String orderBy : orderByAsc) { allColumns.addAll(Arrays.asList(orderBy.split(StringPool.COMMA))); } - this.orderByAsc = allColumns.stream().filter(StringUtils::isNotBlank).map(String::trim).map(f -> + this.orderByAsc = allColumns.stream().filter(StrUtils::isNotBlank).map(String::trim).map(f -> colSet.contains(f) ? f : listField.stream().filter(s -> s.getColumProperty().equals(f)) .findFirst().map(SelectCache::getColumn).orElse(f)).collect(Collectors.toList()); } @@ -104,7 +104,7 @@ public class MPJMappingWrapper { for (String orderBy : orderByDesc) { allColumns.addAll(Arrays.asList(orderBy.split(StringPool.COMMA))); } - this.orderByDesc = allColumns.stream().filter(StringUtils::isNotBlank).map(String::trim).map(f -> + this.orderByDesc = allColumns.stream().filter(StrUtils::isNotBlank).map(String::trim).map(f -> colSet.contains(f) ? f : listField.stream().filter(s -> s.getColumProperty().equals(f)) .findFirst().map(SelectCache::getColumn).orElse(f)).collect(Collectors.toList()); } diff --git a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java index d1a4b4e..7316305 100644 --- a/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java +++ b/mybatis-plus-join-extension/src/main/java/com/github/yulichang/extension/mapping/mapper/MPJTableFieldInfo.java @@ -3,12 +3,16 @@ package com.github.yulichang.extension.mapping.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; -import com.baomidou.mybatisplus.core.toolkit.*; +import com.baomidou.mybatisplus.core.toolkit.Assert; +import com.baomidou.mybatisplus.core.toolkit.ClassUtils; +import com.baomidou.mybatisplus.core.toolkit.ExceptionUtils; +import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.github.yulichang.adapter.AdapterHelper; import com.github.yulichang.annotation.EntityMapping; import com.github.yulichang.annotation.FieldMapping; import com.github.yulichang.toolkit.ReflectionKit; import com.github.yulichang.toolkit.SpringContentUtils; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.toolkit.TableHelper; import com.github.yulichang.toolkit.support.ColumnCache; import com.github.yulichang.wrapper.segments.SelectCache; @@ -178,7 +182,7 @@ public class MPJTableFieldInfo { } private void initJoinField(String joinField) { - if (StringUtils.isNotBlank(joinField)) { + if (StrUtils.isNotBlank(joinField)) { this.joinProperty = joinField; } else { TableInfo info = getTableInfo(this.joinClass); @@ -200,14 +204,14 @@ public class MPJTableFieldInfo { this.joinField = getField(this.joinClass, joinFieldInfo); } Assert.notNull(this.joinField, "注解属性joinField不存在 %s , %s", this.joinClass.getName(), - StringUtils.isBlank(this.joinProperty) ? "主键" : this.joinProperty); + StrUtils.isBlank(this.joinProperty) ? "主键" : this.joinProperty); Assert.notNull(this.joinColumn, "注解属性joinField不存在 %s , %s", this.joinClass.getName(), - StringUtils.isBlank(this.joinProperty) ? "主键" : this.joinProperty); + StrUtils.isBlank(this.joinProperty) ? "主键" : this.joinProperty); this.joinField.setAccessible(true); } private void initThisField(String thisField) { - if (StringUtils.isNotBlank(thisField)) { + if (StrUtils.isNotBlank(thisField)) { this.thisProperty = thisField; } else { TableInfo info = getTableInfo(this.entityType); @@ -220,13 +224,13 @@ public class MPJTableFieldInfo { this.thisField = ReflectionKit.getFieldList(ClassUtils.getUserClass(entityType)).stream().filter(f -> f.getName().equals(tableInfo.getKeyProperty())).findFirst().orElse(null); Assert.notNull(this.thisField, "注解属性thisField不存在 %s , %s", entityType.getName(), - StringUtils.isBlank(this.thisProperty) ? "主键" : this.thisProperty); + StrUtils.isBlank(this.thisProperty) ? "主键" : this.thisProperty); this.thisColumn = tableInfo.getKeyColumn(); } else { TableFieldInfo fieldInfo = tableInfo.getFieldList().stream().filter(f -> f.getProperty().equals(this.thisProperty)).findFirst().orElse(null); Assert.notNull(fieldInfo, "注解属性thisField不存在 %s , %s", entityType.getName(), - StringUtils.isBlank(this.thisProperty) ? "主键" : this.thisProperty); + StrUtils.isBlank(this.thisProperty) ? "主键" : this.thisProperty); this.thisField = getField(this.entityType, fieldInfo); this.thisColumn = fieldInfo.getColumn(); } @@ -269,20 +273,20 @@ public class MPJTableFieldInfo { if (Objects.isNull(arr) || arr.length == 0) { return false; } - return Arrays.stream(arr).anyMatch(StringUtils::isNotBlank); + return Arrays.stream(arr).anyMatch(StrUtils::isNotBlank); } private String propToColumn(Class tag, String[] arr, String joinC) { Map mapField = ColumnCache.getMapField(tag); List args = null; if (checkArr(arr)) { - args = Arrays.stream(arr).filter(StringUtils::isNotBlank).map(c -> { + args = Arrays.stream(arr).filter(StrUtils::isNotBlank).map(c -> { if (mapField.containsKey(c)) { return mapField.get(c).getColumn(); } return c; }).collect(Collectors.toList()); - if (StringUtils.isNotBlank(joinC)) { + if (StrUtils.isNotBlank(joinC)) { if (mapField.containsKey(joinC)) { args.add(mapField.get(joinC).getColumn()); } diff --git a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java index 241bf85..d91b11a 100644 --- a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java +++ b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/config/MybatisPlusConfig.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.injector.ISqlInjector; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler; @@ -16,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerIntercept import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils; import com.github.yulichang.injector.MPJSqlInjector; import com.github.yulichang.test.util.ThreadLocalUtils; +import com.github.yulichang.toolkit.StrUtils; import lombok.SneakyThrows; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; @@ -149,7 +149,7 @@ public class MybatisPlusConfig { @SneakyThrows public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) { BoundSql boundSql = sh.getBoundSql(); - if (boundSql != null && StringUtils.isNotBlank(boundSql.getSql())) { + if (boundSql != null && StrUtils.isNotBlank(boundSql.getSql())) { String sql = boundSql.getSql(); this.dbType = Optional.ofNullable(this.dbType).orElse(JdbcUtils.getDbType(connection.getMetaData().getURL())); if (P.test(this.dbType)) { @@ -166,7 +166,7 @@ public class MybatisPlusConfig { } private String formatSql(String sql) { - if (StringUtils.isBlank(sql)) { + if (StrUtils.isBlank(sql)) { return sql; } sql = sql.replaceAll("\n", ""); diff --git a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/util/ThreadLocalUtils.java b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/util/ThreadLocalUtils.java index 13ee788..8f5ea73 100644 --- a/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/util/ThreadLocalUtils.java +++ b/mybatis-plus-join-test/test-base/src/main/java/com/github/yulichang/test/util/ThreadLocalUtils.java @@ -1,9 +1,9 @@ package com.github.yulichang.test.util; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.yulichang.toolkit.StrUtils; import lombok.SneakyThrows; import java.util.Arrays; @@ -31,13 +31,13 @@ public class ThreadLocalUtils { @SneakyThrows public static List get() { String s = userThreadLocal.get(); - if (StringUtils.isBlank(s)) { + if (StrUtils.isBlank(s)) { return null; } ObjectMapper mapper = new ObjectMapper(); - List sqlList = mapper.readValue(s, new TypeReference>() { + List sqlList = mapper.readValue(s, new TypeReference<>() { }); - sqlList.removeIf(StringUtils::isBlank); + sqlList.removeIf(StrUtils::isBlank); set(""); return sqlList; } diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java index d2a8e58..084a3c6 100644 --- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java +++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/LambdaWrapperTest.java @@ -2,7 +2,6 @@ package com.github.yulichang.test.join; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.adapter.base.tookit.VersionUtils; import com.github.yulichang.test.join.dto.AddressDTO; @@ -14,6 +13,7 @@ import com.github.yulichang.test.join.mapper.*; import com.github.yulichang.test.util.Reset; import com.github.yulichang.test.util.ThreadLocalUtils; import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.toolkit.StrUtils; import com.github.yulichang.wrapper.MPJLambdaWrapper; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; @@ -329,9 +329,9 @@ class LambdaWrapperTest { .leftJoin(UserDO.class, "uc", UserDO::getId, UserDto::getUpdateBy, ext -> ext .selectAs(UserDO::getName, UserDto::getUpdateName)); List userDtos = userDTOMapper.selectJoinList(UserDto.class, wrapper.clone()); - assert StringUtils.isNotBlank(userDtos.get(0).getUserName()); - assert StringUtils.isNotBlank(userDtos.get(0).getCreateName()); - assert StringUtils.isNotBlank(userDtos.get(0).getUpdateName()); + assert StrUtils.isNotBlank(userDtos.get(0).getUserName()); + assert StrUtils.isNotBlank(userDtos.get(0).getCreateName()); + assert StrUtils.isNotBlank(userDtos.get(0).getUpdateName()); ThreadLocalUtils.set(""" diff --git a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/AptWrapperTest.java b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/AptWrapperTest.java index 81c8c1c..243ca1a 100644 --- a/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/AptWrapperTest.java +++ b/mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/apt/AptWrapperTest.java @@ -2,7 +2,6 @@ package com.github.yulichang.test.join.apt; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.adapter.base.tookit.VersionUtils; import com.github.yulichang.extension.apt.AptQueryWrapper; @@ -16,6 +15,7 @@ import com.github.yulichang.test.join.entity.apt.*; import com.github.yulichang.test.join.mapper.*; import com.github.yulichang.test.util.Reset; import com.github.yulichang.test.util.ThreadLocalUtils; +import com.github.yulichang.toolkit.StrUtils; import lombok.SneakyThrows; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -364,9 +364,9 @@ class AptWrapperTest { .ge(ub.id, 0); List userDtos = userDTOMapper.selectJoinList(UserDto.class, wrapper); - assert StringUtils.isNotBlank(userDtos.get(0).getUserName()); - assert StringUtils.isNotBlank(userDtos.get(0).getCreateName()); - assert StringUtils.isNotBlank(userDtos.get(0).getUpdateName()); + assert StrUtils.isNotBlank(userDtos.get(0).getUserName()); + assert StrUtils.isNotBlank(userDtos.get(0).getCreateName()); + assert StrUtils.isNotBlank(userDtos.get(0).getUpdateName()); ThreadLocalUtils.set(""" diff --git a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt index 9608248..8e72a69 100644 --- a/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt +++ b/mybatis-plus-join-test/test-kotlin/src/test/java/com/github/yulichang/test/kt/LambdaWrapperTest.kt @@ -1,7 +1,6 @@ package com.github.yulichang.test.kt import com.baomidou.mybatisplus.core.metadata.IPage -import com.baomidou.mybatisplus.core.toolkit.StringUtils import com.baomidou.mybatisplus.extension.plugins.pagination.Page import com.github.yulichang.extension.kt.KtDeleteJoinWrapper import com.github.yulichang.extension.kt.KtLambdaWrapper @@ -16,6 +15,7 @@ import com.github.yulichang.test.kt.mapper.UserDTOMapper import com.github.yulichang.test.kt.mapper.UserMapper import com.github.yulichang.test.util.Reset import com.github.yulichang.test.util.ThreadLocalUtils +import com.github.yulichang.toolkit.StrUtils import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired @@ -295,9 +295,9 @@ class LambdaWrapperTest { ext.selectAs(UserDO::name, UserDto::updateName) } val userDtos: List = userDTOMapper!!.selectJoinList(UserDto::class.java, wrapper) - assert(StringUtils.isNotBlank(userDtos[0].userName)) - assert(StringUtils.isNotBlank(userDtos[0].createName)) - assert(StringUtils.isNotBlank(userDtos[0].updateName)) + assert(StrUtils.isNotBlank(userDtos[0].userName)) + assert(StrUtils.isNotBlank(userDtos[0].createName)) + assert(StrUtils.isNotBlank(userDtos[0].updateName)) ThreadLocalUtils.set(