From cf7ba9b390596b6e452ca135246f351299bd3d71 Mon Sep 17 00:00:00 2001 From: Yuriy Lytvynchuk Date: Thu, 25 Aug 2022 11:47:06 +0300 Subject: [PATCH] refactor code --- .../rule/engine/transform/TbSplitArrayMsgNode.java | 13 +++++++++---- .../engine/transform/TbSplitArrayMsgNodeTest.java | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java index 1c682fbf7c..4eaf19ec6f 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNode.java @@ -61,12 +61,12 @@ public class TbSplitArrayMsgNode implements TbNode { ArrayNode data = (ArrayNode) jsonNode; List messages = new ArrayList<>(); data.forEach(msgNode -> { - messages.add(createNewMsg(msg, msgNode)); + messages.add(createMsg(msg, msgNode, data.size() > 1)); }); - ctx.ack(msg); if (messages.size() == 1) { ctx.tellSuccess(messages.get(0)); } else { + ctx.ack(msg); for (TbMsg newMsg : messages) { ctx.tellSuccess(newMsg); } @@ -76,8 +76,12 @@ public class TbSplitArrayMsgNode implements TbNode { } } - private TbMsg createNewMsg(TbMsg msg, JsonNode msgNode) { - return TbMsg.newMsg(msg.getQueueName(), msg.getType(), msg.getOriginator(), msg.getMetaData(), JacksonUtil.toString(msgNode)); + private TbMsg createMsg(TbMsg msg, JsonNode msgNode, boolean newMessage) { + if (newMessage) { + return TbMsg.newMsg(msg.getQueueName(), msg.getType(), msg.getOriginator(), msg.getMetaData(), JacksonUtil.toString(msgNode)); + } else { + return TbMsg.transformMsg(msg, msg.getType(), msg.getOriginator(), msg.getMetaData(), JacksonUtil.toString(msgNode)); + } } @Override @@ -85,3 +89,4 @@ public class TbSplitArrayMsgNode implements TbNode { } } + diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java index 17bfd1663c..adaf842d42 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java @@ -130,4 +130,4 @@ public class TbSplitArrayMsgNodeTest { ); return TbMsg.newMsg("POST_ATTRIBUTES_REQUEST", entityId, new TbMsgMetaData(mdMap), data, callback); } -} \ No newline at end of file +}