Project

General

Profile

« Previous | Next » 

Revision 45887

View differences:

UIModuleGrouper.java
2 2

  
3 3
import java.util.ArrayList;
4 4
import java.util.Arrays;
5
import java.util.Collections;
5 6
import java.util.List;
6 7
import java.util.Map;
7
import java.util.Set;
8
import java.util.TreeSet;
9 8
import java.util.stream.Collectors;
10 9

  
11 10
import org.springframework.beans.factory.annotation.Autowired;
......
25 24

  
26 25
	public List<UIModuleGroup> getMenus(final User user) {
27 26

  
28
		final Map<MenuGroup, Set<UIModule>> map = sections.stream()
27
		final Map<MenuGroup, List<UIModule>> map = sections.stream()
29 28
				.filter(m -> verifyAuthorization(m, user))
30
				.collect(Collectors.groupingBy(UIModule::getGroup, Collectors.toCollection(TreeSet::new)));
29
				.collect(Collectors.groupingBy(UIModule::getGroup, Collectors.toList()));
31 30

  
32 31
		return Arrays.stream(MenuGroup.values())
33 32
				.filter(map::containsKey)
34
				.map(g -> new UIModuleGroup(g.getName(), map.get(g)))
33
				.map(g -> {
34
					final List<UIModule> list = map.get(g);
35
					Collections.sort(list);
36
					return new UIModuleGroup(g.getName(), list);
37
				})
35 38
				.collect(Collectors.toList());
36 39
	}
37 40

  

Also available in: Unified diff