Fix for build after changes

4 years ago · 334455e683
2 changed files with 2 additions and 2 deletions
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
@ -569,7 +569,7 @@ public class DefaultSubscriptionManagerService extends TbApplicationEventListene

        builder.setSessionId(subscription.getSessionId());
        builder.setSubscriptionId(subscription.getSubscriptionId());
-        builder.setAlarmInfo(JacksonUtil.toString(alarmInfo));
+        builder.setAlarm(JacksonUtil.toString(alarmInfo));
        builder.setDeleted(deleted);

        ToCoreNotificationMsg toCoreMsg = ToCoreNotificationMsg.newBuilder().setToLocalSubscriptionServiceMsg(
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmServiceTest.java
@ -250,7 +250,7 @@ public abstract class BaseAlarmServiceTest extends AbstractServiceTest {

        Assert.assertNotNull(tenantUser);

-        AlarmOperationResult assignmentResult = alarmService.assignAlarm(tenantId, created.getId(), tenantUser.getId(), ts).get();
+        AlarmOperationResult assignmentResult = alarmService.assignAlarm(tenantId, created.getId(), tenantUser.getId(), ts);
        created = assignmentResult.getAlarmInfo();

        PageData<AlarmInfo> alarms = alarmService.findAlarms(tenantId, AlarmQuery.builder()