tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

TbMsg: add resetRuleNodeId and copyMetaData

pull/12256/head
ViacheslavKlimov 2 years ago
parent
1b6256a9e8
commit
ac61d7c526
101 changed files with 330 additions and 388 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
  2. 4
      application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
  3. 2
      application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
  4. 3
      application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
  5. 2
      application/src/main/java/org/thingsboard/server/controller/RuleEngineController.java
  6. 2
      application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
  7. 4
      application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
  8. 2
      application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
  9. 2
      application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
  10. 2
      application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java
  11. 9
      application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java
  12. 2
      application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
  13. 2
      application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbCoreDeviceRpcService.java
  14. 2
      application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java
  15. 2
      application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
  16. 2
      application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
  17. 6
      application/src/test/java/org/thingsboard/server/actors/rule/DefaultTbContextTest.java
  18. 10
      application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
  19. 2
      application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
  20. 4
      application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java
  21. 2
      application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java
  22. 8
      application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
  23. 2
      application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
  24. 2
      application/src/test/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcServiceTest.java
  25. 4
      application/src/test/java/org/thingsboard/server/service/ruleengine/DefaultRuleEngineCallServiceTest.java
  26. 2
      application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java
  27. 11
      common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
  28. 3
      common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
  29. 10
      rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/util/TbNodeUtilsTest.java
  30. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
  31. 4
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java
  32. 2
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java
  33. 6
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java
  34. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
  35. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeTest.java
  36. 12
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNodeTest.java
  37. 14
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeTest.java
  38. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
  39. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
  40. 6
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java
  41. 6
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbLogNodeTest.java
  42. 6
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgCountNodeTest.java
  43. 10
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeTest.java
  44. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
  45. 10
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java
  46. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java
  47. 8
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java
  48. 8
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java
  49. 12
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
  50. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
  51. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
  52. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java
  53. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
  54. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
  55. 6
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
  56. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
  57. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java
  58. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java
  59. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java
  60. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java
  61. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java
  62. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
  63. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
  64. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java
  65. 8
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java
  66. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java
  67. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java
  68. 12
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
  69. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java
  70. 38
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java
  71. 32
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
  72. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
  73. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java
  74. 6
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java
  75. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
  76. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
  77. 12
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
  78. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
  79. 20
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
  80. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
  81. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
  82. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java
  83. 15
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java
  84. 143
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java
  85. 6
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java
  86. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java
  87. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
  88. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java
  89. 12
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java
  90. 40
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java
  91. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java
  92. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
  93. 8
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java
  94. 12
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
  95. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java
  96. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java
  97. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java
  98. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
  99. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java
  100. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java

12
application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
View File

@ -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();
}

4
application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActorMessageProcessor.java
View File

@ -219,7 +219,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
targetCtx = firstNode;
msg = msg.copy()
.ruleChainId(entityId)
.ruleNodeId(null)
.resetRuleNodeId()
.build();
} else {
targetCtx = nodeActors.get(targetId);
@ -356,7 +356,7 @@ public class RuleChainActorMessageProcessor extends ComponentMsgProcessor<RuleCh
putToQueue(tpi, msg.copy()
.id(UUID.randomUUID())
.ruleChainId(new RuleChainId(target.getId()))
.ruleNodeId(null)
.resetRuleNodeId()
.build(), callbackWrapper);
break;
}

2
application/src/main/java/org/thingsboard/server/controller/RpcV2Controller.java
View File

@ -242,7 +242,7 @@ public class RpcV2Controller extends AbstractRpcController {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.RPC_DELETED)
.originator(rpc.getDeviceId())
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(JacksonUtil.toString(rpc))
.build();
tbClusterService.pushMsgToRuleEngine(getTenantId(), rpc.getDeviceId(), msg, null);

3
application/src/main/java/org/thingsboard/server/controller/RuleChainController.java
View File

@ -386,8 +386,7 @@ public class RuleChainController extends BaseController {
}
TbMsg inMsg = TbMsg.newMsg()
.type(msgType)
.originator(null)
.metaData(new TbMsgMetaData(metadata).copy())
.copyMetaData(new TbMsgMetaData(metadata))
.dataType(TbMsgDataType.JSON)
.data(data)
.build();

