From 8b699cc10ba1d6924abaed9b6500decc2b0c235b Mon Sep 17 00:00:00 2001 From: Stanislav Trailov Date: Fri, 23 Jan 2026 10:58:16 +0200 Subject: [PATCH] Allow nullable description in UI (#2886) * Allow nullable description in UI Signed-off-by: strailov * Fix also for DS & SM Views Signed-off-by: strailov --------- Signed-off-by: strailov --- .../java/org/eclipse/hawkbit/ui/view/DistributionSetView.java | 4 +++- .../main/java/org/eclipse/hawkbit/ui/view/RolloutView.java | 4 +++- .../java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java index ac1026811..e39623b74 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/DistributionSetView.java @@ -14,6 +14,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -213,7 +214,8 @@ public class DistributionSetView extends TableView { } private void setItem(final MgmtDistributionSet distributionSet) { - description.setValue(distributionSet.getDescription()); + description.setValue(Objects.requireNonNullElse(distributionSet.getDescription(), "")); + createdBy.setValue(distributionSet.getCreatedBy()); createdAt.setValue(Utils.localDateTimeFromTs(distributionSet.getCreatedAt())); lastModifiedBy.setValue(distributionSet.getLastModifiedBy()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java index 48be189d5..2c91d11ce 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/RolloutView.java @@ -12,6 +12,7 @@ package org.eclipse.hawkbit.ui.view; import java.time.ZoneOffset; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.stream.Stream; @@ -228,7 +229,8 @@ public class RolloutView extends TableView { } private void setItem(final MgmtRolloutResponseBody rollout) { - description.setValue(rollout.getDescription()); + description.setValue(Objects.requireNonNullElse(rollout.getDescription(), "")); + createdBy.setValue(rollout.getCreatedBy()); createdAt.setValue(Utils.localDateTimeFromTs(rollout.getCreatedAt())); lastModifiedBy.setValue(rollout.getLastModifiedBy()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java index d71aeeed6..e93468b65 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/SoftwareModuleView.java @@ -17,6 +17,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -181,7 +182,7 @@ public class SoftwareModuleView extends TableView { } private void setItem(final MgmtSoftwareModule softwareModule) { - description.setValue(softwareModule.getDescription()); + description.setValue(Objects.requireNonNullElse(softwareModule.getDescription(), "")); createdBy.setValue(softwareModule.getCreatedBy()); createdAt.setValue(Utils.localDateTimeFromTs(softwareModule.getCreatedAt())); lastModifiedBy.setValue(softwareModule.getLastModifiedBy());