Browse Source

Fix AlarmRuleControllerTest deserialization failures

pull/15326/head
Viacheslav Klimov 6 months ago
parent
commit
b234948d14
Failed to extract signature
  1. 4
      application/src/test/java/org/thingsboard/server/controller/AlarmRuleControllerTest.java
  2. 9
      common/data/src/main/java/org/thingsboard/server/common/data/cf/AlarmRuleDefinition.java

4
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"); Device testDevice = createDevice("Test device", "1234567890");
AlarmRuleDefinition saved = saveAlarmRule(createTestAlarmRule(testDevice.getId(), "Debug Test")); AlarmRuleDefinition saved = saveAlarmRule(createTestAlarmRule(testDevice.getId(), "Debug Test"));
JsonNode result = doGet("/api/alarm/rule/" + saved.getId().getId() + "/debug", JsonNode.class); doGet("/api/alarm/rule/" + saved.getId().getId() + "/debug")
assertThat(result).isNull(); .andExpect(status().isOk());
doDelete("/api/alarm/rule/" + saved.getId().getId()) doDelete("/api/alarm/rule/" + saved.getId().getId())
.andExpect(status().isOk()); .andExpect(status().isOk());

9
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.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.thingsboard.server.common.data.BaseData; 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.HasAdditionalInfo;
import org.thingsboard.server.common.data.HasDebugSettings; import org.thingsboard.server.common.data.HasDebugSettings;
import org.thingsboard.server.common.data.HasName; 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.HasTenantId;
import org.thingsboard.server.common.data.HasVersion;
import org.thingsboard.server.common.data.cf.configuration.AlarmCalculatedFieldConfiguration; import org.thingsboard.server.common.data.cf.configuration.AlarmCalculatedFieldConfiguration;
import org.thingsboard.server.common.data.debug.DebugSettings; import org.thingsboard.server.common.data.debug.DebugSettings;
import org.thingsboard.server.common.data.id.CalculatedFieldId; import org.thingsboard.server.common.data.id.CalculatedFieldId;
@ -64,7 +63,7 @@ public class AlarmRuleDefinition extends BaseData<CalculatedFieldId> implements
private Long version; private Long version;
@NoXss @NoXss
@Schema(description = "Additional parameters of the alarm rule. " + @Schema(description = "Additional parameters of the alarm rule. " +
"May include: 'description' (string).", "May include: 'description' (string).",
implementation = com.fasterxml.jackson.databind.JsonNode.class, implementation = com.fasterxml.jackson.databind.JsonNode.class,
example = "{\"description\":\"High temperature alarm rule\"}") example = "{\"description\":\"High temperature alarm rule\"}")
private JsonNode additionalInfo; private JsonNode additionalInfo;
@ -112,10 +111,6 @@ public class AlarmRuleDefinition extends BaseData<CalculatedFieldId> implements
this.debugMode = debugMode; this.debugMode = debugMode;
} }
public EntityType getEntityType() {
return EntityType.CALCULATED_FIELD;
}
public CalculatedField toCalculatedField() { public CalculatedField toCalculatedField() {
CalculatedField cf = new CalculatedField(); CalculatedField cf = new CalculatedField();
cf.setId(this.id); cf.setId(this.id);

Loading…
Cancel
Save