From 6d01d5956ad8b87c846b8559276a130644206af4 Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Thu, 28 Aug 2025 11:42:14 +0200 Subject: [PATCH 1/2] simple-ui: fix NPE on filters --- .../org/eclipse/hawkbit/ui/simple/view/util/Filter.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java index e1bcdd6974..63dcc7c8df 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java +++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java @@ -15,6 +15,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.Consumer; +import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -116,13 +117,7 @@ public static String filter(final Map keyToValues) { final Map normalized = new HashMap<>(keyToValues) .entrySet() .stream() - .map(e -> { - if (e.getValue() instanceof Optional opt) { - e.setValue(opt.orElse(null)); - } - return e; - }) - .filter(e -> !ObjectUtils.isEmpty(e)) + .filter(e -> !ObjectUtils.isEmpty(e.getValue())) .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); if (normalized.isEmpty()) { return null; From 09bd905aa9d8446efe80d1a218338a9b47b708a5 Mon Sep 17 00:00:00 2001 From: Mohamed Zenadi Date: Mon, 1 Sep 2025 10:23:05 +0200 Subject: [PATCH 2/2] simple-ui: fix NPE on filters --- .../java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java index 63dcc7c8df..3984218b38 100644 --- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java +++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java @@ -15,7 +15,6 @@ import java.util.Map; import java.util.Optional; import java.util.function.Consumer; -import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream;