diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java index ce3a318fe6..7141d66f42 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNode.java @@ -104,7 +104,7 @@ public class CalculateDeltaNode implements TbNode { return; } - if (config.isExcludeZeroDeltasFromOutboundMessage() && delta.doubleValue() == 0) { + if (config.isExcludeZeroDeltas() && delta.doubleValue() == 0) { ctx.tellSuccess(msg); return; } @@ -141,10 +141,10 @@ public class CalculateDeltaNode implements TbNode { boolean hasChanges = false; switch (fromVersion) { case 0: - String excludeZeroDeltasFromOutboundMessage = "excludeZeroDeltasFromOutboundMessage"; - if (!oldConfiguration.has(excludeZeroDeltasFromOutboundMessage)) { + String excludeZeroDeltas = "excludeZeroDeltas"; + if (!oldConfiguration.has(excludeZeroDeltas)) { hasChanges = true; - ((ObjectNode) oldConfiguration).put(excludeZeroDeltasFromOutboundMessage, false); + ((ObjectNode) oldConfiguration).put(excludeZeroDeltas, false); } break; default: diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java index 82a2eb85b0..0ae558718b 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeConfiguration.java @@ -30,7 +30,7 @@ public class CalculateDeltaNodeConfiguration implements NodeConfiguration CalculateDeltaTestConfig() { return Stream.of( - // delta = 0, tell failure if delta is negative is set to true and exclude zero deltas from outbound message is set to true so delta should filter out the message. + // delta = 0, tell failure if delta is negative is set to true and exclude zero deltas is set to true so delta should filter out the message. new CalculateDeltaTestConfig(true, true, 40, 40, (ctx, msg) -> { verify(ctx).tellSuccess(eq(msg)); verify(ctx).getDbCallbackExecutor(); @@ -474,7 +474,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { verifyNoMoreInteractions(ctx); assertThat(errorCaptor.getValue()).isInstanceOf(IllegalArgumentException.class).hasMessage("Delta value is negative!"); }), - // delta < 0, exclude zero deltas from outbound message is set to true so it should return message with delta if delta is negative is set to false. + // delta < 0, exclude zero deltas is set to true so it should return message with delta if delta is negative is set to false. new CalculateDeltaTestConfig(false, true, 40, 41, (ctx, msg) -> { var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class); verify(ctx).tellSuccess(actualMsgCaptor.capture()); @@ -483,13 +483,13 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { String expectedMsgData = "{\"temperature\":40.0,\"airPressure\":123,\"delta\":-1}"; assertEquals(expectedMsgData, actualMsgCaptor.getValue().getData()); }), - // delta = 0, tell failure if delta is negative is set to false and exclude zero deltas from outbound message is set to true so delta should filter out the message. + // delta = 0, tell failure if delta is negative is set to false and exclude zero deltas is set to true so delta should filter out the message. new CalculateDeltaTestConfig(false, true, 40, 40, (ctx, msg) -> { verify(ctx).tellSuccess(eq(msg)); verify(ctx).getDbCallbackExecutor(); verifyNoMoreInteractions(ctx); }), - // delta > 0, exclude zero deltas from outbound message is set to true so it should return message with delta. + // delta > 0, exclude zero deltas is set to true so it should return message with delta. new CalculateDeltaTestConfig(false, true, 40, 39, (ctx, msg) -> { var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class); verify(ctx).tellSuccess(actualMsgCaptor.capture()); @@ -498,7 +498,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { String expectedMsgData = "{\"temperature\":40.0,\"airPressure\":123,\"delta\":1}"; assertEquals(expectedMsgData, actualMsgCaptor.getValue().getData()); }), - // delta > 0, exclude zero deltas from outbound message is set to false so it should return message with delta. + // delta > 0, exclude zero deltas is set to false so it should return message with delta. new CalculateDeltaTestConfig(false, false, 40, 39, (ctx, msg) -> { var actualMsgCaptor = ArgumentCaptor.forClass(TbMsg.class); verify(ctx).tellSuccess(actualMsgCaptor.capture()); @@ -559,12 +559,12 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { Arguments.of(0, "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true}", true, - "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltasFromOutboundMessage\":false}"), + "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}"), // default config for version 1 with upgrade from version 0 Arguments.of(1, - "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltasFromOutboundMessage\":false}", + "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}", false, - "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltasFromOutboundMessage\":false}") + "{\"inputValueKey\":\"pulseCounter\",\"outputValueKey\":\"delta\",\"useCache\":true,\"addPeriodBetweenMsgs\":false, \"periodValueKey\":\"periodInMs\", \"round\":null,\"tellFailureIfDeltaIsNegative\":true, \"excludeZeroDeltas\":false}") ); }