From b256f3a8cdece5214e1f01e225362b62da7e8585 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 27 Dec 2023 11:54:14 +0200
Subject: [PATCH] Refactor MobileDeliveryMethodNotificationTemplate

---
 .../MobileDeliveryMethodNotificationTemplate.java     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileDeliveryMethodNotificationTemplate.java b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileDeliveryMethodNotificationTemplate.java
index 91786db48a..42cff39c81 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileDeliveryMethodNotificationTemplate.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileDeliveryMethodNotificationTemplate.java
@@ -19,10 +19,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.apache.commons.lang3.StringUtils;
 import org.thingsboard.server.common.data.notification.NotificationDeliveryMethod;
 
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 @Data
 @NoArgsConstructor
@@ -33,6 +33,11 @@ public class MobileDeliveryMethodNotificationTemplate extends DeliveryMethodNoti
     @NotEmpty
     private String subject;
 
+    private final List<TemplatableValue> templatableValues = List.of(
+            TemplatableValue.of(this::getBody, this::setBody),
+            TemplatableValue.of(this::getSubject, this::setSubject)
+    );
+
     public MobileDeliveryMethodNotificationTemplate(MobileDeliveryMethodNotificationTemplate other) {
         super(other);
         this.subject = other.subject;
@@ -49,8 +54,8 @@ public class MobileDeliveryMethodNotificationTemplate extends DeliveryMethodNoti
     }
 
     @Override
-    public boolean containsAny(String... params) {
-        return super.containsAny(params) || StringUtils.containsAny(subject, params);
+    public List<TemplatableValue> getTemplatableValues() {
+        return templatableValues;
     }
 
 }