Allow nullable description in UI (#2886)
* Allow nullable description in UI Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * Fix also for DS & SM Views Signed-off-by: strailov <Stanislav.Trailov@bosch.io> --------- Signed-off-by: strailov <Stanislav.Trailov@bosch.io>
This commit is contained in:
committed by
GitHub
parent
d9e52cb542
commit
8b699cc10b
@@ -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<MgmtDistributionSet, Long> {
|
||||
}
|
||||
|
||||
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());
|
||||
|
||||
@@ -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<MgmtRolloutResponseBody, Long> {
|
||||
}
|
||||
|
||||
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());
|
||||
|
||||
@@ -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<MgmtSoftwareModule, Long> {
|
||||
}
|
||||
|
||||
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());
|
||||
|
||||
Reference in New Issue
Block a user