ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

add null check

Browse Source
This commit is contained in:
Looly 2022-05-20 11:33:56 +08:00
parent 586b8d2c85
commit b5619fefbd
4 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hutool-core/src/main/java/cn/hutool/core/bean/BeanUtil.java
View File

@ -685,6 +685,9 @@ public class BeanUtil {
* @return 目标对象
*/
public static <T> T copyProperties(final Object source, final Class<T> tClass, final String... ignoreProperties) {
if(null == source){
return null;
}
final T target = ConstructorUtil.newInstanceIfPossible(tClass);
copyProperties(source, target, CopyOptions.create().setIgnoreProperties(ignoreProperties));
return target;
@ -722,6 +725,9 @@ public class BeanUtil {
* @param copyOptions 拷贝选项，见 {@link CopyOptions}
*/
public static void copyProperties(final Object source, final Object target, final CopyOptions copyOptions) {
if(null == source || null == target){
return;
}
BeanCopier.create(source, target, ObjUtil.defaultIfNull(copyOptions, CopyOptions::create)).copy();
}

28
hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java
View File

@ -1,5 +1,6 @@
package cn.hutool.core.bean.copier;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.copier.Copier;
import java.io.Serializable;
@ -16,9 +17,8 @@ import java.util.Map;
* 4. Map 转 Map
* </pre>
*
* @author looly
*
* @param <T> 目标对象类型
* @author looly
* @since 3.2.3
*/
public class BeanCopier<T> implements Copier<T>, Serializable {
@ -29,9 +29,9 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
/**
* 创建BeanCopier
*
* @param <T> 目标Bean类型
* @param source 来源对象，可以是Bean或者Map
* @param target 目标Bean对象
* @param <T> 目标Bean类型
* @param source 来源对象，可以是Bean或者Map
* @param target 目标Bean对象
* @param copyOptions 拷贝属性选项
* @return BeanCopier
*/
@ -42,10 +42,10 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
/**
* 创建BeanCopier
*
* @param <T> 目标Bean类型
* @param source 来源对象，可以是Bean或者Map
* @param target 目标Bean对象
* @param destType 目标的泛型类型，用于标注有泛型参数的Bean对象
* @param <T> 目标Bean类型
* @param source 来源对象，可以是Bean或者Map
* @param target 目标Bean对象
* @param destType 目标的泛型类型，用于标注有泛型参数的Bean对象
* @param copyOptions 拷贝属性选项
* @return BeanCopier
*/
@ -56,13 +56,15 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
/**
* 构造
*
* @param source 来源对象，可以是Bean或者Map
* @param target 目标Bean对象
* @param targetType 目标的泛型类型，用于标注有泛型参数的Bean对象
* @param source 来源对象，可以是Bean或者Map，不能为{@code null}
* @param target 目标Bean对象，不能为{@code null}
* @param targetType 目标的泛型类型，用于标注有泛型参数的Bean对象
* @param copyOptions 拷贝属性选项
*/
@SuppressWarnings("unchecked")
public BeanCopier(final Object source, final T target, final Type targetType, final CopyOptions copyOptions) {
Assert.notNull(source, "Source bean must be not null!");
Assert.notNull(target, "Target bean must be not null!");
final Copier<T> copier;
if (source instanceof Map) {
if (target instanceof Map) {
@ -70,7 +72,7 @@ public class BeanCopier<T> implements Copier<T>, Serializable {
} else {
copier = new MapToBeanCopier<>((Map<?, ?>) source, target, targetType, copyOptions);
}
}else if(source instanceof ValueProvider){
} else if (source instanceof ValueProvider) {
//noinspection unchecked
copier = new ValueProviderToBeanCopier<>((ValueProvider<String>) source, target, targetType, copyOptions);
} else {

2
hutool-core/src/main/java/cn/hutool/core/bean/copier/MapToMapCopier.java
View File

@ -24,7 +24,7 @@ public class MapToMapCopier extends AbsCopier<Map, Map> {
* @param source 来源Map
* @param target 目标Bean对象
* @param targetType 目标泛型类型
* @param copyOptions 拷贝选项
* @param copyOptions 拷贝选项，{@code null}使用默认配置
*/
public MapToMapCopier(final Map source, final Map target, final Type targetType, final CopyOptions copyOptions) {
super(source, target, copyOptions);

5
hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java
View File

@ -567,6 +567,11 @@ public class BeanUtilTest {
Assert.assertNull(newFood.getCode());
}
@Test
public void copyNullTest() {
Assert.assertNull(BeanUtil.copyProperties(null, Food.class));
}
@Test
public void copyBeanPropertiesFilterTest() {
final Food info = new Food();