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

refactor: 修改 StringUtil 的 isBlank 为 noText, 以及 isNotBlank 为 hasText

Browse Source
This commit is contained in:
Michael Yang 2024-10-28 10:53:50 +08:00
parent 66c20079ff
commit b346901621
71 changed files with 215 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/JavadocConfig.java
View File

@ -124,7 +124,7 @@ public class JavadocConfig implements Serializable {
}
public String formatTableComment(String comment) {
if (StringUtil.isBlank(comment)) {
if (StringUtil.noText(comment)) {
return "";
}
return tableCommentFormat.apply(comment);
@ -146,7 +146,7 @@ public class JavadocConfig implements Serializable {
}
public String formatColumnComment(String comment) {
if (StringUtil.isBlank(comment)) {
if (StringUtil.noText(comment)) {
return "";
}
return columnCommentFormat.apply(comment);

16
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/config/PackageConfig.java
View File

@ -78,7 +78,7 @@ public class PackageConfig implements Serializable {
* 获取生成目录。
*/
public String getSourceDir() {
if (StringUtil.isBlank(sourceDir)) {
if (StringUtil.noText(sourceDir)) {
return System.getProperty("user.dir") + "/src/main/java";
}
return sourceDir;
@ -111,7 +111,7 @@ public class PackageConfig implements Serializable {
* 获取实体类层包路径。
*/
public String getEntityPackage() {
if (StringUtil.isBlank(entityPackage)) {
if (StringUtil.noText(entityPackage)) {
return basePackage.concat(".entity");
}
return entityPackage;
@ -129,7 +129,7 @@ public class PackageConfig implements Serializable {
* 获取映射层包路径。
*/
public String getMapperPackage() {
if (StringUtil.isBlank(mapperPackage)) {
if (StringUtil.noText(mapperPackage)) {
return basePackage.concat(".mapper");
}
return mapperPackage;
@ -147,7 +147,7 @@ public class PackageConfig implements Serializable {
* 获取服务层包路径。
*/
public String getServicePackage() {
if (StringUtil.isBlank(servicePackage)) {
if (StringUtil.noText(servicePackage)) {
return basePackage.concat(".service");
}
return servicePackage;
@ -165,7 +165,7 @@ public class PackageConfig implements Serializable {
* 获取服务层实现包路径。
*/
public String getServiceImplPackage() {
if (StringUtil.isBlank(serviceImplPackage)) {
if (StringUtil.noText(serviceImplPackage)) {
return basePackage.concat(".service.impl");
}
return serviceImplPackage;
@ -183,7 +183,7 @@ public class PackageConfig implements Serializable {
* 获取控制层包路径。
*/
public String getControllerPackage() {
if (StringUtil.isBlank(controllerPackage)) {
if (StringUtil.noText(controllerPackage)) {
return basePackage.concat(".controller");
}
return controllerPackage;
@ -201,7 +201,7 @@ public class PackageConfig implements Serializable {
* 获取表定义层包路径。
*/
public String getTableDefPackage() {
if (StringUtil.isBlank(tableDefPackage)) {
if (StringUtil.noText(tableDefPackage)) {
return getEntityPackage().concat(".table");
}
return tableDefPackage;
@ -219,7 +219,7 @@ public class PackageConfig implements Serializable {
* 获取 Mapper XML 文件路径。
*/
public String getMapperXmlPath() {
if (StringUtil.isBlank(mapperXmlPath)) {
if (StringUtil.noText(mapperXmlPath)) {
return System.getProperty("user.dir").concat("/src/main/resources/mapper");
}
return mapperXmlPath;

4
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/dialect/JdbcTypeMapping.java
View File

@ -73,12 +73,12 @@ public class JdbcTypeMapping {
public static String getType(String jdbcType, Table table, Column column) {
if (typeMapper != null) {
String type = typeMapper.getType(jdbcType, table, column);
if (StringUtil.isNotBlank(type)) {
if (StringUtil.hasText(type)) {
return type;
}
}
String registered = mapping.get(jdbcType);
return StringUtil.isNotBlank(registered) ? registered : jdbcType;
return StringUtil.hasText(registered) ? registered : jdbcType;
}
public interface JdbcTypeMapper {

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/dialect/impl/DefaultJdbcDialect.java
View File

@ -24,6 +24,6 @@ import com.mybatisflex.core.util.StringUtil;
public class DefaultJdbcDialect extends AbstractJdbcDialect {
@Override
protected String forBuildColumnsSql(String schema, String tableName) {
return "SELECT * FROM " + (StringUtil.isNotBlank(schema) ? schema + "." : "") + tableName + " WHERE 1 = 2";
return "SELECT * FROM " + (StringUtil.hasText(schema) ? schema + "." : "") + tableName + " WHERE 1 = 2";
}
}

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/dialect/impl/MySqlJdbcDialect.java
View File

@ -24,6 +24,6 @@ import com.mybatisflex.core.util.StringUtil;
public class MySqlJdbcDialect extends AbstractJdbcDialect {
@Override
protected String forBuildColumnsSql(String schema, String tableName) {
return "SELECT * FROM `" + (StringUtil.isNotBlank(schema) ? schema + "`.`" : "") + tableName + "` WHERE 1 = 2";
return "SELECT * FROM `" + (StringUtil.hasText(schema) ? schema + "`.`" : "") + tableName + "` WHERE 1 = 2";
}
}

6
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/dialect/impl/OracleJdbcDialect.java
View File

@ -36,19 +36,19 @@ public class OracleJdbcDialect extends AbstractJdbcDialect {
@Override
public String forBuildColumnsSql(String schema, String tableName) {
return "SELECT * FROM \"" + (StringUtil.isNotBlank(schema) ? schema + "\".\"" : "") + tableName + "\" WHERE rownum < 1";
return "SELECT * FROM \"" + (StringUtil.hasText(schema) ? schema + "\".\"" : "") + tableName + "\" WHERE rownum < 1";
}
@Override
public ResultSet getTablesResultSet(DatabaseMetaData dbMeta, Connection conn, String schema, String[] types) throws SQLException {
return dbMeta.getTables(conn.getCatalog(), StringUtil.isNotBlank(schema) ? schema : dbMeta.getUserName(), null, types);
return dbMeta.getTables(conn.getCatalog(), StringUtil.hasText(schema) ? schema : dbMeta.getUserName(), null, types);
}
@Override
protected ResultSet forRemarks(String schema, Table table, DatabaseMetaData dbMeta, Connection conn) throws SQLException {
if (conn instanceof OracleConnection) {
((OracleConnection) conn).setRemarksReporting(true);
return dbMeta.getColumns(conn.getCatalog(), StringUtil.isNotBlank(schema) ? schema : dbMeta.getUserName(), table.getName(), null);
return dbMeta.getColumns(conn.getCatalog(), StringUtil.hasText(schema) ? schema : dbMeta.getUserName(), table.getName(), null);
} else if ("com.zaxxer.hikari.pool.HikariProxyConnection".equals(conn.getClass().getName())) {
return forRemarks(schema, table, dbMeta, getOriginalConn(HikariProxyConnection.class, "delegate", conn));
} else if ("com.alibaba.druid.pool.DruidPooledConnection".equals(conn.getClass().getName())) {

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/dialect/impl/PostgreSQLJdbcDialect.java
View File

@ -24,6 +24,6 @@ import com.mybatisflex.core.util.StringUtil;
public class PostgreSQLJdbcDialect extends AbstractJdbcDialect {
@Override
protected String forBuildColumnsSql(String schema, String tableName) {
return "SELECT * FROM " + (StringUtil.isNotBlank(schema) ? schema + "." : "") + "\"" + tableName + "\"" + " WHERE 1 = 2";
return "SELECT * FROM " + (StringUtil.hasText(schema) ? schema + "." : "") + "\"" + tableName + "\"" + " WHERE 1 = 2";
}
}

10
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Column.java
View File

@ -193,7 +193,7 @@ public class Column {
}
public String buildComment() {
if (StringUtil.isBlank(comment)) {
if (StringUtil.noText(comment)) {
return "";
} else {
return "/**\n" +
@ -260,7 +260,7 @@ public class Column {
}
if (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.isNotBlank(comment)) {
if (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.hasText(comment)) {
addComma(annotations, needComma);
annotations.append("comment = \"")
.append(this.comment.replace("\n", "")
@ -282,7 +282,7 @@ public class Column {
boolean needGenColumnAnnotation = (entityConfig != null && entityConfig.isAlwaysGenColumnAnnotation())
|| !name.equalsIgnoreCase(StringUtil.camelToUnderline(property))
|| (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.isNotBlank(this.comment) && annotations.length() == 0);
|| (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.hasText(this.comment) && annotations.length() == 0);
StringBuilder columnAnnotation = new StringBuilder("@Column(");
@ -344,7 +344,7 @@ public class Column {
columnAnnotation.append("tenantId = true");
needComma = true;
}
if (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.isNotBlank(comment)) {
if (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.hasText(comment)) {
addComma(columnAnnotation, needComma);
columnAnnotation.append("comment = \"")
.append(this.comment.replace("\n", "")
@ -419,7 +419,7 @@ public class Column {
boolean needGenColumnAnnotation = (entityConfig != null && entityConfig.isAlwaysGenColumnAnnotation())
|| !name.equalsIgnoreCase(StringUtil.camelToUnderline(property))
|| (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.isNotBlank(this.comment));
|| (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.hasText(this.comment));
if (columnConfig.getOnInsertValue() != null
|| columnConfig.getOnUpdateValue() != null

14
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/entity/Table.java
View File

@ -97,7 +97,7 @@ public class Table {
}
public String getComment() {
if (StringUtil.isNotBlank(comment)) {
if (StringUtil.hasText(comment)) {
return globalConfig.getJavadocConfig().formatTableComment(comment);
}
return null;
@ -148,7 +148,7 @@ public class Table {
public boolean containsColumn(String columnName) {
if (columns == null || columns.isEmpty() || StringUtil.isBlank(columnName)) {
if (columns == null || columns.isEmpty() || StringUtil.noText(columnName)) {
return false;
}
for (Column column : columns) {
@ -302,7 +302,7 @@ public class Table {
if (tableConfig == null) {
// 未配置 tableConfig 以策略中的 schema 为主
globalSchema = schema;
} else if (StringUtil.isBlank(tableConfig.getSchema())) {
} else if (StringUtil.noText(tableConfig.getSchema())) {
// 配置 tableConfig 但未指定 schema 还是以策略中的 schema 为主
globalSchema = schema;
} else {
@ -310,19 +310,19 @@ public class Table {
globalSchema = null;
}
if (StringUtil.isNotBlank(globalSchema)) {
if (StringUtil.hasText(globalSchema)) {
tableAnnotation.append(", schema = \"").append(globalSchema).append("\"");
}
// 添加 dataSource 配置，因为代码生成器是一个数据源生成的，所以这些实体类应该都是一个数据源。
String dataSource = globalConfig.getEntityDataSource();
if (StringUtil.isNotBlank(dataSource)) {
if (StringUtil.hasText(dataSource)) {
tableAnnotation.append(", dataSource = \"").append(dataSource).append("\"");
}
if (tableConfig != null) {
if (StringUtil.isNotBlank(tableConfig.getSchema())) {
if (StringUtil.hasText(tableConfig.getSchema())) {
tableAnnotation.append(", schema = \"").append(tableConfig.getSchema()).append("\"");
}
if (tableConfig.getCamelToUnderline() != null) {
@ -343,7 +343,7 @@ public class Table {
}
if (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.isNotBlank(comment)) {
if (entityConfig != null && entityConfig.isColumnCommentEnable() && StringUtil.hasText(comment)) {
tableAnnotation.append(", comment = \"")
.append(this.comment.replace("\n", "").replace("\"", "\\\"").trim())
.append("\"");

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ControllerGenerator.java
View File

@ -55,7 +55,7 @@ public class ControllerGenerator implements IGenerator {
PackageConfig packageConfig = globalConfig.getPackageConfig();
ControllerConfig controllerConfig = globalConfig.getControllerConfig();
String sourceDir = StringUtil.isNotBlank(controllerConfig.getSourceDir()) ? controllerConfig.getSourceDir() : packageConfig.getSourceDir();
String sourceDir = StringUtil.hasText(controllerConfig.getSourceDir()) ? controllerConfig.getSourceDir() : packageConfig.getSourceDir();
String controllerPackagePath = packageConfig.getControllerPackage().replace(".", "/");
File controllerJavaFile = new File(sourceDir, controllerPackagePath + "/" +

8
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/EntityGenerator.java
View File

@ -68,7 +68,7 @@ public class EntityGenerator implements IGenerator {
PackageConfig packageConfig = globalConfig.getPackageConfig();
EntityConfig entityConfig = globalConfig.getEntityConfig();
String sourceDir = StringUtil.isNotBlank(entityConfig.getSourceDir()) ? entityConfig.getSourceDir() : packageConfig.getSourceDir();
String sourceDir = StringUtil.hasText(entityConfig.getSourceDir()) ? entityConfig.getSourceDir() : packageConfig.getSourceDir();
String entityPackagePath = packageConfig.getEntityPackage().replace(".", "/");
String entityClassName = table.buildEntityClassName();
@ -107,7 +107,7 @@ public class EntityGenerator implements IGenerator {
String baseClassName = table.buildEntityClassName() + entityConfig.getWithBaseClassSuffix();
params.put("baseClassName", baseClassName);
String baseClassPackage = StringUtil.isNotBlank(entityConfig.getWithBasePackage())
String baseClassPackage = StringUtil.hasText(entityConfig.getWithBasePackage())
? entityConfig.getWithBasePackage() : packageConfig.getEntityPackage() + ".base";
params.put("baseClassPackage", baseClassPackage);
@ -129,10 +129,10 @@ public class EntityGenerator implements IGenerator {
}
PackageConfig packageConfig = globalConfig.getPackageConfig();
String sourceDir = StringUtil.isNotBlank(entityConfig.getSourceDir()) ? entityConfig.getSourceDir() : packageConfig.getSourceDir();
String sourceDir = StringUtil.hasText(entityConfig.getSourceDir()) ? entityConfig.getSourceDir() : packageConfig.getSourceDir();
String baseEntityPackagePath = packageConfig.getEntityPackage().replace(".", "/");
baseEntityPackagePath = StringUtil.isNotBlank(entityConfig.getWithBasePackage()) ? entityConfig.getWithBasePackage().replace(".", "")
baseEntityPackagePath = StringUtil.hasText(entityConfig.getWithBasePackage()) ? entityConfig.getWithBasePackage().replace(".", "")
: baseEntityPackagePath + "/base";
String baseEntityClassName = table.buildEntityClassName() + entityConfig.getWithBaseClassSuffix();

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/MapperGenerator.java
View File

@ -55,7 +55,7 @@ public class MapperGenerator implements IGenerator {
PackageConfig packageConfig = globalConfig.getPackageConfig();
MapperConfig mapperConfig = globalConfig.getMapperConfig();
String sourceDir = StringUtil.isNotBlank(mapperConfig.getSourceDir()) ? mapperConfig.getSourceDir() : packageConfig.getSourceDir();
String sourceDir = StringUtil.hasText(mapperConfig.getSourceDir()) ? mapperConfig.getSourceDir() : packageConfig.getSourceDir();
String mapperPackagePath = packageConfig.getMapperPackage().replace(".", "/");
File mapperJavaFile = new File(sourceDir, mapperPackagePath + "/" +

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceGenerator.java
View File

@ -55,7 +55,7 @@ public class ServiceGenerator implements IGenerator {
PackageConfig packageConfig = globalConfig.getPackageConfig();
ServiceConfig serviceConfig = globalConfig.getServiceConfig();
String sourceDir = StringUtil.isNotBlank(serviceConfig.getSourceDir()) ? serviceConfig.getSourceDir() : packageConfig.getSourceDir();
String sourceDir = StringUtil.hasText(serviceConfig.getSourceDir()) ? serviceConfig.getSourceDir() : packageConfig.getSourceDir();
String servicePackagePath = packageConfig.getServicePackage().replace(".", "/");
File serviceJavaFile = new File(sourceDir, servicePackagePath + "/" +

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/ServiceImplGenerator.java
View File

@ -55,7 +55,7 @@ public class ServiceImplGenerator implements IGenerator {
PackageConfig packageConfig = globalConfig.getPackageConfig();
ServiceImplConfig serviceImplConfig = globalConfig.getServiceImplConfig();
String sourceDir = StringUtil.isNotBlank(serviceImplConfig.getSourceDir()) ? serviceImplConfig.getSourceDir() : packageConfig.getSourceDir();
String sourceDir = StringUtil.hasText(serviceImplConfig.getSourceDir()) ? serviceImplConfig.getSourceDir() : packageConfig.getSourceDir();
String serviceImplPackagePath = packageConfig.getServiceImplPackage().replace(".", "/");
File serviceImplJavaFile = new File(sourceDir, serviceImplPackagePath + "/" +

2
mybatis-flex-codegen/src/main/java/com/mybatisflex/codegen/generator/impl/TableDefGenerator.java
View File

@ -55,7 +55,7 @@ public class TableDefGenerator implements IGenerator {
PackageConfig packageConfig = globalConfig.getPackageConfig();
TableDefConfig tableDefConfig = globalConfig.getTableDefConfig();
String sourceDir = StringUtil.isNotBlank(tableDefConfig.getSourceDir()) ? tableDefConfig.getSourceDir() : packageConfig.getSourceDir();
String sourceDir = StringUtil.hasText(tableDefConfig.getSourceDir()) ? tableDefConfig.getSourceDir() : packageConfig.getSourceDir();
String tableDefPackagePath = packageConfig.getTableDefPackage().replace(".", "/");
File tableDefJavaFile = new File(sourceDir, tableDefPackagePath + "/" +

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/BaseMapper.java
View File

@ -247,7 +247,7 @@ public interface BaseMapper<T> {
default int insertOrUpdate(T entity, boolean ignoreNulls) {
TableInfo tableInfo = TableInfoFactory.ofEntityClass(entity.getClass());
Object[] pkArgs = tableInfo.buildPkSqlArgs(entity);
if (pkArgs.length == 0 || pkArgs[0] == null || (pkArgs[0] instanceof String && StringUtil.isBlank((String) pkArgs[0]))) {
if (pkArgs.length == 0 || pkArgs[0] == null || (pkArgs[0] instanceof String && StringUtil.noText((String) pkArgs[0]))) {
return insert(entity, ignoreNulls);
} else {
return update(entity, ignoreNulls);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/AuditManager.java
View File

@ -103,7 +103,7 @@ public class AuditManager {
return supplier.execute();
}
String key = DataSourceKey.get();
if (StringUtil.isBlank(key)) {
if (StringUtil.noText(key)) {
key = FlexGlobalConfig.getDefaultConfig()
.getDataSource()
.getDefaultDataSourceKey();

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/audit/http/HttpUtil.java
View File

@ -116,7 +116,7 @@ public class HttpUtil {
}
public static void setCharSet(String charSet) {
if (StringUtil.isBlank(charSet)) {
if (StringUtil.noText(charSet)) {
throw new IllegalArgumentException("charSet can not be blank.");
}
HttpUtil.CHARSET = charSet;
@ -232,7 +232,7 @@ public class HttpUtil {
String key = entry.getKey();
String value = entry.getValue();
if (StringUtil.isNotBlank(value)) {
if (StringUtil.hasText(value)) {
try {
value = URLEncoder.encode(value, CHARSET);
} catch (UnsupportedEncodingException e) {

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/DataSourceBuilder.java
View File

@ -49,15 +49,15 @@ public class DataSourceBuilder {
public DataSource build() {
String dataSourceClassName = null;
String type = dataSourceProperties.get("type");
if (StringUtil.isNotBlank(type)) {
if (StringUtil.hasText(type)) {
dataSourceClassName = dataSourceAlias.getOrDefault(type, type);
} else {
dataSourceClassName = detectDataSourceClass();
}
if (StringUtil.isBlank(dataSourceClassName)) {
if (StringUtil.isBlank(type)) {
if (StringUtil.noText(dataSourceClassName)) {
if (StringUtil.noText(type)) {
throw FlexExceptions.wrap(LocalizedFormats.DATASOURCE_TYPE_BLANK);
} else {
throw FlexExceptions.wrap(LocalizedFormats.DATASOURCE_TYPE_NOT_FIND, type);

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/datasource/FlexDataSource.java
View File

@ -112,9 +112,9 @@ public class FlexDataSource extends AbstractDataSource {
@Override
public Connection getConnection() throws SQLException {
String xid = TransactionContext.getXID();
if (StringUtil.isNotBlank(xid)) {
if (StringUtil.hasText(xid)) {
String dataSourceKey = DataSourceKey.get();
if (StringUtil.isBlank(dataSourceKey)) {
if (StringUtil.noText(dataSourceKey)) {
dataSourceKey = defaultDataSourceKey;
}
@ -133,9 +133,9 @@ public class FlexDataSource extends AbstractDataSource {
@Override
public Connection getConnection(String username, String password) throws SQLException {
String xid = TransactionContext.getXID();
if (StringUtil.isNotBlank(xid)) {
if (StringUtil.hasText(xid)) {
String dataSourceKey = DataSourceKey.get();
if (StringUtil.isBlank(dataSourceKey)) {
if (StringUtil.noText(dataSourceKey)) {
dataSourceKey = defaultDataSourceKey;
}
Connection connection = TransactionalManager.getConnection(xid, dataSourceKey);
@ -206,7 +206,7 @@ public class FlexDataSource extends AbstractDataSource {
DataSource dataSource = defaultDataSource;
if (dataSourceMap.size() > 1) {
String dataSourceKey = DataSourceKey.get();
if (StringUtil.isNotBlank(dataSourceKey)) {
if (StringUtil.hasText(dataSourceKey)) {
//负载均衡 key
if (dataSourceKey.charAt(dataSourceKey.length() - 1) == LOAD_BALANCE_KEY_SUFFIX) {
String prefix = dataSourceKey.substring(0, dataSourceKey.length() - 1);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/DbTypeUtil.java
View File

@ -40,7 +40,7 @@ public class DbTypeUtil {
public static DbType getDbType(DataSource dataSource) {
String jdbcUrl = getJdbcUrl(dataSource);
if (StringUtil.isNotBlank(jdbcUrl)) {
if (StringUtil.hasText(jdbcUrl)) {
return parseDbType(jdbcUrl);
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/KeywordWrap.java
View File

@ -115,7 +115,7 @@ public class KeywordWrap {
}
public String wrap(String keyword) {
if (StringUtil.isBlank(keyword) || SqlConsts.ASTERISK.equals(keyword.trim())) {
if (StringUtil.noText(keyword) || SqlConsts.ASTERISK.equals(keyword.trim())) {
return keyword;
}
@ -146,7 +146,7 @@ public class KeywordWrap {
//sqlserver 转义 scheme table colums 包装 根据 . 分割后分别包装
public String wrap4Sqlserver(String keyword) {
if (StringUtil.isBlank(keyword) || SqlConsts.ASTERISK.equals(keyword.trim())) {
if (StringUtil.noText(keyword) || SqlConsts.ASTERISK.equals(keyword.trim())) {
return keyword;
}

20
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/ClickhouseDialectImpl.java
View File

@ -70,7 +70,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
String[] primaryKeys = RowCPI.obtainsPrimaryKeyStrings(row);
sql.append(ALTER_TABLE);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.UPDATE))).append(REFERENCE);
}
sql.append(wrap(table)).append(CK_UPDATE);
@ -118,7 +118,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
StringBuilder sql = new StringBuilder();
sql.append(ALTER_TABLE);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.DELETE))).append(REFERENCE);
}
sql.append(wrap(table));
@ -206,7 +206,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
String table = getRealTable(tableName, OperateType.DELETE);
StringBuilder sql = new StringBuilder();
sql.append(ALTER_TABLE);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.DELETE))).append(REFERENCE);
}
sql.append(wrap(table));
@ -256,7 +256,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
Object[] tenantIdArgs = tableInfo.buildTenantIdArgs();
// 正常删除
if (StringUtil.isBlank(logicDeleteColumn)) {
if (StringUtil.noText(logicDeleteColumn)) {
String deleteSQL = forDeleteBatchByIds(tableInfo.getSchema(), tableInfo.getTableName(), tableInfo.getPrimaryColumns(), primaryValues);
// 多租户
@ -322,7 +322,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
// ignore selectColumns
StringBuilder sqlBuilder = new StringBuilder(ALTER_TABLE);
String hint = CPI.getHint(queryWrapper);
if (StringUtil.isNotBlank(hint)) {
if (StringUtil.hasText(hint)) {
sqlBuilder.append(BLANK).append(hint).deleteCharAt(sqlBuilder.length() - 1);
}
@ -357,7 +357,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
String logicDeleteColumn = tableInfo.getLogicDeleteColumnOrSkip();
// 正常删除
if (StringUtil.isBlank(logicDeleteColumn)) {
if (StringUtil.noText(logicDeleteColumn)) {
return forDeleteByQuery(queryWrapper);
}
@ -418,7 +418,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
// 乐观锁字段
String versionColumn = tableInfo.getVersionColumn();
if (StringUtil.isNotBlank(tableInfo.getOptimisticLockColumnOrSkip())) {
if (StringUtil.hasText(tableInfo.getOptimisticLockColumnOrSkip())) {
stringJoiner.add(wrap(versionColumn) + EQUALS + wrap(versionColumn) + " + 1 ");
}
@ -434,7 +434,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
// 逻辑删除条件，已删除的数据不能被修改
String logicDeleteColumn = tableInfo.getLogicDeleteColumnOrSkip();
if (StringUtil.isNotBlank(logicDeleteColumn)) {
if (StringUtil.hasText(logicDeleteColumn)) {
sql.append(AND).append(buildLogicNormalCondition(logicDeleteColumn, tableInfo));
}
@ -444,7 +444,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
tableInfo.buildTenantCondition(sql, tenantIdArgs, this);
// 乐观锁条件
if (StringUtil.isNotBlank(versionColumn)) {
if (StringUtil.hasText(versionColumn)) {
Object versionValue = tableInfo.buildColumnSqlArg(entity, versionColumn);
if (versionValue == null) {
throw FlexExceptions.wrap(LocalizedFormats.ENTITY_VERSION_NULL, entity);
@ -491,7 +491,7 @@ public class ClickhouseDialectImpl extends CommonsDialectImpl {
// 乐观锁字段
String versionColumn = tableInfo.getVersionColumn();
if (StringUtil.isNotBlank(tableInfo.getOptimisticLockColumnOrSkip())) {
if (StringUtil.hasText(tableInfo.getOptimisticLockColumnOrSkip())) {
stringJoiner.add(wrap(versionColumn) + EQUALS + wrap(versionColumn) + " + 1 ");
}

50
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/CommonsDialectImpl.java
View File

@ -113,7 +113,7 @@ public class CommonsDialectImpl implements IDialect {
@Override
public String forHint(String hintString) {
return StringUtil.isNotBlank(hintString) ? HINT_START + hintString + HINT_END : EMPTY;
return StringUtil.hasText(hintString) ? HINT_START + hintString + HINT_END : EMPTY;
}
@Override
@ -143,7 +143,7 @@ public class CommonsDialectImpl implements IDialect {
String table = getRealTable(tableName, OperateType.INSERT);
StringBuilder sql = new StringBuilder();
sql.append(INSERT_INTO);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.INSERT))).append(REFERENCE);
}
sql.append(wrap(table));
@ -179,7 +179,7 @@ public class CommonsDialectImpl implements IDialect {
String table = getRealTable(tableName, OperateType.INSERT);
StringBuilder sql = new StringBuilder();
sql.append(INSERT_INTO);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.INSERT))).append(REFERENCE);
}
sql.append(wrap(table));
@ -196,7 +196,7 @@ public class CommonsDialectImpl implements IDialect {
String table = getRealTable(tableName, OperateType.DELETE);
StringBuilder sql = new StringBuilder();
sql.append(DELETE_FROM);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.DELETE))).append(REFERENCE);
}
sql.append(wrap(table));
@ -217,7 +217,7 @@ public class CommonsDialectImpl implements IDialect {
String table = getRealTable(tableName, OperateType.DELETE);
StringBuilder sql = new StringBuilder();
sql.append(DELETE_FROM);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.DELETE))).append(REFERENCE);
}
@ -268,7 +268,7 @@ public class CommonsDialectImpl implements IDialect {
String[] primaryKeys = RowCPI.obtainsPrimaryKeyStrings(row);
sql.append(UPDATE);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.UPDATE))).append(REFERENCE);
}
@ -369,7 +369,7 @@ public class CommonsDialectImpl implements IDialect {
public String forSelectOneById(String schema, String tableName, String[] primaryKeys, Object[] primaryValues) {
String table = getRealTable(tableName, OperateType.SELECT);
StringBuilder sql = new StringBuilder(SELECT_ALL_FROM);
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
sql.append(wrap(getRealSchema(schema, table, OperateType.SELECT))).append(REFERENCE);
}
sql.append(wrap(table)).append(WHERE);
@ -409,8 +409,8 @@ public class CommonsDialectImpl implements IDialect {
.entrySet()
.stream()
// 需要处理别名的情况
.filter(e -> StringUtil.isNotBlank(e.getValue().getName()))
.filter(e -> StringUtil.isBlank(e.getValue().getAlias()))
.filter(e -> StringUtil.hasText(e.getValue().getName()))
.filter(e -> StringUtil.noText(e.getValue().getAlias()))
.filter(e -> !"*".equals(e.getValue().getName()))
// 将相同字段对象放在一个集合里
.collect(Collectors.groupingBy(e -> e.getValue().getName(),
@ -423,7 +423,7 @@ public class CommonsDialectImpl implements IDialect {
.flatMap(Collection::stream)
// 过滤出来可以添加别名的列
.filter(e -> e.getValue().getTable() != null)
.filter(e -> StringUtil.isNotBlank(e.getValue().getTable().getName()))
.filter(e -> StringUtil.hasText(e.getValue().getTable().getName()))
// 添加别名并放回原集合索引位置
.forEach(e -> selectColumns.set(e.getKey(),
e.getValue().as(e.getValue().getTable().getName() + "$" + e.getValue().getName())));
@ -534,7 +534,7 @@ public class CommonsDialectImpl implements IDialect {
// ignore selectColumns
StringBuilder sqlBuilder = new StringBuilder(DELETE);
String hint = CPI.getHint(queryWrapper);
if (StringUtil.isNotBlank(hint)) {
if (StringUtil.hasText(hint)) {
sqlBuilder.append(BLANK).append(hint).deleteCharAt(sqlBuilder.length() - 1);
}
@ -547,7 +547,7 @@ public class CommonsDialectImpl implements IDialect {
}
QueryTable queryTable = queryTables.get(0);
String table = getRealTable(queryTable.getName(), OperateType.DELETE);
if (StringUtil.isNotBlank(queryTable.getSchema())) {
if (StringUtil.hasText(queryTable.getSchema())) {
sqlBuilder.append(wrap(getRealSchema(queryTable.getSchema(), table, OperateType.DELETE))).append(REFERENCE);
}
sqlBuilder.append(BLANK).append(wrap(getRealTable(table, OperateType.DELETE)));
@ -692,7 +692,7 @@ public class CommonsDialectImpl implements IDialect {
Object[] tenantIdArgs = tableInfo.buildTenantIdArgs();
// 正常删除
if (StringUtil.isBlank(logicDeleteColumn)) {
if (StringUtil.noText(logicDeleteColumn)) {
String deleteByIdSql = forDeleteById(tableInfo.getSchema(), tableInfo.getTableName(), tableInfo.getPrimaryColumns());
return tableInfo.buildTenantCondition(deleteByIdSql, tenantIdArgs, this);
}
@ -726,7 +726,7 @@ public class CommonsDialectImpl implements IDialect {
Object[] tenantIdArgs = tableInfo.buildTenantIdArgs();
// 正常删除
if (StringUtil.isBlank(logicDeleteColumn)) {
if (StringUtil.noText(logicDeleteColumn)) {
String deleteSQL = forDeleteBatchByIds(tableInfo.getSchema(), tableInfo.getTableName(), tableInfo.getPrimaryColumns(), primaryValues);
// 多租户
@ -785,7 +785,7 @@ public class CommonsDialectImpl implements IDialect {
String logicDeleteColumn = tableInfo.getLogicDeleteColumnOrSkip();
// 正常删除
if (StringUtil.isBlank(logicDeleteColumn)) {
if (StringUtil.noText(logicDeleteColumn)) {
return forDeleteByQuery(queryWrapper);
}
@ -842,7 +842,7 @@ public class CommonsDialectImpl implements IDialect {
// 乐观锁字段
String versionColumn = tableInfo.getVersionColumn();
if (StringUtil.isNotBlank(tableInfo.getOptimisticLockColumnOrSkip())) {
if (StringUtil.hasText(tableInfo.getOptimisticLockColumnOrSkip())) {
stringJoiner.add(wrap(versionColumn) + EQUALS + wrap(versionColumn) + " + 1 ");
}
@ -858,7 +858,7 @@ public class CommonsDialectImpl implements IDialect {
// 逻辑删除条件，已删除的数据不能被修改
String logicDeleteColumn = tableInfo.getLogicDeleteColumnOrSkip();
if (StringUtil.isNotBlank(logicDeleteColumn)) {
if (StringUtil.hasText(logicDeleteColumn)) {
sql.append(AND).append(buildLogicNormalCondition(logicDeleteColumn, tableInfo));
}
@ -868,7 +868,7 @@ public class CommonsDialectImpl implements IDialect {
tableInfo.buildTenantCondition(sql, tenantIdArgs, this);
// 乐观锁条件
if (StringUtil.isNotBlank(tableInfo.getOptimisticLockColumnOrSkip())) {
if (StringUtil.hasText(tableInfo.getOptimisticLockColumnOrSkip())) {
Object versionValue = tableInfo.buildColumnSqlArg(entity, versionColumn);
if (versionValue == null) {
throw FlexExceptions.wrap(LocalizedFormats.ENTITY_VERSION_NULL, entity);
@ -917,7 +917,7 @@ public class CommonsDialectImpl implements IDialect {
// 乐观锁字段
String versionColumn = tableInfo.getVersionColumn();
if (StringUtil.isNotBlank(tableInfo.getOptimisticLockColumnOrSkip())) {
if (StringUtil.hasText(tableInfo.getOptimisticLockColumnOrSkip())) {
stringJoiner.add(wrap(versionColumn) + EQUALS + wrap(versionColumn) + " + 1 ");
}
@ -965,7 +965,7 @@ public class CommonsDialectImpl implements IDialect {
// 逻辑删除的情况下，需要添加逻辑删除的条件
String logicDeleteColumn = tableInfo.getLogicDeleteColumnOrSkip();
if (StringUtil.isNotBlank(logicDeleteColumn)) {
if (StringUtil.hasText(logicDeleteColumn)) {
sql.append(AND).append(buildLogicNormalCondition(logicDeleteColumn, tableInfo));
}
@ -987,7 +987,7 @@ public class CommonsDialectImpl implements IDialect {
String logicDeleteColumn = tableInfo.getLogicDeleteColumnOrSkip();
Object[] tenantIdArgs = tableInfo.buildTenantIdArgs();
if (StringUtil.isNotBlank(logicDeleteColumn) || ArrayUtil.isNotEmpty(tenantIdArgs)) {
if (StringUtil.hasText(logicDeleteColumn) || ArrayUtil.isNotEmpty(tenantIdArgs)) {
sql.append(BRACKET_LEFT);
}
@ -1017,12 +1017,12 @@ public class CommonsDialectImpl implements IDialect {
}
}
if (StringUtil.isNotBlank(logicDeleteColumn) || ArrayUtil.isNotEmpty(tenantIdArgs)) {
if (StringUtil.hasText(logicDeleteColumn) || ArrayUtil.isNotEmpty(tenantIdArgs)) {
sql.append(BRACKET_RIGHT);
}
if (StringUtil.isNotBlank(logicDeleteColumn)) {
if (StringUtil.hasText(logicDeleteColumn)) {
sql.append(AND).append(buildLogicNormalCondition(logicDeleteColumn, tableInfo));
}
@ -1053,7 +1053,7 @@ public class CommonsDialectImpl implements IDialect {
QueryCondition whereQueryCondition = CPI.getWhereQueryCondition(queryWrapper);
if (whereQueryCondition != null) {
String whereSql = whereQueryCondition.toSql(queryTables, this);
if (StringUtil.isNotBlank(whereSql)) {
if (StringUtil.hasText(whereSql)) {
sqlBuilder.append(WHERE).append(whereSql);
} else if (!allowNoCondition) {
throw FlexExceptions.wrap(LocalizedFormats.UPDATE_OR_DELETE_NOT_ALLOW);
@ -1088,7 +1088,7 @@ public class CommonsDialectImpl implements IDialect {
QueryCondition havingQueryCondition = CPI.getHavingQueryCondition(queryWrapper);
if (havingQueryCondition != null) {
String havingSql = havingQueryCondition.toSql(queryTables, this);
if (StringUtil.isNotBlank(havingSql)) {
if (StringUtil.hasText(havingSql)) {
sqlBuilder.append(HAVING).append(havingSql);
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/OracleDialect.java
View File

@ -167,7 +167,7 @@ public class OracleDialect extends CommonsDialectImpl {
sql.append(INSERT_ALL);
String table = getRealTable(tableName, OperateType.INSERT);
String tableNameWrap = StringUtil.isNotBlank(schema)
String tableNameWrap = StringUtil.hasText(schema)
? wrap(getRealSchema(schema, table, OperateType.INSERT)) + REFERENCE + wrap(table)
: wrap(table);
String questionStrings = SqlUtil.buildSqlParamPlaceholder(attrs.size());

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/handler/BaseJsonTypeHandler.java
View File

@ -34,19 +34,19 @@ public abstract class BaseJsonTypeHandler<T> extends BaseTypeHandler<T> {
@Override
public T getNullableResult(ResultSet rs, String columnName) throws SQLException {
final String json = rs.getString(columnName);
return StringUtil.isBlank(json) ? null : parseJson(json);
return StringUtil.noText(json) ? null : parseJson(json);
}
@Override
public T getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
final String json = rs.getString(columnIndex);
return StringUtil.isBlank(json) ? null : parseJson(json);
return StringUtil.noText(json) ? null : parseJson(json);
}
@Override
public T getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
final String json = cs.getString(columnIndex);
return StringUtil.isBlank(json) ? null : parseJson(json);
return StringUtil.noText(json) ? null : parseJson(json);
}
protected abstract T parseJson(String json);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/CustomKeyGenerator.java
View File

@ -73,7 +73,7 @@ public class CustomKeyGenerator implements KeyGenerator {
Object existId = tableInfo.getValue(entity, idInfo.getProperty());
// 若用户主动设置了主键，则使用用户自己设置的主键，不再生成主键
// 只有主键为 null 或者 空字符串时，对主键进行设置
if (existId == null || (existId instanceof String && StringUtil.isBlank((String) existId))) {
if (existId == null || (existId instanceof String && StringUtil.noText((String) existId))) {
Configuration msConfiguration = ms.getConfiguration();
MetaObject metaParam = msConfiguration.newMetaObject(parameter);
Object generateId = keyGenerator.generate(entity, idInfo.getColumn());

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/KeyGeneratorFactory.java
View File

@ -52,7 +52,7 @@ public class KeyGeneratorFactory {
* @return 主键生成器
*/
public static IKeyGenerator getKeyGenerator(String name) {
if (StringUtil.isBlank(name)) {
if (StringUtil.noText(name)) {
throw FlexExceptions.wrap(LocalizedFormats.KEY_GENERATOR_BLANK);
}
return KEY_GENERATOR_MAP.get(name.trim());

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/MybatisKeyGeneratorUtil.java
View File

@ -81,7 +81,7 @@ public class MybatisKeyGeneratorUtil {
//通过序列生成的注解
String sequence = getKeyValue(idInfo, globalKeyConfig);
if (StringUtil.isBlank(sequence)) {
if (StringUtil.noText(sequence)) {
throw FlexExceptions.wrap("Please config sequence by @Id(value=\"...\") for field: %s in class: %s"
, idInfo.getProperty()
, tableInfo.getEntityClass().getName());
@ -146,7 +146,7 @@ public class MybatisKeyGeneratorUtil {
public static String getKeyValue(IdInfo idInfo, FlexGlobalConfig.KeyConfig globalKeyConfig) {
String value = idInfo.getValue();
if (StringUtil.isBlank(value) && globalKeyConfig != null) {
if (StringUtil.noText(value) && globalKeyConfig != null) {
value = globalKeyConfig.getValue();
}
return value;

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/RowCustomKeyGenerator.java
View File

@ -60,7 +60,7 @@ public class RowCustomKeyGenerator implements KeyGenerator {
Object existId = row.get(rowKey.getKeyColumn());
// 若用户主动设置了主键，则使用用户自己设置的主键，不再生成主键
// 只有主键为 null 或者 空字符串时，对主键进行设置
if (existId == null || (existId instanceof String && StringUtil.isBlank((String) existId))) {
if (existId == null || (existId instanceof String && StringUtil.noText((String) existId))) {
Object generateId = keyGenerator.generate(row, rowKey.getKeyColumn());
row.put(rowKey.getKeyColumn(), generateId);
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/keygen/impl/SnowFlakeIDKeyGenerator.java
View File

@ -152,7 +152,7 @@ public class SnowFlakeIDKeyGenerator implements IKeyGenerator {
StringBuilder mpId = new StringBuilder();
mpId.append(dataCenterId);
String name = ManagementFactory.getRuntimeMXBean().getName();
if (StringUtil.isNotBlank(name)) {
if (StringUtil.hasText(name)) {
// GET jvmPid
mpId.append(name.split("@")[0]);
}

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/binding/FlexMapperProxy.java
View File

@ -57,14 +57,14 @@ public class FlexMapperProxy<T> extends MybatisMapperProxy<T> {
String finalDsKey = userDsKey;
try {
if (StringUtil.isBlank(finalDsKey)) {
if (StringUtil.noText(finalDsKey)) {
finalDsKey = getMethodDsKey(method, proxy);
}
//通过自定义分配策略去获取最终的数据源
finalDsKey = DataSourceKey.getShardingDsKey(finalDsKey, proxy, method, args);
if (StringUtil.isNotBlank(finalDsKey) && !finalDsKey.equals(userDsKey)) {
if (StringUtil.hasText(finalDsKey) && !finalDsKey.equals(userDsKey)) {
needClearDsKey = true;
DataSourceKey.use(finalDsKey);
}
@ -103,14 +103,14 @@ public class FlexMapperProxy<T> extends MybatisMapperProxy<T> {
private static String getMethodDsKey(Method method, Object proxy) {
UseDataSource methodAnno = method.getAnnotation(UseDataSource.class);
if (methodAnno != null && StringUtil.isNotBlank(methodAnno.value())) {
if (methodAnno != null && StringUtil.hasText(methodAnno.value())) {
return methodAnno.value();
}
Class<?>[] interfaces = proxy.getClass().getInterfaces();
for (Class<?> anInterface : interfaces) {
UseDataSource classAnno = anInterface.getAnnotation(UseDataSource.class);
if (classAnno != null && StringUtil.isNotBlank(classAnno.value())) {
if (classAnno != null && StringUtil.hasText(classAnno.value())) {
return classAnno.value();
}
}
@ -119,7 +119,7 @@ public class FlexMapperProxy<T> extends MybatisMapperProxy<T> {
TableInfo tableInfo = TableInfoFactory.ofMapperClass(interfaces[0]);
if (tableInfo != null) {
String tableDsKey = tableInfo.getDataSource();
if (StringUtil.isNotBlank(tableDsKey)) {
if (StringUtil.hasText(tableDsKey)) {
return tableDsKey;
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/EntitySqlProvider.java
View File

@ -407,7 +407,7 @@ public class EntitySqlProvider {
tableInfos = new ArrayList<>();
for (QueryTable queryTable : queryTables) {
String tableNameWithSchema = queryTable.getNameWithSchema();
if (StringUtil.isNotBlank(tableNameWithSchema)) {
if (StringUtil.hasText(tableNameWithSchema)) {
TableInfo tableInfo = TableInfoFactory.ofTableName(tableNameWithSchema);
if (tableInfo != null) {
tableInfos.add(tableInfo);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/provider/ProviderUtil.java
View File

@ -65,7 +65,7 @@ class ProviderUtil {
public static String[] getPrimaryKeys(Map params) {
String primaryKey = (String) params.get(FlexConsts.PRIMARY_KEY);
if (StringUtil.isBlank(primaryKey)) {
if (StringUtil.noText(primaryKey)) {
throw FlexExceptions.wrap(LocalizedFormats.OBJECT_NULL_OR_BLANK, "primaryKey");
}
String[] primaryKeys = primaryKey.split(",");

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/ArithmeticQueryColumn.java
View File

@ -94,7 +94,7 @@ public class ArithmeticQueryColumn extends QueryColumn implements HasParamsColum
for (int i = 0; i < arithmeticInfos.size(); i++) {
sql.append(arithmeticInfos.get(i).toSql(queryTables, dialect, i));
}
if (StringUtil.isNotBlank(alias)) {
if (StringUtil.hasText(alias)) {
return WrapperUtil.withAlias(sql.toString(), alias, dialect);
}
return sql.toString();

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/Brackets.java
View File

@ -113,11 +113,11 @@ public class Brackets extends QueryCondition {
StringBuilder sql = new StringBuilder();
if (checkEffective()) {
String childSql = childCondition.toSql(queryTables, dialect);
if (StringUtil.isNotBlank(childSql)) {
if (StringUtil.hasText(childSql)) {
QueryCondition prevEffectiveCondition = getPrevEffectiveCondition();
if (prevEffectiveCondition != null && this.connector != null) {
childSql = this.connector + SqlConsts.BRACKET_LEFT + childSql + SqlConsts.BRACKET_RIGHT;
} else if (StringUtil.isNotBlank(sqlNext)) {
} else if (StringUtil.hasText(sqlNext)) {
childSql = SqlConsts.BRACKET_LEFT + childSql + SqlConsts.BRACKET_RIGHT;
}
sql.append(childSql);

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
View File

@ -245,14 +245,14 @@ public class CPI {
}
public static void setFromIfNecessary(QueryWrapper queryWrapper, String tableName) {
if (StringUtil.isNotBlank(tableName)
if (StringUtil.hasText(tableName)
&& CollectionUtil.isEmpty(queryWrapper.getQueryTables())) {
queryWrapper.from(tableName);
}
}
public static void setFromIfNecessary(QueryWrapper queryWrapper, String schema, String tableName) {
if (StringUtil.isNotBlank(tableName)
if (StringUtil.hasText(tableName)
&& CollectionUtil.isEmpty(queryWrapper.getQueryTables())) {
queryWrapper.from(new QueryTable(schema, tableName));
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseQueryColumn.java
View File

@ -43,7 +43,7 @@ public class CaseQueryColumn extends QueryColumn implements HasParamsColumn {
@Override
protected String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
String sql = buildSql(queryTables, dialect);
if (StringUtil.isNotBlank(alias)) {
if (StringUtil.hasText(alias)) {
return WrapperUtil.withAlias(sql, alias, dialect);
}
return sql;

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CaseSearchQueryColumn.java
View File

@ -36,7 +36,7 @@ public class CaseSearchQueryColumn extends QueryColumn implements HasParamsColum
@Override
protected String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
String sql = buildSql(queryTables, dialect);
if (StringUtil.isNotBlank(alias)) {
if (StringUtil.hasText(alias)) {
return WrapperUtil.withAlias(sql, alias, dialect);
}
return sql;

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/FunctionQueryColumn.java
View File

@ -92,7 +92,7 @@ public class FunctionQueryColumn extends QueryColumn implements HasParamsColumn
@Override
public String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
String sql = getSql(queryTables, dialect);
if (StringUtil.isBlank(alias)) {
if (StringUtil.noText(alias)) {
return fnName + WrapperUtil.withBracket(sql);
}
return fnName + WrapperUtil.withAlias(sql, alias, dialect);
@ -125,7 +125,7 @@ public class FunctionQueryColumn extends QueryColumn implements HasParamsColumn
.map(c -> c.toSelectSql(queryTables, dialect))
.collect(Collectors.joining(SqlConsts.DELIMITER));
if (StringUtil.isBlank(sql)) {
if (StringUtil.noText(sql)) {
return SqlConsts.EMPTY;
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/If.java
View File

@ -67,7 +67,7 @@ public class If {
* 查看某个 string 对象是否有文本内容
*/
public static boolean hasText(String string) {
return StringUtil.isNotBlank(string);
return StringUtil.hasText(string);
}
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorQueryCondition.java
View File

@ -47,7 +47,7 @@ public class OperatorQueryCondition extends QueryCondition {
//检测是否生效
if (checkEffective()) {
String childSql = childCondition.toSql(queryTables, dialect);
if (StringUtil.isNotBlank(childSql)) {
if (StringUtil.hasText(childSql)) {
QueryCondition prevEffectiveCondition = getPrevEffectiveCondition();
if (prevEffectiveCondition != null && this.connector != null) {
sql.append(this.connector);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/OperatorSelectCondition.java
View File

@ -49,7 +49,7 @@ public class OperatorSelectCondition extends QueryCondition {
//检测是否生效
if (checkEffective()) {
String childSql = dialect.buildSelectSql(queryWrapper);
if (StringUtil.isNotBlank(childSql)) {
if (StringUtil.hasText(childSql)) {
QueryCondition prevEffectiveCondition = getPrevEffectiveCondition();
if (prevEffectiveCondition != null && this.connector != null) {
sql.append(this.connector);

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
View File

@ -948,13 +948,13 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (selectTable == null) {
return dialect.wrap(name);
} else {
if (StringUtil.isNotBlank(selectTable.alias)) {
if (StringUtil.hasText(selectTable.alias)) {
return dialect.wrap(selectTable.alias) + SqlConsts.REFERENCE + dialect.wrap(name);
} else if (StringUtil.isNotBlank(selectTable.getSchema()) && StringUtil.isNotBlank(selectTable.getName())) {
} else if (StringUtil.hasText(selectTable.getSchema()) && StringUtil.hasText(selectTable.getName())) {
String realTable = dialect.getRealTable(selectTable.getName(), OperateType.SELECT);
return dialect.wrap(dialect.getRealSchema(selectTable.schema, realTable, OperateType.SELECT)) + SqlConsts.REFERENCE + dialect.wrap(realTable)
+ SqlConsts.REFERENCE + dialect.wrap(name);
} else if (StringUtil.isNotBlank(selectTable.getName())) {
} else if (StringUtil.hasText(selectTable.getName())) {
return dialect.wrap(dialect.getRealTable(selectTable.getName(), OperateType.SELECT)) + SqlConsts.REFERENCE + dialect.wrap(name);
} else {
return dialect.wrap(name);
@ -991,7 +991,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
// 当前表有别名，以别名为主
// SELECT u.id FROM tb_user u
if (StringUtil.isNotBlank(selfTable.alias)) {
if (StringUtil.hasText(selfTable.alias)) {
return selfTable;
}
@ -1003,7 +1003,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
while (it.hasPrevious()) {
QueryTable queryTable = it.previous();
if (Objects.equals(queryTable.name, selfTable.name)) {
if (StringUtil.isBlank(queryTable.alias)) {
if (StringUtil.noText(queryTable.alias)) {
// 因为当前表没有别名，所以表名相同有没有别名，一定是这个表
return queryTable;
} else {

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryTable.java
View File

@ -73,7 +73,7 @@ public class QueryTable implements CloneSupport<QueryTable> {
}
public String getNameWithSchema() {
return StringUtil.isNotBlank(schema) ? schema + "." + name : name;
return StringUtil.hasText(schema) ? schema + "." + name : name;
}
public String getAlias() {
@ -115,7 +115,7 @@ public class QueryTable implements CloneSupport<QueryTable> {
public String toSql(IDialect dialect, OperateType operateType) {
String sql;
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
String table = dialect.getRealTable(name, operateType);
sql = dialect.wrap(dialect.getRealSchema(schema, table, operateType)) + "." + dialect.wrap(table) + WrapperUtil.buildAlias(alias, dialect);
} else {

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
View File

@ -209,7 +209,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
public QueryWrapper from(String... tables) {
for (String table : tables) {
if (StringUtil.isBlank(table)) {
if (StringUtil.noText(table)) {
throw new IllegalArgumentException("table must not be null or blank.");
}
from(new QueryTable(table));
@ -801,7 +801,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
return this;
}
for (String queryOrderBy : orderBys) {
if (StringUtil.isNotBlank(queryOrderBy)) {
if (StringUtil.hasText(queryOrderBy)) {
addOrderBy(new RawQueryOrderBy(queryOrderBy));
}
}
@ -813,7 +813,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
return this;
}
for (String queryOrderBy : rawOrderBy) {
if (StringUtil.isNotBlank(queryOrderBy)) {
if (StringUtil.hasText(queryOrderBy)) {
addOrderBy(new RawQueryOrderBy(queryOrderBy, false));
}
}

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/RawQueryTable.java
View File

@ -47,8 +47,8 @@ public class RawQueryTable extends QueryTable {
return false;
}
// 只比较别名，不比较内容
if (StringUtil.isNotBlank(alias)
&& StringUtil.isNotBlank(table.alias)) {
if (StringUtil.hasText(alias)
&& StringUtil.hasText(table.alias)) {
return Objects.equals(alias, table.alias);
}
return false;

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryColumn.java
View File

@ -47,7 +47,7 @@ public class SelectQueryColumn extends QueryColumn implements HasParamsColumn {
@Override
protected String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
String selectSql = dialect.forSelectByQuery(queryWrapper);
if (StringUtil.isNotBlank(selectSql) && StringUtil.isNotBlank(alias)) {
if (StringUtil.hasText(selectSql) && StringUtil.hasText(alias)) {
selectSql = WrapperUtil.withAlias(selectSql, alias, dialect);
}
return selectSql;

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/SelectQueryTable.java
View File

@ -49,7 +49,7 @@ public class SelectQueryTable extends QueryTable {
@Override
public String toSql(IDialect dialect, OperateType operateType) {
String sql = dialect.buildSelectSql(queryWrapper);
if (StringUtil.isNotBlank(alias)) {
if (StringUtil.hasText(alias)) {
return WrapperUtil.withAlias(sql, alias, dialect);
} else {
return WrapperUtil.withBracket(sql);

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/StringFunctionQueryColumn.java
View File

@ -59,10 +59,10 @@ public class StringFunctionQueryColumn extends QueryColumn {
@Override
public String toSelectSql(List<QueryTable> queryTables, IDialect dialect) {
String sql = StringUtil.join(SqlConsts.DELIMITER, params);
if (StringUtil.isBlank(sql)) {
if (StringUtil.noText(sql)) {
return SqlConsts.EMPTY;
}
if (StringUtil.isBlank(alias)) {
if (StringUtil.noText(alias)) {
return fnName + WrapperUtil.withBracket(sql);
}
return fnName + WrapperUtil.withAlias(sql, alias, dialect);
@ -71,7 +71,7 @@ public class StringFunctionQueryColumn extends QueryColumn {
@Override
protected String toConditionSql(List<QueryTable> queryTables, IDialect dialect) {
String sql = StringUtil.join(SqlConsts.DELIMITER, params);
if (StringUtil.isBlank(sql)) {
if (StringUtil.noText(sql)) {
return SqlConsts.EMPTY;
}
return fnName + WrapperUtil.withBracket(sql);

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/WrapperUtil.java
View File

@ -170,11 +170,11 @@ class WrapperUtil {
}
static String buildAlias(String alias, IDialect dialect) {
return StringUtil.isBlank(alias) ? SqlConsts.EMPTY : getAsKeyWord(dialect) + dialect.wrap(alias);
return StringUtil.noText(alias) ? SqlConsts.EMPTY : getAsKeyWord(dialect) + dialect.wrap(alias);
}
static String buildColumnAlias(String alias, IDialect dialect) {
return StringUtil.isBlank(alias) ? SqlConsts.EMPTY : getAsKeyWord(dialect) + dialect.wrapColumnAlias(alias);
return StringUtil.noText(alias) ? SqlConsts.EMPTY : getAsKeyWord(dialect) + dialect.wrapColumnAlias(alias);
}
private static String getAsKeyWord(IDialect dialect) {

18
mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/AbstractRelation.java
View File

@ -87,12 +87,12 @@ public abstract class AbstractRelation<SelfEntity> {
this.selfFieldWrapper = FieldWrapper.of(entityClass, selfField);
//以使用者注解配置为主
this.targetTableInfo = StringUtil.isBlank(targetTable) ? TableInfoFactory.ofEntityClass(relationFieldWrapper.getMappingType()) : TableInfoFactory.ofTableName(targetTable);
this.targetTableInfo = StringUtil.noText(targetTable) ? TableInfoFactory.ofEntityClass(relationFieldWrapper.getMappingType()) : TableInfoFactory.ofTableName(targetTable);
this.targetSchema = targetTableInfo != null ? targetTableInfo.getSchema() : targetSchema;
this.targetTable = targetTableInfo != null ? targetTableInfo.getTableName() : targetTable;
//当指定了 valueField 的时候，一般是 String Integer 等基本数据类型
this.targetEntityClass = (StringUtil.isNotBlank(valueField) && targetTableInfo != null) ? targetTableInfo.getEntityClass() : relationFieldWrapper.getMappingType();
this.targetEntityClass = (StringUtil.hasText(valueField) && targetTableInfo != null) ? targetTableInfo.getEntityClass() : relationFieldWrapper.getMappingType();
this.targetField = ClassUtil.getFirstField(targetEntityClass, field -> field.getName().equalsIgnoreCase(targetField));
if (this.targetField == null) {
@ -102,7 +102,7 @@ public abstract class AbstractRelation<SelfEntity> {
this.targetFieldWrapper = FieldWrapper.of(targetEntityClass, targetField);
this.valueField = valueField;
this.onlyQueryValueField = StringUtil.isNotBlank(valueField);
this.onlyQueryValueField = StringUtil.hasText(valueField);
this.conditionColumn = targetTableInfo == null ? column(targetTable, StringUtil.camelToUnderline(this.targetField.getName()))
: column(targetTable, targetTableInfo.getColumnByProperty(this.targetField.getName()));
@ -126,7 +126,7 @@ public abstract class AbstractRelation<SelfEntity> {
}
protected void initExtraCondition(String extraCondition) {
if (StringUtil.isBlank(extraCondition)) {
if (StringUtil.noText(extraCondition)) {
return;
}
@ -336,15 +336,15 @@ public abstract class AbstractRelation<SelfEntity> {
}
public String getTargetTableWithSchema() {
if (StringUtil.isNotBlank(targetTable)) {
return StringUtil.isNotBlank(targetSchema) ? targetSchema + "." + targetTable : targetTable;
if (StringUtil.hasText(targetTable)) {
return StringUtil.hasText(targetSchema) ? targetSchema + "." + targetTable : targetTable;
} else {
return targetTableInfo.getTableNameWithSchema();
}
}
protected boolean isRelationByMiddleTable() {
return StringUtil.isNotBlank(joinTable);
return StringUtil.hasText(joinTable);
}
@ -353,7 +353,7 @@ public abstract class AbstractRelation<SelfEntity> {
}
protected static String getDefaultPrimaryProperty(String key, Class<?> entityClass, String message) {
if (StringUtil.isNotBlank(key)) {
if (StringUtil.hasText(key)) {
return key;
}
@ -388,7 +388,7 @@ public abstract class AbstractRelation<SelfEntity> {
queryWrapper.where(conditionColumn.eq(targetValues.iterator().next()));
}
if (StringUtil.isNotBlank(extraConditionSql)) {
if (StringUtil.hasText(extraConditionSql)) {
queryWrapper.and(extraConditionSql, RelationManager.getExtraConditionParams(extraConditionParamKeys));
}

6
mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/RelationManager.java
View File

@ -328,12 +328,12 @@ public class RelationManager {
//注解配置的数据源
String configDsKey = relation.getDataSource();
if (StringUtil.isBlank(configDsKey) && currentDsKey != null) {
if (StringUtil.noText(configDsKey) && currentDsKey != null) {
configDsKey = currentDsKey;
}
try {
if (StringUtil.isNotBlank(configDsKey)) {
if (StringUtil.hasText(configDsKey)) {
DataSourceKey.use(configDsKey);
}
@ -391,7 +391,7 @@ public class RelationManager {
relation.join(entities, targetObjectList, mappingRows);
}
} finally {
if (StringUtil.isNotBlank(configDsKey)) {
if (StringUtil.hasText(configDsKey)) {
DataSourceKey.clear();
}
}

9
mybatis-flex-core/src/main/java/com/mybatisflex/core/relation/ToManyRelation.java
View File

@ -22,7 +22,6 @@ import com.mybatisflex.core.util.*;
import java.lang.reflect.Field;
import java.util.*;
import java.util.function.Function;
public class ToManyRelation<SelfEntity> extends AbstractRelation<SelfEntity> {
@ -64,7 +63,7 @@ public class ToManyRelation<SelfEntity> extends AbstractRelation<SelfEntity> {
*/
@Override
public QueryWrapper buildQueryWrapper(Set<Object> targetValues) {
if (StringUtil.isNotBlank(selfValueSplitBy) && CollectionUtil.isNotEmpty(targetValues)) {
if (StringUtil.hasText(selfValueSplitBy) && CollectionUtil.isNotEmpty(targetValues)) {
Set<Object> newTargetValues = new HashSet<>();
for (Object targetValue : targetValues) {
if (targetValue == null) {
@ -86,7 +85,7 @@ public class ToManyRelation<SelfEntity> extends AbstractRelation<SelfEntity> {
@Override
public void customizeQueryWrapper(QueryWrapper queryWrapper) {
if (StringUtil.isNotBlank(orderBy)) {
if (StringUtil.hasText(orderBy)) {
queryWrapper.orderBy(orderBy);
}
@ -135,7 +134,7 @@ public class ToManyRelation<SelfEntity> extends AbstractRelation<SelfEntity> {
Class<?> fieldType = relationFieldWrapper.getFieldType();
boolean isMapType = Map.class.isAssignableFrom(fieldType);
Class<?> wrapType = isMapType ? getMapWrapType(fieldType) : MapperUtil.getCollectionWrapType(fieldType);
boolean splitMode = StringUtil.isNotBlank(selfValueSplitBy);
boolean splitMode = StringUtil.hasText(selfValueSplitBy);
for (SelfEntity selfEntity : selfEntities) {
if (selfEntity == null) {
@ -230,7 +229,7 @@ public class ToManyRelation<SelfEntity> extends AbstractRelation<SelfEntity> {
public void setMapKeyField(String mapKeyField) {
this.mapKeyField = mapKeyField;
if (StringUtil.isNotBlank(mapKeyField)) {
if (StringUtil.hasText(mapKeyField)) {
this.mapKeyFieldWrapper = FieldWrapper.of(targetEntityClass, mapKeyField);
} else {
if (Map.class.isAssignableFrom(relationFieldWrapper.getFieldType())) {

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/row/Row.java
View File

@ -116,7 +116,7 @@ public class Row extends LinkedHashMap<String, Object> implements UpdateWrapper<
return this;
}
if (StringUtil.isBlank(property)) {
if (StringUtil.noText(property)) {
throw new IllegalArgumentException("key column not be null or empty.");
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/ColumnInfo.java
View File

@ -144,7 +144,7 @@ public class ColumnInfo {
}
//脱敏规则配置
else if (StringUtil.isNotBlank(maskType)) {
else if (StringUtil.hasText(maskType)) {
if (typeHandler != null) {
//noinspection unchecked
buildTypeHandler = new CompositeMaskTypeHandler(maskType, (TypeHandler<Object>) typeHandler);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/IdInfo.java
View File

@ -65,7 +65,7 @@ public class IdInfo extends ColumnInfo {
this.keyType = defaultKeyConfig.getKeyType();
this.before = defaultKeyConfig.isBefore();
}
if (StringUtil.isBlank(this.value) && StringUtil.isNotBlank(defaultKeyConfig.getValue())) {
if (StringUtil.noText(this.value) && StringUtil.hasText(defaultKeyConfig.getValue())) {
this.value = defaultKeyConfig.getValue();
}
}

22
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfo.java
View File

@ -176,7 +176,7 @@ public class TableInfo {
}
public String getWrapSchemaAndTableName(IDialect dialect, OperateType operateType) {
if (StringUtil.isNotBlank(schema)) {
if (StringUtil.hasText(schema)) {
String table = dialect.getRealTable(tableName, operateType);
return dialect.wrap(dialect.getRealSchema(schema, table, operateType)) + "." + dialect.wrap(table);
} else {
@ -187,7 +187,7 @@ public class TableInfo {
public void setTableName(String tableName) {
int indexOf = tableName.indexOf(".");
if (indexOf > 0) {
if (StringUtil.isBlank(schema)) {
if (StringUtil.noText(schema)) {
this.schema = tableName.substring(0, indexOf);
this.tableName = tableName.substring(indexOf + 1);
} else {
@ -380,7 +380,7 @@ public class TableInfo {
}
}
}
return StringUtil.isNotBlank(column) ? column : property;
return StringUtil.hasText(column) ? column : property;
}
public Map<String, Class<?>> getAssociationType() {
@ -812,7 +812,7 @@ public class TableInfo {
public Object[] buildTenantIdArgs() {
if (StringUtil.isBlank(tenantIdColumn)) {
if (StringUtil.noText(tenantIdColumn)) {
return null;
}
@ -889,7 +889,7 @@ public class TableInfo {
}
// 添加乐观锁条件，只有在 update 的时候进行处理
if (StringUtil.isNotBlank(getOptimisticLockColumnOrSkip()) && entity != null) {
if (StringUtil.hasText(getOptimisticLockColumnOrSkip()) && entity != null) {
Object versionValue = buildColumnSqlArg(entity, versionColumn);
if (versionValue == null) {
throw FlexExceptions.wrap(LocalizedFormats.ENTITY_VERSION_NULL, entity);
@ -898,7 +898,7 @@ public class TableInfo {
}
// 逻辑删除
if (StringUtil.isNotBlank(getLogicDeleteColumnOrSkip())) {
if (StringUtil.hasText(getLogicDeleteColumnOrSkip())) {
// 逻辑删除时 保证前面的条件被括号包裹
// fix:https://gitee.com/mybatis-flex/mybatis-flex/issues/I9163G
QueryCondition whereCondition = CPI.getWhereQueryCondition(queryWrapper);
@ -941,7 +941,7 @@ public class TableInfo {
// join table
else {
String nameWithSchema = joinQueryTable.getNameWithSchema();
if (StringUtil.isNotBlank(nameWithSchema)) {
if (StringUtil.hasText(nameWithSchema)) {
TableInfo tableInfo = TableInfoFactory.ofTableName(nameWithSchema);
if (tableInfo != null) {
QueryCondition joinQueryCondition = CPI.getJoinQueryCondition(join);
@ -977,7 +977,7 @@ public class TableInfo {
doAppendConditions(entity, childQuery);
} else {
String nameWithSchema = queryTable.getNameWithSchema();
if (StringUtil.isNotBlank(nameWithSchema)) {
if (StringUtil.hasText(nameWithSchema)) {
TableInfo tableInfo = TableInfoFactory.ofTableName(nameWithSchema);
if (tableInfo != null) {
tableInfo.appendConditions(entity, queryWrapper);
@ -1374,7 +1374,7 @@ public class TableInfo {
* @param entityObject
*/
public void initVersionValueIfNecessary(Object entityObject) {
if (StringUtil.isBlank(versionColumn)) {
if (StringUtil.noText(versionColumn)) {
return;
}
@ -1393,7 +1393,7 @@ public class TableInfo {
* @param entityObject
*/
public void initTenantIdIfNecessary(Object entityObject) {
if (StringUtil.isBlank(tenantIdColumn)) {
if (StringUtil.noText(tenantIdColumn)) {
return;
}
@ -1426,7 +1426,7 @@ public class TableInfo {
* @param entityObject
*/
public void initLogicDeleteValueIfNecessary(Object entityObject) {
if (StringUtil.isBlank(getLogicDeleteColumnOrSkip())) {
if (StringUtil.noText(getLogicDeleteColumnOrSkip())) {
return;
}

12
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableInfoFactory.java
View File

@ -153,7 +153,7 @@ public class TableInfoFactory {
public static TableInfo ofTableName(String tableName) {
return StringUtil.isNotBlank(tableName) ? tableInfoMap.get(tableName) : null;
return StringUtil.hasText(tableName) ? tableInfoMap.get(tableName) : null;
}
@ -289,7 +289,7 @@ public class TableInfoFactory {
tableInfo.setOnSetListeners(setListeners);
}
if (StringUtil.isNotBlank(table.dataSource())) {
if (StringUtil.hasText(table.dataSource())) {
tableInfo.setDataSource(table.dataSource());
}
}
@ -412,12 +412,12 @@ public class TableInfoFactory {
}
if (columnAnnotation != null && StringUtil.isNotBlank(columnAnnotation.onInsertValue())) {
if (columnAnnotation != null && StringUtil.hasText(columnAnnotation.onInsertValue())) {
onInsertColumns.put(columnName, columnAnnotation.onInsertValue().trim());
}
if (columnAnnotation != null && StringUtil.isNotBlank(columnAnnotation.onUpdateValue())) {
if (columnAnnotation != null && StringUtil.hasText(columnAnnotation.onUpdateValue())) {
onUpdateColumns.put(columnName, columnAnnotation.onUpdateValue().trim());
}
@ -499,7 +499,7 @@ public class TableInfoFactory {
// 数据脱敏配置
ColumnMask columnMask = field.getAnnotation(ColumnMask.class);
if (columnMask != null && StringUtil.isNotBlank(columnMask.value())) {
if (columnMask != null && StringUtil.hasText(columnMask.value())) {
if (String.class != fieldType) {
throw new IllegalStateException("@ColumnMask() only support for string type field. error: " + entityClass.getName() + "." + field.getName());
}
@ -586,7 +586,7 @@ public class TableInfoFactory {
static String getColumnName(boolean isCamelToUnderline, Field field, Column column) {
if (column != null && StringUtil.isNotBlank(column.value())) {
if (column != null && StringUtil.hasText(column.value())) {
return column.value();
}
if (isCamelToUnderline) {

8
mybatis-flex-core/src/main/java/com/mybatisflex/core/table/TableManager.java
View File

@ -84,7 +84,7 @@ public class TableManager {
Map<String, String> mapping = tableNameMappingTL.get();
if (mapping != null) {
String dynamicTableName = mapping.get(tableName);
if (StringUtil.isNotBlank(dynamicTableName)) {
if (StringUtil.hasText(dynamicTableName)) {
return dynamicTableName;
}
}
@ -94,7 +94,7 @@ public class TableManager {
}
String dynamicTableName = dynamicTableProcessor.process(tableName, operateType);
return StringUtil.isNotBlank(dynamicTableName) ? dynamicTableName : tableName;
return StringUtil.hasText(dynamicTableName) ? dynamicTableName : tableName;
}
@ -102,7 +102,7 @@ public class TableManager {
Map<String, String> mapping = schemaMappingTL.get();
if (mapping != null) {
String dynamicSchema = mapping.get(schema);
if (StringUtil.isNotBlank(dynamicSchema)) {
if (StringUtil.hasText(dynamicSchema)) {
return dynamicSchema;
}
}
@ -112,7 +112,7 @@ public class TableManager {
}
String dynamicSchema = dynamicSchemaProcessor.process(schema, table, operateType);
return StringUtil.isNotBlank(dynamicSchema) ? dynamicSchema : schema;
return StringUtil.hasText(dynamicSchema) ? dynamicSchema : schema;
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/util/ConvertUtil.java
View File

@ -40,7 +40,7 @@ public class ConvertUtil {
return getPrimitiveDefaultValue(targetClass);
}
if (value == null || (targetClass != String.class && value.getClass() == String.class
&& StringUtil.isBlank((String) value))) {
&& StringUtil.noText((String) value))) {
return null;
}
if (value.getClass().isAssignableFrom(targetClass)) {

4
mybatis-flex-core/src/main/java/com/mybatisflex/core/util/DateUtil.java
View File

@ -93,7 +93,7 @@ public class DateUtil {
public static Date parseDate(String dateString) {
if (StringUtil.isBlank(dateString)) {
if (StringUtil.noText(dateString)) {
return null;
}
dateString = dateString.trim();
@ -134,7 +134,7 @@ public class DateUtil {
public static LocalDateTime parseLocalDateTime(String dateString) {
if (StringUtil.isBlank(dateString)) {
if (StringUtil.noText(dateString)) {
return null;
}
dateString = dateString.trim();

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/util/LambdaUtil.java
View File

@ -66,7 +66,7 @@ public class LambdaUtil {
public static <T> String getAliasName(LambdaGetter<T> getter, boolean withPrefix) {
QueryColumn queryColumn = getQueryColumn(getter);
if (queryColumn != null) {
String alias = StringUtil.isNotBlank(queryColumn.getAlias()) ? queryColumn.getAlias() : queryColumn.getName();
String alias = StringUtil.hasText(queryColumn.getAlias()) ? queryColumn.getAlias() : queryColumn.getName();
return withPrefix ? queryColumn.getTable().getName() + "$" + alias : alias;
}
return getFieldName(getter);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/util/MapUtil.java
View File

@ -29,7 +29,7 @@ public class MapUtil {
int jvmVersion = -1;
try {
String javaSpecVer = StringUtil.tryTrim(System.getProperty("java.specification.version"));
if (StringUtil.isNotBlank(javaSpecVer)) {
if (StringUtil.hasText(javaSpecVer)) {
if (javaSpecVer.startsWith("1.")) {
javaSpecVer = javaSpecVer.substring(2);
}

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/util/MapperUtil.java
View File

@ -165,7 +165,7 @@ public class MapperUtil {
QueryTable joinQueryTable = CPI.getJoinQueryTable(join);
if (joinQueryTable != null) {
String tableName = joinQueryTable.getName();
if (StringUtil.isNotBlank(joinQueryTable.getAlias())) {
if (StringUtil.hasText(joinQueryTable.getAlias())) {
joinTables.add(tableName + "." + joinQueryTable.getAlias());
} else {
joinTables.add(tableName);

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/util/SqlUtil.java
View File

@ -36,7 +36,7 @@ public class SqlUtil {
}
public static void keepColumnSafely(String column) {
if (StringUtil.isBlank(column)) {
if (StringUtil.noText(column)) {
throw new IllegalArgumentException("Column must not be empty");
} else {
column = column.trim();

63
mybatis-flex-core/src/main/java/com/mybatisflex/core/util/StringUtil.java
View File

@ -84,7 +84,7 @@ public class StringUtil {
* @param string
*/
public static String camelToUnderline(String string) {
if (isBlank(string)) {
if (noText(string)) {
return "";
}
int strLen = string.length();
@ -108,7 +108,7 @@ public class StringUtil {
* @param string
*/
public static String underlineToCamel(String string) {
if (isBlank(string)) {
if (noText(string)) {
return "";
}
if (Character.isUpperCase(string.charAt(0))) {
@ -134,7 +134,7 @@ public class StringUtil {
* 删除字符串中的字符
*/
public static String deleteChar(String string, char deleteChar) {
if (isBlank(string)) {
if (noText(string)) {
return "";
}
char[] chars = string.toCharArray();
@ -148,7 +148,7 @@ public class StringUtil {
}
public static String deleteChar(String string, char deleteChar1, char deleteChar2) {
if (isBlank(string)) {
if (noText(string)) {
return "";
}
char[] chars = string.toCharArray();
@ -161,30 +161,9 @@ public class StringUtil {
return sb.toString();
}
/**
* 字符串为 null 或者内部字符全部为 ' ', '\t', '\n', '\r' 这四类字符时返回 true
*/
public static boolean isBlank(String string) {
if (string == null) {
return true;
}
for (int i = 0, len = string.length(); i < len; i++) {
if (string.charAt(i) > ' ') {
return false;
}
}
return true;
}
public static boolean isAnyBlank(String... strings) {
if (strings == null || strings.length == 0) {
throw new IllegalArgumentException("strings is null or empty.");
}
for (String string : strings) {
if (isBlank(string)) {
private static boolean containsText(CharSequence charSequence) {
for (int i = 0; i < charSequence.length(); i++) {
if (!Character.isWhitespace(charSequence.charAt(i))) {
return true;
}
}
@ -192,13 +171,25 @@ public class StringUtil {
}
public static boolean isNotBlank(String str) {
return !isBlank(str);
public static boolean hasText(String string) {
return string != null && !string.isEmpty() && containsText(string);
}
public static boolean areNotBlank(String... strings) {
return !isAnyBlank(strings);
public static boolean allHasText(String... strings) {
for (String string : strings) {
if (!hasText(string)) {
return false;
}
}
return true;
}
/**
* 字符串为 null 或者内部字符全部为 ' ', '\t', '\n', '\r' 这四类字符时返回 true
*/
public static boolean noText(String string) {
return !hasText(string);
}
@ -209,7 +200,7 @@ public class StringUtil {
* @return 全部数数值时返回 true，否则返回 false
*/
public static boolean isNumeric(String string) {
if (isBlank(string)) {
if (noText(string)) {
return false;
}
for (int i = string.length(); --i >= 0; ) {
@ -223,7 +214,7 @@ public class StringUtil {
public static boolean startsWithAny(String string, String... prefixes) {
if (isBlank(string) || prefixes == null) {
if (noText(string) || prefixes == null) {
return false;
}
@ -237,7 +228,7 @@ public class StringUtil {
public static boolean endsWithAny(String str, String... suffixes) {
if (isBlank(str) || suffixes == null) {
if (noText(str) || suffixes == null) {
return false;
}
@ -326,7 +317,7 @@ public class StringUtil {
}
public static String buildSchemaWithTable(String schema, String tableName) {
return isNotBlank(schema) ? schema + "." + tableName : tableName;
return hasText(schema) ? schema + "." + tableName : tableName;
}
public static String[] getSchemaAndTableName(String tableNameWithSchema) {

2
mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexSpringTransaction.java
View File

@ -44,7 +44,7 @@ public class FlexSpringTransaction implements Transaction {
public Connection getConnection() throws SQLException {
if (isConnectionTransactional == null) {
connection = dataSource.getConnection();
isConnectionTransactional = StringUtil.isNotBlank(TransactionContext.getXID());
isConnectionTransactional = StringUtil.hasText(TransactionContext.getXID());
autoCommit = connection.getAutoCommit();
return connection;
}

2
mybatis-flex-spring/src/main/java/com/mybatisflex/spring/FlexTransactionManager.java
View File

@ -39,7 +39,7 @@ public class FlexTransactionManager extends AbstractPlatformTransactionManager {
@Override
protected boolean isExistingTransaction(Object transaction) throws TransactionException {
TransactionObject transactionObject = (TransactionObject) transaction;
return StringUtil.isNotBlank(transactionObject.prevXid);
return StringUtil.hasText(transactionObject.prevXid);
}
@Override

2
mybatis-flex-spring/src/main/java/com/mybatisflex/spring/datasource/DataSourceInterceptor.java
View File

@ -45,7 +45,7 @@ public class DataSourceInterceptor implements MethodInterceptor {
@Override
public Object invoke(MethodInvocation invocation) throws Throwable {
String dsKey = getDataSourceKey(invocation.getMethod(), invocation.getThis().getClass());
if (StringUtil.isBlank(dsKey)) {
if (StringUtil.noText(dsKey)) {
return invocation.proceed();
}
try {

2
mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/ContributorsDocGen.java
View File

@ -80,7 +80,7 @@ public class ContributorsDocGen {
markdown.append("|");
if (StringUtil.isNotBlank(src)) {
if (StringUtil.hasText(src)) {
markdown.append("![](" + src + ")");
}