added findAlarmById method to AlarmService

application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java

@@ -132,11 +132,7 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
 
     @Override
     public Alarm findAlarmById(TenantId tenantId, AlarmId alarmId) {
-        try {
-            return alarmService.findAlarmByIdAsync(tenantId, alarmId).get();
-        } catch (InterruptedException | ExecutionException e) {
-            throw new RuntimeException(e);
-        }
+        return alarmService.findAlarmById(tenantId, alarmId);
     }
 
     @Override

common/dao-api/src/main/java/org/thingsboard/server/dao/alarm/AlarmService.java

@@ -48,6 +48,8 @@ public interface AlarmService {
 
     ListenableFuture<AlarmOperationResult> clearAlarm(TenantId tenantId, AlarmId alarmId, JsonNode details, long clearTs);
 
+    Alarm findAlarmById(TenantId tenantId, AlarmId alarmId);
+
     ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId);
 
     ListenableFuture<AlarmInfo> findAlarmInfoByIdAsync(TenantId tenantId, AlarmId alarmId);

dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java

@@ -262,9 +262,16 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
     }
 
     @Override
-    public ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId) {
+    public Alarm findAlarmById(TenantId tenantId, AlarmId alarmId) {
         log.trace("Executing findAlarmById [{}]", alarmId);
         validateId(alarmId, "Incorrect alarmId " + alarmId);
+        return alarmDao.findAlarmById(tenantId, alarmId.getId());
+    }
+
+    @Override
+    public ListenableFuture<Alarm> findAlarmByIdAsync(TenantId tenantId, AlarmId alarmId) {
+        log.trace("Executing findAlarmByIdAsync [{}]", alarmId);
+        validateId(alarmId, "Incorrect alarmId " + alarmId);
         return alarmDao.findAlarmByIdAsync(tenantId, alarmId.getId());
     }