diff --git a/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java b/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java index a13e0b0c8..1b97c84ff 100644 --- a/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java +++ b/hutool-core/src/main/java/cn/hutool/core/bean/BeanDesc.java @@ -285,7 +285,7 @@ public class BeanDesc implements Serializable { } // 包括boolean的任何类型只有一种匹配情况:name -》 getName - return methodName.equals("get" + fieldName); + return methodName.equals("get" + handledFieldName); } /** @@ -322,10 +322,10 @@ public class BeanDesc implements Serializable { } // 针对Boolean类型特殊检查 - if (isBooleanField && handledFieldName.startsWith("is")) { + if (isBooleanField && fieldName.startsWith("is")) { // 字段是is开头 if (methodName.equals("set" + StrUtil.removePrefix(fieldName, "is"))// isName -》 setName - || methodName.equals("set" + fieldName)// isName -》 setIsName + || methodName.equals("set" + handledFieldName)// isName -》 setIsName ) { return true; } diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java index b3f8c815e..41c1291f5 100644 --- a/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONObjectTest.java @@ -216,7 +216,6 @@ public class JSONObjectTest { @Test public void toBeanWithNullTest() { String jsonStr = "{'data':{'userName':'ak','password': null}}"; - Console.log(JSONUtil.parseObj(jsonStr)); UserWithMap user = JSONUtil.toBean(JSONUtil.parseObj(jsonStr), UserWithMap.class); Assert.assertTrue(user.getData().containsKey("password")); } @@ -518,7 +517,7 @@ public class JSONObjectTest { final Map.Entry next = entries.iterator().next(); final JSONObject jsonObject = JSONUtil.parseObj(next); - Console.log(jsonObject); + Assert.assertEquals("{\"test\":\"testValue\"}", jsonObject.toString()); } @Test(expected = JSONException.class) @@ -533,7 +532,7 @@ public class JSONObjectTest { map.put("c", 2.0F); final String s = JSONUtil.toJsonStr(map); - Console.log(s); + Assert.assertEquals("{\"c\":2}", s); } @Test