lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-24 18:04:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add record support

Browse Source
This commit is contained in:
Looly 2023-06-20 10:27:02 +08:00
parent e1b6ebd1ac
commit 4f26d3aba5
3 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java
View File

@ -16,8 +16,8 @@ import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.map.CaseInsensitiveMap;
import org.dromara.hutool.core.reflect.FieldUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.reflect.ModifierUtil;
import org.dromara.hutool.core.reflect.method.MethodUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.util.BooleanUtil;
@ -152,6 +152,36 @@ public class BeanDesc implements Serializable {
* 只有与属性关联的相关Getter和Setter方法才会被读取，无关的getXXX和setXXX都被忽略
*/
private void init() {
if (RecordUtil.isRecord(this.beanClass)) {
initForRecord();
} else{
initForBean();
}
}
/**
* 针对Record类的反射初始化
*/
private void initForRecord() {
final Method[] getters = MethodUtil.getPublicMethods(this.beanClass, method -> 0 == method.getParameterCount());
for (final Field field : FieldUtil.getFields(this.beanClass)) {
// 排除静态属性和对象子类
if (!ModifierUtil.isStatic(field) && !FieldUtil.isOuterClassField(field)) {
for (final Method getter : getters) {
if (field.getName().equals(getter.getName())) {
//record对象，getter方法与字段同名
final PropDesc prop = new PropDesc(field, getter, null);
this.propMap.putIfAbsent(prop.getFieldName(), prop);
}
}
}
}
}
/**
* 普通Bean初始化
*/
private void initForBean() {
final Method[] gettersAndSetters = MethodUtil.getPublicMethods(this.beanClass, MethodUtil::isGetterOrSetterIgnoreCase);
PropDesc prop;
for (final Field field : FieldUtil.getFields(this.beanClass)) {
@ -299,7 +329,7 @@ public class BeanDesc implements Serializable {
if (StrUtil.startWith(fieldName, "is", ignoreCase)) {
// isName -》 isName
if(StrUtil.equals(fieldName, m.getName(), ignoreCase)){
if (StrUtil.equals(fieldName, m.getName(), ignoreCase)) {
return true;
}
}

24
hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java
View File

@ -12,6 +12,7 @@
package org.dromara.hutool.core.bean;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.bean.copier.BeanCopier;
import org.dromara.hutool.core.bean.copier.CopyOptions;
import org.dromara.hutool.core.bean.copier.ValueProvider;
@ -19,6 +20,7 @@ import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.collection.set.SetUtil;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.impl.RecordConverter;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.map.CaseInsensitiveMap;
import org.dromara.hutool.core.map.MapUtil;
@ -27,24 +29,12 @@ import org.dromara.hutool.core.reflect.ConstructorUtil;
import org.dromara.hutool.core.reflect.FieldUtil;
import org.dromara.hutool.core.reflect.ModifierUtil;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.core.array.ArrayUtil;
import org.dromara.hutool.core.util.ObjUtil;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
import java.beans.*;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
@ -678,10 +668,16 @@ public class BeanUtil {
* @param ignoreProperties 不拷贝的的属性列表
* @return 目标对象
*/
@SuppressWarnings("unchecked")
public static <T> T copyProperties(final Object source, final Class<T> tClass, final String... ignoreProperties) {
if (null == source) {
return null;
}
if(RecordUtil.isRecord(tClass)){
// issue#I7EO3U
// 转换record时，ignoreProperties无效
return (T) RecordConverter.INSTANCE.convert(tClass, source);
}
final T target = ConstructorUtil.newInstanceIfPossible(tClass);
copyProperties(source, target, CopyOptions.of().setIgnoreProperties(ignoreProperties));
return target;

2
hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/RecordConverter.java
View File

@ -46,7 +46,7 @@ public class RecordConverter extends AbstractConverter {
valueProvider = (ValueProvider<String>) value;
} else if (value instanceof Map) {
valueProvider = new MapValueProvider((Map<String, ?>) value);
} else if (BeanUtil.isWritableBean(value.getClass())) {
} else if (BeanUtil.isReadableBean(value.getClass())) {
valueProvider = new BeanValueProvider(value);
}