From 73c7abcf86dc68fee482f8d7ab709bf8446a3e21 Mon Sep 17 00:00:00 2001 From: ViacheslavKlimov Date: Mon, 4 Dec 2023 17:45:27 +0200 Subject: [PATCH] Fix cmds conversion --- .../notification/cmd/NotificationCmdsWrapper.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/ws/notification/cmd/NotificationCmdsWrapper.java b/application/src/main/java/org/thingsboard/server/service/ws/notification/cmd/NotificationCmdsWrapper.java index 664cfcef5b..5161ce8072 100644 --- a/application/src/main/java/org/thingsboard/server/service/ws/notification/cmd/NotificationCmdsWrapper.java +++ b/application/src/main/java/org/thingsboard/server/service/ws/notification/cmd/NotificationCmdsWrapper.java @@ -41,12 +41,16 @@ public class NotificationCmdsWrapper { @JsonIgnore public WsCommandsWrapper toCommonCmdsWrapper() { WsCommandsWrapper wrapper = new WsCommandsWrapper(); - wrapper.setUnreadNotificationsCountSubCmds(List.of(unreadCountSubCmd)); - wrapper.setUnreadNotificationsSubCmds(List.of(unreadSubCmd)); - wrapper.setMarkNotificationAsReadCmds(List.of(markAsReadCmd)); - wrapper.setMarkAllNotificationsAsReadCmds(List.of(markAllAsReadCmd)); - wrapper.setNotificationsUnsubCmds(List.of(unsubCmd)); + wrapper.setUnreadNotificationsCountSubCmds(toList(unreadCountSubCmd)); + wrapper.setUnreadNotificationsSubCmds(toList(unreadSubCmd)); + wrapper.setMarkNotificationAsReadCmds(toList(markAsReadCmd)); + wrapper.setMarkAllNotificationsAsReadCmds(toList(markAllAsReadCmd)); + wrapper.setNotificationsUnsubCmds(toList(unsubCmd)); return wrapper; } + private List toList(C cmd) { + return cmd != null ? List.of(cmd) : null; + } + }