From 3c8236af95862c25ada5bcf7e9d54c920d8fce0a Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 9 Sep 2020 14:40:22 +0800 Subject: [PATCH] fix code --- .../src/main/java/cn/hutool/core/bean/copier/BeanCopier.java | 2 +- .../cn/hutool/core/bean/copier/provider/BeanValueProvider.java | 2 +- .../src/test/java/cn/hutool/core/bean/BeanUtilTest.java | 3 +-- .../test/java/cn/hutool/core/convert/ConvertToBeanTest.java | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java index 2203d7730..d9c5c1f7a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/BeanCopier.java @@ -216,12 +216,12 @@ public class BeanCopier implements Copier, Serializable { } final HashSet ignoreSet = (null != copyOptions.ignoreProperties) ? CollUtil.newHashSet(copyOptions.ignoreProperties) : null; + // 遍历目标bean的所有属性 BeanUtil.descForEach(actualEditable, (prop)->{ if(false == prop.isWritable(this.copyOptions.isTransientSupport())){ // 字段不可写,跳过之 return; } - // 检查属性名 String fieldName = prop.getFieldName(); if (CollUtil.contains(ignoreSet, fieldName)) { diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/BeanValueProvider.java b/hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/BeanValueProvider.java index 2ca6ce471..8766d7e2a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/BeanValueProvider.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/copier/provider/BeanValueProvider.java @@ -48,7 +48,7 @@ public class BeanValueProvider implements ValueProvider { final PropDesc sourcePd = getPropDesc(key, null); // 字段描述不存在或忽略读的情况下,表示不存在 - return null != sourcePd && false == sourcePd.isReadable(false); + return null != sourcePd && sourcePd.isReadable(false); } /** diff --git a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java index bcc8ccc3a..16284002e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java @@ -4,7 +4,6 @@ import cn.hutool.core.annotation.Alias; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.ValueProvider; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.Console; import cn.hutool.core.map.MapUtil; import lombok.Data; import lombok.Getter; @@ -444,7 +443,7 @@ public class BeanUtilTest { public void setPropertiesTest(){ Map resultMap = MapUtil.newHashMap(); BeanUtil.setProperty(resultMap, "codeList[0].name", "张三"); - Console.log(resultMap); + Assert.assertEquals("{codeList={0={name=张三}}}", resultMap.toString()); } @Test diff --git a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java index 24691be6b..ef4d3dc2e 100644 --- a/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/convert/ConvertToBeanTest.java @@ -1,7 +1,6 @@ package cn.hutool.core.convert; import cn.hutool.core.bean.BeanUtilTest.SubPerson; -import cn.hutool.core.lang.Console; import cn.hutool.core.lang.TypeReference; import org.junit.Assert; import org.junit.Test; @@ -62,7 +61,6 @@ public class ConvertToBeanTest { map1.put("key4", 4); Map map2 = Convert.toMap(String.class, String.class, map1); - Console.log(map2); Assert.assertEquals("1", map2.get("key1")); Assert.assertEquals("2", map2.get("key2"));