From 565234f7a126e94de29362c6fdb4bf385dd57b3f Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Fri, 10 Feb 2023 17:41:21 +0200
Subject: [PATCH] refactoring

---
 .../server/dao/user/UserSettingsServiceImpl.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsServiceImpl.java
index a5f9d2f79f..88087d28b1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserSettingsServiceImpl.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.dao.user;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -86,13 +87,12 @@ public class UserSettingsServiceImpl extends AbstractCachedService<UserId, UserS
         log.trace("Executing deleteUserSettings for user [{}]", userId);
         validateId(userId, INCORRECT_USER_ID + userId);
         UserSettings userSettings = userSettingsDao.findById(tenantId, userId);
-        ObjectNode settings = (ObjectNode) userSettings.getSettings();
-
+        DocumentContext docSettings = JsonPath.parse(userSettings.getSettings().toString());
         try {
             for (String s : jsonPaths) {
-                settings = new ObjectMapper().readValue(JsonPath.parse(settings.toString()).delete("$." + s).jsonString(), ObjectNode.class);
-                userSettings.setSettings(settings);
+                docSettings = docSettings.delete("$." + s);
             }
+            userSettings.setSettings(new ObjectMapper().readValue(docSettings.jsonString(), ObjectNode.class));
             userSettingsDao.save(tenantId, userSettings);
             publishEvictEvent(new UserSettingsEvictEvent(userSettings.getUserId()));
         } catch (Exception t) {