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 fa7a0aead..56ec38dac 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; diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 14841d742..a272af9c8 100644 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -378,7 +378,7 @@ com.googlecode.aviator aviator - 5.1.4 + 5.2.1 compile true diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java index 0afc46d02..beab37210 100644 --- a/hutool-json/src/main/java/cn/hutool/json/JSONArray.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONArray.java @@ -208,7 +208,7 @@ public class JSONArray implements JSON, JSONGetter, List, Rando } /** - * JSONArray转为以separator为分界符的字符串 + * JSONArray转为以{@code separator}为分界符的字符串 * * @param separator 分界符 * @return a string. diff --git a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java index b3a8bb166..5b42385e9 100644 --- a/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java @@ -1,6 +1,7 @@ package cn.hutool.json; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.ConvertException; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Console; @@ -33,6 +34,14 @@ public class JSONArrayTest { new JSONArray(new JSONObject(), JSONConfig.create()); } + @Test + public void addNullTest(){ + final List aaa = ListUtil.of("aaa", null); + String jsonStr = JSONUtil.toJsonStr(JSONUtil.parse(aaa, + JSONConfig.create().setIgnoreNullValue(false))); + Assert.assertEquals("[\"aaa\",null]", jsonStr); + } + @Test public void addTest() { // 方法1 @@ -96,7 +105,7 @@ public class JSONArrayTest { List list = array.toList(Exam.class); Assert.assertFalse(list.isEmpty()); - Assert.assertEquals(Exam.class, list.get(0).getClass()); + Assert.assertSame(Exam.class, list.get(0).getClass()); } @Test @@ -107,7 +116,7 @@ public class JSONArrayTest { List userList = JSONUtil.toList(array, User.class); Assert.assertFalse(userList.isEmpty()); - Assert.assertEquals(User.class, userList.get(0).getClass()); + Assert.assertSame(User.class, userList.get(0).getClass()); Assert.assertEquals(Integer.valueOf(111), userList.get(0).getId()); Assert.assertEquals(Integer.valueOf(112), userList.get(1).getId()); @@ -125,7 +134,7 @@ public class JSONArrayTest { List list = JSONUtil.toList(array, Dict.class); Assert.assertFalse(list.isEmpty()); - Assert.assertEquals(Dict.class, list.get(0).getClass()); + Assert.assertSame(Dict.class, list.get(0).getClass()); Assert.assertEquals(Integer.valueOf(111), list.get(0).getInt("id")); Assert.assertEquals(Integer.valueOf(112), list.get(1).getInt("id")); @@ -142,7 +151,7 @@ public class JSONArrayTest { //noinspection SuspiciousToArrayCall Exam[] list = array.toArray(new Exam[0]); Assert.assertNotEquals(0, list.length); - Assert.assertEquals(Exam.class, list[0].getClass()); + Assert.assertSame(Exam.class, list[0].getClass()); } /** diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index 7f6e72a0c..b3b5bc38c 100644 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -26,7 +26,7 @@ com.github.oshi oshi-core - 5.3.5 + 5.3.6 provided