Browse Source
Merge pull request #15563 from dashevchenko/defaultImplFix
Reverted defaultImpl for UI backward compatibility
pull/15589/head
Viacheslav Klimov
1 month ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
2 additions and
2 deletions
-
common/data/src/main/java/org/thingsboard/server/common/data/notification/rule/NotificationRuleRecipientsConfig.java
-
common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityExportData.java
|
|
|
@ -48,7 +48,7 @@ import java.util.UUID; |
|
|
|
@DiscriminatorMapping(value = "RESOURCES_SHORTAGE", schema = DefaultNotificationRuleRecipientsConfig.ResourceShortageRecipientsConfig.class) |
|
|
|
}) |
|
|
|
@JsonIgnoreProperties(ignoreUnknown = true) |
|
|
|
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "triggerType", include = JsonTypeInfo.As.EXISTING_PROPERTY) |
|
|
|
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "triggerType", include = JsonTypeInfo.As.EXISTING_PROPERTY, defaultImpl = DefaultNotificationRuleRecipientsConfig.class) |
|
|
|
@JsonSubTypes({ |
|
|
|
@Type(name = "ALARM", value = EscalatedNotificationRuleRecipientsConfig.class), |
|
|
|
@Type(name = "ENTITY_ACTION", value = DefaultNotificationRuleRecipientsConfig.EntityActionRecipientsConfig.class), |
|
|
|
|
|
|
|
@ -50,7 +50,7 @@ import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@JsonIgnoreProperties(ignoreUnknown = true) |
|
|
|
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "entityType", include = As.EXISTING_PROPERTY, visible = true) |
|
|
|
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "entityType", include = As.EXISTING_PROPERTY, visible = true, defaultImpl = EntityExportData.class) |
|
|
|
@JsonSubTypes({ |
|
|
|
@Type(name = "DEVICE", value = DeviceExportData.class), |
|
|
|
@Type(name = "RULE_CHAIN", value = RuleChainExportData.class), |
|
|
|
|
