From 27e15ab7d829aca676d1f1885197dc988a6e2125 Mon Sep 17 00:00:00 2001 From: ShvaykaD Date: Thu, 14 Jan 2021 10:41:14 +0200 Subject: [PATCH] merge after cherry-pick --- .../org/thingsboard/server/dao/audit/AuditLogServiceImpl.java | 4 ++-- .../org/thingsboard/server/dao/util/mapping/JacksonUtil.java | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java index 3367234095..8e0490b2c7 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java @@ -262,7 +262,7 @@ public class AuditLogServiceImpl implements AuditLogService { case PROVISION_FAILURE: ProvisionRequest request = extractParameter(ProvisionRequest.class, additionalInfo); if (request != null) { - actionData.set("provisionRequest", objectMapper.valueToTree(request)); + actionData.set("provisionRequest", JacksonUtil.valueToTree(request)); } break; case TIMESERIES_UPDATED: @@ -273,7 +273,7 @@ public class AuditLogServiceImpl implements AuditLogService { updatedTimeseries.stream() .collect(Collectors.groupingBy(TsKvEntry::getTs)) .forEach((k, v) -> { - ObjectNode element = objectMapper.createObjectNode(); + ObjectNode element = JacksonUtil.newObjectNode(); element.put("ts", k); ObjectNode values = element.putObject("values"); v.forEach(kvEntry -> values.put(kvEntry.getKey(), kvEntry.getValueAsString())); diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JacksonUtil.java b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JacksonUtil.java index 587173c910..1a56ff54e1 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JacksonUtil.java +++ b/dao/src/main/java/org/thingsboard/server/dao/util/mapping/JacksonUtil.java @@ -66,10 +66,6 @@ public class JacksonUtil { throw new IllegalArgumentException(e); } } - - public static ObjectNode newObjectNode(){ - return OBJECT_MAPPER.createObjectNode(); - } public static ObjectNode newObjectNode(){ return OBJECT_MAPPER.createObjectNode();