refactoring: - dashboard comments2

application/src/main/java/org/thingsboard/server/controller/AlarmController.java

@@ -147,7 +147,7 @@ public class AlarmController extends BaseController {
         try {
             AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
             Alarm alarm = checkAlarmId(alarmId, Operation.WRITE);
-            return tbAlarmService.deleteAlarm(alarm, getCurrentUser());
+            return tbAlarmService.delete(alarm, getCurrentUser());
         } catch (Exception e) {
             throw handleException(e);
         }

application/src/main/java/org/thingsboard/server/controller/AssetController.java

@@ -149,7 +149,7 @@ public class AssetController extends BaseController {
         }
         asset.setTenantId(getCurrentUser().getTenantId());
         checkEntity(asset.getId(), asset, Resource.ASSET);
-        return tbAssetService.saveAsset(asset, getCurrentUser());
+        return tbAssetService.save(asset, getCurrentUser());
     }
 
     @ApiOperation(value = "Delete asset (deleteAsset)",
@@ -162,7 +162,7 @@ public class AssetController extends BaseController {
         try {
             AssetId assetId = new AssetId(toUUID(strAssetId));
             Asset asset = checkAssetId(assetId, Operation.DELETE);
-            tbAssetService.deleteAsset(asset, getCurrentUser()).get();
+            tbAssetService.delete(asset, getCurrentUser()).get();
         } catch (Exception e) {
             throw handleException(e);
         }

application/src/main/java/org/thingsboard/server/controller/DashboardController.java

@@ -39,6 +39,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.DashboardInfo;
+import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HomeDashboard;
 import org.thingsboard.server.common.data.HomeDashboardInfo;
 import org.thingsboard.server.common.data.Tenant;
@@ -57,7 +58,10 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import static org.thingsboard.server.controller.ControllerConstants.CUSTOMER_ID;
@@ -258,7 +262,8 @@ public class DashboardController extends BaseController {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
         Dashboard dashboard = checkDashboardId(dashboardId, Operation.ASSIGN_TO_CUSTOMER);
-        return tbDashboardService.updateDashboardCustomers(dashboard, strCustomerIds, getCurrentUser());
+        Set<CustomerId> customerIds = customerIdFromStr(strCustomerIds, dashboard);
+        return tbDashboardService.updateDashboardCustomers(dashboard, customerIds, getCurrentUser());
     }
 
     @ApiOperation(value = "Adds the Dashboard Customers (addDashboardCustomers)",
@@ -277,7 +282,8 @@ public class DashboardController extends BaseController {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
         Dashboard dashboard = checkDashboardId(dashboardId, Operation.ASSIGN_TO_CUSTOMER);
-        return tbDashboardService.addDashboardCustomers(dashboard, strCustomerIds, getCurrentUser());
+        Set<CustomerId> customerIds = customerIdFromStr(strCustomerIds, dashboard);
+        return tbDashboardService.addDashboardCustomers(dashboard, customerIds, getCurrentUser());
     }
 
     @ApiOperation(value = "Remove the Dashboard Customers (removeDashboardCustomers)",
@@ -296,8 +302,8 @@ public class DashboardController extends BaseController {
         checkParameter(DASHBOARD_ID, strDashboardId);
         DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
         Dashboard dashboard = checkDashboardId(dashboardId, Operation.UNASSIGN_FROM_CUSTOMER);
-        return tbDashboardService.removeDashboardCustomers(dashboard, strCustomerIds, getCurrentUser());
+        Set<CustomerId> customerIds = customerIdFromStr(strCustomerIds, dashboard);
-
+        return tbDashboardService.removeDashboardCustomers(dashboard, customerIds, getCurrentUser());
     }
 
     @ApiOperation(value = "Assign the Dashboard to Public Customer (assignDashboardToPublicCustomer)",
@@ -698,4 +704,17 @@ public class DashboardController extends BaseController {
             throw handleException(e);
         }
     }
+
+    private  Set<CustomerId> customerIdFromStr(String [] strCustomerIds, Dashboard dashboard) {
+        Set<CustomerId> customerIds = new HashSet<>();
+        if (strCustomerIds != null) {
+            for (String strCustomerId : strCustomerIds) {
+                CustomerId customerId = new CustomerId(UUID.fromString(strCustomerId));
+                if (dashboard.isAssignedToCustomer(customerId)) {
+                    customerIds.add(customerId);
+                }
+            }
+        }
+        return customerIds;
+    }
 }

application/src/main/java/org/thingsboard/server/controller/DeviceController.java

@@ -206,7 +206,7 @@ public class DeviceController extends BaseController {
         DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
         Device device = checkDeviceId(deviceId, Operation.DELETE);
         try {
-            tbDeviceService.deleteDevice(device, getCurrentUser()).get();
+            tbDeviceService.delete(device, getCurrentUser()).get();
         } catch (Exception e) {
             throw handleException(e);
         }

application/src/main/java/org/thingsboard/server/controller/EdgeController.java

@@ -164,7 +164,7 @@ public class EdgeController extends BaseController {
 
         accessControlService.checkPermission(getCurrentUser(), Resource.EDGE, operation, edge.getId(), edge);
 
-        return tbEdgeService.saveEdge(edge, edgeTemplateRootRuleChain, getCurrentUser());
+        return tbEdgeService.save(edge, edgeTemplateRootRuleChain, getCurrentUser());
     }
 
     @ApiOperation(value = "Delete edge (deleteEdge)",
@@ -177,7 +177,7 @@ public class EdgeController extends BaseController {
         checkParameter(EDGE_ID, strEdgeId);
         EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
         Edge edge = checkEdgeId(edgeId, Operation.DELETE);
-        tbEdgeService.deleteEdge(edge, getCurrentUser());
+        tbEdgeService.delete(edge, getCurrentUser());
     }
 
     @ApiOperation(value = "Get Tenant Edges (getEdges)",

application/src/main/java/org/thingsboard/server/service/asset/AssetBulkImportService.java

@@ -66,7 +66,7 @@ public class AssetBulkImportService extends AbstractBulkImportService<Asset> {
     @Override
     @SneakyThrows
     protected Asset saveEntity(SecurityUser user, Asset entity, Map<BulkImportColumnType, String> fields) {
-        return tbAssetService.saveAsset(entity, user);
+        return tbAssetService.save(entity, user);
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/edge/EdgeBulkImportService.java

@@ -76,7 +76,7 @@ public class EdgeBulkImportService extends AbstractBulkImportService<Edge> {
     @Override
     protected Edge saveEntity(SecurityUser user, Edge entity, Map<BulkImportColumnType, String> fields) {
         RuleChain edgeTemplateRootRuleChain = ruleChainService.getEdgeTemplateRootRuleChain(user.getTenantId());
-        return tbEdgeService.saveEdge(entity, edgeTemplateRootRuleChain, user);
+        return tbEdgeService.save(entity, edgeTemplateRootRuleChain, user);
     }
 
     @Override

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

@@ -67,14 +67,21 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
     }
 
     @Override
-    public <E extends HasName, I extends EntityId> void notifyDeleteEntity(TenantId tenantId, I entityId, E entity, EntityId originatorId,
+    public <E extends HasName, I extends EntityId> void notifyDeleteEntity(TenantId tenantId, I entityId, E entity,
                                                                            CustomerId customerId, ActionType actionType,
                                                                            List<EdgeId> relatedEdgeIds,
-                                                                           SecurityUser user,
+                                                                           SecurityUser user, Object... additionalInfo) {
-                                                                           String body, Object... additionalInfo) {
+        logEntityAction(tenantId, entityId, entity, customerId, actionType, user, additionalInfo);
-        EntityId entityIdForLogEntityAction = originatorId != null ? originatorId : entityId;
+        sendDeleteNotificationMsg(tenantId, entityId, entity, relatedEdgeIds);
-        logEntityAction(tenantId, entityIdForLogEntityAction, entity, customerId, actionType, user, additionalInfo);
+    }
-        sendDeleteNotificationMsg(tenantId, entityId, entity, relatedEdgeIds, body);
+
+    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) {
+        logEntityAction(tenantId, originatorId, entity, customerId, actionType, user, additionalInfo);
+        sendAlarmDeleteNotificationMsg(tenantId, entityId, entity, relatedEdgeIds, body);
     }
 
     @Override
@@ -127,7 +134,7 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
         gatewayNotificationsService.onDeviceDeleted(device);
         tbClusterService.onDeviceDeleted(device, null);
 
-        notifyDeleteEntity(tenantId, deviceId, device, customerId, null, ActionType.DELETED, relatedEdgeIds, user,null, additionalInfo);
+        notifyDeleteEntity(tenantId, deviceId, device, customerId, ActionType.DELETED, relatedEdgeIds, user,null, additionalInfo);
     }
 
     @Override
@@ -221,8 +228,8 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
         }
     }
 
-    protected <E extends HasName, I extends EntityId> void sendDeleteNotificationMsg(TenantId tenantId, I entityId, E entity,
+    protected <E extends HasName, I extends EntityId> void sendAlarmDeleteNotificationMsg(TenantId tenantId, I entityId, E entity,
-                                                                                     List<EdgeId> edgeIds, String body) {
+                                                                                          List<EdgeId> edgeIds, String body) {
         try {
             sendDeleteNotificationMsg(tenantId, entityId, edgeIds, body);
         } catch (Exception e) {
@@ -230,6 +237,15 @@ public class DefaultTbNotificationEntityService implements TbNotificationEntityS
         }
     }
 
+    protected <E extends HasName, I extends EntityId> void sendDeleteNotificationMsg(TenantId tenantId, I entityId, E entity,
+                                                                                     List<EdgeId> edgeIds) {
+        try {
+            sendDeleteNotificationMsg(tenantId, entityId, edgeIds, null);
+        } catch (Exception e) {
+            log.warn("Failed to push delete " + entity.getClass().getName() + " msg to core: {}", entity, e);
+        }
+    }
+
     private void sendDeleteNotificationMsg(TenantId tenantId, EntityId entityId, List<EdgeId> edgeIds, String body) {
         if (edgeIds != null && !edgeIds.isEmpty()) {
             for (EdgeId edgeId : edgeIds) {

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

@@ -43,9 +43,15 @@ public interface TbNotificationEntityService {
                                                                             CustomerId customerId, ActionType actionType,
                                                                             SecurityUser user, Object... additionalInfo);
 
-    <E extends HasName, I extends EntityId> void notifyDeleteEntity(TenantId tenantId, I entityId, E entity, EntityId originatorId, CustomerId customerId,
+    <E extends HasName, I extends EntityId> void notifyDeleteEntity(TenantId tenantId, I entityId, E entity,
-                                                                    ActionType actionType, List<EdgeId> relatedEdgeIds, SecurityUser user,
+                                                                    CustomerId customerId, ActionType actionType,
-                                                                    String body, Object... additionalInfo);
+                                                                    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 notifyAssignOrUnassignEntityToCustomer(TenantId tenantId, I entityId,
                                                                                         CustomerId customerId, E entity,

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

@@ -77,10 +77,10 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     }
 
     @Override
-    public Boolean deleteAlarm(Alarm alarm, SecurityUser user) throws ThingsboardException {
+    public Boolean delete(Alarm alarm, SecurityUser user) throws ThingsboardException {
         try {
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(user.getTenantId(), alarm.getOriginator());
-            notificationEntityService.notifyDeleteEntity(user.getTenantId(), alarm.getId(), alarm, alarm.getOriginator(), user.getCustomerId(),
+            notificationEntityService.notifyDeleteEntityAlarm(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/alarm/TbAlarmService.java

@@ -27,5 +27,5 @@ public interface TbAlarmService {
 
     void clear(Alarm alarm, SecurityUser user) throws ThingsboardException;
 
-    Boolean deleteAlarm(Alarm alarm, SecurityUser user) throws ThingsboardException;
+    Boolean delete(Alarm alarm, SecurityUser user) throws ThingsboardException;
 }

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

@@ -41,7 +41,7 @@ import java.util.List;
 public class DefaultTbAssetService extends AbstractTbEntityService implements TbAssetService {
 
     @Override
-    public Asset saveAsset(Asset asset, SecurityUser user) throws ThingsboardException {
+    public Asset save(Asset asset, SecurityUser user) throws ThingsboardException {
         ActionType actionType = asset.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = asset.getTenantId();
         try {
@@ -55,13 +55,13 @@ public class DefaultTbAssetService extends AbstractTbEntityService implements Tb
     }
 
     @Override
-    public ListenableFuture<Void> deleteAsset(Asset asset, SecurityUser user) throws ThingsboardException {
+    public ListenableFuture<Void> delete(Asset asset, SecurityUser user) throws ThingsboardException {
         TenantId tenantId = asset.getTenantId();
         AssetId assetId = asset.getId();
         try {
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(tenantId, assetId);
             assetService.deleteAsset(tenantId, assetId);
-            notificationEntityService.notifyDeleteEntity(tenantId, assetId, asset, null, asset.getCustomerId(), ActionType.DELETED,
+            notificationEntityService.notifyDeleteEntity(tenantId, assetId, asset, asset.getCustomerId(), ActionType.DELETED,
                     relatedEdgeIds, user, null, asset.toString());
 
             return removeAlarmsByEntityId(tenantId, assetId);

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

@@ -26,9 +26,9 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 
 public interface TbAssetService {
 
-    Asset saveAsset(Asset asset, SecurityUser user) throws ThingsboardException;
+    Asset save(Asset asset, SecurityUser user) throws ThingsboardException;
 
-    ListenableFuture<Void> deleteAsset (Asset asset, SecurityUser user) throws ThingsboardException;
+    ListenableFuture<Void> delete(Asset asset, SecurityUser user) throws ThingsboardException;
 
     Asset assignAssetToCustomer(TenantId tenantId, AssetId assetId, Customer customer, SecurityUser user) throws ThingsboardException;
 

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

@@ -61,7 +61,7 @@ public class DefaultTbCustomerService extends AbstractTbEntityService implements
         try {
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(tenantId, customerId);
             customerService.deleteCustomer(tenantId, customerId);
-            notificationEntityService.notifyDeleteEntity(tenantId, customerId, customer, null, customerId,
+            notificationEntityService.notifyDeleteEntity(tenantId, customerId, customer, customerId,
                     ActionType.DELETED, relatedEdgeIds, user, null);
             tbClusterService.broadcastEntityStateChangeEvent(tenantId, customerId, ComponentLifecycleEvent.DELETED);
         } catch (Exception e) {

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

@@ -36,7 +36,6 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.UUID;
 
 @Service
 @TbCoreComponent
@@ -65,7 +64,7 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
         try {
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(tenantId, dashboardId);
             dashboardService.deleteDashboard(tenantId, dashboardId);
-            notificationEntityService.notifyDeleteEntity(tenantId, dashboardId, dashboard, null, user.getCustomerId(),
+            notificationEntityService.notifyDeleteEntity(tenantId, dashboardId, dashboard, user.getCustomerId(),
                     ActionType.DELETED, relatedEdgeIds, user, null);
         } catch (Exception e) {
             notificationEntityService.notifyEntity(tenantId, emptyId(EntityType.DASHBOARD), null, null,
@@ -125,17 +124,10 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
     }
 
     @Override
-    public Dashboard updateDashboardCustomers(Dashboard dashboard, String[] strCustomerIds, SecurityUser user) throws ThingsboardException {
+    public Dashboard updateDashboardCustomers(Dashboard dashboard, Set<CustomerId> customerIds, SecurityUser user) throws ThingsboardException {
         ActionType actionType = ActionType.ASSIGNED_TO_CUSTOMER;
         TenantId tenantId = user.getTenantId();
         try {
-            Set<CustomerId> customerIds = new HashSet<>();
-            if (strCustomerIds != null) {
-                for (String strCustomerId : strCustomerIds) {
-                    customerIds.add(new CustomerId(UUID.fromString(strCustomerId)));
-                }
-            }
-
             Set<CustomerId> addedCustomerIds = new HashSet<>();
             Set<CustomerId> removedCustomerIds = new HashSet<>();
             for (CustomerId customerId : customerIds) {
@@ -179,20 +171,10 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
     }
 
     @Override
-    public Dashboard addDashboardCustomers(Dashboard dashboard, String[] strCustomerIds, SecurityUser user) throws ThingsboardException {
+    public Dashboard addDashboardCustomers(Dashboard dashboard, Set<CustomerId> customerIds, SecurityUser user) throws ThingsboardException {
         ActionType actionType = ActionType.ASSIGNED_TO_CUSTOMER;
         TenantId tenantId = user.getTenantId();
         try {
-            Set<CustomerId> customerIds = new HashSet<>();
-            if (strCustomerIds != null) {
-                for (String strCustomerId : strCustomerIds) {
-                    CustomerId customerId = new CustomerId(UUID.fromString(strCustomerId));
-                    if (!dashboard.isAssignedToCustomer(customerId)) {
-                        customerIds.add(customerId);
-                    }
-                }
-            }
-
             if (customerIds.isEmpty()) {
                 return dashboard;
             } else {
@@ -213,21 +195,11 @@ public class DefaultTbDashboardService extends AbstractTbEntityService implement
     }
 
     @Override
-    public Dashboard removeDashboardCustomers(Dashboard dashboard, String[] strCustomerIds, SecurityUser user) throws ThingsboardException {
+    public Dashboard removeDashboardCustomers(Dashboard dashboard, Set<CustomerId> customerIds, SecurityUser user) throws ThingsboardException {
         ActionType actionType = ActionType.UNASSIGNED_FROM_CUSTOMER;
         TenantId tenantId = user.getTenantId();
         try {
-            Set<CustomerId> customerIds = new HashSet<>();
+             if (customerIds.isEmpty()) {
-            if (strCustomerIds != null) {
-                for (String strCustomerId : strCustomerIds) {
-                    CustomerId customerId = new CustomerId(UUID.fromString(strCustomerId));
-                    if (dashboard.isAssignedToCustomer(customerId)) {
-                        customerIds.add(customerId);
-                    }
-                }
-            }
-
-            if (customerIds.isEmpty()) {
                 return dashboard;
             } else {
                 Dashboard savedDashboard = null;

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

@@ -19,11 +19,13 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DashboardId;
-import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.service.entitiy.SimpleTbEntityService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
+import java.util.Set;
+
 public interface  TbDashboardService extends SimpleTbEntityService<Dashboard> {
 
     Dashboard assignDashboardToCustomer(DashboardId dashboardId, Customer customer, SecurityUser user) throws ThingsboardException;
@@ -32,11 +34,11 @@ public interface  TbDashboardService extends SimpleTbEntityService<Dashboard> {
 
     Dashboard unassignDashboardFromPublicCustomer(Dashboard dashboard, SecurityUser user) throws ThingsboardException;
 
-    Dashboard updateDashboardCustomers(Dashboard dashboard, String[] strCustomerIds, SecurityUser user) throws ThingsboardException;
+    Dashboard updateDashboardCustomers(Dashboard dashboard, Set<CustomerId> customerIds, SecurityUser user) throws ThingsboardException;
 
-    Dashboard addDashboardCustomers(Dashboard dashboard,  String[] strCustomerIds, SecurityUser user) throws ThingsboardException;
+    Dashboard addDashboardCustomers(Dashboard dashboard, Set<CustomerId> customerIds, SecurityUser user) throws ThingsboardException;
 
-    Dashboard removeDashboardCustomers(Dashboard dashboard,  String[] strCustomerIds, SecurityUser user) throws ThingsboardException;
+    Dashboard removeDashboardCustomers(Dashboard dashboard, Set<CustomerId> customerIds, SecurityUser user) throws ThingsboardException;
 
     Dashboard asignDashboardToEdge(DashboardId dashboardId, Edge edge, SecurityUser user) throws ThingsboardException;
 

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

@@ -80,7 +80,7 @@ public class DefaultTbDeviceService extends AbstractTbEntityService implements T
     }
 
     @Override
-    public ListenableFuture<Void> deleteDevice(Device device, SecurityUser user) throws ThingsboardException {
+    public ListenableFuture<Void> delete(Device device, SecurityUser user) throws ThingsboardException {
         TenantId tenantId = device.getTenantId();
         DeviceId deviceId = device.getId();
         try {

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

@@ -35,7 +35,7 @@ public interface TbDeviceService {
 
     Device saveDeviceWithCredentials(TenantId tenantId, Device device, DeviceCredentials deviceCredentials, SecurityUser user) throws ThingsboardException;
 
-    ListenableFuture<Void> deleteDevice(Device device, SecurityUser user) throws ThingsboardException;
+    ListenableFuture<Void> delete(Device device, SecurityUser user) throws ThingsboardException;
 
     Device assignDeviceToCustomer(TenantId tenantId, DeviceId deviceId, Customer customer, SecurityUser user) throws ThingsboardException;
 

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

@@ -39,7 +39,7 @@ import org.thingsboard.server.service.security.model.SecurityUser;
 public class DefaultTbEdgeService extends AbstractTbEntityService implements TbEdgeService {
 
     @Override
-    public Edge saveEdge(Edge edge, RuleChain edgeTemplateRootRuleChain, SecurityUser user) throws ThingsboardException {
+    public Edge save(Edge edge, RuleChain edgeTemplateRootRuleChain, SecurityUser user) throws ThingsboardException {
         ActionType actionType = edge.getId() == null ? ActionType.ADDED : ActionType.UPDATED;
         TenantId tenantId = edge.getTenantId();
         try {
@@ -62,7 +62,7 @@ public class DefaultTbEdgeService extends AbstractTbEntityService implements TbE
     }
 
     @Override
-    public void deleteEdge(Edge edge, SecurityUser user) throws ThingsboardException {
+    public void delete(Edge edge, SecurityUser user) throws ThingsboardException {
         ActionType actionType = ActionType.DELETED;
         EdgeId edgeId = edge.getId();
         TenantId tenantId = edge.getTenantId();

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

@@ -25,9 +25,9 @@ import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
 public interface TbEdgeService {
-    Edge saveEdge(Edge edge, RuleChain edgeTemplateRootRuleChain, SecurityUser user) throws ThingsboardException;
+    Edge save(Edge edge, RuleChain edgeTemplateRootRuleChain, SecurityUser user) throws ThingsboardException;
 
-    void deleteEdge(Edge edge, SecurityUser user) throws ThingsboardException;
+    void delete(Edge edge, SecurityUser user) throws ThingsboardException;
 
     Edge assignEdgeToCustomer(TenantId tenantId, EdgeId edgeId, Customer customer, SecurityUser user) throws ThingsboardException;