Browse Source

Add 'description' to notification target

pull/7925/head
ViacheslavKlimov 4 years ago
parent
commit
b7f4ed1e4b
  1. 4
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/AllUsersNotificationTargetConfig.java
  2. 4
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/CustomerUsersNotificationTargetConfig.java
  3. 8
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetConfig.java
  4. 5
      common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/UserListNotificationTargetConfig.java

4
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/AllUsersNotificationTargetConfig.java

@ -16,9 +16,11 @@
package org.thingsboard.server.common.data.notification.targets; package org.thingsboard.server.common.data.notification.targets;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
@Data @Data
public class AllUsersNotificationTargetConfig implements NotificationTargetConfig { @EqualsAndHashCode(callSuper = true)
public class AllUsersNotificationTargetConfig extends NotificationTargetConfig {
@Override @Override
public NotificationTargetConfigType getType() { public NotificationTargetConfigType getType() {

4
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/CustomerUsersNotificationTargetConfig.java

@ -17,13 +17,15 @@ package org.thingsboard.server.common.data.notification.targets;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import javax.validation.constraints.AssertTrue; import javax.validation.constraints.AssertTrue;
import java.util.UUID; import java.util.UUID;
@Data @Data
public class CustomerUsersNotificationTargetConfig implements NotificationTargetConfig { @EqualsAndHashCode(callSuper = true)
public class CustomerUsersNotificationTargetConfig extends NotificationTargetConfig {
private UUID customerId; // might not be set if using with notification rule private UUID customerId; // might not be set if using with notification rule
private boolean getCustomerIdFromOriginatorEntity; // e.g. from alarm private boolean getCustomerIdFromOriginatorEntity; // e.g. from alarm

8
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetConfig.java

@ -19,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
import lombok.Data;
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
@ -27,8 +28,11 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
@Type(value = CustomerUsersNotificationTargetConfig.class, name = "CUSTOMER_USERS"), @Type(value = CustomerUsersNotificationTargetConfig.class, name = "CUSTOMER_USERS"),
@Type(value = AllUsersNotificationTargetConfig.class, name = "ALL_USERS") @Type(value = AllUsersNotificationTargetConfig.class, name = "ALL_USERS")
}) })
public interface NotificationTargetConfig { @Data
public abstract class NotificationTargetConfig {
NotificationTargetConfigType getType(); private String description;
public abstract NotificationTargetConfigType getType();
} }

5
common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/UserListNotificationTargetConfig.java

@ -16,14 +16,15 @@
package org.thingsboard.server.common.data.notification.targets; package org.thingsboard.server.common.data.notification.targets;
import lombok.Data; import lombok.Data;
import org.thingsboard.server.common.data.id.UserId; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@Data @Data
public class UserListNotificationTargetConfig implements NotificationTargetConfig { @EqualsAndHashCode(callSuper = true)
public class UserListNotificationTargetConfig extends NotificationTargetConfig {
@NotEmpty @NotEmpty
private List<UUID> usersIds; private List<UUID> usersIds;

Loading…
Cancel
Save