Commit 27e15ab7d829aca676d1f1885197dc988a6e2125

Authored by ShvaykaD
1 parent b0e6f726

merge after cherry-pick

... ... @@ -262,7 +262,7 @@ public class AuditLogServiceImpl implements AuditLogService {
262 262 case PROVISION_FAILURE:
263 263 ProvisionRequest request = extractParameter(ProvisionRequest.class, additionalInfo);
264 264 if (request != null) {
265   - actionData.set("provisionRequest", objectMapper.valueToTree(request));
  265 + actionData.set("provisionRequest", JacksonUtil.valueToTree(request));
266 266 }
267 267 break;
268 268 case TIMESERIES_UPDATED:
... ... @@ -273,7 +273,7 @@ public class AuditLogServiceImpl implements AuditLogService {
273 273 updatedTimeseries.stream()
274 274 .collect(Collectors.groupingBy(TsKvEntry::getTs))
275 275 .forEach((k, v) -> {
276   - ObjectNode element = objectMapper.createObjectNode();
  276 + ObjectNode element = JacksonUtil.newObjectNode();
277 277 element.put("ts", k);
278 278 ObjectNode values = element.putObject("values");
279 279 v.forEach(kvEntry -> values.put(kvEntry.getKey(), kvEntry.getValueAsString()));
... ...
... ... @@ -66,10 +66,6 @@ public class JacksonUtil {
66 66 throw new IllegalArgumentException(e);
67 67 }
68 68 }
69   -
70   - public static ObjectNode newObjectNode(){
71   - return OBJECT_MAPPER.createObjectNode();
72   - }
73 69
74 70 public static ObjectNode newObjectNode(){
75 71 return OBJECT_MAPPER.createObjectNode();
... ...