refactoring: - dashboard comments3

application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java

@@ -75,11 +75,11 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
         sendDeleteNotificationMsg(tenantId, entityId, entity, relatedEdgeIds);
     }
 
-    public <E extends HasName, I extends EntityId> void notifyDeleteEntityAlarm(TenantId tenantId, I entityId, E entity, EntityId originatorId,
-                                                                                   CustomerId customerId, ActionType actionType,
-                                                                                   List<EdgeId> relatedEdgeIds,
-                                                                                   SecurityUser user,
-                                                                                   String body, Object... additionalInfo) {
+    public <E extends HasName, I extends EntityId> void notifyDeleteAlarm(TenantId tenantId, I entityId, E entity, EntityId originatorId,
+                                                                          CustomerId customerId, ActionType actionType,
+                                                                          List<EdgeId> relatedEdgeIds,
+                                                                          SecurityUser user,
+                                                                          String body, Object... additionalInfo) {
         logEntityAction(tenantId, originatorId, entity, customerId, actionType, user, additionalInfo);
         sendAlarmDeleteNotificationMsg(tenantId, entityId, entity, relatedEdgeIds, body);
     }
@@ -134,7 +134,7 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
         gatewayNotificationsService.onDeviceDeleted(device);
         tbClusterService.onDeviceDeleted(device, null);
 
-        notifyDeleteEntity(tenantId, deviceId, device, customerId, ActionType.DELETED, relatedEdgeIds, user,null, additionalInfo);
+        notifyDeleteEntity(tenantId, deviceId, device, customerId, ActionType.DELETED, relatedEdgeIds, user, additionalInfo);
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/entitiy/TbNotificationEntityService.java

@@ -48,10 +48,10 @@ public interface TbNotificationEntityService {
                                                                     List<EdgeId> relatedEdgeIds,
                                                                     SecurityUser user, Object... additionalInfo);
 
-    <E extends HasName, I extends EntityId> void notifyDeleteEntityAlarm(TenantId tenantId, I entityId, E entity, EntityId originatorId,
-                                                                         CustomerId customerId, ActionType actionType,
-                                                                         List<EdgeId> relatedEdgeIds,
-                                                                         SecurityUser user, String body, Object... additionalInfo);
+    <E extends HasName, I extends EntityId> void notifyDeleteAlarm(TenantId tenantId, I entityId, E entity, EntityId originatorId,
+                                                                   CustomerId customerId, ActionType actionType,
+                                                                   List<EdgeId> relatedEdgeIds,
+                                                                   SecurityUser user, String body, Object... additionalInfo);
 
     <E extends HasName, I extends EntityId> void notifyAssignOrUnassignEntityToCustomer(TenantId tenantId, I entityId,
                                                                                         CustomerId customerId, E entity,

application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java

@@ -80,7 +80,7 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     public Boolean delete(Alarm alarm, SecurityUser user) throws ThingsboardException {
         try {
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(user.getTenantId(), alarm.getOriginator());
-            notificationEntityService.notifyDeleteEntityAlarm(user.getTenantId(), alarm.getId(), alarm, alarm.getOriginator(), user.getCustomerId(),
+            notificationEntityService.notifyDeleteAlarm(user.getTenantId(), alarm.getId(), alarm, alarm.getOriginator(), user.getCustomerId(),
                     ActionType.DELETED, relatedEdgeIds, user, JacksonUtil.OBJECT_MAPPER.writeValueAsString(alarm));
             return alarmService.deleteAlarm(user.getTenantId(), alarm.getId()).isSuccessful();
         } catch (Exception e) {

application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java

@@ -62,12 +62,12 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(tenantId, assetId);
             assetService.deleteAsset(tenantId, assetId);
             notificationEntityService.notifyDeleteEntity(tenantId, assetId, asset, asset.getCustomerId(), ActionType.DELETED,
-                    relatedEdgeIds, user, null, asset.toString());
+                    relatedEdgeIds, user, assetId.toString());
 
             return removeAlarmsByEntityId(tenantId, assetId);
         } catch (Exception e) {
             notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.ASSET), null, null,
-                    ActionType.DELETED, user, e, asset.toString());
+                    ActionType.DELETED, user, e, assetId.toString());
             throw handleException(e);
         }
     }

application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java

@@ -62,10 +62,11 @@ public class DefaultTbCustomerService extends AbstractTbEntityService implements
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(tenantId, customerId);
             customerService.deleteCustomer(tenantId, customerId);
             notificationEntityService.notifyDeleteEntity(tenantId, customerId, customer, customerId,
-                    ActionType.DELETED, relatedEdgeIds, user, null);
+                    ActionType.DELETED, relatedEdgeIds, user, customerId.toString());
             tbClusterService.broadcastEntityStateChangeEvent(tenantId, customerId, ComponentLifecycleEvent.DELETED);
         } catch (Exception e) {
-            notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.CUSTOMER), null, null, ActionType.DELETED, user, e);
+            notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.CUSTOMER), null, null,
+                    ActionType.DELETED, user, e, customerId.toString());
             throw handleException(e);
         }
     }

application/src/main/java/org/thingsboard/server/service/entitiy/dashboard/DefaultTbDashboardService.java

@@ -65,7 +65,7 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(tenantId, dashboardId);
             dashboardService.deleteDashboard(tenantId, dashboardId);
             notificationEntityService.notifyDeleteEntity(tenantId, dashboardId, dashboard, user.getCustomerId(),
-                    ActionType.DELETED, relatedEdgeIds, user, null);
+                    ActionType.DELETED, relatedEdgeIds, user, dashboardId.toString());
         } catch (Exception e) {
             notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.DASHBOARD), null, null,
                     ActionType.DELETED, user, e, dashboardId.toString());

application/src/main/java/org/thingsboard/server/service/entitiy/edge/DefaultTbEdgeService.java

@@ -69,9 +69,9 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
         try {
             edgeService.deleteEdge(tenantId, edgeId);
             notificationEntityService.notifyEdge(tenantId, edgeId, edge.getCustomerId(), edge, actionType, user, edgeId.toString());
-
         } catch (Exception e) {
-            notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.EDGE), edge, null, actionType, user, e);
+            notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.EDGE), edge, null, actionType,
+                    user, e, edgeId.toString());
             throw handleException(e);
         }
     }