From 0861d865622002f290a0becba750477764b385a1 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Fri, 29 Jul 2022 11:09:50 +0300 Subject: [PATCH 01/12] new RuleNode "rename keys" --- ...oMsgNode.java => TbRenameMsgKeysNode.java} | 39 +++++++++---------- ... => TbRenameMsgKeysNodeConfiguration.java} | 12 +++--- .../transform/TbCopyFromMdToMsgNodeTest.java | 29 +++++++------- 3 files changed, 38 insertions(+), 42 deletions(-) rename rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/{TbCopyFromMdToMsgNode.java => TbRenameMsgKeysNode.java} (63%) rename rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/{TbCopyFromMdToMsgNodeConfiguration.java => TbRenameMsgKeysNodeConfiguration.java} (66%) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java similarity index 63% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNode.java rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java index b01a99e50f..f26f28b522 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java @@ -26,59 +26,58 @@ import org.thingsboard.rule.engine.api.TbNode; import org.thingsboard.rule.engine.api.TbNodeConfiguration; import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.rule.engine.api.util.TbNodeUtils; -import org.thingsboard.server.common.data.StringUtils; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; -import org.thingsboard.server.common.msg.TbMsgMetaData; -import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutionException; @Slf4j @RuleNode( type = ComponentType.TRANSFORMATION, - name = "copy from metadata to msg", - configClazz = TbCopyFromMdToMsgNodeConfiguration.class, - nodeDescription = "Copies the message metadata keys to msg data with specified key names selected in the list", - nodeDetails = "", + name = "rename keys", + configClazz = TbRenameMsgKeysNodeConfiguration.class, + nodeDescription = "Renames the keys in the msg data to the specified key names selected in the key mapping.", + nodeDetails = "Will fetch fields values specified in mapping. If specified field is not part of msg fields it will be ignored." + + "If the msg is not a JSON object returns the incoming message as outbound message with Failure chain," + + " otherwise returns transformed messages via Success chain", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "", icon = "functions" ) -public class TbCopyFromMdToMsgNode implements TbNode { +public class TbRenameMsgKeysNode implements TbNode { - TbCopyFromMdToMsgNodeConfiguration config; + TbRenameMsgKeysNodeConfiguration config; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { - this.config = TbNodeUtils.convert(configuration, TbCopyFromMdToMsgNodeConfiguration.class); + this.config = TbNodeUtils.convert(configuration, TbRenameMsgKeysNodeConfiguration.class); } @Override public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException { - processCopy(ctx, msg); + processRename(ctx, msg); } @Override public void destroy() { } - private void processCopy(TbContext ctx, TbMsg msg) { - List metadataMsgKeys = config.getMetadataMsgKeys(); - if (CollectionUtils.isEmpty(metadataMsgKeys)) { + private void processRename(TbContext ctx, TbMsg msg) { + Map renameKeysMapping = config.getRenameKeysMapping(); + if (CollectionUtils.isEmpty(renameKeysMapping)) { ctx.tellSuccess(msg); } else { JsonNode dataNode = JacksonUtil.toJsonNode(msg.getData()); if (dataNode.isObject()) { ObjectNode msgData = (ObjectNode) dataNode; - TbMsgMetaData metaData = msg.getMetaData(); - metadataMsgKeys.forEach(metadataKey -> { - String value = metaData.getValue(metadataKey); - if (!StringUtils.isEmpty(value)) { - msgData.put(metadataKey, value); + renameKeysMapping.forEach((nameKey, newNameKey) -> { + if (msgData.has(nameKey)) { + msgData.set(newNameKey, msgData.get(nameKey)); + msgData.remove(nameKey); } }); - ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, JacksonUtil.toString(msgData))); + ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), JacksonUtil.toString(msgData))); } else { ctx.tellFailure(msg, new RuntimeException("Msg data is not a JSON Object!")); } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeConfiguration.java similarity index 66% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeConfiguration.java rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeConfiguration.java index fdcdb5f1b6..0efcb38ce2 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeConfiguration.java @@ -19,17 +19,17 @@ import lombok.Data; import org.thingsboard.rule.engine.api.NodeConfiguration; import java.util.Collections; -import java.util.List; +import java.util.Map; @Data -public class TbCopyFromMdToMsgNodeConfiguration implements NodeConfiguration { +public class TbRenameMsgKeysNodeConfiguration implements NodeConfiguration { - private List metadataMsgKeys; + private Map renameKeysMapping; @Override - public TbCopyFromMdToMsgNodeConfiguration defaultConfiguration() { - TbCopyFromMdToMsgNodeConfiguration configuration = new TbCopyFromMdToMsgNodeConfiguration(); - configuration.setMetadataMsgKeys(Collections.emptyList()); + public TbRenameMsgKeysNodeConfiguration defaultConfiguration() { + TbRenameMsgKeysNodeConfiguration configuration = new TbRenameMsgKeysNodeConfiguration(); + configuration.setRenameKeysMapping(Collections.emptyMap()); return configuration; } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeTest.java index 50609edaa0..a5995f8c90 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeTest.java @@ -16,7 +16,6 @@ package org.thingsboard.rule.engine.transform; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,7 +31,6 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.common.msg.queue.TbMsgCallback; import java.util.Collections; -import java.util.List; import java.util.Map; import java.util.UUID; @@ -45,11 +43,9 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; public class TbCopyFromMdToMsgNodeTest { - final ObjectMapper mapper = new ObjectMapper(); - DeviceId deviceId; - TbCopyFromMdToMsgNode node; - TbCopyFromMdToMsgNodeConfiguration config; + TbRenameMsgKeysNode node; + TbRenameMsgKeysNodeConfiguration config; TbNodeConfiguration nodeConfiguration; TbContext ctx; TbMsgCallback callback; @@ -59,10 +55,10 @@ public class TbCopyFromMdToMsgNodeTest { deviceId = new DeviceId(UUID.randomUUID()); callback = mock(TbMsgCallback.class); ctx = mock(TbContext.class); - config = new TbCopyFromMdToMsgNodeConfiguration().defaultConfiguration(); - config.setMetadataMsgKeys(List.of("TestKey_1", "TestKey_2", "TestKey_3")); - nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(config)); - node = spy(new TbCopyFromMdToMsgNode()); + config = new TbRenameMsgKeysNodeConfiguration().defaultConfiguration(); + config.setRenameKeysMapping(Map.of("TestKey_1", "Attribute_1", "TestKey_2", "Attribute_2")); + nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); + node = spy(new TbRenameMsgKeysNode()); node.init(ctx, nodeConfiguration); } @@ -78,13 +74,13 @@ public class TbCopyFromMdToMsgNodeTest { @Test void givenDefaultConfig_whenVerify_thenOK() { - TbCopyFromMdToMsgNodeConfiguration defaultConfig = new TbCopyFromMdToMsgNodeConfiguration().defaultConfiguration(); - assertThat(defaultConfig.getMetadataMsgKeys()).isEqualTo(Collections.emptyList()); + TbRenameMsgKeysNodeConfiguration defaultConfig = new TbRenameMsgKeysNodeConfiguration().defaultConfiguration(); + assertThat(defaultConfig.getRenameKeysMapping()).isEqualTo(Collections.emptyMap()); } @Test void givenMsg_whenOnMsg_thenVerifyOutput() throws Exception { - String data = "{}"; + String data = "{\"Temperature_1\":22.5,\"TestKey_2\":10.3}"; node.onMsg(ctx, getTbMsg(deviceId, data)); ArgumentCaptor newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class); @@ -95,13 +91,14 @@ public class TbCopyFromMdToMsgNodeTest { assertThat(newMsg).isNotNull(); JsonNode dataNode = JacksonUtil.toJsonNode(newMsg.getData()); - assertThat(dataNode.has("TestKey_1")).isEqualTo(true); + assertThat(dataNode.has("Attribute_2")).isEqualTo(true); + assertThat(dataNode.has("Temperature_1")).isEqualTo(true); } @Test void givenEmptyKeys_whenOnMsg_thenVerifyOutput() throws Exception { - TbCopyFromMdToMsgNodeConfiguration defaultConfig = new TbCopyFromMdToMsgNodeConfiguration().defaultConfiguration(); - nodeConfiguration = new TbNodeConfiguration(mapper.valueToTree(defaultConfig)); + TbRenameMsgKeysNodeConfiguration defaultConfig = new TbRenameMsgKeysNodeConfiguration().defaultConfiguration(); + nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(defaultConfig)); node.init(ctx, nodeConfiguration); String data = "{}"; From 0e6a4ee6ffd936db0bc2d64934c223b8a3c9da72 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Tue, 2 Aug 2022 16:13:53 +0300 Subject: [PATCH 02/12] add configDirective --- .../thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java index f26f28b522..10aa7d2b50 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java @@ -42,7 +42,7 @@ import java.util.concurrent.ExecutionException; "If the msg is not a JSON object returns the incoming message as outbound message with Failure chain," + " otherwise returns transformed messages via Success chain", uiResources = {"static/rulenode/rulenode-core-config.js"}, - configDirective = "", + configDirective = "tbTransformationNodeRenameMsgKeysConfig", icon = "functions" ) public class TbRenameMsgKeysNode implements TbNode { From 59713cb4fb8286a42d97ca761029b5a3f157486e Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Wed, 3 Aug 2022 09:39:56 +0300 Subject: [PATCH 03/12] add testClass --- ...opyFromMdToMsgNodeTest.java => TbRenameMsgKeysNodeTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/{TbCopyFromMdToMsgNodeTest.java => TbRenameMsgKeysNodeTest.java} (99%) diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java similarity index 99% rename from rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeTest.java rename to rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java index a5995f8c90..0f06fdc520 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbCopyFromMdToMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -public class TbCopyFromMdToMsgNodeTest { +public class TbRenameMsgKeysNodeTest { DeviceId deviceId; TbRenameMsgKeysNode node; TbRenameMsgKeysNodeConfiguration config; From d4b3eebb5064d6af3fb0696a94859f92cfdfe5f9 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Fri, 5 Aug 2022 14:26:41 +0300 Subject: [PATCH 04/12] refactor code --- .../engine/transform/TbRenameMsgKeysNode.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java index 10aa7d2b50..09543083e3 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java @@ -37,8 +37,8 @@ import java.util.concurrent.ExecutionException; type = ComponentType.TRANSFORMATION, name = "rename keys", configClazz = TbRenameMsgKeysNodeConfiguration.class, - nodeDescription = "Renames the keys in the msg data to the specified key names selected in the key mapping.", - nodeDetails = "Will fetch fields values specified in mapping. If specified field is not part of msg fields it will be ignored." + + nodeDescription = "Renames msg data keys to the new key names selected in the key mapping.", + nodeDetails = "If the key that is selected in the key mapping is missed in the msg data, it will be ignored." + "If the msg is not a JSON object returns the incoming message as outbound message with Failure chain," + " otherwise returns transformed messages via Success chain", uiResources = {"static/rulenode/rulenode-core-config.js"}, @@ -56,14 +56,6 @@ public class TbRenameMsgKeysNode implements TbNode { @Override public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException { - processRename(ctx, msg); - } - - @Override - public void destroy() { - } - - private void processRename(TbContext ctx, TbMsg msg) { Map renameKeysMapping = config.getRenameKeysMapping(); if (CollectionUtils.isEmpty(renameKeysMapping)) { ctx.tellSuccess(msg); @@ -83,5 +75,9 @@ public class TbRenameMsgKeysNode implements TbNode { } } } + + @Override + public void destroy() { + } } From db489f2ae0a8efff98558e6afc69b46f185d9683 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Fri, 12 Aug 2022 10:00:11 +0300 Subject: [PATCH 05/12] add options fromMetadata --- ...MsgKeysNode.java => TbRenameKeysNode.java} | 54 +++++++++++++------ ...ava => TbRenameKeysNodeConfiguration.java} | 8 +-- .../transform/TbRenameMsgKeysNodeTest.java | 35 +++++++++--- 3 files changed, 71 insertions(+), 26 deletions(-) rename rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/{TbRenameMsgKeysNode.java => TbRenameKeysNode.java} (53%) rename rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/{TbRenameMsgKeysNodeConfiguration.java => TbRenameKeysNodeConfiguration.java} (74%) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java similarity index 53% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java index 09543083e3..8704874594 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java @@ -28,6 +28,7 @@ import org.thingsboard.rule.engine.api.TbNodeException; import org.thingsboard.rule.engine.api.util.TbNodeUtils; import org.thingsboard.server.common.data.plugin.ComponentType; import org.thingsboard.server.common.msg.TbMsg; +import org.thingsboard.server.common.msg.TbMsgMetaData; import java.util.Map; import java.util.concurrent.ExecutionException; @@ -36,22 +37,22 @@ import java.util.concurrent.ExecutionException; @RuleNode( type = ComponentType.TRANSFORMATION, name = "rename keys", - configClazz = TbRenameMsgKeysNodeConfiguration.class, - nodeDescription = "Renames msg data keys to the new key names selected in the key mapping.", - nodeDetails = "If the key that is selected in the key mapping is missed in the msg data, it will be ignored." + - "If the msg is not a JSON object returns the incoming message as outbound message with Failure chain," + + configClazz = TbRenameKeysNodeConfiguration.class, + nodeDescription = "Renames msg data or metadata keys to the new key names selected in the key mapping.", + nodeDetails = "If the key that is selected in the key mapping is missed in the msg data or metadata, it will be ignored." + + "If the msg data is not a JSON object returns the incoming message as outbound message with Failure chain," + " otherwise returns transformed messages via Success chain", uiResources = {"static/rulenode/rulenode-core-config.js"}, - configDirective = "tbTransformationNodeRenameMsgKeysConfig", - icon = "functions" + configDirective = "tbTransformationNodeRenameKeysConfig", + icon = "find_replace" ) -public class TbRenameMsgKeysNode implements TbNode { +public class TbRenameKeysNode implements TbNode { - TbRenameMsgKeysNodeConfiguration config; + TbRenameKeysNodeConfiguration config; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { - this.config = TbNodeUtils.convert(configuration, TbRenameMsgKeysNodeConfiguration.class); + this.config = TbNodeUtils.convert(configuration, TbRenameKeysNodeConfiguration.class); } @Override @@ -60,19 +61,38 @@ public class TbRenameMsgKeysNode implements TbNode { if (CollectionUtils.isEmpty(renameKeysMapping)) { ctx.tellSuccess(msg); } else { - JsonNode dataNode = JacksonUtil.toJsonNode(msg.getData()); - if (dataNode.isObject()) { - ObjectNode msgData = (ObjectNode) dataNode; + TbMsgMetaData metaData = msg.getMetaData(); + String data = msg.getData(); + if (config.isFromMetadata()) { + Map metaDataMap = metaData.getData(); renameKeysMapping.forEach((nameKey, newNameKey) -> { - if (msgData.has(nameKey)) { - msgData.set(newNameKey, msgData.get(nameKey)); - msgData.remove(nameKey); + if (!newNameKey.equals(nameKey)) { + if (metaDataMap.containsKey(nameKey)) { + metaDataMap.put(newNameKey, metaDataMap.get(nameKey)); + metaDataMap.remove(nameKey); + } } }); - ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), JacksonUtil.toString(msgData))); + metaData = new TbMsgMetaData(metaDataMap); } else { - ctx.tellFailure(msg, new RuntimeException("Msg data is not a JSON Object!")); + JsonNode dataNode = JacksonUtil.toJsonNode(msg.getData()); + if (dataNode.isObject()) { + ObjectNode msgData = (ObjectNode) dataNode; + renameKeysMapping.forEach((nameKey, newNameKey) -> { + if (!newNameKey.equals(nameKey)) { + if (msgData.has(nameKey)) { + msgData.set(newNameKey, msgData.get(nameKey)); + msgData.remove(nameKey); + } + } + }); + data = JacksonUtil.toString(msgData); + } else { + ctx.tellFailure(msg, new RuntimeException("Msg data is not a JSON Object!")); + return; + } } + ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, data)); } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java similarity index 74% rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeConfiguration.java rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java index 0efcb38ce2..8d9c4d2f94 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java @@ -22,14 +22,16 @@ import java.util.Collections; import java.util.Map; @Data -public class TbRenameMsgKeysNodeConfiguration implements NodeConfiguration { +public class TbRenameKeysNodeConfiguration implements NodeConfiguration { + private boolean fromMetadata; private Map renameKeysMapping; @Override - public TbRenameMsgKeysNodeConfiguration defaultConfiguration() { - TbRenameMsgKeysNodeConfiguration configuration = new TbRenameMsgKeysNodeConfiguration(); + public TbRenameKeysNodeConfiguration defaultConfiguration() { + TbRenameKeysNodeConfiguration configuration = new TbRenameKeysNodeConfiguration(); configuration.setRenameKeysMapping(Collections.emptyMap()); + configuration.setFromMetadata(false); return configuration; } diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java index 0f06fdc520..e42128157d 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java @@ -44,8 +44,8 @@ import static org.mockito.Mockito.verify; public class TbRenameMsgKeysNodeTest { DeviceId deviceId; - TbRenameMsgKeysNode node; - TbRenameMsgKeysNodeConfiguration config; + TbRenameKeysNode node; + TbRenameKeysNodeConfiguration config; TbNodeConfiguration nodeConfiguration; TbContext ctx; TbMsgCallback callback; @@ -55,10 +55,10 @@ public class TbRenameMsgKeysNodeTest { deviceId = new DeviceId(UUID.randomUUID()); callback = mock(TbMsgCallback.class); ctx = mock(TbContext.class); - config = new TbRenameMsgKeysNodeConfiguration().defaultConfiguration(); + config = new TbRenameKeysNodeConfiguration().defaultConfiguration(); config.setRenameKeysMapping(Map.of("TestKey_1", "Attribute_1", "TestKey_2", "Attribute_2")); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); - node = spy(new TbRenameMsgKeysNode()); + node = spy(new TbRenameKeysNode()); node.init(ctx, nodeConfiguration); } @@ -74,8 +74,9 @@ public class TbRenameMsgKeysNodeTest { @Test void givenDefaultConfig_whenVerify_thenOK() { - TbRenameMsgKeysNodeConfiguration defaultConfig = new TbRenameMsgKeysNodeConfiguration().defaultConfiguration(); + TbRenameKeysNodeConfiguration defaultConfig = new TbRenameKeysNodeConfiguration().defaultConfiguration(); assertThat(defaultConfig.getRenameKeysMapping()).isEqualTo(Collections.emptyMap()); + assertThat(defaultConfig.isFromMetadata()).isEqualTo(false); } @Test @@ -95,9 +96,31 @@ public class TbRenameMsgKeysNodeTest { assertThat(dataNode.has("Temperature_1")).isEqualTo(true); } + @Test + void givenMetadata_whenOnMsg_thenVerifyOutput() throws Exception { + config = new TbRenameKeysNodeConfiguration().defaultConfiguration(); + config.setRenameKeysMapping(Map.of("TestKey_1", "Attribute_1", "TestKey_2", "Attribute_2")); + config.setFromMetadata(true); + nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); + node.init(ctx, nodeConfiguration); + + String data = "{\"Temperature_1\":22.5,\"TestKey_2\":10.3}"; + node.onMsg(ctx, getTbMsg(deviceId, data)); + + ArgumentCaptor newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class); + verify(ctx, times(1)).tellSuccess(newMsgCaptor.capture()); + verify(ctx, never()).tellFailure(any(), any()); + + TbMsg newMsg = newMsgCaptor.getValue(); + assertThat(newMsg).isNotNull(); + + Map mdDataMap = newMsg.getMetaData().getData(); + assertThat(mdDataMap.containsKey("Attribute_1")).isEqualTo(true); + } + @Test void givenEmptyKeys_whenOnMsg_thenVerifyOutput() throws Exception { - TbRenameMsgKeysNodeConfiguration defaultConfig = new TbRenameMsgKeysNodeConfiguration().defaultConfiguration(); + TbRenameKeysNodeConfiguration defaultConfig = new TbRenameKeysNodeConfiguration().defaultConfiguration(); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(defaultConfig)); node.init(ctx, nodeConfiguration); From 63c0325d3b26aef5fb9a5cdf590163ec3f222adf Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Mon, 15 Aug 2022 12:05:07 +0300 Subject: [PATCH 06/12] code review --- .../engine/transform/TbRenameKeysNode.java | 51 ++++++++----------- ...odeTest.java => TbRenameKeysNodeTest.java} | 9 ++-- 2 files changed, 26 insertions(+), 34 deletions(-) rename rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/{TbRenameMsgKeysNodeTest.java => TbRenameKeysNodeTest.java} (96%) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java index 8704874594..7bb7d295f2 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java @@ -18,7 +18,6 @@ package org.thingsboard.rule.engine.transform; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; -import org.springframework.util.CollectionUtils; import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.rule.engine.api.RuleNode; import org.thingsboard.rule.engine.api.TbContext; @@ -58,42 +57,34 @@ public class TbRenameKeysNode implements TbNode { @Override public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException { Map renameKeysMapping = config.getRenameKeysMapping(); - if (CollectionUtils.isEmpty(renameKeysMapping)) { - ctx.tellSuccess(msg); + TbMsgMetaData metaData = msg.getMetaData(); + String data = msg.getData(); + if (config.isFromMetadata()) { + Map metaDataMap = metaData.getData(); + renameKeysMapping.forEach((nameKey, newNameKey) -> { + if (metaDataMap.containsKey(nameKey)) { + metaDataMap.put(newNameKey, metaDataMap.get(nameKey)); + metaDataMap.remove(nameKey); + } + }); + metaData = new TbMsgMetaData(metaDataMap); } else { - TbMsgMetaData metaData = msg.getMetaData(); - String data = msg.getData(); - if (config.isFromMetadata()) { - Map metaDataMap = metaData.getData(); + JsonNode dataNode = JacksonUtil.toJsonNode(msg.getData()); + if (dataNode.isObject()) { + ObjectNode msgData = (ObjectNode) dataNode; renameKeysMapping.forEach((nameKey, newNameKey) -> { - if (!newNameKey.equals(nameKey)) { - if (metaDataMap.containsKey(nameKey)) { - metaDataMap.put(newNameKey, metaDataMap.get(nameKey)); - metaDataMap.remove(nameKey); - } + if (msgData.has(nameKey)) { + msgData.set(newNameKey, msgData.get(nameKey)); + msgData.remove(nameKey); } }); - metaData = new TbMsgMetaData(metaDataMap); + data = JacksonUtil.toString(msgData); } else { - JsonNode dataNode = JacksonUtil.toJsonNode(msg.getData()); - if (dataNode.isObject()) { - ObjectNode msgData = (ObjectNode) dataNode; - renameKeysMapping.forEach((nameKey, newNameKey) -> { - if (!newNameKey.equals(nameKey)) { - if (msgData.has(nameKey)) { - msgData.set(newNameKey, msgData.get(nameKey)); - msgData.remove(nameKey); - } - } - }); - data = JacksonUtil.toString(msgData); - } else { - ctx.tellFailure(msg, new RuntimeException("Msg data is not a JSON Object!")); - return; - } + ctx.tellFailure(msg, new RuntimeException("Msg data is not a JSON Object!")); + return; } - ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, data)); } + ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, data)); } @Override diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java similarity index 96% rename from rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java rename to rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java index e42128157d..b5b17efe4c 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameMsgKeysNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java @@ -42,7 +42,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -public class TbRenameMsgKeysNodeTest { +public class TbRenameKeysNodeTest { DeviceId deviceId; TbRenameKeysNode node; TbRenameKeysNodeConfiguration config; @@ -124,8 +124,9 @@ public class TbRenameMsgKeysNodeTest { nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(defaultConfig)); node.init(ctx, nodeConfiguration); - String data = "{}"; - node.onMsg(ctx, getTbMsg(deviceId, data)); + String data = "{\"Temperature_1\":22.5,\"TestKey_2\":10.3}"; + TbMsg msg = getTbMsg(deviceId, data); + node.onMsg(ctx, msg); ArgumentCaptor newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class); verify(ctx, times(1)).tellSuccess(newMsgCaptor.capture()); @@ -134,7 +135,7 @@ public class TbRenameMsgKeysNodeTest { TbMsg newMsg = newMsgCaptor.getValue(); assertThat(newMsg).isNotNull(); - assertThat(newMsg.getData()).isEqualTo(data); + assertThat(newMsg.getMetaData()).isEqualTo(msg.getMetaData()); } @Test From 7964f87a1d86ff5df33663405440f7093b7f678d Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Wed, 17 Aug 2022 15:13:04 +0300 Subject: [PATCH 07/12] add default keys --- .../thingsboard/rule/engine/transform/TbRenameKeysNode.java | 4 ++-- .../rule/engine/transform/TbRenameKeysNodeConfiguration.java | 2 +- .../rule/engine/transform/TbRenameKeysNodeTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java index 7bb7d295f2..031974c7a6 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java @@ -38,8 +38,8 @@ import java.util.concurrent.ExecutionException; name = "rename keys", configClazz = TbRenameKeysNodeConfiguration.class, nodeDescription = "Renames msg data or metadata keys to the new key names selected in the key mapping.", - nodeDetails = "If the key that is selected in the key mapping is missed in the msg data or metadata, it will be ignored." + - "If the msg data is not a JSON object returns the incoming message as outbound message with Failure chain," + + nodeDetails = "If the key that is selected in the key mapping is missed in the selected msg source(data or metadata), it will be ignored." + + " If the msg data is not a JSON object returns the incoming message as outbound message with Failure chain," + " otherwise returns transformed messages via Success chain", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbTransformationNodeRenameKeysConfig", diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java index 8d9c4d2f94..f457512c03 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java @@ -30,7 +30,7 @@ public class TbRenameKeysNodeConfiguration implements NodeConfiguration Date: Fri, 26 Aug 2022 11:17:43 +0300 Subject: [PATCH 08/12] refactor code --- .../engine/transform/TbRenameKeysNode.java | 20 +++++++++++++------ .../TbRenameKeysNodeConfiguration.java | 3 --- .../transform/TbRenameKeysNodeTest.java | 17 +++++++++------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java index 031974c7a6..9096ad4815 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java @@ -31,6 +31,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; import java.util.Map; import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicBoolean; @Slf4j @RuleNode( @@ -48,21 +49,26 @@ import java.util.concurrent.ExecutionException; public class TbRenameKeysNode implements TbNode { TbRenameKeysNodeConfiguration config; + Map renameKeysMapping; + boolean fromMetadata; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { this.config = TbNodeUtils.convert(configuration, TbRenameKeysNodeConfiguration.class); + this.renameKeysMapping = config.getRenameKeysMapping(); + this.fromMetadata = config.isFromMetadata(); } @Override public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException { - Map renameKeysMapping = config.getRenameKeysMapping(); TbMsgMetaData metaData = msg.getMetaData(); String data = msg.getData(); - if (config.isFromMetadata()) { + AtomicBoolean msgChanged = new AtomicBoolean(false); + if (fromMetadata) { Map metaDataMap = metaData.getData(); renameKeysMapping.forEach((nameKey, newNameKey) -> { if (metaDataMap.containsKey(nameKey)) { + msgChanged.set(true); metaDataMap.put(newNameKey, metaDataMap.get(nameKey)); metaDataMap.remove(nameKey); } @@ -74,17 +80,19 @@ public class TbRenameKeysNode implements TbNode { ObjectNode msgData = (ObjectNode) dataNode; renameKeysMapping.forEach((nameKey, newNameKey) -> { if (msgData.has(nameKey)) { + msgChanged.set(true); msgData.set(newNameKey, msgData.get(nameKey)); msgData.remove(nameKey); } }); data = JacksonUtil.toString(msgData); - } else { - ctx.tellFailure(msg, new RuntimeException("Msg data is not a JSON Object!")); - return; } } - ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, data)); + if (msgChanged.get()) { + ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, data)); + } else { + ctx.tellSuccess(msg); + } } @Override diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java index f457512c03..b0ca483b1a 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java @@ -36,6 +36,3 @@ public class TbRenameKeysNodeConfiguration implements NodeConfiguration newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class); - ArgumentCaptor exceptionCaptor = ArgumentCaptor.forClass(Exception.class); - verify(ctx, never()).tellSuccess(any()); - verify(ctx, times(1)).tellFailure(newMsgCaptor.capture(), exceptionCaptor.capture()); + verify(ctx, times(1)).tellSuccess(newMsgCaptor.capture()); + verify(ctx, never()).tellFailure(any(), any()); - assertThat(exceptionCaptor.getValue()).isInstanceOf(RuntimeException.class); + TbMsg newMsg = newMsgCaptor.getValue(); + assertThat(newMsg).isNotNull(); + + assertThat(newMsg).isSameAs(msg); } private TbMsg getTbMsg(EntityId entityId, String data) { @@ -159,4 +162,4 @@ public class TbRenameKeysNodeTest { ); return TbMsg.newMsg("POST_ATTRIBUTES_REQUEST", entityId, new TbMsgMetaData(mdMap), data, callback); } -} \ No newline at end of file +} From eb7c9154a2ec9fd57858d4705b74836574431226 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Fri, 26 Aug 2022 11:18:45 +0300 Subject: [PATCH 09/12] mvn license:format --- .../rule/engine/transform/TbRenameKeysNodeConfiguration.java | 1 - .../thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java index b0ca483b1a..08a46899e2 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeConfiguration.java @@ -18,7 +18,6 @@ package org.thingsboard.rule.engine.transform; import lombok.Data; import org.thingsboard.rule.engine.api.NodeConfiguration; -import java.util.Collections; import java.util.Map; @Data diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java index 0203665d33..20bfd2cc98 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java @@ -30,7 +30,6 @@ import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.common.msg.queue.TbMsgCallback; -import java.util.Collections; import java.util.Map; import java.util.UUID; From c8b35ed5b0f2a67227f1a2497a7980d464d8dccf Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Tue, 6 Sep 2022 14:47:55 +0300 Subject: [PATCH 10/12] refactor code --- .../engine/transform/TbRenameKeysNode.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java index 9096ad4815..c030102f14 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java @@ -31,7 +31,6 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; import java.util.Map; import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicBoolean; @Slf4j @RuleNode( @@ -40,8 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean; configClazz = TbRenameKeysNodeConfiguration.class, nodeDescription = "Renames msg data or metadata keys to the new key names selected in the key mapping.", nodeDetails = "If the key that is selected in the key mapping is missed in the selected msg source(data or metadata), it will be ignored." + - " If the msg data is not a JSON object returns the incoming message as outbound message with Failure chain," + - " otherwise returns transformed messages via Success chain", + " Returns transformed messages via Success chain", uiResources = {"static/rulenode/rulenode-core-config.js"}, configDirective = "tbTransformationNodeRenameKeysConfig", icon = "find_replace" @@ -63,32 +61,34 @@ public class TbRenameKeysNode implements TbNode { public void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException { TbMsgMetaData metaData = msg.getMetaData(); String data = msg.getData(); - AtomicBoolean msgChanged = new AtomicBoolean(false); + boolean msgChanged = false; if (fromMetadata) { Map metaDataMap = metaData.getData(); - renameKeysMapping.forEach((nameKey, newNameKey) -> { + for (Map.Entry entry : renameKeysMapping.entrySet()) { + String nameKey = entry.getKey(); if (metaDataMap.containsKey(nameKey)) { - msgChanged.set(true); - metaDataMap.put(newNameKey, metaDataMap.get(nameKey)); + msgChanged = true; + metaDataMap.put(entry.getValue(), metaDataMap.get(nameKey)); metaDataMap.remove(nameKey); } - }); + } metaData = new TbMsgMetaData(metaDataMap); } else { JsonNode dataNode = JacksonUtil.toJsonNode(msg.getData()); if (dataNode.isObject()) { ObjectNode msgData = (ObjectNode) dataNode; - renameKeysMapping.forEach((nameKey, newNameKey) -> { + for (Map.Entry entry : renameKeysMapping.entrySet()) { + String nameKey = entry.getKey(); if (msgData.has(nameKey)) { - msgChanged.set(true); - msgData.set(newNameKey, msgData.get(nameKey)); + msgChanged = true; + msgData.set(entry.getValue(), msgData.get(nameKey)); msgData.remove(nameKey); } - }); + } data = JacksonUtil.toString(msgData); } } - if (msgChanged.get()) { + if (msgChanged) { ctx.tellSuccess(TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), metaData, data)); } else { ctx.tellSuccess(msg); @@ -99,4 +99,3 @@ public class TbRenameKeysNode implements TbNode { public void destroy() { } } - From d5fd311c75d6cfe7bce9f5427d358e8ba4bfb4c7 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Fri, 23 Sep 2022 11:01:16 +0300 Subject: [PATCH 11/12] delete destroy --- .../thingsboard/rule/engine/transform/TbRenameKeysNode.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java index c030102f14..59c4b9514b 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java @@ -94,8 +94,4 @@ public class TbRenameKeysNode implements TbNode { ctx.tellSuccess(msg); } } - - @Override - public void destroy() { - } } From 0912d0685f9dfd6d74ca40ae1c94d80e1f925157 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Tue, 27 Sep 2022 13:00:59 +0300 Subject: [PATCH 12/12] private fields in node --- .../thingsboard/rule/engine/transform/TbRenameKeysNode.java | 6 +++--- .../rule/engine/transform/TbRenameKeysNodeTest.java | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java index 59c4b9514b..489e0278a3 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbRenameKeysNode.java @@ -46,9 +46,9 @@ import java.util.concurrent.ExecutionException; ) public class TbRenameKeysNode implements TbNode { - TbRenameKeysNodeConfiguration config; - Map renameKeysMapping; - boolean fromMetadata; + private TbRenameKeysNodeConfiguration config; + private Map renameKeysMapping; + private boolean fromMetadata; @Override public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException { diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java index 20bfd2cc98..3cafbce8b2 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbRenameKeysNodeTest.java @@ -66,11 +66,6 @@ public class TbRenameKeysNodeTest { node.destroy(); } - @Test - void givenDefaultConfig_whenInit_thenOK() { - assertThat(node.config).isEqualTo(config); - } - @Test void givenDefaultConfig_whenVerify_thenOK() { TbRenameKeysNodeConfiguration defaultConfig = new TbRenameKeysNodeConfiguration().defaultConfiguration();