Fixed the usage of emptyId in delete methods with getOrEmptyId to find out if Id is really empty.

Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>

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

@@ -197,18 +197,18 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     public boolean delete(Alarm alarm, User user) {
         var tenantId = alarm.getTenantId();
         var alarmId = alarm.getId();
-        var alarmOriginator = alarm.getOriginator();
+        var alarmOriginatorId = alarm.getOriginator();
 
         boolean deleted;
         try {
             deleted = alarmSubscriptionService.deleteAlarm(tenantId, alarmId);
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(alarmOriginator.getEntityType()), ActionType.ALARM_DELETE, user, e, alarmId);
+            logEntityActionService.logEntityAction(tenantId, alarmOriginatorId, ActionType.ALARM_DELETE, user, e, alarmId);
             throw e;
         }
 
         if (deleted) {
-            logEntityActionService.logEntityAction(tenantId, alarmOriginator, alarm, alarm.getCustomerId(), ActionType.ALARM_DELETE, user, alarmId);
+            logEntityActionService.logEntityAction(tenantId, alarmOriginatorId, alarm, alarm.getCustomerId(), ActionType.ALARM_DELETE, user, alarmId);
         }
 
         return deleted;

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

@@ -70,7 +70,7 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
             assetService.deleteAsset(tenantId, assetId);
             logEntityActionService.logEntityAction(tenantId, assetId, asset, asset.getCustomerId(), actionType, user, assetId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET), actionType, user, e,
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(assetId, EntityType.ASSET), actionType, user, e,
                     assetId.toString());
             throw e;
         }

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

@@ -64,7 +64,7 @@ public class DefaultTbAssetProfileService extends AbstractTbEntityService implem
             logEntityActionService.logEntityAction(tenantId, assetProfileId, assetProfile, null,
                     actionType, user, assetProfileId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ASSET_PROFILE), actionType,
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(assetProfileId, EntityType.ASSET_PROFILE), actionType,
                     user, e, assetProfileId.toString());
             throw e;
         }

application/src/main/java/org/thingsboard/server/service/entitiy/cf/DefaultTbCalculatedFieldService.java

@@ -84,7 +84,7 @@ public class DefaultTbCalculatedFieldService extends AbstractTbEntityService imp
             calculatedFieldService.deleteCalculatedField(tenantId, calculatedFieldId);
             logEntityActionService.logEntityAction(tenantId, calculatedFieldId, calculatedField, actionType, user, calculatedFieldId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.CALCULATED_FIELD), actionType, user, e, calculatedFieldId.toString());
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(calculatedFieldId, EntityType.CALCULATED_FIELD), actionType, user, e, calculatedFieldId.toString());
             throw e;
         }
     }

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

@@ -58,10 +58,10 @@ public class DefaultTbCustomerService extends AbstractTbEntityService implements
         CustomerId customerId = customer.getId();
         try {
             customerService.deleteCustomer(tenantId, customerId);
-            logEntityActionService.logEntityAction(tenantId, customer.getId(), customer, customerId, actionType,
+            logEntityActionService.logEntityAction(tenantId, customerId, customer, customerId, actionType,
                     user, customerId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.CUSTOMER), actionType, user,
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(customerId, EntityType.CUSTOMER), actionType, user,
                     e, customerId.toString());
             throw e;
         }

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

@@ -77,7 +77,7 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
             dashboardService.deleteDashboard(tenantId, dashboardId);
             logEntityActionService.logEntityAction(tenantId, dashboardId, dashboard, null, actionType, user, dashboardId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(dashboardId, EntityType.DASHBOARD), actionType, user, e, dashboardId.toString());
             throw e;
         }
     }

application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java

@@ -109,7 +109,7 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
             logEntityActionService.logEntityAction(tenantId, deviceId, device, device.getCustomerId(), actionType,
                     user, deviceId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE), actionType,
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(deviceId, EntityType.DEVICE), actionType,
                     user, e, deviceId.toString());
             throw e;
         }

application/src/main/java/org/thingsboard/server/service/entitiy/device/profile/DefaultTbDeviceProfileService.java

@@ -66,7 +66,7 @@ public class DefaultTbDeviceProfileService extends AbstractTbEntityService imple
             logEntityActionService.logEntityAction(tenantId, deviceProfileId, deviceProfile, null,
                     actionType, user, deviceProfileId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.DEVICE_PROFILE), actionType,
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(deviceProfileId, EntityType.DEVICE_PROFILE), actionType,
                     user, e, deviceProfileId.toString());
             throw e;
         }

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

