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

chore: code format

Browse Source
This commit is contained in:
Michael Yang 2024-02-03 11:49:02 +08:00
parent 086c40362b
commit 34ca4730ee
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,12 +66,12 @@ public class ColumnInfo {
/**
* 自定义 TypeHandler。
*/
protected TypeHandler typeHandler;
protected TypeHandler<?> typeHandler;
/**
* 最终使用和构建出来的 typeHandler
*/
protected TypeHandler buildTypeHandler;
protected TypeHandler<?> buildTypeHandler;
/**
* 数据脱敏类型。
@ -124,7 +124,7 @@ public class ColumnInfo {
this.jdbcType = jdbcType;
}
public TypeHandler buildTypeHandler(Configuration configuration) {
public TypeHandler<?> buildTypeHandler(Configuration configuration) {
if (buildTypeHandler != null) {
return buildTypeHandler;
@ -133,7 +133,8 @@ public class ColumnInfo {
//脱敏规则配置
else if (StringUtil.isNotBlank(maskType)) {
if (typeHandler != null) {
buildTypeHandler = new CompositeMaskTypeHandler(maskType, typeHandler);
//noinspection unchecked
buildTypeHandler = new CompositeMaskTypeHandler(maskType, (TypeHandler<Object>) typeHandler);
} else {
buildTypeHandler = new MaskTypeHandler(maskType);
}
@ -157,7 +158,7 @@ public class ColumnInfo {
return buildTypeHandler;
}
public void setTypeHandler(TypeHandler typeHandler) {
public void setTypeHandler(TypeHandler<?> typeHandler) {
this.typeHandler = typeHandler;
}

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

@ -1207,12 +1207,11 @@ public class TableInfo {
ColumnInfo columnInfo = columnInfoMapping.get(column);
Object value = getPropertyValue(metaObject, columnInfo.property);
if (value != null) {
TypeHandler typeHandler = columnInfo.buildTypeHandler(null);
TypeHandler<?> typeHandler = columnInfo.buildTypeHandler(null);
if (typeHandler != null) {
return new TypeHandlerObject(typeHandler, value, columnInfo.getJdbcType());
}
}
return value;
}