From aa0fce86258335a21e1e042d29f256f32eae215c Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Wed, 12 Feb 2020 13:19:27 +0200 Subject: [PATCH] Fix for Alarm Ack/Clear/Update when Propagation flag is set and Relation Type Filter is used --- .../thingsboard/server/dao/alarm/BaseAlarmService.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java index 00430c7dbe..d86e7e0f1b 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java @@ -386,13 +386,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ private void updateRelations(Alarm alarm, AlarmStatus oldStatus, AlarmStatus newStatus) { try { List relations = relationService.findByToAsync(alarm.getTenantId(), alarm.getId(), RelationTypeGroup.ALARM).get(); - - List propagateRelationTypes = alarm.getPropagateRelationTypes(); - Stream relationStream = relations.stream(); - if (!CollectionUtils.isEmpty(propagateRelationTypes)) { - relationStream = relationStream.filter(entityRelation -> propagateRelationTypes.contains(entityRelation.getType())); - } - Set parents = relationStream.map(EntityRelation::getFrom).collect(Collectors.toSet()); + Set parents = relations.stream().map(EntityRelation::getFrom).collect(Collectors.toSet()); for (EntityId parentId : parents) { updateAlarmRelation(alarm.getTenantId(), parentId, alarm.getId(), oldStatus, newStatus); }