Commit 1bf4fb1a7ecd1ca478dea10ff38a76f95e25fb67
Committed by
GitHub
Merge pull request #43 from BohdanSmetanyuk/feature/relations_deleted
deleted invalid case, deleted unused imports
Showing
2 changed files
with
0 additions
and
13 deletions
... | ... | @@ -24,9 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam; |
24 | 24 | import org.springframework.web.bind.annotation.ResponseBody; |
25 | 25 | import org.springframework.web.bind.annotation.ResponseStatus; |
26 | 26 | import org.springframework.web.bind.annotation.RestController; |
27 | -import org.thingsboard.server.common.data.DataConstants; | |
28 | 27 | import org.thingsboard.server.common.data.audit.ActionType; |
29 | -import org.thingsboard.server.common.data.edge.EdgeEventType; | |
30 | 28 | import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; |
31 | 29 | import org.thingsboard.server.common.data.exception.ThingsboardException; |
32 | 30 | import org.thingsboard.server.common.data.id.EntityId; |
... | ... | @@ -132,8 +130,6 @@ public class EntityRelationController extends BaseController { |
132 | 130 | try { |
133 | 131 | relationService.deleteEntityRelations(getTenantId(), entityId); |
134 | 132 | logEntityAction(entityId, null, getCurrentUser().getCustomerId(), ActionType.RELATIONS_DELETED, null); |
135 | - | |
136 | - sendNotificationMsgToEdgeService(getTenantId(), entityId, ActionType.RELATIONS_DELETED); | |
137 | 133 | } catch (Exception e) { |
138 | 134 | logEntityAction(entityId, null, getCurrentUser().getCustomerId(), ActionType.RELATIONS_DELETED, e); |
139 | 135 | throw handleException(e); | ... | ... |
... | ... | @@ -34,20 +34,16 @@ import org.thingsboard.server.common.data.edge.EdgeEvent; |
34 | 34 | import org.thingsboard.server.common.data.edge.EdgeEventType; |
35 | 35 | import org.thingsboard.server.common.data.id.AlarmId; |
36 | 36 | import org.thingsboard.server.common.data.id.CustomerId; |
37 | -import org.thingsboard.server.common.data.id.DashboardId; | |
38 | 37 | import org.thingsboard.server.common.data.id.EdgeId; |
39 | 38 | import org.thingsboard.server.common.data.id.EntityId; |
40 | 39 | import org.thingsboard.server.common.data.id.EntityIdFactory; |
41 | -import org.thingsboard.server.common.data.id.IdBased; | |
42 | 40 | import org.thingsboard.server.common.data.id.RuleChainId; |
43 | 41 | import org.thingsboard.server.common.data.id.TenantId; |
44 | -import org.thingsboard.server.common.data.id.UserId; | |
45 | 42 | import org.thingsboard.server.common.data.page.TextPageData; |
46 | 43 | import org.thingsboard.server.common.data.page.TextPageLink; |
47 | 44 | import org.thingsboard.server.common.data.page.TimePageData; |
48 | 45 | import org.thingsboard.server.common.data.page.TimePageLink; |
49 | 46 | import org.thingsboard.server.common.data.relation.EntityRelation; |
50 | -import org.thingsboard.server.common.data.relation.RelationTypeGroup; | |
51 | 47 | import org.thingsboard.server.common.data.rule.RuleChain; |
52 | 48 | import org.thingsboard.server.common.data.rule.RuleChainConnectionInfo; |
53 | 49 | import org.thingsboard.server.common.msg.queue.TbCallback; |
... | ... | @@ -65,14 +61,12 @@ import javax.annotation.PostConstruct; |
65 | 61 | import javax.annotation.PreDestroy; |
66 | 62 | import java.io.IOException; |
67 | 63 | import java.util.ArrayList; |
68 | -import java.util.Collections; | |
69 | 64 | import java.util.HashSet; |
70 | 65 | import java.util.List; |
71 | 66 | import java.util.Set; |
72 | 67 | import java.util.UUID; |
73 | 68 | import java.util.concurrent.ExecutorService; |
74 | 69 | import java.util.concurrent.Executors; |
75 | -import java.util.stream.Collectors; | |
76 | 70 | |
77 | 71 | @Service |
78 | 72 | @TbCoreComponent |
... | ... | @@ -361,9 +355,6 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService { |
361 | 355 | updateDependentRuleChains(tenantId, new RuleChainId(entityId.getId()), edgeId); |
362 | 356 | } |
363 | 357 | break; |
364 | - case RELATIONS_DELETED: | |
365 | - // TODO: voba - add support for relations deleted | |
366 | - break; | |
367 | 358 | } |
368 | 359 | } |
369 | 360 | ... | ... |