dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add JacksonUtil.toJsonNode

Browse Source
This commit is contained in:
Yuriy Lytvynchuk 2022-10-07 13:07:12 +03:00
parent 0ec08b8448
commit 504a173710
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
View File

@ -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());

2
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
View File

@ -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) {