Browse Source

merge after cherry-pick

pull/3949/head
ShvaykaD 6 years ago
parent
commit
27e15ab7d8
  1. 4
      dao/src/main/java/org/thingsboard/server/dao/audit/AuditLogServiceImpl.java
  2. 4
      dao/src/main/java/org/thingsboard/server/dao/util/mapping/JacksonUtil.java

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

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

Loading…
Cancel
Save