Refactoring: process correct log warning, remove extra locks to process msg from edge

application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java

@@ -674,9 +674,9 @@ public final class EdgeGrpcSession implements Closeable {
                     result.add(ctx.getDeviceProcessor().processDeviceCredentialsMsg(edge.getTenantId(), deviceCredentialsUpdateMsg));
                 }
             }
-            if (uplinkMsg.getDeviceProfileUpdateMsgCount() > 0) {
+            if (uplinkMsg.getAssetProfileUpdateMsgCount() > 0) {
-                for (DeviceProfileUpdateMsg deviceProfileUpdateMsg : uplinkMsg.getDeviceProfileUpdateMsgList()) {
+                for (AssetProfileUpdateMsg assetProfileUpdateMsg : uplinkMsg.getAssetProfileUpdateMsgList()) {
-                    result.add(ctx.getDeviceProfileProcessor().processDeviceProfileMsgFromEdge(edge.getTenantId(), edge, deviceProfileUpdateMsg));
+                    result.add(ctx.getAssetProfileProcessor().processAssetProfileMsgFromEdge(edge.getTenantId(), edge, assetProfileUpdateMsg));
                 }
             }
             if (uplinkMsg.getAssetUpdateMsgCount() > 0) {
@@ -684,16 +684,16 @@ public final class EdgeGrpcSession implements Closeable {
                     result.add(ctx.getAssetProcessor().processAssetMsgFromEdge(edge.getTenantId(), edge, assetUpdateMsg));
                 }
             }
-            if (uplinkMsg.getAssetProfileUpdateMsgCount() > 0) {
-                for (AssetProfileUpdateMsg assetProfileUpdateMsg : uplinkMsg.getAssetProfileUpdateMsgList()) {
-                    result.add(ctx.getAssetProfileProcessor().processAssetProfileMsgFromEdge(edge.getTenantId(), edge, assetProfileUpdateMsg));
-                }
-            }
             if (uplinkMsg.getAlarmUpdateMsgCount() > 0) {
                 for (AlarmUpdateMsg alarmUpdateMsg : uplinkMsg.getAlarmUpdateMsgList()) {
                     result.add(ctx.getAlarmProcessor().processAlarmMsg(edge.getTenantId(), alarmUpdateMsg));
                 }
             }
+            if (uplinkMsg.getDeviceProfileUpdateMsgCount() > 0) {
+                for (DeviceProfileUpdateMsg deviceProfileUpdateMsg : uplinkMsg.getDeviceProfileUpdateMsgList()) {
+                    result.add(ctx.getDeviceProfileProcessor().processDeviceProfileMsgFromEdge(edge.getTenantId(), edge, deviceProfileUpdateMsg));
+                }
+            }
             if (uplinkMsg.getRelationUpdateMsgCount() > 0) {
                 for (RelationUpdateMsg relationUpdateMsg : uplinkMsg.getRelationUpdateMsgList()) {
                     result.add(ctx.getRelationProcessor().processRelationMsg(edge.getTenantId(), relationUpdateMsg));

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java

@@ -114,11 +114,7 @@ import java.util.concurrent.locks.ReentrantLock;
 public abstract class BaseEdgeProcessor {
 
     protected static final Lock deviceCreationLock = new ReentrantLock();
-    protected static final Lock deviceProfileCreationLock = new ReentrantLock();
     protected static final Lock assetCreationLock = new ReentrantLock();
-    protected static final Lock assetProfileCreationLock = new ReentrantLock();
-    protected static final Lock dashboardCreationLock = new ReentrantLock();
-    protected static final Lock entityViewCreationLock = new ReentrantLock();
 
     protected static final int DEFAULT_PAGE_SIZE = 100;
 

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetEdgeProcessor.java

@@ -115,7 +115,7 @@ public class AssetEdgeProcessor extends BaseAssetProcessor {
 
                 @Override
                 public void onFailure(Throwable t) {
-                    log.debug("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", asset, t);
+                    log.warn("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", asset, t);
                 }
             });
         } catch (JsonProcessingException | IllegalArgumentException e) {

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/AssetProfileEdgeProcessor.java

@@ -64,12 +64,8 @@ public class AssetProfileEdgeProcessor extends BaseAssetProfileProcessor {
                     return handleUnsupportedMsgType(assetProfileUpdateMsg.getMsgType());
             }
         } catch (DataValidationException e) {
-            if (e.getMessage().contains("limit reached")) {
+            log.warn("Failed to process AssetProfileUpdateMsg from Edge [{}]", assetProfileUpdateMsg, e);
-                log.warn("[{}] Number of allowed asset profile violated {}", tenantId, assetProfileUpdateMsg, e);
+            return Futures.immediateFailedFuture(e);
-                return Futures.immediateFuture(null);
-            } else {
-                return Futures.immediateFailedFuture(e);
-            }
         } finally {
             edgeSynchronizationManager.getSync().remove();
         }
@@ -97,7 +93,7 @@ public class AssetProfileEdgeProcessor extends BaseAssetProfileProcessor {
 
                 @Override
                 public void onFailure(Throwable t) {
-                    log.debug("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", assetProfile, t);
+                    log.warn("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", assetProfile, t);
                 }
             });
         } catch (JsonProcessingException | IllegalArgumentException e) {

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/asset/BaseAssetProfileProcessor.java

@@ -33,7 +33,7 @@ public class BaseAssetProfileProcessor extends BaseEdgeProcessor {
 
     protected boolean saveOrUpdateAssetProfile(TenantId tenantId, AssetProfileId assetProfileId, AssetProfileUpdateMsg assetProfileUpdateMsg) {
         boolean created = false;
-        assetProfileCreationLock.lock();
+        assetCreationLock.lock();
         try {
             AssetProfile assetProfile = assetProfileService.findAssetProfileById(tenantId, assetProfileId);
             String assetProfileName = assetProfileUpdateMsg.getName();
@@ -62,7 +62,7 @@ public class BaseAssetProfileProcessor extends BaseEdgeProcessor {
             }
             assetProfileService.saveAssetProfile(assetProfile, false);
         } finally {
-            assetProfileCreationLock.unlock();
+            assetCreationLock.unlock();
         }
         return created;
     }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/BaseDashboardProcessor.java

@@ -34,39 +34,35 @@ public abstract class BaseDashboardProcessor extends BaseEdgeProcessor {
 
     protected boolean saveOrUpdateDashboard(TenantId tenantId, DashboardId dashboardId, DashboardUpdateMsg dashboardUpdateMsg, CustomerId customerId) {
         boolean created = false;
-        dashboardCreationLock.lock();
+        Dashboard dashboard = dashboardService.findDashboardById(tenantId, dashboardId);
-        try {
+        if (dashboard == null) {
-            Dashboard dashboard = dashboardService.findDashboardById(tenantId, dashboardId);
+            created = true;
-            if (dashboard == null) {
+            dashboard = new Dashboard();
-                created = true;
+            dashboard.setTenantId(tenantId);
-                dashboard = new Dashboard();
+            dashboard.setCreatedTime(Uuids.unixTimestamp(dashboardId.getId()));
-                dashboard.setTenantId(tenantId);
+        }
-                dashboard.setCreatedTime(Uuids.unixTimestamp(dashboardId.getId()));
+        dashboard.setTitle(dashboardUpdateMsg.getTitle());
-            }
+        dashboard.setConfiguration(JacksonUtil.toJsonNode(dashboardUpdateMsg.getConfiguration()));
-            dashboard.setTitle(dashboardUpdateMsg.getTitle());
+        Set<ShortCustomerInfo> assignedCustomers = null;
-            dashboard.setConfiguration(JacksonUtil.toJsonNode(dashboardUpdateMsg.getConfiguration()));
+        if (dashboardUpdateMsg.hasAssignedCustomers()) {
-            Set<ShortCustomerInfo> assignedCustomers = null;
+            assignedCustomers = JacksonUtil.fromString(dashboardUpdateMsg.getAssignedCustomers(), new TypeReference<>() {
-            if (dashboardUpdateMsg.hasAssignedCustomers()) {
+            });
-                assignedCustomers = JacksonUtil.fromString(dashboardUpdateMsg.getAssignedCustomers(), new TypeReference<>() {});
+            dashboard.setAssignedCustomers(assignedCustomers);
-                dashboard.setAssignedCustomers(assignedCustomers);
+        }
-            }
 
-            dashboardValidator.validate(dashboard, Dashboard::getTenantId);
+        dashboardValidator.validate(dashboard, Dashboard::getTenantId);
-            if (created) {
+        if (created) {
-                dashboard.setId(dashboardId);
+            dashboard.setId(dashboardId);
-            }
+        }
-            Dashboard savedDashboard = dashboardService.saveDashboard(dashboard, false);
+        Dashboard savedDashboard = dashboardService.saveDashboard(dashboard, false);
-            if (assignedCustomers != null && !assignedCustomers.isEmpty()) {
+        if (assignedCustomers != null && !assignedCustomers.isEmpty()) {
-                for (ShortCustomerInfo assignedCustomer : assignedCustomers) {
+            for (ShortCustomerInfo assignedCustomer : assignedCustomers) {
-                    if (assignedCustomer.getCustomerId().equals(customerId)) {
+                if (assignedCustomer.getCustomerId().equals(customerId)) {
-                        dashboardService.assignDashboardToCustomer(tenantId, dashboardId, assignedCustomer.getCustomerId());
+                    dashboardService.assignDashboardToCustomer(tenantId, dashboardId, assignedCustomer.getCustomerId());
-                    }
                 }
-            } else {
-                unassignCustomersFromDashboard(tenantId, savedDashboard);
             }
-        } finally {
+        } else {
-            dashboardCreationLock.unlock();
+            unassignCustomersFromDashboard(tenantId, savedDashboard);
         }
         return created;
     }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/dashboard/DashboardEdgeProcessor.java

@@ -105,7 +105,7 @@ public class DashboardEdgeProcessor extends BaseDashboardProcessor {
 
                 @Override
                 public void onFailure(Throwable t) {
-                    log.debug("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", dashboard, t);
+                    log.warn("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", dashboard, t);
                 }
             });
         } catch (JsonProcessingException | IllegalArgumentException e) {

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/BaseDeviceProfileProcessor.java

@@ -45,7 +45,7 @@ public class BaseDeviceProfileProcessor extends BaseEdgeProcessor {
 
     protected boolean saveOrUpdateDeviceProfile(TenantId tenantId, DeviceProfileId deviceProfileId, DeviceProfileUpdateMsg deviceProfileUpdateMsg) {
         boolean created = false;
-        deviceProfileCreationLock.lock();
+        deviceCreationLock.lock();
         try {
             DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
             if (deviceProfile == null) {
@@ -95,7 +95,7 @@ public class BaseDeviceProfileProcessor extends BaseEdgeProcessor {
             }
             deviceProfileService.saveDeviceProfile(deviceProfile, false);
         } finally {
-            deviceProfileCreationLock.unlock();
+            deviceCreationLock.unlock();
         }
         return created;
     }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java

@@ -124,7 +124,7 @@ public class DeviceEdgeProcessor extends BaseDeviceProcessor {
 
                 @Override
                 public void onFailure(Throwable t) {
-                    log.debug("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", device, t);
+                    log.warn("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", device, t);
                 }
             });
         } catch (JsonProcessingException | IllegalArgumentException e) {

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceProfileEdgeProcessor.java

@@ -65,12 +65,8 @@ public class DeviceProfileEdgeProcessor extends BaseDeviceProfileProcessor {
                     return handleUnsupportedMsgType(deviceProfileUpdateMsg.getMsgType());
             }
         } catch (DataValidationException e) {
-            if (e.getMessage().contains("limit reached")) {
+            log.warn("Failed to process DeviceProfileUpdateMsg from Edge [{}]", deviceProfileUpdateMsg, e);
-                log.warn("[{}] Number of allowed device profile violated {}", tenantId, deviceProfileUpdateMsg, e);
+            return Futures.immediateFailedFuture(e);
-                return Futures.immediateFuture(null);
-            } else {
-                return Futures.immediateFailedFuture(e);
-            }
         } finally {
             edgeSynchronizationManager.getSync().remove();
         }
@@ -98,7 +94,7 @@ public class DeviceProfileEdgeProcessor extends BaseDeviceProfileProcessor {
 
                 @Override
                 public void onFailure(Throwable t) {
-                    log.debug("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", deviceProfile, t);
+                    log.warn("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", deviceProfile, t);
                 }
             });
         } catch (JsonProcessingException | IllegalArgumentException e) {

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/BaseEntityViewProcessor.java

@@ -38,44 +38,39 @@ public abstract class BaseEntityViewProcessor extends BaseEdgeProcessor {
     protected Pair<Boolean, Boolean> saveOrUpdateEntityView(TenantId tenantId, EntityViewId entityViewId, EntityViewUpdateMsg entityViewUpdateMsg, CustomerId customerId) {
         boolean created = false;
         boolean entityViewNameUpdated = false;
-        entityViewCreationLock.lock();
+        EntityView entityView = entityViewService.findEntityViewById(tenantId, entityViewId);
-        try {
+        String entityViewName = entityViewUpdateMsg.getName();
-            EntityView entityView = entityViewService.findEntityViewById(tenantId, entityViewId);
+        if (entityView == null) {
-            String entityViewName = entityViewUpdateMsg.getName();
+            created = true;
-            if (entityView == null) {
+            entityView = new EntityView();
-                created = true;
+            entityView.setTenantId(tenantId);
-                entityView = new EntityView();
+            entityView.setCreatedTime(Uuids.unixTimestamp(entityViewId.getId()));
-                entityView.setTenantId(tenantId);
+        }
-                entityView.setCreatedTime(Uuids.unixTimestamp(entityViewId.getId()));
+        EntityView entityViewByName = entityViewService.findEntityViewByTenantIdAndName(tenantId, entityViewName);
-            }
+        if (entityViewByName != null && !entityViewByName.getId().equals(entityViewId)) {
-            EntityView entityViewByName = entityViewService.findEntityViewByTenantIdAndName(tenantId, entityViewName);
+            entityViewName = entityViewName + "_" + StringUtils.randomAlphanumeric(15);
-            if (entityViewByName != null && !entityViewByName.getId().equals(entityViewId)) {
+            log.warn("Entity view with name {} already exists. Renaming entity view name to {}",
-                entityViewName = entityViewName + "_" + StringUtils.randomAlphanumeric(15);
+                    entityViewUpdateMsg.getName(), entityViewName);
-                log.warn("Entity view with name {} already exists. Renaming entity view name to {}",
+            entityViewNameUpdated = true;
-                        entityViewUpdateMsg.getName(), entityViewName);
+        }
-                entityViewNameUpdated = true;
+        entityView.setName(entityViewName);
-            }
+        entityView.setType(entityViewUpdateMsg.getType());
-            entityView.setName(entityViewName);
+        entityView.setCustomerId(customerId);
-            entityView.setType(entityViewUpdateMsg.getType());
+        entityView.setAdditionalInfo(entityViewUpdateMsg.hasAdditionalInfo() ?
-            entityView.setCustomerId(customerId);
+                JacksonUtil.toJsonNode(entityViewUpdateMsg.getAdditionalInfo()) : null);
-            entityView.setAdditionalInfo(entityViewUpdateMsg.hasAdditionalInfo() ?
-                    JacksonUtil.toJsonNode(entityViewUpdateMsg.getAdditionalInfo()) : null);
 
-            UUID entityIdUUID = safeGetUUID(entityViewUpdateMsg.getEntityIdMSB(), entityViewUpdateMsg.getEntityIdLSB());
+        UUID entityIdUUID = safeGetUUID(entityViewUpdateMsg.getEntityIdMSB(), entityViewUpdateMsg.getEntityIdLSB());
-            if (EdgeEntityType.DEVICE.equals(entityViewUpdateMsg.getEntityType())) {
+        if (EdgeEntityType.DEVICE.equals(entityViewUpdateMsg.getEntityType())) {
-                entityView.setEntityId(entityIdUUID != null ? new DeviceId(entityIdUUID) : null);
+            entityView.setEntityId(entityIdUUID != null ? new DeviceId(entityIdUUID) : null);
-            } else if (EdgeEntityType.ASSET.equals(entityViewUpdateMsg.getEntityType())) {
+        } else if (EdgeEntityType.ASSET.equals(entityViewUpdateMsg.getEntityType())) {
-                entityView.setEntityId(entityIdUUID != null ? new AssetId(entityIdUUID) : null);
+            entityView.setEntityId(entityIdUUID != null ? new AssetId(entityIdUUID) : null);
-            }
+        }
 
-            entityViewValidator.validate(entityView, EntityView::getTenantId);
+        entityViewValidator.validate(entityView, EntityView::getTenantId);
-            if (created) {
+        if (created) {
-                entityView.setId(entityViewId);
+            entityView.setId(entityViewId);
-            }
-            entityViewService.saveEntityView(entityView, false);
-        } finally {
-            entityViewCreationLock.unlock();
         }
+        entityViewService.saveEntityView(entityView, false);
         return Pair.of(created, entityViewNameUpdated);
     }
 }

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/entityview/EntityViewEdgeProcessor.java

@@ -113,7 +113,7 @@ public class EntityViewEdgeProcessor extends BaseEntityViewProcessor {
 
                 @Override
                 public void onFailure(Throwable t) {
-                    log.debug("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", entityView, t);
+                    log.warn("Failed to send ENTITY_CREATED EVENT to rule engine [{}]", entityView, t);
                 }
             });
         } catch (JsonProcessingException | IllegalArgumentException e) {