plusone/plusone-commons
1
1
Fork 1
Code Issues 1 Pull Requests Projects Releases 4 Activity

1.0.0-RC3 #21

Merged
ZhouXY108 merged 11 commits from 1.x.x into dev 2025-02-14 19:03:05 +08:00
Conversation 0 Commits 11 Files Changed 33 +25 -24
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d217e8b9ac - Show all commits

2
src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2023-2024 the original author or authors. * Copyright 2023-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

37
src/test/java/xyz/zhouxy/plusone/commons/util/TreeBuilderTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2023-2024 the original author or authors. * Copyright 2023-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -62,7 +62,7 @@ class TreeBuilderTests {
Menu::getMenuCode, Menu::getMenuCode,
menu -> Optional.ofNullable(menu.parentMenuCode), menu -> Optional.ofNullable(menu.parentMenuCode),
MenuList::addChild, MenuList::addChild,
Menu.orderNumComparator); Comparator.comparing(Menu::getOrderNum));
@Test @Test
void testBuildTreeAndSortedByOrderNum() { void testBuildTreeAndSortedByOrderNum() {
@ -70,9 +70,10 @@ class TreeBuilderTests {
List<Menu> menuTreeSortedByOrderNum = treeBuilder.buildTree(clonedMenus); List<Menu> menuTreeSortedByOrderNum = treeBuilder.buildTree(clonedMenus);
log.info("menuTreeSortedByOrderNum: {}", new Gson().toJson(menuTreeSortedByOrderNum)); log.info("menuTreeSortedByOrderNum: {}", new Gson().toJson(menuTreeSortedByOrderNum));
assertEquals(clonedMenus.stream() assertEquals(
clonedMenus.stream()
.filter(menu -> menu.getParentMenuCode() == null) .filter(menu -> menu.getParentMenuCode() == null)
.sorted(Menu.orderNumComparator) .sorted(Comparator.comparing(Menu::getOrderNum))
.collect(Collectors.toList()), .collect(Collectors.toList()),
menuTreeSortedByOrderNum); menuTreeSortedByOrderNum);
@ -81,18 +82,21 @@ class TreeBuilderTests {
menuMap.put(element.getMenuCode(), element); menuMap.put(element.getMenuCode(), element);
} }
assertEquals(Arrays.stream(new Menu[] { B001, B002, B003, B004 }) assertEquals(
.sorted(Menu.orderNumComparator) Arrays.stream(new Menu[] { B001, B002, B003, B004 })
.sorted(Comparator.comparing(Menu::getOrderNum))
.collect(Collectors.toList()), .collect(Collectors.toList()),
MenuList.class.cast(menuMap.get("B")).children); MenuList.class.cast(menuMap.get("B")).children);
assertEquals(Arrays.stream(new Menu[] { C1, C2, C3 }) assertEquals(
.sorted(Menu.orderNumComparator) Arrays.stream(new Menu[] { C1, C2, C3 })
.sorted(Comparator.comparing(Menu::getOrderNum))
.collect(Collectors.toList()), .collect(Collectors.toList()),
MenuList.class.cast(menuMap.get("C")).children); MenuList.class.cast(menuMap.get("C")).children);
assertEquals(Arrays.stream(new Menu[] { C1001, C1002 }) assertEquals(
.sorted(Menu.orderNumComparator) Arrays.stream(new Menu[] { C1001, C1002 })
.sorted(Comparator.comparing(Menu::getOrderNum))
.collect(Collectors.toList()), .collect(Collectors.toList()),
MenuList.class.cast(menuMap.get("C1")).children); MenuList.class.cast(menuMap.get("C1")).children);
@ -103,14 +107,14 @@ class TreeBuilderTests {
List<Menu> clonedMenus; List<Menu> clonedMenus;
clonedMenus = menus.stream().map(ObjectUtil::clone).collect(Collectors.toList()); clonedMenus = menus.stream().map(ObjectUtil::clone).collect(Collectors.toList());
List<Menu> menuTreeSortedByMenuCode = treeBuilder.buildTree( List<Menu> menuTreeSortedByMenuCode = treeBuilder
clonedMenus, .buildTree(clonedMenus, Comparator.comparing(Menu::getMenuCode));
(a, b) -> a.getMenuCode().compareTo(b.getMenuCode()));
log.info("menuTreeSortedByMenuCode: {}", new Gson().toJson(menuTreeSortedByMenuCode)); log.info("menuTreeSortedByMenuCode: {}", new Gson().toJson(menuTreeSortedByMenuCode));
assertEquals(clonedMenus.stream() assertEquals(
clonedMenus.stream()
.filter(menu -> menu.getParentMenuCode() == null) .filter(menu -> menu.getParentMenuCode() == null)
.sorted((a, b) -> a.getMenuCode().compareTo(b.getMenuCode())) .sorted(Comparator.comparing(Menu::getMenuCode))
.collect(Collectors.toList()), .collect(Collectors.toList()),
menuTreeSortedByMenuCode); menuTreeSortedByMenuCode);
@ -160,9 +164,6 @@ class TreeBuilderTests {
return orderNum; return orderNum;
} }
public static Comparator<Menu> orderNumComparator =
(a, b) -> Integer.compare(a.getOrderNum(), b.getOrderNum());
private static final long serialVersionUID = 20240917181424L; private static final long serialVersionUID = 20240917181424L;
} }