diff --git a/CHANGELOG.md b/CHANGELOG.md index a894d1f92..f917d22ee 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * 【core 】 增加BeanValueProvider（issue#I5FBHV@Gitee） * 【core 】 Convert工具类中，新增中文大写数字金额转换为数字工具方法（pr#674@Gitee） * 【core 】 新增CollectorUtil.reduceListMap()（pr#676@Gitee） +* 【core 】 新增CollectorUtil.reduceListMap()（pr#676@Gitee） * ### 🐞Bug修复 diff --git a/hutool-core/src/test/java/cn/hutool/core/map/LinkedForestMapTest.java b/hutool-core/src/test/java/cn/hutool/core/map/LinkedForestMapTest.java index af13d4c5e..08ca22047 100644 --- a/hutool-core/src/test/java/cn/hutool/core/map/LinkedForestMapTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/map/LinkedForestMapTest.java @@ -23,9 +23,9 @@ public class LinkedForestMapTest { @Test public void testTreeEntry() { - TreeEntry parent = treeNodeMap.get("b"); - TreeEntry treeEntry = treeNodeMap.get("c"); - TreeEntry child = treeNodeMap.get("d"); + final TreeEntry parent = treeNodeMap.get("b"); + final TreeEntry treeEntry = treeNodeMap.get("c"); + final TreeEntry child = treeNodeMap.get("d"); // Entry相关 Assert.assertEquals("c", treeEntry.getKey()); @@ -40,7 +40,7 @@ public class LinkedForestMapTest { Assert.assertTrue(treeEntry.containsParent("a")); // 子节点相关方法 - List> nodes = new ArrayList<>(); + final List> nodes = new ArrayList<>(); treeEntry.forEachChild(true, nodes::add); Assert.assertEquals(CollUtil.newArrayList(treeEntry, child), nodes); nodes.clear(); @@ -56,7 +56,7 @@ public class LinkedForestMapTest { @Test public void putTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); TreeEntry treeEntry = new LinkedForestMap.TreeEntryNode<>(null, "a", "aaa"); Assert.assertNull(map.put("a", treeEntry)); @@ -73,13 +73,13 @@ public class LinkedForestMapTest { @Test public void removeTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - TreeEntry a = map.get("a"); - TreeEntry b = map.get("b"); - TreeEntry c = map.get("c"); + final TreeEntry a = map.get("a"); + final TreeEntry b = map.get("b"); + final TreeEntry c = map.get("c"); map.remove("b"); Assert.assertNull(map.get("b")); @@ -91,16 +91,16 @@ public class LinkedForestMapTest { @Test public void putAllTest() { - ForestMap source = new LinkedForestMap<>(false); + final ForestMap source = new LinkedForestMap<>(false); source.linkNodes("a", "b"); source.linkNodes("b", "c"); - ForestMap target = new LinkedForestMap<>(false); + final ForestMap target = new LinkedForestMap<>(false); target.putAll(source); - TreeEntry a = target.get("a"); - TreeEntry b = target.get("b"); - TreeEntry c = target.get("c"); + final TreeEntry a = target.get("a"); + final TreeEntry b = target.get("b"); + final TreeEntry c = target.get("c"); Assert.assertNotNull(a); Assert.assertEquals("a", a.getKey()); @@ -118,13 +118,13 @@ public class LinkedForestMapTest { @Test public void clearTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - TreeEntry a = map.get("a"); - TreeEntry b = map.get("b"); - TreeEntry c = map.get("c"); + final TreeEntry a = map.get("a"); + final TreeEntry b = map.get("b"); + final TreeEntry c = map.get("c"); Assert.assertFalse(a.hasParent()); Assert.assertTrue(a.hasChildren()); Assert.assertTrue(b.hasParent()); @@ -144,27 +144,27 @@ public class LinkedForestMapTest { @Test public void putAllNodeTest() { - ForestMap> map = new LinkedForestMap<>(false); + final ForestMap> map = new LinkedForestMap<>(false); - Map aMap = MapBuilder. create() + final Map aMap = MapBuilder. create() .put("pid", null) .put("id", "a") .build(); - Map bMap = MapBuilder. create() + final Map bMap = MapBuilder. create() .put("pid", "a") .put("id", "b") .build(); - Map cMap = MapBuilder. create() + final Map cMap = MapBuilder. create() .put("pid", "b") .put("id", "c") .build(); map.putAllNode(Arrays.asList(aMap, bMap, cMap), m -> m.get("id"), m -> m.get("pid"), true); - TreeEntry> a = map.get("a"); + final TreeEntry> a = map.get("a"); Assert.assertNotNull(a); - TreeEntry> b = map.get("b"); + final TreeEntry> b = map.get("b"); Assert.assertNotNull(b); - TreeEntry> c = map.get("c"); + final TreeEntry> c = map.get("c"); Assert.assertNotNull(c); Assert.assertNull(a.getDeclaredParent()); @@ -178,7 +178,7 @@ public class LinkedForestMapTest { @Test public void putNodeTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); Assert.assertNull(map.get("a")); @@ -193,7 +193,7 @@ public class LinkedForestMapTest { @Test public void putLinkedNodesTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); Assert.assertNull(map.get("a")); Assert.assertNull(map.get("b")); @@ -213,7 +213,7 @@ public class LinkedForestMapTest { @Test public void putLinkedNodesTest2() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); Assert.assertNull(map.get("a")); Assert.assertNull(map.get("b")); @@ -233,11 +233,11 @@ public class LinkedForestMapTest { @Test public void linkNodesTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); - TreeEntry parent = map.get("a"); - TreeEntry child = map.get("b"); + final TreeEntry parent = map.get("a"); + final TreeEntry child = map.get("b"); Assert.assertNotNull(parent); Assert.assertEquals("a", parent.getKey()); @@ -250,10 +250,10 @@ public class LinkedForestMapTest { @Test public void unlinkNodeTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); - TreeEntry parent = map.get("a"); - TreeEntry child = map.get("b"); + final TreeEntry parent = map.get("a"); + final TreeEntry child = map.get("b"); map.unlinkNode("a", "b"); Assert.assertFalse(child.hasParent()); Assert.assertFalse(parent.hasChildren()); @@ -261,11 +261,11 @@ public class LinkedForestMapTest { @Test public void getTreeNodesTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - List expected = CollUtil.newArrayList("a", "b", "c"); + final List expected = CollUtil.newArrayList("a", "b", "c"); List actual = CollStreamUtil.toList(map.getTreeNodes("a"), TreeEntry::getKey); Assert.assertEquals(expected, actual); actual = CollStreamUtil.toList(map.getTreeNodes("b"), TreeEntry::getKey); @@ -276,11 +276,11 @@ public class LinkedForestMapTest { @Test public void getRootNodeTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - TreeEntry root = map.get("a"); + final TreeEntry root = map.get("a"); Assert.assertEquals(root, map.getRootNode("a")); Assert.assertEquals(root, map.getRootNode("b")); Assert.assertEquals(root, map.getRootNode("c")); @@ -288,22 +288,22 @@ public class LinkedForestMapTest { @Test public void getDeclaredParentNodeTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - TreeEntry a = map.get("a"); - TreeEntry b = map.get("b"); + final TreeEntry a = map.get("a"); + final TreeEntry b = map.get("b"); Assert.assertEquals(a, map.getDeclaredParentNode("b")); Assert.assertEquals(b, map.getDeclaredParentNode("c")); } @Test public void getParentNodeTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - TreeEntry a = map.get("a"); - TreeEntry b = map.get("b"); + final TreeEntry a = map.get("a"); + final TreeEntry b = map.get("b"); Assert.assertEquals(a, map.getParentNode("c", "a")); Assert.assertEquals(b, map.getParentNode("c", "b")); @@ -313,7 +313,7 @@ public class LinkedForestMapTest { @Test public void containsParentNodeTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); Assert.assertTrue(map.containsParentNode("c", "b")); @@ -324,11 +324,11 @@ public class LinkedForestMapTest { @Test public void containsChildNodeTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - TreeEntry b = map.get("b"); - TreeEntry c = map.get("c"); + final TreeEntry b = map.get("b"); + final TreeEntry c = map.get("c"); Assert.assertTrue(map.containsChildNode("a", "b")); Assert.assertTrue(map.containsChildNode("a", "c")); @@ -338,11 +338,11 @@ public class LinkedForestMapTest { @Test public void getDeclaredChildNodesTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - TreeEntry b = map.get("b"); - TreeEntry c = map.get("c"); + final TreeEntry b = map.get("b"); + final TreeEntry c = map.get("c"); Assert.assertEquals(CollUtil.newArrayList(b), new ArrayList<>(map.getDeclaredChildNodes("a"))); Assert.assertEquals(CollUtil.newArrayList(c), new ArrayList<>(map.getDeclaredChildNodes("b"))); @@ -351,11 +351,11 @@ public class LinkedForestMapTest { @Test public void getChildNodesTest() { - ForestMap map = new LinkedForestMap<>(false); + final ForestMap map = new LinkedForestMap<>(false); map.linkNodes("a", "b"); map.linkNodes("b", "c"); - TreeEntry b = map.get("b"); - TreeEntry c = map.get("c"); + final TreeEntry b = map.get("b"); + final TreeEntry c = map.get("c"); Assert.assertEquals(CollUtil.newArrayList(b, c), new ArrayList<>(map.getChildNodes("a"))); Assert.assertEquals(CollUtil.newArrayList(c), new ArrayList<>(map.getChildNodes("b")));