Skip to content

Commit 6d01d59

Browse files
committed
simple-ui: fix NPE on filters
1 parent fe68229 commit 6d01d59

File tree

1 file changed

+2
-7
lines changed
  • hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util

1 file changed

+2
-7
lines changed

hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.util.Map;
1616
import java.util.Optional;
1717
import java.util.function.Consumer;
18+
import java.util.function.Predicate;
1819
import java.util.stream.Collectors;
1920
import java.util.stream.Stream;
2021

@@ -116,13 +117,7 @@ public static String filter(final Map<Object, Object> keyToValues) {
116117
final Map<Object, Object> normalized = new HashMap<>(keyToValues)
117118
.entrySet()
118119
.stream()
119-
.map(e -> {
120-
if (e.getValue() instanceof Optional<?> opt) {
121-
e.setValue(opt.orElse(null));
122-
}
123-
return e;
124-
})
125-
.filter(e -> !ObjectUtils.isEmpty(e))
120+
.filter(e -> !ObjectUtils.isEmpty(e.getValue()))
126121
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
127122
if (normalized.isEmpty()) {
128123
return null;

0 commit comments

Comments
 (0)