2
application/src/main/java/org/thingsboard/server/controller/RuleEngineController.java
View File

@ -174,7 +174,7 @@ public class RuleEngineController extends BaseController {
.type(TbMsgType.REST_API_REQUEST)
.originator(entityId)
.customerId(currentUser.getCustomerId())
.metaData(new TbMsgMetaData(metaData).copy())
.copyMetaData(new TbMsgMetaData(metaData))
.data(requestBody)
.build();
ruleEngineCallService.processRestApiCallToRuleEngine(currentUser.getTenantId(), requestId, msg, queueName != null,

2
application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
View File

@ -176,7 +176,7 @@ public class EntityActionService {
.type(msgType.get())
.originator(entityId)
.customerId(customerId)
.metaData(metaData.copy())
.copyMetaData(metaData)
.dataType(TbMsgDataType.JSON)
.data(JacksonUtil.toString(entityNode))
.build();

4
application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java
View File

@ -257,7 +257,7 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
.type(type)
.originator(device.getId())
.customerId(device.getCustomerId())
.metaData(createTbMsgMetaData(device).copy())
.copyMetaData(createTbMsgMetaData(device))
.data(JacksonUtil.toString(entityNode))
.build();
sendToRuleEngine(device.getTenantId(), msg, null);
@ -273,7 +273,7 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
.type(TbMsgType.ENTITY_CREATED)
.originator(device.getId())
.customerId(device.getCustomerId())
.metaData(createTbMsgMetaData(device).copy())
.copyMetaData(createTbMsgMetaData(device))
.data(JacksonUtil.OBJECT_MAPPER.writeValueAsString(entityNode))
.build();
sendToRuleEngine(device.getTenantId(), msg, null);

2
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
View File

@ -578,7 +578,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
TbMsg tbMsg = TbMsg.newMsg()
.type(msgType)
.originator(edgeId)
.metaData(md.copy())
.copyMetaData(md)
.dataType(TbMsgDataType.JSON)
.data(data)
.build();

2
application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java
View File

@ -347,7 +347,7 @@ public abstract class BaseEdgeProcessor {
.type(msgType)
.originator(entityId)
.customerId(customerId)
.metaData(metaData.copy())
.copyMetaData(metaData)
.dataType(TbMsgDataType.JSON)
.data(msgData)
.build();

2
application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java
View File

@ -193,7 +193,7 @@ public abstract class DeviceEdgeProcessor extends BaseDeviceProcessor implements
TbMsg tbMsg = TbMsg.newMsg()
.type(TbMsgType.TO_SERVER_RPC_REQUEST)
.originator(deviceId)
.metaData(metaData.copy())
.copyMetaData(metaData)
.dataType(TbMsgDataType.JSON)
.data(JacksonUtil.toString(data))
.build();

9
application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/telemetry/BaseTelemetryProcessor.java
View File

@ -213,10 +213,9 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(entityId)
.customerId(customerId)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(gson.toJson(json))
.ruleChainId(defaultQueueAndRuleChain.getValue())
.ruleNodeId(null)
.build();
edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
@Override
@ -266,10 +265,9 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
.type(TbMsgType.POST_ATTRIBUTES_REQUEST)
.originator(entityId)
.customerId(customerId)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(gson.toJson(json))
.ruleChainId(defaultQueueAndRuleChain.getValue())
.ruleNodeId(null)
.build();
edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
@Override
@ -304,10 +302,9 @@ public abstract class BaseTelemetryProcessor extends BaseEdgeProcessor {
.type(TbMsgType.ATTRIBUTES_UPDATED)
.originator(entityId)
.customerId(customerId)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(gson.toJson(json))
.ruleChainId(defaultQueueAndRuleChain.getValue())
.ruleNodeId(null)
.build();
edgeCtx.getClusterService().pushMsgToRuleEngine(tenantId, tbMsg.getOriginator(), tbMsg, new TbQueueCallback() {
@Override

2
application/src/main/java/org/thingsboard/server/service/entitiy/EntityStateSourcingListener.java
View File

@ -254,7 +254,7 @@ public class EntityStateSourcingListener {
.type(TbMsgType.ENTITY_ASSIGNED_FROM_TENANT)
.originator(assignedDevice.getId())
.customerId(assignedDevice.getCustomerId())
.metaData(getMetaDataForAssignedFrom(currentTenant).copy())
.copyMetaData(getMetaDataForAssignedFrom(currentTenant))
.dataType(TbMsgDataType.JSON)
.data(data)
.build();

2
application/src/main/java/org/thingsboard/server/service/rpc/DefaultTbCoreDeviceRpcService.java
View File

@ -187,7 +187,7 @@ public class DefaultTbCoreDeviceRpcService implements TbCoreDeviceRpcService {
.type(TbMsgType.RPC_CALL_FROM_SERVER_TO_DEVICE)
.originator(msg.getDeviceId())
.customerId(Optional.ofNullable(currentUser).map(User::getCustomerId).orElse(null))
.metaData(metaData.copy())
.copyMetaData(metaData)
.dataType(TbMsgDataType.JSON)
.data(JacksonUtil.toString(entityNode))
.build();

2
application/src/main/java/org/thingsboard/server/service/rpc/TbRpcService.java
View File

@ -66,7 +66,7 @@ public class TbRpcService {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.valueOf("RPC_" + rpc.getStatus().name()))
.originator(rpc.getDeviceId())
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(JacksonUtil.toString(rpc))
.build();
tbClusterService.pushMsgToRuleEngine(tenantId, rpc.getDeviceId(), msg, null);

2
application/src/main/java/org/thingsboard/server/service/state/DefaultDeviceStateService.java
View File

@ -861,7 +861,7 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
.type(msgType)
.originator(stateData.getDeviceId())
.customerId(stateData.getCustomerId())
.metaData(md.copy())
.copyMetaData(md)
.dataType(TbMsgDataType.JSON)
.data(data)
.build();

2
application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View File

@ -366,7 +366,7 @@ public class DefaultTransportApiService implements TransportApiService {
.type(TbMsgType.ENTITY_CREATED)
.originator(deviceId)
.customerId(customerId)
.metaData(metaData.copy())
.copyMetaData(metaData)
.dataType(TbMsgDataType.JSON)
.data(JacksonUtil.toString(entityNode))
.build();

6
application/src/test/java/org/thingsboard/server/actors/rule/DefaultTbContextTest.java
View File

@ -931,7 +931,7 @@ class DefaultTbContextTest {
return TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TENANT_ID)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_STRING)
.callback(callback)
.build();
@ -942,7 +942,7 @@ class DefaultTbContextTest {
.queueName(DataConstants.MAIN_QUEUE_NAME)
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TENANT_ID)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_STRING)
.build();
}
@ -951,7 +951,7 @@ class DefaultTbContextTest {
return TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TENANT_ID)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_STRING)
.build();
}

10
application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
View File

@ -65,7 +65,7 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
TbMsg responseMsg = TbMsg.newMsg()
.type(TbMsgType.REST_API_REQUEST)
.originator(currentUserId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(RESPONSE_BODY)
.build();
mockRestApiCallToRuleEngine(responseMsg);
@ -94,7 +94,7 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
TbMsg responseMsg = TbMsg.newMsg()
.type(TbMsgType.REST_API_REQUEST)
.originator(deviceId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(RESPONSE_BODY)
.build();
mockRestApiCallToRuleEngine(responseMsg);
@ -123,7 +123,7 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
TbMsg responseMsg = TbMsg.newMsg()
.type(TbMsgType.REST_API_REQUEST)
.originator(deviceId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(RESPONSE_BODY)
.build();
mockRestApiCallToRuleEngine(responseMsg);
@ -175,7 +175,7 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
.queueName(DataConstants.HP_QUEUE_NAME)
.type(TbMsgType.REST_API_REQUEST)
.originator(deviceId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(RESPONSE_BODY)
.build();
mockRestApiCallToRuleEngine(responseMsg);
@ -220,7 +220,7 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
.type(TbMsgType.REST_API_REQUEST)
.originator(deviceId)
.customerId(customerId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(RESPONSE_BODY)
.build();
mockRestApiCallToRuleEngine(responseMsg);

2
application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
View File

@ -746,7 +746,7 @@ public class TenantControllerTest extends AbstractControllerTest {
TbMsg tbMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(tenantId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data("{\"test\":1}")
.build();
TransportProtos.ToRuleEngineMsg msg = TransportProtos.ToRuleEngineMsg.newBuilder()

4
application/src/test/java/org/thingsboard/server/rules/flow/AbstractRuleEngineFlowIntegrationTest.java
View File

@ -187,7 +187,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
TbMsg tbMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(device.getId())
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.callback(tbMsgCallback)
.build();
@ -318,7 +318,7 @@ public abstract class AbstractRuleEngineFlowIntegrationTest extends AbstractRule
TbMsg tbMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(device.getId())
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.callback(tbMsgCallback)
.build();

2
application/src/test/java/org/thingsboard/server/rules/lifecycle/AbstractRuleEngineLifecycleIntegrationTest.java
View File

@ -145,7 +145,7 @@ public abstract class AbstractRuleEngineLifecycleIntegrationTest extends Abstrac
TbMsg tbMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(device.getId())
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.callback(tbMsgCallback)
.build();

8
application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
View File

@ -295,7 +295,7 @@ public class DefaultTbClusterServiceTest {
.queueName(DataConstants.HP_QUEUE_NAME)
.type(TbMsgType.REST_API_REQUEST)
.originator(tenantId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
@ -314,7 +314,7 @@ public class DefaultTbClusterServiceTest {
TbMsg requestMsg = TbMsg.newMsg()
.type(TbMsgType.REST_API_REQUEST)
.originator(deviceId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
TbQueueCallback callback = mock(TbQueueCallback.class);
@ -336,7 +336,7 @@ public class DefaultTbClusterServiceTest {
.queueName(DataConstants.HP_QUEUE_NAME)
.type(TbMsgType.REST_API_REQUEST)
.originator(deviceId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
@ -361,7 +361,7 @@ public class DefaultTbClusterServiceTest {
TbMsg requestMsg = TbMsg.newMsg()
.type(TbMsgType.REST_API_REQUEST)
.originator(deviceId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();

2
application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
View File

@ -785,7 +785,7 @@ public class TbRuleEngineQueueConsumerManagerTest {
testMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(new DeviceId(UUID.randomUUID()))
.metaData(new TbMsgMetaData().copy())
.copyMetaData(new TbMsgMetaData())
.data("{}")
.build();
}

2
application/src/test/java/org/thingsboard/server/service/rpc/DefaultTbRuleEngineRpcServiceTest.java
View File

@ -49,7 +49,7 @@ class DefaultTbRuleEngineRpcServiceTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.REST_API_REQUEST)
.originator(deviceId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
var restApiCallResponseMsgProto = TransportProtos.RestApiCallResponseMsgProto.newBuilder()

4
application/src/test/java/org/thingsboard/server/service/ruleengine/DefaultRuleEngineCallServiceTest.java
View File

@ -89,7 +89,7 @@ public class DefaultRuleEngineCallServiceTest {
.queueName(DataConstants.MAIN_QUEUE_NAME)
.type(TbMsgType.REST_API_REQUEST)
.originator(TENANT_ID)
.metaData(new TbMsgMetaData(metaData).copy())
.copyMetaData(new TbMsgMetaData(metaData))
.data("{\"key\":\"value\"}")
.build();
@ -123,7 +123,7 @@ public class DefaultRuleEngineCallServiceTest {
.queueName(DataConstants.MAIN_QUEUE_NAME)
.type(TbMsgType.REST_API_REQUEST)
.originator(TENANT_ID)
.metaData(new TbMsgMetaData(metaData).copy())
.copyMetaData(new TbMsgMetaData(metaData))
.data("{\"key\":\"value\"}")
.build();

2
application/src/test/java/org/thingsboard/server/service/sql/SequentialTimeseriesPersistenceTest.java
View File

@ -134,7 +134,7 @@ public class SequentialTimeseriesPersistenceTest extends AbstractControllerTest
TbMsg tbMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(device.getId())
.metaData(getTbMsgMetadata(device.getName(), ts.get(idx)).copy())
.copyMetaData(getTbMsgMetadata(device.getName(), ts.get(idx)))
.dataType(TbMsgDataType.JSON)
.data(getTbMsgData(msgValue.get(idx)))
.build();

11
common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java
View File

@ -88,7 +88,7 @@ public final class TbMsg implements Serializable {
public TbMsg transform(String queueName) {
return transform()
.queueName(queueName)
.ruleNodeId(null)
.resetRuleNodeId()
.build();
}
@ -415,6 +415,11 @@ public final class TbMsg implements Serializable {
return this;
}
public TbMsgBuilder copyMetaData(TbMsgMetaData metaData) {
this.metaData = metaData.copy();
return this;
}
public TbMsgBuilder dataType(TbMsgDataType dataType) {
this.dataType = dataType;
return this;
@ -435,6 +440,10 @@ public final class TbMsg implements Serializable {
return this;
}
public TbMsgBuilder resetRuleNodeId() {
return ruleNodeId(null);
}
public TbMsgBuilder correlationId(UUID correlationId) {
this.correlationId = correlationId;
return this;

3
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View File

@ -1141,10 +1141,9 @@ public class DefaultTransportService extends TransportActivityManager implements
.type(tbMsgType)
.originator(deviceId)
.customerId(customerId)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(gson.toJson(json))
.ruleChainId(ruleChainId)
.ruleNodeId(null)
.build();
ruleEngineProducerService.sendToRuleEngine(ruleEngineMsgProducer, tenantId, tbMsg, new StatsCallback(callback, ruleEngineProducerStats));
ruleEngineProducerStats.incrementTotal();

10
rule-engine/rule-engine-api/src/test/java/org/thingsboard/rule/engine/api/util/TbNodeUtilsTest.java
View File

@ -47,7 +47,7 @@ public class TbNodeUtilsTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TenantId.SYS_TENANT_ID)
.metaData(md.copy())
.copyMetaData(md)
.data(JacksonUtil.toString(node))
.build();
String result = TbNodeUtils.processPattern(pattern, msg);
@ -66,7 +66,7 @@ public class TbNodeUtilsTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TenantId.SYS_TENANT_ID)
.metaData(md.copy())
.copyMetaData(md)
.data(JacksonUtil.toString(node))
.build();
String result = TbNodeUtils.processPattern(pattern, msg);
@ -85,7 +85,7 @@ public class TbNodeUtilsTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TenantId.SYS_TENANT_ID)
.metaData(md.copy())
.copyMetaData(md)
.data(JacksonUtil.toString(node))
.build();
String result = TbNodeUtils.processPattern(pattern, msg);
@ -111,7 +111,7 @@ public class TbNodeUtilsTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TenantId.SYS_TENANT_ID)
.metaData(md.copy())
.copyMetaData(md)
.data(JacksonUtil.toString(node))
.build();
String result = TbNodeUtils.processPattern(pattern, msg);
@ -137,7 +137,7 @@ public class TbNodeUtilsTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TenantId.SYS_TENANT_ID)
.metaData(md.copy())
.copyMetaData(md)
.data(JacksonUtil.toString(node))
.build();
String result = TbNodeUtils.processPattern(pattern, msg);

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
View File

@ -79,7 +79,7 @@ public class TbMsgCountNode implements TbNode {
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(ctx.getTenantId())
.customerId(msg.getCustomerId())
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(gson.toJson(telemetryJson))
.build();
ctx.enqueueForTellNext(tbMsg, TbNodeConnectionType.SUCCESS);

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java
View File

@ -158,7 +158,7 @@ public class TbMsgDeduplicationNode implements TbNode {
.queueName(queueName)
.type(config.getOutMsgType())
.originator(deduplicationId)
.metaData(getMetadata().copy())
.copyMetaData(getMetadata())
.data(getMergedData(pack))
.build());
} else {
@ -183,7 +183,7 @@ public class TbMsgDeduplicationNode implements TbNode {
.type(resultMsg.getType())
.originator(resultMsg.getOriginator())
.customerId(resultMsg.getCustomerId())
.metaData(resultMsg.getMetaData().copy())
.copyMetaData(resultMsg.getMetaData())
.data(resultMsg.getData())
.build());
}

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java
View File

@ -70,7 +70,7 @@ public class TbMsgDelayNode implements TbNode {
.type(pendingMsg.getType())
.originator(pendingMsg.getOriginator())
.customerId(pendingMsg.getCustomerId())
.metaData(pendingMsg.getMetaData().copy())
.copyMetaData(pendingMsg.getMetaData())
.data(pendingMsg.getData())
.build(),
TbNodeConnectionType.SUCCESS

6
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java
View File

@ -182,7 +182,7 @@ public class TbDeviceProfileNode implements TbNode {
.type(TbMsgType.DEVICE_PROFILE_PERIODIC_SELF_MSG)
.originator(ctx.getTenantId())
.customerId(customerId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
ctx.tellSelf(periodicCheck, TimeUnit.MINUTES.toMillis(1));
@ -212,7 +212,7 @@ public class TbDeviceProfileNode implements TbNode {
ctx.tellSelf(TbMsg.newMsg()
.type(TbMsgType.DEVICE_PROFILE_UPDATE_SELF_MSG)
.originator(ctx.getTenantId())
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(profile.getId().getId().toString())
.build(), 0L);
}
@ -226,7 +226,7 @@ public class TbDeviceProfileNode implements TbNode {
ctx.tellSelf(TbMsg.newMsg()
.type(TbMsgType.DEVICE_UPDATE_SELF_MSG)
.originator(ctx.getTenantId())
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(JacksonUtil.toString(msgData))
.build(), 0L);
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
View File

@ -309,7 +309,7 @@ class TbAssignToCustomerNodeTest extends AbstractRuleNodeUpgradeTest {
return TbMsg.newMsg()
.type(TbMsgType.NA)
.originator(originator)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
}

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeTest.java
View File

@ -94,7 +94,7 @@ class TbClearAlarmNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(msgOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data("{\"temperature\": 50}")
.build();
@ -151,7 +151,7 @@ class TbClearAlarmNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(alarmOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data("{\"temperature\": 50}")
.build();

12
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNodeTest.java
View File

@ -109,7 +109,7 @@ public class TbCopyAttributesToEntityViewNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_ATTRIBUTES_REQUEST)
.originator(DEVICE_ID)
.metaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())).copy())
.copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())))
.data("{\"clientAttribute1\": 100, \"clientAttribute2\": \"value2\"}")
.build();
@ -146,7 +146,7 @@ public class TbCopyAttributesToEntityViewNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(ATTRIBUTES_DELETED)
.originator(DEVICE_ID)
.metaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())).copy())
.copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())))
.data("{\"attributes\": [\"serverAttribute1\"]}")
.build();
@ -180,7 +180,7 @@ public class TbCopyAttributesToEntityViewNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.ATTRIBUTES_DELETED)
.originator(DEVICE_ID)
.metaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SHARED_SCOPE.name())).copy())
.copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SHARED_SCOPE.name())))
.data("{\"attributes\": [\"anotherAttribute\"]}")
.build();
@ -200,7 +200,7 @@ public class TbCopyAttributesToEntityViewNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_ATTRIBUTES_REQUEST)
.originator(DEVICE_ID)
.metaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())).copy())
.copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())))
.data("{\"clientAttribute2\": \"value2\"}")
.build();
@ -235,7 +235,7 @@ public class TbCopyAttributesToEntityViewNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(ATTRIBUTES_DELETED)
.originator(DEVICE_ID)
.metaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())).copy())
.copyMetaData(new TbMsgMetaData(Map.of(DataConstants.SCOPE, AttributeScope.SERVER_SCOPE.name())))
.data("{\"attributes\": [\"serverAttribute1\"]}")
.build();
node.onMsg(ctxMock, msg);
@ -251,7 +251,7 @@ public class TbCopyAttributesToEntityViewNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(msgType)
.originator(DEVICE_ID)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();

