From ccdb0212a8bbe55e94a4ca1361728cee4fabf65b Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Tue, 1 Aug 2023 16:17:51 +0200
Subject: [PATCH] minor refactoring

---
 .../main/java/org/thingsboard/server/dao/alarm/AlarmDao.java    | 2 +-
 .../java/org/thingsboard/server/dao/alarm/BaseAlarmService.java | 2 +-
 .../java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
index 6c6d8cb27a..da31be082e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDao.java
@@ -98,6 +98,6 @@ public interface AlarmDao extends Dao<Alarm> {
 
     long countAlarmsByQuery(TenantId tenantId, CustomerId customerId, AlarmCountQuery query);
 
-    List<EntitySubtype> findTenantAlarmTypesAsync(UUID tenantId);
+    List<EntitySubtype> findTenantAlarmTypes(UUID tenantId);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index eef476ae72..0e8d18e042 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -401,7 +401,7 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Arra
         log.trace("Executing findAlarmTypesByTenantId, tenantId [{}]", tenantId);
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         return cache.getAndPutInTransaction(tenantId, () ->
-                alarmDao.findTenantAlarmTypesAsync(tenantId.getId()).stream()
+                alarmDao.findTenantAlarmTypes(tenantId.getId()).stream()
                         .sorted(Comparator.comparing(EntitySubtype::getType))
                         .collect(Collectors.toCollection(ArrayList::new)), false);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
index ec5734df84..42e50e878b 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
@@ -370,7 +370,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
     }
 
     @Override
-    public List<EntitySubtype> findTenantAlarmTypesAsync(UUID tenantId) {
+    public List<EntitySubtype> findTenantAlarmTypes(UUID tenantId) {
         return convertTenantEntityTypesToDto(tenantId, EntityType.ALARM, alarmRepository.findTenantAlarmTypes(tenantId));
     }