From 504a173710dbe792cf055d8e5c9b4701f866da4e Mon Sep 17 00:00:00 2001
From: Yuriy Lytvynchuk <yuriy.litv@gmail.com>
Date: Fri, 7 Oct 2022 13:07:12 +0300
Subject: [PATCH] add JacksonUtil.toJsonNode

---
 .../src/main/java/org/thingsboard/common/util/JacksonUtil.java  | 2 +-
 .../rule/engine/metadata/TbAbstractGetAttributesNode.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
index 1bfd85351c..55d3c254d7 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
@@ -224,7 +224,7 @@ public class JacksonUtil {
             kvEntry.getLongValue().ifPresent(value -> entityNode.put(key, value));
         } else if (kvEntry.getDataType() == DataType.JSON) {
             if (kvEntry.getJsonValue().isPresent()) {
-                entityNode.set(key, JacksonUtil.valueToTree(kvEntry.getJsonValue().get()));
+                entityNode.set(key, JacksonUtil.toJsonNode(kvEntry.getJsonValue().get()));
             }
         } else {
             entityNode.put(key, kvEntry.getValueAsString());
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
index c516811e9c..2e525b56ed 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
@@ -171,7 +171,7 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
         ObjectNode value = JacksonUtil.newObjectNode();
         value.put(TS, tsKvEntry.getTs());
         JacksonUtil.addKvEntry(value, tsKvEntry, VALUE);
-        return new BasicTsKvEntry(tsKvEntry.getTs(), new JsonDataEntry(tsKvEntry.getKey(), value.toString()));
+        return new BasicTsKvEntry(tsKvEntry.getTs(), new JsonDataEntry(tsKvEntry.getKey(), JacksonUtil.toString(value)));
     }
 
     private String getPrefix(String scope) {