From 15ef0da68722542a8c247063a92d7ab160cc5f5b Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Sun, 15 May 2022 22:20:25 +0300
Subject: [PATCH] refactoring: - delete SimpleTbEntityService from Alarm

---
 .../entitiy/alarm/DefaultTbAlarmService.java      | 15 +++++----------
 .../service/entitiy/alarm/TbAlarmService.java     |  6 +++---
 .../customer/DefaultTbCustomerService.java        |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
index 88cfb63e72..870388483e 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmService.java
@@ -23,7 +23,6 @@ import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.queue.util.TbCoreComponent;
@@ -81,16 +80,12 @@ public class DefaultTbAlarmService extends AbstractTbEntityService implements Tb
     @Override
     public Boolean deleteAlarm(Alarm alarm, SecurityUser user) throws ThingsboardException {
         try {
-        List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(user.getTenantId(), alarm.getOriginator());
-        notificationEntityService.notifyDeleteEntity(user.getTenantId(), alarm.getId(), alarm, user.getCustomerId(),
-                ActionType.DELETED, relatedEdgeIds, user, json.writeValueAsString(alarm));
-        return alarmService.deleteAlarm(user.getTenantId(), alarm.getId()).isSuccessful();
+            List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(user.getTenantId(), alarm.getOriginator());
+            notificationEntityService.notifyDeleteEntity(user.getTenantId(), alarm.getId(), alarm, user.getCustomerId(),
+                    ActionType.DELETED, relatedEdgeIds, user, json.writeValueAsString(alarm));
+            return alarmService.deleteAlarm(user.getTenantId(), alarm.getId()).isSuccessful();
         } catch (Exception e) {
             throw handleException(e);
         }
     }
-
-
-    @Override
-    public void delete(Alarm entity, AlarmId entityId, SecurityUser user) throws ThingsboardException {}
-}
+}
\ No newline at end of file
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
index 8a169b8f88..85bff96d47 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/alarm/TbAlarmService.java
@@ -17,11 +17,11 @@ package org.thingsboard.server.service.entitiy.alarm;
 
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.service.entitiy.SimpleTbEntityService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
-public interface TbAlarmService extends SimpleTbEntityService<Alarm, AlarmId> {
+public interface TbAlarmService {
+
+    Alarm save(Alarm entity, SecurityUser user) throws ThingsboardException;
 
     void ack(Alarm alarm, SecurityUser user) throws ThingsboardException;
 
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java
index f5250c7ee9..ba3141983d 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/customer/DefaultTbCustomerService.java
@@ -55,7 +55,7 @@ public class DefaultTbCustomerService extends AbstractTbEntityService implements
         TenantId tenantId = user.getTenantId();
         try {
             List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(tenantId, customerId);
-            customerService.deleteCustomer(tenantId, (CustomerId) customerId);
+            customerService.deleteCustomer(tenantId, customerId);
             notificationEntityService.notifyDeleteEntity(tenantId, customerId, customer, user.getCustomerId(),
                     ActionType.DELETED, relatedEdgeIds, user, null);
         } catch (Exception e) {