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

merge after cherry-pick

Browse Source
This commit is contained in:
ShvaykaD 2021-01-14 10:41:14 +02:00
parent b0e6f72658
commit 27e15ab7d8
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
View File

@ -262,7 +262,7 @@ public class AuditLogServiceImpl implements AuditLogService {
case PROVISION_FAILURE: case PROVISION_FAILURE:
ProvisionRequest request = extractParameter(ProvisionRequest.class, additionalInfo); ProvisionRequest request = extractParameter(ProvisionRequest.class, additionalInfo);
if (request != null) { if (request != null) {
actionData.set("provisionRequest", objectMapper.valueToTree(request)); actionData.set("provisionRequest", JacksonUtil.valueToTree(request));
} }
break; break;
case TIMESERIES_UPDATED: case TIMESERIES_UPDATED:
@ -273,7 +273,7 @@ public class AuditLogServiceImpl implements AuditLogService {
updatedTimeseries.stream() updatedTimeseries.stream()
.collect(Collectors.groupingBy(TsKvEntry::getTs)) .collect(Collectors.groupingBy(TsKvEntry::getTs))
.forEach((k, v) -> { .forEach((k, v) -> {
ObjectNode element = objectMapper.createObjectNode(); ObjectNode element = JacksonUtil.newObjectNode();
element.put("ts", k); element.put("ts", k);
ObjectNode values = element.putObject("values"); ObjectNode values = element.putObject("values");
v.forEach(kvEntry -> values.put(kvEntry.getKey(), kvEntry.getValueAsString())); v.forEach(kvEntry -> values.put(kvEntry.getKey(), kvEntry.getValueAsString()));

4
dao/src/main/java/org/thingsboard/server/dao/util/mapping/JacksonUtil.java
View File

@ -66,10 +66,6 @@ public class JacksonUtil {
throw new IllegalArgumentException(e); throw new IllegalArgumentException(e);
} }
} }
public static ObjectNode newObjectNode(){
return OBJECT_MAPPER.createObjectNode();
}
public static ObjectNode newObjectNode(){ public static ObjectNode newObjectNode(){
return OBJECT_MAPPER.createObjectNode(); return OBJECT_MAPPER.createObjectNode();