From 3bdb7bb5addb1849b0a20078b04a090514ef34cc Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Thu, 19 Nov 2020 17:26:07 +0200 Subject: [PATCH] SERVER_SCOPE by default, if not provided in metadata --- .../org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java | 2 +- .../thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java index 1ab8911627..b706a81399 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java @@ -176,7 +176,7 @@ public class TbMsgPushToEdgeNode implements TbNode { private String getScope(Map metadata) { String scope = metadata.get(SCOPE); if (StringUtils.isEmpty(scope)) { - // TODO: voba - move this to configuration of the node or some other place + // TODO: voba - move this to configuration of the node UI or some other place scope = DataConstants.SERVER_SCOPE; } return scope; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java index 1586941789..b47e391b72 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java @@ -48,8 +48,6 @@ public class TbMsgAttributesNode implements TbNode { private TbMsgAttributesNodeConfiguration config; - - @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbMsgAttributesNodeConfiguration.class);