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

Fixed stored rule chain json. Added ignore uknown properties for rule node class

pull/11861/head
ShvaykaD 2 years ago
parent
9878fbe803
commit
54a7400611
5 changed files with 33 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      application/src/main/data/json/tenant/device_profile/rule_chain_template.json
  2. 2
      common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
  3. 36
      monitoring/src/main/resources/root_rule_chain.json
  4. 6
      msa/black-box-tests/src/test/resources/MqttRuleNodeTestMetadata.json
  5. 6
      msa/black-box-tests/src/test/resources/RpcResponseRuleChainMetadata.json

14
application/src/main/data/json/tenant/device_profile/rule_chain_template.json
View File

@ -19,7 +19,7 @@
}, },
"type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
"name": "Save Timeseries", "name": "Save Timeseries",
"debugMode": false, "debugStrategy": "DISABLED",
"configuration": { "configuration": {
"defaultTTL": 0 "defaultTTL": 0
} }
@ -31,7 +31,7 @@
}, },
"type": "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode",
"name": "Save Client Attributes", "name": "Save Client Attributes",
"debugMode": false, "debugStrategy": "DISABLED",
"configurationVersion": 2, "configurationVersion": 2,
"configuration": { "configuration": {
"scope": "CLIENT_SCOPE", "scope": "CLIENT_SCOPE",
@ -47,7 +47,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode", "type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode",
"name": "Message Type Switch", "name": "Message Type Switch",
"debugMode": false, "debugStrategy": "DISABLED",
"configuration": { "configuration": {
"version": 0 "version": 0
} }
@ -59,7 +59,7 @@
}, },
"type": "org.thingsboard.rule.engine.action.TbLogNode", "type": "org.thingsboard.rule.engine.action.TbLogNode",
"name": "Log RPC from Device", "name": "Log RPC from Device",
"debugMode": false, "debugStrategy": "DISABLED",
"configuration": { "configuration": {
"scriptLang": "TBEL", "scriptLang": "TBEL",
"jsScript": "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);", "jsScript": "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);",
@ -73,7 +73,7 @@
}, },
"type": "org.thingsboard.rule.engine.action.TbLogNode", "type": "org.thingsboard.rule.engine.action.TbLogNode",
"name": "Log Other", "name": "Log Other",
"debugMode": false, "debugStrategy": "DISABLED",
"configuration": { "configuration": {
"scriptLang": "TBEL", "scriptLang": "TBEL",
"jsScript": "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);", "jsScript": "return '\\nIncoming message:\\n' + JSON.stringify(msg) + '\\nIncoming metadata:\\n' + JSON.stringify(metadata);",
@ -87,7 +87,7 @@
}, },
"type": "org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode", "type": "org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode",
"name": "RPC Call Request", "name": "RPC Call Request",
"debugMode": false, "debugStrategy": "DISABLED",
"configuration": { "configuration": {
"timeoutInSeconds": 60 "timeoutInSeconds": 60
} }
@ -100,7 +100,7 @@
}, },
"type": "org.thingsboard.rule.engine.profile.TbDeviceProfileNode", "type": "org.thingsboard.rule.engine.profile.TbDeviceProfileNode",
"name": "Device Profile Node", "name": "Device Profile Node",
"debugMode": false, "debugStrategy": "DISABLED",
"configuration": { "configuration": {
"persistAlarmRulesState": false, "persistAlarmRulesState": false,
"fetchAlarmRulesStateOnStart": false "fetchAlarmRulesStateOnStart": false

2
common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
View File

@ -16,6 +16,7 @@
package org.thingsboard.server.common.data.rule; package org.thingsboard.server.common.data.rule;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -32,6 +33,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Slf4j @Slf4j
@JsonIgnoreProperties(ignoreUnknown = true)
public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements HasName { public class RuleNode extends BaseDataWithAdditionalInfo<RuleNodeId> implements HasName {
private static final long serialVersionUID = -5656679015121235465L; private static final long serialVersionUID = -5656679015121235465L;

36
monitoring/src/main/resources/root_rule_chain.json
View File

@ -20,7 +20,7 @@
}, },
"type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
"name": "Save Timeseries", "name": "Save Timeseries",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -35,7 +35,7 @@
}, },
"type": "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode",
"name": "Save Attributes", "name": "Save Attributes",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 1, "configurationVersion": 1,
"configuration": { "configuration": {
@ -53,7 +53,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode", "type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode",
"name": "Message Type Switch", "name": "Message Type Switch",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -68,7 +68,7 @@
}, },
"type": "org.thingsboard.rule.engine.action.TbLogNode", "type": "org.thingsboard.rule.engine.action.TbLogNode",
"name": "Log RPC from Device", "name": "Log RPC from Device",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -85,7 +85,7 @@
}, },
"type": "org.thingsboard.rule.engine.action.TbLogNode", "type": "org.thingsboard.rule.engine.action.TbLogNode",
"name": "Log Other", "name": "Log Other",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -102,7 +102,7 @@
}, },
"type": "org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode", "type": "org.thingsboard.rule.engine.rpc.TbSendRPCRequestNode",
"name": "RPC Call Request", "name": "RPC Call Request",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -117,7 +117,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbOriginatorTypeFilterNode", "type": "org.thingsboard.rule.engine.filter.TbOriginatorTypeFilterNode",
"name": "Is Entity Group", "name": "Is Entity Group",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -134,7 +134,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbMsgTypeFilterNode", "type": "org.thingsboard.rule.engine.filter.TbMsgTypeFilterNode",
"name": "Post attributes or RPC request", "name": "Post attributes or RPC request",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -152,7 +152,7 @@
}, },
"type": "org.thingsboard.rule.engine.transform.TbDuplicateMsgToGroupNode", "type": "org.thingsboard.rule.engine.transform.TbDuplicateMsgToGroupNode",
"name": "Duplicate To Group Entities", "name": "Duplicate To Group Entities",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -169,7 +169,7 @@
}, },
"type": "org.thingsboard.rule.engine.profile.TbDeviceProfileNode", "type": "org.thingsboard.rule.engine.profile.TbDeviceProfileNode",
"name": "Device Profile Node", "name": "Device Profile Node",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -186,7 +186,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbJsFilterNode", "type": "org.thingsboard.rule.engine.filter.TbJsFilterNode",
"name": "Test JS script", "name": "Test JS script",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -204,7 +204,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbJsFilterNode", "type": "org.thingsboard.rule.engine.filter.TbJsFilterNode",
"name": "Test TBEL script", "name": "Test TBEL script",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -222,7 +222,7 @@
}, },
"type": "org.thingsboard.rule.engine.transform.TbTransformMsgNode", "type": "org.thingsboard.rule.engine.transform.TbTransformMsgNode",
"name": "Add arrival timestamp", "name": "Add arrival timestamp",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -240,7 +240,7 @@
}, },
"type": "org.thingsboard.rule.engine.transform.TbTransformMsgNode", "type": "org.thingsboard.rule.engine.transform.TbTransformMsgNode",
"name": "Calculate additional latencies", "name": "Calculate additional latencies",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -258,7 +258,7 @@
}, },
"type": "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode", "type": "org.thingsboard.rule.engine.transform.TbChangeOriginatorNode",
"name": "To latencies asset", "name": "To latencies asset",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -287,7 +287,7 @@
}, },
"type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
"name": "Save Timeseries", "name": "Save Timeseries",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -303,7 +303,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbCheckMessageNode", "type": "org.thingsboard.rule.engine.filter.TbCheckMessageNode",
"name": "Has testData", "name": "Has testData",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -323,7 +323,7 @@
}, },
"type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
"name": "Save Timeseries with TTL", "name": "Save Timeseries with TTL",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {

6
msa/black-box-tests/src/test/resources/MqttRuleNodeTestMetadata.json
View File

@ -9,7 +9,7 @@
}, },
"type": "org.thingsboard.rule.engine.mqtt.TbMqttNode", "type": "org.thingsboard.rule.engine.mqtt.TbMqttNode",
"name": "test mqtt", "name": "test mqtt",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"singletonMode": true, "singletonMode": true,
"queueName": "HighPriority", "queueName": "HighPriority",
"configurationVersion": 0, "configurationVersion": 0,
@ -36,7 +36,7 @@
}, },
"type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
"name": "save timeseries", "name": "save timeseries",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
@ -54,7 +54,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode", "type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode",
"name": "switch", "name": "switch",
"debugMode": false, "debugStrategy": "DISABLED",
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {

6
msa/black-box-tests/src/test/resources/RpcResponseRuleChainMetadata.json
View File

@ -8,7 +8,7 @@
}, },
"type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode", "type": "org.thingsboard.rule.engine.filter.TbMsgTypeSwitchNode",
"name": "msgTypeSwitch", "name": "msgTypeSwitch",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"configuration": { "configuration": {
"version": 0 "version": 0
} }
@ -20,7 +20,7 @@
}, },
"type": "org.thingsboard.rule.engine.transform.TbTransformMsgNode", "type": "org.thingsboard.rule.engine.transform.TbTransformMsgNode",
"name": "formResponse", "name": "formResponse",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"configuration": { "configuration": {
"jsScript": "if (msg.method == \"getResponse\") {\n return {msg: {\"response\": \"requestReceived\"}, metadata: metadata, msgType: msgType};\n}\n\nreturn {msg: msg, metadata: metadata, msgType: msgType};" "jsScript": "if (msg.method == \"getResponse\") {\n return {msg: {\"response\": \"requestReceived\"}, metadata: metadata, msgType: msgType};\n}\n\nreturn {msg: msg, metadata: metadata, msgType: msgType};"
} }
@ -32,7 +32,7 @@
}, },
"type": "org.thingsboard.rule.engine.rpc.TbSendRPCReplyNode", "type": "org.thingsboard.rule.engine.rpc.TbSendRPCReplyNode",
"name": "rpcReply", "name": "rpcReply",
"debugMode": true, "debugStrategy": "ALL_EVENTS",
"configuration": { "configuration": {
"requestIdMetaDataAttribute": "requestId" "requestIdMetaDataAttribute": "requestId"
} }

Write Preview
Loading…
Cancel
Save