From ea2d5485f4daa98f91defda9fa4a4b7f947c1e77 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 5 Jul 2023 12:46:35 +0300
Subject: [PATCH] Remove Slack from user-level settings

---
 .../data/notification/NotificationDeliveryMethod.java     | 6 ------
 .../notification/settings/UserNotificationSettings.java   | 8 +++++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
index ac878adac6..4a2c4657d5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
@@ -18,10 +18,6 @@ package org.thingsboard.server.common.data.notification;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.Arrays;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 @RequiredArgsConstructor
 public enum NotificationDeliveryMethod {
 
@@ -33,6 +29,4 @@ public enum NotificationDeliveryMethod {
     @Getter
     private final String name;
 
-    public static final Set<NotificationDeliveryMethod> values = Arrays.stream(values()).collect(Collectors.toSet());
-
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/UserNotificationSettings.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/UserNotificationSettings.java
index f24520bc32..b7af57238b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/UserNotificationSettings.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/settings/UserNotificationSettings.java
@@ -39,6 +39,8 @@ public class UserNotificationSettings {
 
     public static final UserNotificationSettings DEFAULT = new UserNotificationSettings(Collections.emptyMap());
 
+    private static final Set<NotificationDeliveryMethod> deliveryMethods = NotificationTargetType.PLATFORM_USERS.getSupportedDeliveryMethods();
+
     @JsonCreator
     public UserNotificationSettings(@JsonProperty("prefs") Map<NotificationType, NotificationPref> prefs) {
         this.prefs = prefs;
@@ -49,7 +51,7 @@ public class UserNotificationSettings {
         if (pref != null) {
             return pref.isEnabled() ? pref.getEnabledDeliveryMethods() : Collections.emptySet();
         } else {
-            return NotificationDeliveryMethod.values;
+            return deliveryMethods;
         }
     }
 
@@ -62,14 +64,14 @@ public class UserNotificationSettings {
         public static NotificationPref createDefault() {
             NotificationPref pref = new NotificationPref();
             pref.setEnabled(true);
-            pref.setEnabledDeliveryMethods(NotificationDeliveryMethod.values);
+            pref.setEnabledDeliveryMethods(deliveryMethods);
             return pref;
         }
 
         @JsonIgnore
         @AssertTrue(message = "Only email, Web and SMS delivery methods are allowed")
         public boolean isValid() {
-            return NotificationTargetType.PLATFORM_USERS.getSupportedDeliveryMethods().containsAll(enabledDeliveryMethods);
+            return deliveryMethods.containsAll(enabledDeliveryMethods);
         }
     }