From b234948d1474b85ac2da28fe41215ccf2fa10926 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Fri, 3 Apr 2026 16:22:36 +0300
Subject: [PATCH] Fix AlarmRuleControllerTest deserialization failures

---
 .../server/controller/AlarmRuleControllerTest.java       | 4 ++--
 .../server/common/data/cf/AlarmRuleDefinition.java       | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/AlarmRuleControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmRuleControllerTest.java
index f8bbd963ba..7c64fd6525 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AlarmRuleControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AlarmRuleControllerTest.java
@@ -272,8 +272,8 @@ public class AlarmRuleControllerTest extends AbstractControllerTest {
         Device testDevice = createDevice("Test device", "1234567890");
         AlarmRuleDefinition saved = saveAlarmRule(createTestAlarmRule(testDevice.getId(), "Debug Test"));
 
-        JsonNode result = doGet("/api/alarm/rule/" + saved.getId().getId() + "/debug", JsonNode.class);
-        assertThat(result).isNull();
+        doGet("/api/alarm/rule/" + saved.getId().getId() + "/debug")
+                .andExpect(status().isOk());
 
         doDelete("/api/alarm/rule/" + saved.getId().getId())
                 .andExpect(status().isOk());
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/AlarmRuleDefinition.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/AlarmRuleDefinition.java
index 6e608cd255..ad46fc4050 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/AlarmRuleDefinition.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/AlarmRuleDefinition.java
@@ -24,12 +24,11 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
-import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasAdditionalInfo;
 import org.thingsboard.server.common.data.HasDebugSettings;
 import org.thingsboard.server.common.data.HasName;
-import org.thingsboard.server.common.data.HasVersion;
 import org.thingsboard.server.common.data.HasTenantId;
+import org.thingsboard.server.common.data.HasVersion;
 import org.thingsboard.server.common.data.cf.configuration.AlarmCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.debug.DebugSettings;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
@@ -64,7 +63,7 @@ public class AlarmRuleDefinition extends BaseData<CalculatedFieldId> implements
     private Long version;
     @NoXss
     @Schema(description = "Additional parameters of the alarm rule. " +
-            "May include: 'description' (string).",
+                          "May include: 'description' (string).",
             implementation = com.fasterxml.jackson.databind.JsonNode.class,
             example = "{\"description\":\"High temperature alarm rule\"}")
     private JsonNode additionalInfo;
@@ -112,10 +111,6 @@ public class AlarmRuleDefinition extends BaseData<CalculatedFieldId> implements
         this.debugMode = debugMode;
     }
 
-    public EntityType getEntityType() {
-        return EntityType.CALCULATED_FIELD;
-    }
-
     public CalculatedField toCalculatedField() {
         CalculatedField cf = new CalculatedField();
         cf.setId(this.id);