Skip to content

Commit fe4f39b

Browse files
Update FilterComponentUtl.java
1 parent 6b2ae19 commit fe4f39b

File tree

1 file changed

+7
-19
lines changed

1 file changed

+7
-19
lines changed

vaadin-simple-grid-filter/src/main/java/software/xdev/vaadin/utl/FilterComponentUtl.java

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
*/
1616
package software.xdev.vaadin.utl;
1717

18-
import java.util.ArrayList;
19-
import java.util.Comparator;
2018
import java.util.List;
19+
import java.util.stream.Collectors;
2120

2221
import software.xdev.vaadin.model.ChipBadge;
2322
import software.xdev.vaadin.model.ChipBadgeExtension;
@@ -41,22 +40,11 @@ public boolean equalLists(
4140
final List<ChipBadgeExtension<FilterCondition<T, ?>>> one,
4241
final List<ChipBadgeExtension<FilterCondition<T, ?>>> two)
4342
{
44-
if(one == null && two == null)
45-
{
46-
return true;
47-
}
48-
49-
if(one == null || two == null || one.size() != two.size())
50-
{
51-
return false;
52-
}
53-
54-
// to avoid messing the order of the lists we will use a copy
55-
final List<ChipBadgeExtension<FilterCondition<T, ?>>> oneCopy = new ArrayList<>(one);
56-
final List<ChipBadgeExtension<FilterCondition<T, ?>>> twoCopy = new ArrayList<>(two);
57-
58-
oneCopy.sort(Comparator.comparing(ChipBadge::getBadgeId));
59-
twoCopy.sort(Comparator.comparing(ChipBadge::getBadgeId));
60-
return one.equals(two);
43+
return one.stream()
44+
.map(ChipBadge::getBadgeId)
45+
.collect(Collectors.toSet())
46+
.equals(two.stream()
47+
.map(ChipBadge::getBadgeId)
48+
.collect(Collectors.toSet()));
6149
}
6250
}

0 commit comments

Comments
 (0)