Browse Source

Refactor MobileDeliveryMethodNotificationTemplate

pull/8522/head
ViacheslavKlimov 3 years ago
parent
commit
b256f3a8cd
  1. 11
      common/data/src/main/java/org/thingsboard/server/common/data/notification/template/MobileDeliveryMethodNotificationTemplate.java

11
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;
}
}

Loading…
Cancel
Save