14
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeTest.java
View File

@ -166,7 +166,7 @@ class TbCreateAlarmNodeTest {
var incomingMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(msgOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data("{\"temperature\": 50}")
.build();
@ -325,7 +325,7 @@ class TbCreateAlarmNodeTest {
var incomingMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(msgOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data("{\"temperature\": 50, \"alarmType\": \"" + alarmType + "\"}")
.build();
@ -521,7 +521,7 @@ class TbCreateAlarmNodeTest {
var incomingMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(msgOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data("{\"temperature\": 50, \"alarmSeverity\": \"" + newAlarmSeverity.name() + "\"}")
.build();
@ -698,7 +698,7 @@ class TbCreateAlarmNodeTest {
var incomingMsg = TbMsg.newMsg()
.type(TbMsgType.ALARM)
.originator(msgOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data(JacksonUtil.toString(alarmFromIncomingMessage))
.build();
@ -890,7 +890,7 @@ class TbCreateAlarmNodeTest {
var incomingMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(msgOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data(JacksonUtil.toString(alarmFromIncomingMessage))
.build();
@ -1076,7 +1076,7 @@ class TbCreateAlarmNodeTest {
var incomingMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(msgOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data(JacksonUtil.toString(alarmFromIncomingMessage))
.build();
@ -1222,7 +1222,7 @@ class TbCreateAlarmNodeTest {
var incomingMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(msgOriginator)
.metaData(metadata.copy())
.copyMetaData(metadata)
.data("{\"temperature\": 50}")
.build();

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
View File

@ -491,7 +491,7 @@ public class TbCreateRelationNodeTest extends AbstractRuleNodeUpgradeTest {
var entityCreatedMsg = TbMsg.newMsg()
.type(TbMsgType.ENTITY_CREATED)
.originator(entityId)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
mockMethodCallsMap.get(entityType).accept(entity, entityCreatedMsg);
@ -686,7 +686,7 @@ public class TbCreateRelationNodeTest extends AbstractRuleNodeUpgradeTest {
return TbMsg.newMsg()
.type(TbMsgType.NA)
.originator(originator)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
View File

@ -563,7 +563,7 @@ public class TbDeleteRelationNodeTest extends AbstractRuleNodeUpgradeTest {
return TbMsg.newMsg()
.type(TbMsgType.NA)
.originator(originator)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
}

6
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeviceStateNodeTest.java
View File

@ -88,7 +88,7 @@ public class TbDeviceStateNodeTest {
msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(DEVICE_ID)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(JacksonUtil.toString(data))
.build();
}
@ -215,7 +215,7 @@ public class TbDeviceStateNodeTest {
var msg = TbMsg.newMsg()
.type(TbMsgType.ENTITY_CREATED)
.originator(nonDeviceOriginator)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();
@ -250,7 +250,7 @@ public class TbDeviceStateNodeTest {
.ts(msgTs)
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(DEVICE_ID)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_JSON_OBJECT)
.build();

6
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbLogNodeTest.java
View File

@ -53,7 +53,7 @@ public class TbLogNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TenantId.SYS_TENANT_ID)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(data)
.build();
@ -74,7 +74,7 @@ public class TbLogNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TenantId.SYS_TENANT_ID)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data("")
.build();
@ -95,7 +95,7 @@ public class TbLogNodeTest {
TbMsg msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TenantId.SYS_TENANT_ID)
.metaData(metaData.copy())
.copyMetaData(metaData)
.data(null)
.build();

6
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbMsgCountNodeTest.java
View File

@ -66,7 +66,7 @@ public class TbMsgCountNodeTest {
private final TbMsg tickMsg = TbMsg.newMsg()
.type(TbMsgType.MSG_COUNT_SELF_MSG)
.originator(RULE_NODE_ID)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_STRING)
.build();
@ -128,7 +128,7 @@ public class TbMsgCountNodeTest {
var msg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(DEVICE_ID)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(TbMsg.EMPTY_STRING)
.build();
if (msgWithCounterSent.get()) {
@ -155,7 +155,7 @@ public class TbMsgCountNodeTest {
TbMsg expectedMsg = TbMsg.newMsg()
.type(TbMsgType.POST_TELEMETRY_REQUEST)
.originator(TENANT_ID)
.metaData(TbMsgMetaData.EMPTY.copy())
.copyMetaData(TbMsgMetaData.EMPTY)
.data(expectedData)
.build();
assertThat(resultedMsg).usingRecursiveComparison()

10
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbSaveToCustomCassandraTableNodeTest.java
View File

@ -188,7 +188,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_STRING)
.build();
assertThatThrownBy(() -> 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);

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
View File

@ -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();
}

10
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java
View File

@ -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);

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sns/TbSnsNodeTest.java
View File

@ -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);

8
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/sqs/TbSqsNodeTest.java
View File

@ -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);

8
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/debug/TbMsgGeneratorNodeTest.java
View File

@ -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);

12
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNodeTest.java
View File

@ -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);

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
View File

@ -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();

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
View File

@ -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();
}

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckMessageNodeTest.java
View File

@ -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();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
View File

@ -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();

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
View File

@ -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();

6
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
View File

@ -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)

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
View File

@ -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)

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNodeTest.java
View File

@ -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();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNodeTest.java
View File

@ -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();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNodeTest.java
View File

@ -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();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNodeTest.java
View File

@ -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();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbAckNodeTest.java
View File

@ -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);

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
View File

@ -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);

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
View File

@ -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();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNodeTest.java
View File

@ -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);

8
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/gcp/pubsub/TbPubSubNodeTest.java
View File

@ -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);

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeTest.java
View File

@ -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();
}

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingFilterNodeTest.java
View File

@ -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();
}

12
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
View File

@ -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);

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNodeTest.java
View File

