Refactor SlackNotificationTargetConfig

application/src/main/java/org/thingsboard/server/service/notification/DefaultNotificationCenter.java

@@ -191,8 +191,7 @@ public class DefaultNotificationCenter extends AbstractSubscriptionService imple
             }
             case SLACK: {
                 SlackNotificationTargetConfig slackTargetConfig = (SlackNotificationTargetConfig) target.getConfiguration();
-                SlackConversation conversation = new SlackConversation(slackTargetConfig.getConversationId(), slackTargetConfig.getConversationName());
+                recipients = List.of(slackTargetConfig.getConversation());
-                recipients = List.of(conversation);
                 break;
             }
             default: {

application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java

@@ -43,6 +43,7 @@ import org.thingsboard.server.common.data.notification.targets.platform.AllUsers
 import org.thingsboard.server.common.data.notification.targets.platform.CustomerUsersFilter;
 import org.thingsboard.server.common.data.notification.targets.platform.PlatformUsersNotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.targets.platform.UserListFilter;
+import org.thingsboard.server.common.data.notification.targets.slack.SlackConversation;
 import org.thingsboard.server.common.data.notification.targets.slack.SlackNotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.template.DeliveryMethodNotificationTemplate;
 import org.thingsboard.server.common.data.notification.template.EmailDeliveryMethodNotificationTemplate;
@@ -592,8 +593,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
         notificationTarget.setName(conversationName + " in Slack");
         notificationTarget.setType(NotificationTargetType.SLACK);
         SlackNotificationTargetConfig targetConfig = new SlackNotificationTargetConfig();
-        targetConfig.setConversationId(conversationId);
+        targetConfig.setConversation(new SlackConversation(conversationId, conversationName));
-        targetConfig.setConversationName(conversationName);
         notificationTarget.setConfiguration(targetConfig);
         notificationTarget = saveNotificationTarget(notificationTarget);
 

common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackConversation.java

@@ -20,10 +20,16 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.notification.targets.NotificationRecipient;
 
+import javax.validation.constraints.NotEmpty;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 public class SlackConversation implements NotificationRecipient {
+
+    @NotEmpty
     private String id;
+    @NotEmpty
     private String name;
+
 }

common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/slack/SlackNotificationTargetConfig.java

@@ -20,17 +20,17 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetConfig;
 import org.thingsboard.server.common.data.notification.targets.NotificationTargetType;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class SlackNotificationTargetConfig extends NotificationTargetConfig {
 
     private SlackConversationType conversationType;
-    @NotEmpty
+    @NotNull
-    private String conversationId;
+    @Valid
-    @NotEmpty
+    private SlackConversation conversation;
-    private String conversationName;
 
     @Override
     public NotificationTargetType getType() {