From d349de2de53ee6dcd4a4d7f0426f5f7e1755d854 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 18 Feb 2021 17:17:58 +0200 Subject: [PATCH] Refactoring --- .../server/service/edge/rpc/processor/DeviceProcessor.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java index 8d536d5076..88b8e09b2f 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/DeviceProcessor.java @@ -98,7 +98,6 @@ public class DeviceProcessor extends BaseProcessor { ObjectNode body = mapper.createObjectNode(); body.put("conflictName", deviceName); saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE, EdgeEventActionType.ENTITY_MERGE_REQUEST, device.getId(), body); - deviceService.assignDeviceToEdge(edge.getTenantId(), device.getId(), edge.getId()); } futureToSet.set(null); } @@ -114,7 +113,6 @@ public class DeviceProcessor extends BaseProcessor { log.info("[{}] Creating new device and replacing device entity on the edge [{}]", tenantId, deviceUpdateMsg); device = createDevice(tenantId, edge, deviceUpdateMsg, deviceUpdateMsg.getName()); saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.DEVICE, EdgeEventActionType.ENTITY_MERGE_REQUEST, device.getId(), null); - deviceService.assignDeviceToEdge(edge.getTenantId(), device.getId(), edge.getId()); } break; case ENTITY_UPDATED_RPC_MESSAGE: @@ -190,6 +188,7 @@ public class DeviceProcessor extends BaseProcessor { createRelationFromEdge(tenantId, edge.getId(), device.getId()); deviceStateService.onDeviceAdded(device); pushDeviceCreatedEventToRuleEngine(tenantId, edge, device); + deviceService.assignDeviceToEdge(edge.getTenantId(), device.getId(), edge.getId()); } finally { deviceCreationLock.unlock(); }