fixed pr comments

application/src/main/java/org/thingsboard/server/controller/DashboardController.java

@@ -528,7 +528,7 @@ public class DashboardController extends BaseController {
         Tenant tenant = tenantService.findTenantById(getTenantId());
         JsonNode additionalInfo = tenant.getAdditionalInfo();
         if (additionalInfo == null || !(additionalInfo instanceof ObjectNode)) {
-            additionalInfo = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+            additionalInfo = JacksonUtil.newObjectNode();
         }
         if (homeDashboardInfo.getDashboardId() != null) {
             ((ObjectNode) additionalInfo).put(HOME_DASHBOARD_ID, homeDashboardInfo.getDashboardId().getId().toString());

application/src/main/java/org/thingsboard/server/controller/RuleChainController.java

@@ -478,7 +478,7 @@ public class RuleChainController extends BaseController {
     private String msgToOutput(List<TbMsg> msgs) throws Exception {
         JsonNode resultNode;
         if (msgs.size() > 1) {
-            resultNode = JacksonUtil.OBJECT_MAPPER.createArrayNode();
+            resultNode = JacksonUtil.newArrayNode();
             for (TbMsg msg : msgs) {
                 JsonNode convertedData = convertMsgToOut(msg);
                 ((ArrayNode) resultNode).add(convertedData);
@@ -492,7 +492,7 @@ public class RuleChainController extends BaseController {
     private JsonNode convertMsgToOut(TbMsg msg) throws Exception {
         ObjectNode msgData = JacksonUtil.newObjectNode();
         if (!StringUtils.isEmpty(msg.getData())) {
-            msgData.set("msg", JacksonUtil.valueToTree(msg.getData()));
+            msgData.set("msg", JacksonUtil.toJsonNode(msg.getData()));
         }
         Map<String, String> metadata = msg.getMetaData().getData();
         msgData.set("metadata", JacksonUtil.valueToTree(metadata));

application/src/main/java/org/thingsboard/server/service/edge/DefaultEdgeNotificationService.java

@@ -146,7 +146,7 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
     public Edge setEdgeRootRuleChain(TenantId tenantId, Edge edge, RuleChainId ruleChainId) throws Exception {
         edge.setRootRuleChainId(ruleChainId);
         Edge savedEdge = edgeService.saveEdge(edge);
-        ObjectNode isRootBody = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode isRootBody = JacksonUtil.newObjectNode();
         isRootBody.put(EDGE_IS_ROOT_BODY_KEY, Boolean.TRUE);
         saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.RULE_CHAIN, EdgeEventActionType.UPDATED, ruleChainId, isRootBody).get();
         return savedEdge;

application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java

@@ -445,7 +445,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
 
     private void pushRuleEngineMessage(TenantId tenantId, EdgeId edgeId, long ts, String msgType) {
         try {
-            ObjectNode edgeState = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+            ObjectNode edgeState = JacksonUtil.newObjectNode();
             if (msgType.equals(CONNECT_EVENT)) {
                 edgeState.put(DefaultDeviceStateService.ACTIVITY_STATE, true);
                 edgeState.put(DefaultDeviceStateService.LAST_CONNECT_TIME, ts);

application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/RuleChainsEdgeEventFetcher.java

@@ -45,7 +45,7 @@ public class RuleChainsEdgeEventFetcher extends BasePageableEdgeEventFetcher<Rul
 
     @Override
     EdgeEvent constructEdgeEvent(TenantId tenantId, Edge edge, RuleChain ruleChain) {
-        ObjectNode isRootBody = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode isRootBody = JacksonUtil.newObjectNode();
         boolean isRoot = false;
         try {
             isRoot = ruleChain.getId().equals(edge.getRootRuleChainId());

application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/device/DeviceEdgeProcessor.java

@@ -213,7 +213,7 @@ public class DeviceEdgeProcessor extends BaseDeviceProcessor {
                 metaData.putValue("deviceType", device.getType());
                 metaData.putValue(DataConstants.DEVICE_ID, deviceId.getId().toString());
             }
-            ObjectNode data = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+            ObjectNode data = JacksonUtil.newObjectNode();
             data.put("method", deviceRpcCallMsg.getRequestMsg().getMethod());
             data.put("params", deviceRpcCallMsg.getRequestMsg().getParams());
             TbMsg tbMsg = TbMsg.newMsg(SessionMsgType.TO_SERVER_RPC_REQUEST.name(), deviceId, null, metaData,

application/src/main/java/org/thingsboard/server/service/edge/rpc/sync/DefaultEdgeRequestsService.java

@@ -155,7 +155,7 @@ public class DefaultEdgeRequestsService implements EdgeRequestsService {
                 future = Futures.immediateFuture(null);
             } else {
                 Map<String, Object> entityData = new HashMap<>();
-                ObjectNode attributes = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+                ObjectNode attributes = JacksonUtil.newObjectNode();
                 for (AttributeKvEntry attr : ssAttributes) {
                     if (DefaultDeviceStateService.PERSISTENT_ATTRIBUTES.contains(attr.getKey())
                             && !DefaultDeviceStateService.INACTIVITY_TIMEOUT.equals(attr.getKey())) {

application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java

@@ -643,22 +643,22 @@ public class WebsocketApiTest extends AbstractControllerTest {
 
     @Test
     public void testEntityCountCmd_filterTypeSingularCompatibilityTest() {
-        ObjectNode oldFormatDeviceTypeFilterSingular = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode oldFormatDeviceTypeFilterSingular = JacksonUtil.newObjectNode();
         oldFormatDeviceTypeFilterSingular.put("type", "deviceType");
         oldFormatDeviceTypeFilterSingular.put("deviceType", "default");
         oldFormatDeviceTypeFilterSingular.put("deviceNameFilter", "Device");
 
-        ObjectNode query = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode query = JacksonUtil.newObjectNode();
         query.set("entityFilter", oldFormatDeviceTypeFilterSingular);
 
-        ObjectNode entityCountCmd = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode entityCountCmd = JacksonUtil.newObjectNode();
         entityCountCmd.put("cmdId", 1);
         entityCountCmd.set("query", query);
 
-        ArrayNode entityCountCmds = JacksonUtil.OBJECT_MAPPER.createArrayNode();
+        ArrayNode entityCountCmds = JacksonUtil.newArrayNode();
         entityCountCmds.add(entityCountCmd);
 
-        ObjectNode wrapperNode = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode wrapperNode = JacksonUtil.newObjectNode();
         wrapperNode.set("entityCountCmds", entityCountCmds);
 
         getWsClient().send(JacksonUtil.toString(wrapperNode));

application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java

@@ -699,7 +699,7 @@ public class DeviceEdgeTest extends AbstractEdgeTest {
 
         Assert.assertTrue(onUpdateCallback.getSubscribeLatch().await(30, TimeUnit.SECONDS));
 
-        Assert.assertEquals(JacksonUtil.OBJECT_MAPPER.createObjectNode().put(attrKey, attrValue),
+        Assert.assertEquals(JacksonUtil.newObjectNode().put(attrKey, attrValue),
                 JacksonUtil.fromBytes(onUpdateCallback.getPayloadBytes()));
 
         client.disconnect();

application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java

@@ -251,7 +251,7 @@ public class TelemetryEdgeTest extends AbstractEdgeTest {
         Assert.assertTrue(edgeImitator.waitForMessages());
 
         final String attributeKey = "key1";
-        ObjectNode attributesData = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode attributesData = JacksonUtil.newObjectNode();
         attributesData.put(attributeKey, "value1");
         doPost("/api/plugins/telemetry/ASSET/" + savedAsset.getId() + "/attributes/" + DataConstants.SERVER_SCOPE, attributesData);
 

dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java

@@ -476,7 +476,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
     public String findMissingToRelatedRuleChains(TenantId tenantId, EdgeId edgeId, String tbRuleChainInputNodeClassName) {
         List<RuleChain> edgeRuleChains = findEdgeRuleChains(tenantId, edgeId);
         List<RuleChainId> edgeRuleChainIds = edgeRuleChains.stream().map(IdBased::getId).collect(Collectors.toList());
-        ObjectNode result = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode result = JacksonUtil.newObjectNode();
         for (RuleChain edgeRuleChain : edgeRuleChains) {
             List<RuleNode> ruleNodes =
                     ruleChainService.loadRuleChainMetaData(edgeRuleChain.getTenantId(), edgeRuleChain.getId()).getNodes();
@@ -494,7 +494,7 @@ public class EdgeServiceImpl extends AbstractCachedEntityService<EdgeCacheKey, E
                     }
                 }
                 if (!missingRuleChains.isEmpty()) {
-                    ArrayNode array = JacksonUtil.OBJECT_MAPPER.createArrayNode();
+                    ArrayNode array = JacksonUtil.newArrayNode();
                     for (String missingRuleChain : missingRuleChains) {
                         array.add(missingRuleChain);
                     }

dao/src/test/java/org/thingsboard/server/dao/service/EdgeServiceTest.java

@@ -624,14 +624,14 @@ public class EdgeServiceTest extends AbstractServiceTest {
         RuleNode ruleNode1 = new RuleNode();
         ruleNode1.setName("Input rule node 1");
         ruleNode1.setType("org.thingsboard.rule.engine.flow.TbRuleChainInputNode");
-        ObjectNode configuration = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode configuration = JacksonUtil.newObjectNode();
         configuration.put("ruleChainId", ruleChain1.getUuidId().toString());
         ruleNode1.setConfiguration(configuration);
 
         RuleNode ruleNode2 = new RuleNode();
         ruleNode2.setName("Input rule node 2");
         ruleNode2.setType("org.thingsboard.rule.engine.flow.TbRuleChainInputNode");
-        configuration = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        configuration = JacksonUtil.newObjectNode();
         configuration.put("ruleChainId", ruleChain2.getUuidId().toString());
         ruleNode2.setConfiguration(configuration);
 

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/deduplication/TbMsgDeduplicationNode.java

@@ -214,7 +214,7 @@ public class TbMsgDeduplicationNode implements TbNode {
     }
 
     private String getMergedData(List<TbMsg> msgs) {
-        ArrayNode mergedData = JacksonUtil.OBJECT_MAPPER.createArrayNode();
+        ArrayNode mergedData = JacksonUtil.newArrayNode();
         msgs.forEach(msg -> {
             ObjectNode msgNode = JacksonUtil.newObjectNode();
             msgNode.set("msg", JacksonUtil.toJsonNode(msg.getData()));

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java

@@ -98,7 +98,7 @@ public class TbSendRPCReplyNode implements TbNode {
             return;
         }
 
-        ObjectNode body = JacksonUtil.OBJECT_MAPPER.createObjectNode();
+        ObjectNode body = JacksonUtil.newObjectNode();
         body.put("serviceId", serviceIdStr);
         body.put("sessionId", sessionIdStr);
         body.put("requestId", requestIdStr);

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java

@@ -421,7 +421,7 @@ public class TbMsgDeduplicationNodeTest {
     }
 
     private String getMergedData(List<TbMsg> msgs) {
-        ArrayNode mergedData = JacksonUtil.OBJECT_MAPPER.createArrayNode();
+        ArrayNode mergedData = JacksonUtil.newArrayNode();
         msgs.forEach(msg -> {
             ObjectNode msgNode = JacksonUtil.newObjectNode();
             msgNode.set("msg", JacksonUtil.toJsonNode(msg.getData()));