@ -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();

38
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/math/TbMathNodeTest.java
View File

@ -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()));

32
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/CalculateDeltaNodeTest.java
View File

@ -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();

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbFetchDeviceCredentialsNodeTest.java
View File

@ -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();

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetAttributesNodeTest.java
View File

@ -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();
}

6
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerAttributeNodeTest.java
View File

@ -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();
}

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
View File

@ -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();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
View File

@ -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);

12
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
View File

@ -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();

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
View File

@ -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();
}

20
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
View File

@ -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);

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
View File

@ -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();
}

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
View File

@ -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();
}

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/mqtt/TbMqttNodeTest.java
View File

@ -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);

15
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/DeviceStateTest.java
View File

@ -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(() -> {

143
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNodeTest.java
View File

@ -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);

6
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rabbitmq/TbRabbitMqNodeTest.java
View File

@ -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);

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbHttpClientTest.java
View File

@ -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();

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
View File

@ -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)

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbSendRestApiCallReplyNodeTest.java
View File

@ -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();

12
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNodeTest.java
View File

@ -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();

40
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNodeTest.java
View File

@ -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();

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNodeTest.java
View File

@ -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<AttributeKvEntry> testAttrList = List.of(new BaseAttributeKvEntry(0L, new StringDataEntry("testKey", "testValue")));

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
View File

@ -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();

8
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNodeTest.java
View File

@ -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);

12
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNodeTest.java
View File

@ -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();

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyKeysNodeTest.java
View File

@ -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();

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNodeTest.java
View File

@ -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();

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbJsonPathNodeTest.java
View File

@ -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();

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
View File

@ -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();
}

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java
View File

@ -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();

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
View File

@ -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();

Some files were not shown because too many files changed in this diff

Write Preview
Loading…
Cancel
Save