@@ -76,7 +76,7 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
             edgeService.deleteEdge(tenantId, edgeId);
             logEntityActionService.logEntityAction(tenantId, edgeId, edge, edge.getCustomerId(), actionType, user, edgeId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.EDGE), actionType,
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(edgeId, EntityType.EDGE), actionType,
                     user, e, edgeId.toString());
             throw e;
         }

application/src/main/java/org/thingsboard/server/service/entitiy/entityview/DefaultTbEntityViewService.java

@@ -144,7 +144,7 @@ public class DefaultTbEntityViewService extends AbstractTbEntityService implemen
 
             localCache.computeIfAbsent(tenantId, (k) -> new ConcurrentReferenceHashMap<>()).clear();
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.ENTITY_VIEW),
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(entityViewId, EntityType.ENTITY_VIEW),
                     ActionType.DELETED, user, e, entityViewId.toString());
             throw e;
         }

application/src/main/java/org/thingsboard/server/service/entitiy/ota/DefaultTbOtaPackageService.java

@@ -105,7 +105,7 @@ public class DefaultTbOtaPackageService extends AbstractTbEntityService implemen
             logEntityActionService.logEntityAction(tenantId, otaPackageId, otaPackageInfo, null,
                     actionType, user, otaPackageInfo.getId().toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.OTA_PACKAGE),
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(otaPackageId, EntityType.OTA_PACKAGE),
                     actionType, user, e, otaPackageId.toString());
             throw e;
         }

application/src/main/java/org/thingsboard/server/service/entitiy/user/DefaultUserService.java

@@ -78,7 +78,7 @@ public class DefaultUserService extends AbstractTbEntityService implements TbUse
             userService.deleteUser(tenantId, user);
             logEntityActionService.logEntityAction(tenantId, userId, user, customerId, actionType, responsibleUser, customerId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.USER),
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(userId, EntityType.USER),
                     actionType, responsibleUser, e, userId.toString());
             throw e;
         }

application/src/main/java/org/thingsboard/server/service/entitiy/widgets/bundle/DefaultWidgetsBundleService.java

@@ -66,7 +66,7 @@ public class DefaultWidgetsBundleService extends AbstractTbEntityService impleme
             widgetsBundleService.deleteWidgetsBundle(widgetsBundle.getTenantId(), widgetsBundle.getId());
             logEntityActionService.logEntityAction(tenantId, widgetsBundle.getId(), widgetsBundle, null, actionType, user);
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.WIDGETS_BUNDLE), actionType, user, e, widgetsBundle.getId());
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(widgetsBundle.getId(), EntityType.WIDGETS_BUNDLE), actionType, user, e, widgetsBundle.getId());
             throw e;
         }
     }

application/src/main/java/org/thingsboard/server/service/entitiy/widgets/type/DefaultWidgetTypeService.java

@@ -78,7 +78,7 @@ public class DefaultWidgetTypeService extends AbstractTbEntityService implements
             widgetTypeService.deleteWidgetType(widgetTypeDetails.getTenantId(), widgetTypeDetails.getId());
             logEntityActionService.logEntityAction(tenantId, widgetTypeDetails.getId(), widgetTypeDetails, null, actionType, user);
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.WIDGET_TYPE), actionType, user, e, widgetTypeDetails.getId());
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(widgetTypeDetails.getId(), EntityType.WIDGET_TYPE), actionType, user, e, widgetTypeDetails.getId());
             throw e;
         }
     }

application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java

@@ -104,7 +104,7 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
             }
             return result;
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.TB_RESOURCE),
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(resourceId, EntityType.TB_RESOURCE),
                     actionType, user, e, resourceId.toString());
             throw e;
         }

application/src/main/java/org/thingsboard/server/service/rule/DefaultTbRuleChainService.java

@@ -193,7 +193,7 @@ public class DefaultTbRuleChainService extends AbstractTbEntityService implement
             ruleChainService.deleteRuleChainById(tenantId, ruleChainId);
             logEntityActionService.logEntityAction(tenantId, ruleChainId, ruleChain, null, ActionType.DELETED, user, ruleChainId.toString());
         } catch (Exception e) {
-            logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.RULE_CHAIN), ActionType.DELETED,
+            logEntityActionService.logEntityAction(tenantId, getOrEmptyId(ruleChainId, EntityType.RULE_CHAIN), ActionType.DELETED,
                     user, e, ruleChainId.toString());
             throw e;
         }