diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java index eed7093cd0..c3c524b2bb 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java @@ -175,7 +175,7 @@ public class DefaultTbContext implements TbContext { } TbMsg tbMsg = msg.copy() .ruleChainId(ruleChainId) - .ruleNodeId(null) + .resetRuleNodeId() .build(); tbMsg.pushToStack(nodeCtx.getSelf().getRuleChainId(), nodeCtx.getSelf().getId()); TopicPartitionInfo tpi = mainCtx.resolve(ServiceType.TB_RULE_ENGINE, getQueueName(), getTenantId(), tbMsg.getOriginator()); @@ -371,7 +371,7 @@ public class DefaultTbContext implements TbContext { .type(type) .originator(originator) .customerId(customerId) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .ruleChainId(nodeCtx.getSelf().getRuleChainId()) .ruleNodeId(nodeCtx.getSelf().getId()) @@ -400,7 +400,7 @@ public class DefaultTbContext implements TbContext { .type(type) .originator(originator) .customerId(customerId) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .ruleChainId(nodeCtx.getSelf().getRuleChainId()) .ruleNodeId(nodeCtx.getSelf().getId()) @@ -532,10 +532,9 @@ public class DefaultTbContext implements TbContext { .queueName(defaultQueueName) .type(action) .originator(id) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .ruleChainId(defaultRuleChainId) - .ruleNodeId(null) .build(); } @@ -558,10 +557,9 @@ public class DefaultTbContext implements TbContext { .queueName(defaultQueueName) .type(actionMsgType) .originator(id) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .ruleChainId(defaultRuleChainId) - .ruleNodeId(null) .build(); } diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java index a2a0ab8c80..be0812795d 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java @@ -219,7 +219,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor node.onMsg(ctxMock, msg)) @@ -214,7 +214,7 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(data) .build(); assertThatThrownBy(() -> node.onMsg(ctxMock, msg)) @@ -240,7 +240,7 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(data) .build(); assertThatThrownBy(() -> node.onMsg(ctxMock, msg)) @@ -267,7 +267,7 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -322,7 +322,7 @@ public class TbSaveToCustomCassandraTableNodeTest extends AbstractRuleNodeUpgrad TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(data) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java index 971a858758..d7858e5ceb 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java @@ -297,7 +297,7 @@ class TbUnassignFromCustomerNodeTest extends AbstractRuleNodeUpgradeTest { return TbMsg.newMsg() .type(TbMsgType.NA) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java index b05fc3520c..0afa3804b9 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java @@ -148,7 +148,7 @@ public class TbAwsLambdaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(data) .build(); @@ -208,7 +208,7 @@ public class TbAwsLambdaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); InvokeRequest request = createInvokeRequest(msg); @@ -251,7 +251,7 @@ public class TbAwsLambdaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); InvokeRequest request = createInvokeRequest(msg); @@ -292,7 +292,7 @@ public class TbAwsLambdaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); InvokeRequest request = createInvokeRequest(msg); @@ -333,7 +333,7 @@ public class TbAwsLambdaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); InvokeRequest request = createInvokeRequest(msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java index 8fc649d10c..e085857f3d 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java @@ -108,7 +108,7 @@ class TbSnsNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); node.onMsg(ctxMock, msg); @@ -151,7 +151,7 @@ class TbSnsNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java index 60785d409e..3da7f3d190 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java @@ -110,7 +110,7 @@ class TbSqsNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); node.onMsg(ctxMock, msg); @@ -151,7 +151,7 @@ class TbSqsNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); node.onMsg(ctxMock, msg); @@ -199,7 +199,7 @@ class TbSqsNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -239,7 +239,7 @@ class TbSqsNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java index 5d40328ae4..cd5498c5d8 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java @@ -193,7 +193,7 @@ public class TbMsgGeneratorNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg tickMsg = TbMsg.newMsg() .type(TbMsgType.GENERATOR_NODE_SELF_MSG) .originator(RULE_NODE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); given(ctxMock.newMsg(null, TbMsgType.GENERATOR_NODE_SELF_MSG, RULE_NODE_ID, null, TbMsgMetaData.EMPTY, TbMsg.EMPTY_STRING)).willReturn(tickMsg); @@ -211,7 +211,7 @@ public class TbMsgGeneratorNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg firstMsg = TbMsg.newMsg() .type(TbMsg.EMPTY_STRING) .originator(RULE_NODE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); given(ctxMock.newMsg(null, TbMsg.EMPTY_STRING, RULE_NODE_ID, null, TbMsgMetaData.EMPTY, TbMsg.EMPTY_JSON_OBJECT)).willReturn(firstMsg); @@ -221,7 +221,7 @@ public class TbMsgGeneratorNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg generatedMsg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(RULE_NODE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data("{ \"temp\": 42, \"humidity\": 77 }") .build(); given(scriptEngineMock.executeGenerateAsync(any())).willReturn(Futures.immediateFuture(generatedMsg)); @@ -230,7 +230,7 @@ public class TbMsgGeneratorNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg prevMsg = TbMsg.newMsg() .type(generatedMsg.getType()) .originator(RULE_NODE_ID) - .metaData(generatedMsg.getMetaData().copy()) + .copyMetaData(generatedMsg.getMetaData()) .data(generatedMsg.getData()) .build(); given(ctxMock.newMsg(null, generatedMsg.getType(), RULE_NODE_ID, null, generatedMsg.getMetaData(), generatedMsg.getData())).willReturn(prevMsg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java index e84850498d..602983398f 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java @@ -88,11 +88,9 @@ public class TbMsgPushToEdgeNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(TbMsg.EMPTY_JSON_OBJECT) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -116,11 +114,9 @@ public class TbMsgPushToEdgeNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.ATTRIBUTES_UPDATED) .originator(userId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(TbMsg.EMPTY_JSON_OBJECT) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -154,11 +150,9 @@ public class TbMsgPushToEdgeNodeTest { TbMsg msg = TbMsg.newMsg() .type(event) .originator(new EdgeId(UUID.randomUUID())) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data("{\"lastConnectTs\":1}") - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java index eb99770537..15519e18ee 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java @@ -121,7 +121,7 @@ class TbAssetTypeSwitchNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .callback(callback) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java index 012303278f..0068289080 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java @@ -177,7 +177,7 @@ class TbCheckAlarmStatusNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java index 377c0b69e7..9ecac1a271 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java @@ -47,7 +47,7 @@ class TbCheckMessageNodeTest { private static final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); @@ -204,7 +204,7 @@ class TbCheckMessageNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(data) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java index 9ddf70b9dc..72a78b73a0 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java @@ -69,7 +69,7 @@ class TbCheckRelationNodeTest extends AbstractRuleNodeUpgradeTest { private final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(ORIGINATOR_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java index 64559c5125..31bddccb21 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java @@ -121,7 +121,7 @@ class TbDeviceTypeSwitchNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .callback(callback) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java index e6d04d6af7..79bd3fa710 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java @@ -62,7 +62,7 @@ public class TbJsFilterNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(null) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(TbMsg.EMPTY_JSON_OBJECT) .ruleChainId(ruleChainId) @@ -82,7 +82,7 @@ public class TbJsFilterNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(null) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data(TbMsg.EMPTY_JSON_OBJECT) .ruleChainId(ruleChainId) @@ -102,7 +102,7 @@ public class TbJsFilterNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(null) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data(TbMsg.EMPTY_JSON_OBJECT) .ruleChainId(ruleChainId) diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java index 981ce15a5f..74cd7e4f4f 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java @@ -62,7 +62,7 @@ public class TbJsSwitchNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(null) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data(rawJson) .ruleChainId(ruleChainId) diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java index 4a6b6830f5..2d9cf75e22 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java @@ -100,7 +100,7 @@ class TbMsgTypeFilterNodeTest { return TbMsg.newMsg() .type(msgType) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java index 21f6d94829..1d8bb285af 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java @@ -92,7 +92,7 @@ class TbMsgTypeSwitchNodeTest { return TbMsg.newMsg() .type(msgType) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java index 3246535e15..378e5d53bf 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java @@ -99,7 +99,7 @@ class TbOriginatorTypeFilterNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java index acde991b6e..4782c1bdee 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java @@ -93,7 +93,7 @@ class TbOriginatorTypeSwitchNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java index dc166a775b..f712a607d0 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java @@ -70,7 +70,7 @@ public class TbAckNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java index d8f5d3aa24..8c3c72fb2d 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java @@ -90,7 +90,7 @@ public class TbCheckpointNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -109,7 +109,7 @@ public class TbCheckpointNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java index f294f7b7da..4457b3c671 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java @@ -303,7 +303,7 @@ public class TbRuleChainInputNodeTest extends AbstractRuleNodeUpgradeTest { return TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java index aa6e9aeb6f..49d24f579f 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java @@ -77,7 +77,7 @@ public class TbRuleChainOutputNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java index dcf087af13..49fc03f784 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java @@ -121,7 +121,7 @@ class TbPubSubNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); node.onMsg(ctxMock, msg); @@ -174,7 +174,7 @@ class TbPubSubNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -210,7 +210,7 @@ class TbPubSubNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -245,7 +245,7 @@ class TbPubSubNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java index 997c9dd7fd..872225243b 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java @@ -167,7 +167,7 @@ class TbGpsGeofencingActionNodeTest extends AbstractRuleNodeUpgradeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(data) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java index 1e3878e015..9a7a79b9ad 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java @@ -451,7 +451,7 @@ class TbGpsGeofencingFilterNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(data) .build(); } @@ -460,7 +460,7 @@ class TbGpsGeofencingFilterNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java index 4713f0cfd9..1d7635476e 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java @@ -191,7 +191,7 @@ public class TbKafkaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -220,7 +220,7 @@ public class TbKafkaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -245,7 +245,7 @@ public class TbKafkaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); String topic = TbNodeUtils.processPattern(topicPattern, msg); @@ -296,7 +296,7 @@ public class TbKafkaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -326,7 +326,7 @@ public class TbKafkaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -359,7 +359,7 @@ public class TbKafkaNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java index eaa0d00a25..86d90ec9c0 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java @@ -106,7 +106,7 @@ public class TbMsgToEmailNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(md.copy()) + .copyMetaData(md) .data(msgDataStr) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java index 1a8e8179a9..ae313822d7 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java @@ -176,7 +176,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(msgNode.toString()) .build(); @@ -189,7 +189,7 @@ public class TbMathNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(msgNode.toString()) .build(); @@ -241,7 +241,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", arg1).put("b", arg2).toString()) .build(); @@ -309,7 +309,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", arg1).toString()) .build(); @@ -337,7 +337,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString()) .build(); @@ -365,7 +365,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString()) .build(); @@ -394,7 +394,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().toString()) .build(); @@ -427,7 +427,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 5).toString()) .build(); @@ -454,7 +454,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 5).toString()) .build(); @@ -481,7 +481,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 5).toString()) .build(); @@ -512,7 +512,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 5).toString()) .build(); when(telemetryService.saveAndNotify(any(), any(), any(TsKvEntry.class))) @@ -542,7 +542,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 5).toString()) .build(); when(telemetryService.saveAndNotify(any(), any(), any(TsKvEntry.class))) @@ -578,7 +578,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 10).toString()) .build(); @@ -603,7 +603,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 10).toString()) .build(); node.onMsg(ctx, msg); @@ -623,7 +623,7 @@ public class TbMathNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); node.onMsg(ctx, msg); @@ -648,7 +648,7 @@ public class TbMathNodeTest { .mapToObj(x -> TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originatorSlow) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString()) .build()) .toList(); @@ -656,7 +656,7 @@ public class TbMathNodeTest { .mapToObj(x -> TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originatorFast) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString()) .build()) .toList(); @@ -728,7 +728,7 @@ public class TbMathNodeTest { .mapToObj(x -> TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originatorSlow) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.newObjectNode().put("a", 2).put("b", 2).toString()) .build()) .collect(Collectors.toList()); @@ -806,7 +806,7 @@ public class TbMathNodeTest { .onMsg(ctxNode.getLeft(), TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data("{\"a\":2,\"b\":2}") .build()))); ctxNodes.forEach(ctxNode -> verify(ctxNode.getRight(), timeout(TIMEOUT)).onMsg(eq(ctxNode.getLeft()), any())); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java index bfb2b46037..823b02fe59 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java @@ -172,7 +172,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -192,7 +192,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); @@ -213,7 +213,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); @@ -242,7 +242,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -277,7 +277,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -312,7 +312,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -351,7 +351,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var firstMsg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(firstMsgMetaData.copy()) + .copyMetaData(firstMsgMetaData) .data(msgData) .build(); @@ -382,7 +382,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var secondMsg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(secondMsgMetaData.copy()) + .copyMetaData(secondMsgMetaData) .data(msgData) .build(); @@ -418,7 +418,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -451,7 +451,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -488,7 +488,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -517,7 +517,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -547,7 +547,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -577,7 +577,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); @@ -625,7 +625,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { return TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); }).toList(); @@ -675,7 +675,7 @@ public class CalculateDeltaNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(msgData) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java index c11dcfd749..ecb9ab80ee 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java @@ -176,7 +176,7 @@ public class TbFetchDeviceCredentialsNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .callback(callbackMock) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java index 1f5770bf52..22144ff32e 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java @@ -249,7 +249,7 @@ public class TbGetAttributesNodeTest extends AbstractRuleNodeUpgradeTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(ORIGINATOR_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); @@ -350,7 +350,7 @@ public class TbGetAttributesNodeTest extends AbstractRuleNodeUpgradeTest { return TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(entityId) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(JacksonUtil.toString(msgData)) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java index c5ce45a996..e8e0b42a76 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java @@ -213,7 +213,7 @@ public class TbGetCustomerAttributeNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); @@ -233,7 +233,7 @@ public class TbGetCustomerAttributeNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(userId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); @@ -482,7 +482,7 @@ public class TbGetCustomerAttributeNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java index 31cb6a7083..47c78bc106 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java @@ -162,7 +162,7 @@ public class TbGetCustomerDetailsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); @@ -466,7 +466,7 @@ public class TbGetCustomerDetailsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java index fb21fe3737..212fa7993c 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java @@ -118,7 +118,7 @@ public class TbGetDeviceAttrNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java index 75a0bf4868..54da7e6e78 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java @@ -138,7 +138,7 @@ public class TbGetOriginatorFieldsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); @@ -172,7 +172,7 @@ public class TbGetOriginatorFieldsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); @@ -219,7 +219,7 @@ public class TbGetOriginatorFieldsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); @@ -267,7 +267,7 @@ public class TbGetOriginatorFieldsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); @@ -320,7 +320,7 @@ public class TbGetOriginatorFieldsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); @@ -383,7 +383,7 @@ public class TbGetOriginatorFieldsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(new DashboardId(UUID.randomUUID())) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java index 83a9d4afbf..9ca0d64307 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java @@ -226,7 +226,7 @@ public class TbGetRelatedAttributeNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); @@ -600,7 +600,7 @@ public class TbGetRelatedAttributeNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java index 69d1200746..f2f4f572dc 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java @@ -185,7 +185,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); assertThatThrownBy(() -> node.onMsg(ctxMock, msg)) @@ -213,7 +213,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data("{\"msgEndInterval\":\"" + endTs + "\"}") .build(); node.onMsg(ctxMock, msg); @@ -240,7 +240,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -269,7 +269,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data("{\"msgTsKey\":\"pressure\"}") .build(); node.onMsg(ctxMock, msg); @@ -299,7 +299,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -334,7 +334,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -379,7 +379,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -420,7 +420,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data("{\"msgStartInterval\":\"start\"}") .build(); assertThatThrownBy(() -> node.onMsg(ctxMock, msg)).isInstanceOf(IllegalArgumentException.class).hasMessage(errorMsg); @@ -454,7 +454,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -492,7 +492,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java index 5ad0163a7c..7dd69e051e 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java @@ -193,7 +193,7 @@ public class TbGetTenantAttributeNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); @@ -406,7 +406,7 @@ public class TbGetTenantAttributeNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java index 7cf9ddcdc8..4dc37c824e 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java @@ -132,7 +132,7 @@ public class TbGetTenantDetailsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); @@ -297,7 +297,7 @@ public class TbGetTenantDetailsNodeTest { msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DUMMY_DEVICE_ORIGINATOR) - .metaData(msgMetaData.copy()) + .copyMetaData(msgMetaData) .data(msgData) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java index aa6700dd20..0cd8308ded 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java @@ -286,7 +286,7 @@ public class TbMqttNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); mqttNode.onMsg(ctxMock, msg); @@ -330,7 +330,7 @@ public class TbMqttNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data("\"string\"") .build(); mqttNode.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java index 897a332c95..99cec83cfc 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java @@ -97,8 +97,7 @@ public class DeviceStateTest { String data = invocationOnMock.getArgument(invocationOnMock.getArguments().length - 1); return TbMsg.newMsg() .type(type) - .originator(null) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(data) .build(); }); @@ -115,7 +114,7 @@ public class DeviceStateTest { TbMsg attributeUpdateMsg = TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data("{ \"enabled\": false }") .build(); @@ -128,7 +127,7 @@ public class DeviceStateTest { deviceState.process(ctx, TbMsg.newMsg() .type(TbMsgType.ALARM_CLEAR) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.toString(alarm)) .build()); reset(ctx); @@ -137,7 +136,7 @@ public class DeviceStateTest { deviceState.process(ctx, TbMsg.newMsg() .type(TbMsgType.ATTRIBUTES_DELETED) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(deletedAttributes) .build()); verify(ctx, never()).enqueueForTellNext(any(), anyString()); @@ -152,7 +151,7 @@ public class DeviceStateTest { TbMsg attributeUpdateMsg = TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data("{ \"enabled\": false }") .build(); @@ -164,14 +163,14 @@ public class DeviceStateTest { deviceState.process(ctx, TbMsg.newMsg() .type(TbMsgType.ALARM_CLEAR) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.toString(alarm)) .build()); TbMsg alarmDeleteNotification = TbMsg.newMsg() .type(TbMsgType.ALARM_DELETE) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(JacksonUtil.toString(alarm)) .build(); assertDoesNotThrow(() -> { diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java index 01e42f042e..876b75ecc0 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java @@ -130,7 +130,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type("123456789") .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) .build(); @@ -154,11 +154,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); verify(ctx).tellSuccess(msg); @@ -213,7 +211,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())).thenReturn(theMsg); @@ -223,11 +221,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); verify(ctx).tellSuccess(msg); @@ -237,7 +233,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg2 = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data("2") .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())).thenReturn(theMsg2); @@ -248,11 +244,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg2 = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg2); verify(ctx).tellSuccess(msg2); @@ -313,7 +307,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())).thenReturn(theMsg); @@ -323,11 +317,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); verify(ctx).tellSuccess(msg); @@ -337,7 +329,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg2 = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())).thenReturn(theMsg2); @@ -361,11 +353,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg2 = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg2); verify(ctx).tellSuccess(msg2); @@ -443,7 +433,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); Mockito.when(ctx.newMsg(Mockito.any(), Mockito.any(TbMsgType.class), Mockito.any(), Mockito.any(), Mockito.any(), Mockito.anyString())) @@ -454,11 +444,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -543,7 +531,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -554,11 +542,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -625,7 +611,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -636,11 +622,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -733,7 +717,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -744,11 +728,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -766,11 +748,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg2 = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg2); @@ -878,7 +858,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -889,11 +869,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -911,11 +889,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg2 = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg2); @@ -1008,7 +984,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1019,11 +995,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -1035,11 +1009,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg2 = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg2); @@ -1145,7 +1117,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1156,11 +1128,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -1172,11 +1142,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg2 = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg2); @@ -1261,7 +1229,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1272,11 +1240,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -1294,11 +1260,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg2 = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg2); @@ -1379,7 +1343,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1390,11 +1354,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -1474,7 +1436,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1485,11 +1447,10 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) + .build(); // Mockito.reset(ctx); @@ -1583,7 +1544,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); @@ -1592,11 +1553,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -1674,7 +1633,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1685,11 +1644,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -1760,7 +1717,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1771,11 +1728,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -1848,7 +1803,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { .thenReturn(device); Mockito.when(attributesService.find(eq(tenantId), eq(deviceId), Mockito.any(AttributeScope.class), Mockito.anySet())) .thenReturn(listListenableFutureWithLess); - Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.any(AttributeScope.class), Mockito.anyString())) + Mockito.when(attributesService.find(eq(tenantId), eq(customerId), Mockito.any(AttributeScope.class), Mockito.anyString())) .thenReturn(emptyOptionalFuture); Mockito.when(attributesService.find(eq(tenantId), eq(tenantId), eq(AttributeScope.SERVER_SCOPE), Mockito.anyString())) .thenReturn(optionalListenableFutureWithLess); @@ -1856,7 +1811,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1867,11 +1822,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -1954,7 +1907,7 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg theMsg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_STRING) .build(); when(ctx.newMsg(any(), any(TbMsgType.class), any(), any(), any(), Mockito.anyString())) @@ -1965,11 +1918,9 @@ public class TbDeviceProfileNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .dataType(TbMsgDataType.JSON) .data(JacksonUtil.toString(data)) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java index 914605a8d4..cd7de994b5 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java @@ -150,7 +150,7 @@ public class TbRabbitMqNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); node.onMsg(ctxMock, msg); @@ -186,7 +186,7 @@ public class TbRabbitMqNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -214,7 +214,7 @@ public class TbRabbitMqNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java index be4f3488ec..b42fa8662f 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java @@ -143,13 +143,13 @@ public class TbHttpClientTest { var msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(new DeviceId(EntityId.NULL_UUID)) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); var successMsg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(msg.getOriginator()) - .metaData(msg.getMetaData().copy()) + .copyMetaData(msg.getMetaData()) .data(msg.getData()) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java index d94981cff3..9f5834cd46 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java @@ -145,7 +145,7 @@ public class TbRestApiCallNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data(TbMsg.EMPTY_JSON_OBJECT) .ruleChainId(ruleChainId) @@ -214,7 +214,7 @@ public class TbRestApiCallNodeTest extends AbstractRuleNodeUpgradeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(originator) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data(TbMsg.EMPTY_JSON_OBJECT) .ruleChainId(ruleChainId) diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java index e7613a11cf..6bf34de3b1 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java @@ -92,7 +92,7 @@ public class TbSendRestApiCallReplyNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.REST_API_REQUEST) .originator(DEVICE_ID) - .metaData(new TbMsgMetaData(metadata).copy()) + .copyMetaData(new TbMsgMetaData(metadata)) .data(data) .build(); @@ -117,7 +117,7 @@ public class TbSendRestApiCallReplyNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.REST_API_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java index 61e2b45b42..11a29c67ba 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java @@ -95,11 +95,9 @@ public class TbSendRPCReplyNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(getDefaultMetadata().copy()) + .copyMetaData(getDefaultMetadata()) .dataType(TbMsgDataType.JSON) .data(DUMMY_DATA) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -121,11 +119,9 @@ public class TbSendRPCReplyNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(defaultMetadata.copy()) + .copyMetaData(defaultMetadata) .dataType(TbMsgDataType.JSON) .data(DUMMY_DATA) - .ruleChainId(null) - .ruleNodeId(null) .build(); node.onMsg(ctx, msg); @@ -141,7 +137,7 @@ public class TbSendRPCReplyNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); @@ -160,7 +156,7 @@ public class TbSendRPCReplyNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(TbMsg.EMPTY_STRING) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java index a22554fd56..4aa38b230a 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java @@ -110,7 +110,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(msgMetadata.copy()) + .copyMetaData(msgMetadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -136,7 +136,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -162,7 +162,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.TO_SERVER_RPC_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -188,7 +188,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.TO_SERVER_RPC_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(data) .build(); node.onMsg(ctxMock, msg); @@ -208,7 +208,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -228,7 +228,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -248,7 +248,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -268,7 +268,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -288,7 +288,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -308,7 +308,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -328,7 +328,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -348,7 +348,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -366,7 +366,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(msgType) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -390,7 +390,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -419,7 +419,7 @@ public class TbSendRPCRequestNodeTest { TbMsg outMsg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); @@ -439,7 +439,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -453,7 +453,7 @@ public class TbSendRPCRequestNodeTest { TbMsg outMsg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); @@ -472,7 +472,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(MSG_DATA) .build(); node.onMsg(ctxMock, msg); @@ -489,7 +489,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(entityId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); node.onMsg(ctxMock, msg); @@ -507,7 +507,7 @@ public class TbSendRPCRequestNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data("{\"" + key + "\": \"value\"}") .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java index 470a397ea4..3822ee7d5f 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java @@ -167,7 +167,7 @@ class TbMsgAttributesNodeTest extends AbstractRuleNodeUpgradeTest { var testTbMsg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(md.copy()) + .copyMetaData(md) .data(TbMsg.EMPTY_STRING) .build(); List testAttrList = List.of(new BaseAttributeKvEntry(0L, new StringDataEntry("testKey", "testValue"))); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java index 80259b34c0..0714e13473 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java @@ -142,7 +142,7 @@ public class TbMsgDeleteAttributesNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(deviceId) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .callback(callback) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java index 3bd7a67794..af895d6f52 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java @@ -99,7 +99,7 @@ public class TbMsgTimeseriesNodeTest { TbMsg msg = TbMsg.newMsg() .type(msgType) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_ARRAY) .build(); node.onMsg(ctxMock, msg); @@ -130,7 +130,7 @@ public class TbMsgTimeseriesNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(data) .build(); @@ -172,7 +172,7 @@ public class TbMsgTimeseriesNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(new TbMsgMetaData(metadata).copy()) + .copyMetaData(new TbMsgMetaData(metadata)) .data(data) .build(); @@ -215,7 +215,7 @@ public class TbMsgTimeseriesNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metadata.copy()) + .copyMetaData(metadata) .data(data) .build(); node.onMsg(ctxMock, msg); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java index 851179bc04..2a0e0b73f7 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java @@ -179,7 +179,7 @@ public class TbChangeOriginatorNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); TbMsg expectedMsg = msg.transform() @@ -209,7 +209,7 @@ public class TbChangeOriginatorNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(ASSET_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); TbMsg expectedMsg = msg.transform() @@ -236,7 +236,7 @@ public class TbChangeOriginatorNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(ASSET_ID) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); @@ -275,7 +275,7 @@ public class TbChangeOriginatorNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.ALARM) .originator(alarmId) - .metaData(TbMsgMetaData.EMPTY.copy()) + .copyMetaData(TbMsgMetaData.EMPTY) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); TbMsg expectedMsg = msg.transform() @@ -308,7 +308,7 @@ public class TbChangeOriginatorNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(data) .build(); TbMsg expectedMsg = msg.transform() @@ -351,7 +351,7 @@ public class TbChangeOriginatorNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(DEVICE_ID) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(TbMsg.EMPTY_JSON_OBJECT) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java index 427181c5af..3e214d534d 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java @@ -199,7 +199,7 @@ public class TbCopyKeysNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(new TbMsgMetaData(mdMap).copy()) + .copyMetaData(new TbMsgMetaData(mdMap)) .data(data) .callback(callback) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java index 93b34182a8..036dc5440b 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java @@ -176,7 +176,7 @@ public class TbDeleteKeysNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(new TbMsgMetaData(mdMap).copy()) + .copyMetaData(new TbMsgMetaData(mdMap)) .data(data) .callback(callback) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java index 298df82d2a..ab8c9a44ba 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java @@ -174,7 +174,7 @@ public class TbJsonPathNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(new TbMsgMetaData(mdMap).copy()) + .copyMetaData(new TbMsgMetaData(mdMap)) .data(data) .callback(callback) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java index 84b648823f..91dc20bd9a 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java @@ -106,7 +106,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest { return TbMsg.newMsg() .type(type) .originator(originator) - .metaData(metaData.copy().copy()) + .copyMetaData(metaData.copy()) .data(data) .build(); }).when(ctx).newMsg(isNull(), eq(TbMsgType.DEDUPLICATION_TIMEOUT_SELF_MSG), nullable(EntityId.class), any(TbMsgMetaData.class), any(String.class)); @@ -461,7 +461,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest { .queueName(DataConstants.MAIN_QUEUE_NAME) .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(deviceId) - .metaData(metaData.copy()) + .copyMetaData(metaData) .data(JacksonUtil.toString(dataNode)) .build(); } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java index 61851945c0..0c7f291db1 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java @@ -191,7 +191,7 @@ public class TbRenameKeysNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(new TbMsgMetaData(mdMap).copy()) + .copyMetaData(new TbMsgMetaData(mdMap)) .data(data) .callback(callback) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java index b811934718..895ae96db8 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java @@ -135,7 +135,7 @@ public class TbSplitArrayMsgNodeTest { return TbMsg.newMsg() .type(TbMsgType.POST_ATTRIBUTES_REQUEST) .originator(entityId) - .metaData(new TbMsgMetaData(mdMap).copy()) + .copyMetaData(new TbMsgMetaData(mdMap)) .data(data) .callback(callback) .build(); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java index 094cc4ac18..72f893aa86 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java @@ -64,7 +64,7 @@ public class TbTransformMsgNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(null) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data(rawJson) .ruleChainId(ruleChainId) @@ -73,7 +73,7 @@ public class TbTransformMsgNodeTest { TbMsg transformedMsg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(null) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data("{new}") .ruleChainId(ruleChainId) @@ -100,7 +100,7 @@ public class TbTransformMsgNodeTest { TbMsg msg = TbMsg.newMsg() .type(TbMsgType.POST_TELEMETRY_REQUEST) .originator(null) - .metaData(metaData.copy()) + .copyMetaData(metaData) .dataType(TbMsgDataType.JSON) .data(rawJson) .ruleChainId(ruleChainId)