From 28de53425b7d83b7b26d5397837524836c173987 Mon Sep 17 00:00:00 2001
From: Oleksii Kuripko <alexeu.kyripko@gmail.com>
Date: Tue, 21 Apr 2026 09:28:19 +0200
Subject: [PATCH 01/91] Incident feature for tb-monitoring

Adds Slack-API-based incident grouping for the monitoring microservice:
alerts that fire within resolution_timeout_s are threaded under a single
"Incident" message whose header tracks affected services in real time, and
the incident auto-resolves after a quiet period with a final summary.

Highlights
- Dual Slack modes: when bot_token + channel_id are set, alerts go through
  chat.postMessage / chat.update with threaded replies; otherwise the
  existing webhook path is used unchanged.
- Incident header shows :red_circle: failing / :large_yellow_circle: high
  latency / :large_green_circle: recovered services with live failure
  counts and elapsed duration (updated every minute).
- Notifications carry structured affected-service data
  (AffectedService { name, status, failureCount }) so the incident layer no
  longer parses formatted alert text with regex.
- IncidentManager is decoupled from Slack via a small IncidentTransport
  interface; SlackIncidentTransport adapts SlackApiClient.
- PE/other service-key types can plug in a friendly name via the
  ShortNameProvider interface; TransportInfo implements it.
- Config lives under monitoring.notifications.incident.* (enabled,
  resolution_timeout_s, tag_channel). Slack bot config stays under
  monitoring.notifications.slack.{bot_token,channel_id}. YAML defaults are
  authoritative; Spring @Value no longer carries a conflicting fallback.
- Concurrency: state and transport I/O run under the manager's monitor.
  Slack client has explicit 5s call timeouts (set on SlackConfig) so the
  hold time is bounded. Slack client is closed on PreDestroy.
- HTTP failure text is sanitised: HTML response bodies are stripped so
  Nginx-style error pages don't flood alerts.
- BaseMonitoringService splits login / WS connect / WS subscribe into
  distinct MonitoredServiceKey entries, uses catch(Exception) instead of
  catch(Throwable), and wraps WsClient in try-with-resources.
- Unit tests cover incident lifecycle, status transitions, duration
  formatting, HTML body stripping, and the ShortNameProvider dispatch.
---
 monitoring/pom.xml                            |   9 +
 .../config/transport/TransportInfo.java       |  10 +-
 .../monitoring/data/MonitoredServiceKey.java  |   3 +
 .../data/notification/AffectedService.java    |  34 +++
 .../notification/HighLatencyNotification.java |   9 +
 .../data/notification/InfoNotification.java   |   5 +
 .../data/notification/Notification.java       |  10 +
 .../ServiceFailureNotification.java           |  38 +++
 .../ServiceRecoveryNotification.java          |   7 +
 .../data/notification/ShortNameProvider.java  |  22 ++
 .../notification/NotificationService.java     |   2 +-
 .../channels/NotificationChannel.java         |   4 +-
 .../channels/impl/SlackApiClient.java         | 125 ++++++++
 .../channels/impl/SlackIncidentTransport.java |  45 +++
 .../impl/SlackNotificationChannel.java        |  69 ++++-
 .../incident/IncidentManager.java             | 279 ++++++++++++++++++
 .../incident/IncidentTransport.java           |  26 ++
 .../monitoring/service/BaseHealthChecker.java |   3 +-
 .../service/BaseMonitoringService.java        |  37 ++-
 .../service/MonitoringReporter.java           |   5 +-
 .../src/main/resources/tb-monitoring.yml      |  13 +
 .../ServiceFailureNotificationTest.java       |  70 +++++
 .../incident/IncidentManagerTest.java         | 162 ++++++++++
 23 files changed, 965 insertions(+), 22 deletions(-)
 create mode 100644 monitoring/src/main/java/org/thingsboard/monitoring/data/notification/AffectedService.java
 create mode 100644 monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ShortNameProvider.java
 create mode 100644 monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackApiClient.java
 create mode 100644 monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackIncidentTransport.java
 create mode 100644 monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
 create mode 100644 monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentTransport.java
 create mode 100644 monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
 create mode 100644 monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java

diff --git a/monitoring/pom.xml b/monitoring/pom.xml
index 5bc1fb5baa..571586b8c3 100644
--- a/monitoring/pom.xml
+++ b/monitoring/pom.xml
@@ -79,6 +79,10 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.slack.api</groupId>
+            <artifactId>slack-api-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.leshan</groupId>
             <artifactId>leshan-client-cf</artifactId>
@@ -118,6 +122,11 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportInfo.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportInfo.java
index 251b5e1d85..cc9801dcad 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportInfo.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportInfo.java
@@ -16,13 +16,21 @@
 package org.thingsboard.monitoring.config.transport;
 
 import lombok.Data;
+import org.thingsboard.monitoring.data.notification.ShortNameProvider;
 
 @Data
-public class TransportInfo {
+public class TransportInfo implements ShortNameProvider {
 
     private final TransportType type;
     private final TransportMonitoringTarget target;
 
+    public String getShortName() {
+        if (target.getQueue().equals("Main")) {
+            return type.getName();
+        }
+        return type.getName() + " " + target.getQueue();
+    }
+
     @Override
     public String toString() {
         if (target.getQueue().equals("Main")) {
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
index 28fa6a9e18..c566e8f896 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
@@ -18,6 +18,9 @@ package org.thingsboard.monitoring.data;
 public class MonitoredServiceKey {
 
     public static final String GENERAL = "Monitoring";
+    public static final String LOGIN = "Login";
+    public static final String WS_CONNECT = "WS Connect";
+    public static final String WS_SUBSCRIBE = "WS Subscribe";
     public static final String EDQS = "*EDQS*";
 
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/AffectedService.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/AffectedService.java
new file mode 100644
index 0000000000..b30a398223
--- /dev/null
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/AffectedService.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.monitoring.data.notification;
+
+public record AffectedService(String name, Status status, int failureCount) {
+
+    public enum Status { FAILING, RECOVERED, HIGH_LATENCY }
+
+    public static AffectedService failing(String name, int failureCount) {
+        return new AffectedService(name, Status.FAILING, failureCount);
+    }
+
+    public static AffectedService recovered(String name) {
+        return new AffectedService(name, Status.RECOVERED, 0);
+    }
+
+    public static AffectedService highLatency(String name) {
+        return new AffectedService(name, Status.HIGH_LATENCY, 0);
+    }
+
+}
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/HighLatencyNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/HighLatencyNotification.java
index 9a319eb6c9..3e739ec4dc 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/HighLatencyNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/HighLatencyNotification.java
@@ -18,6 +18,8 @@ package org.thingsboard.monitoring.data.notification;
 import org.thingsboard.monitoring.data.Latency;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class HighLatencyNotification implements Notification {
 
@@ -39,4 +41,11 @@ public class HighLatencyNotification implements Notification {
         return text.toString();
     }
 
+    @Override
+    public List<AffectedService> getAffectedServices() {
+        return highLatencies.stream()
+                .map(latency -> AffectedService.highLatency(latency.getKey()))
+                .collect(Collectors.toList());
+    }
+
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/InfoNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/InfoNotification.java
index b2b73414de..6906e8c732 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/InfoNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/InfoNotification.java
@@ -24,4 +24,9 @@ public class InfoNotification implements Notification {
     public String getText() {
         return message;
     }
+
+    @Override
+    public boolean isIncident() {
+        return false;
+    }
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/Notification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/Notification.java
index 33ed7f8328..7734fc62ee 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/Notification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/Notification.java
@@ -15,8 +15,18 @@
  */
 package org.thingsboard.monitoring.data.notification;
 
+import java.util.List;
+
 public interface Notification {
 
     String getText();
 
+    default boolean isIncident() {
+        return true;
+    }
+
+    default List<AffectedService> getAffectedServices() {
+        return List.of();
+    }
+
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
index dd93f232a6..47daf043ab 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
@@ -18,6 +18,8 @@ package org.thingsboard.monitoring.data.notification;
 import lombok.Getter;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
+import java.util.List;
+
 @Getter
 public class ServiceFailureNotification implements Notification {
 
@@ -43,7 +45,43 @@ public class ServiceFailureNotification implements Notification {
         if (errorMsg == null) {
             errorMsg = error.getClass().getSimpleName();
         }
+        errorMsg = stripResponseBody(errorMsg);
         return String.format("%s - Failure: %s (number of subsequent failures: %s)", serviceKey, errorMsg, failuresCount);
     }
 
+    static String stripResponseBody(String msg) {
+        if (msg == null) {
+            return null;
+        }
+        int htmlIdx = -1;
+        for (String marker : new String[]{"<html", "<HTML", "<!DOCTYPE", "<!doctype"}) {
+            int idx = msg.indexOf(marker);
+            if (idx >= 0 && (htmlIdx < 0 || idx < htmlIdx)) {
+                htmlIdx = idx;
+            }
+        }
+        if (htmlIdx > 0) {
+            msg = msg.substring(0, htmlIdx).stripTrailing();
+            if (msg.endsWith("\"")) {
+                msg = msg.substring(0, msg.length() - 1).stripTrailing();
+            }
+            if (msg.endsWith(":")) {
+                msg = msg.substring(0, msg.length() - 1).stripTrailing();
+            }
+        }
+        return msg;
+    }
+
+    @Override
+    public List<AffectedService> getAffectedServices() {
+        return List.of(AffectedService.failing(shortName(serviceKey), failuresCount));
+    }
+
+    static String shortName(Object serviceKey) {
+        if (serviceKey instanceof ShortNameProvider provider) {
+            return provider.getShortName();
+        }
+        return serviceKey.toString();
+    }
+
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceRecoveryNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceRecoveryNotification.java
index b6e0c7c695..31b32422a1 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceRecoveryNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceRecoveryNotification.java
@@ -15,6 +15,8 @@
  */
 package org.thingsboard.monitoring.data.notification;
 
+import java.util.List;
+
 public class ServiceRecoveryNotification implements Notification {
 
     private final Object serviceKey;
@@ -28,4 +30,9 @@ public class ServiceRecoveryNotification implements Notification {
         return String.format("%s is OK", serviceKey);
     }
 
+    @Override
+    public List<AffectedService> getAffectedServices() {
+        return List.of(AffectedService.recovered(ServiceFailureNotification.shortName(serviceKey)));
+    }
+
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ShortNameProvider.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ShortNameProvider.java
new file mode 100644
index 0000000000..96c63023af
--- /dev/null
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ShortNameProvider.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.monitoring.data.notification;
+
+public interface ShortNameProvider {
+
+    String getShortName();
+
+}
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/NotificationService.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/NotificationService.java
index e813b3205d..091a331438 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/NotificationService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/NotificationService.java
@@ -51,7 +51,7 @@ public class NotificationService {
         return notificationChannels.stream().map(notificationChannel ->
             notificationExecutor.submit(() -> {
                 try {
-                    notificationChannel.sendNotification(message);
+                    notificationChannel.sendNotification(message, notification);
                 } catch (Exception e) {
                     log.error("Failed to send notification to {}", notificationChannel.getClass().getSimpleName(), e);
                 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/NotificationChannel.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/NotificationChannel.java
index 126942cb3f..614fddda31 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/NotificationChannel.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/NotificationChannel.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.monitoring.notification.channels;
 
+import org.thingsboard.monitoring.data.notification.Notification;
+
 public interface NotificationChannel {
 
-    void sendNotification(String message);
+    void sendNotification(String message, Notification notification);
 
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackApiClient.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackApiClient.java
new file mode 100644
index 0000000000..4ad74d7811
--- /dev/null
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackApiClient.java
@@ -0,0 +1,125 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.monitoring.notification.channels.impl;
+
+import com.slack.api.Slack;
+import com.slack.api.SlackConfig;
+import com.slack.api.methods.MethodsClient;
+import com.slack.api.methods.SlackApiTextResponse;
+import com.slack.api.methods.request.chat.ChatPostMessageRequest;
+import com.slack.api.methods.request.chat.ChatUpdateRequest;
+import com.slack.api.methods.response.chat.ChatPostMessageResponse;
+import com.slack.api.methods.response.chat.ChatUpdateResponse;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class SlackApiClient {
+
+    private static final int DEFAULT_CALL_TIMEOUT_MS = 5000;
+
+    private final Slack slack;
+    private final String botToken;
+
+    public SlackApiClient(String botToken) {
+        this(botToken, DEFAULT_CALL_TIMEOUT_MS);
+    }
+
+    public SlackApiClient(String botToken, int callTimeoutMs) {
+        this.botToken = botToken;
+        SlackConfig config = new SlackConfig();
+        config.setHttpClientCallTimeoutMillis(callTimeoutMs);
+        config.setHttpClientReadTimeoutMillis(callTimeoutMs);
+        config.setHttpClientWriteTimeoutMillis(callTimeoutMs);
+        this.slack = Slack.getInstance(config);
+    }
+
+    public String postMessage(String channelId, String text) {
+        ChatPostMessageRequest request = ChatPostMessageRequest.builder()
+                .channel(channelId)
+                .text(text)
+                .build();
+        ChatPostMessageResponse response = sendRequest(request);
+        return response.getTs();
+    }
+
+    public String postThreadReply(String channelId, String threadTs, String text) {
+        ChatPostMessageRequest request = ChatPostMessageRequest.builder()
+                .channel(channelId)
+                .text(text)
+                .threadTs(threadTs)
+                .build();
+        ChatPostMessageResponse response = sendRequest(request);
+        return response.getTs();
+    }
+
+    public void close() {
+        try {
+            slack.close();
+        } catch (Exception e) {
+            log.warn("Failed to close Slack client", e);
+        }
+    }
+
+    public void updateMessage(String channelId, String ts, String text) {
+        ChatUpdateRequest request = ChatUpdateRequest.builder()
+                .channel(channelId)
+                .ts(ts)
+                .text(text)
+                .build();
+        MethodsClient client = slack.methods(botToken);
+        ChatUpdateResponse response;
+        try {
+            response = client.chatUpdate(request);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to update Slack message: " + e.getMessage(), e);
+        }
+        checkResponse(response);
+    }
+
+    private ChatPostMessageResponse sendRequest(ChatPostMessageRequest request) {
+        MethodsClient client = slack.methods(botToken);
+        ChatPostMessageResponse response;
+        try {
+            response = client.chatPostMessage(request);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to send Slack message: " + e.getMessage(), e);
+        }
+        checkResponse(response);
+        return response;
+    }
+
+    private void checkResponse(SlackApiTextResponse response) {
+        if (response.isOk()) {
+            return;
+        }
+        String error = response.getError();
+        if (error != null) {
+            switch (error) {
+                case "missing_scope" -> {
+                    String neededScope = response.getNeeded();
+                    error = "bot token scope '" + neededScope + "' is needed";
+                }
+                case "not_in_channel" -> error = "app needs to be added to the channel";
+            }
+        } else if (response.getWarning() != null) {
+            error = "warning: " + response.getWarning();
+        } else {
+            error = "unknown error";
+        }
+        throw new RuntimeException("Slack API error: " + error);
+    }
+
+}
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackIncidentTransport.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackIncidentTransport.java
new file mode 100644
index 0000000000..8812714d62
--- /dev/null
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackIncidentTransport.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.monitoring.notification.channels.impl;
+
+import org.thingsboard.monitoring.notification.incident.IncidentTransport;
+
+public class SlackIncidentTransport implements IncidentTransport {
+
+    private final SlackApiClient slackApiClient;
+    private final String channelId;
+
+    public SlackIncidentTransport(SlackApiClient slackApiClient, String channelId) {
+        this.slackApiClient = slackApiClient;
+        this.channelId = channelId;
+    }
+
+    @Override
+    public String postIncident(String text) {
+        return slackApiClient.postMessage(channelId, text);
+    }
+
+    @Override
+    public void postThreadReply(String threadId, String text) {
+        slackApiClient.postThreadReply(channelId, threadId, text);
+    }
+
+    @Override
+    public void updateIncident(String threadId, String text) {
+        slackApiClient.updateMessage(channelId, threadId, text);
+    }
+
+}
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
index c1d25c43c0..06990c5a51 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
@@ -16,13 +16,16 @@
 package org.thingsboard.monitoring.notification.channels.impl;
 
 import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
+import org.thingsboard.monitoring.data.notification.Notification;
 import org.thingsboard.monitoring.notification.channels.NotificationChannel;
+import org.thingsboard.monitoring.notification.incident.IncidentManager;
 
 import java.time.Duration;
 import java.util.Map;
@@ -35,19 +38,73 @@ public class SlackNotificationChannel implements NotificationChannel {
     @Value("${monitoring.notifications.slack.webhook_url}")
     private String webhookUrl;
 
+    @Value("${monitoring.notifications.slack.bot_token:}")
+    private String botToken;
+
+    @Value("${monitoring.notifications.slack.channel_id:}")
+    private String channelId;
+
+    @Value("${monitoring.notifications.incident.enabled:}")
+    private boolean incidentEnabled;
+
+    @Value("${monitoring.notifications.incident.resolution_timeout_s:}")
+    private long resolutionTimeoutSeconds;
+
+    @Value("${monitoring.notifications.incident.tag_channel:}")
+    private boolean tagChannel;
+
+    @Value("${monitoring.notifications.message_prefix:}")
+    private String messagePrefix;
+
     private RestTemplate restTemplate;
+    private SlackApiClient slackApiClient;
+    private IncidentManager incidentManager;
 
     @PostConstruct
     private void init() {
-        restTemplate = new RestTemplateBuilder()
-                .setConnectTimeout(Duration.ofSeconds(5))
-                .setReadTimeout(Duration.ofSeconds(2))
-                .build();
+        boolean hasBotConfig = botToken != null && !botToken.isEmpty() && channelId != null && !channelId.isEmpty();
+        if (hasBotConfig) {
+            slackApiClient = new SlackApiClient(botToken);
+            log.info("Slack API mode enabled (channel: {})", channelId);
+            if (incidentEnabled) {
+                incidentManager = new IncidentManager(new SlackIncidentTransport(slackApiClient, channelId),
+                        resolutionTimeoutSeconds, messagePrefix, tagChannel);
+                log.info("Incident grouping enabled via Slack (resolution timeout: {}s)", resolutionTimeoutSeconds);
+            }
+        } else {
+            if (incidentEnabled) {
+                log.warn("Incident grouping is enabled but Slack bot_token/channel_id are not set; " +
+                        "falling back to plain webhook mode without incident support");
+            }
+            restTemplate = new RestTemplateBuilder()
+                    .setConnectTimeout(Duration.ofSeconds(5))
+                    .setReadTimeout(Duration.ofSeconds(2))
+                    .build();
+            log.info("Slack webhook mode enabled");
+        }
     }
 
     @Override
-    public void sendNotification(String message) {
-        restTemplate.postForObject(webhookUrl, Map.of("text", message), String.class);
+    public void sendNotification(String message, Notification notification) {
+        if (incidentManager != null && notification.isIncident()) {
+            // Pass the raw notification text: IncidentManager already puts the prefix into the
+            // incident header, so pre-prefixing the thread reply would double it up.
+            incidentManager.sendAlert(notification.getText(), notification.getAffectedServices());
+        } else if (slackApiClient != null) {
+            slackApiClient.postMessage(channelId, message);
+        } else {
+            restTemplate.postForObject(webhookUrl, Map.of("text", message), String.class);
+        }
+    }
+
+    @PreDestroy
+    private void destroy() {
+        if (incidentManager != null) {
+            incidentManager.shutdown();
+        }
+        if (slackApiClient != null) {
+            slackApiClient.close();
+        }
     }
 
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
new file mode 100644
index 0000000000..133d665f4c
--- /dev/null
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
@@ -0,0 +1,279 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.monitoring.notification.incident;
+
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.monitoring.data.notification.AffectedService;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Thread-safety: all public entry points and scheduled callbacks are {@code synchronized} on the
+ * manager instance. Transport I/O is performed while the monitor is held. This is safe under the
+ * assumptions that (a) the transport enforces a short per-call timeout, and (b) notification
+ * producers are single-threaded; see the Slack client (default 5s) for the Slack-based transport.
+ */
+@Slf4j
+public class IncidentManager {
+
+    private final IncidentTransport transport;
+    private final long resolutionTimeoutSeconds;
+    private final String messagePrefix;
+    private final boolean tagChannel;
+    private final ScheduledExecutorService scheduler;
+
+    private String activeIncidentThreadId;
+    private ScheduledFuture<?> resolutionTask;
+    private ScheduledFuture<?> durationUpdateTask;
+    private Instant incidentStartTime;
+    private Instant lastAlertTime;
+    private final Map<String, Integer> failingServices = new LinkedHashMap<>();
+    private final Set<String> recoveredServices = new LinkedHashSet<>();
+    private final Set<String> highLatencyServices = new LinkedHashSet<>();
+
+    public IncidentManager(IncidentTransport transport, long resolutionTimeoutSeconds,
+                           String messagePrefix, boolean tagChannel) {
+        this.transport = transport;
+        this.resolutionTimeoutSeconds = resolutionTimeoutSeconds;
+        this.messagePrefix = messagePrefix;
+        this.tagChannel = tagChannel;
+        this.scheduler = Executors.newSingleThreadScheduledExecutor(r -> {
+            Thread t = new Thread(r, "incident-manager");
+            t.setDaemon(true);
+            return t;
+        });
+    }
+
+    public synchronized void sendAlert(String message, List<AffectedService> affectedServices) {
+        try {
+            if (activeIncidentThreadId == null) {
+                if (affectedServices.stream().allMatch(s -> s.status() == AffectedService.Status.RECOVERED)) {
+                    return;
+                }
+                incidentStartTime = Instant.now();
+                failingServices.clear();
+                recoveredServices.clear();
+                highLatencyServices.clear();
+                applyAffectedServices(affectedServices);
+                activeIncidentThreadId = transport.postIncident(buildOngoingMessageText());
+                startDurationUpdater();
+                log.info("New incident created, thread id: {}", activeIncidentThreadId);
+            } else if (applyAffectedServices(affectedServices)) {
+                safeUpdateHeader();
+            }
+
+            try {
+                transport.postThreadReply(activeIncidentThreadId, message);
+                log.debug("Alert added to incident thread {}", activeIncidentThreadId);
+            } catch (Exception e) {
+                log.error("Failed to post alert to incident thread {}", activeIncidentThreadId, e);
+            }
+        } finally {
+            if (activeIncidentThreadId != null) {
+                lastAlertTime = Instant.now();
+                resetResolutionTimer();
+            }
+        }
+    }
+
+    private boolean applyAffectedServices(List<AffectedService> affectedServices) {
+        boolean changed = false;
+        Set<String> latencySnapshot = null;
+        for (AffectedService service : affectedServices) {
+            String name = service.name();
+            switch (service.status()) {
+                case FAILING -> {
+                    Integer prev = failingServices.put(name, service.failureCount());
+                    if (prev == null || prev.intValue() != service.failureCount()) {
+                        changed = true;
+                    }
+                    if (recoveredServices.remove(name)) {
+                        changed = true;
+                    }
+                }
+                case RECOVERED -> {
+                    if (failingServices.remove(name) != null) {
+                        recoveredServices.add(name);
+                        changed = true;
+                    }
+                }
+                case HIGH_LATENCY -> {
+                    if (latencySnapshot == null) {
+                        latencySnapshot = new LinkedHashSet<>();
+                    }
+                    latencySnapshot.add(name);
+                }
+            }
+        }
+        // HighLatencyNotification carries the full current set of high latencies, so treat it as a
+        // snapshot: replace highLatencyServices entirely. Without this, a brief spike would stay
+        // yellow in the header until the incident resolves.
+        if (latencySnapshot != null && !latencySnapshot.equals(highLatencyServices)) {
+            highLatencyServices.clear();
+            highLatencyServices.addAll(latencySnapshot);
+            changed = true;
+        }
+        return changed;
+    }
+
+    private String buildOngoingMessageText() {
+        StringBuilder sb = new StringBuilder();
+        if (tagChannel) {
+            sb.append("<!channel> ");
+        }
+        if (messagePrefix != null && !messagePrefix.isEmpty()) {
+            sb.append("*").append(messagePrefix).append("*");
+        }
+        sb.append(" :rotating_light:");
+        Duration elapsed = Duration.between(incidentStartTime, Instant.now());
+        if (elapsed.toMinutes() >= 1) {
+            sb.append(" (").append(formatDuration(elapsed)).append(")");
+        }
+        if (hasAffected()) {
+            sb.append(" | ").append(formatAffectedServices());
+        }
+        return sb.toString();
+    }
+
+    private boolean hasAffected() {
+        return !failingServices.isEmpty() || !recoveredServices.isEmpty() || !highLatencyServices.isEmpty();
+    }
+
+    private void safeUpdateHeader() {
+        try {
+            transport.updateIncident(activeIncidentThreadId, buildOngoingMessageText());
+        } catch (Exception e) {
+            log.error("Failed to update incident message", e);
+        }
+    }
+
+    private void resetResolutionTimer() {
+        if (resolutionTask != null) {
+            resolutionTask.cancel(false);
+        }
+        resolutionTask = scheduler.schedule(this::resolveIncident, resolutionTimeoutSeconds, TimeUnit.SECONDS);
+    }
+
+    private void startDurationUpdater() {
+        if (durationUpdateTask != null) {
+            durationUpdateTask.cancel(false);
+        }
+        durationUpdateTask = scheduler.scheduleAtFixedRate(this::updateDuration, 60, 60, TimeUnit.SECONDS);
+    }
+
+    private synchronized void updateDuration() {
+        if (activeIncidentThreadId == null) {
+            return;
+        }
+        safeUpdateHeader();
+    }
+
+    private void stopDurationUpdater() {
+        if (durationUpdateTask != null) {
+            durationUpdateTask.cancel(false);
+            durationUpdateTask = null;
+        }
+    }
+
+    static String formatDuration(Duration duration) {
+        long totalMinutes = duration.toMinutes();
+        if (totalMinutes < 60) {
+            return totalMinutes + "m";
+        }
+        long hours = totalMinutes / 60;
+        long minutes = totalMinutes % 60;
+        return minutes > 0 ? hours + "h" + minutes + "m" : hours + "h";
+    }
+
+    synchronized void resolveIncident() {
+        if (activeIncidentThreadId == null) {
+            return;
+        }
+        String threadId = activeIncidentThreadId;
+        stopDurationUpdater();
+        String resolutionMessage = buildResolutionMessage();
+        activeIncidentThreadId = null;
+        resolutionTask = null;
+        failingServices.clear();
+        recoveredServices.clear();
+        highLatencyServices.clear();
+        try {
+            transport.updateIncident(threadId, resolutionMessage);
+            log.info("Incident resolved (thread was {})", threadId);
+        } catch (Exception e) {
+            log.error("Failed to send incident resolution message", e);
+        }
+    }
+
+    private String buildResolutionMessage() {
+        Duration totalDuration = lastAlertTime != null
+                ? Duration.between(incidentStartTime, lastAlertTime)
+                : Duration.between(incidentStartTime, Instant.now());
+        StringBuilder sb = new StringBuilder();
+        if (messagePrefix != null && !messagePrefix.isEmpty()) {
+            sb.append("*").append(messagePrefix).append("*");
+        }
+        sb.append(" :white_check_mark:");
+        sb.append(" (").append(formatDuration(totalDuration)).append(")");
+        if (hasAffected()) {
+            sb.append(" | ").append(formatAffectedServices()).append("\n");
+        }
+        return sb.toString();
+    }
+
+    private String formatAffectedServices() {
+        StringBuilder sb = new StringBuilder();
+        boolean first = true;
+        for (Map.Entry<String, Integer> entry : failingServices.entrySet()) {
+            if (!first) sb.append(", ");
+            sb.append(":red_circle: ").append(entry.getKey()).append(" (").append(entry.getValue()).append(")");
+            first = false;
+        }
+        for (String name : highLatencyServices) {
+            if (!first) sb.append(", ");
+            sb.append(":large_yellow_circle: ").append(name);
+            first = false;
+        }
+        for (String name : recoveredServices) {
+            if (!first) sb.append(", ");
+            sb.append(":large_green_circle: ").append(name);
+            first = false;
+        }
+        return sb.toString();
+    }
+
+    public void shutdown() {
+        scheduler.shutdownNow();
+        try {
+            if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
+                log.warn("Incident scheduler did not terminate in time");
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+}
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentTransport.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentTransport.java
new file mode 100644
index 0000000000..0d6b4cac2a
--- /dev/null
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentTransport.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.monitoring.notification.incident;
+
+public interface IncidentTransport {
+
+    String postIncident(String text);
+
+    void postThreadReply(String threadId, String text);
+
+    void updateIncident(String threadId, String text);
+
+}
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
index b73194469f..c0e85da1ac 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
@@ -89,11 +89,10 @@ public abstract class BaseHealthChecker<C extends MonitoringConfig, T extends Mo
             checkWsUpdates(wsClient, testValue);
 
             reporter.serviceIsOk(info);
-            reporter.serviceIsOk(MonitoredServiceKey.GENERAL);
         } catch (ServiceFailureException e) {
             reporter.serviceFailure(e.getServiceKey(), e);
         } catch (Exception e) {
-            reporter.serviceFailure(MonitoredServiceKey.GENERAL, e);
+            reporter.serviceFailure(info, e);
         }
 
         associates.values().forEach(healthChecker -> {
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
index ea154e49c0..3f1c624200 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
@@ -117,17 +117,40 @@ public abstract class BaseMonitoringService<C extends MonitoringConfig<T>, T ext
         }
         try {
             log.info("Starting {}", getName());
-            stopWatch.start();
-            String accessToken = tbClient.logIn();
-            reporter.reportLatency(Latencies.LOG_IN, stopWatch.getTime());
 
-            try (WsClient wsClient = wsClientFactory.createClient(accessToken)) {
+            String accessToken;
+            try {
                 stopWatch.start();
-                wsClient.subscribeForTelemetry(devices, getTestTelemetryKeys()).waitForReply();
-                reporter.reportLatency(Latencies.WS_SUBSCRIBE, stopWatch.getTime());
+                accessToken = tbClient.logIn();
+                reporter.reportLatency(Latencies.LOG_IN, stopWatch.getTime());
+                reporter.serviceIsOk(MonitoredServiceKey.LOGIN);
+            } catch (Exception e) {
+                reporter.serviceFailure(MonitoredServiceKey.LOGIN, e);
+                return;
+            }
+
+            WsClient wsClient;
+            try {
+                wsClient = wsClientFactory.createClient(accessToken);
+                reporter.serviceIsOk(MonitoredServiceKey.WS_CONNECT);
+            } catch (Exception e) {
+                reporter.serviceFailure(MonitoredServiceKey.WS_CONNECT, e);
+                return;
+            }
+
+            try (WsClient ws = wsClient) {
+                try {
+                    stopWatch.start();
+                    ws.subscribeForTelemetry(devices, getTestTelemetryKeys()).waitForReply();
+                    reporter.reportLatency(Latencies.WS_SUBSCRIBE, stopWatch.getTime());
+                    reporter.serviceIsOk(MonitoredServiceKey.WS_SUBSCRIBE);
+                } catch (Exception e) {
+                    reporter.serviceFailure(MonitoredServiceKey.WS_SUBSCRIBE, e);
+                    return;
+                }
 
                 for (BaseHealthChecker<C, T> healthChecker : healthCheckers) {
-                    check(healthChecker, wsClient);
+                    check(healthChecker, ws);
                 }
             }
 
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringReporter.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringReporter.java
index b13394dbdc..75a8a819c0 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringReporter.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringReporter.java
@@ -25,7 +25,6 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.monitoring.client.TbClient;
 import org.thingsboard.monitoring.data.Latency;
-import org.thingsboard.monitoring.data.MonitoredServiceKey;
 import org.thingsboard.monitoring.data.notification.HighLatencyNotification;
 import org.thingsboard.monitoring.data.notification.ServiceFailureNotification;
 import org.thingsboard.monitoring.data.notification.ServiceRecoveryNotification;
@@ -119,9 +118,7 @@ public class MonitoringReporter {
 
     public void serviceIsOk(Object serviceKey) {
         ServiceRecoveryNotification notification = new ServiceRecoveryNotification(serviceKey);
-        if (!serviceKey.equals(MonitoredServiceKey.GENERAL)) {
-            log.info(notification.getText());
-        }
+        log.info(notification.getText());
         AtomicInteger failuresCounter = failuresCounters.get(serviceKey);
         if (failuresCounter != null) {
             if (failuresCounter.get() >= failuresThreshold) {
diff --git a/monitoring/src/main/resources/tb-monitoring.yml b/monitoring/src/main/resources/tb-monitoring.yml
index 053e42bb9d..768fd2e4c7 100644
--- a/monitoring/src/main/resources/tb-monitoring.yml
+++ b/monitoring/src/main/resources/tb-monitoring.yml
@@ -121,11 +121,24 @@ monitoring:
 
   notifications:
     message_prefix: '${NOTIFICATION_MESSAGE_PREFIX:}'
+    # Incident grouping (threads alerts into incidents, auto-resolves after timeout).
+    # Requires a channel that supports it — currently only Slack API (bot_token + channel_id).
+    incident:
+      # Enable incident grouping
+      enabled: '${INCIDENT_ENABLED:false}'
+      # Incident resolution timeout in seconds
+      resolution_timeout_s: '${INCIDENT_RESOLUTION_TIMEOUT_S:90}'
+      # Tag @channel in incident messages
+      tag_channel: '${INCIDENT_TAG_CHANNEL:false}'
     slack:
       # Enable notifying via Slack
       enabled: '${SLACK_NOTIFICATION_CHANNEL_ENABLED:false}'
       # Slack webhook url
       webhook_url: '${SLACK_WEBHOOK_URL:}'
+      # Slack Bot OAuth token (xoxb-...) for API-based messaging with incident support, requires chat:write:bot scope
+      bot_token: '${SLACK_BOT_TOKEN:}'
+      # Slack channel ID (e.g. C01234ABCDE) - required when incident feature is enabled
+      channel_id: '${SLACK_CHANNEL_ID:}'
 
   latency:
     # Enable latencies reporting
diff --git a/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java b/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
new file mode 100644
index 0000000000..92c6996d1d
--- /dev/null
+++ b/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.monitoring.data.notification;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ServiceFailureNotificationTest {
+
+    @Test
+    void stripResponseBodyRemovesNginxErrorHtml() {
+        String msg = "503 Service Temporarily Unavailable on POST request for \"https://domain/api/auth/login\": \""
+                + "<html><head><title>503 Service Temporarily Unavailable</title></head>"
+                + "<body><center><h1>503 Service Temporarily Unavailable</h1></center><hr><center>nginx</center></body></html>\"";
+
+        String sanitized = ServiceFailureNotification.stripResponseBody(msg);
+
+        assertThat(sanitized)
+                .isEqualTo("503 Service Temporarily Unavailable on POST request for \"https://domain/api/auth/login\"");
+    }
+
+    @Test
+    void stripResponseBodyRemovesDoctypeHtml() {
+        String msg = "500 Internal Server Error: \"<!DOCTYPE html><html>...</html>\"";
+
+        String sanitized = ServiceFailureNotification.stripResponseBody(msg);
+
+        assertThat(sanitized).isEqualTo("500 Internal Server Error");
+    }
+
+    @Test
+    void stripResponseBodyLeavesPlainMessagesUntouched() {
+        String msg = "Connection refused";
+        assertThat(ServiceFailureNotification.stripResponseBody(msg)).isEqualTo(msg);
+    }
+
+    @Test
+    void stripResponseBodyHandlesNull() {
+        assertThat(ServiceFailureNotification.stripResponseBody(null)).isNull();
+    }
+
+    @Test
+    void shortNameUsesShortNameProviderWhenAvailable() {
+        ShortNameProvider provider = () -> "MQTT";
+        assertThat(ServiceFailureNotification.shortName(provider)).isEqualTo("MQTT");
+    }
+
+    @Test
+    void shortNameFallsBackToToStringForOtherKeys() {
+        Object key = new Object() {
+            @Override public String toString() { return "LOGIN"; }
+        };
+        assertThat(ServiceFailureNotification.shortName(key)).isEqualTo("LOGIN");
+    }
+
+}
diff --git a/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java b/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java
new file mode 100644
index 0000000000..81202efe25
--- /dev/null
+++ b/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.monitoring.notification.incident;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.thingsboard.monitoring.data.notification.AffectedService;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class IncidentManagerTest {
+
+    private RecordingTransport transport;
+    private IncidentManager manager;
+
+    @BeforeEach
+    void setUp() {
+        transport = new RecordingTransport();
+        manager = new IncidentManager(transport, 3600L, "tbqa", false);
+    }
+
+    @AfterEach
+    void tearDown() {
+        manager.shutdown();
+    }
+
+    @Test
+    void formatDurationRendersMinutesAndHours() {
+        assertThat(IncidentManager.formatDuration(Duration.ofSeconds(30))).isEqualTo("0m");
+        assertThat(IncidentManager.formatDuration(Duration.ofMinutes(5))).isEqualTo("5m");
+        assertThat(IncidentManager.formatDuration(Duration.ofMinutes(59))).isEqualTo("59m");
+        assertThat(IncidentManager.formatDuration(Duration.ofMinutes(60))).isEqualTo("1h");
+        assertThat(IncidentManager.formatDuration(Duration.ofMinutes(75))).isEqualTo("1h15m");
+        assertThat(IncidentManager.formatDuration(Duration.ofMinutes(120))).isEqualTo("2h");
+    }
+
+    @Test
+    void firstFailureOpensIncidentAndPostsHeaderAndReply() {
+        manager.sendAlert("CoAP failure message",
+                List.of(AffectedService.failing("CoAP", 1)));
+
+        assertThat(transport.incidents).hasSize(1);
+        assertThat(transport.incidents.get(0)).contains(":rotating_light:").contains(":red_circle: CoAP (1)");
+        assertThat(transport.replies).hasSize(1);
+        assertThat(transport.replies.get(0).text()).isEqualTo("CoAP failure message");
+    }
+
+    @Test
+    void isolatedRecoveryWithoutActiveIncidentIsIgnored() {
+        manager.sendAlert("Login is OK",
+                List.of(AffectedService.recovered("Login")));
+
+        assertThat(transport.incidents).isEmpty();
+        assertThat(transport.replies).isEmpty();
+        assertThat(transport.updates).isEmpty();
+    }
+
+    @Test
+    void subsequentFailureUpdatesHeaderAndPostsReply() {
+        manager.sendAlert("CoAP failure", List.of(AffectedService.failing("CoAP", 1)));
+        manager.sendAlert("CoAP repeat", List.of(AffectedService.failing("CoAP", 3)));
+
+        assertThat(transport.incidents).hasSize(1);
+        assertThat(transport.replies).hasSize(2);
+        assertThat(transport.updates).hasSize(1);
+        assertThat(transport.updates.get(0).text()).contains(":red_circle: CoAP (3)");
+    }
+
+    @Test
+    void recoveryAfterFailureMovesServiceToGreenAndUpdatesHeader() {
+        manager.sendAlert("CoAP failure", List.of(AffectedService.failing("CoAP", 1)));
+        manager.sendAlert("CoAP is OK", List.of(AffectedService.recovered("CoAP")));
+
+        assertThat(transport.updates).hasSize(1);
+        String updated = transport.updates.get(0).text();
+        assertThat(updated).contains(":large_green_circle: CoAP").doesNotContain(":red_circle:");
+    }
+
+    @Test
+    void highLatencyIsTrackedAsYellow() {
+        manager.sendAlert("high latency",
+                List.of(AffectedService.highLatency("logInLatency")));
+
+        assertThat(transport.incidents.get(0)).contains(":large_yellow_circle: logInLatency");
+    }
+
+    @Test
+    void repeatingSameFailureCountDoesNotTriggerRedundantUpdate() {
+        manager.sendAlert("CoAP failure", List.of(AffectedService.failing("CoAP", 3)));
+        manager.sendAlert("CoAP still failing", List.of(AffectedService.failing("CoAP", 3)));
+
+        assertThat(transport.updates).isEmpty();
+        assertThat(transport.replies).hasSize(2);
+    }
+
+    @Test
+    void fullLifecycleStartFailRecoverResolve() {
+        manager.sendAlert("Login failure", List.of(AffectedService.failing("Login", 1)));
+        manager.sendAlert("WS failure", List.of(AffectedService.failing("WS Connect", 1)));
+        manager.sendAlert("Login is OK", List.of(AffectedService.recovered("Login")));
+
+        assertThat(transport.incidents).hasSize(1);
+
+        manager.resolveIncident();
+
+        assertThat(transport.updates).last()
+                .extracting(RecordingTransport.Message::text)
+                .asString()
+                .contains(":white_check_mark:")
+                .contains(":red_circle: WS Connect")
+                .contains(":large_green_circle: Login");
+    }
+
+    @Test
+    void resolveWithoutActiveIncidentIsNoOp() {
+        manager.resolveIncident();
+        assertThat(transport.updates).isEmpty();
+    }
+
+    private static class RecordingTransport implements IncidentTransport {
+        private final AtomicInteger threadCounter = new AtomicInteger();
+        final java.util.List<String> incidents = new java.util.ArrayList<>();
+        final java.util.List<Message> replies = new java.util.ArrayList<>();
+        final java.util.List<Message> updates = new java.util.ArrayList<>();
+
+        @Override
+        public String postIncident(String text) {
+            incidents.add(text);
+            return "thread-" + threadCounter.incrementAndGet();
+        }
+
+        @Override
+        public void postThreadReply(String threadId, String text) {
+            replies.add(new Message(threadId, text));
+        }
+
+        @Override
+        public void updateIncident(String threadId, String text) {
+            updates.add(new Message(threadId, text));
+        }
+
+        record Message(String threadId, String text) {}
+    }
+}

From 7033f60881deafb3d8cbe7ff1a5391a7e0f9dc41 Mon Sep 17 00:00:00 2001
From: Oleksii Kuripko <alexeu.kyripko@gmail.com>
Date: Tue, 21 Apr 2026 10:43:14 +0200
Subject: [PATCH 02/91] bump slack-api-client from 1.39.0 to 1.48.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Changelog review (v1.40..v1.48): no breaking changes to the slack-api-client
APIs used in this codebase. The only breaking changes in v1.45.0 were in
slack-app-backend (servlet classes) and slack-api-bolt-aws-lambda-s3-storage
(AWS SDK v1→v2), neither of which we depend on. Transitive deps (okhttp,
gson, okio) are unchanged.

Verified by compiling monitoring + application against 1.48.0 and running
the monitoring unit tests plus the application Notification/Slack test
suites (15 + 54 tests, all pass).
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a4aa43688d..107e707bcf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
         <exp4j.version>0.4.8</exp4j.version>
         <aerogear-otp.version>1.0.0</aerogear-otp.version>
 
-        <slack-api.version>1.39.0</slack-api.version>
+        <slack-api.version>1.48.0</slack-api.version>
         <oshi.version>6.6.0</oshi.version>
         <google-oauth-client.version>1.35.0</google-oauth-client.version>
         <weisj-jsvg.version>1.6.1</weisj-jsvg.version>

From c87b20e0c269d6f0c94b396ea371b045e17fa378 Mon Sep 17 00:00:00 2001
From: Oleksii Kuripko <alexeu.kyripko@gmail.com>
Date: Tue, 21 Apr 2026 18:41:46 +0200
Subject: [PATCH 03/91] linkify the URL in HTTP failure messages as a Slack
 hyperlink

Transforms 'request for "<URL>"' into Slack mrkdwn <URL|request>, so the
failure line renders the word 'request' as a clickable link instead of
showing the raw URL in quotes.
---
 .../ServiceFailureNotification.java           | 17 +++++++++++++++++
 .../ServiceFailureNotificationTest.java       | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
index 47daf043ab..5fcc953cce 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
@@ -19,6 +19,8 @@ import lombok.Getter;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Getter
 public class ServiceFailureNotification implements Notification {
@@ -46,9 +48,24 @@ public class ServiceFailureNotification implements Notification {
             errorMsg = error.getClass().getSimpleName();
         }
         errorMsg = stripResponseBody(errorMsg);
+        errorMsg = linkifyRequestUrl(errorMsg);
         return String.format("%s - Failure: %s (number of subsequent failures: %s)", serviceKey, errorMsg, failuresCount);
     }
 
+    private static final Pattern REQUEST_URL_PATTERN = Pattern.compile("request for \"(https?://[^\"\\s]+)\"");
+
+    static String linkifyRequestUrl(String msg) {
+        if (msg == null) {
+            return null;
+        }
+        Matcher m = REQUEST_URL_PATTERN.matcher(msg);
+        if (!m.find()) {
+            return msg;
+        }
+        // Slack mrkdwn link: <url|label>
+        return m.replaceAll("<$1|request>");
+    }
+
     static String stripResponseBody(String msg) {
         if (msg == null) {
             return null;
diff --git a/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java b/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
index 92c6996d1d..7f66a456fe 100644
--- a/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
+++ b/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
@@ -53,6 +53,25 @@ class ServiceFailureNotificationTest {
         assertThat(ServiceFailureNotification.stripResponseBody(null)).isNull();
     }
 
+    @Test
+    void linkifyReplacesRequestForUrlWithSlackMrkdwnLink() {
+        String msg = "503 Service Temporarily Unavailable on POST request for \"https://qa-tb-pe-lts43.iot-private.cloud/api/auth/login\"";
+
+        assertThat(ServiceFailureNotification.linkifyRequestUrl(msg))
+                .isEqualTo("503 Service Temporarily Unavailable on POST <https://qa-tb-pe-lts43.iot-private.cloud/api/auth/login|request>");
+    }
+
+    @Test
+    void linkifyLeavesMessagesWithoutRequestUrlUntouched() {
+        String msg = "Connection refused";
+        assertThat(ServiceFailureNotification.linkifyRequestUrl(msg)).isEqualTo(msg);
+    }
+
+    @Test
+    void linkifyHandlesNull() {
+        assertThat(ServiceFailureNotification.linkifyRequestUrl(null)).isNull();
+    }
+
     @Test
     void shortNameUsesShortNameProviderWhenAvailable() {
         ShortNameProvider provider = () -> "MQTT";

From 43e87d458887b85c670ddb490900c823fd5015fc Mon Sep 17 00:00:00 2001
From: Oleksii Kuripko <alexeu.kyripko@gmail.com>
Date: Tue, 21 Apr 2026 18:45:44 +0200
Subject: [PATCH 04/91] preserve failure count on service recovery in incident
 header

Recovered services are now shown as ':large_green_circle: <name> (<count>)'
with the last failure count that was observed before the service recovered,
matching the red-circle format.
---
 .../notification/incident/IncidentManager.java      | 13 +++++++------
 .../notification/incident/IncidentManagerTest.java  |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
index 133d665f4c..1e52c37634 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
@@ -51,7 +51,7 @@ public class IncidentManager {
     private Instant incidentStartTime;
     private Instant lastAlertTime;
     private final Map<String, Integer> failingServices = new LinkedHashMap<>();
-    private final Set<String> recoveredServices = new LinkedHashSet<>();
+    private final Map<String, Integer> recoveredServices = new LinkedHashMap<>();
     private final Set<String> highLatencyServices = new LinkedHashSet<>();
 
     public IncidentManager(IncidentTransport transport, long resolutionTimeoutSeconds,
@@ -110,13 +110,14 @@ public class IncidentManager {
                     if (prev == null || prev.intValue() != service.failureCount()) {
                         changed = true;
                     }
-                    if (recoveredServices.remove(name)) {
+                    if (recoveredServices.remove(name) != null) {
                         changed = true;
                     }
                 }
                 case RECOVERED -> {
-                    if (failingServices.remove(name) != null) {
-                        recoveredServices.add(name);
+                    Integer lastFailureCount = failingServices.remove(name);
+                    if (lastFailureCount != null) {
+                        recoveredServices.put(name, lastFailureCount);
                         changed = true;
                     }
                 }
@@ -257,9 +258,9 @@ public class IncidentManager {
             sb.append(":large_yellow_circle: ").append(name);
             first = false;
         }
-        for (String name : recoveredServices) {
+        for (Map.Entry<String, Integer> entry : recoveredServices.entrySet()) {
             if (!first) sb.append(", ");
-            sb.append(":large_green_circle: ").append(name);
+            sb.append(":large_green_circle: ").append(entry.getKey()).append(" (").append(entry.getValue()).append(")");
             first = false;
         }
         return sb.toString();
diff --git a/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java b/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java
index 81202efe25..afcd20adf3 100644
--- a/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java
+++ b/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java
@@ -85,13 +85,13 @@ class IncidentManagerTest {
     }
 
     @Test
-    void recoveryAfterFailureMovesServiceToGreenAndUpdatesHeader() {
-        manager.sendAlert("CoAP failure", List.of(AffectedService.failing("CoAP", 1)));
+    void recoveryAfterFailureMovesServiceToGreenAndKeepsFailureCount() {
+        manager.sendAlert("CoAP failure", List.of(AffectedService.failing("CoAP", 4)));
         manager.sendAlert("CoAP is OK", List.of(AffectedService.recovered("CoAP")));
 
         assertThat(transport.updates).hasSize(1);
         String updated = transport.updates.get(0).text();
-        assertThat(updated).contains(":large_green_circle: CoAP").doesNotContain(":red_circle:");
+        assertThat(updated).contains(":large_green_circle: CoAP (4)").doesNotContain(":red_circle:");
     }
 
     @Test
@@ -126,7 +126,7 @@ class IncidentManagerTest {
                 .asString()
                 .contains(":white_check_mark:")
                 .contains(":red_circle: WS Connect")
-                .contains(":large_green_circle: Login");
+                .contains(":large_green_circle: Login (1)");
     }
 
     @Test

From 27c2844fecb382a2d741572a100baf7d08cba043 Mon Sep 17 00:00:00 2001
From: Oleksii Kuripko <alexeu.kyripko@gmail.com>
Date: Tue, 21 Apr 2026 18:53:06 +0200
Subject: [PATCH 05/91] linkify URL for 'request: Connect to <URL> failed'
 error variant

Spring wraps Apache HttpClient connect failures as 'I/O error on POST request:
Connect to <URL> failed: <reason>'. Same treatment as the RestClient variant:
the URL is embedded in the 'request' word and the 'Connect to ... failed'
restatement is dropped from the visible text.
---
 .../ServiceFailureNotification.java           | 19 +++++++++++++------
 .../ServiceFailureNotificationTest.java       | 12 ++++++++++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
index 5fcc953cce..69e336f334 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
@@ -52,18 +52,25 @@ public class ServiceFailureNotification implements Notification {
         return String.format("%s - Failure: %s (number of subsequent failures: %s)", serviceKey, errorMsg, failuresCount);
     }
 
-    private static final Pattern REQUEST_URL_PATTERN = Pattern.compile("request for \"(https?://[^\"\\s]+)\"");
+    // Spring RestClient: '... request for "<URL>"'
+    private static final Pattern REQUEST_FOR_URL_PATTERN = Pattern.compile("request for \"(https?://[^\"\\s]+)\"");
+    // Apache HttpClient wrapped by Spring: 'I/O error on POST request: Connect to <URL> failed: <reason>'
+    private static final Pattern REQUEST_CONNECT_PATTERN = Pattern.compile("request: Connect to (https?://\\S+?) failed:");
 
     static String linkifyRequestUrl(String msg) {
         if (msg == null) {
             return null;
         }
-        Matcher m = REQUEST_URL_PATTERN.matcher(msg);
-        if (!m.find()) {
-            return msg;
-        }
         // Slack mrkdwn link: <url|label>
-        return m.replaceAll("<$1|request>");
+        Matcher m = REQUEST_FOR_URL_PATTERN.matcher(msg);
+        if (m.find()) {
+            return m.replaceAll("<$1|request>");
+        }
+        Matcher m2 = REQUEST_CONNECT_PATTERN.matcher(msg);
+        if (m2.find()) {
+            return m2.replaceAll("<$1|request>:");
+        }
+        return msg;
     }
 
     static String stripResponseBody(String msg) {
diff --git a/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java b/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
index 7f66a456fe..500a713f7b 100644
--- a/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
+++ b/monitoring/src/test/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotificationTest.java
@@ -55,10 +55,18 @@ class ServiceFailureNotificationTest {
 
     @Test
     void linkifyReplacesRequestForUrlWithSlackMrkdwnLink() {
-        String msg = "503 Service Temporarily Unavailable on POST request for \"https://qa-tb-pe-lts43.iot-private.cloud/api/auth/login\"";
+        String msg = "503 Service Temporarily Unavailable on POST request for \"https://example.com/api/auth/login\"";
 
         assertThat(ServiceFailureNotification.linkifyRequestUrl(msg))
-                .isEqualTo("503 Service Temporarily Unavailable on POST <https://qa-tb-pe-lts43.iot-private.cloud/api/auth/login|request>");
+                .isEqualTo("503 Service Temporarily Unavailable on POST <https://example.com/api/auth/login|request>");
+    }
+
+    @Test
+    void linkifyReplacesRequestConnectToUrlFailed() {
+        String msg = "I/O error on POST request: Connect to https://example.com:443 failed: Connect timed out";
+
+        assertThat(ServiceFailureNotification.linkifyRequestUrl(msg))
+                .isEqualTo("I/O error on POST <https://example.com:443|request>: Connect timed out");
     }
 
     @Test

From bec05fab535229e712ee92d13a2c7c6ddd8fe650 Mon Sep 17 00:00:00 2001
From: Oleksii Kuripko <alexeu.kyripko@gmail.com>
Date: Wed, 22 Apr 2026 09:51:35 +0200
Subject: [PATCH 06/91] hold incident resolution timer while services are still
 failing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The resolution countdown now only starts once every failing service has
recovered. While any service is still firing the timer is cancelled, so
the incident cannot auto-resolve and spawn a new incident for the same
ongoing failure between alerts.

High latency is a warning signal (no explicit recovery event) and
therefore does not block resolution — only FAILING services do.
---
 .../incident/IncidentManager.java             | 16 ++++++++++++--
 .../incident/IncidentManagerTest.java         | 21 +++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
index 1e52c37634..c25abfc081 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/incident/IncidentManager.java
@@ -94,7 +94,14 @@ public class IncidentManager {
         } finally {
             if (activeIncidentThreadId != null) {
                 lastAlertTime = Instant.now();
-                resetResolutionTimer();
+                // High latency is a warning only — it has no explicit recovery signal
+                // (HighLatencyNotification fires only when something is above threshold),
+                // so resolution hinges on failing services alone.
+                if (failingServices.isEmpty()) {
+                    resetResolutionTimer();
+                } else {
+                    cancelResolutionTimer();
+                }
             }
         }
     }
@@ -172,10 +179,15 @@ public class IncidentManager {
     }
 
     private void resetResolutionTimer() {
+        cancelResolutionTimer();
+        resolutionTask = scheduler.schedule(this::resolveIncident, resolutionTimeoutSeconds, TimeUnit.SECONDS);
+    }
+
+    private void cancelResolutionTimer() {
         if (resolutionTask != null) {
             resolutionTask.cancel(false);
+            resolutionTask = null;
         }
-        resolutionTask = scheduler.schedule(this::resolveIncident, resolutionTimeoutSeconds, TimeUnit.SECONDS);
     }
 
     private void startDurationUpdater() {
diff --git a/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java b/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java
index afcd20adf3..b7051db534 100644
--- a/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java
+++ b/monitoring/src/test/java/org/thingsboard/monitoring/notification/incident/IncidentManagerTest.java
@@ -135,6 +135,27 @@ class IncidentManagerTest {
         assertThat(transport.updates).isEmpty();
     }
 
+    @Test
+    void doesNotAutoResolveWhileServicesAreStillFailing() throws Exception {
+        manager.shutdown();
+        transport = new RecordingTransport();
+        manager = new IncidentManager(transport, 1L, "tbqa", false);
+
+        manager.sendAlert("CoAP failure", List.of(AffectedService.failing("CoAP", 1)));
+        Thread.sleep(1500);
+
+        assertThat(transport.updates)
+                .extracting(RecordingTransport.Message::text)
+                .noneMatch(t -> t.contains(":white_check_mark:"));
+
+        manager.sendAlert("CoAP is OK", List.of(AffectedService.recovered("CoAP")));
+        Thread.sleep(1500);
+
+        assertThat(transport.updates)
+                .extracting(RecordingTransport.Message::text)
+                .anyMatch(t -> t.contains(":white_check_mark:"));
+    }
+
     private static class RecordingTransport implements IncidentTransport {
         private final AtomicInteger threadCounter = new AtomicInteger();
         final java.util.List<String> incidents = new java.util.ArrayList<>();

From 30330057dbc64801b41e02e0a93e0cfa4fb420d1 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Wed, 22 Apr 2026 11:01:51 +0200
Subject: [PATCH 07/91] Replaced deprecated @MockBean/@SpyBean with
 @MockitoBean in dao tests

Spring Boot 3.4 deprecated @MockBean/@SpyBean in favor of
@MockitoBean/@MockitoSpyBean. The 'answer' attribute was renamed to
'answers'.
---
 .../server/dao/AbstractDaoServiceTest.java    |  4 ++--
 .../server/dao/AbstractJpaDaoTest.java        |  4 ++--
 .../cache/RedisTbTransactionalCacheTest.java  | 10 +++++-----
 .../server/dao/service/DeviceServiceTest.java |  4 ++--
 .../server/dao/service/TenantServiceTest.java |  4 ++--
 .../AdminSettingsDataValidatorTest.java       |  8 ++++----
 .../validator/AlarmDataValidatorTest.java     |  8 ++++----
 .../validator/AssetDataValidatorTest.java     |  8 ++++----
 .../AssetProfileDataValidatorTest.java        | 18 ++++++++---------
 .../CalculatedFieldDataValidatorTest.java     | 10 +++++-----
 .../CalculatedFieldLinkDataValidatorTest.java |  8 ++++----
 .../ComponentDescriptorDataValidatorTest.java |  4 ++--
 .../validator/CustomerDataValidatorTest.java  | 10 +++++-----
 .../validator/DashboardDataValidatorTest.java |  8 ++++----
 .../validator/DeviceDataValidatorTest.java    |  8 ++++----
 .../DeviceProfileDataValidatorTest.java       | 20 +++++++++----------
 .../validator/EdgeDataValidatorTest.java      | 12 +++++------
 .../EntityViewDataValidatorTest.java          | 12 +++++------
 .../validator/ResourceDataValidatorTest.java  | 14 ++++++-------
 .../validator/RuleChainDataValidatorTest.java | 10 +++++-----
 .../validator/TenantDataValidatorTest.java    |  8 ++++----
 .../TenantProfileDataValidatorTest.java       | 10 +++++-----
 .../WidgetTypeDataValidatorTest.java          | 12 +++++------
 .../WidgetsBundleDataValidatorTest.java       | 10 +++++-----
 .../DefaultEntityQueryRepositoryTest.java     |  8 ++++----
 .../query/DefaultQueryLogComponentTest.java   |  4 ++--
 ...esDaoPartitioningDaysAlwaysExistsTest.java |  8 ++++----
 ...sDaoPartitioningHoursAlwaysExistsTest.java |  8 ++++----
 ...artitioningIndefiniteAlwaysExistsTest.java |  8 ++++----
 ...aoPartitioningMinutesAlwaysExistsTest.java |  8 ++++----
 ...DaoPartitioningMonthsAlwaysExistsTest.java |  8 ++++----
 ...sDaoPartitioningYearsAlwaysExistsTest.java |  8 ++++----
 32 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java
index 267dd52882..4aa50de3cc 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.dao;
 
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -40,7 +40,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
         DirtiesContextTestExecutionListener.class})
 public abstract class AbstractDaoServiceTest {
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     StatsFactory statsFactory;
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
index f68ab72786..dc5cc47cf7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.dao;
 
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -42,7 +42,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
         DirtiesContextTestExecutionListener.class})
 public abstract class AbstractJpaDaoTest {
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     StatsFactory statsFactory;
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java
index 5de4378cf0..a9feec982b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.cache;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.test.context.ContextConfiguration;
@@ -50,13 +50,13 @@ import static org.mockito.Mockito.when;
 @Slf4j
 public class RedisTbTransactionalCacheTest {
 
-    @MockBean
+    @MockitoBean
     private RelationRedisCache relationRedisCache;
-    @MockBean
+    @MockitoBean
     private RedisConnectionFactory connectionFactory;
-    @MockBean
+    @MockitoBean
     private RedisConnection redisConnection;
-    @MockBean
+    @MockitoBean
     private RedisSslCredentials redisSslCredentials;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
index 94745c804e..90e3bf0603 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -103,7 +103,7 @@ public class DeviceServiceTest extends AbstractServiceTest {
     private CalculatedFieldService calculatedFieldService;
     @Autowired
     private PlatformTransactionManager platformTransactionManager;
-    @SpyBean
+    @MockitoSpyBean
     private DeviceCredentialsDataValidator validator;
 
     private IdComparator<Device> idComparator = new IdComparator<>();
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java
index e9f5b4d16f..45b39c3ad7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cache.TbTransactionalCache;
 import org.thingsboard.server.common.data.Customer;
@@ -87,7 +87,7 @@ import static org.mockito.Mockito.verify;
 @DaoSqlTest
 public class TenantServiceTest extends AbstractServiceTest {
 
-    @SpyBean
+    @MockitoSpyBean
     TenantDao tenantDao;
 
     @Autowired
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java
index c550772718..6241f2dea3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -31,9 +31,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AdminSettingsDataValidator.class)
 class AdminSettingsDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AdminSettingsService adminSettingsService;
-    @SpyBean
+    @MockitoSpyBean
     AdminSettingsDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java
index 89b0b0cec4..e36aa20773 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -33,9 +33,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AlarmDataValidator.class)
 class AlarmDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     AlarmDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java
index 540d25578a..730daff5c5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetDao;
@@ -39,11 +39,11 @@ import static org.mockito.BDDMockito.willReturn;
 @Slf4j
 class AssetDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AssetDao assetDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
     @Autowired
     AssetDataValidator validator;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java
index b5cfb4998c..a8060cd51f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetProfileDao;
@@ -37,19 +37,19 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AssetProfileDataValidator.class)
 class AssetProfileDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AssetProfileDao assetProfileDao;
-    @MockBean
+    @MockitoBean
     AssetProfileService assetProfileService;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     QueueService queueService;
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     DashboardService dashboardService;
-    @SpyBean
+    @MockitoSpyBean
     AssetProfileDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldDataValidatorTest.java
index 221782b23c..e781e60113 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldDataValidatorTest.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
@@ -38,11 +38,11 @@ public class CalculatedFieldDataValidatorTest {
     private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("7b5229e9-166e-41a9-a257-3b1dafad1b04"));
     private final CalculatedFieldId CALCULATED_FIELD_ID = new CalculatedFieldId(UUID.fromString("060fbe45-fbb2-4549-abf3-f72a6be3cb9f"));
 
-    @MockBean
+    @MockitoBean
     private CalculatedFieldDao calculatedFieldDao;
-    @MockBean
+    @MockitoBean
     private DefaultApiLimitService apiLimitService;
-    @SpyBean
+    @MockitoSpyBean
     private CalculatedFieldDataValidator validator;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldLinkDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldLinkDataValidatorTest.java
index 41d16a0670..9ba5133071 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldLinkDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldLinkDataValidatorTest.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
@@ -37,9 +37,9 @@ public class CalculatedFieldLinkDataValidatorTest {
     private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("2ba09d99-6143-43dc-b645-381fc0c43ebe"));
     private final CalculatedFieldLinkId CALCULATED_FIELD_LINK_ID = new CalculatedFieldLinkId(UUID.fromString("a5609ef4-cb42-43ce-9b23-e090a4878d1c"));
 
-    @MockBean
+    @MockitoBean
     private CalculatedFieldLinkDao calculatedFieldLinkDao;
-    @SpyBean
+    @MockitoSpyBean
     private CalculatedFieldLinkDataValidator validator;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java
index c810dd5c63..1dfc1d4e8d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
 import org.thingsboard.server.common.data.plugin.ComponentScope;
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify;
 
 @SpringBootTest(classes = ComponentDescriptorDataValidator.class)
 class ComponentDescriptorDataValidatorTest {
-    @SpyBean
+    @MockitoSpyBean
     ComponentDescriptorDataValidator validator;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java
index d434d8f231..aa66f4003f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = CustomerDataValidator.class)
 class CustomerDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     CustomerDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java
index 3029027f37..cf5ad6e8fe 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -32,9 +32,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = DashboardDataValidator.class)
 class DashboardDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     DashboardDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java
index 260114abd7..ae55b2caa5 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -39,11 +39,11 @@ import static org.mockito.BDDMockito.willReturn;
 @Slf4j
 class DeviceDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     DeviceDao deviceDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
     @Autowired
     DeviceDataValidator validator;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java
index f3f172a5ce..b9a532f7d1 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -83,21 +83,21 @@ class DeviceProfileDataValidatorTest {
     private static final int port = 5685;
     private static final int portBs = 5687;
 
-    @MockBean
+    @MockitoBean
     DeviceProfileDao deviceProfileDao;
-    @MockBean
+    @MockitoBean
     DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     DeviceDao deviceDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     QueueService queueService;
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     DashboardService dashboardService;
-    @SpyBean
+    @MockitoSpyBean
     DeviceProfileDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java
index 98699b0176..2f4ed4426f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = EdgeDataValidator.class)
 class EdgeDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     EdgeDao edgeDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @SpyBean
+    @MockitoSpyBean
     EdgeDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java
index 3db9d77469..ab821de252 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = EntityViewDataValidator.class)
 class EntityViewDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     EntityViewDao entityViewDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @SpyBean
+    @MockitoSpyBean
     EntityViewDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java
index 9072bb5e62..059e966040 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -36,15 +36,15 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = ResourceDataValidator.class)
 class ResourceDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TbResourceDao resourceDao;
-    @MockBean
+    @MockitoBean
     WidgetTypeDao widgetTypeDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     TbTenantProfileCache tenantProfileCache;
-    @SpyBean
+    @MockitoSpyBean
     ResourceDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java
index 9107d1f8f2..eb884edbf3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainType;
@@ -34,11 +34,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = RuleChainDataValidator.class)
 class RuleChainDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     RuleChainDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java
index c7e4f73ce4..ca1871a1dc 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.tenant.TenantDao;
@@ -30,9 +30,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = TenantDataValidator.class)
 class TenantDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantDao tenantDao;
-    @SpyBean
+    @MockitoSpyBean
     TenantDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantProfileDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantProfileDataValidatorTest.java
index 170b452fee..9d32fbd49e 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantProfileDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantProfileDataValidatorTest.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = TenantProfileDataValidator.class)
 class TenantProfileDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantProfileDao tenantProfileDao;
-    @MockBean
+    @MockitoBean
     TenantProfileService tenantProfileService;
-    @SpyBean
+    @MockitoSpyBean
     TenantProfileDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java
index 3849aa62bf..3904c7d509 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 
 @SpringBootTest(classes = WidgetTypeDataValidator.class)
 class WidgetTypeDataValidatorTest {
-    @MockBean
+    @MockitoBean
     WidgetTypeDao widgetTypeDao;
-    @MockBean
+    @MockitoBean
     WidgetsBundleDao widgetsBundleDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     WidgetTypeDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java
index 1affa60415..6ab7728471 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = WidgetsBundleDataValidator.class)
 class WidgetsBundleDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     WidgetsBundleDao widgetsBundleDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     WidgetsBundleDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java
index b0d946ce3f..863d4ae2e8 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -31,11 +31,11 @@ import static org.hamcrest.Matchers.equalTo;
 @SpringBootTest(classes = DefaultEntityQueryRepository.class)
 public class DefaultEntityQueryRepositoryTest {
 
-    @MockBean
+    @MockitoBean
     NamedParameterJdbcTemplate jdbcTemplate;
-    @MockBean
+    @MockitoBean
     TransactionTemplate transactionTemplate;
-    @MockBean
+    @MockitoBean
     DefaultQueryLogComponent queryLog;
 
     @Autowired
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
index 83a06fe568..e47ed5bfbf 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.mockito.BDDMockito;
 import org.mockito.Mockito;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -52,7 +52,7 @@ public class DefaultQueryLogComponentTest {
     private TenantId tenantId;
     private SqlQueryContext ctx;
 
-    @SpyBean
+    @MockitoSpyBean
     private DefaultQueryLogComponent queryLog;
 
     @Before
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
index 43c8a064e1..05952e1203 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
index 5deccec298..83bb802c85 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
index a742e6cd2c..4f78f5b864 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -52,13 +52,13 @@ public class CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
index dd106cb439..455cf2cc00 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
index 5699f5d5f7..ce8b66215b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -63,13 +63,13 @@ public class CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest {
     @MockitoSpyBean
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
index a68daf664a..90575d5b14 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test

From decd71f48fddb58632ac007319777b883a5f6d57 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Wed, 22 Apr 2026 11:03:12 +0200
Subject: [PATCH 08/91] Replaced deprecated @MockBean/@SpyBean with
 @MockitoBean in edqs and coap-server tests

Spring Boot 3.4 deprecated @MockBean/@SpyBean in favor of
@MockitoBean/@MockitoSpyBean.
---
 .../server/coapserver/TbCoapDtlsSettingsTest.java         | 8 ++++----
 .../org/thingsboard/server/edqs/repo/AbstractEDQTest.java | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/coap-server/src/test/java/org/thingsboard/server/coapserver/TbCoapDtlsSettingsTest.java b/common/coap-server/src/test/java/org/thingsboard/server/coapserver/TbCoapDtlsSettingsTest.java
index c75348d97e..f3af7b752f 100644
--- a/common/coap-server/src/test/java/org/thingsboard/server/coapserver/TbCoapDtlsSettingsTest.java
+++ b/common/coap-server/src/test/java/org/thingsboard/server/coapserver/TbCoapDtlsSettingsTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.coapserver;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig;
@@ -41,11 +41,11 @@ class TbCoapDtlsSettingsTest {
 
     @Autowired
     TbCoapDtlsSettings coapDtlsSettings;
-    @MockBean
+    @MockitoBean
     SslCredentialsConfig sslCredentialsConfig;
-    @MockBean
+    @MockitoBean
     private TransportService transportService;
-    @MockBean
+    @MockitoBean
     private TbServiceInfoProvider serviceInfoProvider;
 
     @Test
diff --git a/edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java b/edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java
index adb42203e0..edf8832a33 100644
--- a/edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java
+++ b/edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java
@@ -20,7 +20,7 @@ import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -81,7 +81,7 @@ public abstract class AbstractEDQTest {
     protected DefaultEdqsRepository repository;
     @Autowired
     protected EdqsMapper edqsMapper;
-    @MockBean
+    @MockitoBean
     private DummyEdqsStatsService edqsStatsService;
 
     protected final TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());

From 3fad83d4e4c9c356d635d8f1b98148b67af1eb7a Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Wed, 22 Apr 2026 11:09:27 +0200
Subject: [PATCH 09/91] Replaced deprecated @MockBean/@SpyBean with
 @MockitoBean in application tests

Spring Boot 3.4 deprecated @MockBean/@SpyBean in favor of
@MockitoBean/@MockitoSpyBean.
---
 .../controller/AbstractNotifyEntityTest.java  |  6 ++--
 .../controller/AuditLogControllerTest.java    |  6 ++--
 ...trollerTest_DedicatedEventsDataSource.java |  4 +--
 .../server/controller/AuthControllerTest.java |  4 +--
 .../controller/BaseQueueControllerTest.java   | 10 +++---
 .../controller/DeviceControllerTest.java      |  6 ++--
 .../controller/EdgeEventControllerTest.java   |  4 +--
 .../EdqsEntityQueryControllerTest.java        |  4 +--
 .../server/controller/HomePageApiTest.java    |  6 ++--
 .../controller/RepositorySettingsTest.java    |  4 +--
 .../controller/RuleEngineControllerTest.java  |  4 +--
 .../controller/TenantControllerTest.java      |  8 ++---
 .../controller/TwoFactorAuthConfigTest.java   | 10 +++---
 .../server/controller/TwoFactorAuthTest.java  |  8 ++---
 .../server/controller/WebsocketApiTest.java   |  4 +--
 .../provision/DeviceProvisionServiceTest.java | 24 ++++++-------
 .../entitiy/EdqsEntityServiceTest.java        |  4 +--
 .../alarm/DefaultTbAlarmServiceTest.java      | 32 ++++++++---------
 .../DefaultTbAlarmCommentServiceTest.java     | 34 +++++++++----------
 .../service/install/InstallScriptsTest.java   | 28 +++++++--------
 .../update/DefaultDataUpdateServiceTest.java  |  4 +--
 .../server/service/job/JobManagerTest.java    |  6 ++--
 .../notification/NotificationApiTest.java     |  4 +--
 .../notification/NotificationRuleApiTest.java |  4 +--
 .../queue/DefaultTbClusterServiceTest.java    | 26 +++++++-------
 .../service/sms/DefaultSmsServiceTest.java    |  4 +--
 .../sync/ie/ExportImportServiceSqlTest.java   |  6 ++--
 .../DefaultTransportApiServiceTest.java       | 34 +++++++++----------
 .../service/ttl/AlarmsCleanUpServiceTest.java |  6 ++--
 .../lwm2m/AbstractLwM2MIntegrationTest.java   |  6 ++--
 .../rpc/AbstractRpcLwM2MIntegrationTest.java  |  4 +--
 .../AbstractLwM2MIntegrationDiffPortTest.java |  4 +--
 .../mqtt/MqttGatewayRateLimitsTest.java       |  4 +--
 ...AbstractMqttTimeseriesIntegrationTest.java |  4 +--
 34 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
index 58bf4b9798..2a03efc2ef 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.controller;
 import lombok.extern.slf4j.Slf4j;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
@@ -53,10 +53,10 @@ import static org.mockito.Mockito.times;
 @Slf4j
 public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
 
-    @SpyBean
+    @MockitoSpyBean
     protected TbClusterService tbClusterService;
 
-    @SpyBean
+    @MockitoSpyBean
     protected AuditLogService auditLogService;
 
     protected final String msgErrorPermission = "You don't have permission to perform this operation!";
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
index a76da5f161..9c5b46ca70 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
@@ -25,7 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
@@ -66,9 +66,9 @@ public class AuditLogControllerTest extends AbstractControllerTest {
     @Autowired
     private AuditLogDao auditLogDao;
     @Getter
-    @SpyBean
+    @MockitoSpyBean
     private SqlPartitioningRepository partitioningRepository;
-    @SpyBean
+    @MockitoSpyBean
     private AuditLogsCleanUpService auditLogsCleanUpService;
 
     @Value("#{${sql.audit_logs.partition_size} * 60 * 60 * 1000}")
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java
index c594beae98..0660dfe95e 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.controller;
 
 import lombok.Getter;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.sqlts.insert.sql.DedicatedEventsSqlPartitioningRepository;
@@ -30,7 +30,7 @@ import org.thingsboard.server.dao.sqlts.insert.sql.DedicatedEventsSqlPartitionin
 public class AuditLogControllerTest_DedicatedEventsDataSource extends AuditLogControllerTest {
 
     @Getter
-    @SpyBean
+    @MockitoSpyBean
     private DedicatedEventsSqlPartitioningRepository partitioningRepository;
 
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
index 9126c42f2f..419f442f87 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
@@ -20,7 +20,7 @@ import org.assertj.core.data.Offset;
 import org.junit.After;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.http.HttpHeaders;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
@@ -50,7 +50,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class AuthControllerTest extends AbstractControllerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private UserCredentialsDao userCredentialsDao;
 
     @After
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
index 46a1dba3a7..b01f5f32f2 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.actors.ActorSystemContext;
@@ -96,15 +96,15 @@ public class BaseQueueControllerTest extends AbstractControllerTest {
     private RuleEngineStatisticsService ruleEngineStatisticsService;
     @Autowired
     private StatsFactory statsFactory;
-    @SpyBean
+    @MockitoSpyBean
     private TimeseriesDao timeseriesDao;
     @Autowired
     private QueueStatsService queueStatsService;
-    @SpyBean
+    @MockitoSpyBean
     private PartitionService partitionService;
-    @SpyBean
+    @MockitoSpyBean
     private TimeseriesService timeseriesService;
-    @SpyBean
+    @MockitoSpyBean
     private ActorSystemContext actorSystemContext;
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
index 0e404b2857..478b11dd3f 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
@@ -31,7 +31,7 @@ import org.mockito.AdditionalAnswers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
@@ -109,10 +109,10 @@ public class DeviceControllerTest extends AbstractControllerTest {
     private Tenant savedTenant;
     private User tenantAdmin;
 
-    @SpyBean
+    @MockitoSpyBean
     private GatewayNotificationsService gatewayNotificationsService;
 
-    @SpyBean
+    @MockitoSpyBean
     private DeviceStateService deviceStateService;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
index ba389d3bd6..262d685d74 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
@@ -25,7 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AttributeScope;
@@ -66,7 +66,7 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
 
     @Autowired
     private EdgeEventDao edgeEventDao;
-    @SpyBean
+    @MockitoSpyBean
     private SqlPartitioningRepository partitioningRepository;
     @Autowired
     private EdgeEventsCleanUpService edgeEventsCleanUpService;
diff --git a/application/src/test/java/org/thingsboard/server/controller/EdqsEntityQueryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdqsEntityQueryControllerTest.java
index 932980a3ca..8d3859b1bd 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdqsEntityQueryControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdqsEntityQueryControllerTest.java
@@ -19,7 +19,7 @@ import org.assertj.core.api.ThrowingConsumer;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.common.data.edqs.EdqsState;
 import org.thingsboard.server.common.data.edqs.EdqsState.EdqsApiMode;
@@ -59,7 +59,7 @@ public class EdqsEntityQueryControllerTest extends EntityQueryControllerTest {
     @Autowired
     private DiscoveryService discoveryService;
 
-    @MockBean // so that we don't do backup for tests
+    @MockitoBean // so that we don't do backup for tests
     private EdqsRocksDb edqsRocksDb;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
index ee2aefc81a..efe553e8f2 100644
--- a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.SmsService;
@@ -85,10 +85,10 @@ public class HomePageApiTest extends AbstractControllerTest {
     @Autowired
     private OAuth2ClientService oAuth2ClientService;
 
-    @MockBean
+    @MockitoBean
     private MailService mailService;
 
-    @MockBean
+    @MockitoBean
     private SmsService smsService;
 
     private static final int DEFAULT_DASHBOARDS_COUNT = 0;
diff --git a/application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java b/application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java
index 072e83cc47..3d6c62d701 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.controller;
 import com.google.common.util.concurrent.SettableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.data.sync.vc.RepositoryAuthMethod;
 import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
 import org.thingsboard.server.dao.service.DaoSqlTest;
@@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class RepositorySettingsTest extends AbstractControllerTest {
 
-    @MockBean
+    @MockitoBean
     private GitVersionControlQueueService gitVersionControlQueueService;
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
index 81c74de038..ff75d80d30 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
@@ -56,7 +56,7 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
     private final String REQUEST_BODY = "{\"request\":\"download\"}";
     private final String RESPONSE_BODY = "{\"response\":\"downloadOk\"}";
 
-    @SpyBean
+    @MockitoSpyBean
     private RuleEngineCallService ruleEngineCallService;
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
index cc217b05d5..cc0f64428e 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
@@ -27,7 +27,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.ResultActions;
 import org.thingsboard.common.util.ThingsBoardExecutors;
@@ -110,11 +110,11 @@ public class TenantControllerTest extends AbstractControllerTest {
 
     ListeningExecutorService executor;
 
-    @SpyBean
+    @MockitoSpyBean
     private PartitionService partitionService;
-    @SpyBean
+    @MockitoSpyBean
     private ActorSystemContext actorContext;
-    @SpyBean
+    @MockitoSpyBean
     private TbQueueAdmin queueAdmin;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java
index c3eb91db85..2a7422880c 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java
@@ -22,8 +22,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.cache.CacheManager;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
@@ -62,15 +62,15 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class TwoFactorAuthConfigTest extends AbstractControllerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private TotpTwoFaProvider totpTwoFactorAuthProvider;
-    @MockBean
+    @MockitoBean
     private SmsService smsService;
     @Autowired
     private CacheManager cacheManager;
     @Autowired
     private TwoFaConfigManager twoFaConfigManager;
-    @SpyBean
+    @MockitoSpyBean
     private TwoFactorAuthService twoFactorAuthService;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java
index b20dd570fb..2092c0b7e7 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java
@@ -23,8 +23,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.rule.engine.api.SmsService;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
@@ -78,9 +78,9 @@ public class TwoFactorAuthTest extends AbstractControllerTest {
 
     @Autowired
     private TwoFaConfigManager twoFaConfigManager;
-    @SpyBean
+    @MockitoSpyBean
     private TwoFactorAuthService twoFactorAuthService;
-    @MockBean
+    @MockitoBean
     private SmsService smsService;
     @Autowired
     private AuditLogService auditLogService;
diff --git a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
index 6ec0f3ad64..e3b6a6efd8 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
@@ -28,7 +28,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
@@ -100,7 +100,7 @@ public class WebsocketApiTest extends AbstractControllerTest {
     @Autowired
     private TelemetrySubscriptionService tsService;
 
-    @SpyBean
+    @MockitoSpyBean
     private TimeseriesService timeseriesService;
 
     Device device;
diff --git a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
index de86e46cd0..c5f10ea4b3 100644
--- a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
@@ -21,8 +21,8 @@ import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.cluster.TbClusterService;
@@ -76,25 +76,25 @@ import static org.mockito.Mockito.when;
 @ContextConfiguration(classes = DeviceProvisionServiceImpl.class)
 public class DeviceProvisionServiceTest {
 
-    @MockBean
+    @MockitoBean
     protected TbQueueProducerProvider producerProvider;
-    @MockBean
+    @MockitoBean
     protected TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToRuleEngineMsg>> ruleEngineMsgProducer;
-    @MockBean
+    @MockitoBean
     protected TbClusterService clusterService;
-    @MockBean
+    @MockitoBean
     protected DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     protected DeviceService deviceService;
-    @MockBean
+    @MockitoBean
     protected DeviceCredentialsService deviceCredentialsService;
-    @MockBean
+    @MockitoBean
     protected AttributesService attributesService;
-    @MockBean
+    @MockitoBean
     protected AuditLogService auditLogService;
-    @MockBean
+    @MockitoBean
     protected PartitionService partitionService;
-    @SpyBean
+    @MockitoSpyBean
     DeviceProvisionServiceImpl service;
 
     private String[] chain;
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/EdqsEntityServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/EdqsEntityServiceTest.java
index a16cf99c1d..0b7be314a0 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/EdqsEntityServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/EdqsEntityServiceTest.java
@@ -19,7 +19,7 @@ import com.google.common.collect.Lists;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.asset.Asset;
@@ -61,7 +61,7 @@ public class EdqsEntityServiceTest extends EntityServiceTest {
     @Autowired
     private EdqsService edqsService;
 
-    @MockBean
+    @MockitoBean
     private EdqsRocksDb edqsRocksDb;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
index 4886310750..e5f8061fb8 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
@@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cluster.TbClusterService;
@@ -66,35 +66,35 @@ import static org.mockito.Mockito.when;
 @SpringJUnitConfig(DefaultTbAlarmService.class)
 class DefaultTbAlarmServiceTest {
 
-    @MockBean
+    @MockitoBean
     TbLogEntityActionService logEntityActionService;
-    @MockBean
+    @MockitoBean
     EdgeService edgeService;
-    @MockBean
+    @MockitoBean
     AlarmService alarmService;
-    @MockBean
+    @MockitoBean
     TbAlarmCommentService alarmCommentService;
-    @MockBean
+    @MockitoBean
     AlarmSubscriptionService alarmSubscriptionService;
-    @MockBean
+    @MockitoBean
     CustomerService customerService;
-    @MockBean
+    @MockitoBean
     TbClusterService tbClusterService;
-    @MockBean
+    @MockitoBean
     EntitiesVersionControlService vcService;
-    @MockBean
+    @MockitoBean
     AccessControlService accessControlService;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     AssetService assetService;
-    @MockBean
+    @MockitoBean
     DeviceService deviceService;
-    @MockBean
+    @MockitoBean
     AssetProfileService assetProfileService;
-    @MockBean
+    @MockitoBean
     DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     EntityService entityService;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
index 2c2d2bbdc3..122a939a9d 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
@@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -65,35 +65,35 @@ import static org.mockito.Mockito.when;
 })
 public class DefaultTbAlarmCommentServiceTest {
 
-    @MockBean
+    @MockitoBean
     protected DbCallbackExecutorService dbExecutor;
-    @MockBean
+    @MockitoBean
     protected TbLogEntityActionService logEntityActionService;
-    @MockBean
+    @MockitoBean
     protected AlarmService alarmService;
-    @MockBean
+    @MockitoBean
     protected AlarmCommentService alarmCommentService;
-    @MockBean
+    @MockitoBean
     protected AlarmSubscriptionService alarmSubscriptionService;
-    @MockBean
+    @MockitoBean
     protected CustomerService customerService;
-    @MockBean
+    @MockitoBean
     protected TbClusterService tbClusterService;
-    @MockBean
+    @MockitoBean
     private AccessControlService accessControlService;
-    @MockBean
+    @MockitoBean
     private TenantService tenantService;
-    @MockBean
+    @MockitoBean
     private AssetService assetService;
-    @MockBean
+    @MockitoBean
     private DeviceService deviceService;
-    @MockBean
+    @MockitoBean
     private AssetProfileService assetProfileService;
-    @MockBean
+    @MockitoBean
     private DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     private EntityService entityService;
-    @SpyBean
+    @MockitoSpyBean
     DefaultTbAlarmCommentService service;
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java b/application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java
index fa675fc3f8..5caf2ececd 100644
--- a/application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java
@@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -52,30 +52,30 @@ import static org.mockito.BDDMockito.willReturn;
 @SpringBootTest(classes = {InstallScripts.class, RuleChainDataValidator.class})
 class InstallScriptsTest {
 
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     DashboardService dashboardService;
-    @MockBean
+    @MockitoBean
     WidgetTypeService widgetTypeService;
-    @MockBean
+    @MockitoBean
     WidgetsBundleService widgetsBundleService;
-    @MockBean
+    @MockitoBean
     OAuth2ConfigTemplateService oAuth2TemplateService;
-    @MockBean
+    @MockitoBean
     ResourceService resourceService;
-    @MockBean
+    @MockitoBean
     ImageService imageService;
-    @MockBean
+    @MockitoBean
     ResourcesUpdater resourcesUpdater;
-    @SpyBean
+    @MockitoSpyBean
     InstallScripts installScripts;
 
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     ApiLimitService apiLimitService;
-    @SpyBean
+    @MockitoSpyBean
     RuleChainDataValidator ruleChainValidator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/application/src/test/java/org/thingsboard/server/service/install/update/DefaultDataUpdateServiceTest.java b/application/src/test/java/org/thingsboard/server/service/install/update/DefaultDataUpdateServiceTest.java
index a82aad5b62..1690d854d9 100644
--- a/application/src/test/java/org/thingsboard/server/service/install/update/DefaultDataUpdateServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/install/update/DefaultDataUpdateServiceTest.java
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.ActiveProfiles;
 import org.thingsboard.common.util.JacksonUtil;
 
@@ -34,7 +34,7 @@ import static org.mockito.BDDMockito.willCallRealMethod;
 @SpringBootTest(classes = DefaultDataUpdateService.class)
 class DefaultDataUpdateServiceTest {
 
-    @MockBean
+    @MockitoBean
     DefaultDataUpdateService service;
 
     @BeforeEach
diff --git a/application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java b/application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
index c17a9f6bfb..b2aa361f27 100644
--- a/application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
@@ -21,7 +21,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.rule.engine.api.JobManager;
 import org.thingsboard.server.common.data.Device;
@@ -64,10 +64,10 @@ public class JobManagerTest extends AbstractControllerTest {
     @Autowired
     private JobManager jobManager;
 
-    @SpyBean
+    @MockitoSpyBean
     private TestTaskProcessor taskProcessor;
 
-    @SpyBean
+    @MockitoSpyBean
     private JobStatsService jobStatsService;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
index e9e239ec04..a24e303e29 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
@@ -24,7 +24,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.HttpEntity;
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.web.client.RestTemplate;
@@ -125,7 +125,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
     private NotificationCenter notificationCenter;
     @Autowired
     private MicrosoftTeamsNotificationChannel microsoftTeamsNotificationChannel;
-    @MockBean
+    @MockitoBean
     private FirebaseService firebaseService;
 
     private static final String TEST_MOBILE_TOKEN = "tenantFcmToken";
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
index 7175f0981d..d13c5c737a 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.function.ThrowingRunnable;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.data.util.Pair;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
@@ -137,7 +137,7 @@ import static org.thingsboard.server.common.data.notification.rule.trigger.confi
 })
 public class NotificationRuleApiTest extends AbstractNotificationApiTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private AlarmSubscriptionService alarmSubscriptionService;
     @Autowired
     private DefaultSystemInfoService systemInfoService;
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
index 8110f6c0e3..63b4c98142 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
@@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.common.util.JacksonUtil;
@@ -87,28 +87,28 @@ public class DefaultTbClusterServiceTest {
 
     public static final String TRANSPORT = "transport";
 
-    @MockBean
+    @MockitoBean
     protected TbDeviceProfileCache deviceProfileCache;
-    @MockBean
+    @MockitoBean
     protected TbAssetProfileCache assetProfileCache;
-    @MockBean
+    @MockitoBean
     protected GatewayNotificationsService gatewayNotificationsService;
-    @MockBean
+    @MockitoBean
     protected EdgeService edgeService;
-    @MockBean
+    @MockitoBean
     protected PartitionService partitionService;
-    @MockBean
+    @MockitoBean
     protected TbQueueProducerProvider producerProvider;
-    @MockBean
+    @MockitoBean
     protected TbRuleEngineProducerService ruleEngineProducerService;
-    @MockBean
+    @MockitoBean
     protected TbTransactionalCache<EdgeId, String> edgeCache;
-    @MockBean
+    @MockitoBean
     protected CalculatedFieldService calculatedFieldService;
 
-    @SpyBean
+    @MockitoSpyBean
     protected TopicService topicService;
-    @SpyBean
+    @MockitoSpyBean
     protected TbClusterService clusterService;
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java b/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
index 445be6363a..8d23b32946 100644
--- a/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
@@ -54,7 +54,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
         "usage.stats.report.interval=1",
 })
 public class DefaultSmsServiceTest extends AbstractControllerTest {
-    @SpyBean
+    @MockitoSpyBean
     private DefaultSmsService defaultSmsService;
     @Autowired
     private AdminSettingsService adminSettingsService;
diff --git a/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java b/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
index e19efdf7e0..dde1c2ae27 100644
--- a/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.debug.TbMsgGeneratorNode;
 import org.thingsboard.rule.engine.debug.TbMsgGeneratorNodeConfiguration;
@@ -128,9 +128,9 @@ import static org.mockito.Mockito.verify;
 @DaoSqlTest
 public class ExportImportServiceSqlTest extends AbstractControllerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private EntityActionService entityActionService;
-    @SpyBean
+    @MockitoSpyBean
     private OtaPackageStateService otaPackageStateService;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
index afb77945ab..952172a491 100644
--- a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
@@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.cache.ota.OtaPackageDataCache;
@@ -72,35 +72,35 @@ import static org.mockito.Mockito.when;
 @ContextConfiguration(classes = DefaultTransportApiService.class)
 public class DefaultTransportApiServiceTest {
 
-    @MockBean
+    @MockitoBean
     protected TbDeviceProfileCache deviceProfileCache;
-    @MockBean
+    @MockitoBean
     protected TbTenantProfileCache tenantProfileCache;
-    @MockBean
+    @MockitoBean
     protected TbApiUsageStateService apiUsageStateService;
-    @MockBean
+    @MockitoBean
     protected DeviceService deviceService;
-    @MockBean
+    @MockitoBean
     protected DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     protected RelationService relationService;
-    @MockBean
+    @MockitoBean
     protected DeviceCredentialsService deviceCredentialsService;
-    @MockBean
+    @MockitoBean
     protected DbCallbackExecutorService dbCallbackExecutorService;
-    @MockBean
+    @MockitoBean
     protected TbClusterService tbClusterService;
-    @MockBean
+    @MockitoBean
     protected DeviceProvisionService deviceProvisionService;
-    @MockBean
+    @MockitoBean
     protected ResourceService resourceService;
-    @MockBean
+    @MockitoBean
     protected OtaPackageService otaPackageService;
-    @MockBean
+    @MockitoBean
     protected OtaPackageDataCache otaPackageDataCache;
-    @MockBean
+    @MockitoBean
     protected QueueService queueService;
-    @SpyBean
+    @MockitoSpyBean
     DefaultTransportApiService service;
 
     private String certificateChain;
diff --git a/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java b/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
index fcb948239f..a74db4593c 100644
--- a/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
@@ -21,7 +21,7 @@ import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.alarm.Alarm;
@@ -50,9 +50,9 @@ import static org.mockito.Mockito.verify;
 })
 public class AlarmsCleanUpServiceTest extends AbstractControllerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private AlarmsCleanUpService alarmsCleanUpService;
-    @SpyBean
+    @MockitoSpyBean
     private AlarmService alarmService;
     @Autowired
     private AlarmDao alarmDao;
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
index 8d0f0f2af0..9765a50f91 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
@@ -36,7 +36,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
@@ -132,10 +132,10 @@ import static org.thingsboard.server.transport.lwm2m.ota.AbstractOtaLwM2MIntegra
 @DaoSqlTest
 public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportIntegrationTest {
 
-    @SpyBean
+    @MockitoSpyBean
     protected LwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandlerTest;
 
-    @SpyBean
+    @MockitoSpyBean
     protected DefaultLwM2mUplinkMsgHandler defaultUplinkMsgHandlerTest;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
index ad02b8f8fc..71c48f6d99 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
@@ -22,7 +22,7 @@ import org.eclipse.leshan.core.link.LinkParser;
 import org.eclipse.leshan.core.link.lwm2m.DefaultLwM2mLinkParser;
 import org.junit.Before;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
@@ -104,7 +104,7 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
 
     protected String idVer_19_0_0;
 
-    @SpyBean
+    @MockitoSpyBean
     protected LwM2mTransportServerHelper lwM2mTransportServerHelperTest;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
index afb179cc5f..f145d6a62a 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
@@ -24,7 +24,7 @@ import org.eclipse.leshan.server.registration.RegistrationStore;
 import org.eclipse.leshan.server.registration.RegistrationUpdate;
 import org.junit.Assert;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
@@ -49,7 +49,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClient
 @Slf4j
 public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecurityLwM2MIntegrationTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private RegistrationStore registrationStoreTest;
 
     protected void basicTestConnectionDifferentPort(Lwm2mDeviceProfileTransportConfiguration transportConfiguration,
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java
index 541ca40072..d2c2b546f7 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.TestPropertySource;
@@ -71,7 +71,7 @@ public class MqttGatewayRateLimitsTest extends AbstractControllerTest {
     private Device gateway;
     private String gatewayAccessToken;
 
-    @SpyBean
+    @MockitoSpyBean
     private NotificationRuleProcessor notificationRuleProcessor;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
index ea40a574a5..07837d9d8f 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -67,7 +67,7 @@ public abstract class AbstractMqttTimeseriesIntegrationTest extends AbstractMqtt
     protected static final String MALFORMED_JSON_PAYLOAD = "{\"key1\":, \"key2\":true, \"key3\": 3.0, \"key4\": 4," +
             " \"key5\": {\"someNumber\": 42, \"someArray\": [1,2,3], \"someNestedObject\": {\"key\": \"value\"}}}";
 
-    @SpyBean
+    @MockitoSpyBean
     GatewayMetricsService gatewayMetricsService;
 
     @Before

From 139b32f329c334b20d8601788000f997a32e94c6 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Wed, 22 Apr 2026 15:44:10 +0200
Subject: [PATCH 10/91] cleanup(common): add @SafeVarargs, drop raw types and
 parameterize test collections

---
 .../server/common/data/util/CollectionsUtil.java     |  3 ++-
 .../org/thingsboard/script/api/tbel/TbUtils.java     |  2 +-
 .../org/thingsboard/script/api/tbel/TbUtilsTest.java | 12 ++++++------
 .../org/thingsboard/common/util/ExceptionUtil.java   |  1 +
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/CollectionsUtil.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/CollectionsUtil.java
index d0d8828649..125a370678 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/util/CollectionsUtil.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/CollectionsUtil.java
@@ -83,6 +83,7 @@ public class CollectionsUtil {
         return result;
     }
 
+    @SafeVarargs
     public static <V> boolean isOneOf(V value, V... others) {
         if (value == null) {
             return false;
@@ -105,7 +106,7 @@ public class CollectionsUtil {
         Set<T> newSet = new HashSet<>(existing.size() + 1);
         newSet.addAll(existing);
         newSet.add(value);
-        return (Set<T>) Set.of(newSet.toArray());
+        return Set.copyOf(newSet);
     }
 
 }
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
index e206d2d78d..28e0357c3b 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
@@ -1349,7 +1349,7 @@ public class TbUtils {
         for (byte b : byteArray) {
             byteList.add(b);
         }
-        ExecutionArrayList<Byte> list = new ExecutionArrayList(byteList, ctx);
+        ExecutionArrayList<Byte> list = new ExecutionArrayList<>(byteList, ctx);
         return list;
     }
 
diff --git a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
index 622d298bbb..bc40ced5bb 100644
--- a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
+++ b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
@@ -1308,13 +1308,13 @@ public class TbUtilsTest {
     }
     @Test
     public void setTest() throws ExecutionException, InterruptedException {
-        Set actual = TbUtils.newSet(ctx);
-        Set expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xCC});
+        Set<Byte> actual = TbUtils.newSet(ctx);
+        Set<Byte> expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xCC});
         actual.add((byte) 0xDD);
         actual.add((byte) 0xCC);
         actual.add((byte) 0xCC);
         assertTrue(expected.containsAll(actual));
-        List list = toList(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xBB, (byte) 0xAA});
+        List<Byte> list = toList(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xBB, (byte) 0xAA});
         actual.addAll(list);
         assertEquals(4, actual.size());
         assertTrue(actual.containsAll(expected));
@@ -1328,9 +1328,9 @@ public class TbUtilsTest {
         actual.clear();
         assertTrue(actual.isEmpty());
         actual = TbUtils.toSet(ctx, list);
-        Set actualClone = TbUtils.toSet(ctx, list);
-        Set actualClone_asc = TbUtils.toSet(ctx, list);
-        Set actualClone_desc = TbUtils.toSet(ctx, list);
+        Set<Byte> actualClone = TbUtils.toSet(ctx, list);
+        Set<Byte> actualClone_asc = TbUtils.toSet(ctx, list);
+        Set<Byte> actualClone_desc = TbUtils.toSet(ctx, list);
         ((ExecutionLinkedHashSet<?>)actualClone).sort();
         ((ExecutionLinkedHashSet<?>)actualClone_asc).sort(true);
         ((ExecutionLinkedHashSet<?>)actualClone_desc).sort(false);
diff --git a/common/util/src/main/java/org/thingsboard/common/util/ExceptionUtil.java b/common/util/src/main/java/org/thingsboard/common/util/ExceptionUtil.java
index e5eed02675..7dc1ddde60 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/ExceptionUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/ExceptionUtil.java
@@ -37,6 +37,7 @@ public class ExceptionUtil {
         }
     }
 
+    @SafeVarargs
     public static Exception lookupExceptionInCause(Throwable source, Class<? extends Exception>... clazzes) {
         while (source != null) {
             for (Class<? extends Exception> clazz : clazzes) {

From 8d3f7bf416b5d6b652ef20da2c6e5959bd792229 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Wed, 22 Apr 2026 17:03:48 +0200
Subject: [PATCH 11/91] cleanup(dao, transport/lwm2m): parameterize
 testcontainers and rpc callback types

---
 .../server/rpc/DefaultLwM2MRpcRequestHandler.java    | 12 ++++++------
 .../server/dao/AbstractRedisClusterContainer.java    | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
index 6980fb6341..c363cd3da5 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
@@ -212,7 +212,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         String[] versionedIds = getIdsFromParameters(client, requestMsg);
         TbLwM2MReadCompositeRequest request = TbLwM2MReadCompositeRequest.builder().versionedIds(versionedIds).timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MReadCompositeCallback(uplinkHandler, logService, client, versionedIds);
-        var rpcCallback = new RpcReadResponseCompositeCallback(transportService, client, requestMsg, mainCallback);
+        var rpcCallback = new RpcReadResponseCompositeCallback<>(transportService, client, requestMsg, mainCallback);
         downlinkHandler.sendReadCompositeRequest(client, request, rpcCallback);
     }
 
@@ -323,7 +323,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
                 } else if (path.isResource()) {
                     validateResource(client, newNodes, nodes, key , value);
                 } else if (path.isObjectInstance() && value instanceof Map<?, ?>) {
-                    ((Map) value).forEach((k, v) -> {
+                    ((Map<?, ?>) value).forEach((k, v) -> {
                         validateResource(client, newNodes, nodes, validateResourceId (key, k.toString(), nodes), v);
                     });
                 } else {
@@ -337,7 +337,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         return newNodes;
     }
 
-    private void validateResource(LwM2mClient client, Map newNodes, Map nodes, String resourceId , Object value) {
+    private void validateResource(LwM2mClient client, Map<String, Object> newNodes, Map<String, Object> nodes, String resourceId , Object value) {
         if (value instanceof Map<?, ?>) {
             ((Map<?, ?>) value).forEach((k, v) -> {
                 setValueToCompositeNodes(client, newNodes, nodes, validateResourceId (resourceId, k.toString(), nodes), v);
@@ -347,7 +347,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         }
     }
 
-    private String validateResourceId (String key, String id, Map nodes) {
+    private String validateResourceId (String key, String id, Map<String, Object> nodes) {
         try {
             Integer.parseInt(id);
             return key + "/" + id;
@@ -357,7 +357,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         }
     }
 
-    private void setValueToCompositeNodes (LwM2mClient client, Map newNodes, Map nodes, String versionedId , Object value) {
+    private void setValueToCompositeNodes (LwM2mClient client, Map<String, Object> newNodes, Map<String, Object> nodes, String versionedId , Object value) {
         // validate value. Must be only primitive, not JsonObject or JsonArray
         try {
             JsonElement element = JsonUtils.parse(value);
@@ -388,7 +388,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         String[] versionedIds = getIdsFromParameters(client, requestMsg);
         TbLwM2MObserveCompositeRequest request = TbLwM2MObserveCompositeRequest.builder().versionedIds(versionedIds).timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MObserveCompositeCallback(uplinkHandler, logService, client, versionedIds);
-        var rpcCallback = new RpcObserveResponseCompositeCallback(transportService, client, requestMsg, mainCallback);
+        var rpcCallback = new RpcObserveResponseCompositeCallback<>(transportService, client, requestMsg, mainCallback);
         downlinkHandler.sendObserveCompositeRequest(client, request, rpcCallback);
     }
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java
index 827e50a5cc..1f057c802b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java
@@ -40,17 +40,17 @@ public class AbstractRedisClusterContainer {
     ); 
 
     @ClassRule(order = 1)
-    public static GenericContainer redis1 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6371").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis1 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6371").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 2)
-    public static GenericContainer redis2 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6372").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis2 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6372").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 3)
-    public static GenericContainer redis3 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6373").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis3 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6373").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 4)
-    public static GenericContainer redis4 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6374").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis4 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6374").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 5)
-    public static GenericContainer redis5 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6375").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis5 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6375").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 6)
-    public static GenericContainer redis6 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6376").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis6 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6376").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
 
 
     @ClassRule(order = 100)

From 6696879a54ec6f1dbc57aa1f7e7b4d6434eb2c13 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Wed, 22 Apr 2026 22:07:16 +0200
Subject: [PATCH 12/91] cleanup(application): parameterize Set and Predicate
 fields in lwm2m rpc integration test base

---
 .../lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
index ad02b8f8fc..1e3b6fcbe7 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
@@ -78,16 +78,16 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
 
     protected final LinkParser linkParser = new DefaultLwM2mLinkParser();
     protected String CONFIG_PROFILE_WITH_PARAMS_RPC;
-    public Set expectedObjects;
-    public Set expectedObjectIdVers;
-    public Set expectedInstances;
-    public Set expectedObjectIdVerInstances;
+    public Set<String> expectedObjects;
+    public Set<String> expectedObjectIdVers;
+    public Set<String> expectedInstances;
+    public Set<String> expectedObjectIdVerInstances;
 
     protected String objectInstanceIdVer_1;
     protected String objectIdVer_0;
     protected String objectIdVer_1;
     protected String objectIdVer_2;
-    private static final Predicate PREDICATE_3 = path -> (!((String) path).startsWith("/" + TEMPERATURE_SENSOR) && ((String) path).startsWith("/" + DEVICE));
+    private static final Predicate<String> PREDICATE_3 = path -> (!((String) path).startsWith("/" + TEMPERATURE_SENSOR) && ((String) path).startsWith("/" + DEVICE));
     protected String objectIdVer_3;
     protected String objectInstanceIdVer_3;
     protected String objectInstanceIdVer_5;

From de1f1a2d9dbdafc743f68b0252a632490d89a23f Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Wed, 22 Apr 2026 22:56:52 +0200
Subject: [PATCH 13/91] cleanup(tests, transport/lwm2m): use
 ArgumentCaptor.captor() and parameterize path list

---
 .../downlink/DefaultLwM2mDownlinkMsgHandler.java     |  2 +-
 .../service/TransportActivityManagerTest.java        |  4 ++--
 .../rule/engine/flow/TbCheckpointNodeTest.java       |  2 +-
 .../rule/engine/kafka/TbKafkaNodeTest.java           |  2 +-
 .../rule/engine/metadata/TbGetTelemetryNodeTest.java | 12 ++++++------
 .../telemetry/TbMsgDeleteAttributesNodeTest.java     |  2 +-
 .../engine/transform/TbMsgDeduplicationNodeTest.java | 10 +++++-----
 .../engine/transform/TbSplitArrayMsgNodeTest.java    |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
index 8f638cfa2a..6d6eea28ab 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
@@ -815,7 +815,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
                 LwM2mPath pathSingleOb = singleObs.getPath();
                 LwM2mPath pathObjectId = new LwM2mPath(objectId);
                 if (!pathSingleOb.toString().equals(objectId)) {
-                    List paths = Arrays.asList(pathSingleOb, pathObjectId);
+                    List<LwM2mPath> paths = Arrays.asList(pathSingleOb, pathObjectId);
                     try {
                         LwM2mPath.validateNotOverlapping(paths);
                     } catch (IllegalArgumentException e){
diff --git a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/TransportActivityManagerTest.java b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/TransportActivityManagerTest.java
index 3b3ce6e600..35ddba5d90 100644
--- a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/TransportActivityManagerTest.java
+++ b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/TransportActivityManagerTest.java
@@ -122,7 +122,7 @@ public class TransportActivityManagerTest {
         // THEN
         ArgumentCaptor<TransportProtos.SessionInfoProto> sessionInfoCaptor = ArgumentCaptor.forClass(TransportProtos.SessionInfoProto.class);
         ArgumentCaptor<TransportProtos.SubscriptionInfoProto> subscriptionInfoCaptor = ArgumentCaptor.forClass(TransportProtos.SubscriptionInfoProto.class);
-        ArgumentCaptor<TransportServiceCallback<Void>> callbackCaptor = ArgumentCaptor.forClass(TransportServiceCallback.class);
+        ArgumentCaptor<TransportServiceCallback<Void>> callbackCaptor = ArgumentCaptor.captor();
 
         verify(transportServiceMock).process(sessionInfoCaptor.capture(), subscriptionInfoCaptor.capture(), callbackCaptor.capture());
 
@@ -166,7 +166,7 @@ public class TransportActivityManagerTest {
         // THEN
         ArgumentCaptor<TransportProtos.SessionInfoProto> sessionInfoCaptor = ArgumentCaptor.forClass(TransportProtos.SessionInfoProto.class);
         ArgumentCaptor<TransportProtos.SubscriptionInfoProto> subscriptionInfoCaptor = ArgumentCaptor.forClass(TransportProtos.SubscriptionInfoProto.class);
-        ArgumentCaptor<TransportServiceCallback<Void>> callbackCaptor = ArgumentCaptor.forClass(TransportServiceCallback.class);
+        ArgumentCaptor<TransportServiceCallback<Void>> callbackCaptor = ArgumentCaptor.captor();
 
         verify(transportServiceMock).process(sessionInfoCaptor.capture(), subscriptionInfoCaptor.capture(), callbackCaptor.capture());
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
index ab0f358684..7c47477fee 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
@@ -114,7 +114,7 @@ public class TbCheckpointNodeTest extends AbstractRuleNodeUpgradeTest {
                 .build();
         node.onMsg(ctxMock, msg);
 
-        ArgumentCaptor<Consumer<Throwable>> onFailure = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> onFailure = ArgumentCaptor.captor();
         then(ctxMock).should().enqueueForTellNext(eq(msg), eq(DataConstants.HP_QUEUE_NAME), eq(TbNodeConnectionType.SUCCESS), any(), onFailure.capture());
         String errorMsg = "Something went wrong.";
         onFailure.getValue().accept(new RuntimeException(errorMsg));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
index 5df7e1be7b..392821b767 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
@@ -420,7 +420,7 @@ public class TbKafkaNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     private void verifyProducerRecord(String expectedTopic, String expectedKey, String expectedValue, Headers expectedHeaders) {
-        ArgumentCaptor<ProducerRecord<String, String>> actualRecordCaptor = ArgumentCaptor.forClass(ProducerRecord.class);
+        ArgumentCaptor<ProducerRecord<String, String>> actualRecordCaptor = ArgumentCaptor.captor();
         then(producerMock).should().send(actualRecordCaptor.capture(), any());
         ProducerRecord<String, String> actualRecord = actualRecordCaptor.getValue();
         assertThat(actualRecord.topic()).isEqualTo(expectedTopic);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
index ce3a1b5b22..5de65535e7 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
@@ -219,7 +219,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         assertThat(actualReadTsKvQuery.getStartTs()).isEqualTo(startTs);
@@ -246,7 +246,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         assertThat(actualReadTsKvQuery.getStartTs()).isEqualTo(ts - TimeUnit.MINUTES.toMillis(config.getStartInterval()));
@@ -275,7 +275,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         List<String> actualKeys = actualReadTsKvQueryList.getValue().stream().map(TsKvQuery::getKey).toList();
         assertThat(actualKeys).containsExactlyInAnyOrder("temperature", "humidity", "pressure");
@@ -305,7 +305,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         aggregationStepVerifier.accept(actualReadTsKvQuery);
@@ -340,7 +340,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         limitInQueryVerifier.accept(actualReadTsKvQuery);
@@ -385,7 +385,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         orderInQueryVerifier.accept(actualReadTsKvQuery);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
index b03794c39d..105962fd1e 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
@@ -147,7 +147,7 @@ public class TbMsgDeleteAttributesNodeTest {
         node.onMsg(ctx, msg);
 
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
         if (sendAttributesDeletedNotification) {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
index ec71819878..8fd2868f61 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
@@ -192,7 +192,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(ctx, times(1)).tellFailure(eq(msgToReject), any());
@@ -248,7 +248,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(ctx, times(1)).tellFailure(eq(msgToReject), any());
@@ -293,7 +293,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(node, times(msgCount + wantedNumberOfTellSelfInvocation)).onMsg(eq(ctx), any());
@@ -339,7 +339,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(node, times(msgCount + wantedNumberOfTellSelfInvocation)).onMsg(eq(ctx), any());
@@ -393,7 +393,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(node, times(msgCount + wantedNumberOfTellSelfInvocation)).onMsg(eq(ctx), any());
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
index 5cd88c8ea9..b178def66e 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
@@ -114,7 +114,7 @@ public class TbSplitArrayMsgNodeTest {
 
         if (dataNode.size() > 1) {
             ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-            ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+            ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
             verify(ctx, times(dataNode.size())).enqueueForTellNext(any(), anyString(), successCaptor.capture(), failureCaptor.capture());
             for (Runnable valueCaptor : successCaptor.getAllValues()) {
                 valueCaptor.run();

From df4dc250829e13b0442bc7b2ffd58a23e3573f47 Mon Sep 17 00:00:00 2001
From: Oleksii Kuripko <alexeu.kyripko@gmail.com>
Date: Thu, 23 Apr 2026 10:20:20 +0200
Subject: [PATCH 14/91] emit recovery signal for MonitoringServiceKey.GENERAL
 and route EDQS I/O errors correctly

Two related fixes for a stuck-open 'Monitoring' entry in the incident header:

1. serviceIsOk(GENERAL) is now called when a monitoring cycle completes
   successfully. Previously GENERAL could only accumulate failures (via the
   outer Throwable catch), with no complementary recovery, so once the
   catch-all fired the service stayed red forever.
2. checkEdqs() is now wrapped in its own try/catch that reports any
   non-ServiceFailureException failures under EDQS rather than GENERAL.
   Connection/read timeouts hitting /api/entitiesQuery/find previously
   propagated unwrapped and were bucketed as GENERAL, which hid the fact
   that EDQS was the failing component.
---
 .../service/BaseMonitoringService.java          | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
index 3f1c624200..9c8c8fc533 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseMonitoringService.java
@@ -155,13 +155,22 @@ public abstract class BaseMonitoringService<C extends MonitoringConfig<T>, T ext
             }
 
             if (checkEdqs) {
-                stopWatch.start();
-                checkEdqs();
-                reporter.reportLatency(Latencies.EDQS_QUERY, stopWatch.getTime());
-                reporter.serviceIsOk(MonitoredServiceKey.EDQS);
+                try {
+                    stopWatch.start();
+                    checkEdqs();
+                    reporter.reportLatency(Latencies.EDQS_QUERY, stopWatch.getTime());
+                    reporter.serviceIsOk(MonitoredServiceKey.EDQS);
+                } catch (ServiceFailureException e) {
+                    reporter.serviceFailure(e.getServiceKey(), e);
+                    return;
+                } catch (Exception e) {
+                    reporter.serviceFailure(MonitoredServiceKey.EDQS, e);
+                    return;
+                }
             }
 
             reporter.reportLatencies();
+            reporter.serviceIsOk(MonitoredServiceKey.GENERAL);
             log.debug("Finished {}", getName());
         } catch (ServiceFailureException e) {
             reporter.serviceFailure(e.getServiceKey(), e);

From e31d04956ce27c61a0bbe1428b930777eba62c1f Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Thu, 23 Apr 2026 10:20:35 +0200
Subject: [PATCH 15/91] Fixed tests by adding context configuration, swapping
 @MockitoSpyBean for @MockitoBean and adding missing dependencies.

Signed-off-by: Oleksandra Matviienko <al.zzzeebra@gmail.com>
---
 .../provision/DeviceProvisionServiceTest.java | 17 ++++++++++++-
 .../queue/DefaultTbClusterServiceTest.java    | 19 ++++++++++++++-
 .../DefaultTransportApiServiceTest.java       | 24 ++++++++++++++++++-
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
index c5f10ea4b3..4f2eaa5147 100644
--- a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
@@ -73,9 +73,24 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = DeviceProvisionServiceImpl.class)
+@ContextConfiguration(classes = DeviceProvisionServiceTest.ContextConfiguration.class)
 public class DeviceProvisionServiceTest {
 
+    @org.springframework.context.annotation.Configuration
+    static class ContextConfiguration {
+        @org.springframework.context.annotation.Bean
+        public DeviceProvisionServiceImpl deviceProvisionService(TbQueueProducerProvider producerProvider,
+                                                                 DeviceProfileService deviceProfileService,
+                                                                 DeviceService deviceService,
+                                                                 DeviceCredentialsService deviceCredentialsService,
+                                                                 AttributesService attributesService,
+                                                                 AuditLogService auditLogService,
+                                                                 PartitionService partitionService) {
+            return new DeviceProvisionServiceImpl(producerProvider, deviceProfileService, deviceService,
+                    deviceCredentialsService, attributesService, auditLogService, partitionService);
+        }
+    }
+
     @MockitoBean
     protected TbQueueProducerProvider producerProvider;
     @MockitoBean
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
index 63b4c98142..79b31acf78 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
@@ -56,6 +56,7 @@ import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
+import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 
@@ -67,6 +68,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -106,11 +108,26 @@ public class DefaultTbClusterServiceTest {
     @MockitoBean
     protected CalculatedFieldService calculatedFieldService;
 
-    @MockitoSpyBean
+    @MockitoBean
     protected TopicService topicService;
+    @MockitoBean
+    protected OtaPackageStateService otaPackageStateService;
     @MockitoSpyBean
     protected TbClusterService clusterService;
 
+    @org.junit.Before
+    public void setUp() {
+        lenient().when(topicService.getNotificationsTopic(any(), any())).thenAnswer(invocation -> {
+            ServiceType serviceType = invocation.getArgument(0);
+            String serviceId = invocation.getArgument(1);
+            return new TopicPartitionInfo(serviceType.name().toLowerCase() + ".notifications." + serviceId, null, null, false);
+        });
+        lenient().when(topicService.getCalculatedFieldNotificationsTopic(any())).thenAnswer(invocation -> {
+            String serviceId = invocation.getArgument(0);
+            return new TopicPartitionInfo("calculated_field.notifications." + serviceId, null, null, false);
+        });
+    }
+
     @Test
     public void testOnQueueChangeSingleMonolith() {
         when(partitionService.getAllServiceIds(ServiceType.TB_RULE_ENGINE)).thenReturn(Sets.newHashSet(MONOLITH));
diff --git a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
index 952172a491..6b667cc811 100644
--- a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
@@ -69,9 +69,31 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = DefaultTransportApiService.class)
+@ContextConfiguration(classes = DefaultTransportApiServiceTest.ContextConfiguration.class)
 public class DefaultTransportApiServiceTest {
 
+    @org.springframework.context.annotation.Configuration
+    static class ContextConfiguration {
+        @org.springframework.context.annotation.Bean
+        public DefaultTransportApiService defaultTransportApiService(TbDeviceProfileCache deviceProfileCache,
+                                                                     TbTenantProfileCache tenantProfileCache,
+                                                                     TbApiUsageStateService apiUsageStateService,
+                                                                     DeviceService deviceService,
+                                                                     DeviceProfileService deviceProfileService,
+                                                                     RelationService relationService,
+                                                                     DeviceCredentialsService deviceCredentialsService,
+                                                                     TbClusterService tbClusterService,
+                                                                     DeviceProvisionService deviceProvisionService,
+                                                                     ResourceService resourceService,
+                                                                     OtaPackageService otaPackageService,
+                                                                     OtaPackageDataCache otaPackageDataCache,
+                                                                     QueueService queueService) {
+            return new DefaultTransportApiService(deviceProfileCache, tenantProfileCache, apiUsageStateService,
+                    deviceService, deviceProfileService, relationService, deviceCredentialsService, tbClusterService,
+                    deviceProvisionService, resourceService, otaPackageService, otaPackageDataCache, queueService);
+        }
+    }
+
     @MockitoBean
     protected TbDeviceProfileCache deviceProfileCache;
     @MockitoBean

From e7751a0bf516246361cbe0e6896f974d6254caa5 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Thu, 23 Apr 2026 15:11:11 +0200
Subject: [PATCH 16/91] Replaced deprecated
 X509Certificate.getSubjectDN()/getIssuerDN() with
 getSubjectX500Principal()/getIssuerX500Principal() in CertPemCredentials

Uses X500Principal.getName(X500Principal.RFC1779) to keep DN output byte-identical to the old sun.security.x509.X500Name format; expected test strings unchanged. Removes 7 getSubjectDN() and 1 getIssuerDN() deprecation warnings in rule-engine-components.
---
 .../rule/engine/credentials/CertPemCredentials.java |  5 +++--
 .../engine/credentials/CertPemCredentialsTest.java  | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
index 81def5a96b..46d844d2c4 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.StringUtils;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
+import javax.security.auth.x500.X500Principal;
 import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.CertPath;
@@ -77,7 +78,7 @@ public class CertPemCredentials implements ClientCredentials {
         KeyStore caKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         caKeyStore.load(null, null);
         for (X509Certificate caCert : caCerts) {
-            caKeyStore.setCertificateEntry(CA_CERT_CERT_ALIAS_PREFIX + caCert.getSubjectDN().getName(), caCert);
+            caKeyStore.setCertificateEntry(CA_CERT_CERT_ALIAS_PREFIX + caCert.getSubjectX500Principal().getName(X500Principal.RFC1779), caCert);
         }
 
         TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
@@ -99,7 +100,7 @@ public class CertPemCredentials implements ClientCredentials {
         keyStore.load(null);
         List<X509Certificate> unique = certificates.stream().distinct().collect(Collectors.toList());
         for (X509Certificate cert : unique) {
-            keyStore.setCertificateEntry(CERT_ALIAS_PREFIX + cert.getSubjectDN().getName(), cert);
+            keyStore.setCertificateEntry(CERT_ALIAS_PREFIX + cert.getSubjectX500Principal().getName(X500Principal.RFC1779), cert);
         }
 
         if (privateKey != null) {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
index cd0d508fec..634b5d8754 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
@@ -23,6 +23,7 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.thingsboard.common.util.SslUtil;
 
+import javax.security.auth.x500.X500Principal;
 import java.io.File;
 import java.io.IOException;
 import java.security.Key;
@@ -49,13 +50,13 @@ public class CertPemCredentialsTest {
 
         Assertions.assertEquals(4, x509Certificates.size());
         Assertions.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
-                x509Certificates.get(0).getSubjectDN().getName());
+                x509Certificates.get(0).getSubjectX500Principal().getName(X500Principal.RFC1779));
         Assertions.assertEquals("CN=Sectigo ECC Organization Validation Secure Server CA, O=Sectigo Limited, L=Salford, ST=Greater Manchester, C=GB",
-                x509Certificates.get(1).getSubjectDN().getName());
+                x509Certificates.get(1).getSubjectX500Principal().getName(X500Principal.RFC1779));
         Assertions.assertEquals("CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US",
-                x509Certificates.get(2).getSubjectDN().getName());
+                x509Certificates.get(2).getSubjectX500Principal().getName(X500Principal.RFC1779));
         Assertions.assertEquals("CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB",
-                x509Certificates.get(3).getSubjectDN().getName());
+                x509Certificates.get(3).getSubjectX500Principal().getName(X500Principal.RFC1779));
     }
 
     @Test
@@ -66,7 +67,7 @@ public class CertPemCredentialsTest {
 
         Assertions.assertEquals(1, x509Certificates.size());
         Assertions.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
-                x509Certificates.get(0).getSubjectDN().getName());
+                x509Certificates.get(0).getSubjectX500Principal().getName(X500Principal.RFC1779));
     }
 
     @Test
@@ -103,7 +104,7 @@ public class CertPemCredentialsTest {
 
         List<X509Certificate> certs = SslUtil.readCertFile(certContent);
         for (X509Certificate cert : certs) {
-            String alias = CERT_ALIAS_PREFIX + cert.getIssuerDN().getName();
+            String alias = CERT_ALIAS_PREFIX + cert.getIssuerX500Principal().getName(X500Principal.RFC1779);
             Certificate certificate = keyStore.getCertificate(alias);
             Assertions.assertNotNull(certificate);
             Assertions.assertEquals(new String(cert.getEncoded()), new String(certificate.getEncoded()));

From 15cca51c42f83691a1c68995dab6906f3d88f336 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 08:54:24 +0200
Subject: [PATCH 17/91] chore(build): silence Lombok @Builder
 ignore-initializer warnings

Added @Builder.Default to 5 fields with initializers in
MobileLayoutConfig (pages) and DefaultTenantProfileConfiguration
(maxCalculatedFieldsPerEntity, maxArgumentsPerCF, maxStateSizeInKBytes,
maxSingleValueArgumentSizeInKBytes). Dropped the redundant `= 0` on
Task.attempt (int default is already 0) to clear the same anomaly on
@SuperBuilder.

Eliminates 6 "@Builder/@SuperBuilder will ignore the initializing
expression" warnings from #15481 Tier 2. `[WARNING]` total drops
843 -> 837, `[ERROR]` unchanged at 0.
---
 .../org/thingsboard/server/common/data/job/task/Task.java     | 2 +-
 .../server/common/data/mobile/layout/MobileLayoutConfig.java  | 1 +
 .../tenant/profile/DefaultTenantProfileConfiguration.java     | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
index 8f3e0d814b..a881780012 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
@@ -46,7 +46,7 @@ public abstract class Task<R extends TaskResult> {
     public Task() {
     }
 
-    private int attempt = 0;
+    private int attempt;
 
     public abstract R toFailed(Throwable error);
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
index a45fd90838..8cf0bfb618 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
@@ -38,6 +38,7 @@ public class MobileLayoutConfig {
     @Schema(description = "List of pages")
     @JsonView(Views.Public.class)
     @Valid
+    @Builder.Default
     private List<MobilePage> pages = new ArrayList<>();
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
index e8dbfd1584..fd13317a38 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
@@ -168,16 +168,20 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
 
     private double warnThreshold;
 
+    @Builder.Default
     @Schema(example = "5")
     private long maxCalculatedFieldsPerEntity = 5;
+    @Builder.Default
     @Schema(example = "10")
     private long maxArgumentsPerCF = 10;
     @Builder.Default
     @Min(value = 1, message = "must be at least 1")
     @Schema(example = "1000")
     private long maxDataPointsPerRollingArg = 1000;
+    @Builder.Default
     @Schema(example = "32")
     private long maxStateSizeInKBytes = 32;
+    @Builder.Default
     @Schema(example = "2")
     private long maxSingleValueArgumentSizeInKBytes = 2;
 

From d7dc035ebc3f0cda4bec345a89e9b521baea27a0 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 10:09:17 +0200
Subject: [PATCH 18/91] chore(build): silence Lombok @EqualsAndHashCode
 callSuper warnings

---
 .../server/service/cf/ctx/state/ScriptCalculatedFieldState.java | 2 ++
 .../server/service/cf/ctx/state/SimpleCalculatedFieldState.java | 2 ++
 .../main/java/org/thingsboard/server/common/data/EventInfo.java | 2 ++
 .../java/org/thingsboard/server/common/data/HomeDashboard.java  | 2 ++
 .../java/org/thingsboard/server/common/data/TenantInfo.java     | 2 ++
 .../org/thingsboard/server/common/data/alarm/AlarmComment.java  | 1 +
 .../data/device/data/CoapDeviceTransportConfiguration.java      | 2 ++
 .../data/device/data/Lwm2mDeviceTransportConfiguration.java     | 2 ++
 .../lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java       | 2 ++
 .../java/org/thingsboard/server/common/data/edge/EdgeInfo.java  | 2 ++
 .../thingsboard/server/common/data/edqs/fields/AssetFields.java | 2 ++
 .../server/common/data/edqs/fields/AssetProfileFields.java      | 2 ++
 .../server/common/data/edqs/fields/CustomerFields.java          | 2 ++
 .../server/common/data/edqs/fields/DashboardFields.java         | 2 ++
 .../server/common/data/edqs/fields/DeviceFields.java            | 2 ++
 .../server/common/data/edqs/fields/DeviceProfileFields.java     | 2 ++
 .../thingsboard/server/common/data/edqs/fields/EdgeFields.java  | 2 ++
 .../server/common/data/edqs/fields/EntityViewFields.java        | 2 ++
 .../server/common/data/edqs/fields/QueueStatsFields.java        | 2 ++
 .../server/common/data/edqs/fields/RuleChainFields.java         | 2 ++
 .../server/common/data/edqs/fields/TenantFields.java            | 2 ++
 .../server/common/data/edqs/fields/TenantProfileFields.java     | 2 ++
 .../thingsboard/server/common/data/edqs/fields/UserFields.java  | 2 ++
 .../thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java  | 2 ++
 .../thingsboard/server/common/data/query/AlarmCountQuery.java   | 2 ++
 .../java/org/thingsboard/server/common/data/queue/Queue.java    | 2 ++
 .../org/thingsboard/server/common/data/rule/RuleNodeState.java  | 2 ++
 .../thingsboard/server/common/data/widget/WidgetTypeInfo.java   | 2 ++
 .../server/transport/mqtt/limits/GatewaySessionLimits.java      | 2 ++
 .../server/dao/model/sqlts/latest/TsKvLatestEntity.java         | 2 ++
 .../rule/engine/action/TbClearAlarmNodeConfiguration.java       | 2 ++
 .../rule/engine/action/TbCreateAlarmNodeConfiguration.java      | 2 ++
 .../rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java | 2 ++
 .../rule/engine/mqtt/azure/AzureIotHubSasCredentials.java       | 2 ++
 .../rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java  | 2 ++
 35 files changed, 69 insertions(+)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
index 24f3acd4a7..be95922dbb 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
@@ -20,6 +20,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.script.api.tbel.TbelCfArg;
@@ -35,6 +36,7 @@ import java.util.List;
 import java.util.Map;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Slf4j
 @NoArgsConstructor
 public class ScriptCalculatedFieldState extends BaseCalculatedFieldState {
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
index 0d018f5def..62c3f840f4 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.script.api.tbel.TbUtils;
@@ -33,6 +34,7 @@ import java.util.List;
 import java.util.Map;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 public class SimpleCalculatedFieldState extends BaseCalculatedFieldState {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
index 9ca3957050..e0bdde1dd8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EventId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.id.TenantId;
  * @author Andrew Shvayka
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Schema
 public class EventInfo extends BaseData<EventId> {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
index ce9c8fce78..df2cdf2bf5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
@@ -17,9 +17,11 @@ package org.thingsboard.server.common.data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class HomeDashboard extends Dashboard {
 
     public static final String HIDE_DASHBOARD_TOOLBAR_DESCRIPTION = "Hide dashboard toolbar flag. Useful for rendering dashboards on mobile.";
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
index 4126b1acdd..8f38ecd750 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
@@ -17,10 +17,12 @@ package org.thingsboard.server.common.data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.TenantId;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TenantInfo extends Tenant {
     @Schema(description = "Tenant Profile name", example = "Default")
     private String tenantProfileName;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
index 0a011c287f..29269e5bd8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
@@ -34,6 +34,7 @@ import java.io.Serial;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Builder
 @AllArgsConstructor
 public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
index 3f23e4fe14..662887c08c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
@@ -19,12 +19,14 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.DeviceTransportType;
 
 import java.util.HashMap;
 import java.util.Map;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
     private static final long serialVersionUID = 6061442236008925609L;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
index 079ceffada..1c53412ef9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
@@ -19,12 +19,14 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.DeviceTransportType;
 
 import java.util.HashMap;
 import java.util.Map;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class Lwm2mDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
     @JsonIgnore
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
index 85c1e97e24..14ef402718 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
@@ -17,9 +17,11 @@ package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class LwM2MServerSecurityConfigDefault extends LwM2MServerSecurityConfig {
     @Schema(description = "Host for 'Security' mode (DTLS)", example = "0.0.0.0", accessMode = Schema.AccessMode.READ_ONLY)
     protected String securityHost;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
index dd751b8b9d..5dbd0212b3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
@@ -16,9 +16,11 @@
 package org.thingsboard.server.common.data.edge;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EdgeId;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class EdgeInfo extends Edge {
 
     private String customerTitle;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
index 40ad22ed19..d05147b4d7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -26,6 +27,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetFields extends AbstractEntityFields implements ProfileAwareFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
index ce91aac9d0..c519daa800 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
index e2cdf8f295..c324f0f1ab 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class CustomerFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
index 4131d58e98..608a64436e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -28,6 +29,7 @@ import java.util.UUID;
 
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DashboardFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
index 90400ae70d..ef8aee952b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -26,6 +27,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceFields extends AbstractEntityFields implements ProfileAwareFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
index 067c961b9e..2331829054 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -23,6 +24,7 @@ import org.thingsboard.server.common.data.DeviceProfileType;
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
index 1d257b06e1..e048eb22a8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class EdgeFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
index 4e326cf779..c5027dfc8f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class EntityViewFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
index 13e05daad4..5c5a139364 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class QueueStatsFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
index 25b7db6aaa..d580f6b913 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class RuleChainFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
index 9b538511b2..ba350fec54 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
index f6a2889f67..5d1ff0e0e2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -23,6 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
index 225b85680f..70fde8bf9c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class UserFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
index 233c53849c..f46339c15a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.common.data.kv;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class BaseDeleteTsKvQuery extends BaseTsKvQuery implements DeleteTsKvQuery {
 
     private final Boolean rewriteLatestIfDeleted;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
index f9d2e8d3d8..1599413c1c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.query;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
@@ -30,6 +31,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
+@EqualsAndHashCode(callSuper = false)
 @ToString
 public class AlarmCountQuery extends EntityCountQuery {
     private long startTs;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
index 57e0e6af66..d6a4f2b12f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.queue;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseDataWithAdditionalInfo;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
@@ -30,6 +31,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 import java.util.Optional;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class Queue extends BaseDataWithAdditionalInfo<QueueId> implements HasName, HasTenantId, QueueConfig {
     private TenantId tenantId;
     @NoXss
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
index cb861a6726..0624350d7e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.rule;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeStateId;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class RuleNodeState extends BaseData<RuleNodeStateId> {
 
     private RuleNodeId ruleNodeId;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
index 9fe846796b..9acce93aa3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.widget;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.validation.NoXss;
 
@@ -26,6 +27,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class WidgetTypeInfo extends BaseWidgetType {
 
     @Serial
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
index 45d9e21e39..8356a17748 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.transport.mqtt.limits;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class GatewaySessionLimits extends SessionLimits {
 
     private SessionRateLimits gatewayRateLimits;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
index 44a38bf445..421a22a9d2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
@@ -26,6 +26,7 @@ import jakarta.persistence.SqlResultSetMapping;
 import jakarta.persistence.SqlResultSetMappings;
 import jakarta.persistence.Table;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 import org.thingsboard.server.dao.sqlts.latest.SearchTsKvLatestRepository;
@@ -35,6 +36,7 @@ import java.util.UUID;
 import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Entity
 @Table(name = "ts_kv_latest")
 @IdClass(TsKvLatestCompositeKey.class)
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
index a69a157241..ab305919fd 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
@@ -16,10 +16,12 @@
 package org.thingsboard.rule.engine.action;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbClearAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbClearAlarmNodeConfiguration> {
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
index 8c791e7634..bf305a55d1 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
@@ -16,6 +16,7 @@
 package org.thingsboard.rule.engine.action;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
@@ -25,6 +26,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbCreateAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbCreateAlarmNodeConfiguration> {
 
     @NoXss
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
index 3b59d814f1..6551352823 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
@@ -16,6 +16,7 @@
 package org.thingsboard.rule.engine.geo;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.common.util.geo.PerimeterType;
 
 import java.util.concurrent.TimeUnit;
@@ -24,6 +25,7 @@ import java.util.concurrent.TimeUnit;
  * Created by ashvayka on 19.01.18.
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilterNodeConfiguration {
 
     private int minInsideDuration;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
index fe17c659e1..93d1ef7ef8 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
@@ -20,6 +20,7 @@ import io.netty.handler.ssl.ClientAuth;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.thingsboard.common.util.AzureIotHubUtil;
@@ -29,6 +30,7 @@ import org.thingsboard.rule.engine.credentials.CredentialsType;
 import java.security.Security;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Slf4j
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AzureIotHubSasCredentials extends CertPemCredentials {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
index c786478575..f11173f3f9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
@@ -17,9 +17,11 @@ package org.thingsboard.rule.engine.mqtt.azure;
 
 import io.netty.handler.codec.mqtt.MqttVersion;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.mqtt.TbMqttNodeConfiguration;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbAzureIotHubNodeConfiguration extends TbMqttNodeConfiguration {
 
     @Override

From 3615de5d75a00afb3c23b7da977617e243c7d3c5 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 11:31:54 +0200
Subject: [PATCH 19/91] chore(build): migrate deprecated
 DefaultedRedisConnection byte[] calls to typed command APIs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Routes get/set/del/scan/getSet/hGet/hSet/hDel/lRange/zRem/getRange calls
through stringCommands()/keyCommands()/hashCommands()/listCommands()/
zSetCommands() instead of the deprecated shortcut methods on
DefaultedRedisConnection. Behavior-preserving — Spring Data Redis
delegates the deprecated overloads to these same typed commands.

Eliminates 70 deprecation warnings across RedisOtaPackageDataCache, five
Leshan-forked lwm2m stores (TbLwM2mRedisRegistrationStore,
TbLwM2mRedisSecurityStore, TbRedisLwM2MClientStore,
TbRedisLwM2MModelConfigStore, TbLwM2mRedisClientOtaInfoStore,
TbLwM2MDtlsSessionRedisStore) and the TbRedisLwM2MClientStoreTest unit
test, which now uses Answers.RETURNS_DEEP_STUBS to mock the typed
command chain.

Part of #15481 Tier 3 cleanup.
---
 .../cache/ota/RedisOtaPackageDataCache.java   |  8 +--
 .../store/TbLwM2MDtlsSessionRedisStore.java   |  6 +-
 .../store/TbLwM2mRedisClientOtaInfoStore.java |  4 +-
 .../store/TbLwM2mRedisRegistrationStore.java  | 66 +++++++++----------
 .../store/TbLwM2mRedisSecurityStore.java      | 24 +++----
 .../server/store/TbRedisLwM2MClientStore.java | 10 +--
 .../store/TbRedisLwM2MModelConfigStore.java   |  8 +--
 .../store/TbRedisLwM2MClientStoreTest.java    | 21 +++---
 8 files changed, 74 insertions(+), 73 deletions(-)

diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/ota/RedisOtaPackageDataCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/ota/RedisOtaPackageDataCache.java
index c3a9ff0385..1e13b1cfe9 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/ota/RedisOtaPackageDataCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/ota/RedisOtaPackageDataCache.java
@@ -39,26 +39,26 @@ public class RedisOtaPackageDataCache implements OtaPackageDataCache {
     public byte[] get(String key, int chunkSize, int chunk) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
             if (chunkSize == 0) {
-                return connection.get(toOtaPackageCacheKey(key));
+                return connection.stringCommands().get(toOtaPackageCacheKey(key));
             }
 
             int startIndex = chunkSize * chunk;
             int endIndex = startIndex + chunkSize - 1;
-            return connection.getRange(toOtaPackageCacheKey(key), startIndex, endIndex);
+            return connection.stringCommands().getRange(toOtaPackageCacheKey(key), startIndex, endIndex);
         }
     }
 
     @Override
     public void put(String key, byte[] value) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
-            connection.set(toOtaPackageCacheKey(key), value);
+            connection.stringCommands().set(toOtaPackageCacheKey(key), value);
         }
     }
 
     @Override
     public void evict(String key) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
-            connection.del(toOtaPackageCacheKey(key));
+            connection.keyCommands().del(toOtaPackageCacheKey(key));
         }
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
index ead9269108..fa78bbb7bb 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
@@ -33,7 +33,7 @@ public class TbLwM2MDtlsSessionRedisStore implements TbLwM2MDtlsSessionStore {
         try (var c = connectionFactory.getConnection()) {
             var serializedMsg = JavaSerDesUtil.encode(msg);
             if (serializedMsg != null) {
-                c.set(getKey(endpoint), serializedMsg);
+                c.stringCommands().set(getKey(endpoint), serializedMsg);
             } else {
                 throw new RuntimeException("Problem with serialization of message: " + msg);
             }
@@ -43,7 +43,7 @@ public class TbLwM2MDtlsSessionRedisStore implements TbLwM2MDtlsSessionStore {
     @Override
     public TbX509DtlsSessionInfo get(String endpoint) {
         try (var c = connectionFactory.getConnection()) {
-            var data = c.get(getKey(endpoint));
+            var data = c.stringCommands().get(getKey(endpoint));
             if (data != null) {
                 return JavaSerDesUtil.decode(data);
             } else {
@@ -55,7 +55,7 @@ public class TbLwM2MDtlsSessionRedisStore implements TbLwM2MDtlsSessionStore {
     @Override
     public void remove(String endpoint) {
         try (var c = connectionFactory.getConnection()) {
-            c.del(getKey(endpoint));
+            c.keyCommands().del(getKey(endpoint));
         }
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisClientOtaInfoStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisClientOtaInfoStore.java
index 8301d4a448..c75a5ff8a0 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisClientOtaInfoStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisClientOtaInfoStore.java
@@ -33,7 +33,7 @@ public class TbLwM2mRedisClientOtaInfoStore implements TbLwM2MClientOtaInfoStore
 
     private void put(OtaPackageType type, LwM2MClientOtaInfo<?, ?, ?> info) {
         try (var connection = connectionFactory.getConnection()) {
-            connection.set((OTA_EP + type + info.getEndpoint()).getBytes(), JacksonUtil.toString(info).getBytes());
+            connection.stringCommands().set((OTA_EP + type + info.getEndpoint()).getBytes(), JacksonUtil.toString(info).getBytes());
         }
     }
 
@@ -59,7 +59,7 @@ public class TbLwM2mRedisClientOtaInfoStore implements TbLwM2MClientOtaInfoStore
 
     private <T extends LwM2MClientOtaInfo<?, ?, ?>> T getLwM2MClientOtaInfo(OtaPackageType type, String endpoint, Class<T> clazz) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] data = connection.get((OTA_EP + type + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((OTA_EP + type + endpoint).getBytes());
             return JacksonUtil.fromBytes(data, clazz);
         }
     }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
index 8158e82a81..5937383156 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
@@ -163,15 +163,15 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                 lock.lock();
                 // add registration
                 byte[] k = toEndpointKey(registration.getEndpoint());
-                byte[] old = connection.getSet(k, serializeReg(registration));
+                byte[] old = connection.stringCommands().getSet(k, serializeReg(registration));
 
                 // add registration: secondary indexes
                 byte[] regid_idx = toRegIdKey(registration.getId());
-                connection.set(regid_idx, registration.getEndpoint().getBytes(UTF_8));
+                connection.stringCommands().set(regid_idx, registration.getEndpoint().getBytes(UTF_8));
                 byte[] addr_idx = toRegAddrKey(registration.getSocketAddress());
-                connection.set(addr_idx, registration.getEndpoint().getBytes(UTF_8));
+                connection.stringCommands().set(addr_idx, registration.getEndpoint().getBytes(UTF_8));
                 byte[] identity_idx = toRegIdentityKey(registration.getClientTransportData().getIdentity());
-                connection.set(identity_idx, registration.getEndpoint().getBytes(UTF_8));
+                connection.stringCommands().set(identity_idx, registration.getEndpoint().getBytes(UTF_8));
 
                 // Add or update expiration
                 addOrUpdateExpiration(connection, registration);
@@ -180,7 +180,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                     Registration oldRegistration = deserializeReg(old);
                     // remove old secondary index
                     if (!registration.getId().equals(oldRegistration.getId()))
-                        connection.del(toRegIdKey(oldRegistration.getId()));
+                        connection.keyCommands().del(toRegIdKey(oldRegistration.getId()));
                     if (!oldRegistration.getSocketAddress().equals(registration.getSocketAddress())) {
                         removeAddrIndex(connection, oldRegistration);
                     }
@@ -209,7 +209,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
         try (var connection = connectionFactory.getConnection()) {
 
             // Fetch the registration ep by registration ID index
-            byte[] ep = connection.get(toRegIdKey(update.getRegistrationId()));
+            byte[] ep = connection.stringCommands().get(toRegIdKey(update.getRegistrationId()));
             if (ep == null) {
                 return null;
             }
@@ -220,7 +220,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                 lock.lock();
 
                 // Fetch the registration
-                byte[] data = connection.get(toEndpointKey(ep));
+                byte[] data = connection.stringCommands().get(toEndpointKey(ep));
                 if (data == null) {
                     return null;
                 }
@@ -230,7 +230,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                 Registration updatedRegistration = update.update(r);
 
                 // Store the new registration
-                connection.set(toEndpointKey(updatedRegistration.getEndpoint()), serializeReg(updatedRegistration));
+                connection.stringCommands().set(toEndpointKey(updatedRegistration.getEndpoint()), serializeReg(updatedRegistration));
 
                 // Add or update expiration
                 addOrUpdateExpiration(connection, updatedRegistration);
@@ -239,7 +239,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                  * If registration is already associated to this address we don't care as we only want to keep the most
                  * recent binding. */
                 byte[] addr_idx = toRegAddrKey(updatedRegistration.getSocketAddress());
-                connection.set(addr_idx, updatedRegistration.getEndpoint().getBytes(UTF_8));
+                connection.stringCommands().set(addr_idx, updatedRegistration.getEndpoint().getBytes(UTF_8));
                 if (!r.getSocketAddress().equals(updatedRegistration.getSocketAddress())) {
                     removeAddrIndex(connection, r);
                 }
@@ -265,11 +265,11 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     }
 
     private Registration getRegistration(RedisConnection connection, String registrationId) {
-        byte[] ep = connection.get(toRegIdKey(registrationId));
+        byte[] ep = connection.stringCommands().get(toRegIdKey(registrationId));
         if (ep == null) {
             return null;
         }
-        byte[] data = connection.get(toEndpointKey(ep));
+        byte[] data = connection.stringCommands().get(toEndpointKey(ep));
         if (data == null) {
             return null;
         }
@@ -281,7 +281,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     public Registration getRegistrationByEndpoint(String endpoint) {
         Validate.notNull(endpoint);
         try (var connection = connectionFactory.getConnection()) {
-            byte[] data = connection.get(toEndpointKey(endpoint));
+            byte[] data = connection.stringCommands().get(toEndpointKey(endpoint));
             if (data == null) {
                 return null;
             }
@@ -293,11 +293,11 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     public Registration getRegistrationByAdress(InetSocketAddress address) {
         Validate.notNull(address);
         try (var connection = connectionFactory.getConnection()) {
-            byte[] ep = connection.get(toRegAddrKey(address));
+            byte[] ep = connection.stringCommands().get(toRegAddrKey(address));
             if (ep == null) {
                 return null;
             }
-            byte[] data = connection.get(toEndpointKey(ep));
+            byte[] data = connection.stringCommands().get(toEndpointKey(ep));
             if (data == null) {
                 return null;
             }
@@ -309,11 +309,11 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     public Registration getRegistrationByIdentity(LwM2mIdentity identity) {
         Validate.notNull(identity);
         try (var connection = connectionFactory.getConnection()) {
-            byte[] ep = connection.get(toRegIdentityKey(identity));
+            byte[] ep = connection.stringCommands().get(toRegIdentityKey(identity));
             if (ep == null) {
                 return null;
             }
-            byte[] data = connection.get(toEndpointKey(ep));
+            byte[] data = connection.stringCommands().get(toEndpointKey(ep));
             if (data == null) {
                 return null;
             }
@@ -332,12 +332,12 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                 clusterConnection.clusterGetNodes().forEach(node ->
                         scans.add(clusterConnection.scan(node, scanOptions)));
             } else {
-                scans.add(scanConnection.scan(scanOptions));
+                scans.add(scanConnection.keyCommands().scan(scanOptions));
             }
 
             scans.forEach(scan -> {
                 scan.forEachRemaining(key -> {
-                    byte[] element = getConnection.get(key);
+                    byte[] element = getConnection.stringCommands().get(key);
                     if (element != null) {
                         list.add(deserializeReg(element));
                     }
@@ -357,7 +357,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
 
     private Deregistration removeRegistration(RedisConnection connection, String registrationId, boolean removeOnlyIfNotAlive) {
         // fetch the client ep by registration ID index
-        byte[] ep = connection.get(toRegIdKey(registrationId));
+        byte[] ep = connection.stringCommands().get(toRegIdKey(registrationId));
         if (ep == null) {
             return null;
         }
@@ -369,16 +369,16 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
             lock.lock();
 
             // fetch the client
-            byte[] data = connection.get(toEndpointKey(ep));
+            byte[] data = connection.stringCommands().get(toEndpointKey(ep));
             if (data == null) {
                 return null;
             }
             Registration r = deserializeReg(data);
 
             if (!removeOnlyIfNotAlive || !r.isAlive(gracePeriod)) {
-                long nbRemoved = connection.del(toRegIdKey(r.getId()));
+                long nbRemoved = connection.keyCommands().del(toRegIdKey(r.getId()));
                 if (nbRemoved > 0) {
-                    connection.del(toEndpointKey(r.getEndpoint()));
+                    connection.keyCommands().del(toEndpointKey(r.getEndpoint()));
                     Collection<Observation> obsRemoved = unsafeRemoveAllObservations(connection, r.getId());
                     removeAddrIndex(connection, r);
                     removeIdentityIndex(connection, r);
@@ -407,12 +407,12 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
         // Watch the key to remove.
 //        connection.watch(indexKey);
 
-        byte[] epFromAddr = connection.get(indexKey);
+        byte[] epFromAddr = connection.stringCommands().get(indexKey);
         // Delete the key if needed.
         if (Arrays.equals(epFromAddr, endpointName.getBytes(UTF_8))) {
             // Try to delete the key
 //            connection.multi();
-            connection.del(indexKey);
+            connection.keyCommands().del(indexKey);
 //            connection.exec();
             // if transaction failed this is not an issue as the index is probably reused and we don't need to
             // delete it anymore.
@@ -427,7 +427,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     }
 
     private void removeExpiration(RedisConnection connection, Registration registration) {
-        connection.zRem(EXP_EP, registration.getEndpoint().getBytes(UTF_8));
+        connection.zSetCommands().zRem(EXP_EP, registration.getEndpoint().getBytes(UTF_8));
     }
 
     private byte[] toRegIdKey(String registrationId) {
@@ -556,7 +556,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     @Override
     public Observation getObservation(ObservationIdentifier observationId) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] observationValue = connection.get(toKey(OBS_TKN, observationId.getBytes()));
+            byte[] observationValue = connection.stringCommands().get(toKey(OBS_TKN, observationId.getBytes()));
             return deserializeObs(observationValue);
         }
     }
@@ -570,7 +570,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
         try (var connection = connectionFactory.getConnection()) {
 
             // fetch the client ep by registration ID index
-            byte[] ep = connection.get(toRegIdKey(registrationId));
+            byte[] ep = connection.stringCommands().get(toRegIdKey(registrationId));
             if (ep == null) {
                 return null;
             }
@@ -635,7 +635,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
 
     public Observation get(Token token) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] obs = connection.get(toKey(OBS_TKN, token.getBytes()));
+            byte[] obs = connection.stringCommands().get(toKey(OBS_TKN, token.getBytes()));
             if (obs == null) {
                 return null;
             } else {
@@ -664,14 +664,14 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
         byte[] regIdKey = toKey(OBS_TKNS_REGID_IDX, registrationId);
 
         // fetch all observations by token
-        for (byte[] token : connection.lRange(regIdKey, 0, -1)) {
-            byte[] obs = connection.get(toKey(OBS_TKN, token));
+        for (byte[] token : connection.listCommands().lRange(regIdKey, 0, -1)) {
+            byte[] obs = connection.stringCommands().get(toKey(OBS_TKN, token));
             if (obs != null) {
                 removed.add(deserializeObs(obs));
             }
-            connection.del(toKey(OBS_TKN, token));
+            connection.keyCommands().del(toKey(OBS_TKN, token));
         }
-        connection.del(regIdKey);
+        connection.keyCommands().del(regIdKey);
 
         return removed;
     }
@@ -752,7 +752,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                         System.currentTimeMillis(), 0, cleanLimit);
 
                 for (byte[] endpoint : endpointsExpired) {
-                    byte[] data = connection.get(toEndpointKey(endpoint));
+                    byte[] data = connection.stringCommands().get(toEndpointKey(endpoint));
                     if (data != null && data.length > 0) {
                         Registration r = deserializeReg(data);
                         if (!r.isAlive(gracePeriod)) {
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
index b07156d0ef..1e5d480c81 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
@@ -52,7 +52,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(toLockKey(endpoint));
             lock.lock();
-            byte[] data = connection.get((SEC_EP + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((SEC_EP + endpoint).getBytes());
             if (data == null || data.length == 0) {
                 return null;
             } else {
@@ -96,11 +96,11 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(toLockKey(identity));
             lock.lock();
-            byte[] ep = connection.hGet(PSKID_SEC.getBytes(), identity.getBytes());
+            byte[] ep = connection.hashCommands().hGet(PSKID_SEC.getBytes(), identity.getBytes());
             if (ep == null) {
                 return null;
             } else {
-                byte[] data = connection.get((SEC_EP + new String(ep)).getBytes());
+                byte[] data = connection.stringCommands().get((SEC_EP + new String(ep)).getBytes());
                 if (data == null || data.length == 0) {
                     return null;
                 } else {
@@ -128,17 +128,17 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             lock = redisLock.obtain(tbSecurityInfo.getEndpoint());
             lock.lock();
             if (info != null && info.getPskIdentity() != null) {
-                byte[] oldEndpointBytes = connection.hGet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
+                byte[] oldEndpointBytes = connection.hashCommands().hGet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
                 if (oldEndpointBytes != null) {
                     String oldEndpoint = new String(oldEndpointBytes);
                     if (!oldEndpoint.equals(info.getEndpoint())) {
                         throw new NonUniqueSecurityInfoException("PSK Identity " + info.getPskIdentity() + " is already used");
                     }
-                    connection.hSet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes(), info.getEndpoint().getBytes());
+                    connection.hashCommands().hSet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes(), info.getEndpoint().getBytes());
                 }
             }
 
-            byte[] previousData = connection.getSet((SEC_EP + tbSecurityInfo.getEndpoint()).getBytes(), tbSecurityInfoSerialized);
+            byte[] previousData = connection.stringCommands().getSet((SEC_EP + tbSecurityInfo.getEndpoint()).getBytes(), tbSecurityInfoSerialized);
 
                 // for tests: redis connect NoSec (securityInfo == null)
             log.info("lwm2m redis connect. Endpoint: [{}], secMode: [{}] key: [{}], tbSecurityInfoSerialized [{}]",
@@ -147,7 +147,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             if (previousData != null && info != null) {
                 String previousIdentity = ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(previousData)).getSecurityInfo().getPskIdentity();
                 if (previousIdentity != null && !previousIdentity.equals(info.getPskIdentity())) {
-                    connection.hDel(PSKID_SEC.getBytes(), previousIdentity.getBytes());
+                    connection.hashCommands().hDel(PSKID_SEC.getBytes(), previousIdentity.getBytes());
                 }
             }
         } finally {
@@ -163,7 +163,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(endpoint);
             lock.lock();
-            byte[] data = connection.get((SEC_EP + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((SEC_EP + endpoint).getBytes());
             if (data != null && data.length > 0) {
                 return JavaSerDesUtil.decode(data);
             } else {
@@ -182,13 +182,13 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(endpoint);
             lock.lock();
-            byte[] data = connection.get((SEC_EP + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((SEC_EP + endpoint).getBytes());
             if (data != null && data.length > 0) {
                 SecurityInfo info = ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(data)).getSecurityInfo();
                 if (info != null && info.getPskIdentity() != null) {
-                    connection.hDel(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
+                    connection.hashCommands().hDel(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
                 }
-                connection.del((SEC_EP + endpoint).getBytes());
+                connection.keyCommands().del((SEC_EP + endpoint).getBytes());
             }
         } finally {
             if (lock != null) {
@@ -203,7 +203,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
 
     private SecurityMode getSecurityModeByRegistration (RedisConnection connection, String endpoint) {
         try {
-            byte[] data = connection.get((REG_EP + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((REG_EP + endpoint).getBytes());
             JsonNode registrationNode = JacksonUtil.fromString(new String(data != null ? data : new byte[0]), JsonNode.class);
             String typeModeStr = registrationNode.get("transportdata").get("identity").get("type").asText();
             return "unsecure".equals(typeModeStr) ? SecurityMode.NO_SEC : null;
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
index 4beefb4896..73d4bd95da 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
@@ -45,7 +45,7 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
     @Override
     public LwM2mClient get(String endpoint) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] data = connection.get(getKey(endpoint));
+            byte[] data = connection.stringCommands().get(getKey(endpoint));
             if (data == null) {
                 return null;
             } else {
@@ -70,12 +70,12 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
                 clusterConnection.clusterGetNodes().forEach(node ->
                         scans.add(clusterConnection.scan(node, scanOptions)));
             } else {
-                scans.add(scanConnection.scan(scanOptions));
+                scans.add(scanConnection.keyCommands().scan(scanOptions));
             }
 
             scans.forEach(scan -> {
                 scan.forEachRemaining(key -> {
-                    byte[] element = getConnection.get(key);
+                    byte[] element = getConnection.stringCommands().get(key);
                     if (element != null) {
                         try {
                             clients.add(deserialize(element));
@@ -97,7 +97,7 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
             try {
                 byte[] clientSerialized = serialize(client);
                 try (var connection = connectionFactory.getConnection()) {
-                    connection.getSet(getKey(client.getEndpoint()), clientSerialized);
+                    connection.stringCommands().getSet(getKey(client.getEndpoint()), clientSerialized);
                 }
             } catch (Exception e) {
                 log.warn("Failed to serialize client: {}", client, e);
@@ -108,7 +108,7 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
     @Override
     public void remove(String endpoint) {
         try (var connection = connectionFactory.getConnection()) {
-            connection.del(getKey(endpoint));
+            connection.keyCommands().del(getKey(endpoint));
         }
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MModelConfigStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MModelConfigStore.java
index 31a78234d0..65ed90d15d 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MModelConfigStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MModelConfigStore.java
@@ -44,12 +44,12 @@ public class TbRedisLwM2MModelConfigStore implements TbLwM2MModelConfigStore {
                 clusterConnection.clusterGetNodes().forEach(node ->
                         scans.add(clusterConnection.scan(node, scanOptions)));
             } else {
-                scans.add(scanConnection.scan(scanOptions));
+                scans.add(scanConnection.keyCommands().scan(scanOptions));
             }
 
             scans.forEach(scan -> {
                 scan.forEachRemaining(key -> {
-                    byte[] element = getConnection.get(key);
+                    byte[] element = getConnection.stringCommands().get(key);
                     if (element != null) {
                         configs.add(JacksonUtil.fromBytes(element, LwM2MModelConfig.class));
                     }
@@ -63,14 +63,14 @@ public class TbRedisLwM2MModelConfigStore implements TbLwM2MModelConfigStore {
     public void put(LwM2MModelConfig modelConfig) {
         byte[] clientSerialized = JacksonUtil.writeValueAsBytes(modelConfig);
         try (var connection = connectionFactory.getConnection()) {
-            connection.getSet(getKey(modelConfig.getEndpoint()), clientSerialized);
+            connection.stringCommands().getSet(getKey(modelConfig.getEndpoint()), clientSerialized);
         }
     }
 
     @Override
     public void remove(String endpoint) {
         try (var connection = connectionFactory.getConnection()) {
-            connection.del(getKey(endpoint));
+            connection.keyCommands().del(getKey(endpoint));
         }
     }
 
diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStoreTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStoreTest.java
index 9fe29c1188..fe8d66365f 100644
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStoreTest.java
+++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStoreTest.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.transport.lwm2m.server.store;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.redis.connection.RedisConnection;
@@ -51,10 +52,10 @@ class TbRedisLwM2MClientStoreTest {
     @Mock
     RedisConnectionFactory connectionFactory;
 
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     RedisConnection scanConnection;
 
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     RedisConnection getConnection;
 
     TbRedisLwM2MClientStore store;
@@ -77,8 +78,8 @@ class TbRedisLwM2MClientStoreTest {
 
         // Cursor created before thenReturn to avoid Mockito unfinished-stubbing error
         Cursor<byte[]> cursor = cursorOf(key);
-        when(scanConnection.scan(any(ScanOptions.class))).thenReturn(cursor);
-        when(getConnection.get(key)).thenReturn(value);
+        when(scanConnection.keyCommands().scan(any(ScanOptions.class))).thenReturn(cursor);
+        when(getConnection.stringCommands().get(key)).thenReturn(value);
 
         Set<LwM2mClient> result = store.getAll();
 
@@ -89,29 +90,29 @@ class TbRedisLwM2MClientStoreTest {
     @Test
     void getAll_getIsNeverCalledOnScanConnection() {
         Cursor<byte[]> cursor = cursorOf();
-        when(scanConnection.scan(any(ScanOptions.class))).thenReturn(cursor);
+        when(scanConnection.keyCommands().scan(any(ScanOptions.class))).thenReturn(cursor);
 
         store.getAll();
 
-        verify(scanConnection, never()).get(any(byte[].class));
+        verify(scanConnection.stringCommands(), never()).get(any(byte[].class));
     }
 
     @Test
     void getAll_scanIsNeverCalledOnGetConnection() {
         Cursor<byte[]> cursor = cursorOf();
-        when(scanConnection.scan(any(ScanOptions.class))).thenReturn(cursor);
+        when(scanConnection.keyCommands().scan(any(ScanOptions.class))).thenReturn(cursor);
 
         store.getAll();
 
-        verify(getConnection, never()).scan(any(ScanOptions.class));
+        verify(getConnection.keyCommands(), never()).scan(any(ScanOptions.class));
     }
 
     @Test
     void getAll_skipsKeyWhenValueIsNull() {
         byte[] key = "CLIENT#EP#gone".getBytes();
         Cursor<byte[]> cursor = cursorOf(key);
-        when(scanConnection.scan(any(ScanOptions.class))).thenReturn(cursor);
-        // getConnection.get(key) returns null by default — no stubbing needed
+        when(scanConnection.keyCommands().scan(any(ScanOptions.class))).thenReturn(cursor);
+        // getConnection.stringCommands().get(key) returns null by default — no stubbing needed
 
         Set<LwM2mClient> result = store.getAll();
 

From 0340612e091efeea50b63a20528014f516296174 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 15:00:26 +0200
Subject: [PATCH 20/91] chore(hygiene): replaced 24 deprecated commons-lang3
 API calls on lts-4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- RandomStringUtils.randomAlphanumeric/Alphabetic/Numeric/random → secure().nextX (10)
- RandomUtils.nextInt/nextBytes → secure().randomX (3)
- NumberUtils.isNumber → isCreatable (2)
- StringUtils.equals → Objects.equals where both args are String (3)
- StringUtils.removeStart → common.data.StringUtils.removeStart wrapper (6)
---
 .../install/DefaultSystemDataLoaderService.java     |  2 +-
 .../auth/mfa/provider/impl/TotpTwoFaProvider.java   |  2 +-
 .../server/service/ws/WebSocketSessionType.java     |  4 ++--
 .../server/controller/AbstractWebTest.java          |  2 +-
 .../notification/AbstractNotificationApiTest.java   |  2 +-
 .../notification/NotificationApiWsClient.java       |  2 +-
 .../thingsboard/server/common/data/EntityType.java  |  4 +++-
 .../thingsboard/server/common/data/StringUtils.java | 13 +++++++------
 .../server/common/data/util/TemplateUtils.java      |  2 +-
 .../server/common/data/util/TypeCastUtil.java       |  2 +-
 .../server/service/sync/vc/GitRepository.java       |  5 +++--
 .../server/dao/resource/BaseImageService.java       |  2 +-
 .../server/dao/resource/BaseResourceService.java    |  8 +++++---
 .../org/thingsboard/monitoring/client/WsClient.java |  2 +-
 .../monitoring/service/MonitoringEntityService.java |  2 +-
 .../client/tools/migrator/PgCaMigrator.java         |  2 +-
 16 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
index 4864f53e17..9b921699f9 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
@@ -330,7 +330,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
 
     private String generateRandomKey() {
         return Base64.getEncoder().encodeToString(
-                RandomStringUtils.randomAlphanumeric(64).getBytes(StandardCharsets.UTF_8));
+                RandomStringUtils.secure().nextAlphanumeric(64).getBytes(StandardCharsets.UTF_8));
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/TotpTwoFaProvider.java b/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/TotpTwoFaProvider.java
index 23eda67a77..a7fbdb84e4 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/TotpTwoFaProvider.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/TotpTwoFaProvider.java
@@ -62,7 +62,7 @@ public class TotpTwoFaProvider implements TwoFaProvider<TotpTwoFaProviderConfig,
     }
 
     private String generateSecretKey() {
-        return Base32.encode(RandomUtils.nextBytes(20));
+        return Base32.encode(RandomUtils.secure().randomBytes(20));
     }
 
 
diff --git a/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionType.java b/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionType.java
index 59faf14a7e..5330daadaf 100644
--- a/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionType.java
+++ b/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionType.java
@@ -17,9 +17,9 @@ package org.thingsboard.server.service.ws;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 @NoArgsConstructor
@@ -33,7 +33,7 @@ public enum WebSocketSessionType {
 
     public static Optional<WebSocketSessionType> forName(String name) {
         return Arrays.stream(values())
-                .filter(sessionType -> StringUtils.equals(sessionType.name, name))
+                .filter(sessionType -> Objects.equals(sessionType.name, name))
                 .findFirst();
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index bbf3a3467e..4f8ed55731 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -1223,7 +1223,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
 
     protected NotificationTarget createNotificationTarget(UsersFilter usersFilter) {
         NotificationTarget notificationTarget = new NotificationTarget();
-        notificationTarget.setName(usersFilter.toString() + RandomStringUtils.randomNumeric(5));
+        notificationTarget.setName(usersFilter.toString() + RandomStringUtils.secure().nextNumeric(5));
         PlatformUsersNotificationTargetConfig targetConfig = new PlatformUsersNotificationTargetConfig();
         targetConfig.setUsersFilter(usersFilter);
         notificationTarget.setConfiguration(targetConfig);
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
index f5607415fa..65a7e2b4fa 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
@@ -155,7 +155,7 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
         User user = new User();
         user.setTenantId(tenantId);
         user.setAuthority(authority);
-        user.setEmail(RandomStringUtils.randomAlphabetic(20) + "@thingsboard.com");
+        user.setEmail(RandomStringUtils.secure().nextAlphabetic(20) + "@thingsboard.com");
         user = createUserAndLogin(user, "12345678");
         NotificationApiWsClient wsClient = buildAndConnectWebSocketClient();
         return Pair.of(user, wsClient);
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
index b538972dd7..f6d94f5170 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
@@ -131,7 +131,7 @@ public class NotificationApiWsClient extends TbTestWebSocketClient {
     }
 
     private int newCmdId() {
-        return RandomUtils.nextInt(1, 1000);
+        return RandomUtils.secure().randomInt(1, 1000);
     }
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
index a95208e457..7eef085340 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
@@ -22,6 +22,8 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
+import static org.thingsboard.server.common.data.StringUtils.removeStart;
+
 public enum EntityType {
     TENANT(1),
     CUSTOMER(2),
@@ -76,7 +78,7 @@ public enum EntityType {
     @Getter
     private final String tableName;
     @Getter
-    private final String normalName = StringUtils.capitalize(StringUtils.removeStart(name(), "TB_")
+    private final String normalName = StringUtils.capitalize(removeStart(name(), "TB_")
             .toLowerCase().replaceAll("_", " "));
 
     public static final List<String> NORMAL_NAMES = EnumSet.allOf(EntityType.class).stream()
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
index 37242dfa1d..59977264b6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 
 import static org.apache.commons.lang3.StringUtils.repeat;
@@ -155,7 +156,7 @@ public class StringUtils {
     }
 
     public static boolean equals(String str1, String str2) {
-        return org.apache.commons.lang3.StringUtils.equals(str1, str2);
+        return Objects.equals(str1, str2);
     }
 
     public static boolean equalsAny(String string, String... otherStrings) {
@@ -210,23 +211,23 @@ public class StringUtils {
     }
 
     public static String randomNumeric(int length) {
-        return RandomStringUtils.randomNumeric(length);
+        return RandomStringUtils.secure().nextNumeric(length);
     }
 
     public static String random(int length) {
-        return RandomStringUtils.random(length);
+        return RandomStringUtils.secure().next(length);
     }
 
     public static String random(int length, String chars) {
-        return RandomStringUtils.random(length, chars);
+        return RandomStringUtils.secure().next(length, chars);
     }
 
     public static String randomAlphanumeric(int count) {
-        return RandomStringUtils.randomAlphanumeric(count);
+        return RandomStringUtils.secure().nextAlphanumeric(count);
     }
 
     public static String randomAlphabetic(int count) {
-        return RandomStringUtils.randomAlphabetic(count);
+        return RandomStringUtils.secure().nextAlphabetic(count);
     }
 
     public static String generateSafeToken(int length) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java
index beaec13748..d740a065ce 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java
@@ -23,7 +23,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static com.google.common.base.Strings.nullToEmpty;
-import static org.apache.commons.lang3.StringUtils.removeStart;
+import static org.thingsboard.server.common.data.StringUtils.removeStart;
 
 public class TemplateUtils {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/TypeCastUtil.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/TypeCastUtil.java
index 78ff4b0eba..887cedefa4 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/util/TypeCastUtil.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/TypeCastUtil.java
@@ -63,7 +63,7 @@ public class TypeCastUtil {
     }
 
     private static boolean isNumber(String value) {
-        return NumberUtils.isNumber(value.replace(',', '.'));
+        return NumberUtils.isCreatable(value.replace(',', '.'));
     }
 
     private static boolean isSimpleDouble(String valueAsString) {
diff --git a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
index 3602dd55ca..15dd615111 100644
--- a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
+++ b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
@@ -99,6 +99,7 @@ import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_NODELET
 import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_NONFASTFORWARD;
 import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_OTHER_REASON;
 import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_REMOTE_CHANGED;
+import static org.thingsboard.server.common.data.StringUtils.removeStart;
 
 @Slf4j
 public class GitRepository {
@@ -448,7 +449,7 @@ public class GitRepository {
 
     private BranchInfo toBranchInfo(Ref ref) {
         String name = org.eclipse.jgit.lib.Repository.shortenRefName(ref.getName());
-        String branchName = StringUtils.removeStart(name, "origin/");
+        String branchName = removeStart(name, "origin/");
         boolean isDefault = this.headId != null && this.headId.equals(ref.getObjectId());
         return new BranchInfo(branchName, isDefault);
     }
@@ -465,7 +466,7 @@ public class GitRepository {
 
     private ObjectId resolve(String rev) throws IOException {
         if (settings.isLocalOnly()) {
-            rev = StringUtils.removeStart(rev, "origin/");
+            rev = removeStart(rev, "origin/");
         }
         ObjectId result = git.getRepository().resolve(rev);
         if (result == null) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
index 11bbe797cf..18023f653c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
@@ -173,7 +173,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
     }
 
     private String generatePublicResourceKey() {
-        return RandomStringUtils.randomAlphanumeric(32);
+        return RandomStringUtils.secure().nextAlphanumeric(32);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
index 40b5a9778b..9af324e7ec 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
@@ -74,6 +74,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -82,6 +83,7 @@ import java.util.function.UnaryOperator;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static org.thingsboard.server.common.data.StringUtils.isNotEmpty;
+import static org.thingsboard.server.common.data.StringUtils.removeStart;
 import static org.thingsboard.server.dao.device.DeviceServiceImpl.INCORRECT_TENANT_ID;
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
@@ -588,7 +590,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
             String resourceKey;
             TenantId resourceTenantId;
             try {
-                String[] parts = StringUtils.removeStart(link, "/api/resource/").split("/");
+                String[] parts = removeStart(link, "/api/resource/").split("/");
                 resourceType = ResourceType.valueOf(parts[0].toUpperCase());
                 String scope = parts[1];
                 resourceKey = parts[2];
@@ -611,7 +613,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
 
     private String getResourceLink(String value) {
         if (StringUtils.startsWith(value, DataConstants.TB_RESOURCE_PREFIX + "/api/resource/")) {
-            return StringUtils.removeStart(value, DataConstants.TB_RESOURCE_PREFIX);
+            return removeStart(value, DataConstants.TB_RESOURCE_PREFIX);
         } else {
             return null;
         }
@@ -658,7 +660,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
                 }
 
                 String newValue = processor.apply(value);
-                if (StringUtils.equals(value, newValue)) {
+                if (Objects.equals(value, newValue)) {
                     return value;
                 } else {
                     updated.set(true);
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java b/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
index 7e2f669f6b..6a2c7f6d56 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
@@ -124,7 +124,7 @@ public class WsClient extends WebSocketClient implements AutoCloseable {
 
     public WsClient subscribeForTelemetry(List<UUID> devices, List<String> keys) {
         EntityDataCmd cmd = new EntityDataCmd();
-        cmd.setCmdId(RandomUtils.nextInt(0, 1000));
+        cmd.setCmdId(RandomUtils.secure().randomInt(0, 1000));
 
         EntityListFilter devicesFilter = new EntityListFilter();
         devicesFilter.setEntityType(EntityType.DEVICE);
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
index 57fd7d280d..d85c0d3cc0 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
@@ -162,7 +162,7 @@ public class MonitoringEntityService {
         device.setName(deviceName);
 
         DeviceCredentials credentials = new DeviceCredentials();
-        credentials.setCredentialsId(RandomStringUtils.randomAlphabetic(20));
+        credentials.setCredentialsId(RandomStringUtils.secure().nextAlphabetic(20));
         DeviceData deviceData = new DeviceData();
         deviceData.setConfiguration(new DefaultDeviceConfiguration());
 
diff --git a/tools/src/main/java/org/thingsboard/client/tools/migrator/PgCaMigrator.java b/tools/src/main/java/org/thingsboard/client/tools/migrator/PgCaMigrator.java
index b88012c00e..2ef202dc9f 100644
--- a/tools/src/main/java/org/thingsboard/client/tools/migrator/PgCaMigrator.java
+++ b/tools/src/main/java/org/thingsboard/client/tools/migrator/PgCaMigrator.java
@@ -249,7 +249,7 @@ public class PgCaMigrator {
 
     private List<Object> castToNumericIfPossible(List<Object> values) {
         try {
-            if (values.get(6) != null && NumberUtils.isNumber(values.get(6).toString())) {
+            if (values.get(6) != null && NumberUtils.isCreatable(values.get(6).toString())) {
                 Double casted = NumberUtils.createDouble(values.get(6).toString());
                 List<Object> numeric = Lists.newArrayList();
                 numeric.addAll(values);

From 6d125f57e92f86a9fd6285617b924873e004d92d Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 23:18:47 +0200
Subject: [PATCH 21/91] Replaced 23 deprecated TenantId(UUID) constructor calls
 with TenantId.fromUUID on lts-4.2

---
 .../transport/mqtt/session/GatewaySessionHandlerTest.java     | 2 +-
 .../dao/sql/cf/DefaultNativeCalculatedFieldRepository.java    | 2 +-
 .../thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java | 2 +-
 .../rule/engine/action/TbAssignToCustomerNodeTest.java        | 2 +-
 .../rule/engine/action/TbCreateRelationNodeTest.java          | 2 +-
 .../rule/engine/action/TbDeleteRelationNodeTest.java          | 2 +-
 .../rule/engine/action/TbUnassignFromCustomerNodeTest.java    | 2 +-
 .../rule/engine/filter/TbAssetTypeSwitchNodeTest.java         | 2 +-
 .../rule/engine/filter/TbCheckAlarmStatusNodeTest.java        | 2 +-
 .../rule/engine/filter/TbCheckRelationNodeTest.java           | 2 +-
 .../rule/engine/filter/TbDeviceTypeSwitchNodeTest.java        | 2 +-
 .../rule/engine/flow/TbRuleChainInputNodeTest.java            | 2 +-
 .../rule/engine/metadata/TbGetCustomerDetailsNodeTest.java    | 2 +-
 .../rule/engine/metadata/TbGetDeviceAttrNodeTest.java         | 2 +-
 .../rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java   | 2 +-
 .../rule/engine/metadata/TbGetRelatedAttributeNodeTest.java   | 4 ++--
 .../rule/engine/metadata/TbGetTenantAttributeNodeTest.java    | 2 +-
 .../rule/engine/metadata/TbGetTenantDetailsNodeTest.java      | 2 +-
 .../rule/engine/util/EntitiesFieldsAsyncLoaderTest.java       | 4 ++--
 .../engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java   | 2 +-
 .../engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java   | 2 +-
 21 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
index 6b4e5e9925..30dc825a9b 100644
--- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
@@ -75,7 +75,7 @@ public class GatewaySessionHandlerTest {
         ConcurrentHashMap<String, GatewayDeviceSessionContext> devices = new ConcurrentHashMap<>();
         TransportDeviceInfo deviceInfo = new TransportDeviceInfo();
         deviceInfo.setDeviceId(new DeviceId(UUID.randomUUID()));
-        deviceInfo.setTenantId(new TenantId(UUID.randomUUID()));
+        deviceInfo.setTenantId(TenantId.fromUUID(UUID.randomUUID()));
         deviceInfo.setCustomerId(new CustomerId(UUID.randomUUID()));
         deviceInfo.setDeviceName("device1");
         deviceInfo.setDeviceType("default");
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/cf/DefaultNativeCalculatedFieldRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/cf/DefaultNativeCalculatedFieldRepository.java
index 9734af7d7a..4cce4c5041 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/cf/DefaultNativeCalculatedFieldRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/cf/DefaultNativeCalculatedFieldRepository.java
@@ -126,7 +126,7 @@ public class DefaultNativeCalculatedFieldRepository implements NativeCalculatedF
                 CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink();
                 calculatedFieldLink.setId(new CalculatedFieldLinkId(id));
                 calculatedFieldLink.setCreatedTime(createdTime);
-                calculatedFieldLink.setTenantId(new TenantId(tenantId));
+                calculatedFieldLink.setTenantId(TenantId.fromUUID(tenantId));
                 calculatedFieldLink.setEntityId(EntityIdFactory.getByTypeAndUuid(entityType, entityId));
                 calculatedFieldLink.setCalculatedFieldId(new CalculatedFieldId(calculatedFieldId));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
index 3ddf318e2f..e03b161692 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
@@ -132,7 +132,7 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
         StatisticsEvent.StatisticsEventBuilder event = StatisticsEvent.builder();
         event.id(eventId);
         event.ts(System.currentTimeMillis());
-        event.tenantId(new TenantId(tenantId));
+        event.tenantId(TenantId.fromUUID(tenantId));
         event.entityId(entityId);
         event.serviceId("server A");
         event.messagesProcessed(1);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
index 0db2d77c01..7f329b1411 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
@@ -97,7 +97,7 @@ class TbAssignToCustomerNodeTest extends AbstractRuleNodeUpgradeTest {
     private final Edge EDGE = new Edge();
     private final Dashboard DASHBOARD = new Dashboard();
 
-    private final TenantId TENANT_ID = new TenantId(UUID.fromString("c818385f-e661-407f-8c52-daf2dddf406d"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("c818385f-e661-407f-8c52-daf2dddf406d"));
     private final RuleNodeId RULE_NODE_ID = new RuleNodeId(UUID.fromString("c3570bd0-c0bc-4609-97a4-6f57d7c8b809"));
 
     private static Stream<Arguments> givenUnsupportedOriginatorType_whenOnMsg_thenVerifyExceptionThrown() {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
index 60924002da..50c54b91de 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
@@ -111,7 +111,7 @@ public class TbCreateRelationNodeTest extends AbstractRuleNodeUpgradeTest {
         return supportedEntityTypes.stream().filter(entityType -> !entityType.equals(EntityType.TENANT)).map(Arguments::of);
     }
 
-    private static final TenantId tenantId = new TenantId(UUID.fromString("6fc86fc9-b25c-4893-b340-51cf4e101ab2"));
+    private static final TenantId tenantId = TenantId.fromUUID(UUID.fromString("6fc86fc9-b25c-4893-b340-51cf4e101ab2"));
     private static final DeviceId deviceId = new DeviceId(UUID.fromString("191ab124-1d8d-4749-97c6-fc84c113c1f5"));
     private static final AssetId assetId = new AssetId(UUID.fromString("a47a5867-deab-4333-b845-88cb1695990c"));
     private static final CustomerId customerId = new CustomerId(UUID.fromString("4af69229-273d-40de-9fba-f49f87373d23"));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
index a8087cc40b..f6ef490aba 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
@@ -108,7 +108,7 @@ public class TbDeleteRelationNodeTest extends AbstractRuleNodeUpgradeTest {
         return supportedEntityTypes.stream().filter(entityType -> !entityType.equals(EntityType.TENANT)).map(Arguments::of);
     }
 
-    private static final TenantId tenantId = new TenantId(UUID.fromString("6fdb457d-0910-401c-8880-abc251e6a1e2"));
+    private static final TenantId tenantId = TenantId.fromUUID(UUID.fromString("6fdb457d-0910-401c-8880-abc251e6a1e2"));
     private static final DeviceId deviceId = new DeviceId(UUID.fromString("4eef91a7-8865-4c3c-837d-ed6f6577508b"));
     private static final AssetId assetId = new AssetId(UUID.fromString("f4fd3b10-3f36-4d46-a162-5e62050774cc"));
     private static final CustomerId customerId = new CustomerId(UUID.fromString("ab890af2-3622-41e0-ac94-14d50af84348"));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
index de891c13d4..dd1307b10a 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
@@ -98,7 +98,7 @@ class TbUnassignFromCustomerNodeTest extends AbstractRuleNodeUpgradeTest {
     private final Edge EDGE = new Edge();
     private final Dashboard DASHBOARD = new Dashboard();
 
-    private final TenantId TENANT_ID = new TenantId(UUID.fromString("06fcc15f-2677-436d-a1cb-7754bd0bcccf"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("06fcc15f-2677-436d-a1cb-7754bd0bcccf"));
 
     private final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
index 557fb5b71d..b0788a1817 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
@@ -58,7 +58,7 @@ class TbAssetTypeSwitchNodeTest {
 
     @BeforeEach
     void setUp() throws TbNodeException {
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         assetId = new AssetId(UUID.randomUUID());
         assetIdDeleted = new AssetId(UUID.randomUUID());
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
index d8a302ae92..9155221a26 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.when;
 
 class TbCheckAlarmStatusNodeTest {
 
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final DeviceId DEVICE_ID = new DeviceId(UUID.randomUUID());
     private static final AlarmId ALARM_ID = new AlarmId(UUID.randomUUID());
     private static final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
index e6011c74d8..fb8ad655c0 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
@@ -63,7 +63,7 @@ import static org.mockito.Mockito.when;
 
 class TbCheckRelationNodeTest extends AbstractRuleNodeUpgradeTest {
 
-    private final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private final DeviceId ORIGINATOR_ID = new DeviceId(UUID.randomUUID());
     private final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     private final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg()
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
index 55e9c33b7e..ebbdbe14c7 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
@@ -58,7 +58,7 @@ class TbDeviceTypeSwitchNodeTest {
 
     @BeforeEach
     void setUp() throws TbNodeException {
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         deviceId = new DeviceId(UUID.randomUUID());
         deviceIdDeleted = new DeviceId(UUID.randomUUID());
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
index 3ae26e6560..963e25f6b6 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
@@ -64,7 +64,7 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 public class TbRuleChainInputNodeTest extends AbstractRuleNodeUpgradeTest {
 
-    private final TenantId TENANT_ID = new TenantId(UUID.fromString("4ba69ea5-6b27-42df-ab66-e7a727a67027"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("4ba69ea5-6b27-42df-ab66-e7a727a67027"));
     private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("97731954-2147-4176-8f1a-d14f1b73e4e6"));
     private final AssetId ASSET_ID = new AssetId(UUID.fromString("841a47bd-4e8e-4ea5-88e6-420da0d70e51"));
     // A stable "current" rule chain ID: this node lives here. Must differ from any target used in tests.
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
index 5e9726ec97..3940ab56c4 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
@@ -76,7 +76,7 @@ import static org.mockito.Mockito.when;
 public class TbGetCustomerDetailsNodeTest {
 
     private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
index 4f267c0dfb..f9a230a437 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
@@ -60,7 +60,7 @@ import static org.mockito.BDDMockito.then;
 @ExtendWith(MockitoExtension.class)
 public class TbGetDeviceAttrNodeTest extends AbstractRuleNodeUpgradeTest {
 
-    private final TenantId TENANT_ID = new TenantId(UUID.fromString("5aea576c-66c4-4732-86b8-dc6bfcde7443"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("5aea576c-66c4-4732-86b8-dc6bfcde7443"));
     private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("40b6b393-6ddf-47f9-973a-18550ca70384"));
     private final ListeningExecutor executor = DirectListeningExecutor.INSTANCE;
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
index fff7437fdf..a0d0a5a957 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
@@ -59,7 +59,7 @@ import static org.mockito.Mockito.when;
 public class TbGetOriginatorFieldsNodeTest {
 
     private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId DUMMY_TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId DUMMY_TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
index a31d23db55..88195973e6 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
@@ -91,7 +91,7 @@ import static org.mockito.Mockito.when;
 public class TbGetRelatedAttributeNodeTest {
 
     private static final EntityId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
@@ -427,7 +427,7 @@ public class TbGetRelatedAttributeNodeTest {
     @Test
     public void givenFetchTelemetryToMetaData_whenOnMsg_thenShouldFetchTelemetryToMetaData() {
         // GIVEN
-        var tenant = new Tenant(new TenantId(UUID.randomUUID()));
+        var tenant = new Tenant(TenantId.fromUUID(UUID.randomUUID()));
         var device = new Device(new DeviceId(UUID.randomUUID()));
 
         prepareMsgAndConfig(TbMsgSource.METADATA, DataToFetch.LATEST_TELEMETRY, tenant.getId());
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
index 88db3dc0cd..fa528a724c 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
@@ -70,7 +70,7 @@ import static org.mockito.Mockito.when;
 public class TbGetTenantAttributeNodeTest {
 
     private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
index b77bd263f8..7f476ea775 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
@@ -73,7 +73,7 @@ public class TbGetTenantDetailsNodeTest {
         config = new TbGetTenantDetailsNodeConfiguration().defaultConfiguration();
         nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
         tenant = new Tenant();
-        tenant.setId(new TenantId(UUID.randomUUID()));
+        tenant.setId(TenantId.fromUUID(UUID.randomUUID()));
         tenant.setTitle("Tenant title");
         tenant.setCountry("Tenant country");
         tenant.setCity("Tenant city");
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java
index d1bcc4559e..75dc8d227a 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java
@@ -104,7 +104,7 @@ public class EntitiesFieldsAsyncLoaderTest {
     @BeforeAll
     public static void setup() {
         RANDOM_UUID = UUID.randomUUID();
-        TENANT_ID = new TenantId(UUID.randomUUID());
+        TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
         SUPPORTED_ENTITY_TYPES = EnumSet.of(
                 EntityType.TENANT,
                 EntityType.CUSTOMER,
@@ -172,7 +172,7 @@ public class EntitiesFieldsAsyncLoaderTest {
     private void initMocks(EntityType entityType, boolean entityDoesNotExist) {
         switch (entityType) {
             case TENANT:
-                var tenant = Futures.immediateFuture(entityDoesNotExist ? null : new Tenant(new TenantId(RANDOM_UUID)));
+                var tenant = Futures.immediateFuture(entityDoesNotExist ? null : new Tenant(TenantId.fromUUID(RANDOM_UUID)));
 
                 when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
                 when(ctxMock.getTenantService()).thenReturn(tenantServiceMock);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java
index 23e98dfc58..6a840a1ae3 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.when;
 public class EntitiesRelatedDeviceIdAsyncLoaderTest {
 
     private static final EntityId DUMMY_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java
index 1131586a07..edeb72ba59 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java
@@ -55,7 +55,7 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
 public class EntitiesRelatedEntityIdAsyncLoaderTest {
 
     private static final EntityId ASSET_ORIGINATOR_ID = new AssetId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
 
     private TbContext ctxMock;

From 8314e1403c1b0b09d844d8243484324f63d9ac1f Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Sat, 25 Apr 2026 00:09:18 +0200
Subject: [PATCH 22/91] Migrated 17 deprecated Validator.validateId(UUIDBased,
 String) calls to the Function-based signature on lts-4.2

Wrapped each literal error message in an id-ignoring lambda so the
IncorrectParameterException message stays byte-identical.
---
 .../server/controller/BaseController.java     |  4 +--
 .../BaseComponentDescriptorService.java       |  2 +-
 .../server/dao/rule/BaseRuleChainService.java | 28 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
index de69c239e9..13135aa72f 100644
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -657,7 +657,7 @@ public abstract class BaseController {
 
     protected <E extends HasId<I> & HasTenantId, I extends EntityId> E checkEntityId(I entityId, ThrowingBiFunction<TenantId, I, E> findingFunction, Operation operation) throws ThingsboardException {
         try {
-            validateId((UUIDBased) entityId, "Invalid entity id");
+            validateId((UUIDBased) entityId, id -> "Invalid entity id");
             SecurityUser user = getCurrentUser();
             E entity = findingFunction.apply(user.getTenantId(), entityId);
             checkNotNull(entity, entityId.getEntityType().getNormalName() + " with id [" + entityId + "] is not found");
@@ -939,7 +939,7 @@ public abstract class BaseController {
     }
 
     private CalculatedField checkCalculatedFieldId(CalculatedFieldId calculatedFieldId, Operation operation) throws ThingsboardException {
-        validateId(calculatedFieldId, "Invalid entity id");
+        validateId(calculatedFieldId, id -> "Invalid entity id");
         SecurityUser user = getCurrentUser();
         CalculatedField cf = calculatedFieldService.findById(user.getTenantId(), calculatedFieldId);
         checkNotNull(cf, calculatedFieldId.getEntityType().getNormalName() + " with id [" + calculatedFieldId + "] is not found");
diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
index ccf145be21..ac9e43270f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
@@ -60,7 +60,7 @@ public class BaseComponentDescriptorService implements ComponentDescriptorServic
 
     @Override
     public ComponentDescriptor findById(TenantId tenantId, ComponentDescriptorId componentId) {
-        Validator.validateId(componentId, "Incorrect component id for search request.");
+        Validator.validateId(componentId, id -> "Incorrect component id for search request.");
         return componentDescriptorDao.findById(tenantId, componentId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
index c96ba0542f..4061c75097 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
@@ -182,7 +182,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Transactional
     @Override
     public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater, boolean publishSaveEvent) {
-        Validator.validateId(ruleChainMetaData.getRuleChainId(), "Incorrect rule chain id.");
+        Validator.validateId(ruleChainMetaData.getRuleChainId(), id -> "Incorrect rule chain id.");
         RuleChain ruleChain = findRuleChainById(tenantId, ruleChainMetaData.getRuleChainId());
         if (ruleChain == null) {
             return RuleChainUpdateResult.failed();
@@ -335,7 +335,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChainMetaData loadRuleChainMetaData(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id.");
         RuleChain ruleChain = findRuleChainById(tenantId, ruleChainId);
         if (ruleChain == null) {
             return null;
@@ -376,37 +376,37 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChain findRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         return ruleChainDao.findById(tenantId, ruleChainId.getId());
     }
 
     @Override
     public RuleNode findRuleNodeById(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         return ruleNodeDao.findById(tenantId, ruleNodeId.getId());
     }
 
     @Override
     public ListenableFuture<RuleChain> findRuleChainByIdAsync(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         return ruleChainDao.findByIdAsync(tenantId, ruleChainId.getId());
     }
 
     @Override
     public ListenableFuture<RuleNode> findRuleNodeByIdAsync(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         return ruleNodeDao.findByIdAsync(tenantId, ruleNodeId.getId());
     }
 
     @Override
     public RuleChain getRootTenantRuleChain(TenantId tenantId) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search request.");
         return ruleChainDao.findRootRuleChainByTenantIdAndType(tenantId.getId(), RuleChainType.CORE);
     }
 
     @Override
     public List<RuleNode> getRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         List<EntityRelation> relations = getRuleChainToNodeRelations(tenantId, ruleChainId);
         List<RuleNode> ruleNodes = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -422,7 +422,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public List<RuleNode> getReferencingRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         List<EntityRelation> relations = getNodeToRuleChainRelations(tenantId, ruleChainId);
         List<RuleNode> ruleNodes = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -436,7 +436,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public List<EntityRelation> getRuleNodeRelations(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         List<EntityRelation> relations = relationService.findByFrom(tenantId, ruleNodeId, RelationTypeGroup.RULE_NODE);
         List<EntityRelation> validRelations = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -463,7 +463,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public PageData<RuleChain> findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, PageLink pageLink) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search rule chain request.");
         Validator.validatePageLink(pageLink);
         return ruleChainDao.findRuleChainsByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
@@ -476,7 +476,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Override
     @Transactional
     public void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for delete request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for delete request.");
         RuleChain ruleChain = ruleChainDao.findById(tenantId, ruleChainId.getId());
         if (ruleChain == null) {
             return;
@@ -515,7 +515,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Transactional
     @Override
     public void deleteRuleChainsByTenantId(TenantId tenantId) {
-        Validator.validateId(tenantId, "Incorrect tenant id for delete rule chains request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for delete rule chains request.");
         tenantRuleChainsRemover.removeEntities(tenantId, tenantId);
     }
 
@@ -527,7 +527,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChainData exportTenantRuleChains(TenantId tenantId, PageLink pageLink) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search rule chain request.");
         Validator.validatePageLink(pageLink);
         PageData<RuleChain> ruleChainData = ruleChainDao.findRuleChainsByTenantId(tenantId.getId(), pageLink);
         List<RuleChain> ruleChains = ruleChainData.getData();

From 8e8dcd493339e29ac393006f5d05d5333e51decd Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Mon, 27 Apr 2026 08:55:19 +0200
Subject: [PATCH 23/91] Replace deprecated PathChildrenCache with CuratorCache
 in ZK discovery

Switches the ZooKeeper-based service discovery from the deprecated
org.apache.curator.framework.recipes.cache.PathChildrenCache to the
modern CuratorCache replacement (Curator 5.x).

- ZkDiscoveryService: field type, construction, listener registration
  and child-event handler migrated to the new API. parentPathFilter
  and zkNodesDir guard preserve the original direct-children semantics
  against the recursive-by-default behaviour of CuratorCache.
- ZkDiscoveryServiceTest: mock type and event construction adapted to
  the new listener signature; existing assertions unchanged.

Eliminates 11 [WARNING] lines for PathChildrenCache deprecation on
lts-4.2 (targeted Tier 3 slice of #15481): repo-wide [WARNING] count
843 -> 832, [ERROR] count 0 -> 0.
---
 .../queue/discovery/ZkDiscoveryService.java   | 47 ++++++++++---------
 .../discovery/ZkDiscoveryServiceTest.java     | 31 ++++++------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
index ccc242a1a3..a1cbe6332e 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
@@ -26,9 +26,8 @@ import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.imps.CuratorFrameworkState;
 import org.apache.curator.framework.recipes.cache.ChildData;
-import org.apache.curator.framework.recipes.cache.PathChildrenCache;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
+import org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
 import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.framework.state.ConnectionStateListener;
 import org.apache.curator.retry.RetryForever;
@@ -54,12 +53,12 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_REMOVED;
+import static org.apache.curator.framework.recipes.cache.CuratorCacheAccessor.parentPathFilter;
 
 @Service
 @ConditionalOnProperty(prefix = "zk", value = "enabled", havingValue = "true", matchIfMissing = false)
 @Slf4j
-public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheListener {
+public class ZkDiscoveryService implements DiscoveryService {
 
     @Value("${zk.url}")
     private String zkUrl;
@@ -84,7 +83,7 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
     private ScheduledExecutorService zkExecutorService;
     @Getter
     private CuratorFramework client;
-    private PathChildrenCache cache;
+    private CuratorCache cache;
     private String nodePath;
     private String zkNodesDir;
 
@@ -117,7 +116,8 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
 
     @Override
     public List<TransportProtos.ServiceInfo> getOtherServers() {
-        return cache.getCurrentData().stream()
+        return cache.stream()
+                .filter(parentPathFilter(zkNodesDir))
                 .filter(cd -> !cd.getPath().equals(nodePath))
                 .map(cd -> {
                     try {
@@ -241,7 +241,7 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
             client = CuratorFrameworkFactory.newClient(zkUrl, zkSessionTimeout, zkConnectionTimeout, new RetryForever(zkRetryInterval));
             client.start();
             client.blockUntilConnected();
-            cache = new PathChildrenCache(client, zkNodesDir, true);
+            cache = CuratorCache.builder(client, zkNodesDir).build();
             cache.start();
             stopped = false;
             log.info("ZK client connected");
@@ -254,7 +254,7 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
     }
 
     private void subscribeToEvents() {
-        cache.getListenable().addListener(this);
+        cache.listenable().addListener(this::onCacheEvent);
     }
 
     private void unpublishCurrentServer() {
@@ -286,29 +286,32 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
         return "The " + propertyName + " property need to be set!";
     }
 
-    @Override
-    public void childEvent(CuratorFramework curatorFramework, PathChildrenCacheEvent pathChildrenCacheEvent) throws Exception {
+    @SneakyThrows
+    void onCacheEvent(CuratorCacheListener.Type type, ChildData oldData, ChildData newData) {
         if (stopped) {
-            log.debug("Ignoring {}. Service is stopped.", pathChildrenCacheEvent);
+            log.debug("Ignoring {}. Service is stopped.", type);
             return;
         }
         if (client.getState() != CuratorFrameworkState.STARTED) {
-            log.debug("Ignoring {}, ZK client is not started, ZK client state [{}]", pathChildrenCacheEvent, client.getState());
+            log.debug("Ignoring {}, ZK client is not started, ZK client state [{}]", type, client.getState());
             return;
         }
-        ChildData data = pathChildrenCacheEvent.getData();
+        ChildData data = type == CuratorCacheListener.Type.NODE_DELETED ? oldData : newData;
         if (data == null) {
-            log.debug("Ignoring {} due to empty child data", pathChildrenCacheEvent);
+            log.debug("Ignoring {} due to empty child data", type);
             return;
         } else if (data.getData() == null) {
-            log.debug("Ignoring {} due to empty child's data", pathChildrenCacheEvent);
+            log.debug("Ignoring {} due to empty child's data", type);
+            return;
+        } else if (zkNodesDir.equals(data.getPath())) {
+            log.debug("Ignoring event about parent node {}", data.getPath());
             return;
         } else if (nodePath != null && nodePath.equals(data.getPath())) {
-            if (pathChildrenCacheEvent.getType() == CHILD_REMOVED) {
+            if (type == CuratorCacheListener.Type.NODE_DELETED) {
                 log.info("ZK node for current instance is somehow deleted.");
                 publishCurrentServer();
             }
-            log.debug("Ignoring event about current server {}", pathChildrenCacheEvent);
+            log.debug("Ignoring event about current server {}", data.getPath());
             return;
         }
         TransportProtos.ServiceInfo instance;
@@ -322,9 +325,9 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
         String serviceId = instance.getServiceId();
         ProtocolStringList serviceTypesList = instance.getServiceTypesList();
 
-        log.trace("Processing [{}] event for [{}]", pathChildrenCacheEvent.getType(), serviceId);
-        switch (pathChildrenCacheEvent.getType()) {
-            case CHILD_ADDED:
+        log.trace("Processing [{}] event for [{}]", type, serviceId);
+        switch (type) {
+            case NODE_CREATED:
                 ScheduledFuture<?> task = delayedTasks.remove(serviceId);
                 if (task != null) {
                     if (task.cancel(false)) {
@@ -341,7 +344,7 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
                     recalculatePartitions();
                 }
                 break;
-            case CHILD_REMOVED:
+            case NODE_DELETED:
                 zkExecutorService.submit(() -> applicationEventPublisher.publishEvent(new OtherServiceShutdownEvent(this, serviceId, serviceTypesList)));
                 ScheduledFuture<?> future = zkExecutorService.schedule(() -> {
                     log.debug("[{}] Going to recalculate partitions due to removed node [{}]",
diff --git a/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java b/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
index 74bf30dca6..a7be216f66 100644
--- a/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
+++ b/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.queue.discovery;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.imps.CuratorFrameworkState;
 import org.apache.curator.framework.recipes.cache.ChildData;
-import org.apache.curator.framework.recipes.cache.PathChildrenCache;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -36,8 +36,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 
-import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_ADDED;
-import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_REMOVED;
+import static org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type.NODE_CREATED;
+import static org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type.NODE_DELETED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -63,12 +63,10 @@ public class ZkDiscoveryServiceTest {
     private CuratorFramework client;
 
     @Mock
-    private PathChildrenCache cache;
-
-    @Mock
-    private CuratorFramework curatorFramework;
+    private CuratorCache cache;
 
     private ZkDiscoveryService zkDiscoveryService;
+    private List<ChildData> dataList;
 
     private static final long RECALCULATE_DELAY = 100L;
 
@@ -89,12 +87,13 @@ public class ZkDiscoveryServiceTest {
         ReflectionTestUtils.setField(zkDiscoveryService, "zkExecutorService", zkExecutorService);
         ReflectionTestUtils.setField(zkDiscoveryService, "recalculateDelay", RECALCULATE_DELAY);
         ReflectionTestUtils.setField(zkDiscoveryService, "zkDir", "/thingsboard");
+        ReflectionTestUtils.setField(zkDiscoveryService, "zkNodesDir", "/thingsboard/nodes");
 
         when(serviceInfoProvider.getServiceInfo()).thenReturn(currentInfo);
 
-        List<ChildData> dataList = new ArrayList<>();
+        dataList = new ArrayList<>();
         dataList.add(currentData);
-        when(cache.getCurrentData()).thenReturn(dataList);
+        when(cache.stream()).thenAnswer(inv -> dataList.stream());
     }
 
     @Test
@@ -178,14 +177,14 @@ public class ZkDiscoveryServiceTest {
         verify(partitionService, times(1)).recalculatePartitions(eq(currentInfo), eq(List.of(anotherInfo, childInfo)));
     }
 
-    private void startNode(ChildData data) throws Exception {
-        cache.getCurrentData().add(data);
-        zkDiscoveryService.childEvent(curatorFramework, new PathChildrenCacheEvent(CHILD_ADDED, data));
+    private void startNode(ChildData data) {
+        dataList.add(data);
+        zkDiscoveryService.onCacheEvent(NODE_CREATED, null, data);
     }
 
-    private void stopNode(ChildData data) throws Exception {
-        cache.getCurrentData().remove(data);
-        zkDiscoveryService.childEvent(curatorFramework, new PathChildrenCacheEvent(CHILD_REMOVED, data));
+    private void stopNode(ChildData data) {
+        dataList.remove(data);
+        zkDiscoveryService.onCacheEvent(NODE_DELETED, data, null);
     }
 
 }

From eaa00ab83b9c137067f0a4fdc477b93a55a27318 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Mon, 27 Apr 2026 09:45:21 +0200
Subject: [PATCH 24/91] Replace deprecated RestTemplateBuilder
 setConnectTimeout/setReadTimeout with non-deprecated variants

Spring Boot 3.5 deprecated RestTemplateBuilder.setConnectTimeout(Duration) and
setReadTimeout(Duration) for removal; their non-deprecated replacements
connectTimeout(Duration) and readTimeout(Duration) are direct, behavior-equivalent
delegations.
---
 .../channels/MicrosoftTeamsNotificationChannel.java           | 4 ++--
 .../main/java/org/thingsboard/monitoring/client/TbClient.java | 4 ++--
 .../notification/channels/impl/SlackNotificationChannel.java  | 4 ++--
 .../service/transport/impl/HttpTransportHealthChecker.java    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java b/application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java
index d023ed9b53..459c857d02 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java
@@ -54,8 +54,8 @@ public class MicrosoftTeamsNotificationChannel implements NotificationChannel<Mi
 
     @Setter
     private RestTemplate restTemplate = new RestTemplateBuilder()
-            .setConnectTimeout(Duration.of(15, ChronoUnit.SECONDS))
-            .setReadTimeout(Duration.of(15, ChronoUnit.SECONDS))
+            .connectTimeout(Duration.of(15, ChronoUnit.SECONDS))
+            .readTimeout(Duration.of(15, ChronoUnit.SECONDS))
             .build();
 
     @Override
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java b/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
index 584b2edc48..64dbde1cdb 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
@@ -34,8 +34,8 @@ public class TbClient extends RestClient {
     public TbClient(@Value("${monitoring.rest.base_url}") String baseUrl,
                     @Value("${monitoring.rest.request_timeout_ms}") int requestTimeoutMs) {
         super(new RestTemplateBuilder()
-                .setConnectTimeout(Duration.ofMillis(requestTimeoutMs))
-                .setReadTimeout(Duration.ofMillis(requestTimeoutMs))
+                .connectTimeout(Duration.ofMillis(requestTimeoutMs))
+                .readTimeout(Duration.ofMillis(requestTimeoutMs))
                 .build(), baseUrl);
     }
 
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
index c1d25c43c0..5c0df4f6fe 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
@@ -40,8 +40,8 @@ public class SlackNotificationChannel implements NotificationChannel {
     @PostConstruct
     private void init() {
         restTemplate = new RestTemplateBuilder()
-                .setConnectTimeout(Duration.ofSeconds(5))
-                .setReadTimeout(Duration.ofSeconds(2))
+                .connectTimeout(Duration.ofSeconds(5))
+                .readTimeout(Duration.ofSeconds(2))
                 .build();
     }
 
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java
index 948ac9fd7e..9a99034d69 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java
@@ -43,8 +43,8 @@ public class HttpTransportHealthChecker extends TransportHealthChecker<HttpTrans
     protected void initClient() throws Exception {
         if (restTemplate == null) {
             restTemplate = new RestTemplateBuilder()
-                    .setConnectTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
-                    .setReadTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
+                    .connectTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
+                    .readTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
                     .build();
             log.debug("Initialized HTTP client");
         }

From dfb4829637bb9c949a499e163d0a95f150fb895b Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Mon, 27 Apr 2026 11:37:35 +0200
Subject: [PATCH 25/91] Create ZK nodes container before starting CuratorCache

PathChildrenCache invoked EnsureContainers internally during start(), so
the parent znode existed when publishCurrentServer ran. CuratorCache does
not, so on a fresh ZK creatingParentsIfNeeded reaches ZKPaths.mkdirs with
the trailing-slash forPath argument and fails with
"Path must not end with / character", aborting Spring startup.
---
 .../thingsboard/server/queue/discovery/ZkDiscoveryService.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
index a1cbe6332e..47c2761020 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
@@ -241,6 +241,7 @@ public class ZkDiscoveryService implements DiscoveryService {
             client = CuratorFrameworkFactory.newClient(zkUrl, zkSessionTimeout, zkConnectionTimeout, new RetryForever(zkRetryInterval));
             client.start();
             client.blockUntilConnected();
+            client.createContainers(zkNodesDir);
             cache = CuratorCache.builder(client, zkNodesDir).build();
             cache.start();
             stopped = false;

From c33546be5e45240466d3508b2f3b314e32f70181 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Mon, 27 Apr 2026 15:08:24 +0200
Subject: [PATCH 26/91] Replace deprecated JsonNode.fields,
 HttpMessageNotReadableException(String), Assert.assertThat(Matcher),
 io.jsonwebtoken.SignatureException, StopWatch.getLastTaskTimeNanos calls with
 non-deprecated variants

---
 .../service/security/model/token/JwtTokenFactory.java    | 2 +-
 .../security/model/token/OAuth2AppTokenFactory.java      | 2 +-
 .../transport/lwm2m/AbstractLwM2MIntegrationTest.java    | 2 +-
 .../server/transport/http/DeviceApiControllerTest.java   | 7 ++++---
 .../java/org/thingsboard/common/util/JacksonUtil.java    | 7 ++-----
 .../java/org/thingsboard/common/util/TbStopWatch.java    | 6 +++---
 .../rule/engine/ai/Langchain4jJsonSchemaAdapter.java     | 2 +-
 .../rule/engine/transform/TbCopyKeysNode.java            | 5 +----
 .../thingsboard/client/tools/i18n/TranslationPruner.java | 9 ++-------
 9 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
index 5b4f4dc94a..2eced691a5 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
@@ -23,9 +23,9 @@ import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.JwtParser;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.SignatureException;
 import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.Keys;
+import io.jsonwebtoken.security.SignatureException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/OAuth2AppTokenFactory.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/OAuth2AppTokenFactory.java
index 98f9215ebf..a353aac86b 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/model/token/OAuth2AppTokenFactory.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/OAuth2AppTokenFactory.java
@@ -20,9 +20,9 @@ import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jws;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.SignatureException;
 import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.Keys;
+import io.jsonwebtoken.security.SignatureException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.StringUtils;
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
index 8d0f0f2af0..90f9679343 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
@@ -101,10 +101,10 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import static org.awaitility.Awaitility.await;
 import static org.eclipse.leshan.client.object.Security.noSec;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.timeout;
diff --git a/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java b/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java
index 397ea791c6..fcdb2b04ea 100644
--- a/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java
+++ b/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.transport.http;
 import com.google.gson.JsonParseException;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
+import org.springframework.http.HttpInputMessage;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.context.request.async.DeferredResult;
@@ -37,7 +38,7 @@ class DeviceApiControllerTest {
         };
         var callback = new DeviceApiController.DeviceAuthCallback(transportContext, responseWriter, onSuccess);
 
-        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax", (HttpInputMessage) null));
 
         callback.onError(new JsonParseException("Json ; expected"));
 
@@ -51,7 +52,7 @@ class DeviceApiControllerTest {
         DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class);
         var callback = new DeviceApiController.DeviceProvisionCallback(responseWriter);
 
-        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax", (HttpInputMessage) null));
 
         callback.onError(new JsonParseException("Json ; expected"));
 
@@ -71,7 +72,7 @@ class DeviceApiControllerTest {
 
         var callback = new DeviceApiController.GetOtaPackageCallback(transportContext, responseWriter, title, version, chunkSize, chunk);
 
-        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax", (HttpInputMessage) null));
 
         callback.onError(new JsonParseException("Json ; expected"));
 
diff --git a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
index 9913210c1a..d6785934a2 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
@@ -434,10 +434,8 @@ public class JacksonUtil {
 
     private static void toFlatMap(JsonNode node, String currentPath, Map<String, String> map) {
         if (node.isObject()) {
-            Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
             currentPath = currentPath.isEmpty() ? "" : currentPath + ".";
-            while (fields.hasNext()) {
-                Map.Entry<String, JsonNode> entry = fields.next();
+            for (Map.Entry<String, JsonNode> entry : node.properties()) {
                 toFlatMap(entry.getValue(), currentPath + entry.getKey(), map);
             }
         } else if (node.isValueNode()) {
@@ -541,8 +539,7 @@ public class JacksonUtil {
                         }
                     } else if (node.isObject()) {
                         ObjectNode on = (ObjectNode) node;
-                        for (Iterator<Map.Entry<String, JsonNode>> it = on.fields(); it.hasNext(); ) {
-                            var kv = it.next();
+                        for (Map.Entry<String, JsonNode> kv : on.properties()) {
                             if (variableName != null) {
                                 tasks.add(task.next(kv.getValue(), variableName, kv.getKey()));
                             } else {
diff --git a/common/util/src/main/java/org/thingsboard/common/util/TbStopWatch.java b/common/util/src/main/java/org/thingsboard/common/util/TbStopWatch.java
index 3a8b94c56e..fab0a72d3d 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/TbStopWatch.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/TbStopWatch.java
@@ -52,17 +52,17 @@ public class TbStopWatch extends StopWatch {
 
     public long stopAndGetTotalTimeNanos(){
         stop();
-        return getLastTaskTimeNanos();
+        return lastTaskInfo().getTimeNanos();
     }
 
     public long stopAndGetLastTaskTimeMillis(){
         stop();
-        return getLastTaskTimeMillis();
+        return lastTaskInfo().getTimeMillis();
     }
 
     public long stopAndGetLastTaskTimeNanos(){
         stop();
-        return getLastTaskTimeNanos();
+        return lastTaskInfo().getTimeNanos();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/Langchain4jJsonSchemaAdapter.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/Langchain4jJsonSchemaAdapter.java
index afe4372101..a6d1c60730 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/Langchain4jJsonSchemaAdapter.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/Langchain4jJsonSchemaAdapter.java
@@ -94,7 +94,7 @@ final class Langchain4jJsonSchemaAdapter {
 
         JsonNode propertiesNode = objectSchema.get("properties");
         if (propertiesNode != null) {
-            propertiesNode.fields().forEachRemaining(entry -> {
+            propertiesNode.properties().forEach(entry -> {
                 String key = entry.getKey();
                 JsonNode value = entry.getValue();
                 builder.addProperty(key, parse(value));
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
index 08919f37fe..f9e732a53d 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
@@ -29,7 +29,6 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -87,9 +86,7 @@ public class TbCopyKeysNode extends TbAbstractTransformNodeWithTbMsgSource {
                     msgData = JacksonUtil.toString(msgDataNode);
                     break;
                 case DATA:
-                    Iterator<Map.Entry<String, JsonNode>> iteratorNode = dataNode.fields();
-                    while (iteratorNode.hasNext()) {
-                        Map.Entry<String, JsonNode> entry = iteratorNode.next();
+                    for (Map.Entry<String, JsonNode> entry : dataNode.properties()) {
                         String msgKey = entry.getKey();
                         JsonNode msgValue = entry.getValue();
                         if (matches(msgKey)) {
diff --git a/tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java b/tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java
index 4181180521..6467c72114 100644
--- a/tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java
+++ b/tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -37,9 +36,7 @@ public class TranslationPruner {
      */
     private static void collectKeys(JsonNode node, String prefix, Set<String> keys) {
         if (!node.isObject()) return;
-        Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
-        while (fields.hasNext()) {
-            Map.Entry<String, JsonNode> entry = fields.next();
+        for (Map.Entry<String, JsonNode> entry : node.properties()) {
             String key = entry.getKey();
             String fullKey = prefix.isEmpty() ? key : prefix + "." + key;
             keys.add(fullKey);
@@ -52,9 +49,7 @@ public class TranslationPruner {
      */
     private static ObjectNode pruneNode(ObjectNode node, Set<String> keys, String prefix, ObjectMapper mapper) {
         ObjectNode pruned = mapper.createObjectNode();
-        Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
-        while (fields.hasNext()) {
-            Map.Entry<String, JsonNode> entry = fields.next();
+        for (Map.Entry<String, JsonNode> entry : node.properties()) {
             String key = entry.getKey();
             JsonNode value = entry.getValue();
             String fullKey = prefix.isEmpty() ? key : prefix + "." + key;

From 459c47310a9c14fb21af722b117eda77d6be8475 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Tue, 19 May 2026 14:51:52 +0200
Subject: [PATCH 27/91] Technical cleanup of annotations in test code

---
 .../controller/AbstractNotifyEntityTest.java  | 10 ++--
 .../controller/AuditLogControllerTest.java    |  6 +-
 ...trollerTest_DedicatedEventsDataSource.java |  4 +-
 .../server/controller/AuthControllerTest.java |  4 +-
 .../controller/DeviceControllerTest.java      |  6 +-
 .../controller/EdgeEventControllerTest.java   |  4 +-
 .../server/controller/HomePageApiTest.java    |  6 +-
 .../controller/RepositorySettingsTest.java    |  4 +-
 .../controller/RuleEngineControllerTest.java  |  4 +-
 .../controller/TwoFactorAuthConfigTest.java   | 10 ++--
 .../server/controller/TwoFactorAuthTest.java  |  8 +--
 .../server/controller/WebsocketApiTest.java   |  4 +-
 .../provision/DeviceProvisionServiceTest.java | 41 ++++++++-----
 .../alarm/DefaultTbAlarmServiceTest.java      | 32 +++++-----
 .../DefaultTbAlarmCommentServiceTest.java     | 34 +++++------
 .../service/install/InstallScriptsTest.java   | 28 ++++-----
 .../server/service/job/JobManagerTest.java    |  6 +-
 .../queue/DefaultTbClusterServiceTest.java    | 43 +++++++++-----
 .../service/sms/DefaultSmsServiceTest.java    |  4 +-
 .../sync/ie/ExportImportServiceSqlTest.java   |  6 +-
 .../DefaultTransportApiServiceTest.java       | 58 +++++++++++++------
 .../service/ttl/AlarmsCleanUpServiceTest.java |  6 +-
 .../lwm2m/AbstractLwM2MIntegrationTest.java   |  6 +-
 .../rpc/AbstractRpcLwM2MIntegrationTest.java  |  4 +-
 .../AbstractLwM2MIntegrationDiffPortTest.java |  4 +-
 .../mqtt/MqttGatewayRateLimitsTest.java       |  4 +-
 ...AbstractMqttTimeseriesIntegrationTest.java |  4 +-
 .../server/dao/AbstractDaoServiceTest.java    |  4 +-
 .../server/dao/AbstractJpaDaoTest.java        |  4 +-
 .../cache/RedisTbTransactionalCacheTest.java  | 10 ++--
 .../server/dao/service/DeviceServiceTest.java |  4 +-
 .../server/dao/service/TenantServiceTest.java |  4 +-
 .../AdminSettingsDataValidatorTest.java       |  8 +--
 .../validator/AlarmDataValidatorTest.java     |  8 +--
 .../validator/AssetDataValidatorTest.java     |  8 +--
 .../AssetProfileDataValidatorTest.java        | 18 +++---
 .../ComponentDescriptorDataValidatorTest.java |  4 +-
 .../validator/CustomerDataValidatorTest.java  | 10 ++--
 .../validator/DashboardDataValidatorTest.java |  8 +--
 .../validator/DeviceDataValidatorTest.java    |  8 +--
 .../DeviceProfileDataValidatorTest.java       | 20 +++----
 .../validator/EdgeDataValidatorTest.java      | 12 ++--
 .../EntityViewDataValidatorTest.java          | 12 ++--
 .../validator/ResourceDataValidatorTest.java  | 14 ++---
 .../validator/RuleChainDataValidatorTest.java | 10 ++--
 .../validator/TenantDataValidatorTest.java    |  8 +--
 .../WidgetTypeDataValidatorTest.java          | 12 ++--
 .../WidgetsBundleDataValidatorTest.java       | 10 ++--
 .../DefaultEntityQueryRepositoryTest.java     |  8 +--
 .../query/DefaultQueryLogComponentTest.java   |  4 +-
 ...esDaoPartitioningDaysAlwaysExistsTest.java |  8 +--
 ...sDaoPartitioningHoursAlwaysExistsTest.java |  8 +--
 ...artitioningIndefiniteAlwaysExistsTest.java |  8 +--
 ...aoPartitioningMinutesAlwaysExistsTest.java |  8 +--
 ...DaoPartitioningMonthsAlwaysExistsTest.java |  8 +--
 ...sDaoPartitioningYearsAlwaysExistsTest.java |  8 +--
 .../server/edqs/repo/AbstractEDQTest.java     |  4 +-
 57 files changed, 332 insertions(+), 278 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
index 62a266f26a..d62fac47a6 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
@@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mockito;
 import org.springframework.boot.info.BuildProperties;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EdgeUtils;
 import org.thingsboard.server.common.data.EntityType;
@@ -55,13 +55,13 @@ import static org.mockito.Mockito.times;
 @Slf4j
 public abstract class AbstractNotifyEntityTest extends AbstractWebTest {
 
-    @SpyBean
+    @MockitoSpyBean
     protected TbClusterService tbClusterService;
 
-    @SpyBean
+    @MockitoSpyBean
     protected AuditLogService auditLogService;
 
-    @MockBean
+    @MockitoBean
     BuildProperties buildProperties;
 
     protected final String msgErrorPermission = "You don't have permission to perform this operation!";
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
index 95582cf261..af3702cb7d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest.java
@@ -26,7 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
@@ -71,9 +71,9 @@ public class AuditLogControllerTest extends AbstractControllerTest {
     @Autowired
     private AuditLogDao auditLogDao;
     @Getter
-    @SpyBean
+    @MockitoSpyBean
     private SqlPartitioningRepository partitioningRepository;
-    @SpyBean
+    @MockitoSpyBean
     private AuditLogsCleanUpService auditLogsCleanUpService;
 
     @Value("#{${sql.audit_logs.partition_size} * 60 * 60 * 1000}")
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java
index c594beae98..0660dfe95e 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuditLogControllerTest_DedicatedEventsDataSource.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.controller;
 
 import lombok.Getter;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.sqlts.insert.sql.DedicatedEventsSqlPartitioningRepository;
@@ -30,7 +30,7 @@ import org.thingsboard.server.dao.sqlts.insert.sql.DedicatedEventsSqlPartitionin
 public class AuditLogControllerTest_DedicatedEventsDataSource extends AuditLogControllerTest {
 
     @Getter
-    @SpyBean
+    @MockitoSpyBean
     private DedicatedEventsSqlPartitioningRepository partitioningRepository;
 
 }
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
index 9126c42f2f..419f442f87 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
@@ -20,7 +20,7 @@ import org.assertj.core.data.Offset;
 import org.junit.After;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.http.HttpHeaders;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
@@ -50,7 +50,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class AuthControllerTest extends AbstractControllerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private UserCredentialsDao userCredentialsDao;
 
     @After
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
index 07b68210bb..43d25566df 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
@@ -31,7 +31,7 @@ import org.mockito.AdditionalAnswers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
@@ -115,10 +115,10 @@ public class DeviceControllerTest extends AbstractControllerTest {
     private Tenant savedTenant;
     private User tenantAdmin;
 
-    @SpyBean
+    @MockitoSpyBean
     private GatewayNotificationsService gatewayNotificationsService;
 
-    @SpyBean
+    @MockitoSpyBean
     private DeviceStateService deviceStateService;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
index ba389d3bd6..262d685d74 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeEventControllerTest.java
@@ -25,7 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AttributeScope;
@@ -66,7 +66,7 @@ public class EdgeEventControllerTest extends AbstractControllerTest {
 
     @Autowired
     private EdgeEventDao edgeEventDao;
-    @SpyBean
+    @MockitoSpyBean
     private SqlPartitioningRepository partitioningRepository;
     @Autowired
     private EdgeEventsCleanUpService edgeEventsCleanUpService;
diff --git a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
index ee2aefc81a..efe553e8f2 100644
--- a/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/HomePageApiTest.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.SmsService;
@@ -85,10 +85,10 @@ public class HomePageApiTest extends AbstractControllerTest {
     @Autowired
     private OAuth2ClientService oAuth2ClientService;
 
-    @MockBean
+    @MockitoBean
     private MailService mailService;
 
-    @MockBean
+    @MockitoBean
     private SmsService smsService;
 
     private static final int DEFAULT_DASHBOARDS_COUNT = 0;
diff --git a/application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java b/application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java
index 072e83cc47..3d6c62d701 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RepositorySettingsTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.controller;
 import com.google.common.util.concurrent.SettableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.data.sync.vc.RepositoryAuthMethod;
 import org.thingsboard.server.common.data.sync.vc.RepositorySettings;
 import org.thingsboard.server.dao.service.DaoSqlTest;
@@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class RepositorySettingsTest extends AbstractControllerTest {
 
-    @MockBean
+    @MockitoBean
     private GitVersionControlQueueService gitVersionControlQueueService;
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
index 81c74de038..ff75d80d30 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RuleEngineControllerTest.java
@@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
@@ -56,7 +56,7 @@ public class RuleEngineControllerTest extends AbstractControllerTest {
     private final String REQUEST_BODY = "{\"request\":\"download\"}";
     private final String RESPONSE_BODY = "{\"response\":\"downloadOk\"}";
 
-    @SpyBean
+    @MockitoSpyBean
     private RuleEngineCallService ruleEngineCallService;
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java
index c8b5bf06c9..558ceb2d10 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthConfigTest.java
@@ -22,8 +22,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.cache.CacheManager;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
@@ -65,15 +65,15 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DaoSqlTest
 public class TwoFactorAuthConfigTest extends AbstractControllerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private TotpTwoFaProvider totpTwoFactorAuthProvider;
-    @MockBean
+    @MockitoBean
     private SmsService smsService;
     @Autowired
     private CacheManager cacheManager;
     @Autowired
     private TwoFaConfigManager twoFaConfigManager;
-    @SpyBean
+    @MockitoSpyBean
     private TwoFactorAuthService twoFactorAuthService;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java
index ca81b97a48..6acae7d1eb 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TwoFactorAuthTest.java
@@ -23,8 +23,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.web.util.UriComponentsBuilder;
 import org.thingsboard.rule.engine.api.SmsService;
 import org.thingsboard.server.common.data.StringUtils;
@@ -82,9 +82,9 @@ public class TwoFactorAuthTest extends AbstractControllerTest {
 
     @Autowired
     private TwoFaConfigManager twoFaConfigManager;
-    @SpyBean
+    @MockitoSpyBean
     private TwoFactorAuthService twoFactorAuthService;
-    @MockBean
+    @MockitoBean
     private SmsService smsService;
     @Autowired
     private AuditLogService auditLogService;
diff --git a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
index 6ec0f3ad64..e3b6a6efd8 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
@@ -28,7 +28,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
@@ -100,7 +100,7 @@ public class WebsocketApiTest extends AbstractControllerTest {
     @Autowired
     private TelemetrySubscriptionService tsService;
 
-    @SpyBean
+    @MockitoSpyBean
     private TimeseriesService timeseriesService;
 
     Device device;
diff --git a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
index de86e46cd0..4f2eaa5147 100644
--- a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
@@ -21,8 +21,8 @@ import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.cluster.TbClusterService;
@@ -73,28 +73,43 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = DeviceProvisionServiceImpl.class)
+@ContextConfiguration(classes = DeviceProvisionServiceTest.ContextConfiguration.class)
 public class DeviceProvisionServiceTest {
 
-    @MockBean
+    @org.springframework.context.annotation.Configuration
+    static class ContextConfiguration {
+        @org.springframework.context.annotation.Bean
+        public DeviceProvisionServiceImpl deviceProvisionService(TbQueueProducerProvider producerProvider,
+                                                                 DeviceProfileService deviceProfileService,
+                                                                 DeviceService deviceService,
+                                                                 DeviceCredentialsService deviceCredentialsService,
+                                                                 AttributesService attributesService,
+                                                                 AuditLogService auditLogService,
+                                                                 PartitionService partitionService) {
+            return new DeviceProvisionServiceImpl(producerProvider, deviceProfileService, deviceService,
+                    deviceCredentialsService, attributesService, auditLogService, partitionService);
+        }
+    }
+
+    @MockitoBean
     protected TbQueueProducerProvider producerProvider;
-    @MockBean
+    @MockitoBean
     protected TbQueueProducer<TbProtoQueueMsg<TransportProtos.ToRuleEngineMsg>> ruleEngineMsgProducer;
-    @MockBean
+    @MockitoBean
     protected TbClusterService clusterService;
-    @MockBean
+    @MockitoBean
     protected DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     protected DeviceService deviceService;
-    @MockBean
+    @MockitoBean
     protected DeviceCredentialsService deviceCredentialsService;
-    @MockBean
+    @MockitoBean
     protected AttributesService attributesService;
-    @MockBean
+    @MockitoBean
     protected AuditLogService auditLogService;
-    @MockBean
+    @MockitoBean
     protected PartitionService partitionService;
-    @SpyBean
+    @MockitoSpyBean
     DeviceProvisionServiceImpl service;
 
     private String[] chain;
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
index 96e4444ffd..67535b6266 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarm/DefaultTbAlarmServiceTest.java
@@ -19,7 +19,7 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cluster.TbClusterService;
@@ -69,35 +69,35 @@ import static org.thingsboard.server.common.data.alarm.AlarmCommentSubType.UNASS
 @SpringJUnitConfig(DefaultTbAlarmService.class)
 class DefaultTbAlarmServiceTest {
 
-    @MockBean
+    @MockitoBean
     TbLogEntityActionService logEntityActionService;
-    @MockBean
+    @MockitoBean
     EdgeService edgeService;
-    @MockBean
+    @MockitoBean
     AlarmService alarmService;
-    @MockBean
+    @MockitoBean
     TbAlarmCommentService alarmCommentService;
-    @MockBean
+    @MockitoBean
     AlarmSubscriptionService alarmSubscriptionService;
-    @MockBean
+    @MockitoBean
     CustomerService customerService;
-    @MockBean
+    @MockitoBean
     TbClusterService tbClusterService;
-    @MockBean
+    @MockitoBean
     EntitiesVersionControlService vcService;
-    @MockBean
+    @MockitoBean
     AccessControlService accessControlService;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     AssetService assetService;
-    @MockBean
+    @MockitoBean
     DeviceService deviceService;
-    @MockBean
+    @MockitoBean
     AssetProfileService assetProfileService;
-    @MockBean
+    @MockitoBean
     DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     EntityService entityService;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
index 2c2d2bbdc3..122a939a9d 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/alarmComment/DefaultTbAlarmCommentServiceTest.java
@@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -65,35 +65,35 @@ import static org.mockito.Mockito.when;
 })
 public class DefaultTbAlarmCommentServiceTest {
 
-    @MockBean
+    @MockitoBean
     protected DbCallbackExecutorService dbExecutor;
-    @MockBean
+    @MockitoBean
     protected TbLogEntityActionService logEntityActionService;
-    @MockBean
+    @MockitoBean
     protected AlarmService alarmService;
-    @MockBean
+    @MockitoBean
     protected AlarmCommentService alarmCommentService;
-    @MockBean
+    @MockitoBean
     protected AlarmSubscriptionService alarmSubscriptionService;
-    @MockBean
+    @MockitoBean
     protected CustomerService customerService;
-    @MockBean
+    @MockitoBean
     protected TbClusterService tbClusterService;
-    @MockBean
+    @MockitoBean
     private AccessControlService accessControlService;
-    @MockBean
+    @MockitoBean
     private TenantService tenantService;
-    @MockBean
+    @MockitoBean
     private AssetService assetService;
-    @MockBean
+    @MockitoBean
     private DeviceService deviceService;
-    @MockBean
+    @MockitoBean
     private AssetProfileService assetProfileService;
-    @MockBean
+    @MockitoBean
     private DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     private EntityService entityService;
-    @SpyBean
+    @MockitoSpyBean
     DefaultTbAlarmCommentService service;
 
     @Test
diff --git a/application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java b/application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java
index fa675fc3f8..5caf2ececd 100644
--- a/application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/install/InstallScriptsTest.java
@@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -52,30 +52,30 @@ import static org.mockito.BDDMockito.willReturn;
 @SpringBootTest(classes = {InstallScripts.class, RuleChainDataValidator.class})
 class InstallScriptsTest {
 
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     DashboardService dashboardService;
-    @MockBean
+    @MockitoBean
     WidgetTypeService widgetTypeService;
-    @MockBean
+    @MockitoBean
     WidgetsBundleService widgetsBundleService;
-    @MockBean
+    @MockitoBean
     OAuth2ConfigTemplateService oAuth2TemplateService;
-    @MockBean
+    @MockitoBean
     ResourceService resourceService;
-    @MockBean
+    @MockitoBean
     ImageService imageService;
-    @MockBean
+    @MockitoBean
     ResourcesUpdater resourcesUpdater;
-    @SpyBean
+    @MockitoSpyBean
     InstallScripts installScripts;
 
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     ApiLimitService apiLimitService;
-    @SpyBean
+    @MockitoSpyBean
     RuleChainDataValidator ruleChainValidator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java b/application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
index 63fa4a7da4..4e74a3e06e 100644
--- a/application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/job/JobManagerTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.rule.engine.api.JobManager;
 import org.thingsboard.server.common.data.Device;
@@ -68,10 +68,10 @@ public class JobManagerTest extends AbstractControllerTest {
     @Autowired
     private JobManager jobManager;
 
-    @SpyBean
+    @MockitoSpyBean
     private TestTaskProcessor taskProcessor;
 
-    @SpyBean
+    @MockitoSpyBean
     private JobStatsService jobStatsService;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
index 8110f6c0e3..79b31acf78 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
@@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.common.util.JacksonUtil;
@@ -56,6 +56,7 @@ import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TopicService;
 import org.thingsboard.server.queue.provider.TbQueueProducerProvider;
 import org.thingsboard.server.service.gateway_device.GatewayNotificationsService;
+import org.thingsboard.server.service.ota.OtaPackageStateService;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 
@@ -67,6 +68,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
@@ -87,30 +89,45 @@ public class DefaultTbClusterServiceTest {
 
     public static final String TRANSPORT = "transport";
 
-    @MockBean
+    @MockitoBean
     protected TbDeviceProfileCache deviceProfileCache;
-    @MockBean
+    @MockitoBean
     protected TbAssetProfileCache assetProfileCache;
-    @MockBean
+    @MockitoBean
     protected GatewayNotificationsService gatewayNotificationsService;
-    @MockBean
+    @MockitoBean
     protected EdgeService edgeService;
-    @MockBean
+    @MockitoBean
     protected PartitionService partitionService;
-    @MockBean
+    @MockitoBean
     protected TbQueueProducerProvider producerProvider;
-    @MockBean
+    @MockitoBean
     protected TbRuleEngineProducerService ruleEngineProducerService;
-    @MockBean
+    @MockitoBean
     protected TbTransactionalCache<EdgeId, String> edgeCache;
-    @MockBean
+    @MockitoBean
     protected CalculatedFieldService calculatedFieldService;
 
-    @SpyBean
+    @MockitoBean
     protected TopicService topicService;
-    @SpyBean
+    @MockitoBean
+    protected OtaPackageStateService otaPackageStateService;
+    @MockitoSpyBean
     protected TbClusterService clusterService;
 
+    @org.junit.Before
+    public void setUp() {
+        lenient().when(topicService.getNotificationsTopic(any(), any())).thenAnswer(invocation -> {
+            ServiceType serviceType = invocation.getArgument(0);
+            String serviceId = invocation.getArgument(1);
+            return new TopicPartitionInfo(serviceType.name().toLowerCase() + ".notifications." + serviceId, null, null, false);
+        });
+        lenient().when(topicService.getCalculatedFieldNotificationsTopic(any())).thenAnswer(invocation -> {
+            String serviceId = invocation.getArgument(0);
+            return new TopicPartitionInfo("calculated_field.notifications." + serviceId, null, null, false);
+        });
+    }
+
     @Test
     public void testOnQueueChangeSingleMonolith() {
         when(partitionService.getAllServiceIds(ServiceType.TB_RULE_ENGINE)).thenReturn(Sets.newHashSet(MONOLITH));
diff --git a/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java b/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
index 28ce4ea46a..8d27b07550 100644
--- a/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
@@ -55,7 +55,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
         "usage.stats.report.urgent_interval=1"
 })
 public class DefaultSmsServiceTest extends AbstractControllerTest {
-    @SpyBean
+    @MockitoSpyBean
     private DefaultSmsService defaultSmsService;
     @Autowired
     private AdminSettingsService adminSettingsService;
diff --git a/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java b/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
index 9630dacdd4..75dce3b2b3 100644
--- a/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sync/ie/ExportImportServiceSqlTest.java
@@ -22,7 +22,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.debug.TbMsgGeneratorNode;
 import org.thingsboard.rule.engine.debug.TbMsgGeneratorNodeConfiguration;
@@ -127,9 +127,9 @@ import static org.mockito.Mockito.verify;
 @DaoSqlTest
 public class ExportImportServiceSqlTest extends AbstractControllerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private EntityActionService entityActionService;
-    @SpyBean
+    @MockitoSpyBean
     private OtaPackageStateService otaPackageStateService;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
index afb77945ab..6b667cc811 100644
--- a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
@@ -20,8 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.cache.ota.OtaPackageDataCache;
@@ -69,38 +69,60 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = DefaultTransportApiService.class)
+@ContextConfiguration(classes = DefaultTransportApiServiceTest.ContextConfiguration.class)
 public class DefaultTransportApiServiceTest {
 
-    @MockBean
+    @org.springframework.context.annotation.Configuration
+    static class ContextConfiguration {
+        @org.springframework.context.annotation.Bean
+        public DefaultTransportApiService defaultTransportApiService(TbDeviceProfileCache deviceProfileCache,
+                                                                     TbTenantProfileCache tenantProfileCache,
+                                                                     TbApiUsageStateService apiUsageStateService,
+                                                                     DeviceService deviceService,
+                                                                     DeviceProfileService deviceProfileService,
+                                                                     RelationService relationService,
+                                                                     DeviceCredentialsService deviceCredentialsService,
+                                                                     TbClusterService tbClusterService,
+                                                                     DeviceProvisionService deviceProvisionService,
+                                                                     ResourceService resourceService,
+                                                                     OtaPackageService otaPackageService,
+                                                                     OtaPackageDataCache otaPackageDataCache,
+                                                                     QueueService queueService) {
+            return new DefaultTransportApiService(deviceProfileCache, tenantProfileCache, apiUsageStateService,
+                    deviceService, deviceProfileService, relationService, deviceCredentialsService, tbClusterService,
+                    deviceProvisionService, resourceService, otaPackageService, otaPackageDataCache, queueService);
+        }
+    }
+
+    @MockitoBean
     protected TbDeviceProfileCache deviceProfileCache;
-    @MockBean
+    @MockitoBean
     protected TbTenantProfileCache tenantProfileCache;
-    @MockBean
+    @MockitoBean
     protected TbApiUsageStateService apiUsageStateService;
-    @MockBean
+    @MockitoBean
     protected DeviceService deviceService;
-    @MockBean
+    @MockitoBean
     protected DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     protected RelationService relationService;
-    @MockBean
+    @MockitoBean
     protected DeviceCredentialsService deviceCredentialsService;
-    @MockBean
+    @MockitoBean
     protected DbCallbackExecutorService dbCallbackExecutorService;
-    @MockBean
+    @MockitoBean
     protected TbClusterService tbClusterService;
-    @MockBean
+    @MockitoBean
     protected DeviceProvisionService deviceProvisionService;
-    @MockBean
+    @MockitoBean
     protected ResourceService resourceService;
-    @MockBean
+    @MockitoBean
     protected OtaPackageService otaPackageService;
-    @MockBean
+    @MockitoBean
     protected OtaPackageDataCache otaPackageDataCache;
-    @MockBean
+    @MockitoBean
     protected QueueService queueService;
-    @SpyBean
+    @MockitoSpyBean
     DefaultTransportApiService service;
 
     private String certificateChain;
diff --git a/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java b/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
index fcb948239f..a74db4593c 100644
--- a/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/ttl/AlarmsCleanUpServiceTest.java
@@ -21,7 +21,7 @@ import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.alarm.Alarm;
@@ -50,9 +50,9 @@ import static org.mockito.Mockito.verify;
 })
 public class AlarmsCleanUpServiceTest extends AbstractControllerTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private AlarmsCleanUpService alarmsCleanUpService;
-    @SpyBean
+    @MockitoSpyBean
     private AlarmService alarmService;
     @Autowired
     private AlarmDao alarmDao;
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
index f3a3212e67..4d5114425f 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
@@ -37,7 +37,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
@@ -133,10 +133,10 @@ import static org.thingsboard.server.transport.lwm2m.ota.AbstractOtaLwM2MIntegra
 })
 public abstract class AbstractLwM2MIntegrationTest extends AbstractTransportIntegrationTest {
 
-    @SpyBean
+    @MockitoSpyBean
     protected LwM2mUplinkMsgHandler defaultLwM2mUplinkMsgHandlerTest;
 
-    @SpyBean
+    @MockitoSpyBean
     protected DefaultLwM2mUplinkMsgHandler defaultUplinkMsgHandlerTest;
 
     @Autowired
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
index 3c4bdcd3e7..b511d8b1e2 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
@@ -22,7 +22,7 @@ import org.eclipse.leshan.core.link.LinkParser;
 import org.eclipse.leshan.core.link.lwm2m.DefaultLwM2mLinkParser;
 import org.junit.Before;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
@@ -103,7 +103,7 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
 
     protected String idVer_19_0_0;
 
-    @SpyBean
+    @MockitoSpyBean
     protected LwM2mTransportServerHelper lwM2mTransportServerHelperTest;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
index afb179cc5f..f145d6a62a 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/security/diffPort/AbstractLwM2MIntegrationDiffPortTest.java
@@ -24,7 +24,7 @@ import org.eclipse.leshan.server.registration.RegistrationStore;
 import org.eclipse.leshan.server.registration.RegistrationUpdate;
 import org.junit.Assert;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
@@ -49,7 +49,7 @@ import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MClient
 @Slf4j
 public abstract class AbstractLwM2MIntegrationDiffPortTest extends AbstractSecurityLwM2MIntegrationTest {
 
-    @SpyBean
+    @MockitoSpyBean
     private RegistrationStore registrationStoreTest;
 
     protected void basicTestConnectionDifferentPort(Lwm2mDeviceProfileTransportConfiguration transportConfiguration,
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java
index 541ca40072..d2c2b546f7 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/MqttGatewayRateLimitsTest.java
@@ -22,7 +22,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.TestPropertySource;
@@ -71,7 +71,7 @@ public class MqttGatewayRateLimitsTest extends AbstractControllerTest {
     private Device gateway;
     private String gatewayAccessToken;
 
-    @SpyBean
+    @MockitoSpyBean
     private NotificationRuleProcessor notificationRuleProcessor;
 
     @Before
diff --git a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
index ea40a574a5..07837d9d8f 100644
--- a/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/mqtt/mqttv3/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -67,7 +67,7 @@ public abstract class AbstractMqttTimeseriesIntegrationTest extends AbstractMqtt
     protected static final String MALFORMED_JSON_PAYLOAD = "{\"key1\":, \"key2\":true, \"key3\": 3.0, \"key4\": 4," +
             " \"key5\": {\"someNumber\": 42, \"someArray\": [1,2,3], \"someNestedObject\": {\"key\": \"value\"}}}";
 
-    @SpyBean
+    @MockitoSpyBean
     GatewayMetricsService gatewayMetricsService;
 
     @Before
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java
index 267dd52882..4aa50de3cc 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractDaoServiceTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.dao;
 
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -40,7 +40,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
         DirtiesContextTestExecutionListener.class})
 public abstract class AbstractDaoServiceTest {
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     StatsFactory statsFactory;
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
index f68ab72786..dc5cc47cf7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractJpaDaoTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.dao;
 
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -42,7 +42,7 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
         DirtiesContextTestExecutionListener.class})
 public abstract class AbstractJpaDaoTest {
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     StatsFactory statsFactory;
 
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java
index 5de4378cf0..a9feec982b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/cache/RedisTbTransactionalCacheTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.cache;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.test.context.ContextConfiguration;
@@ -50,13 +50,13 @@ import static org.mockito.Mockito.when;
 @Slf4j
 public class RedisTbTransactionalCacheTest {
 
-    @MockBean
+    @MockitoBean
     private RelationRedisCache relationRedisCache;
-    @MockBean
+    @MockitoBean
     private RedisConnectionFactory connectionFactory;
-    @MockBean
+    @MockitoBean
     private RedisConnection redisConnection;
-    @MockBean
+    @MockitoBean
     private RedisSslCredentials redisSslCredentials;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
index b9fd609521..9765923967 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -111,7 +111,7 @@ public class DeviceServiceTest extends AbstractServiceTest {
     private CalculatedFieldService calculatedFieldService;
     @Autowired
     private PlatformTransactionManager platformTransactionManager;
-    @SpyBean
+    @MockitoSpyBean
     private DeviceCredentialsDataValidator validator;
 
     private IdComparator<Device> idComparator = new IdComparator<>();
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java
index 1873fa9ea9..53630a9167 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.cache.TbTransactionalCache;
 import org.thingsboard.server.common.data.Customer;
@@ -87,7 +87,7 @@ import static org.mockito.Mockito.verify;
 @DaoSqlTest
 public class TenantServiceTest extends AbstractServiceTest {
 
-    @SpyBean
+    @MockitoSpyBean
     TenantDao tenantDao;
 
     @Autowired
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java
index c550772718..6241f2dea3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AdminSettingsDataValidatorTest.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -31,9 +31,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AdminSettingsDataValidator.class)
 class AdminSettingsDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AdminSettingsService adminSettingsService;
-    @SpyBean
+    @MockitoSpyBean
     AdminSettingsDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java
index 89b0b0cec4..e36aa20773 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AlarmDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -33,9 +33,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AlarmDataValidator.class)
 class AlarmDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     AlarmDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java
index eb46a87018..e5c51ac064 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetDataValidatorTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetDao;
@@ -39,11 +39,11 @@ import static org.mockito.BDDMockito.willReturn;
 @Slf4j
 class AssetDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AssetDao assetDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
     @Autowired
     AssetDataValidator validator;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java
index b5cfb4998c..a8060cd51f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/AssetProfileDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.asset.AssetProfileDao;
@@ -37,19 +37,19 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = AssetProfileDataValidator.class)
 class AssetProfileDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     AssetProfileDao assetProfileDao;
-    @MockBean
+    @MockitoBean
     AssetProfileService assetProfileService;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     QueueService queueService;
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     DashboardService dashboardService;
-    @SpyBean
+    @MockitoSpyBean
     AssetProfileDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java
index c810dd5c63..1dfc1d4e8d 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/ComponentDescriptorDataValidatorTest.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
 import org.thingsboard.server.common.data.plugin.ComponentScope;
@@ -27,7 +27,7 @@ import static org.mockito.Mockito.verify;
 
 @SpringBootTest(classes = ComponentDescriptorDataValidator.class)
 class ComponentDescriptorDataValidatorTest {
-    @SpyBean
+    @MockitoSpyBean
     ComponentDescriptorDataValidator validator;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java
index d434d8f231..aa66f4003f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/CustomerDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = CustomerDataValidator.class)
 class CustomerDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     CustomerDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java
index 3029027f37..cf5ad6e8fe 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DashboardDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -32,9 +32,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = DashboardDataValidator.class)
 class DashboardDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     DashboardDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java
index f0aacc91bd..a77c3e5fb7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceDataValidatorTest.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -39,11 +39,11 @@ import static org.mockito.BDDMockito.willReturn;
 @Slf4j
 class DeviceDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     DeviceDao deviceDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
     @Autowired
     DeviceDataValidator validator;
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java
index 34523c1829..8b2fa3c030 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -86,21 +86,21 @@ class DeviceProfileDataValidatorTest {
     private static final int port = 5685;
     private static final int portBs = 5687;
 
-    @MockBean
+    @MockitoBean
     DeviceProfileDao deviceProfileDao;
-    @MockBean
+    @MockitoBean
     DeviceProfileService deviceProfileService;
-    @MockBean
+    @MockitoBean
     DeviceDao deviceDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     QueueService queueService;
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     DashboardService dashboardService;
-    @SpyBean
+    @MockitoSpyBean
     DeviceProfileDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java
index 98699b0176..2f4ed4426f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/EdgeDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = EdgeDataValidator.class)
 class EdgeDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     EdgeDao edgeDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @SpyBean
+    @MockitoSpyBean
     EdgeDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java
index 3db9d77469..ab821de252 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/EntityViewDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.customer.CustomerDao;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = EntityViewDataValidator.class)
 class EntityViewDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     EntityViewDao entityViewDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     CustomerDao customerDao;
-    @SpyBean
+    @MockitoSpyBean
     EntityViewDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java
index 9072bb5e62..059e966040 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/ResourceDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -36,15 +36,15 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = ResourceDataValidator.class)
 class ResourceDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TbResourceDao resourceDao;
-    @MockBean
+    @MockitoBean
     WidgetTypeDao widgetTypeDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @MockBean
+    @MockitoBean
     TbTenantProfileCache tenantProfileCache;
-    @SpyBean
+    @MockitoSpyBean
     ResourceDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java
index 9107d1f8f2..eb884edbf3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/RuleChainDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainType;
@@ -34,11 +34,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = RuleChainDataValidator.class)
 class RuleChainDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     RuleChainService ruleChainService;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     RuleChainDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java
index c7e4f73ce4..ca1871a1dc 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/TenantDataValidatorTest.java
@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.dao.tenant.TenantDao;
@@ -30,9 +30,9 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = TenantDataValidator.class)
 class TenantDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     TenantDao tenantDao;
-    @SpyBean
+    @MockitoSpyBean
     TenantDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java
index 3849aa62bf..3904c7d509 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
@@ -34,13 +34,13 @@ import static org.mockito.Mockito.verify;
 
 @SpringBootTest(classes = WidgetTypeDataValidator.class)
 class WidgetTypeDataValidatorTest {
-    @MockBean
+    @MockitoBean
     WidgetTypeDao widgetTypeDao;
-    @MockBean
+    @MockitoBean
     WidgetsBundleDao widgetsBundleDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     WidgetTypeDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java
index 1affa60415..6ab7728471 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetsBundleDataValidatorTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.dao.service.validator;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -33,11 +33,11 @@ import static org.mockito.Mockito.verify;
 @SpringBootTest(classes = WidgetsBundleDataValidator.class)
 class WidgetsBundleDataValidatorTest {
 
-    @MockBean
+    @MockitoBean
     WidgetsBundleDao widgetsBundleDao;
-    @MockBean
+    @MockitoBean
     TenantService tenantService;
-    @SpyBean
+    @MockitoSpyBean
     WidgetsBundleDataValidator validator;
     TenantId tenantId = TenantId.fromUUID(UUID.fromString("9ef79cdf-37a8-4119-b682-2e7ed4e018da"));
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java
index b0d946ce3f..863d4ae2e8 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepositoryTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -31,11 +31,11 @@ import static org.hamcrest.Matchers.equalTo;
 @SpringBootTest(classes = DefaultEntityQueryRepository.class)
 public class DefaultEntityQueryRepositoryTest {
 
-    @MockBean
+    @MockitoBean
     NamedParameterJdbcTemplate jdbcTemplate;
-    @MockBean
+    @MockitoBean
     TransactionTemplate transactionTemplate;
-    @MockBean
+    @MockitoBean
     DefaultQueryLogComponent queryLog;
 
     @Autowired
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
index 83a06fe568..e47ed5bfbf 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.mockito.BDDMockito;
 import org.mockito.Mockito;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -52,7 +52,7 @@ public class DefaultQueryLogComponentTest {
     private TenantId tenantId;
     private SqlQueryContext ctx;
 
-    @SpyBean
+    @MockitoSpyBean
     private DefaultQueryLogComponent queryLog;
 
     @Before
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
index 43c8a064e1..05952e1203 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningDaysAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
index 5deccec298..83bb802c85 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningHoursAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
index a742e6cd2c..4f78f5b864 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -52,13 +52,13 @@ public class CassandraBaseTimeseriesDaoPartitioningIndefiniteAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
index dd106cb439..455cf2cc00 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningMinutesAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
index 5699f5d5f7..ce8b66215b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -63,13 +63,13 @@ public class CassandraBaseTimeseriesDaoPartitioningMonthsAlwaysExistsTest {
     @MockitoSpyBean
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
index a68daf664a..90575d5b14 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest.java
@@ -22,7 +22,7 @@ import org.mockito.Answers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
@@ -53,13 +53,13 @@ public class CassandraBaseTimeseriesDaoPartitioningYearsAlwaysExistsTest {
     @Autowired
     CassandraBaseTimeseriesDao tsDao;
 
-    @MockBean(answer = Answers.RETURNS_MOCKS)
+    @MockitoBean(answers = Answers.RETURNS_MOCKS)
     @Qualifier("CassandraCluster")
     CassandraCluster cassandraCluster;
 
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateReadExecutor cassandraBufferedRateReadExecutor;
-    @MockBean
+    @MockitoBean
     CassandraBufferedRateWriteExecutor cassandraBufferedRateWriteExecutor;
 
     @Test
diff --git a/edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java b/edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java
index adb42203e0..edf8832a33 100644
--- a/edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java
+++ b/edqs/src/test/java/org/thingsboard/server/edqs/repo/AbstractEDQTest.java
@@ -20,7 +20,7 @@ import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -81,7 +81,7 @@ public abstract class AbstractEDQTest {
     protected DefaultEdqsRepository repository;
     @Autowired
     protected EdqsMapper edqsMapper;
-    @MockBean
+    @MockitoBean
     private DummyEdqsStatsService edqsStatsService;
 
     protected final TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());

From de0e8c70e312d91904ff77e707de26b4aa9f1212 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Tue, 19 May 2026 15:05:27 +0200
Subject: [PATCH 28/91] Removed compiler warnings about raw types and unchecked
 casts

---
 .../service/notification/NotificationApiTest.java    |  2 +-
 .../lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java   | 10 +++++-----
 .../server/common/data/util/CollectionsUtil.java     |  3 ++-
 .../org/thingsboard/script/api/tbel/TbUtils.java     |  2 +-
 .../org/thingsboard/script/api/tbel/TbUtilsTest.java | 12 ++++++------
 .../downlink/DefaultLwM2mDownlinkMsgHandler.java     |  2 +-
 .../server/rpc/DefaultLwM2MRpcRequestHandler.java    | 12 ++++++------
 .../service/TransportActivityManagerTest.java        |  4 ++--
 .../org/thingsboard/common/util/ExceptionUtil.java   |  1 +
 .../server/dao/AbstractRedisClusterContainer.java    | 12 ++++++------
 .../server/dao/AbstractRedisContainer.java           |  2 +-
 .../org/thingsboard/server/dao/RedisJUnit5Test.java  |  2 +-
 .../rule/engine/flow/TbCheckpointNodeTest.java       |  2 +-
 .../rule/engine/kafka/TbKafkaNodeTest.java           |  2 +-
 .../rule/engine/metadata/TbGetTelemetryNodeTest.java | 12 ++++++------
 .../telemetry/TbMsgDeleteAttributesNodeTest.java     |  2 +-
 .../engine/transform/TbMsgDeduplicationNodeTest.java | 10 +++++-----
 .../engine/transform/TbSplitArrayMsgNodeTest.java    |  2 +-
 18 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
index fc42ae247c..5d0fa31e8a 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiTest.java
@@ -988,7 +988,7 @@ public class NotificationApiTest extends AbstractNotificationApiTest {
 
         String expectedSubject = "Comment on 'test' alarm";
         String expectedBody = TENANT_ADMIN_EMAIL + " added comment: text";
-        ArgumentCaptor<Map<String, String>> msgCaptor = ArgumentCaptor.forClass(Map.class);
+        ArgumentCaptor<Map<String, String>> msgCaptor = ArgumentCaptor.captor();
         await().atMost(TIMEOUT, TimeUnit.SECONDS).untilAsserted(() -> {
             verify(firebaseService).sendMessage(eq(tenantId), eq("testCredentials"),
                     eq(TEST_MOBILE_TOKEN), eq(expectedSubject),
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
index b511d8b1e2..af0fdf4c09 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/AbstractRpcLwM2MIntegrationTest.java
@@ -77,16 +77,16 @@ public abstract class AbstractRpcLwM2MIntegrationTest extends AbstractLwM2MInteg
 
     protected final LinkParser linkParser = new DefaultLwM2mLinkParser();
     protected String CONFIG_PROFILE_WITH_PARAMS_RPC;
-    public Set expectedObjects;
-    public Set expectedObjectIdVers;
-    public Set expectedInstances;
-    public Set expectedObjectIdVerInstances;
+    public Set<String> expectedObjects;
+    public Set<String> expectedObjectIdVers;
+    public Set<String> expectedInstances;
+    public Set<String> expectedObjectIdVerInstances;
 
     protected String objectInstanceIdVer_1;
     protected String objectIdVer_0;
     protected String objectIdVer_1;
     protected String objectIdVer_2;
-    private static final Predicate PREDICATE_3 = path -> (!((String) path).startsWith("/" + TEMPERATURE_SENSOR) && ((String) path).startsWith("/" + DEVICE));
+    private static final Predicate<String> PREDICATE_3 = path -> (!((String) path).startsWith("/" + TEMPERATURE_SENSOR) && ((String) path).startsWith("/" + DEVICE));
     protected String objectIdVer_3;
     protected String objectInstanceIdVer_3;
     protected String objectInstanceIdVer_5;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/CollectionsUtil.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/CollectionsUtil.java
index 7541be5078..f1bedc8659 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/util/CollectionsUtil.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/CollectionsUtil.java
@@ -85,6 +85,7 @@ public class CollectionsUtil {
         return result;
     }
 
+    @SafeVarargs
     public static <V> boolean isOneOf(V value, V... others) {
         if (value == null) {
             return false;
@@ -134,7 +135,7 @@ public class CollectionsUtil {
         Set<T> newSet = new HashSet<>(existing.size() + 1);
         newSet.addAll(existing);
         newSet.add(value);
-        return (Set<T>) Set.of(newSet.toArray());
+        return Set.copyOf(newSet);
     }
 
     public static boolean isEmpty(Map<?, ?> map) {
diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
index ec8eacbc67..26fe9ae99a 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbUtils.java
@@ -1332,7 +1332,7 @@ public class TbUtils {
         for (byte b : byteArray) {
             byteList.add(b);
         }
-        ExecutionArrayList<Byte> list = new ExecutionArrayList(byteList, ctx);
+        ExecutionArrayList<Byte> list = new ExecutionArrayList<>(byteList, ctx);
         return list;
     }
 
diff --git a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
index ef1729ab73..caefb40608 100644
--- a/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
+++ b/common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbUtilsTest.java
@@ -1281,13 +1281,13 @@ public class TbUtilsTest {
     }
     @Test
     public void setTest() throws ExecutionException, InterruptedException {
-        Set actual = TbUtils.newSet(ctx);
-        Set expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xCC});
+        Set<Byte> actual = TbUtils.newSet(ctx);
+        Set<Byte> expected = toSet(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xCC});
         actual.add((byte) 0xDD);
         actual.add((byte) 0xCC);
         actual.add((byte) 0xCC);
         assertTrue(expected.containsAll(actual));
-        List list = toList(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xBB, (byte) 0xAA});
+        List<Byte> list = toList(new byte[]{(byte) 0xDD, (byte) 0xCC, (byte) 0xBB, (byte) 0xAA});
         actual.addAll(list);
         assertEquals(4, actual.size());
         assertTrue(actual.containsAll(expected));
@@ -1301,9 +1301,9 @@ public class TbUtilsTest {
         actual.clear();
         assertTrue(actual.isEmpty());
         actual = TbUtils.toSet(ctx, list);
-        Set actualClone = TbUtils.toSet(ctx, list);
-        Set actualClone_asc = TbUtils.toSet(ctx, list);
-        Set actualClone_desc = TbUtils.toSet(ctx, list);
+        Set<Byte> actualClone = TbUtils.toSet(ctx, list);
+        Set<Byte> actualClone_asc = TbUtils.toSet(ctx, list);
+        Set<Byte> actualClone_desc = TbUtils.toSet(ctx, list);
         ((ExecutionLinkedHashSet<?>)actualClone).sort();
         ((ExecutionLinkedHashSet<?>)actualClone_asc).sort(true);
         ((ExecutionLinkedHashSet<?>)actualClone_desc).sort(false);
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
index 8f638cfa2a..6d6eea28ab 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/downlink/DefaultLwM2mDownlinkMsgHandler.java
@@ -815,7 +815,7 @@ public class DefaultLwM2mDownlinkMsgHandler extends LwM2MExecutorAwareService im
                 LwM2mPath pathSingleOb = singleObs.getPath();
                 LwM2mPath pathObjectId = new LwM2mPath(objectId);
                 if (!pathSingleOb.toString().equals(objectId)) {
-                    List paths = Arrays.asList(pathSingleOb, pathObjectId);
+                    List<LwM2mPath> paths = Arrays.asList(pathSingleOb, pathObjectId);
                     try {
                         LwM2mPath.validateNotOverlapping(paths);
                     } catch (IllegalArgumentException e){
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
index 6980fb6341..c363cd3da5 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/rpc/DefaultLwM2MRpcRequestHandler.java
@@ -212,7 +212,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         String[] versionedIds = getIdsFromParameters(client, requestMsg);
         TbLwM2MReadCompositeRequest request = TbLwM2MReadCompositeRequest.builder().versionedIds(versionedIds).timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MReadCompositeCallback(uplinkHandler, logService, client, versionedIds);
-        var rpcCallback = new RpcReadResponseCompositeCallback(transportService, client, requestMsg, mainCallback);
+        var rpcCallback = new RpcReadResponseCompositeCallback<>(transportService, client, requestMsg, mainCallback);
         downlinkHandler.sendReadCompositeRequest(client, request, rpcCallback);
     }
 
@@ -323,7 +323,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
                 } else if (path.isResource()) {
                     validateResource(client, newNodes, nodes, key , value);
                 } else if (path.isObjectInstance() && value instanceof Map<?, ?>) {
-                    ((Map) value).forEach((k, v) -> {
+                    ((Map<?, ?>) value).forEach((k, v) -> {
                         validateResource(client, newNodes, nodes, validateResourceId (key, k.toString(), nodes), v);
                     });
                 } else {
@@ -337,7 +337,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         return newNodes;
     }
 
-    private void validateResource(LwM2mClient client, Map newNodes, Map nodes, String resourceId , Object value) {
+    private void validateResource(LwM2mClient client, Map<String, Object> newNodes, Map<String, Object> nodes, String resourceId , Object value) {
         if (value instanceof Map<?, ?>) {
             ((Map<?, ?>) value).forEach((k, v) -> {
                 setValueToCompositeNodes(client, newNodes, nodes, validateResourceId (resourceId, k.toString(), nodes), v);
@@ -347,7 +347,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         }
     }
 
-    private String validateResourceId (String key, String id, Map nodes) {
+    private String validateResourceId (String key, String id, Map<String, Object> nodes) {
         try {
             Integer.parseInt(id);
             return key + "/" + id;
@@ -357,7 +357,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         }
     }
 
-    private void setValueToCompositeNodes (LwM2mClient client, Map newNodes, Map nodes, String versionedId , Object value) {
+    private void setValueToCompositeNodes (LwM2mClient client, Map<String, Object> newNodes, Map<String, Object> nodes, String versionedId , Object value) {
         // validate value. Must be only primitive, not JsonObject or JsonArray
         try {
             JsonElement element = JsonUtils.parse(value);
@@ -388,7 +388,7 @@ public class DefaultLwM2MRpcRequestHandler implements LwM2MRpcRequestHandler {
         String[] versionedIds = getIdsFromParameters(client, requestMsg);
         TbLwM2MObserveCompositeRequest request = TbLwM2MObserveCompositeRequest.builder().versionedIds(versionedIds).timeout(clientContext.getRequestTimeout(client)).build();
         var mainCallback = new TbLwM2MObserveCompositeCallback(uplinkHandler, logService, client, versionedIds);
-        var rpcCallback = new RpcObserveResponseCompositeCallback(transportService, client, requestMsg, mainCallback);
+        var rpcCallback = new RpcObserveResponseCompositeCallback<>(transportService, client, requestMsg, mainCallback);
         downlinkHandler.sendObserveCompositeRequest(client, request, rpcCallback);
     }
 
diff --git a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/TransportActivityManagerTest.java b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/TransportActivityManagerTest.java
index 3b3ce6e600..35ddba5d90 100644
--- a/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/TransportActivityManagerTest.java
+++ b/common/transport/transport-api/src/test/java/org/thingsboard/server/common/transport/service/TransportActivityManagerTest.java
@@ -122,7 +122,7 @@ public class TransportActivityManagerTest {
         // THEN
         ArgumentCaptor<TransportProtos.SessionInfoProto> sessionInfoCaptor = ArgumentCaptor.forClass(TransportProtos.SessionInfoProto.class);
         ArgumentCaptor<TransportProtos.SubscriptionInfoProto> subscriptionInfoCaptor = ArgumentCaptor.forClass(TransportProtos.SubscriptionInfoProto.class);
-        ArgumentCaptor<TransportServiceCallback<Void>> callbackCaptor = ArgumentCaptor.forClass(TransportServiceCallback.class);
+        ArgumentCaptor<TransportServiceCallback<Void>> callbackCaptor = ArgumentCaptor.captor();
 
         verify(transportServiceMock).process(sessionInfoCaptor.capture(), subscriptionInfoCaptor.capture(), callbackCaptor.capture());
 
@@ -166,7 +166,7 @@ public class TransportActivityManagerTest {
         // THEN
         ArgumentCaptor<TransportProtos.SessionInfoProto> sessionInfoCaptor = ArgumentCaptor.forClass(TransportProtos.SessionInfoProto.class);
         ArgumentCaptor<TransportProtos.SubscriptionInfoProto> subscriptionInfoCaptor = ArgumentCaptor.forClass(TransportProtos.SubscriptionInfoProto.class);
-        ArgumentCaptor<TransportServiceCallback<Void>> callbackCaptor = ArgumentCaptor.forClass(TransportServiceCallback.class);
+        ArgumentCaptor<TransportServiceCallback<Void>> callbackCaptor = ArgumentCaptor.captor();
 
         verify(transportServiceMock).process(sessionInfoCaptor.capture(), subscriptionInfoCaptor.capture(), callbackCaptor.capture());
 
diff --git a/common/util/src/main/java/org/thingsboard/common/util/ExceptionUtil.java b/common/util/src/main/java/org/thingsboard/common/util/ExceptionUtil.java
index e5eed02675..7dc1ddde60 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/ExceptionUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/ExceptionUtil.java
@@ -37,6 +37,7 @@ public class ExceptionUtil {
         }
     }
 
+    @SafeVarargs
     public static Exception lookupExceptionInCause(Throwable source, Class<? extends Exception>... clazzes) {
         while (source != null) {
             for (Class<? extends Exception> clazz : clazzes) {
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java
index 827e50a5cc..1f057c802b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisClusterContainer.java
@@ -40,17 +40,17 @@ public class AbstractRedisClusterContainer {
     ); 
 
     @ClassRule(order = 1)
-    public static GenericContainer redis1 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6371").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis1 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6371").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 2)
-    public static GenericContainer redis2 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6372").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis2 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6372").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 3)
-    public static GenericContainer redis3 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6373").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis3 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6373").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 4)
-    public static GenericContainer redis4 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6374").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis4 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6374").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 5)
-    public static GenericContainer redis5 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6375").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis5 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6375").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
     @ClassRule(order = 6)
-    public static GenericContainer redis6 = new GenericContainer(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6376").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
+    public static GenericContainer<?> redis6 = new GenericContainer<>(IMAGE).withEnv(ENVS).withEnv("VALKEY_PORT_NUMBER", "6376").withNetworkMode("host").withLogConsumer(AbstractRedisClusterContainer::consumeLog);
 
 
     @ClassRule(order = 100)
diff --git a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
index dc4a47b5a5..72074f60c8 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/AbstractRedisContainer.java
@@ -27,7 +27,7 @@ import java.util.List;
 public class AbstractRedisContainer {
 
     @ClassRule(order = 0)
-    public static GenericContainer redis = new GenericContainer("bitnamilegacy/valkey:8.0")
+    public static GenericContainer<?> redis = new GenericContainer<>("bitnamilegacy/valkey:8.0")
             .withEnv("ALLOW_EMPTY_PASSWORD","yes")
             .withLogConsumer(s -> log.warn(((OutputFrame) s).getUtf8String().trim()))
             .withExposedPorts(6379);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/RedisJUnit5Test.java b/dao/src/test/java/org/thingsboard/server/dao/RedisJUnit5Test.java
index 863eb95d90..9eea80a47f 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/RedisJUnit5Test.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/RedisJUnit5Test.java
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class RedisJUnit5Test {
 
     @Container
-    private static final GenericContainer REDIS = new GenericContainer("bitnamilegacy/valkey:8.0")
+    private static final GenericContainer<?> REDIS = new GenericContainer<>("bitnamilegacy/valkey:8.0")
             .withEnv("ALLOW_EMPTY_PASSWORD","yes")
             .withLogConsumer(s -> log.error(((OutputFrame) s).getUtf8String().trim()))
             .withExposedPorts(6379);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
index ab0f358684..7c47477fee 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbCheckpointNodeTest.java
@@ -114,7 +114,7 @@ public class TbCheckpointNodeTest extends AbstractRuleNodeUpgradeTest {
                 .build();
         node.onMsg(ctxMock, msg);
 
-        ArgumentCaptor<Consumer<Throwable>> onFailure = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> onFailure = ArgumentCaptor.captor();
         then(ctxMock).should().enqueueForTellNext(eq(msg), eq(DataConstants.HP_QUEUE_NAME), eq(TbNodeConnectionType.SUCCESS), any(), onFailure.capture());
         String errorMsg = "Something went wrong.";
         onFailure.getValue().accept(new RuntimeException(errorMsg));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
index 5df7e1be7b..392821b767 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/kafka/TbKafkaNodeTest.java
@@ -420,7 +420,7 @@ public class TbKafkaNodeTest extends AbstractRuleNodeUpgradeTest {
     }
 
     private void verifyProducerRecord(String expectedTopic, String expectedKey, String expectedValue, Headers expectedHeaders) {
-        ArgumentCaptor<ProducerRecord<String, String>> actualRecordCaptor = ArgumentCaptor.forClass(ProducerRecord.class);
+        ArgumentCaptor<ProducerRecord<String, String>> actualRecordCaptor = ArgumentCaptor.captor();
         then(producerMock).should().send(actualRecordCaptor.capture(), any());
         ProducerRecord<String, String> actualRecord = actualRecordCaptor.getValue();
         assertThat(actualRecord.topic()).isEqualTo(expectedTopic);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
index ce3a1b5b22..5de65535e7 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeTest.java
@@ -219,7 +219,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         assertThat(actualReadTsKvQuery.getStartTs()).isEqualTo(startTs);
@@ -246,7 +246,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         assertThat(actualReadTsKvQuery.getStartTs()).isEqualTo(ts - TimeUnit.MINUTES.toMillis(config.getStartInterval()));
@@ -275,7 +275,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         List<String> actualKeys = actualReadTsKvQueryList.getValue().stream().map(TsKvQuery::getKey).toList();
         assertThat(actualKeys).containsExactlyInAnyOrder("temperature", "humidity", "pressure");
@@ -305,7 +305,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         aggregationStepVerifier.accept(actualReadTsKvQuery);
@@ -340,7 +340,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         limitInQueryVerifier.accept(actualReadTsKvQuery);
@@ -385,7 +385,7 @@ public class TbGetTelemetryNodeTest extends AbstractRuleNodeUpgradeTest {
         node.onMsg(ctxMock, msg);
 
         // THEN
-        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.forClass(List.class);
+        ArgumentCaptor<List<ReadTsKvQuery>> actualReadTsKvQueryList = ArgumentCaptor.captor();
         then(timeseriesServiceMock).should().findAll(eq(TENANT_ID), eq(DEVICE_ID), actualReadTsKvQueryList.capture());
         ReadTsKvQuery actualReadTsKvQuery = actualReadTsKvQueryList.getValue().get(0);
         orderInQueryVerifier.accept(actualReadTsKvQuery);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
index b03794c39d..105962fd1e 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/telemetry/TbMsgDeleteAttributesNodeTest.java
@@ -147,7 +147,7 @@ public class TbMsgDeleteAttributesNodeTest {
         node.onMsg(ctx, msg);
 
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
 
         if (sendAttributesDeletedNotification) {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
index ec71819878..8fd2868f61 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbMsgDeduplicationNodeTest.java
@@ -192,7 +192,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(ctx, times(1)).tellFailure(eq(msgToReject), any());
@@ -248,7 +248,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(ctx, times(1)).tellFailure(eq(msgToReject), any());
@@ -293,7 +293,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(node, times(msgCount + wantedNumberOfTellSelfInvocation)).onMsg(eq(ctx), any());
@@ -339,7 +339,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(node, times(msgCount + wantedNumberOfTellSelfInvocation)).onMsg(eq(ctx), any());
@@ -393,7 +393,7 @@ public class TbMsgDeduplicationNodeTest extends AbstractRuleNodeUpgradeTest {
 
         ArgumentCaptor<TbMsg> newMsgCaptor = ArgumentCaptor.forClass(TbMsg.class);
         ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+        ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
 
         verify(ctx, times(msgCount)).ack(any());
         verify(node, times(msgCount + wantedNumberOfTellSelfInvocation)).onMsg(eq(ctx), any());
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
index 5cd88c8ea9..b178def66e 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbSplitArrayMsgNodeTest.java
@@ -114,7 +114,7 @@ public class TbSplitArrayMsgNodeTest {
 
         if (dataNode.size() > 1) {
             ArgumentCaptor<Runnable> successCaptor = ArgumentCaptor.forClass(Runnable.class);
-            ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.forClass(Consumer.class);
+            ArgumentCaptor<Consumer<Throwable>> failureCaptor = ArgumentCaptor.captor();
             verify(ctx, times(dataNode.size())).enqueueForTellNext(any(), anyString(), successCaptor.capture(), failureCaptor.capture());
             for (Runnable valueCaptor : successCaptor.getAllValues()) {
                 valueCaptor.run();

From f8312352a06800c9ab314fe47e24754a1cce27bc Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Thu, 23 Apr 2026 15:11:11 +0200
Subject: [PATCH 29/91] Updated PEM credentials to the non-deprecated
 certificate API

---
 .../rule/engine/credentials/CertPemCredentials.java |  5 +++--
 .../engine/credentials/CertPemCredentialsTest.java  | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
index 81def5a96b..46d844d2c4 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/credentials/CertPemCredentials.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.StringUtils;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.TrustManagerFactory;
+import javax.security.auth.x500.X500Principal;
 import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.CertPath;
@@ -77,7 +78,7 @@ public class CertPemCredentials implements ClientCredentials {
         KeyStore caKeyStore = KeyStore.getInstance(KeyStore.getDefaultType());
         caKeyStore.load(null, null);
         for (X509Certificate caCert : caCerts) {
-            caKeyStore.setCertificateEntry(CA_CERT_CERT_ALIAS_PREFIX + caCert.getSubjectDN().getName(), caCert);
+            caKeyStore.setCertificateEntry(CA_CERT_CERT_ALIAS_PREFIX + caCert.getSubjectX500Principal().getName(X500Principal.RFC1779), caCert);
         }
 
         TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
@@ -99,7 +100,7 @@ public class CertPemCredentials implements ClientCredentials {
         keyStore.load(null);
         List<X509Certificate> unique = certificates.stream().distinct().collect(Collectors.toList());
         for (X509Certificate cert : unique) {
-            keyStore.setCertificateEntry(CERT_ALIAS_PREFIX + cert.getSubjectDN().getName(), cert);
+            keyStore.setCertificateEntry(CERT_ALIAS_PREFIX + cert.getSubjectX500Principal().getName(X500Principal.RFC1779), cert);
         }
 
         if (privateKey != null) {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
index cd0d508fec..634b5d8754 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/credentials/CertPemCredentialsTest.java
@@ -23,6 +23,7 @@ import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.thingsboard.common.util.SslUtil;
 
+import javax.security.auth.x500.X500Principal;
 import java.io.File;
 import java.io.IOException;
 import java.security.Key;
@@ -49,13 +50,13 @@ public class CertPemCredentialsTest {
 
         Assertions.assertEquals(4, x509Certificates.size());
         Assertions.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
-                x509Certificates.get(0).getSubjectDN().getName());
+                x509Certificates.get(0).getSubjectX500Principal().getName(X500Principal.RFC1779));
         Assertions.assertEquals("CN=Sectigo ECC Organization Validation Secure Server CA, O=Sectigo Limited, L=Salford, ST=Greater Manchester, C=GB",
-                x509Certificates.get(1).getSubjectDN().getName());
+                x509Certificates.get(1).getSubjectX500Principal().getName(X500Principal.RFC1779));
         Assertions.assertEquals("CN=USERTrust ECC Certification Authority, O=The USERTRUST Network, L=Jersey City, ST=New Jersey, C=US",
-                x509Certificates.get(2).getSubjectDN().getName());
+                x509Certificates.get(2).getSubjectX500Principal().getName(X500Principal.RFC1779));
         Assertions.assertEquals("CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, ST=Greater Manchester, C=GB",
-                x509Certificates.get(3).getSubjectDN().getName());
+                x509Certificates.get(3).getSubjectX500Principal().getName(X500Principal.RFC1779));
     }
 
     @Test
@@ -66,7 +67,7 @@ public class CertPemCredentialsTest {
 
         Assertions.assertEquals(1, x509Certificates.size());
         Assertions.assertEquals("CN=*.thingsboard.cloud, O=\"ThingsBoard, Inc.\", ST=New York, C=US",
-                x509Certificates.get(0).getSubjectDN().getName());
+                x509Certificates.get(0).getSubjectX500Principal().getName(X500Principal.RFC1779));
     }
 
     @Test
@@ -103,7 +104,7 @@ public class CertPemCredentialsTest {
 
         List<X509Certificate> certs = SslUtil.readCertFile(certContent);
         for (X509Certificate cert : certs) {
-            String alias = CERT_ALIAS_PREFIX + cert.getIssuerDN().getName();
+            String alias = CERT_ALIAS_PREFIX + cert.getIssuerX500Principal().getName(X500Principal.RFC1779);
             Certificate certificate = keyStore.getCertificate(alias);
             Assertions.assertNotNull(certificate);
             Assertions.assertEquals(new String(cert.getEncoded()), new String(certificate.getEncoded()));

From acb21c6f7bba490af2d34fe8c16c1f8270d6ceb8 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 08:54:24 +0200
Subject: [PATCH 30/91] Removed warnings about ignored builder initializers in
 data models

---
 .../org/thingsboard/server/common/data/job/task/Task.java     | 2 +-
 .../server/common/data/mobile/layout/MobileLayoutConfig.java  | 1 +
 .../tenant/profile/DefaultTenantProfileConfiguration.java     | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
index 8f3e0d814b..a881780012 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
@@ -46,7 +46,7 @@ public abstract class Task<R extends TaskResult> {
     public Task() {
     }
 
-    private int attempt = 0;
+    private int attempt;
 
     public abstract R toFailed(Throwable error);
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
index 783d3f68a9..60a7710e65 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/mobile/layout/MobileLayoutConfig.java
@@ -40,6 +40,7 @@ public class MobileLayoutConfig {
     @ArraySchema(schema = @Schema(implementation = MobilePage.class))
     @JsonView(Views.Public.class)
     @Valid
+    @Builder.Default
     private List<MobilePage> pages = new ArrayList<>();
 
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
index 297f92cffb..ff1dd3450c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
@@ -169,8 +169,10 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
 
     private double warnThreshold;
 
+    @Builder.Default
     @Schema(example = "5")
     private long maxCalculatedFieldsPerEntity = 5;
+    @Builder.Default
     @Schema(example = "10")
     private long maxArgumentsPerCF = 10;
     @Schema(example = "10")
@@ -188,8 +190,10 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
     @Positive
     @Schema(example = "1000")
     private long maxDataPointsPerRollingArg = 1000;
+    @Builder.Default
     @Schema(example = "32")
     private long maxStateSizeInKBytes = 32;
+    @Builder.Default
     @Schema(example = "2")
     private long maxSingleValueArgumentSizeInKBytes = 2;
     @Schema(example = "10")

From d5eba3dd2d4538d5686c25901b77b4fc54aa7a36 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 10:09:17 +0200
Subject: [PATCH 31/91] Technical cleanup of generated-equality annotations

---
 .../main/java/org/thingsboard/server/common/data/EventInfo.java | 2 ++
 .../java/org/thingsboard/server/common/data/HomeDashboard.java  | 2 ++
 .../java/org/thingsboard/server/common/data/TenantInfo.java     | 2 ++
 .../org/thingsboard/server/common/data/alarm/AlarmComment.java  | 1 +
 .../data/device/data/CoapDeviceTransportConfiguration.java      | 2 ++
 .../data/device/data/Lwm2mDeviceTransportConfiguration.java     | 2 ++
 .../lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java       | 2 ++
 .../java/org/thingsboard/server/common/data/edge/EdgeInfo.java  | 2 ++
 .../thingsboard/server/common/data/edqs/fields/AssetFields.java | 2 ++
 .../server/common/data/edqs/fields/AssetProfileFields.java      | 2 ++
 .../server/common/data/edqs/fields/CustomerFields.java          | 2 ++
 .../server/common/data/edqs/fields/DashboardFields.java         | 2 ++
 .../server/common/data/edqs/fields/DeviceFields.java            | 2 ++
 .../server/common/data/edqs/fields/DeviceProfileFields.java     | 2 ++
 .../thingsboard/server/common/data/edqs/fields/EdgeFields.java  | 2 ++
 .../server/common/data/edqs/fields/EntityViewFields.java        | 2 ++
 .../server/common/data/edqs/fields/QueueStatsFields.java        | 2 ++
 .../server/common/data/edqs/fields/RuleChainFields.java         | 2 ++
 .../server/common/data/edqs/fields/TenantFields.java            | 2 ++
 .../server/common/data/edqs/fields/TenantProfileFields.java     | 2 ++
 .../thingsboard/server/common/data/edqs/fields/UserFields.java  | 2 ++
 .../thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java  | 2 ++
 .../thingsboard/server/common/data/query/AlarmCountQuery.java   | 2 ++
 .../java/org/thingsboard/server/common/data/queue/Queue.java    | 2 ++
 .../org/thingsboard/server/common/data/rule/RuleNodeState.java  | 2 ++
 .../thingsboard/server/common/data/widget/WidgetTypeInfo.java   | 2 ++
 .../server/transport/mqtt/limits/GatewaySessionLimits.java      | 2 ++
 .../server/dao/model/sqlts/latest/TsKvLatestEntity.java         | 2 ++
 .../rule/engine/action/TbClearAlarmNodeConfiguration.java       | 2 ++
 .../rule/engine/action/TbCreateAlarmNodeConfiguration.java      | 2 ++
 .../rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java | 2 ++
 .../rule/engine/mqtt/azure/AzureIotHubSasCredentials.java       | 2 ++
 .../rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java  | 2 ++
 33 files changed, 65 insertions(+)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
index 9ca3957050..e0bdde1dd8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EventId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.id.TenantId;
  * @author Andrew Shvayka
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Schema
 public class EventInfo extends BaseData<EventId> {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
index ce9c8fce78..df2cdf2bf5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
@@ -17,9 +17,11 @@ package org.thingsboard.server.common.data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class HomeDashboard extends Dashboard {
 
     public static final String HIDE_DASHBOARD_TOOLBAR_DESCRIPTION = "Hide dashboard toolbar flag. Useful for rendering dashboards on mobile.";
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
index 4126b1acdd..8f38ecd750 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
@@ -17,10 +17,12 @@ package org.thingsboard.server.common.data;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.TenantId;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TenantInfo extends Tenant {
     @Schema(description = "Tenant Profile name", example = "Default")
     private String tenantProfileName;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
index ef7499fa33..20c1b218fc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
@@ -34,6 +34,7 @@ import java.io.Serial;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Builder
 @AllArgsConstructor
 public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
index 86a61e31b6..597cee3f1c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.DeviceTransportType;
 
 import java.util.HashMap;
@@ -27,6 +28,7 @@ import java.util.Map;
 
 @Data
 @Schema
+@EqualsAndHashCode(callSuper = false)
 public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
     private static final long serialVersionUID = 6061442236008925609L;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
index 656262ab45..513accfe7b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.DeviceTransportType;
 
 import java.util.HashMap;
@@ -27,6 +28,7 @@ import java.util.Map;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class Lwm2mDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
     @JsonIgnore
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
index 85c1e97e24..14ef402718 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
@@ -17,9 +17,11 @@ package org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Schema
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class LwM2MServerSecurityConfigDefault extends LwM2MServerSecurityConfig {
     @Schema(description = "Host for 'Security' mode (DTLS)", example = "0.0.0.0", accessMode = Schema.AccessMode.READ_ONLY)
     protected String securityHost;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
index dd751b8b9d..5dbd0212b3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
@@ -16,9 +16,11 @@
 package org.thingsboard.server.common.data.edge;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EdgeId;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class EdgeInfo extends Edge {
 
     private String customerTitle;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
index 40ad22ed19..d05147b4d7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -26,6 +27,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetFields extends AbstractEntityFields implements ProfileAwareFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
index ce91aac9d0..c519daa800 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
index e2cdf8f295..c324f0f1ab 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class CustomerFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
index 4131d58e98..608a64436e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
@@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -28,6 +29,7 @@ import java.util.UUID;
 
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DashboardFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
index 90400ae70d..ef8aee952b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -26,6 +27,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceFields extends AbstractEntityFields implements ProfileAwareFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
index 067c961b9e..2331829054 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -23,6 +24,7 @@ import org.thingsboard.server.common.data.DeviceProfileType;
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
index 1d257b06e1..e048eb22a8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class EdgeFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
index 4e326cf779..c5027dfc8f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class EntityViewFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
index 13e05daad4..5c5a139364 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class QueueStatsFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
index 25b7db6aaa..d580f6b913 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class RuleChainFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
index 9b538511b2..ba350fec54 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
index f6a2889f67..5d1ff0e0e2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data.edqs.fields;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -23,6 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import java.util.UUID;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
index 225b85680f..70fde8bf9c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.common.data.edqs.fields;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
@@ -25,6 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @SuperBuilder
 public class UserFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
index 233c53849c..f46339c15a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.common.data.kv;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class BaseDeleteTsKvQuery extends BaseTsKvQuery implements DeleteTsKvQuery {
 
     private final Boolean rewriteLatestIfDeleted;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
index 8431d7a303..0f1138b02e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
@@ -19,6 +19,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
@@ -31,6 +32,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
+@EqualsAndHashCode(callSuper = false)
 @ToString
 @Schema
 public class AlarmCountQuery extends EntityCountQuery {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
index 57e0e6af66..d6a4f2b12f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.queue;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseDataWithAdditionalInfo;
 import org.thingsboard.server.common.data.HasName;
 import org.thingsboard.server.common.data.HasTenantId;
@@ -30,6 +31,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 import java.util.Optional;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class Queue extends BaseDataWithAdditionalInfo<QueueId> implements HasName, HasTenantId, QueueConfig {
     private TenantId tenantId;
     @NoXss
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
index cb861a6726..0624350d7e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
@@ -16,12 +16,14 @@
 package org.thingsboard.server.common.data.rule;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeStateId;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class RuleNodeState extends BaseData<RuleNodeStateId> {
 
     private RuleNodeId ruleNodeId;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
index 9fe846796b..9acce93aa3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.widget;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.validation.NoXss;
 
@@ -26,6 +27,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class WidgetTypeInfo extends BaseWidgetType {
 
     @Serial
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
index 45d9e21e39..8356a17748 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
@@ -16,8 +16,10 @@
 package org.thingsboard.server.transport.mqtt.limits;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class GatewaySessionLimits extends SessionLimits {
 
     private SessionRateLimits gatewayRateLimits;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
index 971c06c7a0..f73b634f08 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
@@ -26,6 +26,7 @@ import jakarta.persistence.SqlResultSetMapping;
 import jakarta.persistence.SqlResultSetMappings;
 import jakarta.persistence.Table;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.dao.model.sql.AbstractTsKvEntity;
 import org.thingsboard.server.dao.sqlts.latest.SearchTsKvLatestRepository;
@@ -35,6 +36,7 @@ import java.util.UUID;
 import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Entity
 @Table(name = "ts_kv_latest")
 @IdClass(TsKvLatestCompositeKey.class)
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
index a69a157241..ab305919fd 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
@@ -16,10 +16,12 @@
 package org.thingsboard.rule.engine.action;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbClearAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbClearAlarmNodeConfiguration> {
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
index 8c791e7634..bf305a55d1 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
@@ -16,6 +16,7 @@
 package org.thingsboard.rule.engine.action;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
@@ -25,6 +26,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbCreateAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbCreateAlarmNodeConfiguration> {
 
     @NoXss
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
index 3b59d814f1..6551352823 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
@@ -16,6 +16,7 @@
 package org.thingsboard.rule.engine.geo;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.common.util.geo.PerimeterType;
 
 import java.util.concurrent.TimeUnit;
@@ -24,6 +25,7 @@ import java.util.concurrent.TimeUnit;
  * Created by ashvayka on 19.01.18.
  */
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilterNodeConfiguration {
 
     private int minInsideDuration;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
index fe17c659e1..93d1ef7ef8 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
@@ -20,6 +20,7 @@ import io.netty.handler.ssl.ClientAuth;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.thingsboard.common.util.AzureIotHubUtil;
@@ -29,6 +30,7 @@ import org.thingsboard.rule.engine.credentials.CredentialsType;
 import java.security.Security;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 @Slf4j
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AzureIotHubSasCredentials extends CertPemCredentials {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
index c786478575..f11173f3f9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
@@ -17,9 +17,11 @@ package org.thingsboard.rule.engine.mqtt.azure;
 
 import io.netty.handler.codec.mqtt.MqttVersion;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.mqtt.TbMqttNodeConfiguration;
 
 @Data
+@EqualsAndHashCode(callSuper = false)
 public class TbAzureIotHubNodeConfiguration extends TbMqttNodeConfiguration {
 
     @Override

From f22a68fe41affa5be763acbbfa8701e4c7592f9f Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 11:31:54 +0200
Subject: [PATCH 32/91] Modernized Redis access in LwM2M transport and OTA
 cache

---
 .../cache/ota/RedisOtaPackageDataCache.java   |  8 +--
 .../store/TbLwM2MDtlsSessionRedisStore.java   |  6 +-
 .../store/TbLwM2mRedisClientOtaInfoStore.java |  4 +-
 .../store/TbLwM2mRedisRegistrationStore.java  | 68 +++++++++----------
 .../store/TbLwM2mRedisSecurityStore.java      | 24 +++----
 .../server/store/TbRedisLwM2MClientStore.java | 10 +--
 .../store/TbRedisLwM2MModelConfigStore.java   |  8 +--
 .../store/TbRedisLwM2MClientStoreTest.java    | 21 +++---
 8 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/ota/RedisOtaPackageDataCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/ota/RedisOtaPackageDataCache.java
index c3a9ff0385..1e13b1cfe9 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/ota/RedisOtaPackageDataCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/ota/RedisOtaPackageDataCache.java
@@ -39,26 +39,26 @@ public class RedisOtaPackageDataCache implements OtaPackageDataCache {
     public byte[] get(String key, int chunkSize, int chunk) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
             if (chunkSize == 0) {
-                return connection.get(toOtaPackageCacheKey(key));
+                return connection.stringCommands().get(toOtaPackageCacheKey(key));
             }
 
             int startIndex = chunkSize * chunk;
             int endIndex = startIndex + chunkSize - 1;
-            return connection.getRange(toOtaPackageCacheKey(key), startIndex, endIndex);
+            return connection.stringCommands().getRange(toOtaPackageCacheKey(key), startIndex, endIndex);
         }
     }
 
     @Override
     public void put(String key, byte[] value) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
-            connection.set(toOtaPackageCacheKey(key), value);
+            connection.stringCommands().set(toOtaPackageCacheKey(key), value);
         }
     }
 
     @Override
     public void evict(String key) {
         try (RedisConnection connection = redisConnectionFactory.getConnection()) {
-            connection.del(toOtaPackageCacheKey(key));
+            connection.keyCommands().del(toOtaPackageCacheKey(key));
         }
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
index ead9269108..fa78bbb7bb 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2MDtlsSessionRedisStore.java
@@ -33,7 +33,7 @@ public class TbLwM2MDtlsSessionRedisStore implements TbLwM2MDtlsSessionStore {
         try (var c = connectionFactory.getConnection()) {
             var serializedMsg = JavaSerDesUtil.encode(msg);
             if (serializedMsg != null) {
-                c.set(getKey(endpoint), serializedMsg);
+                c.stringCommands().set(getKey(endpoint), serializedMsg);
             } else {
                 throw new RuntimeException("Problem with serialization of message: " + msg);
             }
@@ -43,7 +43,7 @@ public class TbLwM2MDtlsSessionRedisStore implements TbLwM2MDtlsSessionStore {
     @Override
     public TbX509DtlsSessionInfo get(String endpoint) {
         try (var c = connectionFactory.getConnection()) {
-            var data = c.get(getKey(endpoint));
+            var data = c.stringCommands().get(getKey(endpoint));
             if (data != null) {
                 return JavaSerDesUtil.decode(data);
             } else {
@@ -55,7 +55,7 @@ public class TbLwM2MDtlsSessionRedisStore implements TbLwM2MDtlsSessionStore {
     @Override
     public void remove(String endpoint) {
         try (var c = connectionFactory.getConnection()) {
-            c.del(getKey(endpoint));
+            c.keyCommands().del(getKey(endpoint));
         }
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisClientOtaInfoStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisClientOtaInfoStore.java
index 8301d4a448..c75a5ff8a0 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisClientOtaInfoStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisClientOtaInfoStore.java
@@ -33,7 +33,7 @@ public class TbLwM2mRedisClientOtaInfoStore implements TbLwM2MClientOtaInfoStore
 
     private void put(OtaPackageType type, LwM2MClientOtaInfo<?, ?, ?> info) {
         try (var connection = connectionFactory.getConnection()) {
-            connection.set((OTA_EP + type + info.getEndpoint()).getBytes(), JacksonUtil.toString(info).getBytes());
+            connection.stringCommands().set((OTA_EP + type + info.getEndpoint()).getBytes(), JacksonUtil.toString(info).getBytes());
         }
     }
 
@@ -59,7 +59,7 @@ public class TbLwM2mRedisClientOtaInfoStore implements TbLwM2MClientOtaInfoStore
 
     private <T extends LwM2MClientOtaInfo<?, ?, ?>> T getLwM2MClientOtaInfo(OtaPackageType type, String endpoint, Class<T> clazz) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] data = connection.get((OTA_EP + type + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((OTA_EP + type + endpoint).getBytes());
             return JacksonUtil.fromBytes(data, clazz);
         }
     }
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
index 8158e82a81..06f91729e4 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisRegistrationStore.java
@@ -163,15 +163,15 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                 lock.lock();
                 // add registration
                 byte[] k = toEndpointKey(registration.getEndpoint());
-                byte[] old = connection.getSet(k, serializeReg(registration));
+                byte[] old = connection.stringCommands().getSet(k, serializeReg(registration));
 
                 // add registration: secondary indexes
                 byte[] regid_idx = toRegIdKey(registration.getId());
-                connection.set(regid_idx, registration.getEndpoint().getBytes(UTF_8));
+                connection.stringCommands().set(regid_idx, registration.getEndpoint().getBytes(UTF_8));
                 byte[] addr_idx = toRegAddrKey(registration.getSocketAddress());
-                connection.set(addr_idx, registration.getEndpoint().getBytes(UTF_8));
+                connection.stringCommands().set(addr_idx, registration.getEndpoint().getBytes(UTF_8));
                 byte[] identity_idx = toRegIdentityKey(registration.getClientTransportData().getIdentity());
-                connection.set(identity_idx, registration.getEndpoint().getBytes(UTF_8));
+                connection.stringCommands().set(identity_idx, registration.getEndpoint().getBytes(UTF_8));
 
                 // Add or update expiration
                 addOrUpdateExpiration(connection, registration);
@@ -180,7 +180,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                     Registration oldRegistration = deserializeReg(old);
                     // remove old secondary index
                     if (!registration.getId().equals(oldRegistration.getId()))
-                        connection.del(toRegIdKey(oldRegistration.getId()));
+                        connection.keyCommands().del(toRegIdKey(oldRegistration.getId()));
                     if (!oldRegistration.getSocketAddress().equals(registration.getSocketAddress())) {
                         removeAddrIndex(connection, oldRegistration);
                     }
@@ -209,7 +209,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
         try (var connection = connectionFactory.getConnection()) {
 
             // Fetch the registration ep by registration ID index
-            byte[] ep = connection.get(toRegIdKey(update.getRegistrationId()));
+            byte[] ep = connection.stringCommands().get(toRegIdKey(update.getRegistrationId()));
             if (ep == null) {
                 return null;
             }
@@ -220,7 +220,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                 lock.lock();
 
                 // Fetch the registration
-                byte[] data = connection.get(toEndpointKey(ep));
+                byte[] data = connection.stringCommands().get(toEndpointKey(ep));
                 if (data == null) {
                     return null;
                 }
@@ -230,7 +230,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                 Registration updatedRegistration = update.update(r);
 
                 // Store the new registration
-                connection.set(toEndpointKey(updatedRegistration.getEndpoint()), serializeReg(updatedRegistration));
+                connection.stringCommands().set(toEndpointKey(updatedRegistration.getEndpoint()), serializeReg(updatedRegistration));
 
                 // Add or update expiration
                 addOrUpdateExpiration(connection, updatedRegistration);
@@ -239,7 +239,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                  * If registration is already associated to this address we don't care as we only want to keep the most
                  * recent binding. */
                 byte[] addr_idx = toRegAddrKey(updatedRegistration.getSocketAddress());
-                connection.set(addr_idx, updatedRegistration.getEndpoint().getBytes(UTF_8));
+                connection.stringCommands().set(addr_idx, updatedRegistration.getEndpoint().getBytes(UTF_8));
                 if (!r.getSocketAddress().equals(updatedRegistration.getSocketAddress())) {
                     removeAddrIndex(connection, r);
                 }
@@ -265,11 +265,11 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     }
 
     private Registration getRegistration(RedisConnection connection, String registrationId) {
-        byte[] ep = connection.get(toRegIdKey(registrationId));
+        byte[] ep = connection.stringCommands().get(toRegIdKey(registrationId));
         if (ep == null) {
             return null;
         }
-        byte[] data = connection.get(toEndpointKey(ep));
+        byte[] data = connection.stringCommands().get(toEndpointKey(ep));
         if (data == null) {
             return null;
         }
@@ -281,7 +281,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     public Registration getRegistrationByEndpoint(String endpoint) {
         Validate.notNull(endpoint);
         try (var connection = connectionFactory.getConnection()) {
-            byte[] data = connection.get(toEndpointKey(endpoint));
+            byte[] data = connection.stringCommands().get(toEndpointKey(endpoint));
             if (data == null) {
                 return null;
             }
@@ -293,11 +293,11 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     public Registration getRegistrationByAdress(InetSocketAddress address) {
         Validate.notNull(address);
         try (var connection = connectionFactory.getConnection()) {
-            byte[] ep = connection.get(toRegAddrKey(address));
+            byte[] ep = connection.stringCommands().get(toRegAddrKey(address));
             if (ep == null) {
                 return null;
             }
-            byte[] data = connection.get(toEndpointKey(ep));
+            byte[] data = connection.stringCommands().get(toEndpointKey(ep));
             if (data == null) {
                 return null;
             }
@@ -309,11 +309,11 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     public Registration getRegistrationByIdentity(LwM2mIdentity identity) {
         Validate.notNull(identity);
         try (var connection = connectionFactory.getConnection()) {
-            byte[] ep = connection.get(toRegIdentityKey(identity));
+            byte[] ep = connection.stringCommands().get(toRegIdentityKey(identity));
             if (ep == null) {
                 return null;
             }
-            byte[] data = connection.get(toEndpointKey(ep));
+            byte[] data = connection.stringCommands().get(toEndpointKey(ep));
             if (data == null) {
                 return null;
             }
@@ -332,12 +332,12 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                 clusterConnection.clusterGetNodes().forEach(node ->
                         scans.add(clusterConnection.scan(node, scanOptions)));
             } else {
-                scans.add(scanConnection.scan(scanOptions));
+                scans.add(scanConnection.keyCommands().scan(scanOptions));
             }
 
             scans.forEach(scan -> {
                 scan.forEachRemaining(key -> {
-                    byte[] element = getConnection.get(key);
+                    byte[] element = getConnection.stringCommands().get(key);
                     if (element != null) {
                         list.add(deserializeReg(element));
                     }
@@ -357,7 +357,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
 
     private Deregistration removeRegistration(RedisConnection connection, String registrationId, boolean removeOnlyIfNotAlive) {
         // fetch the client ep by registration ID index
-        byte[] ep = connection.get(toRegIdKey(registrationId));
+        byte[] ep = connection.stringCommands().get(toRegIdKey(registrationId));
         if (ep == null) {
             return null;
         }
@@ -369,16 +369,16 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
             lock.lock();
 
             // fetch the client
-            byte[] data = connection.get(toEndpointKey(ep));
+            byte[] data = connection.stringCommands().get(toEndpointKey(ep));
             if (data == null) {
                 return null;
             }
             Registration r = deserializeReg(data);
 
             if (!removeOnlyIfNotAlive || !r.isAlive(gracePeriod)) {
-                long nbRemoved = connection.del(toRegIdKey(r.getId()));
+                long nbRemoved = connection.keyCommands().del(toRegIdKey(r.getId()));
                 if (nbRemoved > 0) {
-                    connection.del(toEndpointKey(r.getEndpoint()));
+                    connection.keyCommands().del(toEndpointKey(r.getEndpoint()));
                     Collection<Observation> obsRemoved = unsafeRemoveAllObservations(connection, r.getId());
                     removeAddrIndex(connection, r);
                     removeIdentityIndex(connection, r);
@@ -407,12 +407,12 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
         // Watch the key to remove.
 //        connection.watch(indexKey);
 
-        byte[] epFromAddr = connection.get(indexKey);
+        byte[] epFromAddr = connection.stringCommands().get(indexKey);
         // Delete the key if needed.
         if (Arrays.equals(epFromAddr, endpointName.getBytes(UTF_8))) {
             // Try to delete the key
 //            connection.multi();
-            connection.del(indexKey);
+            connection.keyCommands().del(indexKey);
 //            connection.exec();
             // if transaction failed this is not an issue as the index is probably reused and we don't need to
             // delete it anymore.
@@ -423,11 +423,11 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     }
 
     private void addOrUpdateExpiration(RedisConnection connection, Registration registration) {
-        connection.zAdd(EXP_EP, registration.getExpirationTimeStamp(gracePeriod), registration.getEndpoint().getBytes(UTF_8));
+        connection.zSetCommands().zAdd(EXP_EP, registration.getExpirationTimeStamp(gracePeriod), registration.getEndpoint().getBytes(UTF_8));
     }
 
     private void removeExpiration(RedisConnection connection, Registration registration) {
-        connection.zRem(EXP_EP, registration.getEndpoint().getBytes(UTF_8));
+        connection.zSetCommands().zRem(EXP_EP, registration.getEndpoint().getBytes(UTF_8));
     }
 
     private byte[] toRegIdKey(String registrationId) {
@@ -556,7 +556,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
     @Override
     public Observation getObservation(ObservationIdentifier observationId) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] observationValue = connection.get(toKey(OBS_TKN, observationId.getBytes()));
+            byte[] observationValue = connection.stringCommands().get(toKey(OBS_TKN, observationId.getBytes()));
             return deserializeObs(observationValue);
         }
     }
@@ -570,7 +570,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
         try (var connection = connectionFactory.getConnection()) {
 
             // fetch the client ep by registration ID index
-            byte[] ep = connection.get(toRegIdKey(registrationId));
+            byte[] ep = connection.stringCommands().get(toRegIdKey(registrationId));
             if (ep == null) {
                 return null;
             }
@@ -635,7 +635,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
 
     public Observation get(Token token) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] obs = connection.get(toKey(OBS_TKN, token.getBytes()));
+            byte[] obs = connection.stringCommands().get(toKey(OBS_TKN, token.getBytes()));
             if (obs == null) {
                 return null;
             } else {
@@ -664,14 +664,14 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
         byte[] regIdKey = toKey(OBS_TKNS_REGID_IDX, registrationId);
 
         // fetch all observations by token
-        for (byte[] token : connection.lRange(regIdKey, 0, -1)) {
-            byte[] obs = connection.get(toKey(OBS_TKN, token));
+        for (byte[] token : connection.listCommands().lRange(regIdKey, 0, -1)) {
+            byte[] obs = connection.stringCommands().get(toKey(OBS_TKN, token));
             if (obs != null) {
                 removed.add(deserializeObs(obs));
             }
-            connection.del(toKey(OBS_TKN, token));
+            connection.keyCommands().del(toKey(OBS_TKN, token));
         }
-        connection.del(regIdKey);
+        connection.keyCommands().del(regIdKey);
 
         return removed;
     }
@@ -752,7 +752,7 @@ public class TbLwM2mRedisRegistrationStore implements RegistrationStore, Startab
                         System.currentTimeMillis(), 0, cleanLimit);
 
                 for (byte[] endpoint : endpointsExpired) {
-                    byte[] data = connection.get(toEndpointKey(endpoint));
+                    byte[] data = connection.stringCommands().get(toEndpointKey(endpoint));
                     if (data != null && data.length > 0) {
                         Registration r = deserializeReg(data);
                         if (!r.isAlive(gracePeriod)) {
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
index b07156d0ef..1e5d480c81 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbLwM2mRedisSecurityStore.java
@@ -52,7 +52,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(toLockKey(endpoint));
             lock.lock();
-            byte[] data = connection.get((SEC_EP + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((SEC_EP + endpoint).getBytes());
             if (data == null || data.length == 0) {
                 return null;
             } else {
@@ -96,11 +96,11 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(toLockKey(identity));
             lock.lock();
-            byte[] ep = connection.hGet(PSKID_SEC.getBytes(), identity.getBytes());
+            byte[] ep = connection.hashCommands().hGet(PSKID_SEC.getBytes(), identity.getBytes());
             if (ep == null) {
                 return null;
             } else {
-                byte[] data = connection.get((SEC_EP + new String(ep)).getBytes());
+                byte[] data = connection.stringCommands().get((SEC_EP + new String(ep)).getBytes());
                 if (data == null || data.length == 0) {
                     return null;
                 } else {
@@ -128,17 +128,17 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             lock = redisLock.obtain(tbSecurityInfo.getEndpoint());
             lock.lock();
             if (info != null && info.getPskIdentity() != null) {
-                byte[] oldEndpointBytes = connection.hGet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
+                byte[] oldEndpointBytes = connection.hashCommands().hGet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
                 if (oldEndpointBytes != null) {
                     String oldEndpoint = new String(oldEndpointBytes);
                     if (!oldEndpoint.equals(info.getEndpoint())) {
                         throw new NonUniqueSecurityInfoException("PSK Identity " + info.getPskIdentity() + " is already used");
                     }
-                    connection.hSet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes(), info.getEndpoint().getBytes());
+                    connection.hashCommands().hSet(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes(), info.getEndpoint().getBytes());
                 }
             }
 
-            byte[] previousData = connection.getSet((SEC_EP + tbSecurityInfo.getEndpoint()).getBytes(), tbSecurityInfoSerialized);
+            byte[] previousData = connection.stringCommands().getSet((SEC_EP + tbSecurityInfo.getEndpoint()).getBytes(), tbSecurityInfoSerialized);
 
                 // for tests: redis connect NoSec (securityInfo == null)
             log.info("lwm2m redis connect. Endpoint: [{}], secMode: [{}] key: [{}], tbSecurityInfoSerialized [{}]",
@@ -147,7 +147,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
             if (previousData != null && info != null) {
                 String previousIdentity = ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(previousData)).getSecurityInfo().getPskIdentity();
                 if (previousIdentity != null && !previousIdentity.equals(info.getPskIdentity())) {
-                    connection.hDel(PSKID_SEC.getBytes(), previousIdentity.getBytes());
+                    connection.hashCommands().hDel(PSKID_SEC.getBytes(), previousIdentity.getBytes());
                 }
             }
         } finally {
@@ -163,7 +163,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(endpoint);
             lock.lock();
-            byte[] data = connection.get((SEC_EP + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((SEC_EP + endpoint).getBytes());
             if (data != null && data.length > 0) {
                 return JavaSerDesUtil.decode(data);
             } else {
@@ -182,13 +182,13 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
         try (var connection = connectionFactory.getConnection()) {
             lock = redisLock.obtain(endpoint);
             lock.lock();
-            byte[] data = connection.get((SEC_EP + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((SEC_EP + endpoint).getBytes());
             if (data != null && data.length > 0) {
                 SecurityInfo info = ((TbLwM2MSecurityInfo) JavaSerDesUtil.decode(data)).getSecurityInfo();
                 if (info != null && info.getPskIdentity() != null) {
-                    connection.hDel(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
+                    connection.hashCommands().hDel(PSKID_SEC.getBytes(), info.getPskIdentity().getBytes());
                 }
-                connection.del((SEC_EP + endpoint).getBytes());
+                connection.keyCommands().del((SEC_EP + endpoint).getBytes());
             }
         } finally {
             if (lock != null) {
@@ -203,7 +203,7 @@ public class TbLwM2mRedisSecurityStore implements TbEditableSecurityStore {
 
     private SecurityMode getSecurityModeByRegistration (RedisConnection connection, String endpoint) {
         try {
-            byte[] data = connection.get((REG_EP + endpoint).getBytes());
+            byte[] data = connection.stringCommands().get((REG_EP + endpoint).getBytes());
             JsonNode registrationNode = JacksonUtil.fromString(new String(data != null ? data : new byte[0]), JsonNode.class);
             String typeModeStr = registrationNode.get("transportdata").get("identity").get("type").asText();
             return "unsecure".equals(typeModeStr) ? SecurityMode.NO_SEC : null;
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
index 4beefb4896..73d4bd95da 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStore.java
@@ -45,7 +45,7 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
     @Override
     public LwM2mClient get(String endpoint) {
         try (var connection = connectionFactory.getConnection()) {
-            byte[] data = connection.get(getKey(endpoint));
+            byte[] data = connection.stringCommands().get(getKey(endpoint));
             if (data == null) {
                 return null;
             } else {
@@ -70,12 +70,12 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
                 clusterConnection.clusterGetNodes().forEach(node ->
                         scans.add(clusterConnection.scan(node, scanOptions)));
             } else {
-                scans.add(scanConnection.scan(scanOptions));
+                scans.add(scanConnection.keyCommands().scan(scanOptions));
             }
 
             scans.forEach(scan -> {
                 scan.forEachRemaining(key -> {
-                    byte[] element = getConnection.get(key);
+                    byte[] element = getConnection.stringCommands().get(key);
                     if (element != null) {
                         try {
                             clients.add(deserialize(element));
@@ -97,7 +97,7 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
             try {
                 byte[] clientSerialized = serialize(client);
                 try (var connection = connectionFactory.getConnection()) {
-                    connection.getSet(getKey(client.getEndpoint()), clientSerialized);
+                    connection.stringCommands().getSet(getKey(client.getEndpoint()), clientSerialized);
                 }
             } catch (Exception e) {
                 log.warn("Failed to serialize client: {}", client, e);
@@ -108,7 +108,7 @@ public class TbRedisLwM2MClientStore implements TbLwM2MClientStore {
     @Override
     public void remove(String endpoint) {
         try (var connection = connectionFactory.getConnection()) {
-            connection.del(getKey(endpoint));
+            connection.keyCommands().del(getKey(endpoint));
         }
     }
 
diff --git a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MModelConfigStore.java b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MModelConfigStore.java
index 31a78234d0..65ed90d15d 100644
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MModelConfigStore.java
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MModelConfigStore.java
@@ -44,12 +44,12 @@ public class TbRedisLwM2MModelConfigStore implements TbLwM2MModelConfigStore {
                 clusterConnection.clusterGetNodes().forEach(node ->
                         scans.add(clusterConnection.scan(node, scanOptions)));
             } else {
-                scans.add(scanConnection.scan(scanOptions));
+                scans.add(scanConnection.keyCommands().scan(scanOptions));
             }
 
             scans.forEach(scan -> {
                 scan.forEachRemaining(key -> {
-                    byte[] element = getConnection.get(key);
+                    byte[] element = getConnection.stringCommands().get(key);
                     if (element != null) {
                         configs.add(JacksonUtil.fromBytes(element, LwM2MModelConfig.class));
                     }
@@ -63,14 +63,14 @@ public class TbRedisLwM2MModelConfigStore implements TbLwM2MModelConfigStore {
     public void put(LwM2MModelConfig modelConfig) {
         byte[] clientSerialized = JacksonUtil.writeValueAsBytes(modelConfig);
         try (var connection = connectionFactory.getConnection()) {
-            connection.getSet(getKey(modelConfig.getEndpoint()), clientSerialized);
+            connection.stringCommands().getSet(getKey(modelConfig.getEndpoint()), clientSerialized);
         }
     }
 
     @Override
     public void remove(String endpoint) {
         try (var connection = connectionFactory.getConnection()) {
-            connection.del(getKey(endpoint));
+            connection.keyCommands().del(getKey(endpoint));
         }
     }
 
diff --git a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStoreTest.java b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStoreTest.java
index 9fe29c1188..fe8d66365f 100644
--- a/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStoreTest.java
+++ b/common/transport/lwm2m/src/test/java/org/thingsboard/server/transport/lwm2m/server/store/TbRedisLwM2MClientStoreTest.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.transport.lwm2m.server.store;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.redis.connection.RedisConnection;
@@ -51,10 +52,10 @@ class TbRedisLwM2MClientStoreTest {
     @Mock
     RedisConnectionFactory connectionFactory;
 
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     RedisConnection scanConnection;
 
-    @Mock
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     RedisConnection getConnection;
 
     TbRedisLwM2MClientStore store;
@@ -77,8 +78,8 @@ class TbRedisLwM2MClientStoreTest {
 
         // Cursor created before thenReturn to avoid Mockito unfinished-stubbing error
         Cursor<byte[]> cursor = cursorOf(key);
-        when(scanConnection.scan(any(ScanOptions.class))).thenReturn(cursor);
-        when(getConnection.get(key)).thenReturn(value);
+        when(scanConnection.keyCommands().scan(any(ScanOptions.class))).thenReturn(cursor);
+        when(getConnection.stringCommands().get(key)).thenReturn(value);
 
         Set<LwM2mClient> result = store.getAll();
 
@@ -89,29 +90,29 @@ class TbRedisLwM2MClientStoreTest {
     @Test
     void getAll_getIsNeverCalledOnScanConnection() {
         Cursor<byte[]> cursor = cursorOf();
-        when(scanConnection.scan(any(ScanOptions.class))).thenReturn(cursor);
+        when(scanConnection.keyCommands().scan(any(ScanOptions.class))).thenReturn(cursor);
 
         store.getAll();
 
-        verify(scanConnection, never()).get(any(byte[].class));
+        verify(scanConnection.stringCommands(), never()).get(any(byte[].class));
     }
 
     @Test
     void getAll_scanIsNeverCalledOnGetConnection() {
         Cursor<byte[]> cursor = cursorOf();
-        when(scanConnection.scan(any(ScanOptions.class))).thenReturn(cursor);
+        when(scanConnection.keyCommands().scan(any(ScanOptions.class))).thenReturn(cursor);
 
         store.getAll();
 
-        verify(getConnection, never()).scan(any(ScanOptions.class));
+        verify(getConnection.keyCommands(), never()).scan(any(ScanOptions.class));
     }
 
     @Test
     void getAll_skipsKeyWhenValueIsNull() {
         byte[] key = "CLIENT#EP#gone".getBytes();
         Cursor<byte[]> cursor = cursorOf(key);
-        when(scanConnection.scan(any(ScanOptions.class))).thenReturn(cursor);
-        // getConnection.get(key) returns null by default — no stubbing needed
+        when(scanConnection.keyCommands().scan(any(ScanOptions.class))).thenReturn(cursor);
+        // getConnection.stringCommands().get(key) returns null by default — no stubbing needed
 
         Set<LwM2mClient> result = store.getAll();
 

From fae07e914043cbd96d3a36bbbb1a650f87607917 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 15:00:26 +0200
Subject: [PATCH 33/91] Replaced deprecated string, number, and random-value
 helpers with modern equivalents

---
 .../DefaultSystemDataLoaderService.java       |  2 +-
 .../mfa/provider/impl/TotpTwoFaProvider.java  |  2 +-
 .../service/ws/WebSocketSessionType.java      |  4 ++--
 .../server/controller/AbstractWebTest.java    |  2 +-
 .../controller/AdminControllerTest.java       |  2 +-
 .../AlarmCommentControllerTest.java           |  6 ++---
 .../server/controller/AuthControllerTest.java |  8 +++----
 .../controller/BaseQueueControllerTest.java   |  2 +-
 .../controller/EntityQueryControllerTest.java |  4 ++--
 .../server/controller/UserControllerTest.java |  4 ++--
 .../server/controller/WebsocketApiTest.java   |  4 ++--
 .../discovery/HashPartitionServiceTest.java   |  2 +-
 .../service/entitiy/EntityServiceTest.java    |  6 ++---
 .../housekeeper/HousekeeperServiceTest.java   |  4 ++--
 .../AbstractNotificationApiTest.java          |  2 +-
 .../notification/NotificationApiWsClient.java |  2 +-
 .../NotificationTargetApiTest.java            |  2 +-
 .../TbRuleEngineQueueConsumerManagerTest.java | 14 +++++------
 .../service/sms/DefaultSmsServiceTest.java    | 10 ++++----
 ...DefaultTbLocalSubscriptionServiceTest.java |  6 ++---
 .../subscription/TbEntityDataSubCtxTest.java  | 10 ++++----
 .../server/common/data/EntityType.java        |  2 ++
 .../common/data/util/TemplateUtils.java       |  2 +-
 .../server/common/data/util/TypeCastUtil.java |  2 +-
 .../server/service/sync/vc/GitRepository.java |  5 ++--
 .../server/dao/resource/BaseImageService.java |  2 +-
 .../dao/resource/BaseResourceService.java     |  8 ++++---
 .../dao/service/AdminSettingsServiceTest.java |  6 ++---
 .../dao/service/AlarmCommentServiceTest.java  |  8 +++----
 .../server/dao/service/AssetServiceTest.java  |  4 ++--
 .../dao/sql/alarm/JpaAlarmCommentDaoTest.java |  4 ++--
 .../dao/sql/user/JpaUserSettingsDaoTest.java  |  4 ++--
 .../dao/sqlts/SqlTimeseriesLatestDaoTest.java |  2 +-
 .../monitoring/client/WsClient.java           |  2 +-
 .../service/MonitoringEntityService.java      |  2 +-
 .../connectivity/MqttGatewayClientTest.java   |  4 ++--
 .../lwm2m/AbstractLwm2mClientTest.java        |  6 ++---
 .../lwm2m/rpc/Lwm2mObserveCompositeTest.java  |  6 ++---
 .../lwm2m/rpc/Lwm2mObserveTest.java           |  6 ++---
 .../lwm2m/security/Lwm2mClientNoSecTest.java  |  4 ++--
 .../lwm2m/security/Lwm2mClientPskTest.java    |  4 ++--
 .../msa/edqs/EdqsEntityDataQueryTest.java     |  6 ++---
 .../msa/prototypes/DevicePrototypes.java      |  6 ++---
 .../msa/ui/pages/CreateWidgetPopupHelper.java |  4 ++--
 .../server/msa/ui/utils/EntityPrototypes.java | 24 +++++++++----------
 .../client/tools/migrator/PgCaMigrator.java   |  2 +-
 46 files changed, 114 insertions(+), 109 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
index 965d7105a9..e88b390ca7 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
@@ -335,7 +335,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
 
     private String generateRandomKey() {
         return Base64.getEncoder().encodeToString(
-                RandomStringUtils.randomAlphanumeric(64).getBytes(StandardCharsets.UTF_8));
+                RandomStringUtils.secure().nextAlphanumeric(64).getBytes(StandardCharsets.UTF_8));
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/TotpTwoFaProvider.java b/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/TotpTwoFaProvider.java
index 23eda67a77..a7fbdb84e4 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/TotpTwoFaProvider.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/mfa/provider/impl/TotpTwoFaProvider.java
@@ -62,7 +62,7 @@ public class TotpTwoFaProvider implements TwoFaProvider<TotpTwoFaProviderConfig,
     }
 
     private String generateSecretKey() {
-        return Base32.encode(RandomUtils.nextBytes(20));
+        return Base32.encode(RandomUtils.secure().randomBytes(20));
     }
 
 
diff --git a/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionType.java b/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionType.java
index 59faf14a7e..5330daadaf 100644
--- a/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionType.java
+++ b/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionType.java
@@ -17,9 +17,9 @@ package org.thingsboard.server.service.ws;
 
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Optional;
 
 @NoArgsConstructor
@@ -33,7 +33,7 @@ public enum WebSocketSessionType {
 
     public static Optional<WebSocketSessionType> forName(String name) {
         return Arrays.stream(values())
-                .filter(sessionType -> StringUtils.equals(sessionType.name, name))
+                .filter(sessionType -> Objects.equals(sessionType.name, name))
                 .findFirst();
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index 055e1e19a0..7803b0c746 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -1358,7 +1358,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
 
     protected NotificationTarget createNotificationTarget(UsersFilter usersFilter) {
         NotificationTarget notificationTarget = new NotificationTarget();
-        notificationTarget.setName(usersFilter.toString() + RandomStringUtils.randomNumeric(5));
+        notificationTarget.setName(usersFilter.toString() + RandomStringUtils.secure().nextNumeric(5));
         PlatformUsersNotificationTargetConfig targetConfig = new PlatformUsersNotificationTargetConfig();
         targetConfig.setUsersFilter(usersFilter);
         notificationTarget.setConfiguration(targetConfig);
diff --git a/application/src/test/java/org/thingsboard/server/controller/AdminControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AdminControllerTest.java
index 21a8b3b2e9..ee09b9a98c 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AdminControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AdminControllerTest.java
@@ -168,7 +168,7 @@ public class AdminControllerTest extends AbstractControllerTest {
         assertThat(jwtSettings).isEqualTo(defaultJwtSettings);
 
         jwtSettings.setTokenSigningKey(Base64.getEncoder().encodeToString(
-                RandomStringUtils.randomAlphanumeric(512 / Byte.SIZE).getBytes(StandardCharsets.UTF_8)));
+                RandomStringUtils.secure().nextAlphanumeric(512 / Byte.SIZE).getBytes(StandardCharsets.UTF_8)));
 
         doPost("/api/admin/jwtSettings", jwtSettings).andExpect(status().isOk());
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
index 3bb5fd5647..89eb140c8b 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
@@ -28,7 +28,7 @@ import org.mockito.Mockito;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.ContextConfiguration;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.alarm.Alarm;
@@ -292,7 +292,7 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         final int size = 10;
         for (int i = 0; i < size; i++) {
             createdAlarmComments.add(
-                    createAlarmComment(alarm.getId(), RandomStringUtils.randomAlphanumeric(10))
+                    createAlarmComment(alarm.getId(), RandomStringUtils.secure().nextAlphanumeric(10))
             );
         }
 
@@ -323,7 +323,7 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         List<AlarmComment> createdAlarmComments = new LinkedList<>();
         for (int i = 0; i < size; i++) {
             createdAlarmComments.add(
-                    createAlarmComment(alarm.getId(), RandomStringUtils.randomAlphanumeric(10))
+                    createAlarmComment(alarm.getId(), RandomStringUtils.secure().nextAlphanumeric(10))
             );
         }
 
diff --git a/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
index 419f442f87..a35e1f9af0 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AuthControllerTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.http.HttpHeaders;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.User;
@@ -149,7 +149,7 @@ public class AuthControllerTest extends AbstractControllerTest {
         loginTenantAdmin();
         ChangePasswordRequest changePasswordRequest = new ChangePasswordRequest();
         changePasswordRequest.setCurrentPassword("tenant");
-        changePasswordRequest.setNewPassword(RandomStringUtils.randomAlphanumeric(73));
+        changePasswordRequest.setNewPassword(RandomStringUtils.secure().nextAlphanumeric(73));
         doPost("/api/auth/changePassword", changePasswordRequest)
                 .andExpect(status().isBadRequest())
                 .andExpect(jsonPath("$.message", is("Password must be no more than 72 characters in length.")));
@@ -161,7 +161,7 @@ public class AuthControllerTest extends AbstractControllerTest {
 
         ChangePasswordRequest changePasswordRequest = new ChangePasswordRequest();
         changePasswordRequest.setCurrentPassword("tenant");
-        String newPassword = RandomStringUtils.randomAlphanumeric(16);
+        String newPassword = RandomStringUtils.secure().nextAlphanumeric(16);
         changePasswordRequest.setNewPassword(newPassword);
         doPost("/api/auth/changePassword", changePasswordRequest)
                 .andExpect(status().isOk());
@@ -194,7 +194,7 @@ public class AuthControllerTest extends AbstractControllerTest {
                 .andExpect(status().isSeeOther())
                 .andExpect(header().string(HttpHeaders.LOCATION, "/login/resetPassword?resetToken=" + this.currentResetPasswordToken));
 
-        String newPassword = RandomStringUtils.randomAlphanumeric(73);
+        String newPassword = RandomStringUtils.secure().nextAlphanumeric(73);
         JsonNode resetPasswordRequest = JacksonUtil.newObjectNode()
                 .put("resetToken", this.currentResetPasswordToken)
                 .put("password", newPassword);
diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
index 0d79882a94..b7507f5dec 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/BaseQueueControllerTest.java
@@ -236,7 +236,7 @@ public class BaseQueueControllerTest extends AbstractControllerTest {
         when(testProcessingResult.getFailedMap()).thenReturn(new ConcurrentHashMap<>());
         when(testProcessingResult.getPendingMap()).thenReturn(new ConcurrentHashMap<>());
 
-        String largeExceptionMessage = RandomStringUtils.randomAlphabetic(150);
+        String largeExceptionMessage = RandomStringUtils.secure().nextAlphabetic(150);
         RuleEngineException ruleEngineException = new RuleEngineException(largeExceptionMessage);
         when(testProcessingResult.getExceptionsMap()).thenReturn(new ConcurrentHashMap<>(Map.of(
                 tenantId, ruleEngineException
diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
index 835f00985b..f99fe4be6f 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.ResultActions;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
@@ -201,7 +201,7 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
         loginTenantAdmin();
 
         List<Device> devices = new ArrayList<>();
-        String devicePrefix = "Device" + RandomStringUtils.randomAlphabetic(5);
+        String devicePrefix = "Device" + RandomStringUtils.secure().nextAlphabetic(5);
         for (int i = 0; i < 97; i++) {
             Device device = new Device();
             device.setName(devicePrefix + i);
diff --git a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
index 957b3721e0..751631aec2 100644
--- a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
@@ -1296,9 +1296,9 @@ public class UserControllerTest extends AbstractControllerTest {
         Assert.assertEquals(savedDashboard2.getTitle(), starred.getTitle());
 
         //TEST renaming in the cache.
-        savedDashboard1.setTitle(RandomStringUtils.randomAlphanumeric(10));
+        savedDashboard1.setTitle(RandomStringUtils.secure().nextAlphanumeric(10));
         savedDashboard1 = doPost("/api/dashboard", savedDashboard1, Dashboard.class);
-        savedDashboard2.setTitle(RandomStringUtils.randomAlphanumeric(10));
+        savedDashboard2.setTitle(RandomStringUtils.secure().nextAlphanumeric(10));
         savedDashboard2 = doPost("/api/dashboard", savedDashboard2, Dashboard.class);
 
         newSettings = doGet("/api/user/dashboards/" + savedDashboard1.getId().getId() + "/unstar", UserDashboardsInfo.class);
diff --git a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
index e3b6a6efd8..ea34f428f3 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WebsocketApiTest.java
@@ -30,7 +30,7 @@ import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.AttributesSaveRequest;
 import org.thingsboard.rule.engine.api.TimeseriesSaveRequest;
@@ -556,7 +556,7 @@ public class WebsocketApiTest extends AbstractControllerTest {
         for (int i = 0; i < 6; i++) {
             Alarm alarm = new Alarm();
             alarm.setOriginator(device.getId());
-            alarm.setType(RandomStringUtils.randomAlphabetic(10));
+            alarm.setType(RandomStringUtils.secure().nextAlphabetic(10));
             alarm.setSeverity(AlarmSeverity.CRITICAL);
             alarm = doPost("/api/alarm", alarm, Alarm.class);
             alarms.add(alarm);
diff --git a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
index c361172b66..b1d59c031a 100644
--- a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
@@ -380,7 +380,7 @@ public class HashPartitionServiceTest {
         }
 
         Stream.concat(Stream.of(TenantId.SYS_TENANT_ID), Stream.generate(UUID::randomUUID).map(TenantId::new).limit(10)).forEach(tenantId -> {
-            List<QueueKey> queues = Stream.generate(() -> RandomStringUtils.randomAlphabetic(10))
+            List<QueueKey> queues = Stream.generate(() -> RandomStringUtils.secure().nextAlphabetic(10))
                     .map(queueName -> new QueueKey(ServiceType.TB_RULE_ENGINE, queueName, tenantId))
                     .limit(100).toList();
 
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
index b3230b3d45..251f42bb3f 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
@@ -1004,7 +1004,7 @@ public class EntityServiceTest extends AbstractControllerTest {
     public void testFindEntityDataByQuery_filter_entity_name_ends_with() {
         List<Device> devices = new ArrayList<>();
 
-        String suffixes = RandomStringUtils.randomAlphanumeric(5);
+        String suffixes = RandomStringUtils.secure().nextAlphanumeric(5);
         for (int i = 0; i < 10; i++) {
             Device device = new Device();
             device.setTenantId(tenantId);
@@ -1425,7 +1425,7 @@ public class EntityServiceTest extends AbstractControllerTest {
         Device device = new Device();
         device.setTenantId(tenantId);
         device.setCustomerId(customerId);
-        device.setName("Device test " + RandomStringUtils.randomAlphabetic(5));
+        device.setName("Device test " + RandomStringUtils.secure().nextAlphabetic(5));
         device.setType("default");
         return device;
     }
@@ -1485,7 +1485,7 @@ public class EntityServiceTest extends AbstractControllerTest {
                     device.setTenantId(tenantId);
                     device.setName("Device " + i);
                     device.setType("default");
-                    device.setLabel("label-" + RandomUtils.nextInt(100, 10000));
+                    device.setLabel("label-" + RandomUtils.secure().randomInt(100, 10000));
                     return device;
                 })
                 .limit(count)
diff --git a/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java b/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java
index 0c12767b60..762f3946d4 100644
--- a/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/housekeeper/HousekeeperServiceTest.java
@@ -25,7 +25,7 @@ import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNode;
 import org.thingsboard.rule.engine.metadata.TbGetAttributesNodeConfiguration;
@@ -570,7 +570,7 @@ public class HousekeeperServiceTest extends AbstractControllerTest {
                 .tenantId(tenantId)
                 .originator(entityId)
                 .severity(AlarmSeverity.CRITICAL)
-                .type("test alarm for " + entityId + " " + RandomStringUtils.randomAlphabetic(10))
+                .type("test alarm for " + entityId + " " + RandomStringUtils.secure().nextAlphabetic(10))
                 .build(), Alarm.class);
         assertThat(alarmService.findAlarmIdsByOriginatorId(tenantId, entityId, 0, null, 10)).isNotEmpty();
     }
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
index cf99669777..c7d5f0ea82 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/AbstractNotificationApiTest.java
@@ -155,7 +155,7 @@ public abstract class AbstractNotificationApiTest extends AbstractControllerTest
         User user = new User();
         user.setTenantId(tenantId);
         user.setAuthority(authority);
-        user.setEmail(RandomStringUtils.randomAlphabetic(20) + "@thingsboard.com");
+        user.setEmail(RandomStringUtils.secure().nextAlphabetic(20) + "@thingsboard.com");
         user = createUserAndLogin(user, "12345678");
         NotificationApiWsClient wsClient = buildAndConnectWebSocketClient();
         return Pair.of(user, wsClient);
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
index b538972dd7..f6d94f5170 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationApiWsClient.java
@@ -131,7 +131,7 @@ public class NotificationApiWsClient extends TbTestWebSocketClient {
     }
 
     private int newCmdId() {
-        return RandomUtils.nextInt(1, 1000);
+        return RandomUtils.secure().randomInt(1, 1000);
     }
 
 }
diff --git a/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java b/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
index 2d865542a1..b68d30a4c6 100644
--- a/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/notification/NotificationTargetApiTest.java
@@ -187,7 +187,7 @@ public class NotificationTargetApiTest extends AbstractNotificationApiTest {
         NotificationTarget sysAdmins = createNotificationTarget(new SystemAdministratorsFilter());
 
         NotificationTarget slack = new NotificationTarget();
-        slack.setName(RandomStringUtils.randomNumeric(5));
+        slack.setName(RandomStringUtils.secure().nextNumeric(5));
         SlackNotificationTargetConfig slackConfig = new SlackNotificationTargetConfig();
         SlackConversation slackConversation = new SlackConversation();
         slackConversation.setType(SlackConversationType.DIRECT);
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java b/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
index 228b987cf0..90816b6675 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineQueueConsumerManagerTest.java
@@ -27,7 +27,7 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
@@ -542,18 +542,18 @@ public class TbRuleEngineQueueConsumerManagerTest {
             Queue oldConfig = consumerManager.getConfig();
             Queue newConfig = JacksonUtil.clone(oldConfig);
             newConfig.setConsumerPerPartition(RandomUtils.nextBoolean());
-            newConfig.setPollInterval(RandomUtils.nextInt(100, 501));
-            newConfig.setPartitions(RandomUtils.nextInt(1, 10));
+            newConfig.setPollInterval(RandomUtils.secure().randomInt(100, 501));
+            newConfig.setPartitions(RandomUtils.secure().randomInt(1, 10));
             newConfig.setPackProcessingTimeout(RandomUtils.nextLong(100, 5001));
-            newConfig.getSubmitStrategy().setType(SubmitStrategyType.values()[RandomUtils.nextInt(0, SubmitStrategyType.values().length)]);
-            newConfig.getProcessingStrategy().setType(ProcessingStrategyType.values()[RandomUtils.nextInt(0, ProcessingStrategyType.values().length)]);
+            newConfig.getSubmitStrategy().setType(SubmitStrategyType.values()[RandomUtils.secure().randomInt(0, SubmitStrategyType.values().length)]);
+            newConfig.getProcessingStrategy().setType(ProcessingStrategyType.values()[RandomUtils.secure().randomInt(0, ProcessingStrategyType.values().length)]);
             log.info("Generated new config: consumerPerPartition={}, pollInterval={}, processingStrategy={}",
                     newConfig.isConsumerPerPartition(), newConfig.getPollInterval(), newConfig.getProcessingStrategy().getType());
             return newConfig;
         };
         Supplier<Set<TopicPartitionInfo>> partitionsUpdater = () -> {
-            int partitionsCount = RandomUtils.nextInt(0, 20);
-            int[] partitions = IntStream.generate(() -> RandomUtils.nextInt(0, 20))
+            int partitionsCount = RandomUtils.secure().randomInt(0, 20);
+            int[] partitions = IntStream.generate(() -> RandomUtils.secure().randomInt(0, 20))
                     .distinct().limit(partitionsCount)
                     .sorted().toArray();
             log.info("Generated new partitions: {}", Arrays.toString(partitions));
diff --git a/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java b/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
index 8d27b07550..75a3423b98 100644
--- a/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sms/DefaultSmsServiceTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.TestPropertySource;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.TenantProfile;
@@ -84,13 +84,13 @@ public class DefaultSmsServiceTest extends AbstractControllerTest {
 
         for (int i = 0; i < 10; i++) {
             doReturn(1).when(defaultSmsService).sendSms(any(), any());
-            defaultSmsService.sendSms(tenantId, null, new String[]{RandomStringUtils.randomNumeric(10)}, "Message");
+            defaultSmsService.sendSms(tenantId, null, new String[]{RandomStringUtils.secure().nextNumeric(10)}, "Message");
         }
 
         //wait 1 sec so that api usage state is updated
         TimeUnit.SECONDS.sleep(1);
         assertThrows(RuntimeException.class, () -> {
-            defaultSmsService.sendSms(tenantId, null, new String[]{RandomStringUtils.randomNumeric(10)}, "Message");
+            defaultSmsService.sendSms(tenantId, null, new String[]{RandomStringUtils.secure().nextNumeric(10)}, "Message");
         }, "SMS sending is disabled due to API limits!");
     }
 
@@ -103,7 +103,7 @@ public class DefaultSmsServiceTest extends AbstractControllerTest {
 
         TimeUnit.SECONDS.sleep(1);
         assertThrows(RuntimeException.class, () -> {
-            defaultSmsService.sendSms(tenantId, null, new String[]{RandomStringUtils.randomNumeric(10)}, "Message");
+            defaultSmsService.sendSms(tenantId, null, new String[]{RandomStringUtils.secure().nextNumeric(10)}, "Message");
         }, "SMS sending is disabled due to API limits!");
 
         //enable sms messaging
@@ -113,7 +113,7 @@ public class DefaultSmsServiceTest extends AbstractControllerTest {
 
         for (int i = 0; i < 10; i++) {
             doReturn(1).when(defaultSmsService).sendSms(any(), any());
-            defaultSmsService.sendSms(tenantId, null, new String[]{RandomStringUtils.randomNumeric(10)}, "Message");
+            defaultSmsService.sendSms(tenantId, null, new String[]{RandomStringUtils.secure().nextNumeric(10)}, "Message");
         }
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionServiceTest.java b/application/src/test/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionServiceTest.java
index 2eb7934792..aa17bf020a 100644
--- a/application/src/test/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionServiceTest.java
@@ -126,13 +126,13 @@ public class DefaultTbLocalSubscriptionServiceTest {
     private TbSubscription<?> createSubscription(TenantId tenantId, EntityId entityId) {
         Map<String, Long> keys = new HashMap<>();
         for (int i = 0; i < 50; i++) {
-            keys.put(RandomStringUtils.randomAlphanumeric(5), 1L);
+            keys.put(RandomStringUtils.secure().nextAlphanumeric(5), 1L);
         }
         return TbAttributeSubscription.builder()
                 .tenantId(tenantId)
                 .entityId(entityId)
                 .subscriptionId(1)
-                .sessionId(RandomStringUtils.randomAlphanumeric(5))
+                .sessionId(RandomStringUtils.secure().nextAlphanumeric(5))
                 .keyStates(keys)
                 .build();
     }
@@ -152,7 +152,7 @@ public class DefaultTbLocalSubscriptionServiceTest {
                 .tenantId(tenantId)
                 .entityId(deviceId)
                 .subscriptionId(2)
-                .sessionId(RandomStringUtils.randomAlphanumeric(5))
+                .sessionId(RandomStringUtils.secure().nextAlphanumeric(5))
                 .keyStates(keyStates)
                 .allKeys(true)
                 .latestValues(true)
diff --git a/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtxTest.java b/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtxTest.java
index 1d0e691c74..2c0594bd74 100644
--- a/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtxTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityDataSubCtxTest.java
@@ -23,7 +23,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.test.util.ReflectionTestUtils;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.RandomUtils;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
@@ -55,10 +55,10 @@ public class TbEntityDataSubCtxTest {
 
     private final DeviceId deviceId = new DeviceId(UUID.randomUUID());
 
-    private final Integer cmdId = RandomUtils.nextInt();
-    private final Integer subscriptionId = RandomUtils.nextInt();
-    private final String serviceId = RandomStringUtils.randomAlphanumeric(10);
-    private final String sessionId = RandomStringUtils.randomAlphanumeric(10);
+    private final Integer cmdId = RandomUtils.secure().randomInt();
+    private final Integer subscriptionId = RandomUtils.secure().randomInt();
+    private final String serviceId = RandomStringUtils.secure().nextAlphanumeric(10);
+    private final String sessionId = RandomStringUtils.secure().nextAlphanumeric(10);
 
     private final int maxEntitiesPerDataSubscription = 100;
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
index deb0f8c66e..3ad1e3f25b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
@@ -23,6 +23,8 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
+import static org.thingsboard.server.common.data.StringUtils.removeStart;
+
 public enum EntityType {
 
     TENANT(1),
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java
index beaec13748..d740a065ce 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/TemplateUtils.java
@@ -23,7 +23,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static com.google.common.base.Strings.nullToEmpty;
-import static org.apache.commons.lang3.StringUtils.removeStart;
+import static org.thingsboard.server.common.data.StringUtils.removeStart;
 
 public class TemplateUtils {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/util/TypeCastUtil.java b/common/data/src/main/java/org/thingsboard/server/common/data/util/TypeCastUtil.java
index 9fec33b482..3c9f143d39 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/util/TypeCastUtil.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/util/TypeCastUtil.java
@@ -69,7 +69,7 @@ public class TypeCastUtil {
     }
 
     private static boolean isNumber(String value) {
-        return NumberUtils.isNumber(value.replace(',', '.'));
+        return NumberUtils.isCreatable(value.replace(',', '.'));
     }
 
     private static boolean isSimpleDouble(String valueAsString) {
diff --git a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
index 3602dd55ca..15dd615111 100644
--- a/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
+++ b/common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
@@ -99,6 +99,7 @@ import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_NODELET
 import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_NONFASTFORWARD;
 import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_OTHER_REASON;
 import static org.eclipse.jgit.transport.RemoteRefUpdate.Status.REJECTED_REMOTE_CHANGED;
+import static org.thingsboard.server.common.data.StringUtils.removeStart;
 
 @Slf4j
 public class GitRepository {
@@ -448,7 +449,7 @@ public class GitRepository {
 
     private BranchInfo toBranchInfo(Ref ref) {
         String name = org.eclipse.jgit.lib.Repository.shortenRefName(ref.getName());
-        String branchName = StringUtils.removeStart(name, "origin/");
+        String branchName = removeStart(name, "origin/");
         boolean isDefault = this.headId != null && this.headId.equals(ref.getObjectId());
         return new BranchInfo(branchName, isDefault);
     }
@@ -465,7 +466,7 @@ public class GitRepository {
 
     private ObjectId resolve(String rev) throws IOException {
         if (settings.isLocalOnly()) {
-            rev = StringUtils.removeStart(rev, "origin/");
+            rev = removeStart(rev, "origin/");
         }
         ObjectId result = git.getRepository().resolve(rev);
         if (result == null) {
diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
index 11bbe797cf..18023f653c 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseImageService.java
@@ -173,7 +173,7 @@ public class BaseImageService extends BaseResourceService implements ImageServic
     }
 
     private String generatePublicResourceKey() {
-        return RandomStringUtils.randomAlphanumeric(32);
+        return RandomStringUtils.secure().nextAlphanumeric(32);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
index 432329a621..d96a7516c2 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/resource/BaseResourceService.java
@@ -74,6 +74,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -82,6 +83,7 @@ import java.util.function.UnaryOperator;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 import static org.thingsboard.server.common.data.StringUtils.isNotEmpty;
+import static org.thingsboard.server.common.data.StringUtils.removeStart;
 import static org.thingsboard.server.dao.device.DeviceServiceImpl.INCORRECT_TENANT_ID;
 import static org.thingsboard.server.dao.service.Validator.validateId;
 
@@ -589,7 +591,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
             String resourceKey;
             TenantId resourceTenantId;
             try {
-                String[] parts = StringUtils.removeStart(link, "/api/resource/").split("/");
+                String[] parts = removeStart(link, "/api/resource/").split("/");
                 resourceType = ResourceType.valueOf(parts[0].toUpperCase());
                 String scope = parts[1];
                 resourceKey = parts[2];
@@ -612,7 +614,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
 
     private String getResourceLink(String value) {
         if (StringUtils.startsWith(value, DataConstants.TB_RESOURCE_PREFIX + "/api/resource/")) {
-            return StringUtils.removeStart(value, DataConstants.TB_RESOURCE_PREFIX);
+            return removeStart(value, DataConstants.TB_RESOURCE_PREFIX);
         } else {
             return null;
         }
@@ -659,7 +661,7 @@ public class BaseResourceService extends AbstractCachedEntityService<ResourceInf
                 }
 
                 String newValue = processor.apply(value);
-                if (StringUtils.equals(value, newValue)) {
+                if (Objects.equals(value, newValue)) {
                     return value;
                 } else {
                     updated.set(true);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java
index 50d0b852f1..d35f7d9439 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java
@@ -21,7 +21,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -90,7 +90,7 @@ public class AdminSettingsServiceTest extends AbstractServiceTest {
 
     @Test
     public void whenSavingAdminSettingsWithAlreadyExistingKey_thenReturnError() {
-        String key = RandomStringUtils.randomAlphanumeric(15);
+        String key = RandomStringUtils.secure().nextAlphanumeric(15);
         ObjectNode value = JacksonUtil.newObjectNode().put("test", "test");
 
         AdminSettings systemSettings = new AdminSettings();
@@ -124,7 +124,7 @@ public class AdminSettingsServiceTest extends AbstractServiceTest {
         for (int i = 0; i < totalElements; i++) {
             AdminSettings settings = new AdminSettings();
             settings.setTenantId(tenantId);
-            String key = RandomStringUtils.randomAlphanumeric(15);
+            String key = RandomStringUtils.secure().nextAlphanumeric(15);
             settings.setKey(key);
             settings.setJsonValue(JacksonUtil.newObjectNode().put("value", i));
             adminSettingsService.saveAdminSettings(tenantId, settings);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AlarmCommentServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AlarmCommentServiceTest.java
index e276fb4d00..7bba2f30e3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AlarmCommentServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AlarmCommentServiceTest.java
@@ -21,7 +21,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.alarm.Alarm;
@@ -87,7 +87,7 @@ public class AlarmCommentServiceTest extends AbstractServiceTest {
         AlarmComment alarmComment = AlarmComment.builder().alarmId(alarm.getId())
                 .userId(user.getId())
                 .type(OTHER)
-                .comment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.randomAlphanumeric(10)))
+                .comment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.secure().nextAlphanumeric(10)))
                 .build();
 
         AlarmComment createdComment = alarmCommentService.createOrUpdateAlarmComment(tenantId, alarmComment);
@@ -115,7 +115,7 @@ public class AlarmCommentServiceTest extends AbstractServiceTest {
         AlarmComment alarmComment = AlarmComment.builder().alarmId(alarm.getId())
                 .userId(userId)
                 .type(OTHER)
-                .comment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.randomAlphanumeric(10)))
+                .comment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.secure().nextAlphanumeric(10)))
                 .build();
 
         AlarmComment createdComment = alarmCommentService.createOrUpdateAlarmComment(tenantId, alarmComment);
@@ -151,7 +151,7 @@ public class AlarmCommentServiceTest extends AbstractServiceTest {
         AlarmComment alarmComment = AlarmComment.builder().alarmId(alarm.getId())
                 .userId(userId)
                 .type(OTHER)
-                .comment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.randomAlphanumeric(10)))
+                .comment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.secure().nextAlphanumeric(10)))
                 .build();
 
         AlarmComment createdComment = alarmCommentService.createOrUpdateAlarmComment(tenantId, alarmComment);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java
index 204b200482..9809eacb55 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AssetServiceTest.java
@@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testcontainers.shaded.org.awaitility.Awaitility;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.Customer;
@@ -151,7 +151,7 @@ public class AssetServiceTest extends AbstractServiceTest {
             executor.submit(() -> {
                 Asset asset = new Asset();
                 asset.setTenantId(anotherTenantId);
-                asset.setName(RandomStringUtils.randomAlphabetic(10));
+                asset.setName(RandomStringUtils.secure().nextAlphabetic(10));
                 asset.setType("default");
                 assetService.saveAsset(asset);
             });
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
index b207672004..72503c245b 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmCommentDaoTest.java
@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.sql.alarm;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
@@ -84,7 +84,7 @@ public class JpaAlarmCommentDaoTest extends AbstractJpaDaoTest {
         alarmComment.setAlarmId(new AlarmId(alarmId));
         alarmComment.setUserId(new UserId(userId));
         alarmComment.setType(type);
-        alarmComment.setComment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.randomAlphanumeric(10)));
+        alarmComment.setComment(JacksonUtil.newObjectNode().put("text", RandomStringUtils.secure().nextAlphanumeric(10)));
         alarmCommentDao.save(TenantId.fromUUID(UUID.randomUUID()), alarmComment);
     }
 }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDaoTest.java
index 8c259a4965..bbe8940347 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/user/JpaUserSettingsDaoTest.java
@@ -21,7 +21,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.id.CustomerId;
@@ -112,7 +112,7 @@ public class JpaUserSettingsDaoTest extends AbstractJpaDaoTest {
     private UserSettings createUserSettings(UserId userId) {
         UserSettings userSettings = new UserSettings();
         userSettings.setType(UserSettingsType.GENERAL);
-        userSettings.setSettings(JacksonUtil.newObjectNode().put("text", RandomStringUtils.randomAlphanumeric(10)));
+        userSettings.setSettings(JacksonUtil.newObjectNode().put("text", RandomStringUtils.secure().nextAlphanumeric(10)));
         userSettings.setUserId(userId);
         return userSettingsDao.save(SYSTEM_TENANT_ID, userSettings);
     }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDaoTest.java
index 02abf1e5fd..c67ef1bfb0 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sqlts/SqlTimeseriesLatestDaoTest.java
@@ -171,7 +171,7 @@ public class SqlTimeseriesLatestDaoTest extends AbstractServiceTest {
     }
 
     private TsKvEntry createEntry(String key, long ts) {
-        return new BasicTsKvEntry(ts, new StringDataEntry(key, RandomStringUtils.random(10)));
+        return new BasicTsKvEntry(ts, new StringDataEntry(key, RandomStringUtils.secure().next(10)));
     }
 
     private void equalsIgnoreVersion(TsKvEntry expected, TsKvEntry actual) {
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java b/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
index 7e2f669f6b..6a2c7f6d56 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
@@ -124,7 +124,7 @@ public class WsClient extends WebSocketClient implements AutoCloseable {
 
     public WsClient subscribeForTelemetry(List<UUID> devices, List<String> keys) {
         EntityDataCmd cmd = new EntityDataCmd();
-        cmd.setCmdId(RandomUtils.nextInt(0, 1000));
+        cmd.setCmdId(RandomUtils.secure().randomInt(0, 1000));
 
         EntityListFilter devicesFilter = new EntityListFilter();
         devicesFilter.setEntityType(EntityType.DEVICE);
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
index d2c275945a..3469606943 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
@@ -180,7 +180,7 @@ public class MonitoringEntityService {
         device.setName(deviceName);
 
         DeviceCredentials credentials = new DeviceCredentials();
-        credentials.setCredentialsId(RandomStringUtils.randomAlphabetic(20));
+        credentials.setCredentialsId(RandomStringUtils.secure().nextAlphabetic(20));
         DeviceData deviceData = new DeviceData();
         deviceData.setConfiguration(new DefaultDeviceConfiguration());
 
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java
index bb464ee52e..c9fa76cc9a 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java
@@ -29,7 +29,7 @@ import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -400,7 +400,7 @@ public class MqttGatewayClientTest extends AbstractContainerTest {
             TimeUnit.SECONDS.sleep(30);
         }
 
-        String deviceName = "mqtt_device" + RandomStringUtils.randomAlphabetic(5);
+        String deviceName = "mqtt_device" + RandomStringUtils.secure().nextAlphabetic(5);
         mqttClient.publish("v1/gateway/connect", Unpooled.wrappedBuffer(createGatewayConnectPayload(deviceName).toString().getBytes()), MqttQoS.AT_LEAST_ONCE).get();
 
         if (timeoutMultiplier > 1) {
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/AbstractLwm2mClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/AbstractLwm2mClientTest.java
index c5673ae667..ecd062a15e 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/AbstractLwm2mClientTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/AbstractLwm2mClientTest.java
@@ -25,7 +25,7 @@ import org.apache.commons.io.IOUtils;
 import org.eclipse.leshan.client.object.Security;
 import org.eclipse.leshan.core.ResponseCode;
 import org.eclipse.leshan.core.util.Hex;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.Assert;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
@@ -111,7 +111,7 @@ public class AbstractLwm2mClientTest extends AbstractContainerTest {
     public final Set<LwM2MClientState> expectedStatusesRegistrationLwm2mSuccess = new HashSet<>(Arrays.asList(ON_INIT, ON_REGISTRATION_STARTED, ON_REGISTRATION_SUCCESS));
 
     public void createLwm2mDevicesForConnectNoSec(String name, Lwm2mDevicesForTest devicesForTest) throws Exception {
-        String clientEndpoint = name + "-" + RandomStringUtils.randomAlphanumeric(7);
+        String clientEndpoint = name + "-" + RandomStringUtils.secure().nextAlphanumeric(7);
         LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint));
         Device lwM2MDeviceTest = createDeviceWithCredentials(deviceCredentials, clientEndpoint, devicesForTest.getLwm2mDeviceProfile().getId());
         LwM2MTestClient lwM2MTestClient = createNewClient(SECURITY_NO_SEC, clientEndpoint, executor);
@@ -120,7 +120,7 @@ public class AbstractLwm2mClientTest extends AbstractContainerTest {
     }
 
     public void createLwm2mDevicesForConnectPsk(Lwm2mDevicesForTest devicesForTest) throws Exception {
-        String clientEndpoint = CLIENT_ENDPOINT_PSK + "-" + RandomStringUtils.randomAlphanumeric(7);
+        String clientEndpoint = CLIENT_ENDPOINT_PSK + "-" + RandomStringUtils.secure().nextAlphanumeric(7);
         String identity = CLIENT_PSK_IDENTITY;
         String keyPsk = CLIENT_PSK_KEY;
         PSKClientCredential clientCredentials = new PSKClientCredential();
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/rpc/Lwm2mObserveCompositeTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/rpc/Lwm2mObserveCompositeTest.java
index 4ffc6f4c4f..2d77e43cd2 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/rpc/Lwm2mObserveCompositeTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/rpc/Lwm2mObserveCompositeTest.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.msa.connectivity.lwm2m.rpc;
 
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -36,7 +36,7 @@ public class Lwm2mObserveCompositeTest extends AbstractLwm2mClientTest {
     @BeforeMethod
     public void setUp() throws Exception {
         testRestClient.login(TENANT_EMAIL, TENANT_PASSWORD);
-        this.lwm2mDevicesForTest = new Lwm2mDevicesForTest(initTest(name + "-profile" +  RandomStringUtils.randomAlphanumeric(7)));
+        this.lwm2mDevicesForTest = new Lwm2mDevicesForTest(initTest(name + "-profile" +  RandomStringUtils.secure().nextAlphanumeric(7)));
     }
 
     @AfterMethod
@@ -46,7 +46,7 @@ public class Lwm2mObserveCompositeTest extends AbstractLwm2mClientTest {
 
     @Test
     public void testObserveResource_Update_AfterUpdateRegistration() throws Exception {
-        createLwm2mDevicesForConnectNoSec( name + "-" +  RandomStringUtils.randomAlphanumeric(7), this.lwm2mDevicesForTest );
+        createLwm2mDevicesForConnectNoSec( name + "-" +  RandomStringUtils.secure().nextAlphanumeric(7), this.lwm2mDevicesForTest );
         observeCompositeResource_Update_AfterUpdateRegistration_test(this.lwm2mDevicesForTest.getLwM2MTestClient(), this.lwm2mDevicesForTest.getLwM2MDeviceTest().getId());
     }
 }
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/rpc/Lwm2mObserveTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/rpc/Lwm2mObserveTest.java
index f47c328077..06b033391d 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/rpc/Lwm2mObserveTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/rpc/Lwm2mObserveTest.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.msa.connectivity.lwm2m.rpc;
 
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -36,7 +36,7 @@ public class Lwm2mObserveTest extends AbstractLwm2mClientTest {
     @BeforeMethod
     public void setUp() throws Exception {
         testRestClient.login(TENANT_EMAIL, TENANT_PASSWORD);
-        this.lwm2mDevicesForTest = new Lwm2mDevicesForTest(initTest(name + "-profile" +  RandomStringUtils.randomAlphanumeric(7)));
+        this.lwm2mDevicesForTest = new Lwm2mDevicesForTest(initTest(name + "-profile" +  RandomStringUtils.secure().nextAlphanumeric(7)));
     }
 
     @AfterMethod
@@ -46,7 +46,7 @@ public class Lwm2mObserveTest extends AbstractLwm2mClientTest {
 
     @Test
     public void testObserveResource_Update_AfterUpdateRegistration() throws Exception {
-        createLwm2mDevicesForConnectNoSec( name + "-" +  RandomStringUtils.randomAlphanumeric(7), this.lwm2mDevicesForTest );
+        createLwm2mDevicesForConnectNoSec( name + "-" +  RandomStringUtils.secure().nextAlphanumeric(7), this.lwm2mDevicesForTest );
         observeResource_Update_AfterUpdateRegistration_test(this.lwm2mDevicesForTest.getLwM2MTestClient(), this.lwm2mDevicesForTest.getLwM2MDeviceTest().getId());
     }
 }
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/security/Lwm2mClientNoSecTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/security/Lwm2mClientNoSecTest.java
index 2413094946..e579127a9c 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/security/Lwm2mClientNoSecTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/security/Lwm2mClientNoSecTest.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.msa.connectivity.lwm2m.security;
 
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -34,7 +34,7 @@ public class Lwm2mClientNoSecTest extends AbstractLwm2mClientTest {
     @BeforeMethod
     public void setUp() throws Exception {
         testRestClient.login(TENANT_EMAIL, TENANT_PASSWORD);
-        this.lwm2mDevicesForTest = new Lwm2mDevicesForTest(initTest("lwm2m-NoSec-profile" + "-" +  RandomStringUtils.randomAlphanumeric(7)));
+        this.lwm2mDevicesForTest = new Lwm2mDevicesForTest(initTest("lwm2m-NoSec-profile" + "-" +  RandomStringUtils.secure().nextAlphanumeric(7)));
     }
 
     @AfterMethod
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/security/Lwm2mClientPskTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/security/Lwm2mClientPskTest.java
index 268787794b..97712d96c0 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/security/Lwm2mClientPskTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/lwm2m/security/Lwm2mClientPskTest.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.msa.connectivity.lwm2m.security;
 
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -33,7 +33,7 @@ public class Lwm2mClientPskTest extends AbstractLwm2mClientTest {
     @BeforeMethod
     public void setUp() throws Exception {
         testRestClient.login(TENANT_EMAIL, TENANT_PASSWORD);
-        this.lwm2mDevicesForTest = new Lwm2mDevicesForTest(initTest("lwm2m-Psk-profile" + "-" +  RandomStringUtils.randomAlphanumeric(7)));
+        this.lwm2mDevicesForTest = new Lwm2mDevicesForTest(initTest("lwm2m-Psk-profile" + "-" +  RandomStringUtils.secure().nextAlphanumeric(7)));
     }
 
     @AfterMethod
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
index 2c266bb416..5bfd866056 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.msa.edqs;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -68,7 +68,7 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
     private UserId customer2UserId;
     private final List<Device> tenantDevices = new ArrayList<>();
     private final List<Device> tenant2Devices = new ArrayList<>();
-    private final String deviceProfile = "LoRa-" + RandomStringUtils.randomAlphabetic(10);
+    private final String deviceProfile = "LoRa-" + RandomStringUtils.secure().nextAlphabetic(10);
 
     @BeforeClass
     public void beforeClass() throws Exception {
@@ -188,7 +188,7 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
             device.setLabel("testLabel" + (int) (Math.random() * 1000));
             //TO make sure devices have different created time
             Thread.sleep(1);
-            String token = RandomStringUtils.randomAlphabetic(10);
+            String token = RandomStringUtils.secure().nextAlphabetic(10);
             Device saved = testRestClient.postDevice(token, device);
             tenantDevices.add(saved);
 
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/prototypes/DevicePrototypes.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/prototypes/DevicePrototypes.java
index 3ba78b0171..c0f6af9443 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/prototypes/DevicePrototypes.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/prototypes/DevicePrototypes.java
@@ -16,14 +16,14 @@
 package org.thingsboard.server.msa.prototypes;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Device;
 
 public class DevicePrototypes {
     public static Device defaultDevicePrototype(String name){
         Device device = new Device();
-        device.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        device.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         device.setType("DEFAULT");
         return device;
     }
@@ -32,7 +32,7 @@ public class DevicePrototypes {
         String isGateway = "{\"gateway\":true}";
         JsonNode additionalInfo = JacksonUtil.toJsonNode(isGateway);
         Device gatewayDeviceTemplate = new Device();
-        gatewayDeviceTemplate.setName("mqtt_gateway_" + RandomStringUtils.randomAlphanumeric(5));
+        gatewayDeviceTemplate.setName("mqtt_gateway_" + RandomStringUtils.secure().nextAlphanumeric(5));
         gatewayDeviceTemplate.setType("gateway");
         gatewayDeviceTemplate.setAdditionalInfo(additionalInfo);
         return gatewayDeviceTemplate;
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CreateWidgetPopupHelper.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CreateWidgetPopupHelper.java
index 9741ae9da6..66d7788073 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CreateWidgetPopupHelper.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/pages/CreateWidgetPopupHelper.java
@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.ui.pages;
 
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebDriver;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 
 public class CreateWidgetPopupHelper extends CreateWidgetPopupElements {
     public CreateWidgetPopupHelper(WebDriver driver) {
@@ -25,7 +25,7 @@ public class CreateWidgetPopupHelper extends CreateWidgetPopupElements {
     }
 
     public void goToCreateEntityAliasPopup(String aliasName) {
-        entityAlias().sendKeys(aliasName + RandomStringUtils.randomAlphanumeric(7));
+        entityAlias().sendKeys(aliasName + RandomStringUtils.secure().nextAlphanumeric(7));
         createNewAliasBtn().click();
     }
 
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/EntityPrototypes.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/EntityPrototypes.java
index d6e5f12c1b..d80ea5551a 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/EntityPrototypes.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ui/utils/EntityPrototypes.java
@@ -15,7 +15,7 @@
  */
 package org.thingsboard.server.msa.ui.utils;
 
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
@@ -212,14 +212,14 @@ public class EntityPrototypes {
 
     public static Device defaultDevicePrototype(String name) {
         Device device = new Device();
-        device.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        device.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         device.setType("DEFAULT");
         return device;
     }
 
     public static Device defaultDevicePrototype(String name, CustomerId id) {
         Device device = new Device();
-        device.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        device.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         device.setCustomerId(id);
         device.setType("DEFAULT");
         return device;
@@ -227,7 +227,7 @@ public class EntityPrototypes {
 
     public static Device defaultDevicePrototype(String name, String description) {
         Device device = new Device();
-        device.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        device.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         device.setType("DEFAULT");
         device.setAdditionalInfo(JacksonUtil.newObjectNode().put("description", description));
         return device;
@@ -235,7 +235,7 @@ public class EntityPrototypes {
 
     public static Device defaultDevicePrototype(String name, String description, String label) {
         Device device = new Device();
-        device.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        device.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         device.setType("DEFAULT");
         device.setAdditionalInfo(JacksonUtil.newObjectNode().put("description", description));
         device.setLabel(label);
@@ -244,7 +244,7 @@ public class EntityPrototypes {
 
     public static Device defaultDevicePrototype(String name, boolean gateway) {
         Device device = new Device();
-        device.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        device.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         device.setType("DEFAULT");
         device.setAdditionalInfo(JacksonUtil.newObjectNode().put("gateway", gateway));
         return device;
@@ -252,7 +252,7 @@ public class EntityPrototypes {
 
     public static Device defaultDevicePrototype(String name, boolean gateway, boolean overwriteActivityTime) {
         Device device = new Device();
-        device.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        device.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         device.setType("DEFAULT");
         device.setAdditionalInfo(JacksonUtil.newObjectNode()
                 .put("gateway", gateway)
@@ -262,7 +262,7 @@ public class EntityPrototypes {
 
     public static Device defaultDevicePrototype(String name, DeviceProfileId deviceProfileId) {
         Device device = new Device();
-        device.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        device.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         device.setType("DEFAULT");
         device.setDeviceProfileId(deviceProfileId);
         return device;
@@ -270,7 +270,7 @@ public class EntityPrototypes {
 
     public static Asset defaultAssetPrototype(String name, CustomerId id) {
         Asset asset = new Asset();
-        asset.setName(name + RandomStringUtils.randomAlphanumeric(7));
+        asset.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
         asset.setCustomerId(id);
         asset.setType("DEFAULT");
         return asset;
@@ -278,15 +278,15 @@ public class EntityPrototypes {
 
     public static EntityView defaultEntityViewPrototype(String name, String type, String entityType) {
         EntityView entityView = new EntityView();
-        entityView.setName(name + RandomStringUtils.randomAlphanumeric(7));
-        entityView.setType(type + RandomStringUtils.randomAlphanumeric(7));
+        entityView.setName(name + RandomStringUtils.secure().nextAlphanumeric(7));
+        entityView.setType(type + RandomStringUtils.secure().nextAlphanumeric(7));
         entityView.setAdditionalInfo(JacksonUtil.newObjectNode().put("entityType", entityType));
         return entityView;
     }
 
     public static Dashboard defaultDashboardPrototype(String title) {
         Dashboard dashboard = new Dashboard();
-        dashboard.setTitle(title + RandomStringUtils.randomAlphanumeric(7));
+        dashboard.setTitle(title + RandomStringUtils.secure().nextAlphanumeric(7));
         return dashboard;
     }
 }
diff --git a/tools/src/main/java/org/thingsboard/client/tools/migrator/PgCaMigrator.java b/tools/src/main/java/org/thingsboard/client/tools/migrator/PgCaMigrator.java
index b88012c00e..2ef202dc9f 100644
--- a/tools/src/main/java/org/thingsboard/client/tools/migrator/PgCaMigrator.java
+++ b/tools/src/main/java/org/thingsboard/client/tools/migrator/PgCaMigrator.java
@@ -249,7 +249,7 @@ public class PgCaMigrator {
 
     private List<Object> castToNumericIfPossible(List<Object> values) {
         try {
-            if (values.get(6) != null && NumberUtils.isNumber(values.get(6).toString())) {
+            if (values.get(6) != null && NumberUtils.isCreatable(values.get(6).toString())) {
                 Double casted = NumberUtils.createDouble(values.get(6).toString());
                 List<Object> numeric = Lists.newArrayList();
                 numeric.addAll(values);

From abdae16da2214c0fc19a4bad49199b8095c803f5 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Fri, 24 Apr 2026 23:18:47 +0200
Subject: [PATCH 34/91] Technical cleanup of TenantId construction in tests and
 production code

---
 .../discovery/HashPartitionServiceTest.java   |  6 +--
 .../cf/DefaultCalculatedFieldCacheTest.java   | 52 +++++++++----------
 .../provision/DeviceProvisionServiceTest.java |  2 +-
 .../DefaultTbAssetProfileCacheTest.java       | 14 ++---
 .../DefaultTbDeviceProfileCacheTest.java      | 14 ++---
 .../queue/DefaultTbClusterServiceTest.java    |  4 +-
 .../TbEntityLocalSubsInfoTest.java            |  2 +-
 .../ws/DefaultWebSocketServiceTest.java       |  2 +-
 .../session/GatewaySessionHandlerTest.java    |  2 +-
 .../dao/service/TbCacheSerializationTest.java |  2 +-
 .../attributes/BaseAttributesServiceTest.java | 16 +++---
 .../service/event/BaseEventServiceTest.java   |  2 +-
 .../dao/sql/event/JpaBaseEventDaoTest.java    |  2 +-
 .../query/DefaultQueryLogComponentTest.java   |  2 +-
 .../dao/sql/tenant/JpaTenantDaoTest.java      |  2 +-
 .../sql/widget/JpaWidgetsBundleDaoTest.java   |  4 +-
 .../action/TbAssignToCustomerNodeTest.java    |  2 +-
 .../action/TbCreateRelationNodeTest.java      |  2 +-
 .../action/TbDeleteRelationNodeTest.java      |  2 +-
 .../TbUnassignFromCustomerNodeTest.java       |  2 +-
 .../filter/TbAssetTypeSwitchNodeTest.java     |  2 +-
 .../filter/TbCheckAlarmStatusNodeTest.java    |  2 +-
 .../filter/TbCheckRelationNodeTest.java       |  2 +-
 .../filter/TbDeviceTypeSwitchNodeTest.java    |  2 +-
 .../engine/flow/TbRuleChainInputNodeTest.java |  2 +-
 .../TbGetCustomerDetailsNodeTest.java         |  2 +-
 .../metadata/TbGetDeviceAttrNodeTest.java     |  2 +-
 .../TbGetOriginatorFieldsNodeTest.java        |  2 +-
 .../TbGetRelatedAttributeNodeTest.java        |  4 +-
 .../TbGetTenantAttributeNodeTest.java         |  2 +-
 .../metadata/TbGetTenantDetailsNodeTest.java  |  2 +-
 .../util/EntitiesFieldsAsyncLoaderTest.java   |  4 +-
 ...ntitiesRelatedDeviceIdAsyncLoaderTest.java |  2 +-
 ...ntitiesRelatedEntityIdAsyncLoaderTest.java |  2 +-
 34 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
index b1d59c031a..727a9c1aa5 100644
--- a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
@@ -149,7 +149,7 @@ public class HashPartitionServiceTest {
         Random random = new Random();
         long ts = new SimpleDateFormat("dd-MM-yyyy").parse("06-12-2016").getTime() - TimeUnit.DAYS.toMillis(tenantCount);
         for (int tenantIndex = 0; tenantIndex < tenantCount; tenantIndex++) {
-            TenantId tenantId = new TenantId(Uuids.startOf(ts));
+            TenantId tenantId = TenantId.fromUUID(Uuids.startOf(ts));
             ts += TimeUnit.DAYS.toMillis(1) + random.nextInt(1000);
             for (int queueIndex = 0; queueIndex < queueCount; queueIndex++) {
                 QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, "queue" + queueIndex, tenantId);
@@ -190,7 +190,7 @@ public class HashPartitionServiceTest {
         Map<TenantId, TenantProfileId> tenants = new HashMap<>();
         for (TenantProfileId tenantProfileId : isolatedTenantProfiles) {
             for (int i = 0; i < tenantsCountPerProfile; i++) {
-                tenants.put(new TenantId(UUID.randomUUID()), tenantProfileId);
+                tenants.put(TenantId.fromUUID(UUID.randomUUID()), tenantProfileId);
             }
         }
 
@@ -299,7 +299,7 @@ public class HashPartitionServiceTest {
         Queue systemQueue = createQueue(TenantId.SYS_TENANT_ID, 10);
         queues.add(systemQueue);
 
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         mockRoutingInfo(tenantId, tenantProfileId, false); // not isolated yet
         mockQueues(queues);
 
diff --git a/application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java b/application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java
index 3ee229e7a0..853c7f6127 100644
--- a/application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java
@@ -92,8 +92,8 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_evictsAllTenantCfsFromAllMaps() {
-        TenantId tenant1 = new TenantId(UUID.randomUUID());
-        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID());
+        TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID());
         DeviceId device1 = new DeviceId(UUID.randomUUID());
         DeviceId device2 = new DeviceId(UUID.randomUUID());
 
@@ -110,7 +110,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_evictsOwnerEntities() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         stubDeviceOwner(tenant, device, tenant);
 
@@ -125,7 +125,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_removesLinksToLinkedEntities() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceId cfEntity = new DeviceId(UUID.randomUUID());
         DeviceId linkedDevice = new DeviceId(UUID.randomUUID());
 
@@ -139,7 +139,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictCfs() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, device);
 
@@ -152,7 +152,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_deviceDeleted_evictsCfsForThatDevice() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, device);
 
@@ -164,7 +164,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_deviceDeleted_removesLinksForLinkedEntities() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         DeviceId linkedDevice = new DeviceId(UUID.randomUUID());
         addCfToCache(tenant, device, linkedDevice);
@@ -176,7 +176,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_deviceDeleted_evictsDeviceFromOwnerEntities() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         CustomerId customer = new CustomerId(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         stubDeviceOwner(tenant, device, customer);
@@ -191,7 +191,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_assetDeleted_evictsCfsForThatAsset() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         AssetId asset = new AssetId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, asset);
 
@@ -203,7 +203,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_deviceCreated_addsDeviceToOwnerEntities() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         CustomerId customer = new CustomerId(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         stubDeviceOwner(tenant, device, customer);
@@ -217,7 +217,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_customerDeleted_evictsCustomerOwnerEntries() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         CustomerId customer = new CustomerId(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         stubDeviceOwner(tenant, device, customer);
@@ -235,7 +235,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_deviceProfileDeleted_evictsCfsForThatProfile() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, profileId);
 
@@ -247,7 +247,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_deviceProfileDeleted_removesLinksForLinkedEntities() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
         DeviceId linkedDevice = new DeviceId(UUID.randomUUID());
         addCfToCache(tenant, profileId, linkedDevice);
@@ -259,7 +259,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_deviceProfileDeleted_doesNotEvictOtherProfilesCfs() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId profile1 = new DeviceProfileId(UUID.randomUUID());
         DeviceProfileId profile2 = new DeviceProfileId(UUID.randomUUID());
         CalculatedField cf1 = addCfToCache(tenant, profile1);
@@ -275,7 +275,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_deviceProfileUpdated_doesNotEvictCfs() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, profileId);
 
@@ -287,7 +287,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_assetProfileDeleted_evictsCfsForThatProfile() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, profileId);
 
@@ -299,7 +299,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_assetProfileDeleted_removesLinksForLinkedEntities() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
         AssetId linkedAsset = new AssetId(UUID.randomUUID());
         addCfToCache(tenant, profileId, linkedAsset);
@@ -311,7 +311,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_assetProfileDeleted_doesNotEvictOtherProfilesCfs() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId profile1 = new AssetProfileId(UUID.randomUUID());
         AssetProfileId profile2 = new AssetProfileId(UUID.randomUUID());
         CalculatedField cf1 = addCfToCache(tenant, profile1);
@@ -327,7 +327,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_assetProfileUpdated_doesNotEvictCfs() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, profileId);
 
@@ -341,7 +341,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_calculatedFieldCreated_addsCfToCache() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         CalculatedFieldId cfId = new CalculatedFieldId(UUID.randomUUID());
         CalculatedField cf = buildCalculatedField(cfId, tenant, device, simpleCfConfig());
@@ -355,7 +355,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_calculatedFieldDeleted_evictsCfFromCache() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, device);
 
@@ -367,7 +367,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_calculatedFieldUpdated_refreshesCfInCache() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
         CalculatedField cf = addCfToCache(tenant, device);
 
@@ -384,7 +384,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void evictOwner_customerDeleted_recursivelyEvictsDevicesOwnedByThatCustomer() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         CustomerId customer = new CustomerId(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
 
@@ -406,7 +406,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void evictOwner_tenantDeleted_recursivelyEvictsCustomerAndItsOwnedDevices() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         CustomerId customer = new CustomerId(UUID.randomUUID());
         DeviceId device = new DeviceId(UUID.randomUUID());
 
@@ -431,7 +431,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantProfileUpdated_callsHandleTenantProfileUpdate() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         TenantProfileId profileId = new TenantProfileId(UUID.randomUUID());
         DefaultCalculatedFieldCache spyCache = spy(cache);
 
@@ -442,7 +442,7 @@ public class DefaultCalculatedFieldCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantProfileDeleted_doesNotCallHandleTenantProfileUpdate() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         TenantProfileId profileId = new TenantProfileId(UUID.randomUUID());
         DefaultCalculatedFieldCache spyCache = spy(cache);
 
diff --git a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
index 4f2eaa5147..839fbd9557 100644
--- a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
@@ -235,7 +235,7 @@ public class DeviceProvisionServiceTest {
 
     private Tenant createTenant() {
         Tenant tenant = new Tenant();
-        tenant.setId(new TenantId(UUID.randomUUID()));
+        tenant.setId(TenantId.fromUUID(UUID.randomUUID()));
         return tenant;
     }
 
diff --git a/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java b/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java
index f9b8d428d7..666ae37c6e 100644
--- a/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java
@@ -57,8 +57,8 @@ public class DefaultTbAssetProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_evictsAssetProfilesForThatTenant() {
-        TenantId tenant1 = new TenantId(UUID.randomUUID());
-        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID());
+        TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId profileId1 = new AssetProfileId(UUID.randomUUID());
         AssetProfileId profileId2 = new AssetProfileId(UUID.randomUUID());
 
@@ -75,7 +75,7 @@ public class DefaultTbAssetProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_evictsAssetMappingsForThatTenant() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
         AssetId assetId = new AssetId(UUID.randomUUID());
 
@@ -92,7 +92,7 @@ public class DefaultTbAssetProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_removesListenersForThatTenant() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         EntityId listenerId = new AssetId(UUID.randomUUID());
         AtomicInteger callCount = new AtomicInteger();
 
@@ -110,7 +110,7 @@ public class DefaultTbAssetProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictProfiles() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
         loadProfileIntoCache(tenant, profileId);
 
@@ -123,8 +123,8 @@ public class DefaultTbAssetProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_differentTenantDeleted_keepsOtherTenantsProfiles() {
-        TenantId tenant1 = new TenantId(UUID.randomUUID());
-        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID());
+        TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId profileId1 = new AssetProfileId(UUID.randomUUID());
         AssetProfileId profileId2 = new AssetProfileId(UUID.randomUUID());
 
diff --git a/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java b/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java
index a26413514c..fc900b88e4 100644
--- a/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java
@@ -57,8 +57,8 @@ public class DefaultTbDeviceProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_evictsDeviceProfilesForThatTenant() {
-        TenantId tenant1 = new TenantId(UUID.randomUUID());
-        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID());
+        TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId profileId1 = new DeviceProfileId(UUID.randomUUID());
         DeviceProfileId profileId2 = new DeviceProfileId(UUID.randomUUID());
 
@@ -76,7 +76,7 @@ public class DefaultTbDeviceProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_evictsDeviceMappingsForThatTenant() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
         DeviceId deviceId = new DeviceId(UUID.randomUUID());
 
@@ -93,7 +93,7 @@ public class DefaultTbDeviceProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantDeleted_removesListenersForThatTenant() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         EntityId listenerId = new DeviceId(UUID.randomUUID());
         AtomicInteger callCount = new AtomicInteger();
 
@@ -111,7 +111,7 @@ public class DefaultTbDeviceProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictProfiles() {
-        TenantId tenant = new TenantId(UUID.randomUUID());
+        TenantId tenant = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
         loadProfileIntoCache(tenant, profileId);
 
@@ -124,8 +124,8 @@ public class DefaultTbDeviceProfileCacheTest {
 
     @Test
     public void onComponentLifecycleEvent_differentTenantDeleted_keepsOtherTenantsProfiles() {
-        TenantId tenant1 = new TenantId(UUID.randomUUID());
-        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID());
+        TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId profileId1 = new DeviceProfileId(UUID.randomUUID());
         DeviceProfileId profileId2 = new DeviceProfileId(UUID.randomUUID());
 
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
index 79b31acf78..09225216ca 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
@@ -410,7 +410,7 @@ public class DefaultTbClusterServiceTest {
     @Test
     public void testGetRuleEngineProfileForUpdatedAndDeletedDevice() {
         DeviceId deviceId = new DeviceId(UUID.randomUUID());
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         DeviceProfileId deviceProfileId = new DeviceProfileId(UUID.randomUUID());
 
         Device device = new Device(deviceId);
@@ -430,7 +430,7 @@ public class DefaultTbClusterServiceTest {
     @Test
     public void testGetRuleEngineProfileForUpdatedAndDeletedAsset() {
         AssetId assetId = new AssetId(UUID.randomUUID());
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         AssetProfileId assetProfileId = new AssetProfileId(UUID.randomUUID());
 
         Asset asset = new Asset(assetId);
diff --git a/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java b/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java
index ba1a89eb38..1ab2a54319 100644
--- a/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java
@@ -161,7 +161,7 @@ public class TbEntityLocalSubsInfoTest {
     }
 
     private TbEntityLocalSubsInfo createSubsInfo() {
-        return new TbEntityLocalSubsInfo(new TenantId(UUID.randomUUID()), new DeviceId(UUID.randomUUID()));
+        return new TbEntityLocalSubsInfo(TenantId.fromUUID(UUID.randomUUID()), new DeviceId(UUID.randomUUID()));
     }
 
     private void checkEvent(TbEntitySubEvent event, Set<TbAttributeSubscription> expectedSubs, ComponentLifecycleEvent expectedType) {
diff --git a/application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java b/application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java
index a533e0369f..673062256f 100644
--- a/application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java
@@ -113,7 +113,7 @@ class DefaultWebSocketServiceTest {
         assertThat(publicUserSubscriptionsMap).as("map should contain tenant1").containsKey(tenant1);
         assertThat(publicUserSubscriptionsMap).as("map should contain tenant2").containsKey(tenant2);
         assertThat(publicUserSubscriptionsMap).as("map must not have a single NULL_UUID entry for all tenants")
-                .doesNotContainKey(new TenantId(EntityId.NULL_UUID));
+                .doesNotContainKey(TenantId.fromUUID(EntityId.NULL_UUID));
 
         assertThat(publicUserSubscriptionsMap.get(tenant1))
                 .as("tenant1 should have exactly %d subscriptions", maxPublicSubscriptions)
diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
index 6b4e5e9925..30dc825a9b 100644
--- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
+++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
@@ -75,7 +75,7 @@ public class GatewaySessionHandlerTest {
         ConcurrentHashMap<String, GatewayDeviceSessionContext> devices = new ConcurrentHashMap<>();
         TransportDeviceInfo deviceInfo = new TransportDeviceInfo();
         deviceInfo.setDeviceId(new DeviceId(UUID.randomUUID()));
-        deviceInfo.setTenantId(new TenantId(UUID.randomUUID()));
+        deviceInfo.setTenantId(TenantId.fromUUID(UUID.randomUUID()));
         deviceInfo.setCustomerId(new CustomerId(UUID.randomUUID()));
         deviceInfo.setDeviceName("device1");
         deviceInfo.setDeviceType("default");
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java
index e1654678a0..b0ae8fb6ae 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java
@@ -37,7 +37,7 @@ public class TbCacheSerializationTest extends AbstractServiceTest {
     @Test
     public void AlarmTypesSerializationTest() {
         var typesCount = 13;
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         List<EntitySubtype> types = new ArrayList<>(typesCount);
         for (int i = 0; i < typesCount; i++) {
             types.add(new EntitySubtype(tenantId, EntityType.ALARM, "alarm_type_" + i));
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java
index 373112293d..da1e57e348 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java
@@ -122,7 +122,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testDummyRequestWithEmptyResult() throws Exception {
-        var future = attributesService.find(new TenantId(UUID.randomUUID()), new DeviceId(UUID.randomUUID()), AttributeScope.SERVER_SCOPE, "TEST");
+        var future = attributesService.find(TenantId.fromUUID(UUID.randomUUID()), new DeviceId(UUID.randomUUID()), AttributeScope.SERVER_SCOPE, "TEST");
         Assert.assertNotNull(future);
         var result = future.get(10, TimeUnit.SECONDS);
         Assert.assertTrue(result.isEmpty());
@@ -130,7 +130,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testConcurrentFetchAndUpdate() throws Exception {
-        var tenantId = new TenantId(UUID.randomUUID());
+        var tenantId = TenantId.fromUUID(UUID.randomUUID());
         ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(2));
         try {
             for (int i = 0; i < 100; i++) {
@@ -144,7 +144,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testConcurrentFetchAndUpdateMulti() throws Exception {
-        var tenantId = new TenantId(UUID.randomUUID());
+        var tenantId = TenantId.fromUUID(UUID.randomUUID());
         ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(2));
         try {
             for (int i = 0; i < 100; i++) {
@@ -158,7 +158,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFetchAndUpdateEmpty() throws Exception {
-        var tenantId = new TenantId(UUID.randomUUID());
+        var tenantId = TenantId.fromUUID(UUID.randomUUID());
         var deviceId = new DeviceId(UUID.randomUUID());
         var scope = AttributeScope.SERVER_SCOPE;
         var key = "TEST";
@@ -172,7 +172,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFetchAndUpdateMulti() throws Exception {
-        var tenantId = new TenantId(UUID.randomUUID());
+        var tenantId = TenantId.fromUUID(UUID.randomUUID());
         var deviceId = new DeviceId(UUID.randomUUID());
         var scope = AttributeScope.SERVER_SCOPE;
         var key1 = "TEST1";
@@ -204,7 +204,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindAllKeysByEntityId() {
-        var tenantId = new TenantId(UUID.randomUUID());
+        var tenantId = TenantId.fromUUID(UUID.randomUUID());
         var deviceId = new DeviceId(UUID.randomUUID());
         saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key1", "123");
         saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key2", "123");
@@ -217,7 +217,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindAllKeysByEntityIdAndAttributeType() {
-        var tenantId = new TenantId(UUID.randomUUID());
+        var tenantId = TenantId.fromUUID(UUID.randomUUID());
         var deviceId = new DeviceId(UUID.randomUUID());
         saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key1", "123");
         saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key2", "123");
@@ -230,7 +230,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest {
 
     @Test
     public void testFindAllByEntityIdAndAttributeType() {
-        var tenantId = new TenantId(UUID.randomUUID());
+        var tenantId = TenantId.fromUUID(UUID.randomUUID());
         var deviceId = new DeviceId(UUID.randomUUID());
         saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key1", "123");
         saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key2", "123");
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
index 9d754f6150..2f33fae122 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
@@ -62,7 +62,7 @@ public abstract class BaseEventServiceTest extends AbstractServiceTest {
 
     @Test
     public void saveEvent() throws Exception {
-        TenantId tenantId = new TenantId(Uuids.timeBased());
+        TenantId tenantId = TenantId.fromUUID(Uuids.timeBased());
         DeviceId devId = new DeviceId(Uuids.timeBased());
         RuleNodeDebugEvent event = generateEvent(tenantId, devId);
         eventService.saveAsync(event).get();
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
index 3ddf318e2f..e03b161692 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
@@ -132,7 +132,7 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest {
         StatisticsEvent.StatisticsEventBuilder event = StatisticsEvent.builder();
         event.id(eventId);
         event.ts(System.currentTimeMillis());
-        event.tenantId(new TenantId(tenantId));
+        event.tenantId(TenantId.fromUUID(tenantId));
         event.entityId(entityId);
         event.serviceId("server A");
         event.messagesProcessed(1);
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
index e47ed5bfbf..a25d85aae6 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
@@ -57,7 +57,7 @@ public class DefaultQueryLogComponentTest {
 
     @Before
     public void setUp() {
-        tenantId = new TenantId(UUID.fromString("97275c1c-9cf2-4d25-a68d-933031158f84"));
+        tenantId = TenantId.fromUUID(UUID.fromString("97275c1c-9cf2-4d25-a68d-933031158f84"));
         ctx = new SqlQueryContext(new QueryContext(tenantId, null, EntityType.ALARM));
     }
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java
index dd0bedbf5a..31e4ab2ac8 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java
@@ -103,7 +103,7 @@ public class JpaTenantDaoTest extends AbstractJpaDaoTest {
     //@DatabaseSetup("classpath:dbunit/empty_dataset.xml")
     public void testIsExistsTenantById() {
         final UUID uuid = Uuids.timeBased();
-        final TenantId tenantId = new TenantId(uuid);
+        final TenantId tenantId = TenantId.fromUUID(uuid);
         assertThat(tenantDao.existsById(tenantId, uuid)).as("Is tenant exists before save").isFalse();
 
         final Tenant tenant = new Tenant();
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
index 164d59ecc0..0b6236196a 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
@@ -276,8 +276,8 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
         widgetsBundles = widgetsBundleDao.find(TenantId.SYS_TENANT_ID).stream().sorted(Comparator.comparing(WidgetsBundle::getTitle)).collect(Collectors.toList());;
         assertEquals(100, widgetsBundles.size());
 
-        var widgetType1 = createAndSaveWidgetType(new TenantId(tenantId1), 1, "Test widget type 1", "This is the widget type 1", new String[]{"tag1", "Tag2", "TEST_TAG"});
-        var widgetType2 = createAndSaveWidgetType(new TenantId(tenantId2), 2, "Test widget type 2", "This is the widget type 2", new String[]{"tag3", "Tag5", "TEST_Tag2"});
+        var widgetType1 = createAndSaveWidgetType(TenantId.fromUUID(tenantId1), 1, "Test widget type 1", "This is the widget type 1", new String[]{"tag1", "Tag2", "TEST_TAG"});
+        var widgetType2 = createAndSaveWidgetType(TenantId.fromUUID(tenantId2), 2, "Test widget type 2", "This is the widget type 2", new String[]{"tag3", "Tag5", "TEST_Tag2"});
 
         var widgetsBundle1 = widgetsBundles.stream().filter(widgetsBundle -> widgetsBundle.getTenantId().getId().equals(tenantId1)).collect(Collectors.toList()).get(10);
         widgetTypeDao.saveWidgetsBundleWidget(new WidgetsBundleWidget(widgetsBundle1.getId(), widgetType1.getId(), 0));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
index 0db2d77c01..7f329b1411 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
@@ -97,7 +97,7 @@ class TbAssignToCustomerNodeTest extends AbstractRuleNodeUpgradeTest {
     private final Edge EDGE = new Edge();
     private final Dashboard DASHBOARD = new Dashboard();
 
-    private final TenantId TENANT_ID = new TenantId(UUID.fromString("c818385f-e661-407f-8c52-daf2dddf406d"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("c818385f-e661-407f-8c52-daf2dddf406d"));
     private final RuleNodeId RULE_NODE_ID = new RuleNodeId(UUID.fromString("c3570bd0-c0bc-4609-97a4-6f57d7c8b809"));
 
     private static Stream<Arguments> givenUnsupportedOriginatorType_whenOnMsg_thenVerifyExceptionThrown() {
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
index 60924002da..50c54b91de 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
@@ -111,7 +111,7 @@ public class TbCreateRelationNodeTest extends AbstractRuleNodeUpgradeTest {
         return supportedEntityTypes.stream().filter(entityType -> !entityType.equals(EntityType.TENANT)).map(Arguments::of);
     }
 
-    private static final TenantId tenantId = new TenantId(UUID.fromString("6fc86fc9-b25c-4893-b340-51cf4e101ab2"));
+    private static final TenantId tenantId = TenantId.fromUUID(UUID.fromString("6fc86fc9-b25c-4893-b340-51cf4e101ab2"));
     private static final DeviceId deviceId = new DeviceId(UUID.fromString("191ab124-1d8d-4749-97c6-fc84c113c1f5"));
     private static final AssetId assetId = new AssetId(UUID.fromString("a47a5867-deab-4333-b845-88cb1695990c"));
     private static final CustomerId customerId = new CustomerId(UUID.fromString("4af69229-273d-40de-9fba-f49f87373d23"));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
index a8087cc40b..f6ef490aba 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
@@ -108,7 +108,7 @@ public class TbDeleteRelationNodeTest extends AbstractRuleNodeUpgradeTest {
         return supportedEntityTypes.stream().filter(entityType -> !entityType.equals(EntityType.TENANT)).map(Arguments::of);
     }
 
-    private static final TenantId tenantId = new TenantId(UUID.fromString("6fdb457d-0910-401c-8880-abc251e6a1e2"));
+    private static final TenantId tenantId = TenantId.fromUUID(UUID.fromString("6fdb457d-0910-401c-8880-abc251e6a1e2"));
     private static final DeviceId deviceId = new DeviceId(UUID.fromString("4eef91a7-8865-4c3c-837d-ed6f6577508b"));
     private static final AssetId assetId = new AssetId(UUID.fromString("f4fd3b10-3f36-4d46-a162-5e62050774cc"));
     private static final CustomerId customerId = new CustomerId(UUID.fromString("ab890af2-3622-41e0-ac94-14d50af84348"));
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
index de891c13d4..dd1307b10a 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
@@ -98,7 +98,7 @@ class TbUnassignFromCustomerNodeTest extends AbstractRuleNodeUpgradeTest {
     private final Edge EDGE = new Edge();
     private final Dashboard DASHBOARD = new Dashboard();
 
-    private final TenantId TENANT_ID = new TenantId(UUID.fromString("06fcc15f-2677-436d-a1cb-7754bd0bcccf"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("06fcc15f-2677-436d-a1cb-7754bd0bcccf"));
 
     private final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
index 557fb5b71d..b0788a1817 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
@@ -58,7 +58,7 @@ class TbAssetTypeSwitchNodeTest {
 
     @BeforeEach
     void setUp() throws TbNodeException {
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         assetId = new AssetId(UUID.randomUUID());
         assetIdDeleted = new AssetId(UUID.randomUUID());
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
index d8a302ae92..9155221a26 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.when;
 
 class TbCheckAlarmStatusNodeTest {
 
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final DeviceId DEVICE_ID = new DeviceId(UUID.randomUUID());
     private static final AlarmId ALARM_ID = new AlarmId(UUID.randomUUID());
     private static final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
index e6011c74d8..fb8ad655c0 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
@@ -63,7 +63,7 @@ import static org.mockito.Mockito.when;
 
 class TbCheckRelationNodeTest extends AbstractRuleNodeUpgradeTest {
 
-    private final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private final DeviceId ORIGINATOR_ID = new DeviceId(UUID.randomUUID());
     private final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     private final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg()
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
index 55e9c33b7e..ebbdbe14c7 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
@@ -58,7 +58,7 @@ class TbDeviceTypeSwitchNodeTest {
 
     @BeforeEach
     void setUp() throws TbNodeException {
-        TenantId tenantId = new TenantId(UUID.randomUUID());
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
         deviceId = new DeviceId(UUID.randomUUID());
         deviceIdDeleted = new DeviceId(UUID.randomUUID());
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
index 3ae26e6560..963e25f6b6 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
@@ -64,7 +64,7 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 public class TbRuleChainInputNodeTest extends AbstractRuleNodeUpgradeTest {
 
-    private final TenantId TENANT_ID = new TenantId(UUID.fromString("4ba69ea5-6b27-42df-ab66-e7a727a67027"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("4ba69ea5-6b27-42df-ab66-e7a727a67027"));
     private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("97731954-2147-4176-8f1a-d14f1b73e4e6"));
     private final AssetId ASSET_ID = new AssetId(UUID.fromString("841a47bd-4e8e-4ea5-88e6-420da0d70e51"));
     // A stable "current" rule chain ID: this node lives here. Must differ from any target used in tests.
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
index 5e9726ec97..3940ab56c4 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
@@ -76,7 +76,7 @@ import static org.mockito.Mockito.when;
 public class TbGetCustomerDetailsNodeTest {
 
     private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
index 4f267c0dfb..f9a230a437 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
@@ -60,7 +60,7 @@ import static org.mockito.BDDMockito.then;
 @ExtendWith(MockitoExtension.class)
 public class TbGetDeviceAttrNodeTest extends AbstractRuleNodeUpgradeTest {
 
-    private final TenantId TENANT_ID = new TenantId(UUID.fromString("5aea576c-66c4-4732-86b8-dc6bfcde7443"));
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("5aea576c-66c4-4732-86b8-dc6bfcde7443"));
     private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("40b6b393-6ddf-47f9-973a-18550ca70384"));
     private final ListeningExecutor executor = DirectListeningExecutor.INSTANCE;
 
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
index fff7437fdf..a0d0a5a957 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
@@ -59,7 +59,7 @@ import static org.mockito.Mockito.when;
 public class TbGetOriginatorFieldsNodeTest {
 
     private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId DUMMY_TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId DUMMY_TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
index a31d23db55..88195973e6 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
@@ -91,7 +91,7 @@ import static org.mockito.Mockito.when;
 public class TbGetRelatedAttributeNodeTest {
 
     private static final EntityId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
@@ -427,7 +427,7 @@ public class TbGetRelatedAttributeNodeTest {
     @Test
     public void givenFetchTelemetryToMetaData_whenOnMsg_thenShouldFetchTelemetryToMetaData() {
         // GIVEN
-        var tenant = new Tenant(new TenantId(UUID.randomUUID()));
+        var tenant = new Tenant(TenantId.fromUUID(UUID.randomUUID()));
         var device = new Device(new DeviceId(UUID.randomUUID()));
 
         prepareMsgAndConfig(TbMsgSource.METADATA, DataToFetch.LATEST_TELEMETRY, tenant.getId());
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
index 88db3dc0cd..fa528a724c 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
@@ -70,7 +70,7 @@ import static org.mockito.Mockito.when;
 public class TbGetTenantAttributeNodeTest {
 
     private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
index b77bd263f8..7f476ea775 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
@@ -73,7 +73,7 @@ public class TbGetTenantDetailsNodeTest {
         config = new TbGetTenantDetailsNodeConfiguration().defaultConfiguration();
         nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
         tenant = new Tenant();
-        tenant.setId(new TenantId(UUID.randomUUID()));
+        tenant.setId(TenantId.fromUUID(UUID.randomUUID()));
         tenant.setTitle("Tenant title");
         tenant.setCountry("Tenant country");
         tenant.setCity("Tenant city");
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java
index d1bcc4559e..75dc8d227a 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java
@@ -104,7 +104,7 @@ public class EntitiesFieldsAsyncLoaderTest {
     @BeforeAll
     public static void setup() {
         RANDOM_UUID = UUID.randomUUID();
-        TENANT_ID = new TenantId(UUID.randomUUID());
+        TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
         SUPPORTED_ENTITY_TYPES = EnumSet.of(
                 EntityType.TENANT,
                 EntityType.CUSTOMER,
@@ -172,7 +172,7 @@ public class EntitiesFieldsAsyncLoaderTest {
     private void initMocks(EntityType entityType, boolean entityDoesNotExist) {
         switch (entityType) {
             case TENANT:
-                var tenant = Futures.immediateFuture(entityDoesNotExist ? null : new Tenant(new TenantId(RANDOM_UUID)));
+                var tenant = Futures.immediateFuture(entityDoesNotExist ? null : new Tenant(TenantId.fromUUID(RANDOM_UUID)));
 
                 when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR);
                 when(ctxMock.getTenantService()).thenReturn(tenantServiceMock);
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java
index 23e98dfc58..6a840a1ae3 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.when;
 public class EntitiesRelatedDeviceIdAsyncLoaderTest {
 
     private static final EntityId DUMMY_ORIGINATOR = new DeviceId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
     @Mock
     private TbContext ctxMock;
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java
index 1131586a07..edeb72ba59 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java
@@ -55,7 +55,7 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback;
 public class EntitiesRelatedEntityIdAsyncLoaderTest {
 
     private static final EntityId ASSET_ORIGINATOR_ID = new AssetId(UUID.randomUUID());
-    private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID());
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID());
     private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE;
 
     private TbContext ctxMock;

From 4927efa07763d4b623410df0dfb2de51fcf8f2bd Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Sat, 25 Apr 2026 00:09:18 +0200
Subject: [PATCH 35/91] Technical cleanup of deprecated validator API calls

---
 .../BaseComponentDescriptorService.java       |  2 +-
 .../server/dao/rule/BaseRuleChainService.java | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
index 5e9292af5f..4f2228fe57 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
@@ -60,7 +60,7 @@ public class BaseComponentDescriptorService implements ComponentDescriptorServic
 
     @Override
     public ComponentDescriptor findById(TenantId tenantId, ComponentDescriptorId componentId) {
-        Validator.validateId(componentId, "Incorrect component id for search request.");
+        Validator.validateId(componentId, id -> "Incorrect component id for search request.");
         return componentDescriptorDao.findById(tenantId, componentId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
index 6b90b6fac6..d78c8cf780 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
@@ -187,7 +187,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Transactional
     @Override
     public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater, boolean publishSaveEvent) {
-        Validator.validateId(ruleChainMetaData.getRuleChainId(), "Incorrect rule chain id.");
+        Validator.validateId(ruleChainMetaData.getRuleChainId(), id -> "Incorrect rule chain id.");
         RuleChain ruleChain = findRuleChainById(tenantId, ruleChainMetaData.getRuleChainId());
         if (ruleChain == null) {
             return RuleChainUpdateResult.failed();
@@ -340,7 +340,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChainMetaData loadRuleChainMetaData(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id.");
         RuleChain ruleChain = findRuleChainById(tenantId, ruleChainId);
         if (ruleChain == null) {
             return null;
@@ -381,37 +381,37 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChain findRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         return ruleChainDao.findById(tenantId, ruleChainId.getId());
     }
 
     @Override
     public RuleNode findRuleNodeById(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         return ruleNodeDao.findById(tenantId, ruleNodeId.getId());
     }
 
     @Override
     public ListenableFuture<RuleChain> findRuleChainByIdAsync(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         return ruleChainDao.findByIdAsync(tenantId, ruleChainId.getId());
     }
 
     @Override
     public ListenableFuture<RuleNode> findRuleNodeByIdAsync(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         return ruleNodeDao.findByIdAsync(tenantId, ruleNodeId.getId());
     }
 
     @Override
     public RuleChain getRootTenantRuleChain(TenantId tenantId) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search request.");
         return ruleChainDao.findRootRuleChainByTenantIdAndType(tenantId.getId(), RuleChainType.CORE);
     }
 
     @Override
     public List<RuleNode> getRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         List<EntityRelation> relations = getRuleChainToNodeRelations(tenantId, ruleChainId);
         List<RuleNode> ruleNodes = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -427,7 +427,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public List<RuleNode> getReferencingRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         List<EntityRelation> relations = getNodeToRuleChainRelations(tenantId, ruleChainId);
         List<RuleNode> ruleNodes = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -441,7 +441,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public List<EntityRelation> getRuleNodeRelations(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         List<EntityRelation> relations = relationService.findByFrom(tenantId, ruleNodeId, RelationTypeGroup.RULE_NODE);
         List<EntityRelation> validRelations = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -468,7 +468,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public PageData<RuleChain> findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, PageLink pageLink) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search rule chain request.");
         Validator.validatePageLink(pageLink);
         return ruleChainDao.findRuleChainsByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
@@ -481,7 +481,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Override
     @Transactional
     public void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for delete request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for delete request.");
         RuleChain ruleChain = ruleChainDao.findById(tenantId, ruleChainId.getId());
         if (ruleChain == null) {
             return;
@@ -520,7 +520,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Transactional
     @Override
     public void deleteRuleChainsByTenantId(TenantId tenantId) {
-        Validator.validateId(tenantId, "Incorrect tenant id for delete rule chains request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for delete rule chains request.");
         tenantRuleChainsRemover.removeEntities(tenantId, tenantId);
     }
 
@@ -532,7 +532,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChainData exportTenantRuleChains(TenantId tenantId, PageLink pageLink) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search rule chain request.");
         Validator.validatePageLink(pageLink);
         PageData<RuleChain> ruleChainData = ruleChainDao.findRuleChainsByTenantId(tenantId.getId(), pageLink);
         List<RuleChain> ruleChains = ruleChainData.getData();

From 1d2b27450ed5f7d6902b51a6a07cc48a4b97b19c Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Tue, 19 May 2026 15:25:43 +0200
Subject: [PATCH 36/91] Technical cleanup of deprecated Curator API in
 ZooKeeper discovery

---
 .../queue/discovery/ZkDiscoveryService.java   | 48 ++++++++++---------
 .../discovery/ZkDiscoveryServiceTest.java     | 31 ++++++------
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
index ccc242a1a3..47c2761020 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
@@ -26,9 +26,8 @@ import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
 import org.apache.curator.framework.imps.CuratorFrameworkState;
 import org.apache.curator.framework.recipes.cache.ChildData;
-import org.apache.curator.framework.recipes.cache.PathChildrenCache;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheListener;
+import org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
 import org.apache.curator.framework.state.ConnectionState;
 import org.apache.curator.framework.state.ConnectionStateListener;
 import org.apache.curator.retry.RetryForever;
@@ -54,12 +53,12 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_REMOVED;
+import static org.apache.curator.framework.recipes.cache.CuratorCacheAccessor.parentPathFilter;
 
 @Service
 @ConditionalOnProperty(prefix = "zk", value = "enabled", havingValue = "true", matchIfMissing = false)
 @Slf4j
-public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheListener {
+public class ZkDiscoveryService implements DiscoveryService {
 
     @Value("${zk.url}")
     private String zkUrl;
@@ -84,7 +83,7 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
     private ScheduledExecutorService zkExecutorService;
     @Getter
     private CuratorFramework client;
-    private PathChildrenCache cache;
+    private CuratorCache cache;
     private String nodePath;
     private String zkNodesDir;
 
@@ -117,7 +116,8 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
 
     @Override
     public List<TransportProtos.ServiceInfo> getOtherServers() {
-        return cache.getCurrentData().stream()
+        return cache.stream()
+                .filter(parentPathFilter(zkNodesDir))
                 .filter(cd -> !cd.getPath().equals(nodePath))
                 .map(cd -> {
                     try {
@@ -241,7 +241,8 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
             client = CuratorFrameworkFactory.newClient(zkUrl, zkSessionTimeout, zkConnectionTimeout, new RetryForever(zkRetryInterval));
             client.start();
             client.blockUntilConnected();
-            cache = new PathChildrenCache(client, zkNodesDir, true);
+            client.createContainers(zkNodesDir);
+            cache = CuratorCache.builder(client, zkNodesDir).build();
             cache.start();
             stopped = false;
             log.info("ZK client connected");
@@ -254,7 +255,7 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
     }
 
     private void subscribeToEvents() {
-        cache.getListenable().addListener(this);
+        cache.listenable().addListener(this::onCacheEvent);
     }
 
     private void unpublishCurrentServer() {
@@ -286,29 +287,32 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
         return "The " + propertyName + " property need to be set!";
     }
 
-    @Override
-    public void childEvent(CuratorFramework curatorFramework, PathChildrenCacheEvent pathChildrenCacheEvent) throws Exception {
+    @SneakyThrows
+    void onCacheEvent(CuratorCacheListener.Type type, ChildData oldData, ChildData newData) {
         if (stopped) {
-            log.debug("Ignoring {}. Service is stopped.", pathChildrenCacheEvent);
+            log.debug("Ignoring {}. Service is stopped.", type);
             return;
         }
         if (client.getState() != CuratorFrameworkState.STARTED) {
-            log.debug("Ignoring {}, ZK client is not started, ZK client state [{}]", pathChildrenCacheEvent, client.getState());
+            log.debug("Ignoring {}, ZK client is not started, ZK client state [{}]", type, client.getState());
             return;
         }
-        ChildData data = pathChildrenCacheEvent.getData();
+        ChildData data = type == CuratorCacheListener.Type.NODE_DELETED ? oldData : newData;
         if (data == null) {
-            log.debug("Ignoring {} due to empty child data", pathChildrenCacheEvent);
+            log.debug("Ignoring {} due to empty child data", type);
             return;
         } else if (data.getData() == null) {
-            log.debug("Ignoring {} due to empty child's data", pathChildrenCacheEvent);
+            log.debug("Ignoring {} due to empty child's data", type);
+            return;
+        } else if (zkNodesDir.equals(data.getPath())) {
+            log.debug("Ignoring event about parent node {}", data.getPath());
             return;
         } else if (nodePath != null && nodePath.equals(data.getPath())) {
-            if (pathChildrenCacheEvent.getType() == CHILD_REMOVED) {
+            if (type == CuratorCacheListener.Type.NODE_DELETED) {
                 log.info("ZK node for current instance is somehow deleted.");
                 publishCurrentServer();
             }
-            log.debug("Ignoring event about current server {}", pathChildrenCacheEvent);
+            log.debug("Ignoring event about current server {}", data.getPath());
             return;
         }
         TransportProtos.ServiceInfo instance;
@@ -322,9 +326,9 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
         String serviceId = instance.getServiceId();
         ProtocolStringList serviceTypesList = instance.getServiceTypesList();
 
-        log.trace("Processing [{}] event for [{}]", pathChildrenCacheEvent.getType(), serviceId);
-        switch (pathChildrenCacheEvent.getType()) {
-            case CHILD_ADDED:
+        log.trace("Processing [{}] event for [{}]", type, serviceId);
+        switch (type) {
+            case NODE_CREATED:
                 ScheduledFuture<?> task = delayedTasks.remove(serviceId);
                 if (task != null) {
                     if (task.cancel(false)) {
@@ -341,7 +345,7 @@ public class ZkDiscoveryService implements DiscoveryService, PathChildrenCacheLi
                     recalculatePartitions();
                 }
                 break;
-            case CHILD_REMOVED:
+            case NODE_DELETED:
                 zkExecutorService.submit(() -> applicationEventPublisher.publishEvent(new OtherServiceShutdownEvent(this, serviceId, serviceTypesList)));
                 ScheduledFuture<?> future = zkExecutorService.schedule(() -> {
                     log.debug("[{}] Going to recalculate partitions due to removed node [{}]",
diff --git a/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java b/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
index 74bf30dca6..a7be216f66 100644
--- a/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
+++ b/common/queue/src/test/java/org/thingsboard/server/queue/discovery/ZkDiscoveryServiceTest.java
@@ -18,8 +18,8 @@ package org.thingsboard.server.queue.discovery;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.imps.CuratorFrameworkState;
 import org.apache.curator.framework.recipes.cache.ChildData;
-import org.apache.curator.framework.recipes.cache.PathChildrenCache;
-import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
+import org.apache.curator.framework.recipes.cache.CuratorCache;
+import org.apache.curator.framework.recipes.cache.CuratorCacheListener;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -36,8 +36,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 
-import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_ADDED;
-import static org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent.Type.CHILD_REMOVED;
+import static org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type.NODE_CREATED;
+import static org.apache.curator.framework.recipes.cache.CuratorCacheListener.Type.NODE_DELETED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -63,12 +63,10 @@ public class ZkDiscoveryServiceTest {
     private CuratorFramework client;
 
     @Mock
-    private PathChildrenCache cache;
-
-    @Mock
-    private CuratorFramework curatorFramework;
+    private CuratorCache cache;
 
     private ZkDiscoveryService zkDiscoveryService;
+    private List<ChildData> dataList;
 
     private static final long RECALCULATE_DELAY = 100L;
 
@@ -89,12 +87,13 @@ public class ZkDiscoveryServiceTest {
         ReflectionTestUtils.setField(zkDiscoveryService, "zkExecutorService", zkExecutorService);
         ReflectionTestUtils.setField(zkDiscoveryService, "recalculateDelay", RECALCULATE_DELAY);
         ReflectionTestUtils.setField(zkDiscoveryService, "zkDir", "/thingsboard");
+        ReflectionTestUtils.setField(zkDiscoveryService, "zkNodesDir", "/thingsboard/nodes");
 
         when(serviceInfoProvider.getServiceInfo()).thenReturn(currentInfo);
 
-        List<ChildData> dataList = new ArrayList<>();
+        dataList = new ArrayList<>();
         dataList.add(currentData);
-        when(cache.getCurrentData()).thenReturn(dataList);
+        when(cache.stream()).thenAnswer(inv -> dataList.stream());
     }
 
     @Test
@@ -178,14 +177,14 @@ public class ZkDiscoveryServiceTest {
         verify(partitionService, times(1)).recalculatePartitions(eq(currentInfo), eq(List.of(anotherInfo, childInfo)));
     }
 
-    private void startNode(ChildData data) throws Exception {
-        cache.getCurrentData().add(data);
-        zkDiscoveryService.childEvent(curatorFramework, new PathChildrenCacheEvent(CHILD_ADDED, data));
+    private void startNode(ChildData data) {
+        dataList.add(data);
+        zkDiscoveryService.onCacheEvent(NODE_CREATED, null, data);
     }
 
-    private void stopNode(ChildData data) throws Exception {
-        cache.getCurrentData().remove(data);
-        zkDiscoveryService.childEvent(curatorFramework, new PathChildrenCacheEvent(CHILD_REMOVED, data));
+    private void stopNode(ChildData data) {
+        dataList.remove(data);
+        zkDiscoveryService.onCacheEvent(NODE_DELETED, data, null);
     }
 
 }

From 189cb17852ce5f5af95160ff31b84039b70faa2e Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Mon, 27 Apr 2026 09:45:21 +0200
Subject: [PATCH 37/91] Updated REST client timeout API to non-deprecated
 variants

---
 .../channels/MicrosoftTeamsNotificationChannel.java           | 4 ++--
 .../main/java/org/thingsboard/monitoring/client/TbClient.java | 4 ++--
 .../notification/channels/impl/SlackNotificationChannel.java  | 4 ++--
 .../service/transport/impl/HttpTransportHealthChecker.java    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java b/application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java
index d023ed9b53..459c857d02 100644
--- a/application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java
@@ -54,8 +54,8 @@ public class MicrosoftTeamsNotificationChannel implements NotificationChannel<Mi
 
     @Setter
     private RestTemplate restTemplate = new RestTemplateBuilder()
-            .setConnectTimeout(Duration.of(15, ChronoUnit.SECONDS))
-            .setReadTimeout(Duration.of(15, ChronoUnit.SECONDS))
+            .connectTimeout(Duration.of(15, ChronoUnit.SECONDS))
+            .readTimeout(Duration.of(15, ChronoUnit.SECONDS))
             .build();
 
     @Override
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java b/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
index 584b2edc48..64dbde1cdb 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
@@ -34,8 +34,8 @@ public class TbClient extends RestClient {
     public TbClient(@Value("${monitoring.rest.base_url}") String baseUrl,
                     @Value("${monitoring.rest.request_timeout_ms}") int requestTimeoutMs) {
         super(new RestTemplateBuilder()
-                .setConnectTimeout(Duration.ofMillis(requestTimeoutMs))
-                .setReadTimeout(Duration.ofMillis(requestTimeoutMs))
+                .connectTimeout(Duration.ofMillis(requestTimeoutMs))
+                .readTimeout(Duration.ofMillis(requestTimeoutMs))
                 .build(), baseUrl);
     }
 
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
index c1d25c43c0..5c0df4f6fe 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
@@ -40,8 +40,8 @@ public class SlackNotificationChannel implements NotificationChannel {
     @PostConstruct
     private void init() {
         restTemplate = new RestTemplateBuilder()
-                .setConnectTimeout(Duration.ofSeconds(5))
-                .setReadTimeout(Duration.ofSeconds(2))
+                .connectTimeout(Duration.ofSeconds(5))
+                .readTimeout(Duration.ofSeconds(2))
                 .build();
     }
 
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java
index 948ac9fd7e..9a99034d69 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java
@@ -43,8 +43,8 @@ public class HttpTransportHealthChecker extends TransportHealthChecker<HttpTrans
     protected void initClient() throws Exception {
         if (restTemplate == null) {
             restTemplate = new RestTemplateBuilder()
-                    .setConnectTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
-                    .setReadTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
+                    .connectTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
+                    .readTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
                     .build();
             log.debug("Initialized HTTP client");
         }

From 3a1027798038de91988e217002d3b74812beb717 Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Mon, 27 Apr 2026 15:08:24 +0200
Subject: [PATCH 38/91] Replaced 5 deprecated APIs with non-deprecated variants

---
 .../service/security/model/token/JwtTokenFactory.java    | 2 +-
 .../server/service/sync/vc/VersionControlTest.java       | 2 +-
 .../transport/lwm2m/AbstractLwM2MIntegrationTest.java    | 2 +-
 .../server/transport/http/DeviceApiControllerTest.java   | 7 ++++---
 .../java/org/thingsboard/common/util/JacksonUtil.java    | 7 ++-----
 .../java/org/thingsboard/common/util/TbStopWatch.java    | 6 +++---
 .../rule/engine/ai/Langchain4jJsonSchemaAdapter.java     | 2 +-
 .../rule/engine/transform/TbCopyKeysNode.java            | 5 +----
 .../thingsboard/client/tools/i18n/TranslationPruner.java | 9 ++-------
 9 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
index 051e061857..026673a1ed 100644
--- a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
@@ -23,9 +23,9 @@ import io.jsonwebtoken.JwtBuilder;
 import io.jsonwebtoken.JwtParser;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.SignatureException;
 import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.Keys;
+import io.jsonwebtoken.security.SignatureException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
diff --git a/application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java b/application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java
index 0305d031b8..e182a510c5 100644
--- a/application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java
@@ -477,7 +477,7 @@ public class VersionControlTest extends AbstractControllerTest {
         Dashboard importedOtherDashboard = findDashboard(otherDashboard.getName());
         Dashboard importedDashboard = findDashboard(dashboard.getName());
 
-        Map.Entry<String, JsonNode> entityAlias = importedDashboard.getConfiguration().get("entityAliases").fields().next();
+        Map.Entry<String, JsonNode> entityAlias = importedDashboard.getConfiguration().get("entityAliases").properties().iterator().next();
         assertThat(entityAlias.getKey()).isEqualTo(aliasId);
         assertThat(entityAlias.getValue().get("id").asText()).isEqualTo(aliasId);
 
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
index 4d5114425f..258a173451 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/AbstractLwM2MIntegrationTest.java
@@ -102,10 +102,10 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import static org.awaitility.Awaitility.await;
 import static org.eclipse.leshan.client.object.Security.noSec;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.timeout;
diff --git a/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java b/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java
index 397ea791c6..fcdb2b04ea 100644
--- a/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java
+++ b/common/transport/http/src/test/java/org/thingsboard/server/transport/http/DeviceApiControllerTest.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.transport.http;
 import com.google.gson.JsonParseException;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
+import org.springframework.http.HttpInputMessage;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.context.request.async.DeferredResult;
@@ -37,7 +38,7 @@ class DeviceApiControllerTest {
         };
         var callback = new DeviceApiController.DeviceAuthCallback(transportContext, responseWriter, onSuccess);
 
-        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax", (HttpInputMessage) null));
 
         callback.onError(new JsonParseException("Json ; expected"));
 
@@ -51,7 +52,7 @@ class DeviceApiControllerTest {
         DeferredResult<ResponseEntity> responseWriter = Mockito.mock(DeferredResult.class);
         var callback = new DeviceApiController.DeviceProvisionCallback(responseWriter);
 
-        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax", (HttpInputMessage) null));
 
         callback.onError(new JsonParseException("Json ; expected"));
 
@@ -71,7 +72,7 @@ class DeviceApiControllerTest {
 
         var callback = new DeviceApiController.GetOtaPackageCallback(transportContext, responseWriter, title, version, chunkSize, chunk);
 
-        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax"));
+        callback.onError(new HttpMessageNotReadableException("JSON incorrect syntax", (HttpInputMessage) null));
 
         callback.onError(new JsonParseException("Json ; expected"));
 
diff --git a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
index cf547cb9d4..ee57d31129 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
@@ -447,10 +447,8 @@ public class JacksonUtil {
 
     private static void toFlatMap(JsonNode node, String currentPath, Map<String, String> map) {
         if (node.isObject()) {
-            Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
             currentPath = currentPath.isEmpty() ? "" : currentPath + ".";
-            while (fields.hasNext()) {
-                Map.Entry<String, JsonNode> entry = fields.next();
+            for (Map.Entry<String, JsonNode> entry : node.properties()) {
                 toFlatMap(entry.getValue(), currentPath + entry.getKey(), map);
             }
         } else if (node.isValueNode()) {
@@ -554,8 +552,7 @@ public class JacksonUtil {
                         }
                     } else if (node.isObject()) {
                         ObjectNode on = (ObjectNode) node;
-                        for (Iterator<Map.Entry<String, JsonNode>> it = on.fields(); it.hasNext(); ) {
-                            var kv = it.next();
+                        for (Map.Entry<String, JsonNode> kv : on.properties()) {
                             if (variableName != null) {
                                 tasks.add(task.next(kv.getValue(), variableName, kv.getKey()));
                             } else {
diff --git a/common/util/src/main/java/org/thingsboard/common/util/TbStopWatch.java b/common/util/src/main/java/org/thingsboard/common/util/TbStopWatch.java
index 3a8b94c56e..fab0a72d3d 100644
--- a/common/util/src/main/java/org/thingsboard/common/util/TbStopWatch.java
+++ b/common/util/src/main/java/org/thingsboard/common/util/TbStopWatch.java
@@ -52,17 +52,17 @@ public class TbStopWatch extends StopWatch {
 
     public long stopAndGetTotalTimeNanos(){
         stop();
-        return getLastTaskTimeNanos();
+        return lastTaskInfo().getTimeNanos();
     }
 
     public long stopAndGetLastTaskTimeMillis(){
         stop();
-        return getLastTaskTimeMillis();
+        return lastTaskInfo().getTimeMillis();
     }
 
     public long stopAndGetLastTaskTimeNanos(){
         stop();
-        return getLastTaskTimeNanos();
+        return lastTaskInfo().getTimeNanos();
     }
 
 }
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/Langchain4jJsonSchemaAdapter.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/Langchain4jJsonSchemaAdapter.java
index afe4372101..a6d1c60730 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/Langchain4jJsonSchemaAdapter.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/Langchain4jJsonSchemaAdapter.java
@@ -94,7 +94,7 @@ final class Langchain4jJsonSchemaAdapter {
 
         JsonNode propertiesNode = objectSchema.get("properties");
         if (propertiesNode != null) {
-            propertiesNode.fields().forEachRemaining(entry -> {
+            propertiesNode.properties().forEach(entry -> {
                 String key = entry.getKey();
                 JsonNode value = entry.getValue();
                 builder.addProperty(key, parse(value));
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
index 08919f37fe..f9e732a53d 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbCopyKeysNode.java
@@ -29,7 +29,6 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.msg.TbMsg;
 
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -87,9 +86,7 @@ public class TbCopyKeysNode extends TbAbstractTransformNodeWithTbMsgSource {
                     msgData = JacksonUtil.toString(msgDataNode);
                     break;
                 case DATA:
-                    Iterator<Map.Entry<String, JsonNode>> iteratorNode = dataNode.fields();
-                    while (iteratorNode.hasNext()) {
-                        Map.Entry<String, JsonNode> entry = iteratorNode.next();
+                    for (Map.Entry<String, JsonNode> entry : dataNode.properties()) {
                         String msgKey = entry.getKey();
                         JsonNode msgValue = entry.getValue();
                         if (matches(msgKey)) {
diff --git a/tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java b/tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java
index 4181180521..6467c72114 100644
--- a/tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java
+++ b/tools/src/main/java/org/thingsboard/client/tools/i18n/TranslationPruner.java
@@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -37,9 +36,7 @@ public class TranslationPruner {
      */
     private static void collectKeys(JsonNode node, String prefix, Set<String> keys) {
         if (!node.isObject()) return;
-        Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
-        while (fields.hasNext()) {
-            Map.Entry<String, JsonNode> entry = fields.next();
+        for (Map.Entry<String, JsonNode> entry : node.properties()) {
             String key = entry.getKey();
             String fullKey = prefix.isEmpty() ? key : prefix + "." + key;
             keys.add(fullKey);
@@ -52,9 +49,7 @@ public class TranslationPruner {
      */
     private static ObjectNode pruneNode(ObjectNode node, Set<String> keys, String prefix, ObjectMapper mapper) {
         ObjectNode pruned = mapper.createObjectNode();
-        Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
-        while (fields.hasNext()) {
-            Map.Entry<String, JsonNode> entry = fields.next();
+        for (Map.Entry<String, JsonNode> entry : node.properties()) {
             String key = entry.getKey();
             JsonNode value = entry.getValue();
             String fullKey = prefix.isEmpty() ? key : prefix + "." + key;

From 5858dd0b390b0f3e5f59e2c20f1035ae416f3a8d Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Fri, 6 Mar 2026 15:47:21 +0200
Subject: [PATCH 39/91] added env section description

# Conflicts:
#	application/src/main/resources/thingsboard.yml
#	msa/js-executor/config/default.yml
---
 .../src/main/resources/thingsboard.yml        | 42 +++++++++++-
 msa/js-executor/config/default.yml            | 64 +++++++++++--------
 .../src/main/resources/tb-vc-executor.yml     |  9 +++
 .../src/main/resources/tb-coap-transport.yml  | 16 ++++-
 .../src/main/resources/tb-http-transport.yml  | 11 ++++
 .../src/main/resources/tb-lwm2m-transport.yml | 11 ++++
 .../src/main/resources/tb-mqtt-transport.yml  | 12 ++++
 .../src/main/resources/tb-snmp-transport.yml  | 12 ++++
 8 files changed, 147 insertions(+), 30 deletions(-)

diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 2c24caa1f2..812b296790 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -15,6 +15,7 @@
 #
 
 # Server common parameters
+# Configures HTTP/HTTPS bind address, port, SSL, WebSocket, and REST API settings.
 server:
   # Server bind-address
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
@@ -114,11 +115,13 @@ server:
       reset_password_per_user: "${RESET_PASSWORD_PER_USER_RATE_LIMIT_CONFIGURATION:5:3600}"
 
 # Application info parameters
+# Exposes application metadata such as version string injected at build time.
 app:
   # Application version
   version: "@project.version@"
 
 # Zookeeper connection parameters
+# Controls ZooKeeper-based service discovery and cluster coordination for microservice deployments.
 zk:
   # Enable/disable zookeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
@@ -138,6 +141,7 @@ zk:
   recalculate_delay: "${ZOOKEEPER_RECALCULATE_DELAY_MS:0}"
 
 # Cluster parameters
+# Controls inter-node communication statistics within a ThingsBoard cluster.
 cluster:
   stats:
     # Enable/Disable the cluster statistics. Calculates the number of messages sent between cluster nodes based on each type
@@ -146,11 +150,13 @@ cluster:
     print_interval_ms: "${TB_CLUSTER_STATS_PRINT_INTERVAL_MS:10000}"
 
 # Plugins configuration parameters
+# Defines classpath scan packages used to discover and register ThingsBoard extension plugins.
 plugins:
   # Comma-separated package list used during classpath scanning for plugins
   scan_packages: "${PLUGINS_SCAN_PACKAGES:org.thingsboard.server.extensions,org.thingsboard.rule.engine}"
 
 # Security parameters
+# Configures JWT tokens, user login, device claiming, OAuth2, and CA certificate trust store.
 security:
   # JWT Token parameters
   jwt: # Since 3.4.2 values are persisted in the database during installation or upgrade. On Install, the key will be generated randomly if no custom value set. You can change it later from Web UI under SYS_ADMIN
@@ -237,6 +243,7 @@ security:
       report-only: "${SECURITY_HEADERS_CONTENT_SECURITY_POLICY_REPORT_ONLY:false}"
 
 # Mail settings parameters
+# Configures mail service OAuth2 token refresh and per-tenant sending rate limits.
 mail:
   oauth2:
     # Interval for checking refresh token expiration in seconds(by default, 1 day).
@@ -245,6 +252,7 @@ mail:
   per_tenant_rate_limits: "${MAIL_PER_TENANT_RATE_LIMITS:}"
 
 # Usage statistics parameters
+# Controls collection and reporting intervals for API usage stats at system, tenant, and customer levels.
 usage:
   stats:
     report:
@@ -266,6 +274,7 @@ usage:
       report_interval: "${DEVICES_STATS_REPORT_INTERVAL:60}"
 
 # UI settings parameters
+# Configures dashboard data limits and base URL for UI help assets.
 ui:
   # Dashboard parameters
   dashboard:
@@ -277,6 +286,7 @@ ui:
     base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-4.2.2}"
 
 # Database telemetry parameters
+# Selects the storage backend (SQL, Cassandra, or TimescaleDB) for time-series and latest telemetry data.
 database:
   ts_max_intervals: "${DATABASE_TS_MAX_INTERVALS:700}" # Max number of DB queries generated by a single API call to fetch telemetry records
   ts:
@@ -285,6 +295,7 @@ database:
     type: "${DATABASE_TS_LATEST_TYPE:sql}" # cassandra, sql, or timescale (for hybrid mode, DATABASE_TS_TYPE value should be cassandra, or timescale)
 
 # Cassandra driver configuration parameters
+# Configures cluster name, keyspace, SSL, credentials, socket, and query settings for the Cassandra driver.
 cassandra:
   # Thingsboard cluster name
   cluster_name: "${CASSANDRA_CLUSTER_NAME:Thingsboard Cluster}"
@@ -403,6 +414,7 @@ cassandra:
       print_tenant_names: "${CASSANDRA_QUERY_TENANT_RATE_LIMITS_PRINT_TENANT_NAMES:false}"
 
 # SQL configuration parameters
+# Tunes batch sizes, delays, thread counts, TTL, and partitioning for SQL-backed persistence of telemetry, events, and audit logs.
 sql:
   # Specify batch size for persisting attribute updates
   attributes:
@@ -504,6 +516,7 @@ sql:
     query_timeout: "${SQL_RELATIONS_QUERY_TIMEOUT_SEC:20}" # This value has to be reasonably small to prevent the relation query from blocking all other DB calls
 
 # Actor system parameters
+# Configures thread pools, timeouts, and behavior for the internal actor system processing devices, rules, and RPCs.
 actors:
   system:
     throughput: "${ACTORS_SYSTEM_THROUGHPUT:5}" # Number of messages the actor system will process per actor before switching to processing of messages for the next actor
@@ -620,6 +633,8 @@ actors:
     # Time in seconds to receive calculation result.
     calculation_timeout: "${ACTORS_CALCULATION_TIMEOUT_SEC:5}"
 
+# Debug settings parameters
+# Configures the global default duration for debug mode used by rule chains and calculated fields.
 debug:
   settings:
     # Default duration (in minutes) for debug mode. Min value is 1 minute. Tenant profile settings override this one.
@@ -627,6 +642,7 @@ debug:
     default_duration: "${DEBUG_SETTINGS_DEFAULT_DURATION_MINUTES:15}"
 
 # Cache settings parameters
+# Configures cache type (Caffeine or Redis), pool size, and per-entity TTL and max-size limits for all caches.
 cache:
   # caffeine or redis(7.2 - latest compatible version)
   type: "${CACHE_TYPE:caffeine}"
@@ -780,6 +796,7 @@ cache:
 spring.data.redis.repositories.enabled: false # Disable this because it is not required.
 
 # Redis/Valkey configuration parameters
+# Configures standalone, cluster, or sentinel Redis connection, SSL, and connection pool settings used for caching.
 redis:
   # standalone or cluster or sentinel
   connection:
@@ -863,6 +880,7 @@ redis:
 
 
 # Update version parameters
+# Controls whether the platform periodically checks for new ThingsBoard releases.
 updates:
   # Enable/disable checks for the new version
   enabled: "${UPDATES_ENABLED:true}"
@@ -891,6 +909,7 @@ spring.mvc.cors:
       allow-credentials: "${TB_CORS_ALLOW_CREDENTIALS:true}"
 
 # General spring parameters
+# Miscellaneous Spring Boot settings for circular references, Freemarker, MVC, multipart, and JPA dialect.
 spring.main.allow-circular-references: "true" # Spring Boot configuration property that controls whether circular dependencies between beans are allowed.
 spring.freemarker.checkTemplateLocation: "false" # spring freemarker configuration
 spring.mvc.async.request-timeout: "${SPRING_MVC_ASYNC_REQUEST_TIMEOUT:30000}" # The default timeout for asynchronous requests in milliseconds
@@ -909,6 +928,7 @@ spring.jpa.properties.hibernate.order_by.default_null_ordering: "${SPRING_JPA_PR
 spring.jpa.properties.hibernate.dialect: "${SPRING_JPA_DIALECT:org.thingsboard.server.dao.ThingsboardPostgreSQLDialect}" # we use custom dialect that contains ilike(arg1, arg2) function (is interpreted to postgres ILIKE operator)
 
 # SQL DAO Configuration parameters
+# Configures Spring JPA, Hibernate DDL, and HikariCP datasource connections for the primary and events databases.
 spring:
   data:
     jpa:
@@ -959,6 +979,7 @@ spring:
         registerMbeans: "${SPRING_EVENTS_DATASOURCE_HIKARI_REGISTER_MBEANS:false}"
 
 # Audit log parameters
+# Configures audit logging levels per entity type and optional forwarding to an external sink such as Elasticsearch.
 audit-log:
   # Enable/disable audit log functionality.
   enabled: "${AUDIT_LOG_ENABLED:true}"
@@ -1001,6 +1022,7 @@ audit-log:
     password: "${AUDIT_LOG_SINK_PASSWORD:}" # Password used to access external sink system
 
 # Device state parameters
+# Configures device inactivity detection, state persistence strategy, and rate limits for state rule nodes.
 state:
   # Device inactivity timeout is a global configuration parameter that defines when the device will be marked as "inactive" by the server.
   # The parameter value is in seconds. A user can overwrite this parameter for an individual device by setting the “inactivityTimeout” server-side attribute (NOTE: expects value in milliseconds).
@@ -1031,7 +1053,8 @@ state:
         # Refill is set to be greedy. Please refer to Bucket4j library documentation for more details.
         rateLimit: "${DEVICE_STATE_NODE_RATE_LIMIT_CONFIGURATION:1:1,30:60,60:3600}"
 
-# Tbel parameters
+# TBEL parameters
+# Configures the ThingsBoard Expression Language (TBEL) engine: limits, timeouts, thread pool, and blacklisting.
 tbel:
   # Enable/Disable TBEL feature.
   enabled: "${TBEL_ENABLED:true}"
@@ -1060,6 +1083,7 @@ tbel:
     print_interval_ms: "${TB_TBEL_STATS_PRINT_INTERVAL_MS:10000}"
 
 # JS parameters
+# Configures the JavaScript execution engine (local Nashorn or remote Node.js): limits, sandboxing, and thread pools.
 js:
   # local (Nashorn Engine, deprecated) OR remote JS-Executors (NodeJS)
   evaluator: "${JS_EVALUATOR:local}"
@@ -1107,6 +1131,7 @@ js:
       print_interval_ms: "${TB_JS_REMOTE_STATS_PRINT_INTERVAL_MS:10000}"
 
 # Transport configuration parameters
+# Configures session management, rate limits, and protocol-specific settings for HTTP, MQTT, CoAP, LwM2M, and SNMP transports.
 transport:
   sessions:
     # Session inactivity timeout is a global configuration parameter that defines how long the device transport session will be opened after the last message arrives from the device.
@@ -1426,6 +1451,7 @@ transport:
         check_interval_seconds: "${TB_TRANSPORT_SSL_CERTIFICATE_RELOAD_CHECK_INTERVAL_SECONDS:60}"
 
 # CoAP server parameters
+# Configures the standalone CoAP server bind address, port, DTLS encryption, and credential settings.
 coap:
   server:
     # Enable/disable coap server.
@@ -1510,6 +1536,7 @@ coap:
       dtls_session_report_timeout: "${TB_COAP_X509_DTLS_SESSION_REPORT_TIMEOUT:1800000}"
 
 # Device connectivity parameters
+# Specifies the hosts, ports, and credentials exposed to the UI for generating device connection check commands.
 device:
   connectivity:
     http:
@@ -1563,6 +1590,7 @@ device:
       image_version: "${DEVICE_CONNECTIVITY_GATEWAY_IMAGE_VERSION:3.8-stable}"
 
 # Edges parameters
+# Controls Edge instance gRPC communication, event storage, state persistence, and statistics reporting.
 edges:
   # Enable/disable Edge instance
   enabled: "${EDGES_ENABLED:true}"
@@ -1626,6 +1654,7 @@ edges:
     report-interval-millis: "${EDGES_STATS_REPORT_INTERVAL_MS:600000}"
 
 # Spring doc common parameters
+# Enables or disables the OpenAPI/Swagger documentation endpoint and sets the default media type.
 springdoc:
   # If false swagger API docs will be unavailable
   api-docs.enabled: "${SWAGGER_ENABLED:true}"
@@ -1633,6 +1662,7 @@ springdoc:
   default-produces-media-type: "${SWAGGER_DEFAULT_PRODUCES_MEDIA_TYPE:application/json}"
 
 # Swagger common parameters
+# Configures Swagger UI metadata: title, description, contact, license, version, and API path patterns.
 swagger:
   # General swagger match pattern of swagger UI links
   api_path: "${SWAGGER_API_PATH:/api/**}"
@@ -1662,6 +1692,7 @@ swagger:
   group_name: "${SWAGGER_GROUP_NAME:thingsboard}"
 
 # Queue configuration parameters
+# Configures the message queue backend (in-memory or Kafka) and all topic/partition/consumer settings for each service.
 queue:
   type: "${TB_QUEUE_TYPE:in-memory}" # in-memory or kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
@@ -2072,12 +2103,14 @@ queue:
       processing_interval: "${TB_QUEUE_TASKS_STATS_PROCESSING_INTERVAL_MS:1000}"
 
 # Event configuration parameters
+# Controls limits on debug event content size stored for rule chain and rule node execution.
 event:
   debug:
     # Maximum number of symbols per debug event. The event content will be truncated if needed
     max-symbols: "${TB_MAX_DEBUG_EVENT_SYMBOLS:4096}"
 
 # General service parameters
+# Sets the deployment type (monolith or microservice) and assigns tenant profiles to specific Rule Engine instances.
 service:
   type: "${TB_SERVICE_TYPE:monolith}" # monolith or tb-core or tb-rule-engine
   # Unique id for this service (autogenerated if empty)
@@ -2091,6 +2124,7 @@ service:
       executor_thread_pool_size: "${TB_RULE_ENGINE_PUBSUB_EXECUTOR_THREAD_POOL_SIZE:0}"
 
 # Metrics parameters
+# Enables actuator metrics endpoint and configures system info (CPU, memory) persistence frequency and TTL.
 metrics:
   # Enable/disable actuator metrics.
   enabled: "${METRICS_ENABLED:false}"
@@ -2104,6 +2138,7 @@ metrics:
     ttl: "${METRICS_SYSTEM_INFO_TTL_DAYS:7}"
 
 # Version control parameters
+# Configures thread pools and Git repository folder for entity version control (export/import) operations.
 vc:
   # Pool size for handling export tasks
   thread_pool_size: "${TB_VC_POOL_SIZE:6}"
@@ -2114,6 +2149,7 @@ vc:
     repositories-folder: "${TB_VC_GIT_REPOSITORIES_FOLDER:${java.io.tmpdir}/repositories}"
 
 # Notification system parameters
+# Configures thread pool size and deduplication intervals for the notification rule processing engine.
 notification_system:
   # Specify thread pool size for Notification System processing notification rules and notification sending. Recommend value <= 10
   thread_pool_size: "${TB_NOTIFICATION_SYSTEM_THREAD_POOL_SIZE:10}"
@@ -2122,6 +2158,7 @@ notification_system:
     deduplication_durations: "${TB_NOTIFICATION_RULES_DEDUPLICATION_DURATIONS:NEW_PLATFORM_VERSION:0;RATE_LIMITS:14400000;}"
 
 # General management parameters
+# Configures Spring Boot Actuator endpoint exposure and health indicator settings.
 management:
   endpoints:
     web:
@@ -2134,6 +2171,7 @@ management:
       enabled: "false"
 
 # Mobile application settings for Thingsboard mobile application
+# Specifies domain name and store links used for the ThingsBoard Live mobile application QR code and deep links.
 mobileApp:
   # Server domain name for Thingsboard Live mobile application
   domain: "${TB_MOBILE_APP_DOMAIN:demo.thingsboard.io}"
@@ -2142,6 +2180,8 @@ mobileApp:
   # Link to App Store for Thingsboard Live mobile application
   appStoreLink: "${TB_MOBILE_APP_APP_STORE_LINK:https://apps.apple.com/us/app/thingsboard-live/id1594355695}"
 
+# MQTT client settings
+# Configures MQTT client retransmission behavior including max attempts, initial delay, and jitter factor.
 mqtt:
   # MQTT client configuration parameters
   client:
diff --git a/msa/js-executor/config/default.yml b/msa/js-executor/config/default.yml
index 9a33190069..bde09551ac 100644
--- a/msa/js-executor/config/default.yml
+++ b/msa/js-executor/config/default.yml
@@ -14,41 +14,51 @@
 # limitations under the License.
 #
 
-queue_type: "kafka"
-request_topic: "js_eval.requests"
-queue_prefix: ""
-http_port: "8888" # /livenessProbe
+# Queue configuration
+# Defines the messaging queue backend used to dispatch JS evaluation requests to the executor and receive results.
+queue_type: "kafka" # Queue type used for JS evaluation requests: kafka or in-memory
+request_topic: "js_eval.requests" # Kafka topic name for incoming JS evaluation requests
+queue_prefix: "" # Optional prefix applied to all queue/topic names; useful for environment isolation
+http_port: "8888" # HTTP port exposing the /livenessProbe health check endpoint
 
+# JavaScript execution configuration
+# Controls response polling behavior and output size limits for individual JS script executions.
 js:
-  response_poll_interval: "25"
-  max_result_size: "300000"
+  response_poll_interval: "25" # Interval in milliseconds to poll for JS execution responses
+  max_result_size: "300000" # Maximum allowed size in bytes of a JS execution result
 
+# Kafka configuration
+# Connection, producer, and topic settings for the Kafka message broker used as the JS evaluation queue.
 kafka:
   bootstrap:
     # Kafka Bootstrap Servers
     servers: "localhost:9092"
-  replication_factor: "1"
+  replication_factor: "1" # Number of replicas for each Kafka topic partition
   acks: "1" # -1 = all; 0 = no acknowledgments; 1 = only waits for the leader to acknowledge
-  batch_size: "128" # for producer
-  linger_ms: "5" # for producer
+  batch_size: "128" # Maximum number of bytes the producer batches per partition before sending
+  linger_ms: "5" # Time in milliseconds the producer waits before sending a batch, allowing more messages to accumulate
   partitions_consumed_concurrently: "1" # (EXPERIMENTAL) increase this value if you are planning to handle more than one partition (scale up, scale down) - this will decrease the latency
-  requestTimeout: "30000" # The default value in kafkajs is: 30000
-  connectionTimeout: "1000" # The default value in kafkajs is: 1000
-  compression: "none" # gzip, lz4 or none
-  topic_properties: "retention.ms:604800000;segment.bytes:52428800;retention.bytes:104857600;partitions:100;min.insync.replicas:1"
-  use_confluent_cloud: false
-  client_id: "kafkajs" #inject pod name to easy identify the client using /opt/kafka/bin/kafka-consumer-groups.sh
+  requestTimeout: "30000" # Time in milliseconds to wait for a response to a Kafka request before timing out
+  connectionTimeout: "1000" # Time in milliseconds to wait when establishing a connection to a Kafka broker
+  compression: "none" # Message compression codec for the producer: gzip, lz4 or none
+  topic_properties: "retention.ms:604800000;segment.bytes:52428800;retention.bytes:104857600;partitions:100;min.insync.replicas:1" # Semicolon-separated Kafka topic configuration properties applied on topic creation
+  use_confluent_cloud: false # Set to true to enable Confluent Cloud-specific configuration (SSL + SASL)
+  client_id: "kafkajs" # Kafka client identifier; inject the pod name to easily identify the client via kafka-consumer-groups.sh
   ssl:
-    enabled: false
+    enabled: false # Enable SSL/TLS for Kafka broker connections
   confluent:
     sasl:
-      mechanism: "PLAIN"
+      mechanism: "PLAIN" # SASL mechanism for Confluent Cloud authentication: PLAIN, SCRAM-SHA-256, or SCRAM-SHA-512
 
+# Logging configuration
+# Controls log verbosity, output directory, and log file naming pattern for the JS executor service.
 logger:
-  level: "info"
-  path: "logs"
-  filename: "tb-js-executor-%DATE%.log"
+  level: "info" # Log level: trace, debug, info, warn, or error
+  path: "logs" # Directory path where log files are written
+  filename: "tb-js-executor-%DATE%.log" # Log file name pattern; %DATE% is replaced with the current date
 
+# JavaScript execution and monitoring configuration
+# Sandboxing, script caching, and observability settings for the JS script runtime.
 script:
   # WARNING: setting this to "false" is DANGEROUS BY DESIGN. The non-sandbox
   # path compiles and runs user-supplied scripts in the host realm via
@@ -56,10 +66,10 @@ script:
   # (file system, environment variables, child_process, etc.) to script
   # authors. Use "false" only as a performance trade-off in trusted,
   # non-public clusters where every script author is fully trusted.
-  use_sandbox: "true"
-  memory_usage_trace_frequency: "1000"
-  script_body_trace_frequency: "10000"
-  stat_print_frequency: "10000"
-  max_active_scripts: "1000"
-  slow_query_log_ms: "5.000000" #millis
-  slow_query_log_body: "false"
+  use_sandbox: "true" # Run scripts inside an isolated sandbox to prevent access to Node.js internals
+  memory_usage_trace_frequency: "1000" # Log memory usage every N script executions
+  script_body_trace_frequency: "10000" # Log the script body every N script executions
+  stat_print_frequency: "10000" # Print execution statistics every N script executions
+  max_active_scripts: "1000" # Maximum number of compiled scripts kept in the cache
+  slow_query_log_ms: "5.000000" # Execution time threshold in milliseconds above which a script is considered slow and logged
+  slow_query_log_body: "false" # Log the script body when execution time exceeds slow_query_log_ms threshold
diff --git a/msa/vc-executor/src/main/resources/tb-vc-executor.yml b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
index 9ed3299606..0fe37abf22 100644
--- a/msa/vc-executor/src/main/resources/tb-vc-executor.yml
+++ b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
@@ -15,11 +15,13 @@
 #
 
 # Spring common parameters
+# Controls Spring Boot startup mode, web environment type, and bean wiring behaviour.
 spring.main.web-environment: "${WEB_APPLICATION_ENABLE:false}" # If you enabled process metrics you should also enable 'web-environment'.
 spring.main.web-application-type: "${WEB_APPLICATION_TYPE:none}" # If you enabled process metrics you should set 'web-application-type' to 'servlet' value.
 spring.main.allow-circular-references: "true" # Spring Boot configuration property that controls whether circular dependencies between beans are allowed.
 
 # Server common parameters
+# Configures the embedded HTTP server bind address and port used for actuator and metrics endpoints.
 server:
   # Server bind address (has no effect if web-environment is disabled).
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
@@ -46,6 +48,7 @@ zk:
   recalculate_delay: "${ZOOKEEPER_RECALCULATE_DELAY_MS:0}"
 
 # Queue configuration parameters
+# Defines the message queue type (Kafka or in-memory) and all related producer, consumer, and topic settings.
 queue:
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
@@ -196,6 +199,7 @@ queue:
     msg-chunk-size: "${TB_QUEUE_VC_MSG_CHUNK_SIZE:250000}"
 
 # Version control parameters
+# Configures the Git-based version control executor, including thread pools and local repository storage.
 vc:
   # Pool size for handling export tasks
   thread_pool_size: "${TB_VC_POOL_SIZE:6}"
@@ -206,6 +210,7 @@ vc:
     repositories-folder: "${TB_VC_GIT_REPOSITORIES_FOLDER:${java.io.tmpdir}/repositories}"
 
 # Usage statistics parameters
+# Controls collection and reporting of API usage statistics at system, tenant, and customer levels.
 usage:
   stats:
     report:
@@ -219,6 +224,7 @@ usage:
       pack_size: "${USAGE_STATS_REPORT_PACK_SIZE:1024}"
 
 # Metrics parameters
+# Enables actuator-based metrics collection and configures histogram/timer percentile exports.
 metrics:
   # Enable/disable actuator metrics.
   enabled: "${METRICS_ENABLED:false}"
@@ -227,6 +233,7 @@ metrics:
     percentiles: "${METRICS_TIMER_PERCENTILES:0.5}"
 
 # General management parameters
+# Configures Spring Boot Actuator endpoint exposure, including the metrics and info endpoints.
 management:
   endpoints:
     web:
@@ -235,12 +242,14 @@ management:
         include: "${METRICS_ENDPOINTS_EXPOSE:info}"
 
 # Service common properties
+# Identifies this microservice instance by type and optional unique ID for cluster coordination.
 service:
   type: "${TB_SERVICE_TYPE:tb-vc-executor}" # service type
   # Unique id for this service (autogenerated if empty)
   id: "${TB_SERVICE_ID:}"
 
 # Notification system parameters
+# Defines deduplication rules for notification triggers to prevent repeated alerts within a time window.
 notification_system:
   rules:
     # Semicolon-separated deduplication durations (in millis) for trigger types. Format: 'NotificationRuleTriggerType1:123;NotificationRuleTriggerType2:456'
diff --git a/transport/coap/src/main/resources/tb-coap-transport.yml b/transport/coap/src/main/resources/tb-coap-transport.yml
index 1554b3fc24..f84dc04907 100644
--- a/transport/coap/src/main/resources/tb-coap-transport.yml
+++ b/transport/coap/src/main/resources/tb-coap-transport.yml
@@ -15,11 +15,13 @@
 #
 
 # Spring common parameters
+# Controls core Spring Boot application settings such as web environment and application type.
 spring.main.web-environment: "${WEB_APPLICATION_ENABLE:false}" # If you enabled process metrics you should also enable 'web-environment'.
 spring.main.web-application-type: "${WEB_APPLICATION_TYPE:none}" # If you enabled process metrics you should set 'web-application-type' to 'servlet' value.
 spring.main.allow-circular-references: "true" # Spring Boot configuration property that controls whether circular dependencies between beans are allowed.
 
 # Server common parameters
+# Configures the HTTP server bind address and port for the actuator/metrics web endpoint.
 server:
   # Server bind address (has no effect if web-environment is disabled).
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
@@ -27,6 +29,7 @@ server:
   port: "${HTTP_BIND_PORT:8083}"
 
 # Zookeeper connection parameters. Used for service discovery.
+# Defines how this service registers itself and discovers other nodes via Apache ZooKeeper.
 zk:
   # Enable/disable zookeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
@@ -46,6 +49,7 @@ zk:
   recalculate_delay: "${ZOOKEEPER_RECALCULATE_DELAY_MS:0}"
 
 # Cache parameters
+# Configures the caching backend and per-entity cache settings used by the transport service.
 cache:
   # caffeine or redis
   type: "${CACHE_TYPE:redis}"
@@ -55,6 +59,7 @@ cache:
     maxSize: "${CACHE_SPECS_ENTITY_LIMITS_MAX_SIZE:100000}" # 0 means the cache is disabled
 
 # Redis/Valkey configuration parameters
+# Defines connection mode, authentication, SSL, and connection pool settings for Redis or Valkey.
 redis:
   connection:
     # standalone or cluster or sentinel
@@ -90,9 +95,9 @@ redis:
     password: "${REDIS_SENTINEL_PASSWORD:}"
     # if set false will be used pool config build from values of the pool config section
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
-  # db index
+  # Redis logical database index to select after connecting.
   db: "${REDIS_DB:0}"
-  # db password
+  # Password for Redis authentication (leave empty if not required).
   password: "${REDIS_PASSWORD:}"
   # Redis username for ACL authentication (Redis 6.0+). Leave empty for legacy password-only auth
   username: "${REDIS_USERNAME:}"
@@ -181,6 +186,7 @@ transport:
         check_interval_seconds: "${TB_TRANSPORT_SSL_CERTIFICATE_RELOAD_CHECK_INTERVAL_SECONDS:60}"
 
 # CoAP server parameters
+# Configures the CoAP and CoAP/DTLS server endpoints, including bind addresses, timeouts, and TLS credentials.
 coap:
   # CoAP bind-address
   bind_address: "${COAP_BIND_ADDRESS:0.0.0.0}"
@@ -262,6 +268,7 @@ coap:
       dtls_session_report_timeout: "${TB_COAP_X509_DTLS_SESSION_REPORT_TIMEOUT:1800000}"
 
 # Queue configuration parameters
+# Defines the message queue backend (Kafka) and all topic, partition, and consumer settings for inter-service communication.
 queue:
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
@@ -415,12 +422,14 @@ queue:
     poll_interval: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
 
 # Service common properties
+# Identifies this service instance within the ThingsBoard cluster.
 service:
   type: "${TB_SERVICE_TYPE:tb-transport}" # service type
   # Unique id for this service (autogenerated if empty)
   id: "${TB_SERVICE_ID:}"
 
 # Usage statistics parameters
+# Controls reporting of API usage metrics at system, tenant, and customer levels.
 usage:
   stats:
     report:
@@ -434,11 +443,13 @@ usage:
       pack_size: "${USAGE_STATS_REPORT_PACK_SIZE:1024}"
 
 # Metrics parameters
+# Enables Micrometer/Actuator metrics collection and configures the exposed management endpoints.
 metrics:
   # Enable/disable actuator metrics.
   enabled: "${METRICS_ENABLED:false}"
 
 # General management parameters
+# Configures Spring Boot Actuator endpoint exposure for health checks and metrics scraping.
 management:
   endpoints:
     web:
@@ -447,6 +458,7 @@ management:
         include: "${METRICS_ENDPOINTS_EXPOSE:info}"
 
 # Notification system parameters
+# Configures deduplication rules for platform notifications to prevent repeated alerts within a time window.
 notification_system:
   rules:
     # Semicolon-separated deduplication durations (in millis) for trigger types. Format: 'NotificationRuleTriggerType1:123;NotificationRuleTriggerType2:456'
diff --git a/transport/http/src/main/resources/tb-http-transport.yml b/transport/http/src/main/resources/tb-http-transport.yml
index c878887a01..44adcf6e14 100644
--- a/transport/http/src/main/resources/tb-http-transport.yml
+++ b/transport/http/src/main/resources/tb-http-transport.yml
@@ -15,6 +15,7 @@
 #
 
 # Server common properties
+# Configures the HTTP server bind address, port, SSL/TLS settings, and HTTP/2 support.
 server:
   # Server bind address
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
@@ -54,6 +55,7 @@ server:
     enabled: "${HTTP2_ENABLED:true}"
 
 # Spring common parameters
+# Controls Spring Boot framework-level settings such as circular references and multipart upload limits.
 spring.main.allow-circular-references: "true" # Spring Boot configuration property that controls whether circular dependencies between beans are allowed.
 spring.servlet.multipart.max-file-size: "${SPRING_SERVLET_MULTIPART_MAX_FILE_SIZE:50MB}" # Total file size cannot exceed 50MB when configuring file uploads
 spring.servlet.multipart.max-request-size: "${SPRING_SERVLET_MULTIPART_MAX_REQUEST_SIZE:50MB}" # Total request size for a multipart/form-data cannot exceed 50MB
@@ -78,6 +80,7 @@ zk:
   recalculate_delay: "${ZOOKEEPER_RECALCULATE_DELAY_MS:0}"
 
 # Cache parameters
+# Defines the cache backend type and per-entity cache configuration such as TTL and maximum size.
 cache:
   # caffeine or redis
   type: "${CACHE_TYPE:redis}"
@@ -87,6 +90,7 @@ cache:
     maxSize: "${CACHE_SPECS_ENTITY_LIMITS_MAX_SIZE:100000}" # 0 means the cache is disabled
 
 # Redis/Valkey configuration parameters
+# Configures connection mode (standalone, cluster, sentinel), credentials, SSL, and connection pool settings.
 redis:
   # standalone or cluster or sentinel
   connection:
@@ -166,6 +170,7 @@ redis:
     blockWhenExhausted: "${REDIS_POOL_CONFIG_BLOCK_WHEN_EXHAUSTED:true}"
 
 # HTTP server parameters
+# Configures HTTP transport request timeouts, payload limits, session management, JSON processing, logging, and statistics.
 transport:
   http:
     # HTTP request processing timeout in milliseconds
@@ -212,6 +217,7 @@ transport:
         check_interval_seconds: "${TB_TRANSPORT_SSL_CERTIFICATE_RELOAD_CHECK_INTERVAL_SECONDS:60}"
 
 # Queue configuration parameters
+# Configures the messaging queue backend (Kafka), topic definitions, partitioning, and per-service consumer settings.
 queue:
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka) .
@@ -364,12 +370,14 @@ queue:
     poll_interval: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
 
 # General service parameters
+# Defines the service type and unique identifier used for service discovery and cluster coordination.
 service:
   type: "${TB_SERVICE_TYPE:tb-transport}" # type of service
   # Unique id for this service (autogenerated if empty)
   id: "${TB_SERVICE_ID:}"
 
 # Usage statistics parameters
+# Controls reporting of API usage statistics at the system, tenant, and optional customer level.
 usage:
   stats:
     report:
@@ -383,11 +391,13 @@ usage:
       pack_size: "${USAGE_STATS_REPORT_PACK_SIZE:1024}"
 
 # Metrics parameters
+# Enables or disables actuator metrics collection and exposure for monitoring integrations such as Prometheus.
 metrics:
   # Enable/disable actuator metrics.
   enabled: "${METRICS_ENABLED:false}"
 
 # General management parameters
+# Configures Spring Boot Actuator management endpoints, including which endpoints are exposed over HTTP.
 management:
   endpoints:
     web:
@@ -396,6 +406,7 @@ management:
         include: "${METRICS_ENDPOINTS_EXPOSE:info}"
 
 # Notification system parameters
+# Configures notification rules, including deduplication windows to prevent repeated alerts for the same trigger.
 notification_system:
   rules:
     # Semicolon-separated deduplication durations (in millis) for trigger types. Format: 'NotificationRuleTriggerType1:123;NotificationRuleTriggerType2:456'
diff --git a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
index 51b1ad0a2b..cb554fb705 100644
--- a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
+++ b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
@@ -15,11 +15,13 @@
 #
 
 # Spring common parameters
+# Controls Spring Boot web environment and application type settings used for optional metrics exposure.
 spring.main.web-environment: "${WEB_APPLICATION_ENABLE:false}" # If you enabled process metrics you should also enable 'web-environment'.
 spring.main.web-application-type: "${WEB_APPLICATION_TYPE:none}" # If you enabled process metrics you should set 'web-application-type' to 'servlet' value.
 spring.main.allow-circular-references: "true" # Spring Boot configuration property that controls whether circular dependencies between beans are allowed.
 
 # Server common parameters
+# HTTP server bind address and port, effective only when the web environment is enabled.
 server:
   # Server bind address (has no effect if web-environment is disabled).
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
@@ -46,6 +48,7 @@ zk:
   recalculate_delay: "${ZOOKEEPER_RECALCULATE_DELAY_MS:0}"
 
 # Cache parameters
+# Configures the cache backend type and per-entity cache specifications such as TTL and maximum size.
 cache:
   # caffeine or redis
   type: "${CACHE_TYPE:redis}"
@@ -55,6 +58,7 @@ cache:
     maxSize: "${CACHE_SPECS_ENTITY_LIMITS_MAX_SIZE:100000}" # 0 means the cache is disabled
 
 # Redis/Valkey configuration parameters
+# Connection, authentication, SSL, and connection pool settings for the Redis or Valkey cache backend.
 redis:
   connection:
     # standalone or cluster or sentinel
@@ -133,6 +137,7 @@ redis:
     blockWhenExhausted: "${REDIS_POOL_CONFIG_BLOCK_WHEN_EXHAUSTED:true}"
 
 # LWM2M server parameters
+# Session, JSON processing, RPC, logging, and LwM2M-specific transport settings including DTLS, bootstrap, and OTA.
 transport:
   sessions:
     # Session inactivity timeout is a global configuration parameter that defines how long the device transport session will be opened after the last message arrives from the device.
@@ -312,6 +317,7 @@ transport:
         check_interval_seconds: "${TB_TRANSPORT_SSL_CERTIFICATE_RELOAD_CHECK_INTERVAL_SECONDS:60}"
 
 # Queue configuration properties
+# Defines the message queue backend (Kafka) and per-topic settings for transport, core, rule-engine, and JS evaluation.
 queue:
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
@@ -465,12 +471,14 @@ queue:
     poll_interval: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
 
 # Service common parameters
+# Identifies the service type and its unique instance ID within a ThingsBoard cluster.
 service:
   type: "${TB_SERVICE_TYPE:tb-transport}" # service type
   # Unique id for this service (autogenerated if empty)
   id: "${TB_SERVICE_ID:}"
 
 # Usage statistics parameters
+# Controls reporting of API usage statistics at system, tenant, and optionally customer level.
 usage:
   stats:
     report:
@@ -484,11 +492,13 @@ usage:
       pack_size: "${USAGE_STATS_REPORT_PACK_SIZE:1024}"
 
 # Metrics parameters
+# Enables or disables Actuator-based metrics collection (e.g., Prometheus endpoint).
 metrics:
   # Enable/disable actuator metrics.
   enabled: "${METRICS_ENABLED:false}"
 
 # General management parameters
+# Configures Spring Boot Actuator endpoint exposure, e.g. for Prometheus metrics scraping.
 management:
   endpoints:
     web:
@@ -497,6 +507,7 @@ management:
         include: "${METRICS_ENDPOINTS_EXPOSE:info}"
 
 # Notification system parameters
+# Configures deduplication rules for notification triggers to prevent repeated alerts within a time window.
 notification_system:
   rules:
     # Semicolon-separated deduplication durations (in millis) for trigger types. Format: 'NotificationRuleTriggerType1:123;NotificationRuleTriggerType2:456'
diff --git a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
index dfe35db29c..fcdc9000bd 100644
--- a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
+++ b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
@@ -15,11 +15,13 @@
 #
 
 # Spring common parameters
+# Controls Spring Boot application type, web environment, and bean dependency settings.
 spring.main.web-environment: "${WEB_APPLICATION_ENABLE:false}" # If you enabled process metrics you should also enable 'web-environment'.
 spring.main.web-application-type: "${WEB_APPLICATION_TYPE:none}" # If you enabled process metrics you should set 'web-application-type' to 'servlet' value.
 spring.main.allow-circular-references: "true" # Spring Boot configuration property that controls whether circular dependencies between beans are allowed.
 
 # Server common parameters
+# Configures the embedded HTTP server bind address and port for actuator/metrics endpoints.
 server:
   # Server bind address (has no effect if web-environment is disabled).
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
@@ -27,6 +29,7 @@ server:
   port: "${HTTP_BIND_PORT:8083}"
 
 # Zookeeper connection parameters. Used for service discovery.
+# Defines connection, session, retry settings and the node directory path for Zookeeper-based cluster coordination.
 zk:
   # Enable/disable zookeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
@@ -46,6 +49,7 @@ zk:
   recalculate_delay: "${ZOOKEEPER_RECALCULATE_DELAY_MS:0}"
 
 # Cache parameters
+# Configures the cache backend type (Caffeine or Redis) and per-cache TTL and size limits.
 cache:
   # caffeine or redis
   type: "${CACHE_TYPE:redis}"
@@ -55,6 +59,7 @@ cache:
     maxSize: "${CACHE_SPECS_ENTITY_LIMITS_MAX_SIZE:100000}" # 0 means the cache is disabled
 
 # Redis/Valkey configuration parameters
+# Covers connection mode (standalone, cluster, sentinel), SSL, credentials, and connection pool tuning.
 redis:
   # standalone or cluster or sentinel
   connection:
@@ -134,6 +139,7 @@ redis:
     blockWhenExhausted: "${REDIS_POOL_CONFIG_BLOCK_WHEN_EXHAUSTED:true}"
 
 # MQTT server parameters
+# Configures the MQTT transport layer including bind address/port, SSL, Netty tuning, session management, rate limits, and message processing options.
 transport:
   mqtt:
     # MQTT bind-address
@@ -245,6 +251,7 @@ transport:
         check_interval_seconds: "${TB_TRANSPORT_SSL_CERTIFICATE_RELOAD_CHECK_INTERVAL_SECONDS:60}"
 
 # Queue configuration parameters
+# Defines the messaging queue backend (Kafka), topic names, partitioning, and poll/processing settings for all platform microservices.
 queue:
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
@@ -398,12 +405,14 @@ queue:
     poll_interval: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
 
 # Service common properties
+# Identifies this service instance within the cluster by type and optional unique ID.
 service:
   type: "${TB_SERVICE_TYPE:tb-transport}" # service type
   # Unique id for this service (autogenerated if empty)
   id: "${TB_SERVICE_ID:}"
 
 # Usage statistics parameters
+# Controls reporting of API usage statistics at system, tenant, and customer levels with configurable intervals.
 usage:
   stats:
     report:
@@ -417,11 +426,13 @@ usage:
       pack_size: "${USAGE_STATS_REPORT_PACK_SIZE:1024}"
 
 # Metrics parameters
+# Enables or disables Micrometer actuator metrics collection for monitoring this service.
 metrics:
   # Enable/disable actuator metrics.
   enabled: "${METRICS_ENABLED:false}"
 
 # General management parameters
+# Configures Spring Boot Actuator endpoint exposure, including which endpoints are accessible over HTTP.
 management:
   endpoints:
     web:
@@ -430,6 +441,7 @@ management:
         include: "${METRICS_ENDPOINTS_EXPOSE:info}"
 
 # Notification system parameters
+# Configures deduplication rules for notification triggers to prevent repeated alerts within a defined time window.
 notification_system:
   rules:
     # Semicolon-separated deduplication durations (in millis) for trigger types. Format: 'NotificationRuleTriggerType1:123;NotificationRuleTriggerType2:456'
diff --git a/transport/snmp/src/main/resources/tb-snmp-transport.yml b/transport/snmp/src/main/resources/tb-snmp-transport.yml
index d021030a91..4df225778e 100644
--- a/transport/snmp/src/main/resources/tb-snmp-transport.yml
+++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml
@@ -15,11 +15,13 @@
 #
 
 # Spring common parameters
+# Controls Spring Boot application type and web environment settings for the SNMP transport service.
 spring.main.web-environment: "${WEB_APPLICATION_ENABLE:false}" # If you enabled process metrics you should also enable 'web-environment'.
 spring.main.web-application-type: "${WEB_APPLICATION_TYPE:none}" # If you enabled process metrics you should set 'web-application-type' to 'servlet' value.
 spring.main.allow-circular-references: "true" # Spring Boot configuration property that controls whether circular dependencies between beans are allowed.
 
 # Server common parameters
+# Configures the embedded HTTP server bind address and port (used when web environment is enabled).
 server:
   # Server bind address (has no effect if web-environment is disabled).
   address: "${HTTP_BIND_ADDRESS:0.0.0.0}"
@@ -27,6 +29,7 @@ server:
   port: "${HTTP_BIND_PORT:8083}"
 
 # Zookeeper connection parameters. Used for service discovery.
+# Defines ZooKeeper connectivity, timeouts, and cluster node registration settings for service coordination.
 zk:
   # Enable/disable zookeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
@@ -46,6 +49,7 @@ zk:
   recalculate_delay: "${ZOOKEEPER_RECALCULATE_DELAY_MS:0}"
 
 # Cache parameters
+# Specifies the caching backend (Caffeine or Redis) and per-entity cache TTL and size limits.
 cache:
   # caffeine or redis
   type: "${CACHE_TYPE:redis}"
@@ -55,6 +59,7 @@ cache:
     maxSize: "${CACHE_SPECS_ENTITY_LIMITS_MAX_SIZE:100000}" # 0 means the cache is disabled
 
 # Redis/Valkey configuration parameters
+# Covers standalone, cluster, and sentinel Redis connection modes, SSL, authentication, and connection pool tuning.
 redis:
   connection:
     # standalone or cluster or sentinel
@@ -133,6 +138,7 @@ redis:
     blockWhenExhausted: "${REDIS_POOL_CONFIG_BLOCK_WHEN_EXHAUSTED:true}"
 
 # Snmp server parameters
+# Configures the SNMP transport protocol, bind port, PDU limits, session management, JSON handling, logging, and statistics.
 transport:
   snmp:
     # Enable/disable SNMP transport protocol
@@ -184,6 +190,7 @@ transport:
     print-interval-ms: "${TB_TRANSPORT_STATS_PRINT_INTERVAL_MS:60000}"
 
 # Queue configuration parameters
+# Defines the message queue backend (Kafka) and topic/consumer settings for transport, core, rule-engine, and JS evaluation.
 queue:
   type: "${TB_QUEUE_TYPE:kafka}" # kafka (Apache Kafka)
   prefix: "${TB_QUEUE_PREFIX:}" # Global queue prefix. If specified, prefix is added before default topic name: 'prefix.default_topic_name'. Prefix is applied to all topics (and consumer groups for kafka).
@@ -344,12 +351,14 @@ queue:
     poll_interval: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_POLL_INTERVAL_MS:25}"
 
 # Service common parameters
+# Identifies this service instance by type and unique ID within a ThingsBoard cluster.
 service:
   type: "${TB_SERVICE_TYPE:tb-transport}" # service type
   # Unique id for this service (autogenerated if empty)
   id: "${TB_SERVICE_ID:}"
 
 # Usage statistics parameters
+# Controls collection and reporting intervals for API usage statistics at system, tenant, and customer levels.
 usage:
   stats:
     report:
@@ -363,11 +372,13 @@ usage:
       pack_size: "${USAGE_STATS_REPORT_PACK_SIZE:1024}"
 
 # Metrics parameters
+# Enables or disables actuator-based metrics collection (e.g., Prometheus) for the SNMP transport service.
 metrics:
   # Enable/disable actuator metrics.
   enabled: "${METRICS_ENABLED:false}"
 
 # General management parameters
+# Configures Spring Boot Actuator endpoint exposure, including which management endpoints are accessible over HTTP.
 management:
   endpoints:
     web:
@@ -376,6 +387,7 @@ management:
         include: "${METRICS_ENDPOINTS_EXPOSE:info}"
 
 # Notification system parameters
+# Defines deduplication rules for notification triggers to prevent duplicate alerts within configured time windows.
 notification_system:
   rules:
     # Semicolon-separated deduplication durations (in millis) for trigger types. Format: 'NotificationRuleTriggerType1:123;NotificationRuleTriggerType2:456'

From e5c7ecc82acb96e0355d01cb5eb3ddc952bd8889 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Mon, 1 Jun 2026 17:31:27 +0300
Subject: [PATCH 40/91] added section description

---
 .../src/main/resources/thingsboard.yml        | 92 +++++++++----------
 edqs/src/main/resources/edqs.yml              | 14 +--
 msa/js-executor/config/default.yml            |  4 +-
 .../src/main/resources/tb-vc-executor.yml     | 15 +--
 .../src/main/resources/tb-coap-transport.yml  | 30 +++---
 .../src/main/resources/tb-http-transport.yml  | 19 ++--
 .../src/main/resources/tb-lwm2m-transport.yml | 37 ++++----
 .../src/main/resources/tb-mqtt-transport.yml  | 20 ++--
 .../src/main/resources/tb-snmp-transport.yml  | 18 ++--
 9 files changed, 126 insertions(+), 123 deletions(-)

diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 812b296790..6540888ba1 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -120,20 +120,20 @@ app:
   # Application version
   version: "@project.version@"
 
-# Zookeeper connection parameters
+# ZooKeeper connection parameters
 # Controls ZooKeeper-based service discovery and cluster coordination for microservice deployments.
 zk:
-  # Enable/disable zookeeper discovery service.
+  # Enable/disable ZooKeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
-  # Zookeeper connect string
+  # ZooKeeper connect string
   url: "${ZOOKEEPER_URL:localhost:2181}"
-  # Zookeeper retry interval in milliseconds
+  # ZooKeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
-  # Zookeeper connection timeout in milliseconds
+  # ZooKeeper connection timeout in milliseconds
   connection_timeout_ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
-  # Zookeeper session timeout in milliseconds
+  # ZooKeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
-  # Name of the directory in zookeeper 'filesystem'
+  # Name of the directory in ZooKeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
   # The recalculate_delay property is recommended in a microservices architecture setup for rule-engine services.
   # This property provides a pause to ensure that when a rule-engine service is restarted, other nodes don't immediately attempt to recalculate their partitions.
@@ -141,7 +141,7 @@ zk:
   recalculate_delay: "${ZOOKEEPER_RECALCULATE_DELAY_MS:0}"
 
 # Cluster parameters
-# Controls inter-node communication statistics within a ThingsBoard cluster.
+# Controls cluster statistics — tracks the number of messages exchanged between cluster nodes.
 cluster:
   stats:
     # Enable/Disable the cluster statistics. Calculates the number of messages sent between cluster nodes based on each type
@@ -610,14 +610,14 @@ actors:
     response_timeout_ms: "${ACTORS_RPC_RESPONSE_TIMEOUT_MS:30000}"
     # Close transport session if RPC delivery timed out. If enabled, RPC will be reverted to the queued state.
     # Note:
-    # - For MQTT transport:
-    #   - QoS level 0: This feature does not apply, as no acknowledgment is expected, and therefore no timeout is triggered.
-    #   - QoS level 1: This feature applies, as an acknowledgment is expected.
-    #   - QoS level 2: Unsupported.
-    # - For CoAP transport:
-    #   - Confirmable requests: This feature applies, as delivery confirmation is expected.
-    #   - Non-confirmable requests: This feature does not apply, as no delivery acknowledgment is expected.
-    # - For HTTP and SNPM transports: RPC is considered delivered immediately, and there is no logic to await acknowledgment.
+    # <ul><li> For MQTT transport:
+    #   <ul><li> QoS level 0: This feature does not apply, as no acknowledgment is expected, and therefore no timeout is triggered.</li>
+    #   <li> QoS level 1: This feature applies, as an acknowledgment is expected.</li>
+    #   <li> QoS level 2: Unsupported.</li></ul></li>
+    # <li> For CoAP transport:
+    #   <ul><li> Confirmable requests: This feature applies, as delivery confirmation is expected.</li>
+    #   <li> Non-confirmable requests: This feature does not apply, as no delivery acknowledgment is expected.</li></ul></li>
+    # <li> For HTTP and SNPM transports: RPC is considered delivered immediately, and there is no logic to await acknowledgment.</li></ul>
     close_session_on_rpc_delivery_timeout: "${ACTORS_RPC_CLOSE_SESSION_ON_RPC_DELIVERY_TIMEOUT:false}"
   statistics:
     # Enable/disable actor statistics
@@ -825,17 +825,17 @@ redis:
     # if set false will be used pool config build from values of the pool config section
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
   sentinel:
-    # name of the master node
+    # Name of the master node
     master: "${REDIS_MASTER:}"
-    # comma-separated list of "host:port" pairs of sentinels
+    # Comma-separated list of "host:port" pairs of sentinels
     sentinels: "${REDIS_SENTINELS:}"
-    # password to authenticate with sentinel
+    # Password to authenticate with sentinel
     password: "${REDIS_SENTINEL_PASSWORD:}"
-    # if set false will be used pool config build from values of the pool config section
+    # If set false will be used pool config build from values of the pool config section
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
-  # db index
+  # Redis logical database index to select after connecting.
   db: "${REDIS_DB:0}"
-  # db password
+  # Password for Redis authentication (leave empty if not required).
   password: "${REDIS_PASSWORD:}"
   # Redis username for ACL authentication (Redis 6.0+). Leave empty for legacy password-only auth
   username: "${REDIS_USERNAME:}"
@@ -1148,10 +1148,10 @@ transport:
   activity:
     # This property specifies the strategy for reporting activity events within each reporting period.
     # The accepted values are 'FIRST', 'LAST', 'FIRST_AND_LAST' and 'ALL'.
-    # - 'FIRST': Only the first activity event in each reporting period is reported.
-    # - 'LAST': Only the last activity event in the reporting period is reported.
-    # - 'FIRST_AND_LAST': Both the first and last activity events in the reporting period are reported.
-    # - 'ALL': All activity events in the reporting period are reported.
+    # <ul><li> 'FIRST': Only the first activity event in each reporting period is reported.</li>
+    # <li> 'LAST': Only the last activity event in the reporting period is reported.</li>
+    # <li> 'FIRST_AND_LAST': Both the first and last activity events in the reporting period are reported.</li>
+    # <li> 'ALL': All activity events in the reporting period are reported.</li></ul>
     reporting_strategy: "${TB_TRANSPORT_ACTIVITY_REPORTING_STRATEGY:LAST}"
   json:
     # Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
@@ -1269,16 +1269,16 @@ transport:
     dtls:
       # RFC7925_RETRANSMISSION_TIMEOUT_IN_MILLISECONDS = 9000
       retransmission_timeout: "${LWM2M_DTLS_RETRANSMISSION_TIMEOUT_MS:9000}"
-      # CoAP DTLS connection ID length for LWM2M. RFC 9146, Connection Identifier for DTLS 1.2
-      # Default: off
+      # LWM2M DTLS connection ID length for LWM2M. RFC 9146, Connection Identifier for DTLS 1.2
+      # Default: off. <br>
       # Control usage of DTLS connection ID length (CID).
-      # - 'off' to deactivate it.
-      # - 'on' to activate Connection ID support (same as CID 0 or more 0).
-      # - A positive value defines generated CID size in bytes.
-      # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
-      # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
-      # - A value that are > 4: MultiNodeConnectionIdGenerator is used
-      connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:}"
+      # <ul> <li> 'off' to deactivate it. </li>
+      # <li> 'on' to activate Connection ID support (same as CID 0 or more 0). </li>
+      # <li> A positive value defines generated CID size in bytes.</li>
+      # <li> A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic). </li>
+      # <li> A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used </li>
+      # <li> A value that are > 4: MultiNodeConnectionIdGenerator is used </li> </ul>
+      connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:8}"
     server:
       # LwM2M Server ID
       id: "${LWM2M_SERVER_ID:123}"
@@ -1470,15 +1470,15 @@ coap:
     # CoAP DTLS bind port
     bind_port: "${COAP_DTLS_BIND_PORT:5684}"
     # CoAP DTLS connection ID length. RFC 9146, Connection Identifier for DTLS 1.2
-    # Default: off
+    # Default: off. <br>
     # Control usage of DTLS connection ID length (CID).
-    # - 'off' to deactivate it.
-    # - 'on' to activate Connection ID support (same as CID 0 or more 0).
-    # - A positive value defines generated CID size in bytes.
-    # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
-    # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
-    # - A value that are > 4: MultiNodeConnectionIdGenerator is used
-    connection_id_length: "${COAP_DTLS_CONNECTION_ID_LENGTH:}"
+    # <ul> <li> 'off' to deactivate it. </li>
+    # <li> 'on' to activate Connection ID support (same as CID 0 or more 0). </li>
+    # <li> A positive value defines generated CID size in bytes.</li>
+    # <li> A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).</li>
+    # <li> A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used</li>
+    # <li> A value that are > 4: MultiNodeConnectionIdGenerator is used</li> </ul>
+    connection_id_length: "${COAP_DTLS_CONNECTION_ID_LENGTH:8}"
     # Specify the MTU (Maximum Transmission Unit).
     # Should be used if LAN MTU is not used, e.g. if IP tunnels are used or if the client uses a smaller value than the LAN MTU.
     # Default = 1024
@@ -1494,13 +1494,13 @@ coap:
     # In order to negotiate smaller maximum fragment lengths,
     # clients MAY include an extension of type "max_fragment_length" in the (extended) client hello.
     # The "extension_data" field of this extension SHALL contain:
-    # enum {
+    # <pre> enum {
     #   2^9(1) == 512,
     #   2^10(2) == 1024,
     #   2^11(3) == 2048,
     #   2^12(4) == 4096,
     #   (255)
-    # } MaxFragmentLength;
+    # } MaxFragmentLength; </pre>
     # TLS already requires clients and servers to support fragmentation of handshake messages.
     max_fragment_length: "${COAP_DTLS_MAX_FRAGMENT_LENGTH:1024}"
     # Server DTLS credentials
@@ -2180,7 +2180,7 @@ mobileApp:
   # Link to App Store for Thingsboard Live mobile application
   appStoreLink: "${TB_MOBILE_APP_APP_STORE_LINK:https://apps.apple.com/us/app/thingsboard-live/id1594355695}"
 
-# MQTT client settings
+# MQTT client parameters
 # Configures MQTT client retransmission behavior including max attempts, initial delay, and jitter factor.
 mqtt:
   # MQTT client configuration parameters
diff --git a/edqs/src/main/resources/edqs.yml b/edqs/src/main/resources/edqs.yml
index 4dc404e2ca..cad0fcaccc 100644
--- a/edqs/src/main/resources/edqs.yml
+++ b/edqs/src/main/resources/edqs.yml
@@ -25,19 +25,19 @@ app:
   # Application version
   version: "@project.version@"
 
-# Zookeeper connection parameters
+# ZooKeeper connection parameters
 zk:
-  # Enable/disable zookeeper discovery service.
+  # Enable/disable ZooKeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:true}"
-  # Zookeeper connect string
+  # ZooKeeper connect string
   url: "${ZOOKEEPER_URL:localhost:2181}"
-  # Zookeeper retry interval in milliseconds
+  # ZooKeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
-  # Zookeeper connection timeout in milliseconds
+  # ZooKeeper connection timeout in milliseconds
   connection_timeout_ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
-  # Zookeeper session timeout in milliseconds
+  # ZooKeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
-  # Name of the directory in zookeeper 'filesystem'
+  # Name of the directory in ZooKeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
   # The recalculate_delay property is recommended in a microservices architecture setup for rule-engine services.
   # This property provides a pause to ensure that when a rule-engine service is restarted, other nodes don't immediately attempt to recalculate their partitions.
diff --git a/msa/js-executor/config/default.yml b/msa/js-executor/config/default.yml
index bde09551ac..feae8edc4a 100644
--- a/msa/js-executor/config/default.yml
+++ b/msa/js-executor/config/default.yml
@@ -35,7 +35,7 @@ kafka:
     servers: "localhost:9092"
   replication_factor: "1" # Number of replicas for each Kafka topic partition
   acks: "1" # -1 = all; 0 = no acknowledgments; 1 = only waits for the leader to acknowledge
-  batch_size: "128" # Maximum number of bytes the producer batches per partition before sending
+  batch_size: "128" # Maximum number of messages to accumulate before triggering a batch send
   linger_ms: "5" # Time in milliseconds the producer waits before sending a batch, allowing more messages to accumulate
   partitions_consumed_concurrently: "1" # (EXPERIMENTAL) increase this value if you are planning to handle more than one partition (scale up, scale down) - this will decrease the latency
   requestTimeout: "30000" # Time in milliseconds to wait for a response to a Kafka request before timing out
@@ -66,7 +66,7 @@ script:
   # (file system, environment variables, child_process, etc.) to script
   # authors. Use "false" only as a performance trade-off in trusted,
   # non-public clusters where every script author is fully trusted.
-  use_sandbox: "true" # Run scripts inside an isolated sandbox to prevent access to Node.js internals
+  use_sandbox: "true"
   memory_usage_trace_frequency: "1000" # Log memory usage every N script executions
   script_body_trace_frequency: "10000" # Log the script body every N script executions
   stat_print_frequency: "10000" # Print execution statistics every N script executions
diff --git a/msa/vc-executor/src/main/resources/tb-vc-executor.yml b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
index 0fe37abf22..e540182c06 100644
--- a/msa/vc-executor/src/main/resources/tb-vc-executor.yml
+++ b/msa/vc-executor/src/main/resources/tb-vc-executor.yml
@@ -28,19 +28,20 @@ server:
   # Server bind port (has no effect if web-environment is disabled).
   port: "${HTTP_BIND_PORT:8086}"
 
-# Zookeeper connection parameters. Used for service discovery.
+# ZooKeeper connection parameters
+# Controls ZooKeeper-based service discovery and cluster coordination for microservice deployments.
 zk:
-  # Enable/disable zookeeper discovery service.
+  # Enable/disable ZooKeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:true}"
-  # Zookeeper connect string
+  # ZooKeeper connect string
   url: "${ZOOKEEPER_URL:localhost:2181}"
-  # Zookeeper retry interval in milliseconds
+  # ZooKeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
-  # Zookeeper connection timeout in milliseconds
+  # ZooKeeper connection timeout in milliseconds
   connection_timeout_ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
-  # Zookeeper session timeout in milliseconds
+  # ZooKeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
-  # Name of the directory in zookeeper 'filesystem'
+  # Name of the directory in ZooKeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
   # The recalculate_delay property is recommended in a microservices architecture setup for rule-engine services.
   # This property provides a pause to ensure that when a rule-engine service is restarted, other nodes don't immediately attempt to recalculate their partitions.
diff --git a/transport/coap/src/main/resources/tb-coap-transport.yml b/transport/coap/src/main/resources/tb-coap-transport.yml
index f84dc04907..dd5b77ab00 100644
--- a/transport/coap/src/main/resources/tb-coap-transport.yml
+++ b/transport/coap/src/main/resources/tb-coap-transport.yml
@@ -28,20 +28,20 @@ server:
   # Server bind port (has no effect if web-environment is disabled).
   port: "${HTTP_BIND_PORT:8083}"
 
-# Zookeeper connection parameters. Used for service discovery.
+# ZooKeeper connection parameters. Used for service discovery.
 # Defines how this service registers itself and discovers other nodes via Apache ZooKeeper.
 zk:
-  # Enable/disable zookeeper discovery service.
+  # Enable/disable ZooKeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
-  # Zookeeper connect string
+  # ZooKeeper connect string
   url: "${ZOOKEEPER_URL:localhost:2181}"
-  # Zookeeper retry interval in milliseconds
+  # ZooKeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
-  # Zookeeper connection timeout in milliseconds
+  # ZooKeeper connection timeout in milliseconds
   connection_timeout_ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
-  # Zookeeper session timeout in milliseconds
+  # ZooKeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
-  # Name of the directory in zookeeper 'filesystem'
+  # Name of the directory in ZooKeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
   # The recalculate_delay property is recommended in a microservices architecture setup for rule-engine services.
   # This property provides a pause to ensure that when a rule-engine service is restarted, other nodes don't immediately attempt to recalculate their partitions.
@@ -202,15 +202,15 @@ coap:
     # CoAP DTLS bind port
     bind_port: "${COAP_DTLS_BIND_PORT:5684}"
     # CoAP DTLS connection ID length. RFC 9146, Connection Identifier for DTLS 1.2
-    # Default: off
+    # Default: off. <br>
     # Control usage of DTLS connection ID length (CID).
-    # - 'off' to deactivate it.
-    # - 'on' to activate Connection ID support (same as CID 0 or more 0).
-    # - A positive value defines generated CID size in bytes.
-    # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
-    # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
-    # - A value that are > 4: MultiNodeConnectionIdGenerator is used
-    connection_id_length: "${COAP_DTLS_CONNECTION_ID_LENGTH:}"
+    # <ul> <li> 'off' to deactivate it. </li>
+    # <li> 'on' to activate Connection ID support (same as CID 0 or more 0). </li>
+    # <li> A positive value defines generated CID size in bytes.</li>
+    # <li> A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).</li>
+    # <li> A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used</li>
+    # <li> A value that are > 4: MultiNodeConnectionIdGenerator is used</li> </ul>
+    connection_id_length: "${COAP_DTLS_CONNECTION_ID_LENGTH:8}"
     # Specify the MTU (Maximum Transmission Unit).
     # Should be used if LAN MTU is not used, e.g. if IP tunnels are used or if the client uses a smaller value than the LAN MTU.
     # Default = 1024
diff --git a/transport/http/src/main/resources/tb-http-transport.yml b/transport/http/src/main/resources/tb-http-transport.yml
index 44adcf6e14..9fe5b50db8 100644
--- a/transport/http/src/main/resources/tb-http-transport.yml
+++ b/transport/http/src/main/resources/tb-http-transport.yml
@@ -60,19 +60,20 @@ spring.main.allow-circular-references: "true" # Spring Boot configuration proper
 spring.servlet.multipart.max-file-size: "${SPRING_SERVLET_MULTIPART_MAX_FILE_SIZE:50MB}" # Total file size cannot exceed 50MB when configuring file uploads
 spring.servlet.multipart.max-request-size: "${SPRING_SERVLET_MULTIPART_MAX_REQUEST_SIZE:50MB}" # Total request size for a multipart/form-data cannot exceed 50MB
 
-# Zookeeper connection parameters. Used for service discovery.
+# ZooKeeper connection parameters
+# Controls ZooKeeper-based service discovery and cluster coordination for microservice deployments.
 zk:
-  # Enable/disable zookeeper discovery service.
+  # Enable/disable ZooKeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
-  # Zookeeper connect string
+  # ZooKeeper connect string
   url: "${ZOOKEEPER_URL:localhost:2181}"
-  # Zookeeper retry interval in milliseconds
+  # ZooKeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
-  # Zookeeper connection timeout in milliseconds
+  # ZooKeeper connection timeout in milliseconds
   connection_timeout_ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
-  # Zookeeper session timeout in milliseconds
+  # ZooKeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
-  # Name of the directory in zookeeper 'filesystem'
+  # Name of the directory in ZooKeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
   # The recalculate_delay property is recommended in a microservices architecture setup for rule-engine services.
   # This property provides a pause to ensure that when a rule-engine service is restarted, other nodes don't immediately attempt to recalculate their partitions.
@@ -127,9 +128,9 @@ redis:
     password: "${REDIS_SENTINEL_PASSWORD:}"
     # if set false will be used pool config build from values of the pool config section
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
-  # db index
+  # Redis logical database index to select after connecting.
   db: "${REDIS_DB:0}"
-  # db password
+  # Password for Redis authentication (leave empty if not required).
   password: "${REDIS_PASSWORD:}"
   # Redis username for ACL authentication (Redis 6.0+). Leave empty for legacy password-only auth
   username: "${REDIS_USERNAME:}"
diff --git a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
index cb554fb705..161e1a39fb 100644
--- a/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
+++ b/transport/lwm2m/src/main/resources/tb-lwm2m-transport.yml
@@ -28,19 +28,20 @@ server:
   # Server bind port (has no effect if web-environment is disabled).
   port: "${HTTP_BIND_PORT:8083}"
 
-# Zookeeper connection parameters. Used for service discovery.
+# ZooKeeper connection parameters
+# Controls ZooKeeper-based service discovery and cluster coordination for microservice deployments.
 zk:
-  # Enable/disable zookeeper discovery service.
+  # Enable/disable ZooKeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
-  # Zookeeper connect string
+  # ZooKeeper connect string
   url: "${ZOOKEEPER_URL:localhost:2181}"
-  # Zookeeper retry interval in milliseconds
+  # ZooKeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
-  # Zookeeper connection timeout in milliseconds
+  # ZooKeeper connection timeout in milliseconds
   connection_timeout_ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
-  # Zookeeper session timeout in milliseconds
+  # ZooKeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
-  # Name of the directory in zookeeper 'filesystem'
+  # Name of the directory in ZooKeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
   # The recalculate_delay property is recommended in a microservices architecture setup for rule-engine services.
   # This property provides a pause to ensure that when a rule-engine service is restarted, other nodes don't immediately attempt to recalculate their partitions.
@@ -94,9 +95,9 @@ redis:
     password: "${REDIS_SENTINEL_PASSWORD:}"
     # if set false will be used pool config build from values of the pool config section
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
-  # db index
+  # Redis logical database index to select after connecting.
   db: "${REDIS_DB:0}"
-  # db password
+  # Password for Redis authentication (leave empty if not required).
   password: "${REDIS_PASSWORD:}"
   # Redis username for ACL authentication (Redis 6.0+). Leave empty for legacy password-only auth
   username: "${REDIS_USERNAME:}"
@@ -171,16 +172,16 @@ transport:
     dtls:
       # RFC7925_RETRANSMISSION_TIMEOUT_IN_MILLISECONDS = 9000
       retransmission_timeout: "${LWM2M_DTLS_RETRANSMISSION_TIMEOUT_MS:9000}"
-      # CoAP DTLS connection ID length for LWM2M. RFC 9146, Connection Identifier for DTLS 1.2
-      # Default: off
+      # LWM2M DTLS connection ID length for LWM2M. RFC 9146, Connection Identifier for DTLS 1.2
+      # Default: off. <br>
       # Control usage of DTLS connection ID length (CID).
-      # - 'off' to deactivate it.
-      # - 'on' to activate Connection ID support (same as CID 0 or more 0).
-      # - A positive value defines generated CID size in bytes.
-      # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
-      # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
-      # - A value that are > 4: MultiNodeConnectionIdGenerator is used
-      connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:}"
+      # <ul> <li> 'off' to deactivate it. </li>
+      # <li> 'on' to activate Connection ID support (same as CID 0 or more 0). </li>
+      # <li> A positive value defines generated CID size in bytes.</li>
+      # <li> A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic). </li>
+      # <li> A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used </li>
+      # <li> A value that are > 4: MultiNodeConnectionIdGenerator is used </li> </ul>
+      connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:8}"
     server:
       # LwM2M Server ID
       id: "${LWM2M_SERVER_ID:123}"
diff --git a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
index fcdc9000bd..35bb11d039 100644
--- a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
+++ b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
@@ -28,20 +28,20 @@ server:
   # Server bind port (has no effect if web-environment is disabled).
   port: "${HTTP_BIND_PORT:8083}"
 
-# Zookeeper connection parameters. Used for service discovery.
-# Defines connection, session, retry settings and the node directory path for Zookeeper-based cluster coordination.
+# ZooKeeper connection parameters. Used for service discovery.
+# Defines connection, session, retry settings and the node directory path for ZooKeeper-based cluster coordination.
 zk:
-  # Enable/disable zookeeper discovery service.
+  # Enable/disable ZooKeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
-  # Zookeeper connect string
+  # ZooKeeper connect string
   url: "${ZOOKEEPER_URL:localhost:2181}"
-  # Zookeeper retry interval in milliseconds
+  # ZooKeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
-  # Zookeeper connection timeout in milliseconds
+  # ZooKeeper connection timeout in milliseconds
   connection_timeout_ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
-  # Zookeeper session timeout in milliseconds
+  # ZooKeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
-  # Name of the directory in zookeeper 'filesystem'
+  # Name of the directory in ZooKeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
   # The recalculate_delay property is recommended in a microservices architecture setup for rule-engine services.
   # This property provides a pause to ensure that when a rule-engine service is restarted, other nodes don't immediately attempt to recalculate their partitions.
@@ -96,9 +96,9 @@ redis:
     password: "${REDIS_SENTINEL_PASSWORD:}"
     # if set false will be used pool config build from values of the pool config section
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
-  # db index
+  # Redis logical database index to select after connecting.
   db: "${REDIS_DB:0}"
-  # db password
+  # Password for Redis authentication (leave empty if not required).
   password: "${REDIS_PASSWORD:}"
   # Redis username for ACL authentication (Redis 6.0+). Leave empty for legacy password-only auth
   username: "${REDIS_USERNAME:}"
diff --git a/transport/snmp/src/main/resources/tb-snmp-transport.yml b/transport/snmp/src/main/resources/tb-snmp-transport.yml
index 4df225778e..3816068d35 100644
--- a/transport/snmp/src/main/resources/tb-snmp-transport.yml
+++ b/transport/snmp/src/main/resources/tb-snmp-transport.yml
@@ -28,20 +28,20 @@ server:
   # Server bind port (has no effect if web-environment is disabled).
   port: "${HTTP_BIND_PORT:8083}"
 
-# Zookeeper connection parameters. Used for service discovery.
+# ZooKeeper connection parameters. Used for service discovery.
 # Defines ZooKeeper connectivity, timeouts, and cluster node registration settings for service coordination.
 zk:
-  # Enable/disable zookeeper discovery service.
+  # Enable/disable ZooKeeper discovery service.
   enabled: "${ZOOKEEPER_ENABLED:false}"
-  # Zookeeper connect string
+  # ZooKeeper connect string
   url: "${ZOOKEEPER_URL:localhost:2181}"
-  # Zookeeper retry interval in milliseconds
+  # ZooKeeper retry interval in milliseconds
   retry_interval_ms: "${ZOOKEEPER_RETRY_INTERVAL_MS:3000}"
-  # Zookeeper connection timeout in milliseconds
+  # ZooKeeper connection timeout in milliseconds
   connection_timeout_ms: "${ZOOKEEPER_CONNECTION_TIMEOUT_MS:3000}"
-  # Zookeeper session timeout in milliseconds
+  # ZooKeeper session timeout in milliseconds
   session_timeout_ms: "${ZOOKEEPER_SESSION_TIMEOUT_MS:3000}"
-  # Name of the directory in zookeeper 'filesystem'
+  # Name of the directory in ZooKeeper 'filesystem'
   zk_dir: "${ZOOKEEPER_NODES_DIR:/thingsboard}"
   # The recalculate_delay property is recommended in a microservices architecture setup for rule-engine services.
   # This property provides a pause to ensure that when a rule-engine service is restarted, other nodes don't immediately attempt to recalculate their partitions.
@@ -95,9 +95,9 @@ redis:
     password: "${REDIS_SENTINEL_PASSWORD:}"
     # if set false will be used pool config build from values of the pool config section
     useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
-  # db index
+  # Redis logical database index to select after connecting.
   db: "${REDIS_DB:0}"
-  # db password
+  # Password for Redis authentication (leave empty if not required).
   password: "${REDIS_PASSWORD:}"
   # Redis username for ACL authentication (Redis 6.0+). Leave empty for legacy password-only auth
   username: "${REDIS_USERNAME:}"

From eae065aa74408d4ecec7f61125e64090a113b760 Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Fri, 26 Jun 2026 09:58:20 +0300
Subject: [PATCH 41/91] Fix dashboard config changes not syncing to edge by
 removing transient from Dashboard.configuration

---
 .../rpc/processor/BaseEdgeProcessorTest.java  | 236 ++++++++++++++++++
 .../server/common/data/Dashboard.java         |   2 +-
 2 files changed, 237 insertions(+), 1 deletion(-)
 create mode 100644 application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java

diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
new file mode 100644
index 0000000000..55f975b1ea
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
@@ -0,0 +1,236 @@
+/**
+ * ThingsBoard, Inc. ("COMPANY") CONFIDENTIAL
+ *
+ * Copyright © 2016-2026 ThingsBoard, Inc. All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of ThingsBoard, Inc. and its suppliers,
+ * if any.  The intellectual and technical concepts contained
+ * herein are proprietary to ThingsBoard, Inc.
+ * and its suppliers and may be covered by U.S. and Foreign Patents,
+ * patents in process, and are protected by trade secret or copyright law.
+ *
+ * Dissemination of this information or reproduction of this material is strictly forbidden
+ * unless prior written permission is obtained from COMPANY.
+ *
+ * Access to the source code contained herein is hereby forbidden to anyone except current COMPANY employees,
+ * managers or contractors who have executed Confidentiality and Non-disclosure agreements
+ * explicitly covering such access.
+ *
+ * The copyright notice above does not evidence any actual or intended publication
+ * or disclosure  of  this source code, which includes
+ * information that is confidential and/or proprietary, and is a trade secret, of  COMPANY.
+ * ANY REPRODUCTION, MODIFICATION, DISTRIBUTION, PUBLIC  PERFORMANCE,
+ * OR PUBLIC DISPLAY OF OR THROUGH USE  OF THIS  SOURCE CODE  WITHOUT
+ * THE EXPRESS WRITTEN CONSENT OF COMPANY IS STRICTLY PROHIBITED,
+ * AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES.
+ * THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR RELATED INFORMATION
+ * DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS,
+ * OR TO MANUFACTURE, USE, OR SELL ANYTHING THAT IT  MAY DESCRIBE, IN WHOLE OR IN PART.
+ */
+package org.thingsboard.server.service.edge.rpc.processor;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.jupiter.api.Test;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.EntityView;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.device.data.DeviceData;
+import org.thingsboard.server.common.data.device.data.DefaultDeviceConfiguration;
+import org.thingsboard.server.common.data.device.data.DefaultDeviceTransportConfiguration;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.DashboardId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityViewId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.gen.transport.TransportProtos;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class BaseEdgeProcessorTest {
+
+    private final BaseEdgeProcessor processor = new BaseEdgeProcessor() {
+        @Override
+        public ListenableFuture<Void> processEntityNotification(TenantId tenantId, TransportProtos.EdgeNotificationMsgProto msg) {
+            return Futures.immediateFuture(null);
+        }
+    };
+
+    @Test
+    public void dashboardSaveRequiredWhenConfigurationChanges() {
+        DashboardId dashboardId = new DashboardId(UUID.randomUUID());
+        Dashboard current = new Dashboard(dashboardId);
+        current.setTitle("Dashboard");
+        current.setConfiguration(JacksonUtil.toJsonNode("{\"widgets\":{\"w1\":{\"type\":\"timeseries\"}}}"));
+
+        Dashboard updated = new Dashboard(current);
+        updated.setConfiguration(JacksonUtil.toJsonNode("{\"widgets\":{\"w1\":{\"type\":\"latest\"}}}"));
+
+        assertThat(processor.isSaveRequired(current, updated)).isTrue();
+    }
+
+    @Test
+    public void dashboardSaveNotRequiredWhenOnlyVersionChanges() {
+        DashboardId dashboardId = new DashboardId(UUID.randomUUID());
+        Dashboard current = new Dashboard(dashboardId);
+        current.setTitle("Dashboard");
+        current.setConfiguration(JacksonUtil.toJsonNode("{\"widgets\":{\"w1\":{\"type\":\"timeseries\"}}}"));
+        current.setVersion(1L);
+
+        Dashboard updated = new Dashboard(current);
+        updated.setVersion(2L);
+
+        assertThat(processor.isSaveRequired(current, updated)).isFalse();
+    }
+
+    @Test
+    public void dashboardSaveNotRequiredWhenIdentical() {
+        DashboardId dashboardId = new DashboardId(UUID.randomUUID());
+        Dashboard current = new Dashboard(dashboardId);
+        current.setTitle("Dashboard");
+        current.setConfiguration(JacksonUtil.toJsonNode("{\"widgets\":{\"w1\":{\"type\":\"timeseries\"}}}"));
+
+        Dashboard updated = new Dashboard(current);
+
+        assertThat(processor.isSaveRequired(current, updated)).isFalse();
+    }
+
+    @Test
+    public void deviceSaveRequiredWhenDeviceDataChanges() {
+        DeviceId deviceId = new DeviceId(UUID.randomUUID());
+        Device current = new Device(deviceId);
+        current.setName("Device");
+        current.setDeviceData(deviceDataWithTransport());
+
+        Device updated = new Device(current);
+        DeviceData withoutTransport = new DeviceData();
+        withoutTransport.setConfiguration(new DefaultDeviceConfiguration());
+        updated.setDeviceData(withoutTransport);
+
+        assertThat(processor.isSaveRequired(current, updated)).isTrue();
+    }
+
+    @Test
+    public void deviceSaveRequiredWhenAdditionalInfoChanges() {
+        DeviceId deviceId = new DeviceId(UUID.randomUUID());
+        Device current = new Device(deviceId);
+        current.setName("Device");
+        current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"old\"}"));
+
+        Device updated = new Device(current);
+        updated.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"new\"}"));
+
+        assertThat(processor.isSaveRequired(current, updated)).isTrue();
+    }
+
+    @Test
+    public void deviceSaveNotRequiredWhenOnlyVersionChanges() {
+        DeviceId deviceId = new DeviceId(UUID.randomUUID());
+        Device current = new Device(deviceId);
+        current.setName("Device");
+        current.setDeviceData(deviceDataWithTransport());
+        current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"same\"}"));
+        current.setVersion(1L);
+
+        Device updated = new Device(current);
+        updated.setVersion(2L);
+
+        assertThat(processor.isSaveRequired(current, updated)).isFalse();
+    }
+
+    @Test
+    public void assetSaveRequiredWhenAdditionalInfoChanges() {
+        AssetId assetId = new AssetId(UUID.randomUUID());
+        Asset current = new Asset(assetId);
+        current.setName("Asset");
+        current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"old\"}"));
+
+        Asset updated = new Asset(current);
+        updated.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"new\"}"));
+
+        assertThat(processor.isSaveRequired(current, updated)).isTrue();
+    }
+
+    @Test
+    public void assetSaveNotRequiredWhenOnlyVersionChanges() {
+        AssetId assetId = new AssetId(UUID.randomUUID());
+        Asset current = new Asset(assetId);
+        current.setName("Asset");
+        current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"same\"}"));
+        current.setVersion(1L);
+
+        Asset updated = new Asset(current);
+        updated.setVersion(2L);
+
+        assertThat(processor.isSaveRequired(current, updated)).isFalse();
+    }
+
+    @Test
+    public void entityViewSaveRequiredWhenAdditionalInfoChanges() {
+        EntityViewId entityViewId = new EntityViewId(UUID.randomUUID());
+        EntityView current = new EntityView(entityViewId);
+        current.setName("EntityView");
+        current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"old\"}"));
+
+        EntityView updated = new EntityView(current);
+        updated.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"new\"}"));
+
+        assertThat(processor.isSaveRequired(current, updated)).isTrue();
+    }
+
+    @Test
+    public void entityViewSaveNotRequiredWhenOnlyVersionChanges() {
+        EntityViewId entityViewId = new EntityViewId(UUID.randomUUID());
+        EntityView current = new EntityView(entityViewId);
+        current.setName("EntityView");
+        current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"same\"}"));
+        current.setVersion(1L);
+
+        EntityView updated = new EntityView(current);
+        updated.setVersion(2L);
+
+        assertThat(processor.isSaveRequired(current, updated)).isFalse();
+    }
+
+    @Test
+    public void userSaveRequiredWhenAdditionalInfoChanges() {
+        UserId userId = new UserId(UUID.randomUUID());
+        User current = new User(userId);
+        current.setEmail("user@thingsboard.io");
+        current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"old\"}"));
+
+        User updated = new User(current);
+        updated.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"new\"}"));
+
+        assertThat(processor.isSaveRequired(current, updated)).isTrue();
+    }
+
+    @Test
+    public void userSaveNotRequiredWhenOnlyVersionChanges() {
+        UserId userId = new UserId(UUID.randomUUID());
+        User current = new User(userId);
+        current.setEmail("user@thingsboard.io");
+        current.setAdditionalInfo(JacksonUtil.toJsonNode("{\"description\":\"same\"}"));
+        current.setVersion(1L);
+
+        User updated = new User(current);
+        updated.setVersion(2L);
+
+        assertThat(processor.isSaveRequired(current, updated)).isFalse();
+    }
+
+    private static DeviceData deviceDataWithTransport() {
+        DeviceData deviceData = new DeviceData();
+        deviceData.setConfiguration(new DefaultDeviceConfiguration());
+        deviceData.setTransportConfiguration(new DefaultDeviceTransportConfiguration());
+        return deviceData;
+    }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java b/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java
index 2c65a3dfc8..2666663d97 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/Dashboard.java
@@ -38,7 +38,7 @@ public class Dashboard extends DashboardInfo implements ExportableEntity<Dashboa
 
     private static final long serialVersionUID = 872682138346187503L;
 
-    private transient JsonNode configuration;
+    private JsonNode configuration;
 
     @Getter
     @Setter

From 28bdd81371dc1eaaa9541e29a5792e20f1299b70 Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Fri, 26 Jun 2026 10:56:01 +0300
Subject: [PATCH 42/91] Fix license header on BaseEdgeProcessorTest

---
 .../rpc/processor/BaseEdgeProcessorTest.java  | 35 ++++++-------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
index 55f975b1ea..430df22548 100644
--- a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
@@ -1,32 +1,17 @@
 /**
- * ThingsBoard, Inc. ("COMPANY") CONFIDENTIAL
+ * Copyright © 2016-2026 The Thingsboard Authors
  *
- * Copyright © 2016-2026 ThingsBoard, Inc. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * NOTICE: All information contained herein is, and remains
- * the property of ThingsBoard, Inc. and its suppliers,
- * if any.  The intellectual and technical concepts contained
- * herein are proprietary to ThingsBoard, Inc.
- * and its suppliers and may be covered by U.S. and Foreign Patents,
- * patents in process, and are protected by trade secret or copyright law.
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Dissemination of this information or reproduction of this material is strictly forbidden
- * unless prior written permission is obtained from COMPANY.
- *
- * Access to the source code contained herein is hereby forbidden to anyone except current COMPANY employees,
- * managers or contractors who have executed Confidentiality and Non-disclosure agreements
- * explicitly covering such access.
- *
- * The copyright notice above does not evidence any actual or intended publication
- * or disclosure  of  this source code, which includes
- * information that is confidential and/or proprietary, and is a trade secret, of  COMPANY.
- * ANY REPRODUCTION, MODIFICATION, DISTRIBUTION, PUBLIC  PERFORMANCE,
- * OR PUBLIC DISPLAY OF OR THROUGH USE  OF THIS  SOURCE CODE  WITHOUT
- * THE EXPRESS WRITTEN CONSENT OF COMPANY IS STRICTLY PROHIBITED,
- * AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES.
- * THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR RELATED INFORMATION
- * DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS,
- * OR TO MANUFACTURE, USE, OR SELL ANYTHING THAT IT  MAY DESCRIBE, IN WHOLE OR IN PART.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.thingsboard.server.service.edge.rpc.processor;
 

From 632193cbdfb5cfac54dfcfb3bc79882e556111f8 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Tue, 30 Jun 2026 12:30:42 +0300
Subject: [PATCH 43/91] Reserve dynamic ports for OpenAPI spec generation to
 avoid port conflicts

---
 application/pom.xml | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/application/pom.xml b/application/pom.xml
index f6ceba95a1..6a976bf846 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -507,12 +507,31 @@
             </properties>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <!-- Reserve free ephemeral ports so concurrent openapi-spec builds (and orphaned
+                                 forks from prior failed builds) on the same CI agent don't collide on fixed ports. -->
+                            <execution>
+                                <id>reserve-openapi-ports</id>
+                                <phase>initialize</phase>
+                                <goals><goal>reserve-network-port</goal></goals>
+                                <configuration>
+                                    <portNames>
+                                        <portName>jmx.port</portName>
+                                        <portName>http.port</portName>
+                                    </portNames>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
                         <configuration>
                             <mainClass>org.thingsboard.server.ThingsboardServerApplication</mainClass>
-                            <jmxPort>9001</jmxPort>
+                            <jmxPort>${jmx.port}</jmxPort>
                         </configuration>
                         <executions>
                             <execution>
@@ -532,6 +551,7 @@
                                     <arguments>
                                         <argument>--spring.config.name=thingsboard</argument>
                                         <argument>--spring.profiles.active=openapi</argument>
+                                        <argument>--server.port=${http.port}</argument>
                                     </arguments>
                                     <maxAttempts>180</maxAttempts>
                                     <wait>2000</wait>
@@ -557,7 +577,7 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <apiDocsUrl>http://localhost:8080/v3/api-docs/thingsboard</apiDocsUrl>
+                            <apiDocsUrl>http://localhost:${http.port}/v3/api-docs/thingsboard</apiDocsUrl>
                             <outputFileName>openapi.json</outputFileName>
                             <outputDir>${project.build.directory}</outputDir>
                         </configuration>

From 42e3c8de6a36454c696a5be63f1d304a28aa9007 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Tue, 30 Jun 2026 12:22:22 +0200
Subject: [PATCH 44/91] Remove redundant [disabled] binding on reactive-form
 fields to fix NG01001 warning

---
 .../basic/button/power-button-basic-config.component.html       | 1 -
 .../basic/button/toggle-button-basic-config.component.html      | 1 -
 .../cards/aggregated-value-card-basic-config.component.html     | 2 --
 .../basic/cards/label-value-card-basic-config.component.html    | 1 -
 .../config/basic/cards/progress-bar-basic-config.component.html | 1 -
 .../basic/cards/timeseries-table-basic-config.component.html    | 1 -
 .../config/basic/cards/value-card-basic-config.component.html   | 1 -
 .../basic/cards/value-chart-card-basic-config.component.html    | 1 -
 .../chart/bar-chart-with-labels-basic-config.component.html     | 1 -
 .../widget/config/basic/chart/flot-basic-config.component.html  | 1 -
 .../config/basic/chart/latest-chart-basic-config.component.html | 1 -
 .../config/basic/chart/range-chart-basic-config.component.html  | 1 -
 .../basic/chart/time-series-chart-basic-config.component.html   | 1 -
 .../basic/entity/entities-table-basic-config.component.html     | 1 -
 .../basic/indicator/battery-level-basic-config.component.html   | 1 -
 .../indicator/liquid-level-card-basic-config.component.html     | 1 -
 .../basic/indicator/signal-strength-basic-config.component.html | 1 -
 .../widget/config/basic/map/map-basic-config.component.html     | 1 -
 .../widget/config/basic/rpc/slider-basic-config.component.html  | 1 -
 .../config/basic/scada/scada-symbol-basic-config.component.html | 1 -
 .../weather/wind-speed-direction-basic-config.component.html    | 1 -
 .../cards/aggregated-value-card-widget-settings.component.html  | 1 -
 .../cards/label-value-card-widget-settings.component.html       | 1 -
 .../common/button/widget-button-appearance.component.html       | 1 -
 .../lib/settings/common/count-widget-settings.component.html    | 1 -
 .../indicator/status-widget-state-settings.component.html       | 1 -
 .../control/single-switch-widget-settings.component.html        | 1 -
 .../modules/home/components/widget/widget-config.component.html | 1 -
 28 files changed, 29 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.html
index 51ebab7a92..75e3bad0f5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/power-button-basic-config.component.html
@@ -88,7 +88,6 @@
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
                                         [predefinedValues]="predefinedValues"
-                                        [disabled]="!powerButtonWidgetConfigForm.get('showTitle').value"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
         ></tb-string-pattern-autocomplete>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/toggle-button-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/toggle-button-basic-config.component.html
index d506fe4e8b..7bd2974678 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/toggle-button-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/toggle-button-basic-config.component.html
@@ -98,7 +98,6 @@
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
                                         [predefinedValues]="predefinedValues"
-                                        [disabled]="!toggleButtonWidgetConfigForm.get('showTitle').value"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
         ></tb-string-pattern-autocomplete>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-value-card-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-value-card-basic-config.component.html
index f0897ae55c..a7192a3c1b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-value-card-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/aggregated-value-card-basic-config.component.html
@@ -45,7 +45,6 @@
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
                                         [predefinedValues]="predefinedValues"
-                                        [disabled]="!aggregatedValueCardWidgetConfigForm.get('showTitle').value"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
         ></tb-string-pattern-autocomplete>
@@ -91,7 +90,6 @@
                                         subscriptSizing="dynamic"
                                         [predefinedValuesButton]="true"
                                         [predefinedValues]="predefinedValues"
-                                        [disabled]="!aggregatedValueCardWidgetConfigForm.get('showSubtitle').value"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="subtitle"
         ></tb-string-pattern-autocomplete>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.html
index 90cb150339..b2d186724b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/label-value-card-basic-config.component.html
@@ -46,7 +46,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!labelValueCardWidgetConfigForm.get('showLabel').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="label"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html
index 120ccf6457..a6212379c6 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/progress-bar-basic-config.component.html
@@ -58,7 +58,6 @@
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
                                         [predefinedValues]="predefinedValues"
-                                        [disabled]="!progressBarWidgetConfigForm.get('showTitle').value"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
         ></tb-string-pattern-autocomplete>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/timeseries-table-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/timeseries-table-basic-config.component.html
index 43777d596e..fe63bb8591 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/timeseries-table-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/timeseries-table-basic-config.component.html
@@ -49,7 +49,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!timeseriesTableWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/value-card-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/value-card-basic-config.component.html
index 9a4a6196c8..1ab422f7ec 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/value-card-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/value-card-basic-config.component.html
@@ -58,7 +58,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!valueCardWidgetConfigForm.get('showLabel').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="label"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/value-chart-card-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/value-chart-card-basic-config.component.html
index c7943ec0a7..406ae88d2e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/value-chart-card-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/cards/value-chart-card-basic-config.component.html
@@ -56,7 +56,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!valueChartCardWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
index 1aa4c2be3d..98c0884da4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/bar-chart-with-labels-basic-config.component.html
@@ -54,7 +54,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!barChartWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/flot-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/flot-basic-config.component.html
index 029a1a8cb3..12c538dae4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/flot-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/flot-basic-config.component.html
@@ -49,7 +49,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!flotWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/latest-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/latest-chart-basic-config.component.html
index b0f108ba58..a1b3b97ee7 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/latest-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/latest-chart-basic-config.component.html
@@ -55,7 +55,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!latestChartWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
index 7d3195e7f4..45acefab12 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/range-chart-basic-config.component.html
@@ -38,7 +38,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!rangeChartWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
index 85ef776718..ac0017929b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
@@ -131,7 +131,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!timeSeriesChartWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/entity/entities-table-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/entity/entities-table-basic-config.component.html
index 27ad183dfa..34579f1b3a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/entity/entities-table-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/entity/entities-table-basic-config.component.html
@@ -49,7 +49,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!entitiesTableWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/battery-level-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/battery-level-basic-config.component.html
index e36e315b3e..894b13788b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/battery-level-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/battery-level-basic-config.component.html
@@ -58,7 +58,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!batteryLevelWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.html
index 473bdb0b4b..396441ce2f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/liquid-level-card-basic-config.component.html
@@ -40,7 +40,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!levelCardWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/signal-strength-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/signal-strength-basic-config.component.html
index ed034aaf89..c3ac497ae5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/signal-strength-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/indicator/signal-strength-basic-config.component.html
@@ -52,7 +52,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!signalStrengthWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/map/map-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/map/map-basic-config.component.html
index 3d1f05fb4b..fb1246a9cc 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/map/map-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/map/map-basic-config.component.html
@@ -40,7 +40,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!mapWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html
index b6566c181e..918af02557 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/rpc/slider-basic-config.component.html
@@ -81,7 +81,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!sliderWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/scada/scada-symbol-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/scada/scada-symbol-basic-config.component.html
index 03cdee6b95..224e45354e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/scada/scada-symbol-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/scada/scada-symbol-basic-config.component.html
@@ -40,7 +40,6 @@
                                           brackets="curly"
                                           subscriptSizing="dynamic"
                                           predefinedValuesButton="true"
-                                          [disabled]="!scadaSymbolWidgetConfigForm.get('showTitle').value"
                                           [predefinedValues]="predefinedValues"
                                           placeholderText="{{ 'widget-config.set' | translate }}"
                                           formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/weather/wind-speed-direction-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/weather/wind-speed-direction-basic-config.component.html
index 3727cd0952..fc673b8baa 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/weather/wind-speed-direction-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/weather/wind-speed-direction-basic-config.component.html
@@ -100,7 +100,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         predefinedValuesButton="true"
-                                        [disabled]="!windSpeedDirectionWidgetConfigForm.get('showTitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="title"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/aggregated-value-card-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/aggregated-value-card-widget-settings.component.html
index d2bda36ab2..ba54d83173 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/aggregated-value-card-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/aggregated-value-card-widget-settings.component.html
@@ -33,7 +33,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         [predefinedValuesButton]="true"
-                                        [disabled]="!aggregatedValueCardWidgetSettingsForm.get('showSubtitle').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="subtitle"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.html
index b4520590b6..cd11b4f10f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-value-card-widget-settings.component.html
@@ -33,7 +33,6 @@
                                         brackets="curly"
                                         subscriptSizing="dynamic"
                                         [predefinedValuesButton]="true"
-                                        [disabled]="!labelValueCardWidgetSettingsForm.get('showLabel').value"
                                         [predefinedValues]="predefinedValues"
                                         placeholderText="{{ 'widget-config.set' | translate }}"
                                         formControlName="label"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html
index 26835e857a..d54cd71c00 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.html
@@ -42,7 +42,6 @@
                                     brackets="curly"
                                     subscriptSizing="dynamic"
                                     predefinedValuesButton="true"
-                                    [disabled]="!appearanceFormGroup.get('showLabel').value"
                                     [predefinedValues]="predefinedValues"
                                     placeholderText="{{ 'widget-config.set' | translate }}"
                                     formControlName="label"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/count-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/count-widget-settings.component.html
index 08a0246217..ee79216190 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/count-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/count-widget-settings.component.html
@@ -48,7 +48,6 @@
                                       brackets="curly"
                                       subscriptSizing="dynamic"
                                       predefinedValuesButton="true"
-                                      [disabled]="!countWidgetConfigForm.get('showLabel').value"
                                       [predefinedValues]="predefinedValues"
                                       placeholderText="{{ 'widget-config.set' | translate }}"
                                       formControlName="label"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.html
index 485f6d0af4..11b99f411a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/indicator/status-widget-state-settings.component.html
@@ -26,7 +26,6 @@
                                       brackets="curly"
                                       subscriptSizing="dynamic"
                                       predefinedValuesButton="true"
-                                      [disabled]="!stateSettingsFormGroup.get('showLabel').value"
                                       [predefinedValues]="predefinedValues"
                                       placeholderText="{{ 'widget-config.set' | translate }}"
                                       formControlName="label"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html
index 330433141e..cf3a77c38d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/control/single-switch-widget-settings.component.html
@@ -91,7 +91,6 @@
                                       brackets="curly"
                                       subscriptSizing="dynamic"
                                       predefinedValuesButton="true"
-                                      [disabled]="!singleSwitchWidgetSettingsForm.get('showLabel').value"
                                       [predefinedValues]="predefinedValues"
                                       placeholderText="{{ 'widget-config.set' | translate }}"
                                       formControlName="label"
diff --git a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
index 641755b810..1bf65c61a0 100644
--- a/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/widget-config.component.html
@@ -51,7 +51,6 @@
                                               brackets="curly"
                                               subscriptSizing="dynamic"
                                               [predefinedValuesButton]="true"
-                                              [disabled]="!widgetSettings.get('showTitle').value"
                                               [predefinedValues]="predefinedValues"
                                               placeholderText="{{ 'widget-config.set' | translate }}"
                                               formControlName="title"

From c435bcdf6f10fae8ae029bce8ba593989ecf9c2b Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Tue, 30 Jun 2026 14:54:23 +0200
Subject: [PATCH 45/91] Used shared ShortNumberPipe for API usage value
 formatting

---
 .../lib/cards/api-usage-widget.component.ts   | 29 ++++---------------
 .../usage-info-widget.component.html          | 10 +++----
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
index b41f5ed02a..af315b226a 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
@@ -30,6 +30,7 @@ import {
   ApiUsageWidgetSettings,
   getUniqueDataKeys
 } from '@home/components/widget/lib/settings/cards/api-usage-settings.component.models';
+import { ShortNumberPipe } from '@shared/pipe/short-number.pipe';
 
 @Component({
     selector: 'tb-api-usage-widget',
@@ -57,18 +58,12 @@ export class ApiUsageWidgetComponent implements OnInit, OnDestroy {
   noDataDisplayMessageText: string;
 
   private contentResize$: ResizeObserver;
-  private powers: {key: string, value: number}[] = [
-    { key: 'Q', value: 1e15 },
-    { key: 'T', value: 1e12 },
-    { key: 'B', value: 1e9 },
-    { key: 'M', value: 1e6 },
-    { key: 'K', value: 1e3 }
-  ];
 
   constructor(private imagePipe: ImagePipe,
               private utils: UtilsService,
               private sanitizer: DomSanitizer,
-              private cd: ChangeDetectorRef) {
+              private cd: ChangeDetectorRef,
+              private shortNumberPipe: ShortNumberPipe) {
   }
 
   ngOnInit(): void {
@@ -95,8 +90,8 @@ export class ApiUsageWidgetComponent implements OnInit, OnDestroy {
             const progress = (this.isFiniteNumber(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0) ? Math.min(100, ((data[0][key.current.key] / data[0][key.maxLimit.key]) * 100)) : 0;
             key.progress = isFinite(progress) ? progress : 0;
             key.status.value = data[0][key.status.key] ? data[0][key.status.key].toLowerCase() : 'enabled';
-            key.maxLimit.value = this.isFiniteNumber(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0 ? this.toShortNumber(data[0][key.maxLimit.key]) : '∞';
-            key.current.value = this.isFiniteNumber(data[0][key.current.key]) ? this.toShortNumber(data[0][key.current.key]) : 0;
+            key.maxLimit.value = this.isFiniteNumber(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0 ?  this.shortNumberPipe.transform(data[0][key.maxLimit.key]) : '∞';
+            key.current.value = this.isFiniteNumber(data[0][key.current.key]) ? this.shortNumberPipe.transform(data[0][key.current.key], {roundDown: true}) : 0;
           });
           this.cd.detectChanges();
         }
@@ -145,20 +140,6 @@ export class ApiUsageWidgetComponent implements OnInit, OnDestroy {
     }
   }
 
-  private toShortNumber(number: any, decimals = 1) {
-    if (!Number.isFinite(number) || number < 0) {
-      return '0';
-    }
-    for (const power of this.powers) {
-      if (number >= power.value) {
-        const reduced = number / power.value;
-        const rounded = Number(reduced.toFixed(decimals));
-        return `${rounded}${power.key}`;
-      }
-    }
-    return `${Number(number.toFixed(decimals))}`;
-  }
-
   public onInit() {
     const borderRadius = this.ctx.$widgetElement.css('borderRadius');
     this.overlayStyle = {...this.overlayStyle, ...{borderRadius}};
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/usage-info-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/usage-info-widget.component.html
index d23b7b8e50..92ef58c640 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/usage-info-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/usage-info-widget.component.html
@@ -63,11 +63,11 @@
           </div>
           <div class="tb-usage-items-values">
             <div class="tb-usage-items-counts">
-              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.transportMessages">{{ usageInfo?.transportMessages | shortNumber }} / {{ maxValue(usageInfo?.maxTransportMessages) }}</div>
-              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.jsExecutions">{{ usageInfo?.jsExecutions | shortNumber }} / {{ maxValue(usageInfo?.maxJsExecutions) }}</div>
-              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.alarms">{{ usageInfo?.alarms | shortNumber }} / {{ maxValue(usageInfo?.maxAlarms) }}</div>
-              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.emails">{{ usageInfo?.emails | shortNumber }} / {{ maxValue(usageInfo?.maxEmails) }}</div>
-              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.sms">{{ usageInfo?.sms | shortNumber }} / {{ maxValue(usageInfo?.maxSms) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.transportMessages">{{ usageInfo?.transportMessages | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxTransportMessages) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.jsExecutions">{{ usageInfo?.jsExecutions | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxJsExecutions) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.alarms">{{ usageInfo?.alarms | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxAlarms) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.emails">{{ usageInfo?.emails | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxEmails) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="apiCallItemCritical.sms">{{ usageInfo?.sms | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxSms) }}</div>
             </div>
             <div class="tb-usage-items-progress">
               <mat-progress-bar [class.critical]="apiCallItemCritical.transportMessages" color="primary" mode="determinate" [value]="progressValue(usageInfo?.transportMessages, usageInfo?.maxTransportMessages)"></mat-progress-bar>

From 091eebb40c4e9a0638fc2be900916de23ee34405 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 30 Jun 2026 18:58:36 +0300
Subject: [PATCH 46/91] Fix stray double space in api-usage-widget ternary

---
 .../components/widget/lib/cards/api-usage-widget.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
index af315b226a..65829ea723 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/api-usage-widget.component.ts
@@ -90,7 +90,7 @@ export class ApiUsageWidgetComponent implements OnInit, OnDestroy {
             const progress = (this.isFiniteNumber(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0) ? Math.min(100, ((data[0][key.current.key] / data[0][key.maxLimit.key]) * 100)) : 0;
             key.progress = isFinite(progress) ? progress : 0;
             key.status.value = data[0][key.status.key] ? data[0][key.status.key].toLowerCase() : 'enabled';
-            key.maxLimit.value = this.isFiniteNumber(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0 ?  this.shortNumberPipe.transform(data[0][key.maxLimit.key]) : '∞';
+            key.maxLimit.value = this.isFiniteNumber(data[0][key.maxLimit.key]) && data[0][key.maxLimit.key] !== 0 ? this.shortNumberPipe.transform(data[0][key.maxLimit.key]) : '∞';
             key.current.value = this.isFiniteNumber(data[0][key.current.key]) ? this.shortNumberPipe.transform(data[0][key.current.key], {roundDown: true}) : 0;
           });
           this.cd.detectChanges();

From 9d3897764377b629f4d49efac5e3b5a44e95500c Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 1 Jul 2026 09:28:17 +0200
Subject: [PATCH 47/91] Minor fixes

---
 .../lib/home-page/usage-info-widget.component.html     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/usage-info-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/usage-info-widget.component.html
index 92ef58c640..0f3f35f172 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/usage-info-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/usage-info-widget.component.html
@@ -36,11 +36,11 @@
           </div>
           <div class="tb-usage-items-values">
             <div class="tb-usage-items-counts">
-              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.devices">{{ usageInfo?.devices | shortNumber }} / {{ maxValue(usageInfo?.maxDevices) }}</div>
-              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.assets">{{ usageInfo?.assets | shortNumber }} / {{ maxValue(usageInfo?.maxAssets) }}</div>
-              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.users">{{ usageInfo?.users | shortNumber }} / {{ maxValue(usageInfo?.maxUsers) }}</div>
-              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.dashboards">{{ usageInfo?.dashboards | shortNumber }} / {{ maxValue(usageInfo?.maxDashboards) }}</div>
-              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.customers">{{ usageInfo?.customers | shortNumber }} / {{ maxValue(usageInfo?.maxCustomers) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.devices">{{ usageInfo?.devices | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxDevices) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.assets">{{ usageInfo?.assets | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxAssets) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.users">{{ usageInfo?.users | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxUsers) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.dashboards">{{ usageInfo?.dashboards | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxDashboards) }}</div>
+              <div class="tb-usage-item-counts" [class.critical]="entityItemCritical.customers">{{ usageInfo?.customers | shortNumber: {roundDown: true} }} / {{ maxValue(usageInfo?.maxCustomers) }}</div>
             </div>
             <div class="tb-usage-items-progress">
               <mat-progress-bar [class.critical]="entityItemCritical.devices" color="primary" mode="determinate" [value]="progressValue(usageInfo?.devices, usageInfo?.maxDevices)"></mat-progress-bar>

From ec5be9bfef1a56a5605bffcfbadd8ca00c19d45e Mon Sep 17 00:00:00 2001
From: Valeriia Koriavikova <mandragora1783@gmail.com>
Date: Thu, 2 Jul 2026 18:21:15 +0300
Subject: [PATCH 48/91] Merge pull request #15847 from
 LeoMorgan113/feature/ticks-label-fix

Fix chart axis ticks font size
---
 .../widget/lib/chart/time-series-chart.ts     | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
index ca2456e109..763c8d612d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts
@@ -846,15 +846,29 @@ export class TbTimeSeriesChart {
     }
   }
 
+  private maxTickLabelHalfHeight(): number {
+    const axes = this.yAxisList.filter(a => a.settings.show && a.settings.showTickLabels);
+    if (!axes.length) {
+      return 0;
+    }
+
+    const defaultSize = defaultTimeSeriesChartYAxisSettings.tickLabelFont.size;
+    const maxFontSize = Math.max(...axes.map(a => a.settings.tickLabelFont?.size || defaultSize));
+    return Math.ceil(maxFontSize / 2);
+  }
+
   private minTopOffset(): number {
-    const showTickLabels =
-      !!this.yAxisList.find(yAxis => yAxis.settings.show && yAxis.settings.showTickLabels);
-    return (this.topPointLabels) ? 25 :
-      (showTickLabels ? 10 : 5);
+    if (this.topPointLabels) {
+      return 25;
+    }
+    const half = this.maxTickLabelHalfHeight();
+    return half ? Math.max(10, half) : 5;
   }
 
   private minBottomOffset(): number {
-    return this.settings.dataZoom ? 45 : 5;
+    const half = this.maxTickLabelHalfHeight();
+    const minOffset = half ? Math.max(5, half) : 5;
+    return this.settings.dataZoom ? Math.max(45, minOffset) : minOffset;
   }
 
   private _onParentScroll() {
@@ -883,6 +897,7 @@ export class TbTimeSeriesChart {
             this.updateBarsAnimation(barItems, false);
           }
           this.timeSeriesChart.resize();
+          this.updateAxes();
           if (this.animationEnabled()) {
             this.updateBarsAnimation(barItems, true);
           }

From 751730acd3d4970bd9dc0fd7ba0c64f5af1e436f Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Thu, 2 Jul 2026 10:48:21 +0200
Subject: [PATCH 49/91] Added missing translation for Label and Value Card
 widget

---
 .../widget/lib/cards/label-value-card-widget.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.html
index 289b54bb56..930fef4d42 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/cards/label-value-card-widget.component.html
@@ -28,7 +28,7 @@
         <div *ngIf="showLabel" [class.tb-label-value-card-label]="!settings.autoScale" [style]="labelStyle" [style.color]="labelColor.color"
              [innerHTML]="label$ | async | safe:'html'"></div>
       </div>
-      <div class="tb-label-value-card-value" [style]="valueStyle" [style.color]="valueColor.color">{{ valueText }}</div>
+      <div class="tb-label-value-card-value" [style]="valueStyle" [style.color]="valueColor.color">{{ valueText | customTranslate }}</div>
     </div>
   </div>
 </div>

From 5493ac7da50a506693a5b5f1ac69d6eb27842b33 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Thu, 2 Jul 2026 17:54:39 +0200
Subject: [PATCH 50/91] Fixed validation for Digital Gauge widget maxValue when
 it is zero (#15893)

* Fixed validation for Digital Gauge widget maxValue when it is zero

* Fixed check
---
 .../digital-simple-gauge-basic-config.component.ts    | 11 +++++------
 .../gauge/digital-gauge-widget-settings.component.ts  | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/digital-simple-gauge-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/digital-simple-gauge-basic-config.component.ts
index e0ca65cdea..6d837f476c 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/digital-simple-gauge-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/gauge/digital-simple-gauge-basic-config.component.ts
@@ -30,7 +30,7 @@ import {
   getTimewindowConfig,
   setTimewindowConfig
 } from '@home/components/widget/config/timewindow-config-panel.component';
-import { formatValue, isDefined, isUndefined } from '@core/utils';
+import { formatValue, isDefined, isDefinedAndNotNull, isNumeric, isUndefined } from '@core/utils';
 import { Component } from '@angular/core';
 import {
   convertLevelColorsSettingsToColorProcessor,
@@ -189,11 +189,10 @@ export class DigitalSimpleGaugeBasicConfigComponent extends BasicWidgetConfigCom
 
   private maxValueValidation(): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
-      const value: string = control.value;
-      if (value) {
-        if (value < control.parent?.get('minValue').value) {
-          return {maxValue: true};
-        }
+      const value: number = control.value;
+      const minValue = control.parent?.get('minValue').value;
+      if (isNumeric(value) && isDefinedAndNotNull(minValue) && value < minValue) {
+        return {maxValue: true};
       }
       return null;
     };
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/digital-gauge-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/digital-gauge-widget-settings.component.ts
index ff22abd28a..fe7eeb7305 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/digital-gauge-widget-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/gauge/digital-gauge-widget-settings.component.ts
@@ -37,7 +37,7 @@ import {
   digitalGaugeLayoutTranslations,
   DigitalGaugeType
 } from '@home/components/widget/lib/digital-gauge.models';
-import { formatValue, isDefined } from '@core/utils';
+import { formatValue, isDefined, isDefinedAndNotNull, isNumeric } from '@core/utils';
 import {
   ColorSettings,
   ColorType,
@@ -218,11 +218,10 @@ export class DigitalGaugeWidgetSettingsComponent extends WidgetSettingsComponent
 
   private maxValueValidation(): ValidatorFn {
     return (control: AbstractControl): ValidationErrors | null => {
-      const value: string = control.value;
-      if (value) {
-        if (value < control.parent?.get('minValue').value) {
-          return {maxValue: true};
-        }
+      const value: number = control.value;
+      const minValue = control.parent?.get('minValue').value;
+      if (isNumeric(value) && isDefinedAndNotNull(minValue) && value < minValue) {
+        return {maxValue: true};
       }
       return null;
     };

From 1302a67ee83b8b2b2f3e93bbf789a387d1c40acc Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Mon, 29 Jun 2026 14:17:52 +0200
Subject: [PATCH 51/91] Fixed Calculated Field test script running against
 stale entity values instead of current form input

---
 .../components/calculated-fields/calculated-field.component.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.ts b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.ts
index 4790789080..a80eb3439f 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.ts
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.ts
@@ -132,7 +132,7 @@ export class CalculatedFieldComponent extends EntityComponent<CalculatedFieldsTa
   onTestScript(expression?: string): Observable<string> {
     return this.cfFormService.testScript(
       this.entity?.id?.id,
-      this.entityValue,
+      this.entityFormValue(),
       this.entitiesTableConfig.getTestScriptDialog.bind(this.entitiesTableConfig),
       this.destroyRef,
       expression

From 655d4ed55e7aeb88a8fcb2be9903a4ec99432b06 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Fri, 3 Jul 2026 12:16:41 +0300
Subject: [PATCH 52/91] Fix invalid `callSuper = false` usages for
 EqualsAndHashCode

---
 .../server/service/cf/ctx/state/ScriptCalculatedFieldState.java | 2 +-
 .../server/service/cf/ctx/state/SimpleCalculatedFieldState.java | 2 +-
 .../main/java/org/thingsboard/server/common/data/EventInfo.java | 2 +-
 .../java/org/thingsboard/server/common/data/HomeDashboard.java  | 2 +-
 .../java/org/thingsboard/server/common/data/TenantInfo.java     | 2 +-
 .../org/thingsboard/server/common/data/alarm/AlarmComment.java  | 2 +-
 .../data/device/data/CoapDeviceTransportConfiguration.java      | 2 +-
 .../data/device/data/Lwm2mDeviceTransportConfiguration.java     | 2 +-
 .../lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java       | 2 +-
 .../java/org/thingsboard/server/common/data/edge/EdgeInfo.java  | 2 +-
 .../thingsboard/server/common/data/edqs/fields/AssetFields.java | 2 +-
 .../server/common/data/edqs/fields/AssetProfileFields.java      | 2 +-
 .../server/common/data/edqs/fields/CustomerFields.java          | 2 +-
 .../server/common/data/edqs/fields/DashboardFields.java         | 2 +-
 .../server/common/data/edqs/fields/DeviceFields.java            | 2 +-
 .../server/common/data/edqs/fields/DeviceProfileFields.java     | 2 +-
 .../thingsboard/server/common/data/edqs/fields/EdgeFields.java  | 2 +-
 .../server/common/data/edqs/fields/EntityViewFields.java        | 2 +-
 .../server/common/data/edqs/fields/QueueStatsFields.java        | 2 +-
 .../server/common/data/edqs/fields/RuleChainFields.java         | 2 +-
 .../server/common/data/edqs/fields/TenantFields.java            | 2 +-
 .../server/common/data/edqs/fields/TenantProfileFields.java     | 2 +-
 .../thingsboard/server/common/data/edqs/fields/UserFields.java  | 2 +-
 .../thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java  | 2 +-
 .../thingsboard/server/common/data/query/AlarmCountQuery.java   | 2 +-
 .../java/org/thingsboard/server/common/data/queue/Queue.java    | 2 +-
 .../org/thingsboard/server/common/data/rule/RuleNodeState.java  | 2 +-
 .../thingsboard/server/common/data/widget/WidgetTypeInfo.java   | 2 +-
 .../server/transport/mqtt/limits/GatewaySessionLimits.java      | 2 +-
 .../server/dao/model/sqlts/latest/TsKvLatestEntity.java         | 2 +-
 .../rule/engine/action/TbClearAlarmNodeConfiguration.java       | 2 +-
 .../rule/engine/action/TbCreateAlarmNodeConfiguration.java      | 2 +-
 .../rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java | 2 +-
 .../rule/engine/mqtt/azure/AzureIotHubSasCredentials.java       | 2 +-
 .../rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java  | 2 +-
 35 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
index be95922dbb..4bb5e4eca2 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java
@@ -36,7 +36,7 @@ import java.util.List;
 import java.util.Map;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Slf4j
 @NoArgsConstructor
 public class ScriptCalculatedFieldState extends BaseCalculatedFieldState {
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
index e797376c55..7c54cefdcc 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java
@@ -34,7 +34,7 @@ import java.util.List;
 import java.util.Map;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 public class SimpleCalculatedFieldState extends BaseCalculatedFieldState {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
index e0bdde1dd8..e81ea75d93 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/EventInfo.java
@@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.id.TenantId;
  * @author Andrew Shvayka
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Schema
 public class EventInfo extends BaseData<EventId> {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
index df2cdf2bf5..8d9ee2104b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboard.java
@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
 
 @Schema
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class HomeDashboard extends Dashboard {
 
     public static final String HIDE_DASHBOARD_TOOLBAR_DESCRIPTION = "Hide dashboard toolbar flag. Useful for rendering dashboards on mobile.";
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
index 8f38ecd750..6f44874a9c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TenantInfo.java
@@ -22,7 +22,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 
 @Schema
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TenantInfo extends Tenant {
     @Schema(description = "Tenant Profile name", example = "Default")
     private String tenantProfileName;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
index 29269e5bd8..17211ed617 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmComment.java
@@ -34,7 +34,7 @@ import java.io.Serial;
 
 @Schema
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Builder
 @AllArgsConstructor
 public class AlarmComment extends BaseData<AlarmCommentId> implements HasName {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
index 662887c08c..b365686064 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/CoapDeviceTransportConfiguration.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class CoapDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
     private static final long serialVersionUID = 6061442236008925609L;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
index 1c53412ef9..dc9e22fe80 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class Lwm2mDeviceTransportConfiguration extends PowerSavingConfiguration implements DeviceTransportConfiguration {
 
     @JsonIgnore
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
index 14ef402718..ad5703637c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MServerSecurityConfigDefault.java
@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
 
 @Schema
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class LwM2MServerSecurityConfigDefault extends LwM2MServerSecurityConfig {
     @Schema(description = "Host for 'Security' mode (DTLS)", example = "0.0.0.0", accessMode = Schema.AccessMode.READ_ONLY)
     protected String securityHost;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
index 5dbd0212b3..66ad9f1d85 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edge/EdgeInfo.java
@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.id.EdgeId;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class EdgeInfo extends Edge {
 
     private String customerTitle;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
index d05147b4d7..18b410a581 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetFields.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetFields extends AbstractEntityFields implements ProfileAwareFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
index c519daa800..3e336023a3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/AssetProfileFields.java
@@ -23,7 +23,7 @@ import lombok.experimental.SuperBuilder;
 import java.util.UUID;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class AssetProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
index c324f0f1ab..ad5e87134e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/CustomerFields.java
@@ -26,7 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class CustomerFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
index 608a64436e..786a27fce9 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DashboardFields.java
@@ -29,7 +29,7 @@ import java.util.UUID;
 
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class DashboardFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
index ef8aee952b..df72525990 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceFields.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceFields extends AbstractEntityFields implements ProfileAwareFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
index 2331829054..d7f6cf13bb 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/DeviceProfileFields.java
@@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.DeviceProfileType;
 import java.util.UUID;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class DeviceProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
index e048eb22a8..24ac1fcd35 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EdgeFields.java
@@ -26,7 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class EdgeFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
index c5027dfc8f..d21d495cf1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/EntityViewFields.java
@@ -26,7 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class EntityViewFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
index 5c5a139364..3e8a1136bc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/QueueStatsFields.java
@@ -23,7 +23,7 @@ import lombok.experimental.SuperBuilder;
 import java.util.UUID;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class QueueStatsFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
index d580f6b913..d8dd1c8a43 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/RuleChainFields.java
@@ -26,7 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class RuleChainFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
index ba350fec54..3fda35d969 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantFields.java
@@ -26,7 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
index 5d1ff0e0e2..28f257bbf2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/TenantProfileFields.java
@@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import java.util.UUID;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class TenantProfileFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
index 70fde8bf9c..723b618d7c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/edqs/fields/UserFields.java
@@ -26,7 +26,7 @@ import java.util.UUID;
 import static org.thingsboard.server.common.data.edqs.fields.FieldsUtil.getText;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @SuperBuilder
 public class UserFields extends AbstractEntityFields {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
index f46339c15a..8ca4070671 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BaseDeleteTsKvQuery.java
@@ -19,7 +19,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class BaseDeleteTsKvQuery extends BaseTsKvQuery implements DeleteTsKvQuery {
 
     private final Boolean rewriteLatestIfDeleted;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
index 1599413c1c..77003a9452 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
@@ -31,7 +31,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @ToString
 public class AlarmCountQuery extends EntityCountQuery {
     private long startTs;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
index d6a4f2b12f..1e48b66c92 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/queue/Queue.java
@@ -31,7 +31,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 import java.util.Optional;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class Queue extends BaseDataWithAdditionalInfo<QueueId> implements HasName, HasTenantId, QueueConfig {
     private TenantId tenantId;
     @NoXss
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
index 0624350d7e..77c2b2068c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNodeState.java
@@ -23,7 +23,7 @@ import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.RuleNodeStateId;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class RuleNodeState extends BaseData<RuleNodeStateId> {
 
     private RuleNodeId ruleNodeId;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
index 9acce93aa3..34f397f0ed 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetTypeInfo.java
@@ -27,7 +27,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class WidgetTypeInfo extends BaseWidgetType {
 
     @Serial
diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
index 8356a17748..641f52bbd3 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/limits/GatewaySessionLimits.java
@@ -19,7 +19,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class GatewaySessionLimits extends SessionLimits {
 
     private SessionRateLimits gatewayRateLimits;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
index 421a22a9d2..4d8a7de22a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/sqlts/latest/TsKvLatestEntity.java
@@ -36,7 +36,7 @@ import java.util.UUID;
 import static org.thingsboard.server.dao.model.ModelConstants.VERSION_COLUMN;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "ts_kv_latest")
 @IdClass(TsKvLatestCompositeKey.class)
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
index ab305919fd..a98e04e591 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbClearAlarmNodeConfiguration.java
@@ -21,7 +21,7 @@ import org.thingsboard.rule.engine.api.NodeConfiguration;
 import org.thingsboard.server.common.data.script.ScriptLanguage;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TbClearAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbClearAlarmNodeConfiguration> {
 
     @Override
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
index bf305a55d1..c97ef31e73 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateAlarmNodeConfiguration.java
@@ -26,7 +26,7 @@ import java.util.Collections;
 import java.util.List;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TbCreateAlarmNodeConfiguration extends TbAbstractAlarmNodeConfiguration implements NodeConfiguration<TbCreateAlarmNodeConfiguration> {
 
     @NoXss
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
index 6551352823..bafc4fb64e 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/TbGpsGeofencingActionNodeConfiguration.java
@@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit;
  * Created by ashvayka on 19.01.18.
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TbGpsGeofencingActionNodeConfiguration extends TbGpsGeofencingFilterNodeConfiguration {
 
     private int minInsideDuration;
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
index 93d1ef7ef8..4b9550b1d9 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/AzureIotHubSasCredentials.java
@@ -30,7 +30,7 @@ import org.thingsboard.rule.engine.credentials.CredentialsType;
 import java.security.Security;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 @Slf4j
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AzureIotHubSasCredentials extends CertPemCredentials {
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
index f11173f3f9..3362526e70 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mqtt/azure/TbAzureIotHubNodeConfiguration.java
@@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode;
 import org.thingsboard.rule.engine.mqtt.TbMqttNodeConfiguration;
 
 @Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
 public class TbAzureIotHubNodeConfiguration extends TbMqttNodeConfiguration {
 
     @Override

From c0dead85520dcdecc5ee0435e48b16d8fcc0265b Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Fri, 3 Jul 2026 12:42:58 +0300
Subject: [PATCH 53/91] Address review comments: rename test config class and
 drop inline FQN annotations

---
 .../device/provision/DeviceProvisionServiceTest.java   | 10 ++++++----
 .../service/queue/DefaultTbClusterServiceTest.java     |  3 ++-
 .../transport/DefaultTransportApiServiceTest.java      | 10 ++++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
index 4f2eaa5147..4d0195c816 100644
--- a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
@@ -21,6 +21,8 @@ import org.assertj.core.api.Assertions;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
@@ -73,12 +75,12 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = DeviceProvisionServiceTest.ContextConfiguration.class)
+@ContextConfiguration(classes = DeviceProvisionServiceTest.TestConfig.class)
 public class DeviceProvisionServiceTest {
 
-    @org.springframework.context.annotation.Configuration
-    static class ContextConfiguration {
-        @org.springframework.context.annotation.Bean
+    @Configuration
+    static class TestConfig {
+        @Bean
         public DeviceProvisionServiceImpl deviceProvisionService(TbQueueProducerProvider producerProvider,
                                                                  DeviceProfileService deviceProfileService,
                                                                  DeviceService deviceService,
diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
index 79b31acf78..b4f36d9bb5 100644
--- a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.service.queue;
 
 import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -115,7 +116,7 @@ public class DefaultTbClusterServiceTest {
     @MockitoSpyBean
     protected TbClusterService clusterService;
 
-    @org.junit.Before
+    @Before
     public void setUp() {
         lenient().when(topicService.getNotificationsTopic(any(), any())).thenAnswer(invocation -> {
             ServiceType serviceType = invocation.getArgument(0);
diff --git a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
index 6b667cc811..be3cc2e92b 100644
--- a/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/transport/DefaultTransportApiServiceTest.java
@@ -20,6 +20,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.springframework.test.context.ContextConfiguration;
@@ -69,12 +71,12 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(SpringRunner.class)
-@ContextConfiguration(classes = DefaultTransportApiServiceTest.ContextConfiguration.class)
+@ContextConfiguration(classes = DefaultTransportApiServiceTest.TestConfig.class)
 public class DefaultTransportApiServiceTest {
 
-    @org.springframework.context.annotation.Configuration
-    static class ContextConfiguration {
-        @org.springframework.context.annotation.Bean
+    @Configuration
+    static class TestConfig {
+        @Bean
         public DefaultTransportApiService defaultTransportApiService(TbDeviceProfileCache deviceProfileCache,
                                                                      TbTenantProfileCache tenantProfileCache,
                                                                      TbApiUsageStateService apiUsageStateService,

From 432262f358f3e844ec942d65d533fa0890ddf9dc Mon Sep 17 00:00:00 2001
From: Oleksandra Matviienko <al.zzzeebra@gmail.com>
Date: Sun, 5 Jul 2026 22:47:04 +0200
Subject: [PATCH 54/91] Fix AlarmCommentControllerTest delete assertions for
 callSuper=true

The deprecation cleanup set @EqualsAndHashCode(callSuper = true) on AlarmComment,
so equals/hashCode now include the BaseData id and createdTime. The delete tests
built the expected comment via a fresh builder (no id), which no longer matches the
server-generated deletion comment (which reuses the original comment id).

Mutate the original alarm comment (already carrying the correct id/createdTime) into
the expected SYSTEM deletion comment instead of building a fresh one.
---
 .../AlarmCommentControllerTest.java           | 48 ++++++++-----------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
index c778916d02..df6edaaac8 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
@@ -226,15 +226,13 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         doDelete("/api/alarm/" + alarm.getId() + "/comment/" + alarmComment.getId())
                 .andExpect(status().isOk());
 
-        AlarmComment expectedAlarmComment = AlarmComment.builder()
-                .alarmId(alarm.getId())
-                .type(AlarmCommentType.SYSTEM)
-                .comment(JacksonUtil.newObjectNode()
-                        .put("text", String.format(COMMENT_DELETED.getText(), CUSTOMER_USER_EMAIL))
-                        .put("subtype", COMMENT_DELETED.name())
-                        .put("userName", CUSTOMER_USER_EMAIL))
-                .build();
-        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
+        alarmComment.setType(AlarmCommentType.SYSTEM);
+        alarmComment.setUserId(null);
+        alarmComment.setComment(JacksonUtil.newObjectNode()
+                .put("text", String.format(COMMENT_DELETED.getText(), CUSTOMER_USER_EMAIL))
+                .put("subtype", COMMENT_DELETED.name())
+                .put("userName", CUSTOMER_USER_EMAIL));
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED_COMMENT, 1, alarmComment);
     }
 
     @Test
@@ -252,15 +250,13 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         loginTenantAdmin();
         doDelete("/api/alarm/" + alarm.getId() + "/comment/" + alarmComment.getId())
                 .andExpect(status().isOk());
-        AlarmComment expectedAlarmComment = AlarmComment.builder()
-                .alarmId(alarm.getId())
-                .type(AlarmCommentType.SYSTEM)
-                .comment(JacksonUtil.newObjectNode()
-                        .put("text", String.format(COMMENT_DELETED.getText(), TENANT_ADMIN_EMAIL))
-                        .put("subtype", COMMENT_DELETED.name())
-                        .put("userName", TENANT_ADMIN_EMAIL))
-                .build();
-        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
+        alarmComment.setType(AlarmCommentType.SYSTEM);
+        alarmComment.setUserId(null);
+        alarmComment.setComment(JacksonUtil.newObjectNode()
+                .put("text", String.format(COMMENT_DELETED.getText(), TENANT_ADMIN_EMAIL))
+                .put("subtype", COMMENT_DELETED.name())
+                .put("userName", TENANT_ADMIN_EMAIL));
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, alarmComment);
     }
 
     @Test
@@ -285,15 +281,13 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         assertThat(systemComment.getComment().get("text").asText()).isEqualTo(String.format("Comment was deleted by user %s",
                 TENANT_ADMIN_EMAIL));
 
-        AlarmComment expectedAlarmComment = AlarmComment.builder()
-                .alarmId(alarm.getId())
-                .type(AlarmCommentType.SYSTEM)
-                .comment(JacksonUtil.newObjectNode()
-                        .put("text", String.format(COMMENT_DELETED.getText(), TENANT_ADMIN_EMAIL))
-                        .put("subtype", COMMENT_DELETED.name())
-                        .put("userName", TENANT_ADMIN_EMAIL))
-                .build();
-        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
+        alarmComment.setType(AlarmCommentType.SYSTEM);
+        alarmComment.setUserId(null);
+        alarmComment.setComment(JacksonUtil.newObjectNode()
+                .put("text", String.format(COMMENT_DELETED.getText(), TENANT_ADMIN_EMAIL))
+                .put("subtype", COMMENT_DELETED.name())
+                .put("userName", TENANT_ADMIN_EMAIL));
+        testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, alarmComment);
     }
 
     @Test

From e2969dd381e154faa31f3532b238d7e0dac6f2be Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Mon, 6 Jul 2026 11:59:25 +0300
Subject: [PATCH 55/91] Version set to 4.2.2.4-SNAPSHOT

---
 application/pom.xml                        | 2 +-
 common/actor/pom.xml                       | 2 +-
 common/cache/pom.xml                       | 2 +-
 common/cluster-api/pom.xml                 | 2 +-
 common/coap-server/pom.xml                 | 2 +-
 common/dao-api/pom.xml                     | 2 +-
 common/data/pom.xml                        | 2 +-
 common/discovery-api/pom.xml               | 2 +-
 common/edge-api/pom.xml                    | 2 +-
 common/edge-api/src/main/proto/edge.proto  | 1 +
 common/edqs/pom.xml                        | 2 +-
 common/message/pom.xml                     | 2 +-
 common/pom.xml                             | 2 +-
 common/proto/pom.xml                       | 2 +-
 common/queue/pom.xml                       | 2 +-
 common/script/pom.xml                      | 2 +-
 common/script/remote-js-client/pom.xml     | 2 +-
 common/script/script-api/pom.xml           | 2 +-
 common/stats/pom.xml                       | 2 +-
 common/transport/coap/pom.xml              | 2 +-
 common/transport/http/pom.xml              | 2 +-
 common/transport/lwm2m/pom.xml             | 2 +-
 common/transport/mqtt/pom.xml              | 2 +-
 common/transport/pom.xml                   | 2 +-
 common/transport/snmp/pom.xml              | 2 +-
 common/transport/transport-api/pom.xml     | 2 +-
 common/util/pom.xml                        | 2 +-
 common/version-control/pom.xml             | 2 +-
 dao/pom.xml                                | 2 +-
 edqs/pom.xml                               | 2 +-
 monitoring/pom.xml                         | 2 +-
 msa/black-box-tests/pom.xml                | 2 +-
 msa/edqs/pom.xml                           | 2 +-
 msa/js-executor/package.json               | 2 +-
 msa/js-executor/pom.xml                    | 2 +-
 msa/monitoring/pom.xml                     | 2 +-
 msa/pom.xml                                | 2 +-
 msa/tb-node/pom.xml                        | 2 +-
 msa/tb/pom.xml                             | 2 +-
 msa/transport/coap/pom.xml                 | 2 +-
 msa/transport/http/pom.xml                 | 2 +-
 msa/transport/lwm2m/pom.xml                | 2 +-
 msa/transport/mqtt/pom.xml                 | 2 +-
 msa/transport/pom.xml                      | 2 +-
 msa/transport/snmp/pom.xml                 | 2 +-
 msa/vc-executor-docker/pom.xml             | 2 +-
 msa/vc-executor/pom.xml                    | 2 +-
 msa/web-ui/package.json                    | 2 +-
 msa/web-ui/pom.xml                         | 2 +-
 netty-mqtt/pom.xml                         | 4 ++--
 pom.xml                                    | 2 +-
 rest-client/pom.xml                        | 2 +-
 rule-engine/pom.xml                        | 2 +-
 rule-engine/rule-engine-api/pom.xml        | 2 +-
 rule-engine/rule-engine-components/pom.xml | 2 +-
 tools/pom.xml                              | 2 +-
 transport/coap/pom.xml                     | 2 +-
 transport/http/pom.xml                     | 2 +-
 transport/lwm2m/pom.xml                    | 2 +-
 transport/mqtt/pom.xml                     | 2 +-
 transport/pom.xml                          | 2 +-
 transport/snmp/pom.xml                     | 2 +-
 ui-ngx/package.json                        | 2 +-
 ui-ngx/pom.xml                             | 2 +-
 64 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/application/pom.xml b/application/pom.xml
index 1ae95e99ed..9a46bbdc3a 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>application</artifactId>
diff --git a/common/actor/pom.xml b/common/actor/pom.xml
index 61ff41ce80..7d6aba753b 100644
--- a/common/actor/pom.xml
+++ b/common/actor/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/cache/pom.xml b/common/cache/pom.xml
index a9d43c9ec1..4db50b2380 100644
--- a/common/cache/pom.xml
+++ b/common/cache/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/cluster-api/pom.xml b/common/cluster-api/pom.xml
index 987e6e2ffe..48d931bb53 100644
--- a/common/cluster-api/pom.xml
+++ b/common/cluster-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/coap-server/pom.xml b/common/coap-server/pom.xml
index c1a83ee870..d6d1d1d69b 100644
--- a/common/coap-server/pom.xml
+++ b/common/coap-server/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/dao-api/pom.xml b/common/dao-api/pom.xml
index c9cfeae4e7..a0f9a8be78 100644
--- a/common/dao-api/pom.xml
+++ b/common/dao-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/data/pom.xml b/common/data/pom.xml
index 450a0826b9..a2b9dce687 100644
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/discovery-api/pom.xml b/common/discovery-api/pom.xml
index 1c3b34f6f4..38774d93f7 100644
--- a/common/discovery-api/pom.xml
+++ b/common/discovery-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/edge-api/pom.xml b/common/edge-api/pom.xml
index ff630f416c..9141a164d8 100644
--- a/common/edge-api/pom.xml
+++ b/common/edge-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 520b4ac493..376a4d8c5b 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -49,6 +49,7 @@ enum EdgeVersion {
   V_4_2_2_1 = 4221;
   V_4_2_2_2 = 4222;
   V_4_2_2_3 = 4223;
+  V_4_2_2_4 = 4224;
 
   V_LATEST = 99999;
 }
diff --git a/common/edqs/pom.xml b/common/edqs/pom.xml
index f107721524..ae62259f79 100644
--- a/common/edqs/pom.xml
+++ b/common/edqs/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/message/pom.xml b/common/message/pom.xml
index d9184ac548..d338f57946 100644
--- a/common/message/pom.xml
+++ b/common/message/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/pom.xml b/common/pom.xml
index f63c12d7dc..1eb2dc44b2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>common</artifactId>
diff --git a/common/proto/pom.xml b/common/proto/pom.xml
index 5335df00b9..c2f898bb38 100644
--- a/common/proto/pom.xml
+++ b/common/proto/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/queue/pom.xml b/common/queue/pom.xml
index 8e684718a0..e714fc749b 100644
--- a/common/queue/pom.xml
+++ b/common/queue/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/script/pom.xml b/common/script/pom.xml
index cdfe36cd3c..46a97d2ece 100644
--- a/common/script/pom.xml
+++ b/common/script/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/script/remote-js-client/pom.xml b/common/script/remote-js-client/pom.xml
index 9f179e9b1a..0f9191e3cc 100644
--- a/common/script/remote-js-client/pom.xml
+++ b/common/script/remote-js-client/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>
diff --git a/common/script/script-api/pom.xml b/common/script/script-api/pom.xml
index 5791fefc6a..6752190015 100644
--- a/common/script/script-api/pom.xml
+++ b/common/script/script-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>
diff --git a/common/stats/pom.xml b/common/stats/pom.xml
index 0de5ffe6ea..ae013f938c 100644
--- a/common/stats/pom.xml
+++ b/common/stats/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/transport/coap/pom.xml b/common/transport/coap/pom.xml
index a2681241c6..79c1e4c06b 100644
--- a/common/transport/coap/pom.xml
+++ b/common/transport/coap/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
diff --git a/common/transport/http/pom.xml b/common/transport/http/pom.xml
index 4d5b6bce44..801fb49117 100644
--- a/common/transport/http/pom.xml
+++ b/common/transport/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
diff --git a/common/transport/lwm2m/pom.xml b/common/transport/lwm2m/pom.xml
index 5da25b24d0..a4892f9f80 100644
--- a/common/transport/lwm2m/pom.xml
+++ b/common/transport/lwm2m/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
diff --git a/common/transport/mqtt/pom.xml b/common/transport/mqtt/pom.xml
index 9cc958cde9..a6c0686b4b 100644
--- a/common/transport/mqtt/pom.xml
+++ b/common/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
diff --git a/common/transport/pom.xml b/common/transport/pom.xml
index b069dbe413..dc12d0d7b5 100644
--- a/common/transport/pom.xml
+++ b/common/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/transport/snmp/pom.xml b/common/transport/snmp/pom.xml
index 2565016226..b1b2ed7343 100644
--- a/common/transport/snmp/pom.xml
+++ b/common/transport/snmp/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
 
diff --git a/common/transport/transport-api/pom.xml b/common/transport/transport-api/pom.xml
index ca992646a9..a11c5b17d1 100644
--- a/common/transport/transport-api/pom.xml
+++ b/common/transport/transport-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>
diff --git a/common/util/pom.xml b/common/util/pom.xml
index 3c60d4f077..db60495e95 100644
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/common/version-control/pom.xml b/common/version-control/pom.xml
index 09c4318a20..28a7e6e332 100644
--- a/common/version-control/pom.xml
+++ b/common/version-control/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
diff --git a/dao/pom.xml b/dao/pom.xml
index 4449502857..19c089dee1 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>dao</artifactId>
diff --git a/edqs/pom.xml b/edqs/pom.xml
index 2d811909ec..bdae55999d 100644
--- a/edqs/pom.xml
+++ b/edqs/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>edqs</artifactId>
diff --git a/monitoring/pom.xml b/monitoring/pom.xml
index fa8b83c6f7..2026a40f70 100644
--- a/monitoring/pom.xml
+++ b/monitoring/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
 
diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml
index e433d6bfb2..a78bea8969 100644
--- a/msa/black-box-tests/pom.xml
+++ b/msa/black-box-tests/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/edqs/pom.xml b/msa/edqs/pom.xml
index 54a1cd91c7..74a6e58ad9 100644
--- a/msa/edqs/pom.xml
+++ b/msa/edqs/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/js-executor/package.json b/msa/js-executor/package.json
index 070bf829a5..de6339b518 100644
--- a/msa/js-executor/package.json
+++ b/msa/js-executor/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-js-executor",
   "private": true,
-  "version": "4.2.2.3",
+  "version": "4.2.2.4",
   "description": "ThingsBoard JavaScript Executor Microservice",
   "main": "server.ts",
   "bin": "server.js",
diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index 7174947cbc..f6f7961d0e 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/monitoring/pom.xml b/msa/monitoring/pom.xml
index 519c928b6e..64157d6197 100644
--- a/msa/monitoring/pom.xml
+++ b/msa/monitoring/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
 
diff --git a/msa/pom.xml b/msa/pom.xml
index 2552bf188c..0847add29e 100644
--- a/msa/pom.xml
+++ b/msa/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>msa</artifactId>
diff --git a/msa/tb-node/pom.xml b/msa/tb-node/pom.xml
index ba83cbb211..9be443d031 100644
--- a/msa/tb-node/pom.xml
+++ b/msa/tb-node/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml
index a20505772e..ba18c5279b 100644
--- a/msa/tb/pom.xml
+++ b/msa/tb/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/transport/coap/pom.xml b/msa/transport/coap/pom.xml
index 309536b4ef..f78e2f0f13 100644
--- a/msa/transport/coap/pom.xml
+++ b/msa/transport/coap/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/http/pom.xml b/msa/transport/http/pom.xml
index f7ea4160d1..ac25949c82 100644
--- a/msa/transport/http/pom.xml
+++ b/msa/transport/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/lwm2m/pom.xml b/msa/transport/lwm2m/pom.xml
index d80b63217c..89e99f79e2 100644
--- a/msa/transport/lwm2m/pom.xml
+++ b/msa/transport/lwm2m/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/mqtt/pom.xml b/msa/transport/mqtt/pom.xml
index 0bf990171b..eb69201745 100644
--- a/msa/transport/mqtt/pom.xml
+++ b/msa/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/transport/pom.xml b/msa/transport/pom.xml
index a711411729..399d84763c 100644
--- a/msa/transport/pom.xml
+++ b/msa/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/transport/snmp/pom.xml b/msa/transport/snmp/pom.xml
index f0996dc1bf..330e205394 100644
--- a/msa/transport/snmp/pom.xml
+++ b/msa/transport/snmp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.thingsboard.msa</groupId>
         <artifactId>transport</artifactId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.thingsboard.msa.transport</groupId>
diff --git a/msa/vc-executor-docker/pom.xml b/msa/vc-executor-docker/pom.xml
index 9d781e0854..fc8779250a 100644
--- a/msa/vc-executor-docker/pom.xml
+++ b/msa/vc-executor-docker/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/vc-executor/pom.xml b/msa/vc-executor/pom.xml
index 47fff0501d..4bb404284a 100644
--- a/msa/vc-executor/pom.xml
+++ b/msa/vc-executor/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/msa/web-ui/package.json b/msa/web-ui/package.json
index 4c58d7a94f..e5acd2a6fa 100644
--- a/msa/web-ui/package.json
+++ b/msa/web-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-web-ui",
   "private": true,
-  "version": "4.2.2.3",
+  "version": "4.2.2.4",
   "description": "ThingsBoard Web UI Microservice",
   "main": "server.ts",
   "bin": "server.js",
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index bc40e149ff..738118d4f8 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>
diff --git a/netty-mqtt/pom.xml b/netty-mqtt/pom.xml
index 6a2b55cd84..9cc1f94bbe 100644
--- a/netty-mqtt/pom.xml
+++ b/netty-mqtt/pom.xml
@@ -19,11 +19,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>netty-mqtt</artifactId>
-    <version>4.2.2.3-SNAPSHOT</version>
+    <version>4.2.2.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Netty MQTT Client</name>
diff --git a/pom.xml b/pom.xml
index 1a2faa6cb7..7d42f9f1c7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
     <artifactId>thingsboard</artifactId>
-    <version>4.2.2.3-SNAPSHOT</version>
+    <version>4.2.2.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Thingsboard</name>
diff --git a/rest-client/pom.xml b/rest-client/pom.xml
index 9051482016..ceadf1d118 100644
--- a/rest-client/pom.xml
+++ b/rest-client/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rest-client</artifactId>
diff --git a/rule-engine/pom.xml b/rule-engine/pom.xml
index 2c73670dde..75bd4e06ed 100644
--- a/rule-engine/pom.xml
+++ b/rule-engine/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rule-engine</artifactId>
diff --git a/rule-engine/rule-engine-api/pom.xml b/rule-engine/rule-engine-api/pom.xml
index 8d9b6e5cbc..f45cd15c34 100644
--- a/rule-engine/rule-engine-api/pom.xml
+++ b/rule-engine/rule-engine-api/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>
diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index dcb0f975f2..c6c2429a4f 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/rule-engine/rule-engine-components/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>
diff --git a/tools/pom.xml b/tools/pom.xml
index 137dbaa1a7..86a17be7a5 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>tools</artifactId>
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 4fef3b50e7..cf4374ad9e 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index 8d24e0d982..d5ff0be961 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/lwm2m/pom.xml b/transport/lwm2m/pom.xml
index 99b98fa7c9..1d0fe86220 100644
--- a/transport/lwm2m/pom.xml
+++ b/transport/lwm2m/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index 1d61b07440..e1c9512d05 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>
diff --git a/transport/pom.xml b/transport/pom.xml
index 3889d8d334..16052972cd 100644
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>transport</artifactId>
diff --git a/transport/snmp/pom.xml b/transport/snmp/pom.xml
index a1f9d384f1..cc18e3a815 100644
--- a/transport/snmp/pom.xml
+++ b/transport/snmp/pom.xml
@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
 
diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 2ac8b3a6d7..09d354e3a3 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thingsboard",
-  "version": "4.2.2.3",
+  "version": "4.2.2.4",
   "scripts": {
     "ng": "ng",
     "start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --configuration development --host 0.0.0.0 --open",
diff --git a/ui-ngx/pom.xml b/ui-ngx/pom.xml
index 863463e78c..099850fb80 100644
--- a/ui-ngx/pom.xml
+++ b/ui-ngx/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.3-SNAPSHOT</version>
+        <version>4.2.2.4-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

From 1b9b30e49c9485e2923dae5d94648d435d8599d2 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Mon, 13 Jul 2026 16:04:37 +0300
Subject: [PATCH 56/91] Move LTS version range check into LtsVersion

---
 .../server/service/install/lts/LtsMigrationService.java   | 4 +---
 .../server/service/install/lts/LtsVersion.java            | 8 ++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/lts/LtsMigrationService.java b/application/src/main/java/org/thingsboard/server/service/install/lts/LtsMigrationService.java
index ccafa88234..580db32666 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/lts/LtsMigrationService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/lts/LtsMigrationService.java
@@ -126,9 +126,7 @@ public class LtsMigrationService {
     // so a cross-family upgrade is fully handled by the target-family migrations.
     // Excluding the dormant older-family beans avoids double-processing.
     static boolean isInRangeForTargetFamily(LtsVersion version, LtsVersion from, LtsVersion to) {
-        return version.sameFamily(to)
-                && version.compareTo(from) > 0
-                && version.compareTo(to) <= 0;
+        return version.sameFamily(to) && version.isInRange(from, to);
     }
 
     private void runSchemaUpdate(String version) {
diff --git a/application/src/main/java/org/thingsboard/server/service/install/lts/LtsVersion.java b/application/src/main/java/org/thingsboard/server/service/install/lts/LtsVersion.java
index cb55e61b3e..9a0fa5be34 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/lts/LtsVersion.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/lts/LtsVersion.java
@@ -37,6 +37,14 @@ public record LtsVersion(int major, int minor, int maintenance, int patch) imple
         return major == other.major && minor == other.minor;
     }
 
+    /**
+     * Half-open range check: {@code from < this <= to}. The lower bound is exclusive (a source already at
+     * {@code from} has applied that version) and the upper bound inclusive (the target version's own migration runs).
+     */
+    public boolean isInRange(LtsVersion from, LtsVersion to) {
+        return compareTo(from) > 0 && compareTo(to) <= 0;
+    }
+
     @Override
     public int compareTo(LtsVersion o) {
         int c = Integer.compare(major, o.major);

From 4448c3c646e9597f0fe7f160cc5d90d7c753a645 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Tue, 21 Jul 2026 11:20:07 +0200
Subject: [PATCH 57/91] Updated functionality block at System Administrator
 level

---
 ui-ngx/src/assets/dashboard/sys_admin_home_page.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
index 739402e72f..860afa84c8 100644
--- a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
+++ b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
@@ -194,7 +194,8 @@
           "padding": "16px",
           "settings": {
             "useMarkdownTextFunction": false,
-            "markdownTextPattern": "<div style=\"height: 100%;\" class=\"flex flex-col\">\n    <div class=\"tb-card-header\">\n        <div class=\"tb-card-title\">\n            <div class=\"tb-home-widget-title\" translate>widgets.functions.title</div>\n        </div>\n        <a mat-stroked-button color=\"primary\" class=\"tb-switch-to-pe\"\n        href=\"https://thingsboard.io/pricing/?product=thingsboard-pe&solution=pe-pay-as-you-go\" target=\"_blank\">{{ 'widgets.functions.switch-to-pe' | translate }}</a>\n    </div>\n    <div class=\"tb-card-content flex-1\">\n        <div class=\"tb-card-column\">\n            <div class=\"feature\" translate>widgets.functions.alarms</div>\n            <div class=\"feature\" translate>widgets.functions.dashboards</div>\n            <div class=\"feature\" translate>widgets.functions.entities-and-relations</div>\n            <div class=\"feature\" translate>widgets.functions.profiles</div>\n            <div class=\"feature\" translate>widgets.functions.advanced-features</div>\n        </div>\n        <div class=\"tb-card-column\">\n            <div class=\"feature\" translate>widgets.functions.notification-center</div>\n            <div class=\"feature\" translate>widgets.functions.api-usage</div>\n            <div class=\"feature\" translate>widgets.functions.customers</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.customers-hierarchy</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.roles-and-permissions</div>\n        </div>\n        <div class=\"tb-card-column\">\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.groups</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.integrations</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.solution-templates</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.scheduler</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.white-labeling</div>\n        </div>\n    </div>\n</div>",
+            "markdownTextPattern": "<div style=\"height: 100%;\" class=\"flex flex-col\">\n    <div class=\"tb-card-header\">\n        <div class=\"tb-card-title\">\n            <div class=\"tb-home-widget-title\" translate>widgets.functions.title</div>\n        </div>\n        <a mat-stroked-button color=\"primary\" class=\"tb-switch-to-pe\"\n        href=\"https://thingsboard.io/pricing/?product=thingsboard-pe&solution=pe-pay-as-you-go\" target=\"_blank\">{{ 'widgets.functions.switch-to-pe' | translate }}</a>\n    </div>\n    <div class=\"tb-card-content flex-1\">\n        <div class=\"tb-card-column\">\n            <div class=\"feature\" translate>widgets.functions.alarms</div>\n            <div class=\"feature\" translate>widgets.functions.dashboards</div>\n            <div class=\"feature\" translate>widgets.functions.entities-and-relations</div>\n            <div class=\"feature\" translate>widgets.functions.profiles</div>\n            <div class=\"feature\" translate>widgets.functions.advanced-features</div>\n            <div class=\"feature\" translate>widgets.functions.solution-templates</div>\n        </div>\n        <div class=\"tb-card-column\">\n            <div class=\"feature\" translate>widgets.functions.notification-center</div>\n            <div class=\"feature\" translate>widgets.functions.api-usage</div>\n            <div class=\"feature\" translate>widgets.functions.customers</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.customers-hierarchy</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.roles-and-permissions</div>\n        </div>\n        <div class=\"tb-card-column\">\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.groups</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.integrations</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.scheduler</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.white-labeling</div>\n        </div>\n    </div>\n</div>",
+            "markdownTextFunction": "return '# Some title\\\\n - Entity name: ' + data[0]['entityName'];",
             "applyDefaultMarkdownStyle": false,
             "markdownCss": ".tb-card-header {\n    display: flex;\n    flex-direction: row;\n    justify-content: space-between;\n    align-items: center;\n}\n\n.tb-card-content {\n    width: 100%;\n    height: 100%;\n    display: flex;\n    flex-direction: row;\n    margin-top: 4px;\n    overflow: auto;\n}\n\n.tb-card-column {\n    min-width: 0px;\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n.feature {\n    position: relative;\n    cursor: default;\n    font-weight: 400;\n    font-size: 14px;\n    line-height: 28px;\n    letter-spacing: 0.2px;\n    color: rgba(0, 0, 0, 0.76);\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.feature:before {\n    content: \"check\";\n    font-family: 'Material Icons Round';\n    display: inline-block;\n    font-size: 20px;\n    line-height: 20px;\n    color: #198038;\n    font-weight: 600;\n    position: relative;\n    background: #F3F6FA;\n    border-radius: 4px;\n    width: 20px;\n    height: 20px;\n    padding: 2px;\n    vertical-align: sub;\n    margin-right: 8px;\n}\n\n.feature.pe:before {\n    content: \"close\";\n    background: #F4F4F4;\n    color: rgba(0, 0, 0, 0.12);\n}\n\n.feature.pe:after {\n    position: relative;\n    display: inline-block;\n    margin-left: 4px;\n    vertical-align: baseline;\n    top: -0.5em;\n    content: \"PE\";\n    color: #305680;\n    font-weight: 700;\n    font-size: 12px;\n    line-height: 12px;\n    letter-spacing: 0.0015em;\n}\n\n.feature+.feature {\n    margin-top: 4px;\n}\n\n@media screen and (min-width: 960px) and (max-width: 1819px) {\n    .tb-switch-to-pe {\n        height: 24px;\n        font-size: 12px;\n        padding: 0 4px;\n    }\n    \n    .feature+.feature {\n        margin-top: 2px;\n    }\n    \n    .feature {\n        font-size: 11px;\n        line-height: 18px;\n    }\n\n    .feature:before {\n      font-size: 14px;\n      line-height: 14px;\n      width: 14px;\n      height: 14px;\n      margin-right: 4px;\n    }\n    .feature.pe:after {\n        margin-left: 2px;\n        top: -0.5em;\n        content: \"PE\";\n        font-size: 8px;\n        line-height: 8px;\n    }\n    \n}\n\n"
           },

From 7d3959036ba790fb3556009667108e841016c434 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Wed, 29 Jul 2026 13:36:34 +0300
Subject: [PATCH 58/91] sparkplug^ fix_bug close session after connect nodde

---
 .../mqtt/session/AbstractGatewaySessionHandler.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
index 8ea6480142..905814d06d 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
@@ -845,7 +845,14 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
                     }
                 }
                 if (msgId <= 0) {
-                    closeDeviceSession(deviceName, MqttReasonCodes.Disconnect.MALFORMED_PACKET);
+                    if (deviceSessionCtx.isSparkplug()) {
+                        // Sparkplug devices may use msgId = 0 during the initial connection or for QoS 0 messages.
+                        // We bypass the MALFORMED_PACKET check to allow these sessions to proceed.
+                        log.trace("[{}] Sparkplug session: allowed msgId [{}] for device: [{}]", sessionId, msgId, deviceName);
+                    } else {
+                        // Standard MQTT defense: close session for invalid message IDs
+                        closeDeviceSession(deviceName, MqttReasonCodes.Disconnect.MALFORMED_PACKET);
+                    }
                 }
             }
 

From 2aded56324d6365b688f73a397258c5ae3a4b0f6 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Wed, 29 Jul 2026 14:18:20 +0300
Subject: [PATCH 59/91] sparkplug: fix_bug close session after connect nodde -
 2

---
 .../transport/mqtt/session/AbstractGatewaySessionHandler.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
index 905814d06d..6130d49bfc 100644
--- a/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
+++ b/common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
@@ -846,8 +846,7 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
                 }
                 if (msgId <= 0) {
                     if (deviceSessionCtx.isSparkplug()) {
-                        // Sparkplug devices may use msgId = 0 during the initial connection or for QoS 0 messages.
-                        // We bypass the MALFORMED_PACKET check to allow these sessions to proceed.
+                        // Sparkplug devices may use msgId = 0 during the initial connection or for QoS 0 messages. We bypass the MALFORMED_PACKET check to allow these sessions to proceed.
                         log.trace("[{}] Sparkplug session: allowed msgId [{}] for device: [{}]", sessionId, msgId, deviceName);
                     } else {
                         // Standard MQTT defense: close session for invalid message IDs

From 6d349707f61de03d60dfcbc26cc85b67424aa71a Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Thu, 30 Jul 2026 16:22:11 +0200
Subject: [PATCH 60/91] Changed sequence

---
 ui-ngx/src/assets/dashboard/sys_admin_home_page.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
index 860afa84c8..97ef4feb2d 100644
--- a/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
+++ b/ui-ngx/src/assets/dashboard/sys_admin_home_page.json
@@ -194,7 +194,7 @@
           "padding": "16px",
           "settings": {
             "useMarkdownTextFunction": false,
-            "markdownTextPattern": "<div style=\"height: 100%;\" class=\"flex flex-col\">\n    <div class=\"tb-card-header\">\n        <div class=\"tb-card-title\">\n            <div class=\"tb-home-widget-title\" translate>widgets.functions.title</div>\n        </div>\n        <a mat-stroked-button color=\"primary\" class=\"tb-switch-to-pe\"\n        href=\"https://thingsboard.io/pricing/?product=thingsboard-pe&solution=pe-pay-as-you-go\" target=\"_blank\">{{ 'widgets.functions.switch-to-pe' | translate }}</a>\n    </div>\n    <div class=\"tb-card-content flex-1\">\n        <div class=\"tb-card-column\">\n            <div class=\"feature\" translate>widgets.functions.alarms</div>\n            <div class=\"feature\" translate>widgets.functions.dashboards</div>\n            <div class=\"feature\" translate>widgets.functions.entities-and-relations</div>\n            <div class=\"feature\" translate>widgets.functions.profiles</div>\n            <div class=\"feature\" translate>widgets.functions.advanced-features</div>\n            <div class=\"feature\" translate>widgets.functions.solution-templates</div>\n        </div>\n        <div class=\"tb-card-column\">\n            <div class=\"feature\" translate>widgets.functions.notification-center</div>\n            <div class=\"feature\" translate>widgets.functions.api-usage</div>\n            <div class=\"feature\" translate>widgets.functions.customers</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.customers-hierarchy</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.roles-and-permissions</div>\n        </div>\n        <div class=\"tb-card-column\">\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.groups</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.integrations</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.scheduler</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.white-labeling</div>\n        </div>\n    </div>\n</div>",
+            "markdownTextPattern": "<div style=\"height: 100%;\" class=\"flex flex-col\">\n    <div class=\"tb-card-header\">\n        <div class=\"tb-card-title\">\n            <div class=\"tb-home-widget-title\" translate>widgets.functions.title</div>\n        </div>\n        <a mat-stroked-button color=\"primary\" class=\"tb-switch-to-pe\"\n        href=\"https://thingsboard.io/pricing/?product=thingsboard-pe&solution=pe-pay-as-you-go\" target=\"_blank\">{{ 'widgets.functions.switch-to-pe' | translate }}</a>\n    </div>\n    <div class=\"tb-card-content flex-1\">\n        <div class=\"tb-card-column\">\n            <div class=\"feature\" translate>widgets.functions.alarms</div>\n            <div class=\"feature\" translate>widgets.functions.dashboards</div>\n            <div class=\"feature\" translate>widgets.functions.entities-and-relations</div>\n            <div class=\"feature\" translate>widgets.functions.profiles</div>\n            <div class=\"feature\" translate>widgets.functions.advanced-features</div>\n        </div>\n        <div class=\"tb-card-column\">\n            <div class=\"feature\" translate>widgets.functions.notification-center</div>\n            <div class=\"feature\" translate>widgets.functions.api-usage</div>\n            <div class=\"feature\" translate>widgets.functions.customers</div>\n            <div class=\"feature\" translate>widgets.functions.solution-templates</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.customers-hierarchy</div>\n        </div>\n        <div class=\"tb-card-column\">\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.roles-and-permissions</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.groups</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.integrations</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.scheduler</div>\n            <div matTooltip=\"{{ 'widgets.functions.pe-feature-tooltip' | translate }}\" matTooltipPosition=\"above\" class=\"feature pe\" translate>widgets.functions.white-labeling</div>\n        </div>\n    </div>\n</div>",
             "markdownTextFunction": "return '# Some title\\\\n - Entity name: ' + data[0]['entityName'];",
             "applyDefaultMarkdownStyle": false,
             "markdownCss": ".tb-card-header {\n    display: flex;\n    flex-direction: row;\n    justify-content: space-between;\n    align-items: center;\n}\n\n.tb-card-content {\n    width: 100%;\n    height: 100%;\n    display: flex;\n    flex-direction: row;\n    margin-top: 4px;\n    overflow: auto;\n}\n\n.tb-card-column {\n    min-width: 0px;\n    flex: 1;\n    display: flex;\n    flex-direction: column;\n}\n\n.feature {\n    position: relative;\n    cursor: default;\n    font-weight: 400;\n    font-size: 14px;\n    line-height: 28px;\n    letter-spacing: 0.2px;\n    color: rgba(0, 0, 0, 0.76);\n    white-space: nowrap;\n    overflow: hidden;\n    text-overflow: ellipsis;\n}\n\n.feature:before {\n    content: \"check\";\n    font-family: 'Material Icons Round';\n    display: inline-block;\n    font-size: 20px;\n    line-height: 20px;\n    color: #198038;\n    font-weight: 600;\n    position: relative;\n    background: #F3F6FA;\n    border-radius: 4px;\n    width: 20px;\n    height: 20px;\n    padding: 2px;\n    vertical-align: sub;\n    margin-right: 8px;\n}\n\n.feature.pe:before {\n    content: \"close\";\n    background: #F4F4F4;\n    color: rgba(0, 0, 0, 0.12);\n}\n\n.feature.pe:after {\n    position: relative;\n    display: inline-block;\n    margin-left: 4px;\n    vertical-align: baseline;\n    top: -0.5em;\n    content: \"PE\";\n    color: #305680;\n    font-weight: 700;\n    font-size: 12px;\n    line-height: 12px;\n    letter-spacing: 0.0015em;\n}\n\n.feature+.feature {\n    margin-top: 4px;\n}\n\n@media screen and (min-width: 960px) and (max-width: 1819px) {\n    .tb-switch-to-pe {\n        height: 24px;\n        font-size: 12px;\n        padding: 0 4px;\n    }\n    \n    .feature+.feature {\n        margin-top: 2px;\n    }\n    \n    .feature {\n        font-size: 11px;\n        line-height: 18px;\n    }\n\n    .feature:before {\n      font-size: 14px;\n      line-height: 14px;\n      width: 14px;\n      height: 14px;\n      margin-right: 4px;\n    }\n    .feature.pe:after {\n        margin-left: 2px;\n        top: -0.5em;\n        content: \"PE\";\n        font-size: 8px;\n        line-height: 8px;\n    }\n    \n}\n\n"

From 6de4b30e5ff22848cbab5cb26eb951c5c6b685c5 Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Tue, 4 Aug 2026 16:01:34 +0300
Subject: [PATCH 61/91] Unblock and interrupt edge event consumer on session
 destroy

---
 .../server/service/edge/rpc/EdgeGrpcSession.java           | 2 +-
 .../server/service/edge/rpc/KafkaEdgeGrpcSession.java      | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
index fb420d080a..1e9a0ade87 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
@@ -760,7 +760,7 @@ public abstract class EdgeGrpcSession implements Closeable {
         ctx.getClusterService().onEdgeEventUpdate(new EdgeEventUpdateMsg(edge.getTenantId(), edge.getId()));
     }
 
-    private void stopCurrentSendDownlinkMsgsTask(Boolean isInterrupted) {
+    protected void stopCurrentSendDownlinkMsgsTask(Boolean isInterrupted) {
         if (sessionState.getSendDownlinkMsgsFuture() != null && !sessionState.getSendDownlinkMsgsFuture().isDone()) {
             sessionState.getSendDownlinkMsgsFuture().set(isInterrupted);
         }
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java
index 67c0a19e66..e1acc08ba3 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java
@@ -156,6 +156,7 @@ public class KafkaEdgeGrpcSession extends EdgeGrpcSession {
 
     @Override
     public boolean destroy() {
+        stopCurrentSendDownlinkMsgsTask(true);
         try {
             if (consumer != null) {
                 log.info("[{}][{}] Stopping edge event consumer...", tenantId, edge != null ? edge.getId() : null);
@@ -180,9 +181,13 @@ public class KafkaEdgeGrpcSession extends EdgeGrpcSession {
 
     private void awaitConsumerTermination() {
         try {
-            consumerExecutor.awaitTermination(5, java.util.concurrent.TimeUnit.SECONDS);
+            if (!consumerExecutor.awaitTermination(5, java.util.concurrent.TimeUnit.SECONDS)) {
+                // without this the thread is leaked for the whole remaining delivery-retry window (or forever, if the future is never completed).
+                consumerExecutor.shutdownNow();
+            }
         } catch (InterruptedException ie) {
             log.warn("[{}][{}] Interrupted while awaiting consumer executor termination", tenantId, edge.getId());
+            Thread.currentThread().interrupt();
         }
     }
 

From e2617bcd8e15f34e1ed6d1240a2577e5af5f248c Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Wed, 5 Aug 2026 16:06:22 +0300
Subject: [PATCH 62/91] Fix TelemetryObserveStrategy enum values in OpenAPI
 spec

---
 .../device/profile/lwm2m/TelemetryObserveStrategy.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java
index 53dafe19b7..615bd4f32e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/TelemetryObserveStrategy.java
@@ -15,8 +15,13 @@
  */
 package org.thingsboard.server.common.data.device.profile.lwm2m;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 
+@Schema(description = "Observation strategy for telemetry. " +
+        "SINGLE (0): one resource equals one single observe request. " +
+        "COMPOSITE_ALL (1): all resources in one composite observe request. " +
+        "COMPOSITE_BY_OBJECT (2): grouped composite observe requests by object.")
 public enum TelemetryObserveStrategy {
 
     SINGLE("One resource equals one single observe request", 0),
@@ -52,8 +57,4 @@ public enum TelemetryObserveStrategy {
         throw new IllegalArgumentException("Unknown TelemetryObserveStrategy id: " + id);
     }
 
-    @Override
-    public String toString() {
-        return name() + " (" + id + "): " + description;
-    }
 }

From 4d6600834cfc4a4f1cdf159b5634f842faad741a Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Thu, 6 Aug 2026 16:29:06 +0300
Subject: [PATCH 63/91] Add OpenAPI discriminator mapping to polymorphic LwM2M
 and job types

---
 .../lwm2m/LwM2MBootstrapClientCredential.java         | 11 +++++++++++
 .../credentials/lwm2m/LwM2MClientCredential.java      | 11 +++++++++++
 .../bootstrap/LwM2MBootstrapServerCredential.java     | 11 +++++++++++
 .../thingsboard/server/common/data/job/task/Task.java |  8 ++++++++
 .../server/common/data/job/task/TaskResult.java       |  8 ++++++++
 5 files changed, 49 insertions(+)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MBootstrapClientCredential.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MBootstrapClientCredential.java
index 9041de33f0..008c01e7de 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MBootstrapClientCredential.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MBootstrapClientCredential.java
@@ -19,7 +19,18 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 
+@Schema(
+        discriminatorProperty = "securityMode",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "NO_SEC", schema = NoSecBootstrapClientCredential.class),
+                @DiscriminatorMapping(value = "PSK", schema = PSKBootstrapClientCredential.class),
+                @DiscriminatorMapping(value = "RPK", schema = RPKBootstrapClientCredential.class),
+                @DiscriminatorMapping(value = "X509", schema = X509BootstrapClientCredential.class)
+        }
+)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         property = "securityMode")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MClientCredential.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MClientCredential.java
index 0ac1911d81..3f939cbd5b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MClientCredential.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/credentials/lwm2m/LwM2MClientCredential.java
@@ -19,7 +19,18 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 
+@Schema(
+        discriminatorProperty = "securityConfigClientMode",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "NO_SEC", schema = NoSecClientCredential.class),
+                @DiscriminatorMapping(value = "PSK", schema = PSKClientCredential.class),
+                @DiscriminatorMapping(value = "RPK", schema = RPKClientCredential.class),
+                @DiscriminatorMapping(value = "X509", schema = X509ClientCredential.class)
+        }
+)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         property = "securityConfigClientMode")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MBootstrapServerCredential.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MBootstrapServerCredential.java
index 71e00cd354..1e6e3d056e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MBootstrapServerCredential.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/lwm2m/bootstrap/LwM2MBootstrapServerCredential.java
@@ -19,10 +19,21 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MSecurityMode;
 
 import java.io.Serializable;
 
+@Schema(
+        discriminatorProperty = "securityMode",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "NO_SEC", schema = NoSecLwM2MBootstrapServerCredential.class),
+                @DiscriminatorMapping(value = "PSK", schema = PSKLwM2MBootstrapServerCredential.class),
+                @DiscriminatorMapping(value = "RPK", schema = RPKLwM2MBootstrapServerCredential.class),
+                @DiscriminatorMapping(value = "X509", schema = X509LwM2MBootstrapServerCredential.class)
+        }
+)
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         property = "securityMode")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
index a881780012..bf12d50ece 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/Task.java
@@ -20,6 +20,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.experimental.SuperBuilder;
@@ -29,6 +31,12 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.job.JobType;
 
 @Data
+@Schema(
+        discriminatorProperty = "jobType",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "DUMMY", schema = DummyTask.class)
+        }
+)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "jobType")
 @JsonSubTypes({
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/TaskResult.java b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/TaskResult.java
index e882c74eb6..ac55f14b0f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/job/task/TaskResult.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/job/task/TaskResult.java
@@ -20,12 +20,20 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import io.swagger.v3.oas.annotations.media.DiscriminatorMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.thingsboard.server.common.data.job.JobType;
 
 @Data
 @NoArgsConstructor
+@Schema(
+        discriminatorProperty = "jobType",
+        discriminatorMapping = {
+                @DiscriminatorMapping(value = "DUMMY", schema = DummyTaskResult.class)
+        }
+)
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "jobType")
 @JsonSubTypes({

From b31845e4beecfbb684b068e265604e8d5f45c152 Mon Sep 17 00:00:00 2001
From: Dmytro Pinkevych <49400214+pinkevmladchy@users.noreply.github.com>
Date: Thu, 13 Aug 2026 16:43:01 +0300
Subject: [PATCH 64/91] Merge pull request #16028 from
 pinkevmladchy/iot-hub-built-in-items

Open built-in IoT Hub items locally instead of installing duplicates
---
 ui-ngx/src/app/core/http/widget.service.ts    |   2 +-
 .../dashboard-widget-select.component.html    |  13 +-
 .../dashboard-widget-select.component.ts      |  41 ++++-
 .../iot-hub/iot-hub-actions.service.ts        |  79 +++++++++-
 .../iot-hub-add-item-dialog.component.ts      |  15 ++
 .../iot-hub/iot-hub-built-in.service.ts       | 146 ++++++++++++++++++
 .../iot-hub-install-dialog.component.html     |   2 +-
 .../iot-hub-install-dialog.component.ts       |  11 ++
 .../iot-hub/iot-hub-item-card.component.html  |  32 ++--
 .../iot-hub/iot-hub-item-card.component.ts    |  13 +-
 .../iot-hub-item-detail-dialog.component.html |  28 ++--
 .../iot-hub-item-detail-dialog.component.ts   |  32 ++++
 .../home/components/iot-hub/iot-hub-utils.ts  |  52 ++++++-
 .../home-page/iot-hub-widget.component.html   |  20 ++-
 .../lib/home-page/iot-hub-widget.component.ts |   7 +-
 .../models/iot-hub/iot-hub-version.models.ts  |   8 +
 .../assets/locale/locale.constant-en_US.json  |   7 +
 17 files changed, 457 insertions(+), 51 deletions(-)
 create mode 100644 ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-built-in.service.ts

diff --git a/ui-ngx/src/app/core/http/widget.service.ts b/ui-ngx/src/app/core/http/widget.service.ts
index 06a6c86ddd..e4e50cc830 100644
--- a/ui-ngx/src/app/core/http/widget.service.ts
+++ b/ui-ngx/src/app/core/http/widget.service.ts
@@ -188,7 +188,7 @@ export class WidgetService {
   }
 
   public getWidgetType(fullFqn: string, config?: RequestConfig): Observable<WidgetType> {
-    return this.http.get<WidgetType>(`/api/widgetType?fqn=${fullFqn}`,
+    return this.http.get<WidgetType>(`/api/widgetType?fqn=${encodeURIComponent(fullFqn)}`,
       defaultHttpOptionsFromConfig(config));
   }
 
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.html b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.html
index 7d2ea9cdb5..6da41a9878 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.html
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.html
@@ -370,7 +370,8 @@
   </ng-template>
 
   <ng-template #iotHubWidgetCardTpl let-item let-showInstalledBadge="showInstalledBadge">
-    <mat-card class="tb-widget-preview-card tb-iot-hub-widget-card flex flex-col gap-2" appearance="raised" (click)="onIotHubWidgetClicked($event, item)">
+    <mat-card class="tb-widget-preview-card tb-iot-hub-widget-card flex flex-col gap-2" appearance="raised"
+              (click)="onIotHubWidgetClicked($event, item)">
       <div class="title-container">
         <div title="{{item.name}}" class="widget-title">
           {{item.name}}
@@ -405,10 +406,12 @@
             {{ 'iot-hub.installed' | translate }}
           </span>
         }
-        <span class="tb-iot-hub-widget-installs">
-          <mat-icon>file_download</mat-icon>
-          {{ item.totalInstallCount | shortNumber }}
-        </span>
+        @if (!isIotHubWidgetBuiltIn(item)) {
+          <span class="tb-iot-hub-widget-installs">
+            <mat-icon>file_download</mat-icon>
+            {{ item.totalInstallCount | shortNumber }}
+          </span>
+        }
       </div>
     </mat-card>
   </ng-template>
diff --git a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
index 3034cee011..46d4e06e91 100644
--- a/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
+++ b/ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-widget-select.component.ts
@@ -39,7 +39,14 @@ import { ItemType, FilterParamInfo, WidgetCategory } from '@shared/models/iot-hu
 import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models';
 import { IotHubApiService } from '@core/http/iot-hub-api.service';
 import { IotHubActionsService } from '@home/components/iot-hub/iot-hub-actions.service';
-import { filterIotHubItemsBySearch, groupIotHubFilterItems, IotHubFilterGroup, resolveIotHubItemImageUrl } from '@home/components/iot-hub/iot-hub-utils';
+import {
+  filterIotHubItemsBySearch,
+  groupIotHubFilterItems,
+  IotHubFilterGroup,
+  isBuiltInItem,
+  resolveIotHubItemImageUrl
+} from '@home/components/iot-hub/iot-hub-utils';
+import { IotHubBuiltInService } from '@home/components/iot-hub/iot-hub-built-in.service';
 
 type selectWidgetMode = 'installed' | 'iotHub';
 type installedSubMode = 'default' | 'allWidgets';
@@ -278,6 +285,7 @@ export class DashboardWidgetSelectComponent {
   constructor(private widgetsService: WidgetService,
               private iotHubApiService: IotHubApiService,
               private iotHubActions: IotHubActionsService,
+              private iotHubBuiltInService: IotHubBuiltInService,
               private translate: TranslateService,
               private cd: ChangeDetectorRef) {
 
@@ -494,6 +502,13 @@ export class DashboardWidgetSelectComponent {
       }
       return;
     }
+    if (isBuiltInItem(item)) {
+      // Built-in widgets ship with the platform: pick the local widget type matched by fqn
+      // instead of installing a duplicate, exactly like an already installed item.
+      this.selectBuiltInWidget(item);
+      return;
+    }
+    // Built-in items never reach the dialog (they return above), so anything added from it installs.
     this.iotHubActions.openItemDetail(item, undefined, undefined, 'add').subscribe(result => {
       if (result?.action === 'add') {
         this.installAndAddWidget(result.item);
@@ -505,6 +520,10 @@ export class DashboardWidgetSelectComponent {
     return this.installedWidgets?.some(i => i.itemId === item.itemId) ?? false;
   }
 
+  isIotHubWidgetBuiltIn(item: MpItemVersionView): boolean {
+    return isBuiltInItem(item);
+  }
+
   getIotHubItemImage(item: MpItemVersionView): string | null {
     return resolveIotHubItemImageUrl(item, this.iotHubApiService);
   }
@@ -737,6 +756,26 @@ export class DashboardWidgetSelectComponent {
     this.cd.markForCheck();
   }
 
+  private selectBuiltInWidget(item: MpItemVersionView): void {
+    this.iotHubBuiltInService.resolveLocalWidgetTypeInfo(item).subscribe(lookup => {
+      if (lookup.value) {
+        this.widgetSelected.emit(this.toWidgetInfo(lookup.value));
+        return;
+      }
+      if (lookup.failed) {
+        // Existence is unknown — installing now could duplicate a widget that is still there.
+        this.iotHubActions.showBuiltInLookupFailed(item);
+        return;
+      }
+      // The local copy is gone (e.g. deleted by a sysadmin) — installing is the only way back.
+      this.iotHubActions.confirmInstallMissingBuiltIn(item).subscribe(confirmed => {
+        if (confirmed) {
+          this.installAndAddWidget(item);
+        }
+      });
+    });
+  }
+
   private installAndAddWidget(item: MpItemVersionView): void {
     const versionId = item.id as string;
     this.iotHubApiService.installItemVersion(versionId, { ignoreLoading: true }).subscribe({
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-actions.service.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-actions.service.ts
index 73e627fbe6..cd3d48d5d5 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-actions.service.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-actions.service.ts
@@ -17,6 +17,7 @@
 import { Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Observable, of, EMPTY } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { DialogService } from '@core/services/dialog.service';
 import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models';
@@ -30,6 +31,15 @@ import { TbIotHubUpdateDialogComponent, IotHubUpdateDialogData } from './iot-hub
 import { TbIotHubDeleteDialogComponent, IotHubDeleteDialogData } from './iot-hub-delete-dialog.component';
 import { TbDeviceInstallDialogComponent, DeviceInstallDialogData } from './device-install-dialog/device-install-dialog.component';
 import { TbIotHubInstalledItemsDialogComponent, IotHubInstalledItemsDialogData } from './iot-hub-installed-items-dialog.component';
+import { IotHubBuiltInService } from './iot-hub-built-in.service';
+import { isBuiltInItem } from './iot-hub-utils';
+
+/**
+ * What `openBuiltInOrConfirmInstall` did with a built-in item: 'handled' means nothing is left to do
+ * (the local copy was opened, or the user was told why it could not be), while 'install-requested'
+ * means the component really is absent and the user asked for it to be installed.
+ */
+export type IotHubBuiltInAction = 'handled' | 'install-requested';
 
 @Injectable()
 export class IotHubActionsService {
@@ -37,7 +47,8 @@ export class IotHubActionsService {
   constructor(
     private dialog: MatDialog,
     private dialogService: DialogService,
-    private translate: TranslateService
+    private translate: TranslateService,
+    private builtInService: IotHubBuiltInService
   ) {}
 
   openItemDetail(item: MpItemVersionView, installedItem?: IotHubInstalledItem, installedItemsCount?: number,
@@ -72,7 +83,67 @@ export class IotHubActionsService {
     }).afterClosed();
   }
 
+  /**
+   * Runs the primary action of an item: built-in content is opened locally (never installed),
+   * device packages are connected, everything else goes through the install dialog.
+   */
   installItem(item: MpItemVersionView): Observable<string> {
+    if (isBuiltInItem(item)) {
+      return this.openOrInstallBuiltIn(item);
+    }
+    return this.runInstall(item);
+  }
+
+  /** Opens the local copy of a built-in item, or asks to install it when it really is absent. */
+  openBuiltInOrConfirmInstall(item: MpItemVersionView): Observable<IotHubBuiltInAction> {
+    return this.builtInService.openLocalComponent(item).pipe(
+      switchMap(outcome => {
+        switch (outcome) {
+          case 'missing':
+            return this.confirmInstallMissingBuiltIn(item).pipe(
+              map((confirmed): IotHubBuiltInAction => confirmed ? 'install-requested' : 'handled')
+            );
+          case 'failed':
+            this.showBuiltInLookupFailed(item);
+            return of<IotHubBuiltInAction>('handled');
+          default:
+            // 'opened' or 'cancelled' — the component is in place either way, so never install.
+            return of<IotHubBuiltInAction>('handled');
+        }
+      })
+    );
+  }
+
+  /**
+   * Asks whether to install a built-in item whose local copy is gone — the component the Hub entry
+   * mirrors was deleted from this instance, so installing is the only way to get it back.
+   */
+  confirmInstallMissingBuiltIn(item: MpItemVersionView): Observable<boolean> {
+    return this.dialogService.confirm(
+      this.translate.instant('iot-hub.built-in-missing-title'),
+      this.translate.instant('iot-hub.built-in-missing-text', { name: item?.name }),
+      this.translate.instant('action.cancel'),
+      this.translate.instant('iot-hub.install')
+    );
+  }
+
+  /** Reports that the local copy could not be checked — nothing was opened and nothing installed. */
+  showBuiltInLookupFailed(item: MpItemVersionView): void {
+    this.dialogService.alert(
+      this.translate.instant('iot-hub.built-in-lookup-failed-title'),
+      this.translate.instant('iot-hub.built-in-lookup-failed-text', { name: item?.name })
+    );
+  }
+
+  private openOrInstallBuiltIn(item: MpItemVersionView): Observable<string> {
+    return this.openBuiltInOrConfirmInstall(item).pipe(
+      // The confirmation inside is the only one the user gets: install starts immediately,
+      // and opening the component is a separate click once it is back in the library.
+      switchMap(action => action === 'install-requested' ? this.runInstall(item, true) : EMPTY)
+    );
+  }
+
+  private runInstall(item: MpItemVersionView, skipConfirm = false): Observable<string> {
     if (item.type === ItemType.ALARM_RULE) {
       this.dialogService.alert(
         this.translate.instant('iot-hub.alarm-rule-install-update-required'),
@@ -81,13 +152,13 @@ export class IotHubActionsService {
       return EMPTY;
     }
     if (item.type === ItemType.DEVICE) {
-      return this.installDevice(item);
+      return this.openDeviceInstallDialog(item);
     }
     return this.dialog.open(TbIotHubInstallDialogComponent, {
       panelClass: ['tb-dialog'],
       disableClose: true,
       autoFocus: false,
-      data: { item } as IotHubInstallDialogData
+      data: { item, skipConfirm } as IotHubInstallDialogData
     }).afterClosed();
   }
 
@@ -121,6 +192,8 @@ export class IotHubActionsService {
     }).afterClosed();
   }
 
+  // Reached only for items whose action mode is 'connect', i.e. never for built-in content:
+  // that decision is made once, at the public entry points above.
   installDevice(item: MpItemVersionView): Observable<string> {
     return this.openDeviceInstallDialog(item);
   }
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-add-item-dialog.component.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-add-item-dialog.component.ts
index e83580e271..404ec8ef03 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-add-item-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-add-item-dialog.component.ts
@@ -27,6 +27,7 @@ import { DialogService } from '@core/services/dialog.service';
 import { TranslateService } from '@ngx-translate/core';
 import { EntityId } from '@shared/models/id/entity-id';
 import { IotHubActionsService } from './iot-hub-actions.service';
+import { isBuiltInItem } from './iot-hub-utils';
 
 export interface IotHubAddItemDialogData {
   itemType: ItemType;
@@ -73,6 +74,20 @@ export class TbIotHubAddItemDialogComponent extends DialogComponent<TbIotHubAddI
   }
 
   onAddItem(item: MpItemVersionView): void {
+    if (isBuiltInItem(item)) {
+      // Built-in content is already part of the platform — open the local copy instead of
+      // installing a duplicate, and install only if that copy no longer exists.
+      this.iotHubActions.openBuiltInOrConfirmInstall(item).subscribe(action => {
+        if (action === 'install-requested') {
+          this.doAddItem(item);
+        }
+      });
+      return;
+    }
+    this.doAddItem(item);
+  }
+
+  private doAddItem(item: MpItemVersionView): void {
     if (this.itemType === ItemType.DEVICE) {
       this.installDeviceItem(item);
       return;
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-built-in.service.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-built-in.service.ts
new file mode 100644
index 0000000000..054bec852f
--- /dev/null
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-built-in.service.ts
@@ -0,0 +1,146 @@
+///
+/// Copyright © 2016-2026 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { Injectable } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
+import { Router } from '@angular/router';
+import { from, Observable, of } from 'rxjs';
+import { catchError, concatMap, first, map, switchMap } from 'rxjs/operators';
+import { WidgetService } from '@core/http/widget.service';
+import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models';
+import { ItemType } from '@shared/models/iot-hub/iot-hub-item.models';
+import { isValidWidgetFullFqn, WidgetType, WidgetTypeInfo } from '@shared/models/widget.models';
+import { EntityType } from '@shared/models/entity-type.models';
+import { getEntityDetailsPageURL, isNotEmptyStr } from '@core/utils';
+
+/**
+ * Result of looking up the local component a built-in Hub item mirrors. `failed` separates
+ * "the lookup itself did not answer" (network error, 5xx, no read permission) from "the component
+ * is not here": only the latter may be offered as an install, otherwise a transient error would
+ * hand the tenant a duplicate of a component that is still in place.
+ */
+export interface IotHubLocalLookup<T> {
+  value: T | null;
+  failed: boolean;
+}
+
+/**
+ * Outcome of trying to open the local component of a built-in item. 'cancelled' means the component
+ * is there but the router did not go — typically a route guard blocked it (unsaved changes) — so
+ * there is nothing to install and nothing to report.
+ */
+export type IotHubOpenLocalOutcome = 'opened' | 'cancelled' | 'missing' | 'failed';
+
+/**
+ * Handles IoT Hub items marked `builtIn` — content that already ships inside ThingsBoard.
+ * Such an item is never installed: its `fqn` is deliberately identical to the fqn of the
+ * platform's own component, which is used as the match key to reach the local copy.
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class IotHubBuiltInService {
+
+  constructor(
+    private router: Router,
+    private widgetService: WidgetService
+  ) {}
+
+  /**
+   * Resolves the platform's own widget type mirroring a built-in Hub item, matched by fqn.
+   *
+   * There is no API to test a batch of fqns at once — `GET /api/widgetType?fqn=` is per fqn and
+   * carries the full descriptor, and `/api/widgetTypeFqns` is scoped to a bundle the Hub payload
+   * does not name — so this must stay a per-item check triggered by a click, never a prefetch
+   * across a catalogue page.
+   */
+  resolveLocalWidgetType(item: MpItemVersionView): Observable<IotHubLocalLookup<WidgetType>> {
+    const noMatch: IotHubLocalLookup<WidgetType> = { value: null, failed: false };
+    const fqn = item?.dataDescriptor?.fqn;
+    if (!isNotEmptyStr(fqn)) {
+      // Without a match key nothing was asked of the server, so existence is unknown rather than
+      // disproven — reporting it as absent would offer an install for a component that is in place.
+      return of({ value: null, failed: true });
+    }
+    // Hub items carry a bare fqn; platform widget types are addressed by a scoped full fqn.
+    // Built-in content is system scoped; the tenant scope covers a copy installed into this tenant,
+    // which matters while the installed-items list a caller filters by is still stale.
+    const fullFqns = isValidWidgetFullFqn(fqn) ? [fqn] : [`system.${fqn}`, `tenant.${fqn}`];
+    return from(fullFqns).pipe(
+      concatMap(fullFqn => this.widgetService.getWidgetType(fullFqn, { ignoreErrors: true, ignoreLoading: true }).pipe(
+        map(widgetType => this.lookupResult(widgetType)),
+        catchError((err: HttpErrorResponse) => of(this.lookupFailure<WidgetType>(err)))
+      )),
+      // Stop at the first match, and at the first hard failure too: with existence unknown, the
+      // remaining candidate cannot turn a failure into a trustworthy "not here".
+      first(lookup => !!lookup.value?.id?.id || lookup.failed, noMatch)
+    );
+  }
+
+  /** Same match, resolved to the info projection widget pickers need (image, description, type). */
+  resolveLocalWidgetTypeInfo(item: MpItemVersionView): Observable<IotHubLocalLookup<WidgetTypeInfo>> {
+    return this.resolveLocalWidgetType(item).pipe(
+      switchMap(lookup => lookup.value
+        ? this.widgetService.getWidgetTypeInfoById(lookup.value.id.id, { ignoreErrors: true, ignoreLoading: true }).pipe(
+            map(widgetTypeInfo => this.lookupResult(widgetTypeInfo)),
+            catchError((err: HttpErrorResponse) => of(this.lookupFailure<WidgetTypeInfo>(err)))
+          )
+        : of({ value: null, failed: lookup.failed }))
+    );
+  }
+
+  /** Navigates to the local component a built-in item mirrors, reporting why it could not. */
+  openLocalComponent(item: MpItemVersionView): Observable<IotHubOpenLocalOutcome> {
+    return this.resolveLocalComponentUrl(item).pipe(
+      switchMap(lookup => {
+        if (!lookup.value) {
+          return of<IotHubOpenLocalOutcome>(lookup.failed ? 'failed' : 'missing');
+        }
+        // The navigation itself can still be refused — a ConfirmOnExitGuard on the page the user is
+        // leaving, a failing resolver — and reporting it as opened would leave them with the Hub
+        // dialog closed (it closes on NavigationStart) and nothing opened in its place.
+        return from(this.router.navigateByUrl(lookup.value)).pipe(
+          map((navigated): IotHubOpenLocalOutcome => navigated ? 'opened' : 'cancelled'),
+          catchError(() => of<IotHubOpenLocalOutcome>('cancelled'))
+        );
+      })
+    );
+  }
+
+  private resolveLocalComponentUrl(item: MpItemVersionView): Observable<IotHubLocalLookup<string>> {
+    // Only widgets (including SCADA symbol widgets) ship inside the platform today. Other item
+    // types have no local counterpart to match by fqn, so they count as missing.
+    if (item?.type !== ItemType.WIDGET) {
+      return of({ value: null, failed: false });
+    }
+    return this.resolveLocalWidgetType(item).pipe(
+      map(lookup => ({
+        value: lookup.value ? getEntityDetailsPageURL(lookup.value.id.id, EntityType.WIDGET_TYPE) || null : null,
+        failed: lookup.failed
+      }))
+    );
+  }
+
+  private lookupResult<T>(value: T | null): IotHubLocalLookup<T> {
+    return { value: value ?? null, failed: false };
+  }
+
+  // A 404 is an answer — the component is not here. Anything else (network error, 5xx, 403) leaves
+  // existence unknown, and must never be presented to the user as deleted content.
+  private lookupFailure<T>(err: HttpErrorResponse): IotHubLocalLookup<T> {
+    return { value: null, failed: err?.status !== 404 };
+  }
+}
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.html b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.html
index ea3774ac11..25c5ca2089 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.html
@@ -117,7 +117,7 @@
       </ul>
     }
     @case ('installing') {
-      <h2 class="tb-iot-hub-install-title">{{ 'iot-hub.install-confirm-title' | translate:{ name: item.name } }}</h2>
+      <h2 class="tb-iot-hub-install-title">{{ 'iot-hub.installing-title' | translate:{ name: item.name } }}</h2>
       <p class="tb-iot-hub-install-desc">{{ 'iot-hub.install-desc' | translate }}</p>
     }
     @case ('success') {
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.ts
index 43ed8d21b4..e4816d19ad 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-install-dialog.component.ts
@@ -60,6 +60,13 @@ interface PendingOverwrite {
 
 export interface IotHubInstallDialogData {
   item: MpItemVersionView;
+  /**
+   * Starts installing right away instead of opening on the confirm step. Set by callers that
+   * already asked the user — e.g. a built-in item whose local copy was deleted — so the user is
+   * not asked to confirm the same install twice. Ignored when the item needs input first
+   * (entity selection, rule chain options).
+   */
+  skipConfirm?: boolean;
 }
 
 export type InstallState =
@@ -140,6 +147,10 @@ export class TbIotHubInstallDialogComponent extends DialogComponent<TbIotHubInst
     if (this.item.type === ItemType.RULE_CHAIN) {
       this.initRuleChainForm();
     }
+    if (data.skipConfirm && this.state === 'confirm') {
+      this.state = 'installing';
+      this.install();
+    }
   }
 
   private computeInitialState(): InstallState {
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.html b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.html
index dc2030b00a..26e6042d34 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.html
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.html
@@ -37,17 +37,21 @@
                 [class.clickable]="mode !== 'add'"
                 (click)="mode !== 'add' && onCreatorClick($event)"
                 (keyup.enter)="mode !== 'add' && onCreatorClick($event)">{{ item.creatorDisplayName }}</span>
-          <span class="tb-iot-hub-compact-dot">&middot;</span>
+          @if (showInstallCount) {
+            <span class="tb-iot-hub-compact-dot">&middot;</span>
+          }
+        }
+        @if (showInstallCount) {
+          <tb-icon class="tb-iot-hub-compact-download-icon">download</tb-icon>
+          <span class="tb-iot-hub-compact-count">{{ item.totalInstallCount | shortNumber }}</span>
         }
-        <tb-icon class="tb-iot-hub-compact-download-icon">download</tb-icon>
-        <span class="tb-iot-hub-compact-count">{{ item.totalInstallCount | shortNumber }}</span>
       </div>
     </div>
     @if (mode === 'add') {
       @if (isInstalled()) {
         <span class="tb-iot-hub-card-installed-chip"><tb-icon>check</tb-icon>{{ 'iot-hub.installed' | translate }}</span>
       } @else {
-        <button class="tb-iot-hub-card-install-btn" (click)="onAddClick($event)">{{ 'action.add' | translate }}</button>
+        <button class="tb-iot-hub-card-install-btn" (click)="onAddClick($event)">{{ actionLabel | translate }}</button>
       }
     } @else if (isInstalled()) {
       @if (isSameVersion()) {
@@ -74,7 +78,7 @@
         </button>
       }
     } @else {
-      <button class="tb-iot-hub-card-install-btn" (click)="onInstallClick($event)">{{ (item.type === ItemType.DEVICE ? 'iot-hub.connect' : 'iot-hub.install') | translate }}</button>
+      <button class="tb-iot-hub-card-install-btn" (click)="onInstallClick($event)">{{ actionLabel | translate }}</button>
     }
   </div>
 } @else {
@@ -105,18 +109,22 @@
                 [class.clickable]="mode !== 'add'"
                 (click)="mode !== 'add' && onCreatorClick($event)"
                 (keyup.enter)="mode !== 'add' && onCreatorClick($event)">{{ item.creatorDisplayName }}</span>
-          <span class="tb-iot-hub-card-dot">&middot;</span>
+          @if (showInstallCount) {
+            <span class="tb-iot-hub-card-dot">&middot;</span>
+          }
+        }
+        @if (showInstallCount) {
+          <span class="tb-iot-hub-card-stat">
+            <tb-icon>download</tb-icon>
+            {{ item.totalInstallCount | shortNumber }}
+          </span>
         }
-        <span class="tb-iot-hub-card-stat">
-          <tb-icon>download</tb-icon>
-          {{ item.totalInstallCount | shortNumber }}
-        </span>
         <span class="tb-iot-hub-card-stats">
           @if (mode === 'add') {
             @if (isInstalled()) {
               <span class="tb-iot-hub-card-installed-chip"><tb-icon>check</tb-icon>{{ 'iot-hub.installed' | translate }}</span>
             } @else {
-              <button class="tb-iot-hub-card-install-btn" (click)="onAddClick($event)">{{ 'action.add' | translate }}</button>
+              <button class="tb-iot-hub-card-install-btn" (click)="onAddClick($event)">{{ actionLabel | translate }}</button>
             }
           } @else if (isInstalled()) {
             @if (isSameVersion()) {
@@ -143,7 +151,7 @@
               </button>
             }
           } @else {
-            <button class="tb-iot-hub-card-install-btn" (click)="onInstallClick($event)">{{ (item.type === ItemType.DEVICE ? 'iot-hub.connect' : 'iot-hub.install') | translate }}</button>
+            <button class="tb-iot-hub-card-install-btn" (click)="onInstallClick($event)">{{ actionLabel | translate }}</button>
           }
         </span>
       </div>
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.ts
index 2d9c13d8d7..b2fe9a58f3 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.ts
@@ -20,6 +20,7 @@ import { getItemTypeIcon, ItemType } from '@shared/models/iot-hub/iot-hub-item.m
 import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models';
 import { TranslateService } from '@ngx-translate/core';
 import { IotHubApiService } from '@core/http/iot-hub-api.service';
+import { iotHubItemActionLabel, isBuiltInItem } from '@home/components/iot-hub/iot-hub-utils';
 
 @Component({
   selector: 'tb-iot-hub-item-card',
@@ -29,8 +30,6 @@ import { IotHubApiService } from '@core/http/iot-hub-api.service';
 })
 export class TbIotHubItemCardComponent {
 
-  readonly ItemType = ItemType;
-
   @Input() item: MpItemVersionView;
   @Input() installedItem: IotHubInstalledItem;
   @Input() installedItemsCount = 0;
@@ -51,6 +50,16 @@ export class TbIotHubItemCardComponent {
     private iotHubApiService: IotHubApiService
   ) {}
 
+  // Install counters mean nothing for content the tenant already has, so the counter and the
+  // separator that would dangle next to it are both derived from this one boolean.
+  get showInstallCount(): boolean {
+    return !isBuiltInItem(this.item);
+  }
+
+  get actionLabel(): string {
+    return iotHubItemActionLabel(this.item, this.mode === 'add' ? 'add' : 'card');
+  }
+
   isCompactLayout(): boolean {
     return this.item.type === ItemType.CALCULATED_FIELD
         || this.item.type === ItemType.ALARM_RULE
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.html b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.html
index 30d9322dd9..eba34fb30a 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.html
@@ -30,15 +30,17 @@
           <tb-icon class="dlg-subtitle-icon">{{ getTypeIcon() }}</tb-icon>
           <span>{{ typeTranslations.get(item.type) | translate }}</span>
         </span>
-        <span class="dlg-dot"></span>
-        <span class="dlg-subtitle-group">
-          <tb-icon class="dlg-subtitle-icon">download</tb-icon>
-          <span>{{ item.totalInstallCount | shortNumber }} {{ 'iot-hub.installs' | translate }}</span>
-        </span>
+        @if (showInstallCount) {
+          <span class="dlg-dot"></span>
+          <span class="dlg-subtitle-group">
+            <tb-icon class="dlg-subtitle-icon">download</tb-icon>
+            <span>{{ item.totalInstallCount | shortNumber }} {{ 'iot-hub.installs' | translate }}</span>
+          </span>
+        }
         <span class="dlg-dot"></span>
         <span class="dlg-subtitle-group">
           <mat-icon class="dlg-subtitle-icon">update</mat-icon>
-          <span>v {{ item.version }}</span>
+          <span>{{ versionLabel }}</span>
         </span>
         @if (preview) {
           <span class="dlg-dot"></span>
@@ -318,19 +320,13 @@
     <button mat-button (click)="close()">{{ 'action.close' | translate }}</button>
     @if (mode === 'add' && !isInstalled()) {
       <button mat-flat-button color="primary" (click)="addItem()">
-        {{ 'action.add' | translate }}
+        {{ actionLabel | translate }}
       </button>
     }
     @if (!isInstalled() && mode !== 'add') {
-      @if (item.type === ItemType.DEVICE) {
-        <button mat-flat-button color="primary" (click)="installDevice()">
-          {{ 'iot-hub.connect-device' | translate }}
-        </button>
-      } @else {
-        <button mat-flat-button color="primary" (click)="install()">
-          {{ 'iot-hub.install' | translate }}
-        </button>
-      }
+      <button mat-flat-button color="primary" (click)="runPrimaryAction()">
+        {{ actionLabel | translate }}
+      </button>
     }
     @if (isInstalled() && mode !== 'add') {
       <button mat-flat-button color="primary" (click)="openEntityDetails()">
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts
index bc72b7a94c..6a061c338c 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts
@@ -28,6 +28,11 @@ import { TranslateService } from '@ngx-translate/core';
 import { SolutionInstallDialogComponent } from '@home/components/iot-hub/solution-install-dialog.component';
 import { SolutionTemplateInstalledItemDescriptor } from '@shared/models/iot-hub/iot-hub-installed-item.models';
 import { IotHubActionsService } from '@home/components/iot-hub/iot-hub-actions.service';
+import {
+  iotHubItemActionLabel,
+  iotHubItemActionMode,
+  isBuiltInItem
+} from '@home/components/iot-hub/iot-hub-utils';
 
 export type IotHubItemDetailDialogMode = 'default' | 'add';
 
@@ -59,6 +64,8 @@ export class TbIotHubItemDetailDialogComponent extends DialogComponent<TbIotHubI
   installedItemsCount = 0;
   carouselImages: string[] = [];
   carouselIndex = 0;
+  // Built-in marker rides on the version line rather than as a standalone badge.
+  versionLabel: string;
 
   constructor(
     protected store: Store<AppState>,
@@ -77,10 +84,22 @@ export class TbIotHubItemDetailDialogComponent extends DialogComponent<TbIotHubI
     this.preview = data.preview === true;
     this.installedItem = data.installedItem;
     this.installedItemsCount = data.installedItemsCount || 0;
+    this.versionLabel = isBuiltInItem(this.item)
+      ? `v ${this.item.version} | ${this.translate.instant('iot-hub.built-in')}`
+      : `v ${this.item.version}`;
     this.buildCarouselImages();
     this.loadReadme();
   }
 
+  // The counter and the separator that would otherwise dangle next to it share this boolean.
+  get showInstallCount(): boolean {
+    return !isBuiltInItem(this.item);
+  }
+
+  get actionLabel(): string {
+    return iotHubItemActionLabel(this.item, this.mode === 'add' ? 'add' : 'detail');
+  }
+
   isCompactLayout(): boolean {
     return this.item.type === ItemType.CALCULATED_FIELD
         || this.item.type === ItemType.ALARM_RULE
@@ -167,6 +186,19 @@ export class TbIotHubItemDetailDialogComponent extends DialogComponent<TbIotHubI
       && this.installedItem.itemVersionId !== this.item.id;
   }
 
+  /** Runs whatever the item's action mode calls for: open the local copy, connect, or install. */
+  runPrimaryAction(): void {
+    if (iotHubItemActionMode(this.item) === 'connect') {
+      this.installDevice();
+    } else {
+      this.install();
+    }
+  }
+
+  /**
+   * For a built-in item this opens the local copy (the dialog closes itself on navigation) and only
+   * installs if that copy no longer exists — `IotHubActionsService.installItem` owns that decision.
+   */
   install(): void {
     this.iotHubActions.installItem(this.item).subscribe(result => {
       if (result === 'installed') {
diff --git a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-utils.ts b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-utils.ts
index c5ea02e2d0..793d107f11 100644
--- a/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-utils.ts
+++ b/ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-utils.ts
@@ -14,13 +14,63 @@
 /// limitations under the License.
 ///
 
-import { FilterParamInfo } from '@shared/models/iot-hub/iot-hub-item.models';
+import { FilterParamInfo, ItemType } from '@shared/models/iot-hub/iot-hub-item.models';
 import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models';
 import { IotHubApiService } from '@core/http/iot-hub-api.service';
 
 export const IOT_HUB_FILTER_GROUPING_THRESHOLD = 11;
 export const IOT_HUB_FILTER_POPULAR_LIMIT = 10;
 
+/**
+ * Primary action offered for an IoT Hub item:
+ *  - `open`    — the item is built-in, the tenant already has it, so we navigate to the local copy;
+ *  - `connect` — device packages are connected rather than installed;
+ *  - `install` — everything else.
+ * Dependent copy (button labels, dialog CTA, tooltips) is keyed by this mode, never by the verb itself.
+ */
+export type IotHubItemActionMode = 'open' | 'connect' | 'install';
+
+/**
+ * The `builtIn` flag is server-owned and not live on every Hub deployment yet, so an absent,
+ * null or non-boolean value must read as "not built-in" instead of leaking into the UI.
+ */
+export const isBuiltInItem = (item?: MpItemVersionView | null): boolean => item?.builtIn === true;
+
+export const iotHubItemActionMode = (item?: MpItemVersionView | null): IotHubItemActionMode => {
+  if (isBuiltInItem(item)) {
+    return 'open';
+  }
+  return item?.type === ItemType.DEVICE ? 'connect' : 'install';
+};
+
+/** Surface a CTA is rendered on: a catalogue card, the item detail footer, or an add-item picker. */
+export type IotHubItemActionContext = 'card' | 'detail' | 'add';
+
+const iotHubActionLabels: Record<IotHubItemActionContext, Record<IotHubItemActionMode, string>> = {
+  card: {
+    open: 'iot-hub.open',
+    connect: 'iot-hub.connect',
+    install: 'iot-hub.install'
+  },
+  // The detail footer has room to spell the device wording out.
+  detail: {
+    open: 'iot-hub.open',
+    connect: 'iot-hub.connect-device',
+    install: 'iot-hub.install'
+  },
+  // Picking an item to add to an entity or a dashboard is "Add", whether or not it is a device.
+  add: {
+    open: 'iot-hub.open',
+    connect: 'action.add',
+    install: 'action.add'
+  }
+};
+
+/** Translation key of the primary CTA for an item on the given surface. */
+export const iotHubItemActionLabel = (item: MpItemVersionView | null,
+                                      context: IotHubItemActionContext): string =>
+  iotHubActionLabels[context][iotHubItemActionMode(item)];
+
 export interface IotHubFilterGroup {
   label: string;
   items: FilterParamInfo[];
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/iot-hub-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/iot-hub-widget.component.html
index 7c1a11f3ab..19eb6a0a3f 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/iot-hub-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/iot-hub-widget.component.html
@@ -39,10 +39,12 @@
               </div>
               <div class="tb-iot-hub-widget-card-label">
                 <span class="tb-iot-hub-widget-card-name" tbTruncateWithTooltip>{{ item.name }}</span>
-                <span class="tb-iot-hub-widget-card-installs">
-                  <mat-icon>file_download</mat-icon>
-                  {{ item.totalInstallCount | shortNumber }}
-                </span>
+                @if (showInstallCount(item)) {
+                  <span class="tb-iot-hub-widget-card-installs">
+                    <mat-icon>file_download</mat-icon>
+                    {{ item.totalInstallCount | shortNumber }}
+                  </span>
+                }
               </div>
             </div>
           }
@@ -63,10 +65,12 @@
               </div>
               <div class="tb-iot-hub-widget-card-label">
                 <span class="tb-iot-hub-widget-card-name" tbTruncateWithTooltip>{{ item.name }}</span>
-                <span class="tb-iot-hub-widget-card-installs">
-                  <mat-icon>file_download</mat-icon>
-                  {{ item.totalInstallCount | shortNumber }}
-                </span>
+                @if (showInstallCount(item)) {
+                  <span class="tb-iot-hub-widget-card-installs">
+                    <mat-icon>file_download</mat-icon>
+                    {{ item.totalInstallCount | shortNumber }}
+                  </span>
+                }
               </div>
             </div>
           }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/iot-hub-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/iot-hub-widget.component.ts
index 8195aa4117..4755b6be07 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/home-page/iot-hub-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/home-page/iot-hub-widget.component.ts
@@ -22,7 +22,7 @@ import { getCurrentAuthUser } from '@core/auth/auth.selectors';
 import { WidgetContext } from '@home/models/widget-component.models';
 import { IotHubApiService } from '@core/http/iot-hub-api.service';
 import { IotHubActionsService } from '@home/components/iot-hub/iot-hub-actions.service';
-import { resolveIotHubItemImageUrl } from '@home/components/iot-hub/iot-hub-utils';
+import { isBuiltInItem, resolveIotHubItemImageUrl } from '@home/components/iot-hub/iot-hub-utils';
 import { MpItemVersionQuery, MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models';
 import { ItemType } from '@shared/models/iot-hub/iot-hub-item.models';
 import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models';
@@ -83,6 +83,11 @@ export class IotHubWidgetComponent extends PageComponent implements OnInit {
     return item.type === ItemType.SOLUTION_TEMPLATE && !!this.findInstalledSolutionTemplate(item);
   }
 
+  // Install counters track nothing actionable for content that already ships with the platform.
+  showInstallCount(item: MpItemVersionView): boolean {
+    return !isBuiltInItem(item);
+  }
+
   private findInstalledSolutionTemplate(item: MpItemVersionView): IotHubInstalledItem | undefined {
     return this.installedSolutionTemplates.find(i => i.itemId === item.itemId);
   }
diff --git a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts
index 250a2f19f7..ddae5610a3 100644
--- a/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts
+++ b/ui-ngx/src/app/shared/models/iot-hub/iot-hub-version.models.ts
@@ -109,6 +109,14 @@ export interface MpItemVersionView {
   creatorVerified: boolean;
   installCount: number;
   totalInstallCount: number;
+  /**
+   * Server-owned, read-only marker for content that already ships inside ThingsBoard
+   * (a bundled widget, a SCADA symbol) instead of being installed by the IoT Hub.
+   * Optional on purpose: older Hub deployments simply omit the field, so it must never
+   * be read directly — use `isBuiltInItem()` from `@home/components/iot-hub/iot-hub-utils`.
+   * Never send it back to the server.
+   */
+  builtIn?: boolean;
   resources: MpItemVersionResource[];
   relatedItems?: string[];
   checksum?: string;
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index b7a2d72e33..98f59ec8a9 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3830,9 +3830,16 @@
         "rule-chain-overwrite-body": "Profile <b>{{profile}}</b> currently uses <b>{{existing}}</b> as its default rule chain. Installing will replace it with this rule chain.",
         "rule-chain-overwrite-replace": "Replace",
         "install": "Install",
+        "open": "Open",
+        "built-in": "Built-in",
+        "built-in-lookup-failed-title": "Could not check this component",
+        "built-in-lookup-failed-text": "Failed to check whether '{{name}}' is already present in this instance. Nothing was installed — please try again.",
+        "built-in-missing-title": "Not available in this instance",
+        "built-in-missing-text": "'{{name}}' normally ships with ThingsBoard, but it is not present in this instance — it may have been deleted by the system administrator. You can install it from the IoT Hub instead.",
         "connect": "Connect",
         "connect-device": "Connect device",
         "installing": "Installing...",
+        "installing-title": "Installing '{{name}}'",
         "installed": "Installed",
         "install-success": "{{name}} installed successfully",
         "install-success-title": "Installation Successful",

From 268a374ec23cd0dc894ff5f695edcf84073d2ae2 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Wed, 19 Aug 2026 12:58:10 +0300
Subject: [PATCH 65/91] Bump netty from 4.1.135.Final to 4.1.136.Final to fix
 CVE-2026-44891, CVE-2026-55831, and 11 others

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7d42f9f1c7..99d5ff6a40 100755
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
              entries below once TB migrates its tests off the deprecated @SpyBean/@MockBean to @MockitoSpyBean/@MockitoBean. -->
         <spring-boot-test.version>3.5.13</spring-boot-test.version>
         <commons-lang3.version>3.18.0</commons-lang3.version> <!-- to fix CVE-2025-48924. TODO: remove when fixed in spring-boot-dependencies -->
-        <netty.version>4.1.135.Final</netty.version> <!-- to fix CVE-2026-44249, CVE-2026-44250, CVE-2026-44890, CVE-2026-44893, CVE-2026-45416, CVE-2026-45674, CVE-2026-46340, CVE-2026-47691, CVE-2026-48006, CVE-2026-48059, CVE-2026-50010, CVE-2026-50011 (supersedes earlier netty CVE pins; also retains the 4.1.134 MQTT decoder regression fix). TODO: remove when fixed in spring-boot-dependencies -->
+        <netty.version>4.1.136.Final</netty.version> <!-- to fix CVE-2026-44891, CVE-2026-55831, CVE-2026-55833, CVE-2026-55851, CVE-2026-56745, CVE-2026-56817, CVE-2026-56819, CVE-2026-56820, CVE-2026-56821, CVE-2026-56822, CVE-2026-59901, CVE-2026-59920, CVE-2026-73507 (supersedes earlier netty CVE pins; also retains the 4.1.134 MQTT decoder regression fix). TODO: remove when fixed in spring-boot-dependencies -->
         <javax.xml.bind-api.version>2.4.0-b180830.0359</javax.xml.bind-api.version>
         <jjwt.version>0.12.5</jjwt.version>
         <rat.version>0.10</rat.version> <!-- unused -->

From 7415739f5b650513946060f840c38e901ce19d81 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Wed, 19 Aug 2026 12:58:17 +0300
Subject: [PATCH 66/91] Bump bouncycastle from 1.84 to 1.85 to fix
 CVE-2026-8763, CVE-2026-12185, and 15 others

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 99d5ff6a40..6cf26b71f9 100755
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
         <swagger-annotations.version>2.2.30</swagger-annotations.version>
         <spatial4j.version>0.8</spatial4j.version>
         <jts.version>1.19.0</jts.version>
-        <bouncycastle.version>1.84</bouncycastle.version> <!-- 1.84 fixes CVE-2026-5588, CVE-2026-5598, CVE-2025-14813 -->
+        <bouncycastle.version>1.85</bouncycastle.version> <!-- to fix CVE-2026-8763, CVE-2026-12185, CVE-2026-12802, CVE-2026-12803, CVE-2026-12816, CVE-2026-12860, CVE-2026-13506, CVE-2026-14682, CVE-2026-58059, CVE-2026-58060, CVE-2026-58061, CVE-2026-58062, CVE-2026-59639, CVE-2026-59642, CVE-2026-59645, CVE-2026-59650, CVE-2026-59651 (supersedes the earlier 1.84 pin for CVE-2026-5588, CVE-2026-5598, CVE-2025-14813). Not managed by the Spring Boot BOM — this pin is the sole source of the bouncycastle version. -->
         <winsw.version>2.0.1</winsw.version>
         <sonar.exclusions>org/thingsboard/server/gen/**/*,
             org/thingsboard/server/extensions/core/plugin/telemetry/gen/**/*

From 260e08b251f92b2973db00839b34222e1af8d3f4 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Wed, 19 Aug 2026 13:00:35 +0300
Subject: [PATCH 67/91] Bump tomcat from 10.1.55 to 10.1.56 to fix
 CVE-2026-53434 and CVE-2026-55955

---
 pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6cf26b71f9..49c19adc0a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,7 @@
         <spring-boot-test.version>3.5.13</spring-boot-test.version>
         <commons-lang3.version>3.18.0</commons-lang3.version> <!-- to fix CVE-2025-48924. TODO: remove when fixed in spring-boot-dependencies -->
         <netty.version>4.1.136.Final</netty.version> <!-- to fix CVE-2026-44891, CVE-2026-55831, CVE-2026-55833, CVE-2026-55851, CVE-2026-56745, CVE-2026-56817, CVE-2026-56819, CVE-2026-56820, CVE-2026-56821, CVE-2026-56822, CVE-2026-59901, CVE-2026-59920, CVE-2026-73507 (supersedes earlier netty CVE pins; also retains the 4.1.134 MQTT decoder regression fix). TODO: remove when fixed in spring-boot-dependencies -->
+        <tomcat.version>10.1.56</tomcat.version> <!-- to fix CVE-2026-53434 and CVE-2026-55955. Pinned via the tomcat-embed overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <javax.xml.bind-api.version>2.4.0-b180830.0359</javax.xml.bind-api.version>
         <jjwt.version>0.12.5</jjwt.version>
         <rat.version>0.10</rat.version> <!-- unused -->
@@ -1015,6 +1016,23 @@
                 <scope>import</scope>
             </dependency>
             <!-- End of netty-bom version override -->
+            <!-- Temporary tomcat-embed version override -->
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-core</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-el</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+            <!-- End of tomcat-embed version override -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>

From 297050c8a41501ea9b0f687707b2cd5d373ac894 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Wed, 19 Aug 2026 13:00:35 +0300
Subject: [PATCH 68/91] Bump httpcore5 from 5.3.6 to 5.4.3 to fix
 CVE-2026-54399 and CVE-2026-54428

---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 49c19adc0a..72c417c013 100755
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
         <commons-lang3.version>3.18.0</commons-lang3.version> <!-- to fix CVE-2025-48924. TODO: remove when fixed in spring-boot-dependencies -->
         <netty.version>4.1.136.Final</netty.version> <!-- to fix CVE-2026-44891, CVE-2026-55831, CVE-2026-55833, CVE-2026-55851, CVE-2026-56745, CVE-2026-56817, CVE-2026-56819, CVE-2026-56820, CVE-2026-56821, CVE-2026-56822, CVE-2026-59901, CVE-2026-59920, CVE-2026-73507 (supersedes earlier netty CVE pins; also retains the 4.1.134 MQTT decoder regression fix). TODO: remove when fixed in spring-boot-dependencies -->
         <tomcat.version>10.1.56</tomcat.version> <!-- to fix CVE-2026-53434 and CVE-2026-55955. Pinned via the tomcat-embed overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
+        <httpcore5.version>5.4.3</httpcore5.version> <!-- to fix CVE-2026-54399 and CVE-2026-54428 (no fix exists on the 5.3.x line; httpclient5 5.5.2 from the Spring Boot BOM is compatible with httpcore5 5.4.x). Pinned via the httpcore5 overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <javax.xml.bind-api.version>2.4.0-b180830.0359</javax.xml.bind-api.version>
         <jjwt.version>0.12.5</jjwt.version>
         <rat.version>0.10</rat.version> <!-- unused -->
@@ -1033,6 +1034,18 @@
                 <version>${tomcat.version}</version>
             </dependency>
             <!-- End of tomcat-embed version override -->
+            <!-- Temporary httpcore5 version override -->
+            <dependency>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <artifactId>httpcore5</artifactId>
+                <version>${httpcore5.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents.core5</groupId>
+                <artifactId>httpcore5-h2</artifactId>
+                <version>${httpcore5.version}</version>
+            </dependency>
+            <!-- End of httpcore5 version override -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>

From 0c3850f2eac8a4bceec4b126d3afeaa0cabe5771 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Wed, 19 Aug 2026 13:00:35 +0300
Subject: [PATCH 69/91] Bump logback from 1.5.34 to 1.5.38 to fix
 CVE-2026-13006

---
 pom.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index 72c417c013..564b0b65c2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
         <netty.version>4.1.136.Final</netty.version> <!-- to fix CVE-2026-44891, CVE-2026-55831, CVE-2026-55833, CVE-2026-55851, CVE-2026-56745, CVE-2026-56817, CVE-2026-56819, CVE-2026-56820, CVE-2026-56821, CVE-2026-56822, CVE-2026-59901, CVE-2026-59920, CVE-2026-73507 (supersedes earlier netty CVE pins; also retains the 4.1.134 MQTT decoder regression fix). TODO: remove when fixed in spring-boot-dependencies -->
         <tomcat.version>10.1.56</tomcat.version> <!-- to fix CVE-2026-53434 and CVE-2026-55955. Pinned via the tomcat-embed overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <httpcore5.version>5.4.3</httpcore5.version> <!-- to fix CVE-2026-54399 and CVE-2026-54428 (no fix exists on the 5.3.x line; httpclient5 5.5.2 from the Spring Boot BOM is compatible with httpcore5 5.4.x). Pinned via the httpcore5 overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
+        <logback.version>1.5.38</logback.version> <!-- to fix CVE-2026-13006 (1.5.36 as reported by the scanner is still vulnerable; 1.5.37 removed Janino conditional processing entirely, 1.5.38 adds a HardenedObjectInputStream fix). Pinned via the logback overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <javax.xml.bind-api.version>2.4.0-b180830.0359</javax.xml.bind-api.version>
         <jjwt.version>0.12.5</jjwt.version>
         <rat.version>0.10</rat.version> <!-- unused -->
@@ -1046,6 +1047,18 @@
                 <version>${httpcore5.version}</version>
             </dependency>
             <!-- End of httpcore5 version override -->
+            <!-- Temporary logback version override -->
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <!-- End of logback version override -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>

From 06740c48f06ac24922ff0f1a00bbf9a8334362d2 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Wed, 19 Aug 2026 13:00:43 +0300
Subject: [PATCH 70/91] Bump jackson from 2.21.4 to 2.21.5 to fix
 CVE-2026-59889

---
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 564b0b65c2..34e0946d62 100755
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
         <tomcat.version>10.1.56</tomcat.version> <!-- to fix CVE-2026-53434 and CVE-2026-55955. Pinned via the tomcat-embed overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <httpcore5.version>5.4.3</httpcore5.version> <!-- to fix CVE-2026-54399 and CVE-2026-54428 (no fix exists on the 5.3.x line; httpclient5 5.5.2 from the Spring Boot BOM is compatible with httpcore5 5.4.x). Pinned via the httpcore5 overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <logback.version>1.5.38</logback.version> <!-- to fix CVE-2026-13006 (1.5.36 as reported by the scanner is still vulnerable; 1.5.37 removed Janino conditional processing entirely, 1.5.38 adds a HardenedObjectInputStream fix). Pinned via the logback overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
+        <jackson-bom.version>2.21.5</jackson-bom.version> <!-- to fix CVE-2026-59889. Pinned via the jackson-bom import below: spring-boot-dependencies re-imports jackson-bom with its own placeholder, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <javax.xml.bind-api.version>2.4.0-b180830.0359</javax.xml.bind-api.version>
         <jjwt.version>0.12.5</jjwt.version>
         <rat.version>0.10</rat.version> <!-- unused -->
@@ -1059,6 +1060,15 @@
                 <version>${logback.version}</version>
             </dependency>
             <!-- End of logback version override -->
+            <!-- Temporary jackson-bom version override -->
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson-bom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <!-- End of jackson-bom version override -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>

From a7d80406ed51d0c959bf9a38e01b4736e57b5598 Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Wed, 19 Aug 2026 13:00:44 +0300
Subject: [PATCH 71/91] Bump postgresql from 42.7.11 to 42.7.12 to fix
 CVE-2026-54291

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 34e0946d62..ac36f06375 100755
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
         <httpcore5.version>5.4.3</httpcore5.version> <!-- to fix CVE-2026-54399 and CVE-2026-54428 (no fix exists on the 5.3.x line; httpclient5 5.5.2 from the Spring Boot BOM is compatible with httpcore5 5.4.x). Pinned via the httpcore5 overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <logback.version>1.5.38</logback.version> <!-- to fix CVE-2026-13006 (1.5.36 as reported by the scanner is still vulnerable; 1.5.37 removed Janino conditional processing entirely, 1.5.38 adds a HardenedObjectInputStream fix). Pinned via the logback overrides below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <jackson-bom.version>2.21.5</jackson-bom.version> <!-- to fix CVE-2026-59889. Pinned via the jackson-bom import below: spring-boot-dependencies re-imports jackson-bom with its own placeholder, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
+        <postgresql.version>42.7.12</postgresql.version> <!-- to fix CVE-2026-54291. Pinned via the postgresql override below: spring-boot-dependencies is imported as a BOM, so this property alone would not win. TODO: remove when fixed in spring-boot-dependencies -->
         <javax.xml.bind-api.version>2.4.0-b180830.0359</javax.xml.bind-api.version>
         <jjwt.version>0.12.5</jjwt.version>
         <rat.version>0.10</rat.version> <!-- unused -->
@@ -1069,6 +1070,13 @@
                 <scope>import</scope>
             </dependency>
             <!-- End of jackson-bom version override -->
+            <!-- Temporary postgresql version override -->
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>${postgresql.version}</version>
+            </dependency>
+            <!-- End of postgresql version override -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>

From 18e90c06e480a39769141c0615916bb0be8a5ce8 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 12:26:07 +0200
Subject: [PATCH 72/91] Fixed CVE-2026-59873 and CVE-2026-59874

---
 msa/js-executor/yarn.lock | 6 +++---
 msa/web-ui/yarn.lock      | 6 +++---
 ui-ngx/yarn.lock          | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/msa/js-executor/yarn.lock b/msa/js-executor/yarn.lock
index 5e3330e0d7..b174d94238 100644
--- a/msa/js-executor/yarn.lock
+++ b/msa/js-executor/yarn.lock
@@ -1654,9 +1654,9 @@ tar-stream@^2.1.4:
     readable-stream "^3.1.1"
 
 tar@>=7.5.8, tar@^7.4.3:
-  version "7.5.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.11.tgz#1250fae45d98806b36d703b30973fa8e0a6d8868"
-  integrity sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==
+  version "7.5.22"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.22.tgz#a696f998136e71487dc3f869a85bba2c67971ba9"
+  integrity sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==
   dependencies:
     "@isaacs/fs-minipass" "^4.0.0"
     chownr "^3.0.0"
diff --git a/msa/web-ui/yarn.lock b/msa/web-ui/yarn.lock
index 033aeac686..c1f5738544 100644
--- a/msa/web-ui/yarn.lock
+++ b/msa/web-ui/yarn.lock
@@ -1631,9 +1631,9 @@ tar-stream@^2.1.4:
     readable-stream "^3.1.1"
 
 tar@>=7.5.8, tar@^7.4.3:
-  version "7.5.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.11.tgz#1250fae45d98806b36d703b30973fa8e0a6d8868"
-  integrity sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==
+  version "7.5.22"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.22.tgz#a696f998136e71487dc3f869a85bba2c67971ba9"
+  integrity sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==
   dependencies:
     "@isaacs/fs-minipass" "^4.0.0"
     chownr "^3.0.0"
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index e05a9e4a7c..b929f0c928 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -10119,9 +10119,9 @@ tapable@^2.2.1, tapable@^2.3.0:
   integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==
 
 tar@^7.4.3, tar@^7.5.2:
-  version "7.5.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.11.tgz#1250fae45d98806b36d703b30973fa8e0a6d8868"
-  integrity sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==
+  version "7.5.22"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.22.tgz#a696f998136e71487dc3f869a85bba2c67971ba9"
+  integrity sha512-MFO/QzvtAOmJbkhOaCTvbGcFN9L9b+JunIsDwaKljSOdcLMea3NJ1k9Usz/rjdfSXTq4dfzfeS7W4p4YOAAHeA==
   dependencies:
     "@isaacs/fs-minipass" "^4.0.0"
     chownr "^3.0.0"

From 631c81b736e9245e4134bd8322638242af6c3ca0 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 12:26:56 +0200
Subject: [PATCH 73/91] Fixed CVE-2026-54466

---
 ui-ngx/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index b929f0c928..a059eb58d9 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -10798,9 +10798,9 @@ webpack@5.105.0:
     webpack-sources "^3.3.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
-  integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.5.tgz#569d22764ab21f2de20af0e74b411e8ae5a0fa46"
+  integrity sha512-ZL2+3c7kMBdIRCMz6l8jQMHyGVxj+UL+xVk74Ombiciboca8rHa15L86B19E5oh1pL9Ii/uj54gtsIrZGMo6zA==
   dependencies:
     http-parser-js ">=0.5.1"
     safe-buffer ">=5.1.0"

From a78ce1e7b866be248843d858905f0d605b2e4f2b Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 12:28:10 +0200
Subject: [PATCH 74/91] Fixed CVE-2026-59879 and CVE-2026-59880

---
 ui-ngx/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index a059eb58d9..de50922203 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -6758,9 +6758,9 @@ immediate@~3.0.5:
   integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
 immutable@^5.0.2:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.5.tgz#93ee4db5c2a9ab42a4a783069f3c5d8847d40165"
-  integrity sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==
+  version "5.1.9"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-5.1.9.tgz#ac23c3a01992ab665e14ac9ffff298f28cd74a0c"
+  integrity sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==
 
 import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"

From e4988de4c0e023ccf11fac837a60f142b7083c15 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 12:33:22 +0200
Subject: [PATCH 75/91] Fixed CVE-2026-13311

---
 ui-ngx/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index de50922203..f423b7ccb7 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -9648,9 +9648,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.8.1:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.4.tgz#2edd9a4dcefc96649e2e2cb12f637b1f1d92a190"
-  integrity sha512-VsC6n6vz1ihYYyZZwX7YZSF5l5x36ca17OC+a69h94YqB7X6XLwf+5MOgynYir2SLFUbl8gIYvBo8K8RoNQ6bQ==
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.10.0.tgz#482033e192e4f5c07151521ffa03400ec71b1b0f"
+  integrity sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==
 
 side-channel-list@^1.0.0:
   version "1.0.0"

From ec658c71bd0e8434697c0c58ca1831a0215ea67b Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 12:46:54 +0200
Subject: [PATCH 76/91] Fixed CVE-2026-68945 and CVE-2026-69151

---
 ui-ngx/package.json                           |  30 +--
 ....25.patch => @angular+build+20.3.27.patch} |   0
 ...3.25.patch => @angular+core+20.3.27.patch} |   4 +-
 ui-ngx/yarn.lock                              | 186 +++++++++---------
 4 files changed, 110 insertions(+), 110 deletions(-)
 rename ui-ngx/patches/{@angular+build+20.3.25.patch => @angular+build+20.3.27.patch} (100%)
 rename ui-ngx/patches/{@angular+core+20.3.25.patch => @angular+core+20.3.27.patch} (92%)

diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 09d354e3a3..c4a70ba67d 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -13,16 +13,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "20.3.25",
+    "@angular/animations": "20.3.27",
     "@angular/cdk": "20.2.14",
-    "@angular/common": "20.3.25",
-    "@angular/compiler": "20.3.25",
-    "@angular/core": "20.3.25",
-    "@angular/forms": "20.3.25",
+    "@angular/common": "20.3.27",
+    "@angular/compiler": "20.3.27",
+    "@angular/core": "20.3.27",
+    "@angular/forms": "20.3.27",
     "@angular/material": "20.2.14",
-    "@angular/platform-browser": "20.3.25",
-    "@angular/platform-browser-dynamic": "20.3.25",
-    "@angular/router": "20.3.25",
+    "@angular/platform-browser": "20.3.27",
+    "@angular/platform-browser-dynamic": "20.3.27",
+    "@angular/router": "20.3.27",
     "@auth0/angular-jwt": "^5.2.0",
     "@flowjs/flow.js": "^2.14.1",
     "@flowjs/ngx-flow": "20.0.2",
@@ -95,13 +95,13 @@
   },
   "devDependencies": {
     "@angular-builders/custom-esbuild": "20.0.0",
-    "@angular-devkit/build-angular": "20.3.25",
-    "@angular-devkit/core": "20.3.25",
-    "@angular-devkit/schematics": "20.3.25",
-    "@angular/build": "20.3.25",
-    "@angular/cli": "20.3.25",
-    "@angular/compiler-cli": "20.3.25",
-    "@angular/language-service": "20.3.25",
+    "@angular-devkit/build-angular": "20.3.27",
+    "@angular-devkit/core": "20.3.27",
+    "@angular-devkit/schematics": "20.3.27",
+    "@angular/build": "20.3.27",
+    "@angular/cli": "20.3.27",
+    "@angular/compiler-cli": "20.3.27",
+    "@angular/language-service": "20.3.27",
     "@types/ace-diff": "^2.1.4",
     "@types/canvas-gauges": "^2.1.8",
     "@types/flot": "^0.0.36",
diff --git a/ui-ngx/patches/@angular+build+20.3.25.patch b/ui-ngx/patches/@angular+build+20.3.27.patch
similarity index 100%
rename from ui-ngx/patches/@angular+build+20.3.25.patch
rename to ui-ngx/patches/@angular+build+20.3.27.patch
diff --git a/ui-ngx/patches/@angular+core+20.3.25.patch b/ui-ngx/patches/@angular+core+20.3.27.patch
similarity index 92%
rename from ui-ngx/patches/@angular+core+20.3.25.patch
rename to ui-ngx/patches/@angular+core+20.3.27.patch
index 5cb9b5e521..2879994671 100644
--- a/ui-ngx/patches/@angular+core+20.3.25.patch
+++ b/ui-ngx/patches/@angular+core+20.3.27.patch
@@ -1,8 +1,8 @@
 diff --git a/node_modules/@angular/core/fesm2022/debug_node.mjs b/node_modules/@angular/core/fesm2022/debug_node.mjs
-index be43067..079f100 100755
+index e570ca9..979f273 100755
 --- a/node_modules/@angular/core/fesm2022/debug_node.mjs
 +++ b/node_modules/@angular/core/fesm2022/debug_node.mjs
-@@ -9599,13 +9599,13 @@ function findDirectiveDefMatches(tView, tNode) {
+@@ -9596,13 +9596,13 @@ function findDirectiveDefMatches(tView, tNode) {
              if (isNodeMatchingSelectorList(tNode, def.selectors, /* isProjectionMode */ false)) {
                  matches ??= [];
                  if (isComponentDef(def)) {
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index f423b7ccb7..1025891d45 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -160,24 +160,24 @@
     "@angular-devkit/core" "^20.0.0"
     "@angular/build" "^20.0.0"
 
-"@angular-devkit/architect@0.2003.25", "@angular-devkit/architect@>= 0.2000.0 < 0.2100.0", "@angular-devkit/architect@>=0.2000.0 < 0.2100.0":
-  version "0.2003.25"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.2003.25.tgz#5fef6c3b713c7db438464e7f352bc762eafedfa5"
-  integrity sha512-39pTqt4wSmpD1WeCee46oSGXRh6TR1PFd9GZEwyZoMvBTMs8mE2sXGxUgd4Qyi5CkQ1XnCM5XfgJcjUWUQRoGg==
+"@angular-devkit/architect@0.2003.27", "@angular-devkit/architect@>= 0.2000.0 < 0.2100.0", "@angular-devkit/architect@>=0.2000.0 < 0.2100.0":
+  version "0.2003.27"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.2003.27.tgz#a5a1367db98d66eea8271d855efa69aed4d26fee"
+  integrity sha512-rRTj/VdeLRC0tdwym/SUYTMoB7v1HWTOcKBGHjqFQ7ZMyapJT4QtaedSEMJo8QFlX9E0GFAi6wR+t6wbsOELIg==
   dependencies:
-    "@angular-devkit/core" "20.3.25"
+    "@angular-devkit/core" "20.3.27"
     rxjs "7.8.2"
 
-"@angular-devkit/build-angular@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-20.3.25.tgz#1e3f973cd33a399ab6d05839cede6fe29b8e3219"
-  integrity sha512-jp2sbJhbVRT65RbGENY/lz3Z0W0D50Af3xzENmLDLBVp9uhlpIPSTC9LG4CEPV7T6H5Oq6ymHKM+OO5WwTlHHA==
+"@angular-devkit/build-angular@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-20.3.27.tgz#8da7ebe2f5a3a59a94ffc8b47001200012df5ef4"
+  integrity sha512-Tog1mAUyNPOJtuDIf1VYVjoaSy3gQHPZ3Q9gYKEi/7kpVoTdNtE3scws6Fb5z5uBsrjqc3lupoej3HO9kY+www==
   dependencies:
     "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.2003.25"
-    "@angular-devkit/build-webpack" "0.2003.25"
-    "@angular-devkit/core" "20.3.25"
-    "@angular/build" "20.3.25"
+    "@angular-devkit/architect" "0.2003.27"
+    "@angular-devkit/build-webpack" "0.2003.27"
+    "@angular-devkit/core" "20.3.27"
+    "@angular/build" "20.3.27"
     "@babel/core" "7.28.3"
     "@babel/generator" "7.28.3"
     "@babel/helper-annotate-as-pure" "7.27.3"
@@ -188,7 +188,7 @@
     "@babel/preset-env" "7.28.3"
     "@babel/runtime" "7.28.3"
     "@discoveryjs/json-ext" "0.6.3"
-    "@ngtools/webpack" "20.3.25"
+    "@ngtools/webpack" "20.3.27"
     ansi-colors "4.1.3"
     autoprefixer "10.4.21"
     babel-loader "10.0.0"
@@ -230,18 +230,18 @@
   optionalDependencies:
     esbuild "0.28.0"
 
-"@angular-devkit/build-webpack@0.2003.25":
-  version "0.2003.25"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.2003.25.tgz#ec1e1fbc690edb319a80f31acdf8673199352d43"
-  integrity sha512-jJMpYBdWeRfvrCna7JWsyMBbvjMcPblyzh4/pSfWw5znla3hJGzDtmb84qKZ+IB8eZNEcky4iGR5LK2jdGFLAg==
+"@angular-devkit/build-webpack@0.2003.27":
+  version "0.2003.27"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.2003.27.tgz#0291841a5048bfee322aa8d78aa972e9aa00d370"
+  integrity sha512-vrvLMWMcMcgbciHKQAlJVTQCQAdM36Ql4wf5+Obk20RedNvMyhRzg+5f0+MbBdyEjJRvIT4oC6I68orHYX1hGQ==
   dependencies:
-    "@angular-devkit/architect" "0.2003.25"
+    "@angular-devkit/architect" "0.2003.27"
     rxjs "7.8.2"
 
-"@angular-devkit/core@20.3.25", "@angular-devkit/core@>= 20.0.0 < 21.0.0", "@angular-devkit/core@^20.0.0":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-20.3.25.tgz#779b2eba00f688f0b9105e1562d9c14738cfabfa"
-  integrity sha512-pSfeWEoS1y9zxqTOw0Etj2NXkRmp/aU52wdnyq3KqVA9cJtgxtlOHlBBNswTil4dReojEy+0K1xJm+mLuWuLxA==
+"@angular-devkit/core@20.3.27", "@angular-devkit/core@>= 20.0.0 < 21.0.0", "@angular-devkit/core@^20.0.0":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-20.3.27.tgz#a1fc6b2d634155d56d828e24b1d3f41af58be8f4"
+  integrity sha512-jBaBTT9FemIEVpjN6omSzUYv9VOSnyPilLPC83E6JxNNMO4CMVKLfGK9SaVPJHtqU6YAWNFQqcD1dP7f/m49Cw==
   dependencies:
     ajv "8.18.0"
     ajv-formats "3.0.1"
@@ -250,12 +250,12 @@
     rxjs "7.8.2"
     source-map "0.7.6"
 
-"@angular-devkit/schematics@20.3.25", "@angular-devkit/schematics@>= 20.0.0 < 21.0.0":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-20.3.25.tgz#446618dbeb9b9756784e46b01190b71d10b6ffee"
-  integrity sha512-IB0IHf8ZRqr69hT/XIfHkYLPAYHWQ/WUc6+fKHBwq58jJlm/y5QUeTEuXvJ18IX/+hUIqw+E2Q3T0N9rLDLzXg==
+"@angular-devkit/schematics@20.3.27", "@angular-devkit/schematics@>= 20.0.0 < 21.0.0":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-20.3.27.tgz#88b0c24d84047d4b81efad14c02f7a1995b91696"
+  integrity sha512-S/y04S8eQIfyAa9nYhY10lQbqP1VYkMoKxHUdQ+PWjzHXL4NRb/5+yKV3BJI0kEngEX1ooQMoGYi+AqSIPT7wA==
   dependencies:
-    "@angular-devkit/core" "20.3.25"
+    "@angular-devkit/core" "20.3.27"
     jsonc-parser "3.3.1"
     magic-string "0.30.17"
     ora "8.2.0"
@@ -321,20 +321,20 @@
   dependencies:
     "@angular-eslint/bundled-angular-compiler" "20.7.0"
 
-"@angular/animations@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-20.3.25.tgz#f672d78b9282a93f23b91739093dc1b40663e1ef"
-  integrity sha512-lQmti3tI85D525TjUVGqCNLzFxSUoZg+vgIyvuGJZPY0UU/o2S6KAxW6ObmcRotZZHNfenLHIxWgzamBDjIjuw==
+"@angular/animations@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-20.3.27.tgz#21aefe74ea36df86f0af20458a9f97d09635cd6a"
+  integrity sha512-BgGTloDiD3qIFVSxZq8xO6CiyhKn00WbhQQiklZF8WI2hXd3Hmc1OUAAHqSMh2c9uL7X1ZYkg9lSzjiasK2vKg==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/build@20.3.25", "@angular/build@^20.0.0":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/build/-/build-20.3.25.tgz#cb21941c33b00758a2496d7ffc1e4d5b869d0867"
-  integrity sha512-ddWmPzYuzDWz9ql0262u9w3OJHXpSjHVNIDFIYOG2XYyMj/Xve0RkJ8/xvV+Hv7T3iqyyGKtsO+n/d0GCJQCtQ==
+"@angular/build@20.3.27", "@angular/build@^20.0.0":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/build/-/build-20.3.27.tgz#543c837b0e5821f61994bee75c8bec04340437aa"
+  integrity sha512-RzCMCCkGd6jEGW/iz68VylS7rl3PM1TgbNKBGXe+ImiccPYEDJCO073X6qCle1pYqi6HiPx+plu2YWYQOyH29Q==
   dependencies:
     "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.2003.25"
+    "@angular-devkit/architect" "0.2003.27"
     "@babel/core" "7.28.3"
     "@babel/helper-annotate-as-pure" "7.27.3"
     "@babel/helper-split-export-declaration" "7.24.7"
@@ -370,18 +370,18 @@
     parse5 "^8.0.0"
     tslib "^2.3.0"
 
-"@angular/cli@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-20.3.25.tgz#f16e78a689dfc546b55e0fc7da68545d1b307944"
-  integrity sha512-QOSxza45CZY11kqPVpqsU+WGYF99rR/r9A9GykZQWuAHb5SEAxlXHyaaGMu/BMtBHy5HNIlJH25UlzelrbaNyQ==
+"@angular/cli@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-20.3.27.tgz#cf1a00942588ab0a673aecd04f689737979cc226"
+  integrity sha512-FSZNnSCXm3bpUkVdOGZ//p9vjETtW7fLeg8dNIIFr/KObFZJ1bTv6ILiF6I/TujjfThUiKYEr7hb2C4zACXasg==
   dependencies:
-    "@angular-devkit/architect" "0.2003.25"
-    "@angular-devkit/core" "20.3.25"
-    "@angular-devkit/schematics" "20.3.25"
+    "@angular-devkit/architect" "0.2003.27"
+    "@angular-devkit/core" "20.3.27"
+    "@angular-devkit/schematics" "20.3.27"
     "@inquirer/prompts" "7.8.2"
     "@listr2/prompt-adapter-inquirer" "3.0.1"
     "@modelcontextprotocol/sdk" "1.26.0"
-    "@schematics/angular" "20.3.25"
+    "@schematics/angular" "20.3.27"
     "@yarnpkg/lockfile" "1.1.0"
     algoliasearch "5.35.0"
     ini "5.0.0"
@@ -394,19 +394,19 @@
     yargs "18.0.0"
     zod "4.1.13"
 
-"@angular/common@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-20.3.25.tgz#0f2bd058ec6595cfb4dd6a05601c41cb5cf3cb23"
-  integrity sha512-rnRGcXbjet0DHgkRL4Dqxk21G2T4UypVfiTV/fay58H8w9U89PJ1L6gRmk8B/uyfpii/9r23cBwnpcguQykxYw==
+"@angular/common@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-20.3.27.tgz#52405b538e1e662b4b93a4176d6ff86fbb81f7e7"
+  integrity sha512-4ectYP60XatB9zZ40WlfmaTzjmEhaz8SSqLsbZI4VZ8gDb5qNmxWtwwt8UxS3NmDHEgqdNL8UPO4E94+yKCICg==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/compiler-cli@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-20.3.25.tgz#64c7cdcd4118cd24cb1905804754ccf3d90a7df4"
-  integrity sha512-iqxwVo5Pgzt3EfT49OZ6plxA6KKxwv7ixx1XNH7QRvaOJC9gmsPScWpx+LO7ZsVZdo/NkA+rnXDl0PauUgGciw==
+"@angular/compiler-cli@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-20.3.27.tgz#8ad38bfbd64bf7b2382946a0ffd550c0c031f511"
+  integrity sha512-R0j9mFfUdGmmw867V/TfMSOBkLZT6ASxyY5tc1NDNmxQioZDVIDP9pqBOayzhJ0xiuDc9JellQXUTZ+vm+b/Zg==
   dependencies:
-    "@babel/core" "7.28.3"
+    "@babel/core" "7.29.7"
     "@jridgewell/sourcemap-codec" "^1.4.14"
     chokidar "^4.0.0"
     convert-source-map "^1.5.1"
@@ -415,31 +415,31 @@
     tslib "^2.3.0"
     yargs "^18.0.0"
 
-"@angular/compiler@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-20.3.25.tgz#674d07b2437e9a3c99e9bb1c10e4d13bbedb4086"
-  integrity sha512-TSh6gVoQqlLPqWwsYMK0lfVEQYENQO+USzS+BHFXEHFfgBRap6qDpIUGnRdj0Y2PlaVJUVFbeq1855EZUPUEoA==
+"@angular/compiler@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-20.3.27.tgz#052a968f3830b9279d299b7ee0d1f248bdf0dc23"
+  integrity sha512-in3THZ678GAYuOR9RZV18+zZz0KGhlGikyUEfLeALLjGf9ZaR3n+t19BmYx6G2VkF/Xqadne1omQ2vbl6PRASA==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-20.3.25.tgz#4418a9625a8a152029b49158dbda01f1c83d19c0"
-  integrity sha512-B4XnnR5jzikZDvZ4PjwjAWZMT14dxrKrmJdwa/n0yp7rMPkIJTKF6ZJMg4d1pLWLLSsc2oWHioN3UrWlGqIKnA==
+"@angular/core@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-20.3.27.tgz#97ce97a90c3e06564df7d7d8abbb2eeac3afdb07"
+  integrity sha512-8EfYIUST5CKldOF4MAYWTFFRB7EtwqUoQBZdar6US39/EEzWm/wm/iRNkH2jmKe4YuPa2GoeHS1WQ8VRuOk7Dg==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-20.3.25.tgz#10a16a9ebe8e71c2a236b1bf69c3fe4bd44923c5"
-  integrity sha512-vGRo1LVPFo2Cu0k+QyDTlsBv5UbN0c3Et2YMS+43oyi1c4keocntBccOjLyM5C0kpMz4+pP81MqqYpAWu2k+TQ==
+"@angular/forms@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-20.3.27.tgz#57d9eac1864454967f112a8b65a542a7d3e72dd9"
+  integrity sha512-cNG26wi3tr3m8At6puxJpAMVk9mBhEqREA4Jk/klalMwWuYEf8ApTEAw0a5NUfMxDkL3dcJJwDRf8rK6ma6TYQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/language-service@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-20.3.25.tgz#a319dec7d6369337908862461b45be96c6851a06"
-  integrity sha512-3PZUwbDUVQXk9BLSiNUpDxTnRXGR3szwK9QFQaGDt8lhmLYaQLh3VJsY0FHDRghHZYIGR2P2MbVxGQHytF+IPw==
+"@angular/language-service@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-20.3.27.tgz#0545aace3940741ca4c1c16684a19b3a93732580"
+  integrity sha512-utRPmVoEjiy0cBCtBZLo2Cyc/a/DeKdARpemRlrQjmrAs4wNJ3s2m8kEDbSR8o7DAX8na26aSk0qGikEaj0Q+A==
 
 "@angular/material@20.2.14":
   version "20.2.14"
@@ -448,24 +448,24 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser-dynamic@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.25.tgz#5051bea6135c0e9585956bc2ec0df4d9dabac182"
-  integrity sha512-3Ku+IsN4tQPVBsw75SoLbLf7TsXAGL0rGPHSsyNYFhG2ZZeQuYNIAi8mc4cwz/qMDnuassHFrCxuLDgN6Yab5w==
+"@angular/platform-browser-dynamic@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.27.tgz#6a5863b79df3ae5cf9d5070720aed73834de553a"
+  integrity sha512-4UUs8vOswgBOWCRoeZrswguarBLrM3j6WGb927Y3GXdN37fVJQYjyKHivNeQwZvwsGgl5Nl6mvpBpZv47n/OrQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-20.3.25.tgz#f738f1895415c76932b5064d04b4493d17159cdf"
-  integrity sha512-0k06U/AJRQifGMLkcU3R9uEHWbuKEzkKMuKcGagXTrkeFvCG2Ub4JdsbcjFNWB2bspWgaxIMSceuj7c83U5wOA==
+"@angular/platform-browser@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-20.3.27.tgz#4f98b2941aa1be881c0c6c8da5b7bbb577f7ae73"
+  integrity sha512-IV2zQ4zk6liyw5NE48bQqSk3nOAZ1rmDAQi7W4Kw0N8cs9MYVgK3zulo0zx5UqSv1kuNDAGb0HPR5tUGVOf9kw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/router@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-20.3.25.tgz#0b79c6c0a0f4212002713c03bbb2709dbd79c546"
-  integrity sha512-YIjLHWAufTaukNj15hEoys29e7XNhnCRsS1/95h/OqR69R3adbB8hV7ut7gO6XdXokriYqb4gtoUjoESxR+xFQ==
+"@angular/router@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-20.3.27.tgz#5635e1dadd0d6ad02a262598c13cabeae197ed30"
+  integrity sha512-F3hfJQ0GAuD6LdeB7A6fMfaErc4HXCtCQGh3C/8VrbVEbGfIgSveNjQXzGYPNklnOLhj1BmWf5w0WniUAEjLBA==
   dependencies:
     tslib "^2.3.0"
 
@@ -498,7 +498,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.0.tgz#00d03e8c0ac24dd9be942c5370990cbe1f17d88d"
   integrity sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==
 
-"@babel/core@7.28.3", "@babel/core@^7.23.9":
+"@babel/core@7.28.3", "@babel/core@7.29.7", "@babel/core@^7.23.9":
   version "7.28.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.3.tgz#aceddde69c5d1def69b839d09efa3e3ff59c97cb"
   integrity sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==
@@ -2386,10 +2386,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-20.3.25.tgz#18e676da66c10b6810aac8b5aee9a10432e03e9a"
-  integrity sha512-p/YopAgukaIvezv3hsJzJevnNUBNTM8UQIkyDHPY5/aANdKraUTKDQUwlVxRiyD8U+PTSeD/BI56oOnuKrdFZQ==
+"@ngtools/webpack@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-20.3.27.tgz#6f5232f0a9a878ebb456399a7157615ad59a310e"
+  integrity sha512-+H6u6RKGIHjkGhvtz1CexGtjLR2WqUB37TnO/RdGxq6xWyH0oEzV5oT73OGSrwrNjQS9TzhVj0xcnVsAhv5HdQ==
 
 "@ngx-translate/core@^17.0.0":
   version "17.0.0"
@@ -2740,13 +2740,13 @@
   resolved "https://registry.yarnpkg.com/@sanity/diff-match-patch/-/diff-match-patch-3.2.0.tgz#7ce587273f7372a146308cb1075ba26177d42cdb"
   integrity sha512-4hPADs0qUThFZkBK/crnfKKHg71qkRowfktBljH2UIxGHHTxIzt8g8fBiXItyCjxkuNy+zpYOdRMifQNv8+Yww==
 
-"@schematics/angular@20.3.25":
-  version "20.3.25"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-20.3.25.tgz#bf22b66390eb8fb8cf125f07ba3718077642c721"
-  integrity sha512-ezoJpPKhhjXgE3LxuNcJO/ghSXs8f73xrqGvqouag7IbuliJYbHrt22WH3X75XSbD0+iOdiqA2bARvAO/ezyxQ==
+"@schematics/angular@20.3.27":
+  version "20.3.27"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-20.3.27.tgz#6f52cefd7f3fcc2d7328cae58d88f2c33894e669"
+  integrity sha512-HGwM7Rr2Yburrp89Rez96KLylwz+fhqRFOrh2BoGF6ztyYxNr45t7ro8HJvaSEELMC1mefXsW5n5xzl3jsastw==
   dependencies:
-    "@angular-devkit/core" "20.3.25"
-    "@angular-devkit/schematics" "20.3.25"
+    "@angular-devkit/core" "20.3.27"
+    "@angular-devkit/schematics" "20.3.27"
     jsonc-parser "3.3.1"
 
 "@sigstore/bundle@^4.0.0":

From 13afeacc0d2a8dd41e0db9536d5a1b685282e060 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 12:54:35 +0200
Subject: [PATCH 77/91] Fixed CVE-2026-55388

---
 ui-ngx/package.json | 1 +
 ui-ngx/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index c4a70ba67d..d2dfc5f614 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -143,6 +143,7 @@
     "esbuild": "0.28.1",
     "vite": "7.3.5",
     "rollup": "4.59.0",
+    "piscina": "5.2.0",
     "jquery.terminal/**/form-data": ">=4.0.4",
     "js-beautify/**/minimatch": "^9.0.7"
   }
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 1025891d45..698474f635 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -8777,10 +8777,10 @@ pirates@^4.0.1:
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
   integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
 
-piscina@5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/piscina/-/piscina-5.1.3.tgz#30a460500a08770fc97d622e63857a5978dfc466"
-  integrity sha512-0u3N7H4+hbr40KjuVn2uNhOcthu/9usKhnw5vT3J7ply79v3D3M8naI00el9Klcy16x557VsEkkUQaHCWFXC/g==
+piscina@5.1.3, piscina@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/piscina/-/piscina-5.2.0.tgz#3a9a568ab9e3a0556b5c94522ba305962de13e3b"
+  integrity sha512-DszUCKeVN/5G5QKo6jAVHL8fmKnkJvQ0ACiVgY7YGCq3TUB2oznAOayvZPIAdEThvhczkXR+qm3IHsNXpFCYfA==
   optionalDependencies:
     "@napi-rs/nice" "^1.0.4"
 

From 08466774fad2ea497456556e383e8898980c816a Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 12:56:44 +0200
Subject: [PATCH 78/91] Fixed CVE-2026-67213 and CVE-2026-67214

---
 ui-ngx/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 698474f635..e494ecb35c 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -8082,9 +8082,9 @@ mz@^2.7.0:
     thenify-all "^1.0.0"
 
 nanoid@^3.3.11:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+  version "3.3.18"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.18.tgz#f66a2de1199ffde0fcf21c8a5f13106b1c081913"
+  integrity sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==
 
 natural-compare@^1.4.0:
   version "1.4.0"

From b5fe54b5374e322227161a8042915fb98c7a9dfa Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 13:00:32 +0200
Subject: [PATCH 79/91] Fixed CVE-2026-13149, CVE-2026-69152 and CVE-2026-14257

---
 msa/js-executor/yarn.lock |  6 +++---
 msa/web-ui/yarn.lock      |  6 +++---
 ui-ngx/yarn.lock          | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/msa/js-executor/yarn.lock b/msa/js-executor/yarn.lock
index b174d94238..312d145e85 100644
--- a/msa/js-executor/yarn.lock
+++ b/msa/js-executor/yarn.lock
@@ -447,9 +447,9 @@ body-parser@^2.2.0:
     type-is "^2.0.0"
 
 brace-expansion@^1.1.7:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6"
-  integrity sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.18.tgz#3ce74d89885136be1535341f8c3d4425c29a5cab"
+  integrity sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
diff --git a/msa/web-ui/yarn.lock b/msa/web-ui/yarn.lock
index c1f5738544..7f42a855e5 100644
--- a/msa/web-ui/yarn.lock
+++ b/msa/web-ui/yarn.lock
@@ -379,9 +379,9 @@ body-parser@^2.2.0:
     type-is "^2.0.0"
 
 brace-expansion@^1.1.7:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.13.tgz#d37875c01dc9eff988dd49d112a57cb67b54efe6"
-  integrity sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.18.tgz#3ce74d89885136be1535341f8c3d4425c29a5cab"
+  integrity sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index e494ecb35c..64b184550d 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -4349,17 +4349,17 @@ boolbase@^1.0.0:
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 brace-expansion@^1.1.7:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.14.tgz#d9de602370d91347cd9ddad1224d4fd701eb348b"
-  integrity sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==
+  version "1.1.18"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.18.tgz#3ce74d89885136be1535341f8c3d4425c29a5cab"
+  integrity sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 brace-expansion@^5.0.2:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.6.tgz#ec68fe0a641a29d8711579caf641d05bae1f2285"
-  integrity sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==
+  version "5.0.9"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.9.tgz#7c72438809b5fa5babf54199a1f1c281a6984fcf"
+  integrity sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==
   dependencies:
     balanced-match "^4.0.2"
 

From c1344f6308b3616253c6a72a12114da3fea1c5ec Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 13:02:26 +0200
Subject: [PATCH 80/91] Fixed CVE-2026-69192

---
 ui-ngx/yarn.lock | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 64b184550d..f6ff99bb47 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -6009,11 +6009,12 @@ exponential-backoff@^3.1.1:
   integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
 
 express-rate-limit@^8.2.1:
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-8.3.1.tgz#0aaba098eadd40f6737f30a98e6b16fa1a29edfb"
-  integrity sha512-D1dKN+cmyPWuvB+G2SREQDzPY1agpBIcTa9sJxOPMCNeH3gwzhqJRDWCXW3gg0y//+LQ/8j52JbMROWyrKdMdw==
+  version "8.6.2"
+  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-8.6.2.tgz#1a6c7fb6c5f5a83883c14f1d198fcdff60087c5d"
+  integrity sha512-YH4ru+eOJxQABscKFfRCy9R7x9QFGdezclVMwwgFFndzS2Xnm0uo6B0ABZsLhcpeptGv2qvuJVWlQr9gQZoC3A==
   dependencies:
-    ip-address "10.1.0"
+    debug "^4.4.3"
+    ip-address "^10.2.0"
 
 express@^4.21.2:
   version "4.22.1"
@@ -6824,10 +6825,10 @@ internmap@^1.0.0:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
-ip-address@10.1.0, ip-address@^10.0.1:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4"
-  integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==
+ip-address@^10.0.1, ip-address@^10.2.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.5.0.tgz#fcd6d7dfe9e68416b7cb71afe9bc960b3e38c13b"
+  integrity sha512-R5SnVLJmgYYvf2F2ZgwSBnelz5G4q5AxIC277GDfUaNbrZKNANcBC7RHqYYePlszf4kBolVkJauG0ZjHHFh55g==
 
 ipaddr.js@1.9.1:
   version "1.9.1"

From 5beb2b32cdb99549caf3534247471af64bc5a404 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 13:08:12 +0200
Subject: [PATCH 81/91] Fixed CVE-2026-59869 and CWE-407

---
 msa/js-executor/yarn.lock |  6 ++---
 msa/web-ui/yarn.lock      |  6 ++---
 ui-ngx/yarn.lock          | 55 +++++++++------------------------------
 3 files changed, 19 insertions(+), 48 deletions(-)

diff --git a/msa/js-executor/yarn.lock b/msa/js-executor/yarn.lock
index 312d145e85..439ab60d05 100644
--- a/msa/js-executor/yarn.lock
+++ b/msa/js-executor/yarn.lock
@@ -1030,9 +1030,9 @@ isarray@~1.0.0:
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 js-yaml@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
-  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.1.tgz#01216c001d67f48e2cd560d708c7af21090a3848"
+  integrity sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==
   dependencies:
     argparse "^2.0.1"
 
diff --git a/msa/web-ui/yarn.lock b/msa/web-ui/yarn.lock
index 7f42a855e5..d876d9df50 100644
--- a/msa/web-ui/yarn.lock
+++ b/msa/web-ui/yarn.lock
@@ -1018,9 +1018,9 @@ isarray@~1.0.0:
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 js-yaml@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
-  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.1.tgz#01216c001d67f48e2cd560d708c7af21090a3848"
+  integrity sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==
   dependencies:
     argparse "^2.0.1"
 
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index f6ff99bb47..7606472600 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -1548,9 +1548,9 @@
     "@types/json-schema" "^7.0.15"
 
 "@eslint/eslintrc@^3.3.5":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.5.tgz#c131793cfc1a7b96f24a83e0a8bbd4b881558c60"
-  integrity sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.6.tgz#d22bfd6b3a7d8e1f2c0b2f2e6de111b53ec6e13e"
+  integrity sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==
   dependencies:
     ajv "^6.14.0"
     debug "^4.3.2"
@@ -1558,7 +1558,7 @@
     globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^4.1.1"
+    js-yaml "^4.3.0"
     minimatch "^3.1.5"
     strip-json-comments "^3.1.1"
 
@@ -4857,17 +4857,6 @@ cosmiconfig@^9.0.0:
     js-yaml "^4.1.0"
     parse-json "^5.2.0"
 
-coveralls-next@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/coveralls-next/-/coveralls-next-4.2.1.tgz#6cf872710e4594d2912fb0196a48dbfee061c6b5"
-  integrity sha512-O/SBGZsCryt+6Q3NuJHENyQYaucTEV9qp0KGaed+y42PUh+GuF949LRLHKZbxWwOIc1tV8bJRIVWlfbZ8etEwQ==
-  dependencies:
-    form-data "4.0.0"
-    js-yaml "4.1.0"
-    lcov-parse "1.0.0"
-    log-driver "1.2.7"
-    minimist "1.2.8"
-
 create-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
@@ -6265,7 +6254,7 @@ foreground-child@^3.1.0:
     cross-spawn "^7.0.0"
     signal-exit "^4.0.1"
 
-form-data@4.0.0, form-data@>=4.0.4:
+form-data@>=4.0.4:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.6.tgz#28e864e1b786dbebb68db1f452f9635278665827"
   integrity sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==
@@ -7200,14 +7189,13 @@ jose@^6.1.3:
   integrity sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==
 
 jquery.terminal@^2.45.2:
-  version "2.45.2"
-  resolved "https://registry.yarnpkg.com/jquery.terminal/-/jquery.terminal-2.45.2.tgz#b954785fdf966070e435ff75f1d574c2de2568b1"
-  integrity sha512-7MtA3Hc8w+xSaANF5ZfN7ibDTp2DhecWsy4n8o+3+m62WDvg39gW6j+XcCQN6fc+b22Sy8m2jnKIJyb9nk4H5w==
+  version "2.46.2"
+  resolved "https://registry.yarnpkg.com/jquery.terminal/-/jquery.terminal-2.46.2.tgz#c508e98f3c617bdc542e2b8bf8d7f063785e80bf"
+  integrity sha512-/ytW0vxgKGt01ws05DAYsfFtg67fHuqYFRX+30rs6cgfcNt3gHGppyROyOCA6XRBbju5rQSbw4PdfidyA+pfIQ==
   dependencies:
     "@jcubic/lily" "^0.3.0"
     "@types/jquery" "^3.5.29"
     ansidec "^0.3.4"
-    coveralls-next "^4.2.1"
     iconv-lite "^0.6.3"
     jquery "^3.7.1"
     node-fetch "^3.3.2"
@@ -7242,17 +7230,10 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-js-yaml@^4.1.0, js-yaml@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
-  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
+js-yaml@^4.1.0, js-yaml@^4.3.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.3.1.tgz#01216c001d67f48e2cd560d708c7af21090a3848"
+  integrity sha512-CY6crGq313MX8GkwvB7tzgp99vjQxY1++5y10/BKN/GUfHqWaOGQMNZkBvqSzsZKWk/ijwHlWzzkLulsGHhjWQ==
   dependencies:
     argparse "^2.0.1"
 
@@ -7456,11 +7437,6 @@ layout-base@^2.0.0:
   resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-2.0.1.tgz#d0337913586c90f9c2c075292069f5c2da5dd285"
   integrity sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==
 
-lcov-parse@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
-  integrity sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==
-
 leaflet-polylinedecorator@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/leaflet-polylinedecorator/-/leaflet-polylinedecorator-1.6.0.tgz#9ef79fd1b5302d67b72efe959a8ecd2553f27266"
@@ -7641,11 +7617,6 @@ lodash@4.18.1, lodash@^4.17.14:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
   integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
-log-driver@1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
-  integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
-
 log-symbols@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-6.0.0.tgz#bb95e5f05322651cac30c0feb6404f9f2a8a9439"
@@ -7924,7 +7895,7 @@ minimatch@^3.1.2, minimatch@^3.1.5:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@1.2.8, minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
+minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==

From eb9e405cd34ad272b20f333cbbb1a2904659613d Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 13:11:51 +0200
Subject: [PATCH 82/91] Fixed CVE-2026-13676, CVE-2026-16221 and CVE-2026-18446

---
 ui-ngx/yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 7606472600..546eb49b17 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -6103,9 +6103,9 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fast-uri@^3.0.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.2.tgz#8af3d4fc9d3e71b11572cc2673b514a7d1a8c8ec"
-  integrity sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.5.tgz#610f37419a030270430cecd68d74e3d4d96725d0"
+  integrity sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==
 
 fastq@^1.6.0:
   version "1.17.1"

From 63aea3dcfeefa40f08dfe8d8ef3bc6c65509af7e Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 13:17:02 +0200
Subject: [PATCH 83/91] Fixed CVE-2026-48815

---
 ui-ngx/yarn.lock | 70 ++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 546eb49b17..922456ebad 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -1592,6 +1592,11 @@
   dependencies:
     tslib "^2.3.0"
 
+"@gar/promise-retry@^1.0.0", "@gar/promise-retry@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@gar/promise-retry/-/promise-retry-1.0.3.tgz#65e726428e794bc4453948e0a41e6de4215ce8b0"
+  integrity sha512-GmzA9ckNokPypTg10pgpeHNQe7ph+iIKKmhKu3Ob9ANkswreCx7R3cKmY781K8QK3AqVL3xVh9A42JvIAbkkSA==
+
 "@geoman-io/leaflet-geoman-free@2.19.3":
   version "2.19.3"
   resolved "https://registry.yarnpkg.com/@geoman-io/leaflet-geoman-free/-/leaflet-geoman-free-2.19.3.tgz#42ea4d10be3a76c64376cdd8736b191dd0c5ae2d"
@@ -2756,43 +2761,43 @@
   dependencies:
     "@sigstore/protobuf-specs" "^0.5.0"
 
-"@sigstore/core@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/core/-/core-3.1.0.tgz#b418de73f56333ad9e369b915173d8c98e9b96d5"
-  integrity sha512-o5cw1QYhNQ9IroioJxpzexmPjfCe7gzafd2RY3qnMpxr4ZEja+Jad/U8sgFpaue6bOaF+z7RVkyKVV44FN+N8A==
+"@sigstore/core@^3.2.0", "@sigstore/core@^3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/core/-/core-3.2.1.tgz#4efd4ab0f59e768b6daf65612024ba925787de72"
+  integrity sha512-qRsxPnCrbC/puegGxKuynfnxgLiHqWStrSjxkoB4YKqq3Z3s4cyZyj42ZdWFAEblNP65C+rBH8EuREHIXoi83g==
 
 "@sigstore/protobuf-specs@^0.5.0":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.5.0.tgz#e5f029edcb3a4329853a09b603011e61043eb005"
   integrity sha512-MM8XIwUjN2bwvCg1QvrMtbBmpcSHrkhFSCu1D11NyPvDQ25HEc4oG5/OcQfd/Tlf/OxmKWERDj0zGE23jQaMwA==
 
-"@sigstore/sign@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-4.1.0.tgz#63df15a137337b29f463a1d1c51e1f7d4c1db2f1"
-  integrity sha512-Vx1RmLxLGnSUqx/o5/VsCjkuN5L7y+vxEEwawvc7u+6WtX2W4GNa7b9HEjmcRWohw/d6BpATXmvOwc78m+Swdg==
+"@sigstore/sign@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/sign/-/sign-4.1.1.tgz#34765fe4a190d693340c0771a3d150a397bcfc55"
+  integrity sha512-Hf4xglukg0XXQ2RiD5vSoLjdPe8OBUPA8XeVjUObheuDcWdYWrnH/BNmxZCzkAy68MzmNCxXLeurJvs6hcP2OQ==
   dependencies:
+    "@gar/promise-retry" "^1.0.2"
     "@sigstore/bundle" "^4.0.0"
-    "@sigstore/core" "^3.1.0"
+    "@sigstore/core" "^3.2.0"
     "@sigstore/protobuf-specs" "^0.5.0"
-    make-fetch-happen "^15.0.3"
+    make-fetch-happen "^15.0.4"
     proc-log "^6.1.0"
-    promise-retry "^2.0.1"
 
-"@sigstore/tuf@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-4.0.1.tgz#9b080390936d79ea3b6a893b64baf3123e92d6d3"
-  integrity sha512-OPZBg8y5Vc9yZjmWCHrlWPMBqW5yd8+wFNl+thMdtcWz3vjVSoJQutF8YkrzI0SLGnkuFof4HSsWUhXrf219Lw==
+"@sigstore/tuf@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-4.0.2.tgz#7d2fa2abcd5afa5baf752671d14a1c6ed0ed3196"
+  integrity sha512-TCAzTy0xzdP79EnxSjq9KQ3eaR7+FmudLC6eRKknVKZbV7ZNlGLClAAQb/HMNJ5n2OBNk2GT1tEmU0xuPr+SLQ==
   dependencies:
     "@sigstore/protobuf-specs" "^0.5.0"
     tuf-js "^4.1.0"
 
-"@sigstore/verify@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@sigstore/verify/-/verify-3.1.0.tgz#4046d4186421db779501fe87fa5acaa5d4d21b08"
-  integrity sha512-mNe0Iigql08YupSOGv197YdHpPPr+EzDZmfCgMc7RPNaZTw5aLN01nBl6CHJOh3BGtnMIj83EeN4butBchc8Ag==
+"@sigstore/verify@^3.1.1":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@sigstore/verify/-/verify-3.1.1.tgz#13c1c1cff28fe81f662de29d85ba5ae048fcbd8d"
+  integrity sha512-qv7+G3J2cc6wwFj3yKvXOamzqhMwSk1ogPGmhpS8iXllcPrJaIIBA+4HbttlHVu1pqWTdmaCH/WE7UOC51kdoA==
   dependencies:
     "@sigstore/bundle" "^4.0.0"
-    "@sigstore/core" "^3.1.0"
+    "@sigstore/core" "^3.2.1"
     "@sigstore/protobuf-specs" "^0.5.0"
 
 "@sindresorhus/base62@^1.0.0":
@@ -7673,12 +7678,14 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^15.0.0, make-fetch-happen@^15.0.1, make-fetch-happen@^15.0.3:
-  version "15.0.3"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-15.0.3.tgz#1578d72885f2b3f9e5daa120b36a14fc31a84610"
-  integrity sha512-iyyEpDty1mwW3dGlYXAJqC/azFn5PPvgKVwXayOGBSmKLxhKZ9fg4qIan2ePpp1vJIwfFiO34LAPZgq9SZW9Aw==
+make-fetch-happen@^15.0.0, make-fetch-happen@^15.0.1, make-fetch-happen@^15.0.4:
+  version "15.0.6"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-15.0.6.tgz#079dee708c88a04a1f79735bb02789a63597840e"
+  integrity sha512-Je0fLJ0F5atA7F+eIlLzk+Wkcl57JDf4kf+EW8xiP5E31xOQxkIxTbgf1Oi1Lw9tRI9UEMRdI5Vz2xTzoNU1Jw==
   dependencies:
+    "@gar/promise-retry" "^1.0.0"
     "@npmcli/agent" "^4.0.0"
+    "@npmcli/redact" "^4.0.0"
     cacache "^20.0.1"
     http-cache-semantics "^4.1.1"
     minipass "^7.0.2"
@@ -7687,7 +7694,6 @@ make-fetch-happen@^15.0.0, make-fetch-happen@^15.0.1, make-fetch-happen@^15.0.3:
     minipass-pipeline "^1.2.4"
     negotiator "^1.0.0"
     proc-log "^6.0.0"
-    promise-retry "^2.0.1"
     ssri "^13.0.0"
 
 make-plural@^7.0.0:
@@ -9670,16 +9676,16 @@ signal-exit@^4.0.1, signal-exit@^4.1.0:
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 sigstore@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-4.1.0.tgz#d34b92a544a05e003a2430209d26d8dfafd805a0"
-  integrity sha512-/fUgUhYghuLzVT/gaJoeVehLCgZiUxPCPMcyVNY0lIf/cTCz58K/WTI7PefDarXxp9nUKpEwg1yyz3eSBMTtgA==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-4.1.1.tgz#2959993dbf978c759a5d23d854cbd3729b6dcd97"
+  integrity sha512-endqECJkfhozrXMK5ngu/UAA0xVcVEFdnHJCElGaExypjW+HK5i6zu3NteLoaX/iFbRUbC3+DjttQs0GARr+5w==
   dependencies:
     "@sigstore/bundle" "^4.0.0"
-    "@sigstore/core" "^3.1.0"
+    "@sigstore/core" "^3.2.1"
     "@sigstore/protobuf-specs" "^0.5.0"
-    "@sigstore/sign" "^4.1.0"
-    "@sigstore/tuf" "^4.0.1"
-    "@sigstore/verify" "^3.1.0"
+    "@sigstore/sign" "^4.1.1"
+    "@sigstore/tuf" "^4.0.2"
+    "@sigstore/verify" "^3.1.1"
 
 slash@^2.0.0:
   version "2.0.0"

From 7c4d1774dfb3674518ba2f8790a49551bf40306e Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 13:21:33 +0200
Subject: [PATCH 84/91] Fixed CVE-2026-55603

---
 ui-ngx/package.json | 1 +
 ui-ngx/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index d2dfc5f614..3c251a6983 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -144,6 +144,7 @@
     "vite": "7.3.5",
     "rollup": "4.59.0",
     "piscina": "5.2.0",
+    "@angular-devkit/build-angular/http-proxy-middleware": "3.0.7",
     "jquery.terminal/**/form-data": ">=4.0.4",
     "js-beautify/**/minimatch": "^9.0.7"
   }
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 922456ebad..0ba1f037f2 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -6649,10 +6649,10 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
-http-proxy-middleware@3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz#9dcde663edc44079bc5a9c63e03fe5e5d6037fab"
-  integrity sha512-GLZZm1X38BPY4lkXA01jhwxvDoOkkXqjgVyUzVxiEK4iuRu03PZoYHhHRwxnfhQMDuaxi3vVri0YgSro/1oWqg==
+http-proxy-middleware@3.0.5, http-proxy-middleware@3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-3.0.7.tgz#53d3a1fe175bcacc507711cc52a0b32baf2c3442"
+  integrity sha512-iwbQltVlx8bCrqePUM8C+hllHvdawVhQJaLrj1X7qllkvFQdXFsr16pW/mo9+JDVjN+QO2XUx9jd8SmoFkE5qw==
   dependencies:
     "@types/http-proxy" "^1.17.15"
     debug "^4.3.6"

From 7ccc6d33819ce074fdd22f83889e4d2ed032eb7f Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 13:28:33 +0200
Subject: [PATCH 85/91] Fixed CVE-2026-73646

---
 ui-ngx/package.json |  1 +
 ui-ngx/yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 3c251a6983..1a0eb050ab 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -144,6 +144,7 @@
     "vite": "7.3.5",
     "rollup": "4.59.0",
     "piscina": "5.2.0",
+    "postcss": "8.5.23",
     "@angular-devkit/build-angular/http-proxy-middleware": "3.0.7",
     "jquery.terminal/**/form-data": ">=4.0.4",
     "js-beautify/**/minimatch": "^9.0.7"
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 0ba1f037f2..2f755ff7e5 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -8059,7 +8059,7 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nanoid@^3.3.11:
+nanoid@^3.3.11, nanoid@^3.3.16:
   version "3.3.18"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.18.tgz#f66a2de1199ffde0fcf21c8a5f13106b1c081913"
   integrity sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==
@@ -8899,12 +8899,12 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.5.12, postcss@^8.2.14, postcss@^8.4.33, postcss@^8.4.4, postcss@^8.4.47, postcss@^8.4.49, postcss@^8.5.6:
-  version "8.5.12"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.12.tgz#cd0c0f667f7cb0521e2313234ea6e707a9ec1ddb"
-  integrity sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==
+postcss@8.5.12, postcss@8.5.23, postcss@^8.2.14, postcss@^8.4.33, postcss@^8.4.4, postcss@^8.4.47, postcss@^8.4.49, postcss@^8.5.6:
+  version "8.5.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.23.tgz#3493550116f478487298301d2c2e8dc5a56e6594"
+  integrity sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==
   dependencies:
-    nanoid "^3.3.11"
+    nanoid "^3.3.16"
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 

From ce30d3ae56aee24b1d82f69944f58cd97d1bcbe1 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 14:24:18 +0200
Subject: [PATCH 86/91] Migrated from TinyMCE editor to Hugerte

---
 ui-ngx/angular.json                           |  4 +--
 ui-ngx/package.json                           |  5 ++-
 .../mobile/common/editor-panel.component.ts   |  7 ++--
 .../sent/sent-notification-dialog.componet.ts |  5 ++-
 ...cation-template-configuration.component.ts |  7 ++--
 ui-ngx/src/app/shared/shared.module.ts        |  6 ++--
 ui-ngx/src/styles.scss                        |  4 +--
 ui-ngx/yarn.lock                              | 33 +++++++++++--------
 8 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/ui-ngx/angular.json b/ui-ngx/angular.json
index 007af200ba..08ffdd7b9a 100644
--- a/ui-ngx/angular.json
+++ b/ui-ngx/angular.json
@@ -74,8 +74,8 @@
               },
               {
                 "glob": "**/*",
-                "input": "node_modules/tinymce",
-                "output": "/assets/tinymce/"
+                "input": "node_modules/hugerte",
+                "output": "/assets/hugerte/"
               },
               {
                 "glob": "marker-icon-2x.png",
diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index 1a0eb050ab..a4ae6d7a6a 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -37,8 +37,8 @@
     "@ngx-translate/core": "^17.0.0",
     "@svgdotjs/svg.filter.js": "^3.0.9",
     "@svgdotjs/svg.js": "3.2.4",
+    "@hugerte/hugerte-angular": "^1.1.1",
     "@svgdotjs/svg.panzoom.js": "^2.1.2",
-    "@tinymce/tinymce-angular": "^8.0.1",
     "ace-builds": "1.43.6",
     "ace-diff": "^3.3.0",
     "angular-gridster2": "~20.2.4",
@@ -51,6 +51,7 @@
     "flot.curvedlines": "https://github.com/MichaelZinsmaier/CurvedLines.git#master",
     "font-awesome": "^4.7.0",
     "html2canvas": "^1.4.1",
+    "hugerte": "^1.0.12",
     "jquery": "^3.7.1",
     "jquery.terminal": "^2.45.2",
     "js-beautify": "1.15.4",
@@ -87,7 +88,6 @@
     "split.js": "^1.6.5",
     "systemjs": "6.15.1",
     "tinycolor2": "^1.6.0",
-    "tinymce": "~6.8.6",
     "tooltipster": "^4.2.8",
     "tslib": "^2.8.1",
     "typeface-roboto": "^1.1.13",
@@ -138,7 +138,6 @@
   },
   "resolutions": {
     "ace-builds": "1.43.6",
-    "tinymce": "6.8.6",
     "@babel/core": "7.28.3",
     "esbuild": "0.28.1",
     "vite": "7.3.5",
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
index dbc1a5d9c8..5232162ec3 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
@@ -17,7 +17,7 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
 import { FormBuilder, FormControl } from '@angular/forms';
 import { TbPopoverComponent } from '@shared/components/popover.component';
-import { EditorOptions } from 'tinymce';
+import { EditorOptions } from 'hugerte';
 
 @Component({
     selector: 'tb-release-notes-panel',
@@ -46,7 +46,7 @@ export class EditorPanelComponent implements OnInit {
   editorControl: FormControl<string>;
 
   tinyMceOptions: Partial<EditorOptions> = {
-    base_url: '/assets/tinymce',
+    base_url: '/assets/hugerte',
     suffix: '.min',
     plugins: ['link', 'table', 'image', 'lists', 'fullscreen'],
     menubar: 'edit insert view format',
@@ -56,11 +56,10 @@ export class EditorPanelComponent implements OnInit {
     height: 400,
     autofocus: false,
     branding: false,
-    promotion: false,
     resize: false,
     setup: (editor) => {
       editor.on('PostRender', function() {
-        const container = document.querySelector('.tox.tox-tinymce-aux');
+        const container = document.querySelector('.tox.tox-hugerte-aux');
         const styleSheet = document.createElement('style');
         styleSheet.innerText = `
           .tox-tiered-menu .tox-menu {
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
index eec70df210..7ab522b651 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
@@ -79,7 +79,7 @@ export class SentNotificationDialogComponent extends
   showRefresh = false;
 
   tinyMceOptions: Record<string, any> = {
-    base_url: '/assets/tinymce',
+    base_url: '/assets/hugerte',
     suffix: '.min',
     plugins: ['autoresize'],
     menubar: false,
@@ -90,11 +90,10 @@ export class SentNotificationDialogComponent extends
     height: 400,
     autofocus: false,
     branding: false,
-    promotion: false,
     setup: (ed) => {
       ed.on('PreInit', () => {
         const document = $(ed.iframeElement.contentDocument);
-        const body = $('#tinymce', document);
+        const body = $('#hugerte', document);
         body.attr({contenteditable: false});
         body.css('pointerEvents', 'none');
         body.css('userSelect', 'none');
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
index 4a4f11d40b..971d36d0c3 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
@@ -37,7 +37,7 @@ import { Subject } from 'rxjs';
 import { deepClone, isDefinedAndNotNull } from '@core/utils';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { TranslateService } from '@ngx-translate/core';
-import { EditorOptions } from 'tinymce';
+import { EditorOptions } from 'hugerte';
 
 @Component({
     selector: 'tb-template-configuration',
@@ -84,7 +84,7 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
   readonly NotificationTemplateTypeTranslateMap = NotificationTemplateTypeTranslateMap;
 
   tinyMceOptions: Partial<EditorOptions> = {
-    base_url: '/assets/tinymce',
+    base_url: '/assets/hugerte',
     suffix: '.min',
     plugins: ['link', 'table', 'image', 'lists', 'code', 'fullscreen'],
     menubar: 'edit insert tools view format table',
@@ -95,10 +95,9 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
     height: 400,
     autofocus: false,
     branding: false,
-    promotion: false,
     setup: (editor) => {
       editor.on('PostRender', function() {
-        const container = document.querySelector('.tox.tox-tinymce-aux');
+        const container = document.querySelector('.tox.tox-hugerte-aux');
         const styleSheet = document.createElement('style');
         styleSheet.innerText = `
           .tox-tiered-menu .tox-menu {
diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts
index d5073332d2..5fcf5ace8a 100644
--- a/ui-ngx/src/app/shared/shared.module.ts
+++ b/ui-ngx/src/app/shared/shared.module.ts
@@ -64,7 +64,7 @@ import { ShareButtonDirective } from 'ngx-sharebuttons';
 import { HotkeyModule } from 'angular2-hotkeys';
 import { ColorPickerModule } from '@iplab/ngx-color-picker';
 import { NgxHmCarouselComponent, NgxHmCarouselDynamicDirective, NgxHmCarouselItemDirective } from 'ngx-hm-carousel';
-import { EditorModule, TINYMCE_SCRIPT_SRC } from '@tinymce/tinymce-angular';
+import { EditorModule, HUGERTE_SCRIPT_SRC } from '@hugerte/hugerte-angular';
 import { UserMenuComponent } from '@shared/components/user-menu.component';
 import { TruncateWithTooltipDirective } from '@shared/directives/truncate-with-tooltip.directive';
 import { ContextMenuDirective } from '@shared/directives/context-menu.directive';
@@ -258,8 +258,8 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
       useValue: Flow
     },
     {
-      provide: TINYMCE_SCRIPT_SRC,
-      useValue: 'assets/tinymce/tinymce.min.js'
+      provide: HUGERTE_SCRIPT_SRC,
+      useValue: 'assets/hugerte/hugerte.min.js'
     },
     {
       provide: MAT_DATE_LOCALE,
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index 00e051c497..79a54bbebe 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -1227,9 +1227,9 @@ pre.tb-highlight {
     white-space: pre-line;
   }
 
-  // TinyMCE
+  // HugeRTE
 
-  .tox-tinymce {
+  .tox-hugerte {
     button:not(.mat-mdc-menu-item):not(.mat-sort-header-button) {
       text-transform: none;
     }
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 2f755ff7e5..c7bd75c298 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -1614,6 +1614,19 @@
   resolved "https://registry.yarnpkg.com/@hono/node-server/-/node-server-1.19.11.tgz#dc419f0826dd2504e9fc86ad289d5636a0444e2f"
   integrity sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==
 
+"@hugerte/framework-integration-shared@^1.0.1":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@hugerte/framework-integration-shared/-/framework-integration-shared-1.2.0.tgz#75f04e4249bbb2c314d1f7a962b9c2f5fed7db80"
+  integrity sha512-ogcvVO0dFcb/HQAY7itj8xnmeMcHZmtMaOj9uC34ZYopnvj12TGWnfRQwbt8jZMlmoZk2z1TTLmJgvQBuH013A==
+
+"@hugerte/hugerte-angular@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@hugerte/hugerte-angular/-/hugerte-angular-1.1.1.tgz#08b2c963d66d7a754e8cd4884b9111ca166781e7"
+  integrity sha512-ubh6ZG3+dU6g3BkS2ZHx0FO46nti6N2CpN2gG/URFtF+pau/V59N94E7w7+8VeoPjqsFRpjB6zefRGNUoTJLOA==
+  dependencies:
+    "@hugerte/framework-integration-shared" "^1.0.1"
+    tslib "^2.3.0"
+
 "@humanfs/core@^0.19.1":
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
@@ -2824,14 +2837,6 @@
   dependencies:
     "@svgdotjs/svg.js" "^3.0.16"
 
-"@tinymce/tinymce-angular@^8.0.1":
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/@tinymce/tinymce-angular/-/tinymce-angular-8.0.1.tgz#a17b4a5bef87d563e63dc442ffeb4b82d2137da3"
-  integrity sha512-m0/ne5nL00YeZ7wCyhBVwKUbvS8fQZ+S+T5pinqTIqTUKpcfIC2+BIKqzUpS+niiRCowFoZl5eVlI5zdFN9/0A==
-  dependencies:
-    tinymce "^7.0.0 || ^6.0.0 || ^5.5.0"
-    tslib "^2.3.0"
-
 "@tsconfig/node10@^1.0.7":
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
@@ -6689,6 +6694,11 @@ https-proxy-agent@7.0.6, https-proxy-agent@^7.0.1:
     agent-base "^7.1.2"
     debug "4"
 
+hugerte@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/hugerte/-/hugerte-1.0.12.tgz#84337116bd7e76c39e851a51d5dc0214af9882b8"
+  integrity sha512-/JDCdJy1C83a7+RjlfWx6EjRvxqmmHFA5Pzcq8Y0ngdBESiC+2xa4ogsqnRPeadF04Cs95YfTd1SKquDdksjRw==
+
 hyperdyperid@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
@@ -8059,7 +8069,7 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nanoid@^3.3.11, nanoid@^3.3.16:
+nanoid@^3.3.16:
   version "3.3.18"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.18.tgz#f66a2de1199ffde0fcf21c8a5f13106b1c081913"
   integrity sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==
@@ -10199,11 +10209,6 @@ tinyglobby@^0.2.11, tinyglobby@^0.2.12, tinyglobby@^0.2.15:
     fdir "^6.5.0"
     picomatch "^4.0.3"
 
-tinymce@6.8.6, "tinymce@^7.0.0 || ^6.0.0 || ^5.5.0", tinymce@~6.8.6:
-  version "6.8.6"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.8.6.tgz#799e4f03eeb4399399dfdeb12ba17b3b91887adf"
-  integrity sha512-++XYEs8lKWvZxDCjrr8Baiw7KiikraZ5JkLMg6EdnUVNKJui0IsrAADj5MsyUeFkcEryfn2jd3p09H7REvewyg==
-
 tinyqueue@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08"

From e32ae5cbbf399fbf08165deb778d6c3c64f19a05 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 16:01:40 +0200
Subject: [PATCH 87/91] Updated Angular version to minimize resolutions

---
 ui-ngx/package.json                           |  39 +-
 ....27.patch => @angular+build+20.3.34.patch} |   0
 ...3.27.patch => @angular+core+20.3.28.patch} |   4 +-
 ui-ngx/yarn.lock                              | 872 +++++++++++-------
 4 files changed, 531 insertions(+), 384 deletions(-)
 rename ui-ngx/patches/{@angular+build+20.3.27.patch => @angular+build+20.3.34.patch} (100%)
 rename ui-ngx/patches/{@angular+core+20.3.27.patch => @angular+core+20.3.28.patch} (92%)

diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index a4ae6d7a6a..a37dc39be2 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -13,16 +13,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "20.3.27",
+    "@angular/animations": "20.3.28",
     "@angular/cdk": "20.2.14",
-    "@angular/common": "20.3.27",
-    "@angular/compiler": "20.3.27",
-    "@angular/core": "20.3.27",
-    "@angular/forms": "20.3.27",
+    "@angular/common": "20.3.28",
+    "@angular/compiler": "20.3.28",
+    "@angular/core": "20.3.28",
+    "@angular/forms": "20.3.28",
     "@angular/material": "20.2.14",
-    "@angular/platform-browser": "20.3.27",
-    "@angular/platform-browser-dynamic": "20.3.27",
-    "@angular/router": "20.3.27",
+    "@angular/platform-browser": "20.3.28",
+    "@angular/platform-browser-dynamic": "20.3.28",
+    "@angular/router": "20.3.28",
     "@auth0/angular-jwt": "^5.2.0",
     "@flowjs/flow.js": "^2.14.1",
     "@flowjs/ngx-flow": "20.0.2",
@@ -95,13 +95,13 @@
   },
   "devDependencies": {
     "@angular-builders/custom-esbuild": "20.0.0",
-    "@angular-devkit/build-angular": "20.3.27",
-    "@angular-devkit/core": "20.3.27",
-    "@angular-devkit/schematics": "20.3.27",
-    "@angular/build": "20.3.27",
-    "@angular/cli": "20.3.27",
-    "@angular/compiler-cli": "20.3.27",
-    "@angular/language-service": "20.3.27",
+    "@angular-devkit/build-angular": "20.3.34",
+    "@angular-devkit/core": "20.3.34",
+    "@angular-devkit/schematics": "20.3.34",
+    "@angular/build": "20.3.34",
+    "@angular/cli": "20.3.34",
+    "@angular/compiler-cli": "20.3.28",
+    "@angular/language-service": "20.3.28",
     "@types/ace-diff": "^2.1.4",
     "@types/canvas-gauges": "^2.1.8",
     "@types/flot": "^0.0.36",
@@ -137,15 +137,8 @@
     "typescript-eslint": "^8.54.0"
   },
   "resolutions": {
-    "ace-builds": "1.43.6",
-    "@babel/core": "7.28.3",
+    "@babel/core": "7.29.7",
     "esbuild": "0.28.1",
-    "vite": "7.3.5",
-    "rollup": "4.59.0",
-    "piscina": "5.2.0",
-    "postcss": "8.5.23",
-    "@angular-devkit/build-angular/http-proxy-middleware": "3.0.7",
-    "jquery.terminal/**/form-data": ">=4.0.4",
     "js-beautify/**/minimatch": "^9.0.7"
   }
 }
diff --git a/ui-ngx/patches/@angular+build+20.3.27.patch b/ui-ngx/patches/@angular+build+20.3.34.patch
similarity index 100%
rename from ui-ngx/patches/@angular+build+20.3.27.patch
rename to ui-ngx/patches/@angular+build+20.3.34.patch
diff --git a/ui-ngx/patches/@angular+core+20.3.27.patch b/ui-ngx/patches/@angular+core+20.3.28.patch
similarity index 92%
rename from ui-ngx/patches/@angular+core+20.3.27.patch
rename to ui-ngx/patches/@angular+core+20.3.28.patch
index 2879994671..cb947112bf 100644
--- a/ui-ngx/patches/@angular+core+20.3.27.patch
+++ b/ui-ngx/patches/@angular+core+20.3.28.patch
@@ -1,8 +1,8 @@
 diff --git a/node_modules/@angular/core/fesm2022/debug_node.mjs b/node_modules/@angular/core/fesm2022/debug_node.mjs
-index e570ca9..979f273 100755
+index be00d4e..8d7ed1a 100755
 --- a/node_modules/@angular/core/fesm2022/debug_node.mjs
 +++ b/node_modules/@angular/core/fesm2022/debug_node.mjs
-@@ -9596,13 +9596,13 @@ function findDirectiveDefMatches(tView, tNode) {
+@@ -9488,13 +9488,13 @@ function findDirectiveDefMatches(tView, tNode) {
              if (isNodeMatchingSelectorList(tNode, def.selectors, /* isProjectionMode */ false)) {
                  matches ??= [];
                  if (isComponentDef(def)) {
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index c7bd75c298..4f85ee0b0f 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -133,7 +133,7 @@
   resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
   integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
 
-"@ampproject/remapping@2.3.0", "@ampproject/remapping@^2.2.0":
+"@ampproject/remapping@2.3.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
   integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
@@ -160,25 +160,25 @@
     "@angular-devkit/core" "^20.0.0"
     "@angular/build" "^20.0.0"
 
-"@angular-devkit/architect@0.2003.27", "@angular-devkit/architect@>= 0.2000.0 < 0.2100.0", "@angular-devkit/architect@>=0.2000.0 < 0.2100.0":
-  version "0.2003.27"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.2003.27.tgz#a5a1367db98d66eea8271d855efa69aed4d26fee"
-  integrity sha512-rRTj/VdeLRC0tdwym/SUYTMoB7v1HWTOcKBGHjqFQ7ZMyapJT4QtaedSEMJo8QFlX9E0GFAi6wR+t6wbsOELIg==
+"@angular-devkit/architect@0.2003.34", "@angular-devkit/architect@>= 0.2000.0 < 0.2100.0", "@angular-devkit/architect@>=0.2000.0 < 0.2100.0":
+  version "0.2003.34"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.2003.34.tgz#4346108edc5084cf37a6f719b27d91ecfee7ff9a"
+  integrity sha512-JX68qGFvv8Duy5UL21IJCived83tOZBVCxNcOS2XCII0CS8Z5nCEndRre73JfDsleTNkeS3fo2P5tjqN+/S80A==
   dependencies:
-    "@angular-devkit/core" "20.3.27"
+    "@angular-devkit/core" "20.3.34"
     rxjs "7.8.2"
 
-"@angular-devkit/build-angular@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-20.3.27.tgz#8da7ebe2f5a3a59a94ffc8b47001200012df5ef4"
-  integrity sha512-Tog1mAUyNPOJtuDIf1VYVjoaSy3gQHPZ3Q9gYKEi/7kpVoTdNtE3scws6Fb5z5uBsrjqc3lupoej3HO9kY+www==
+"@angular-devkit/build-angular@20.3.34":
+  version "20.3.34"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-20.3.34.tgz#19611effcfae1e3170132560b7d4a4f2283dfe50"
+  integrity sha512-0pkzrPfFurAJdVzOi3xrsdv4Hraz/G+RrO7SXlwEGpvu/DUy/lZvsnk0kcg2/eZttoQfOLTMwnM8I6TeZx/IcQ==
   dependencies:
     "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.2003.27"
-    "@angular-devkit/build-webpack" "0.2003.27"
-    "@angular-devkit/core" "20.3.27"
-    "@angular/build" "20.3.27"
-    "@babel/core" "7.28.3"
+    "@angular-devkit/architect" "0.2003.34"
+    "@angular-devkit/build-webpack" "0.2003.34"
+    "@angular-devkit/core" "20.3.34"
+    "@angular/build" "20.3.34"
+    "@babel/core" "7.29.7"
     "@babel/generator" "7.28.3"
     "@babel/helper-annotate-as-pure" "7.27.3"
     "@babel/helper-split-export-declaration" "7.24.7"
@@ -188,16 +188,16 @@
     "@babel/preset-env" "7.28.3"
     "@babel/runtime" "7.28.3"
     "@discoveryjs/json-ext" "0.6.3"
-    "@ngtools/webpack" "20.3.27"
+    "@ngtools/webpack" "20.3.34"
     ansi-colors "4.1.3"
     autoprefixer "10.4.21"
     babel-loader "10.0.0"
     browserslist "^4.21.5"
     copy-webpack-plugin "14.0.0"
     css-loader "7.1.2"
-    esbuild-wasm "0.28.0"
+    esbuild-wasm "0.28.1"
     fast-glob "3.3.3"
-    http-proxy-middleware "3.0.5"
+    http-proxy-middleware "3.0.7"
     istanbul-lib-instrument "6.0.3"
     jsonc-parser "3.3.1"
     karma-source-map-support "1.4.0"
@@ -209,8 +209,8 @@
     open "10.2.0"
     ora "8.2.0"
     picomatch "4.0.4"
-    piscina "5.1.3"
-    postcss "8.5.12"
+    piscina "5.2.0"
+    postcss "8.5.23"
     postcss-loader "8.1.1"
     resolve-url-loader "5.0.0"
     rxjs "7.8.2"
@@ -224,24 +224,24 @@
     tslib "2.8.1"
     webpack "5.105.0"
     webpack-dev-middleware "7.4.2"
-    webpack-dev-server "5.2.2"
+    webpack-dev-server "5.2.5"
     webpack-merge "6.0.1"
     webpack-subresource-integrity "5.1.0"
   optionalDependencies:
-    esbuild "0.28.0"
+    esbuild "0.28.1"
 
-"@angular-devkit/build-webpack@0.2003.27":
-  version "0.2003.27"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.2003.27.tgz#0291841a5048bfee322aa8d78aa972e9aa00d370"
-  integrity sha512-vrvLMWMcMcgbciHKQAlJVTQCQAdM36Ql4wf5+Obk20RedNvMyhRzg+5f0+MbBdyEjJRvIT4oC6I68orHYX1hGQ==
+"@angular-devkit/build-webpack@0.2003.34":
+  version "0.2003.34"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.2003.34.tgz#148e55c7bbe7b12749bf4e7a168ccf04dcb5550c"
+  integrity sha512-IHl8e5dClTfzpqeqanBi4s5dti6i+kueIlfASl/cfyBYW7ASr+FDLbffIonpLYvb3uyucFdo22ND9+/HZZdrKQ==
   dependencies:
-    "@angular-devkit/architect" "0.2003.27"
+    "@angular-devkit/architect" "0.2003.34"
     rxjs "7.8.2"
 
-"@angular-devkit/core@20.3.27", "@angular-devkit/core@>= 20.0.0 < 21.0.0", "@angular-devkit/core@^20.0.0":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-20.3.27.tgz#a1fc6b2d634155d56d828e24b1d3f41af58be8f4"
-  integrity sha512-jBaBTT9FemIEVpjN6omSzUYv9VOSnyPilLPC83E6JxNNMO4CMVKLfGK9SaVPJHtqU6YAWNFQqcD1dP7f/m49Cw==
+"@angular-devkit/core@20.3.34", "@angular-devkit/core@>= 20.0.0 < 21.0.0", "@angular-devkit/core@^20.0.0":
+  version "20.3.34"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-20.3.34.tgz#10beedd0c5af94f3115a16f1244acf004c741b0a"
+  integrity sha512-vcDaXzF3E+gGD62gdPa0AZlEertqB3raufEjT5Y0bl9MO4t2CCanEbbIfIyPtpLp22SJOyOErx/39weeEbfmjQ==
   dependencies:
     ajv "8.18.0"
     ajv-formats "3.0.1"
@@ -250,12 +250,12 @@
     rxjs "7.8.2"
     source-map "0.7.6"
 
-"@angular-devkit/schematics@20.3.27", "@angular-devkit/schematics@>= 20.0.0 < 21.0.0":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-20.3.27.tgz#88b0c24d84047d4b81efad14c02f7a1995b91696"
-  integrity sha512-S/y04S8eQIfyAa9nYhY10lQbqP1VYkMoKxHUdQ+PWjzHXL4NRb/5+yKV3BJI0kEngEX1ooQMoGYi+AqSIPT7wA==
+"@angular-devkit/schematics@20.3.34", "@angular-devkit/schematics@>= 20.0.0 < 21.0.0":
+  version "20.3.34"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-20.3.34.tgz#2628c1319f56f3506ce8c60da0594d2dbe5c78e1"
+  integrity sha512-JW+RmDOeCGrzcdiTthw/ZlYMmsI3n2akWAdOUeczMdnbWfygMcbft3r8D+k1uefuxfAhJ4PgTtvECKhDqLN67g==
   dependencies:
-    "@angular-devkit/core" "20.3.27"
+    "@angular-devkit/core" "20.3.34"
     jsonc-parser "3.3.1"
     magic-string "0.30.17"
     ora "8.2.0"
@@ -321,28 +321,28 @@
   dependencies:
     "@angular-eslint/bundled-angular-compiler" "20.7.0"
 
-"@angular/animations@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-20.3.27.tgz#21aefe74ea36df86f0af20458a9f97d09635cd6a"
-  integrity sha512-BgGTloDiD3qIFVSxZq8xO6CiyhKn00WbhQQiklZF8WI2hXd3Hmc1OUAAHqSMh2c9uL7X1ZYkg9lSzjiasK2vKg==
+"@angular/animations@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-20.3.28.tgz#d0a75dcb0ad859ba4be9cdabb5a18706e196c39f"
+  integrity sha512-cd0zEamoqHT94JG/ejUCkZLRxty9sD3nD9yWrwdymCBI5l6Fdfk5tp5QdhU8qjKy9FAMFxnCTjz3stPByrDgBQ==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/build@20.3.27", "@angular/build@^20.0.0":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/build/-/build-20.3.27.tgz#543c837b0e5821f61994bee75c8bec04340437aa"
-  integrity sha512-RzCMCCkGd6jEGW/iz68VylS7rl3PM1TgbNKBGXe+ImiccPYEDJCO073X6qCle1pYqi6HiPx+plu2YWYQOyH29Q==
+"@angular/build@20.3.34", "@angular/build@^20.0.0":
+  version "20.3.34"
+  resolved "https://registry.yarnpkg.com/@angular/build/-/build-20.3.34.tgz#1cd20f8b87faf033e563d1ca0b216d950e474a0a"
+  integrity sha512-uV7zgmvbLwaT/blpYqVVWkrJnHBGSjkuB+ADCruIou7j+/kmo9k/dXCnXVAlP22nR/gdKi24NBahDBNXxrBpzg==
   dependencies:
     "@ampproject/remapping" "2.3.0"
-    "@angular-devkit/architect" "0.2003.27"
-    "@babel/core" "7.28.3"
+    "@angular-devkit/architect" "0.2003.34"
+    "@babel/core" "7.29.7"
     "@babel/helper-annotate-as-pure" "7.27.3"
     "@babel/helper-split-export-declaration" "7.24.7"
     "@inquirer/confirm" "5.1.14"
     "@vitejs/plugin-basic-ssl" "2.1.0"
     beasties "0.3.5"
     browserslist "^4.23.0"
-    esbuild "0.28.0"
+    esbuild "0.28.1"
     https-proxy-agent "7.0.6"
     istanbul-lib-instrument "6.0.3"
     jsonc-parser "3.3.1"
@@ -351,13 +351,13 @@
     mrmime "2.0.1"
     parse5-html-rewriting-stream "8.0.0"
     picomatch "4.0.4"
-    piscina "5.1.3"
+    piscina "5.2.0"
     rollup "4.59.0"
     sass "1.90.0"
     semver "7.7.2"
     source-map-support "0.5.21"
     tinyglobby "0.2.14"
-    vite "7.3.2"
+    vite "7.3.6"
     watchpack "2.4.4"
   optionalDependencies:
     lmdb "3.4.2"
@@ -370,41 +370,41 @@
     parse5 "^8.0.0"
     tslib "^2.3.0"
 
-"@angular/cli@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-20.3.27.tgz#cf1a00942588ab0a673aecd04f689737979cc226"
-  integrity sha512-FSZNnSCXm3bpUkVdOGZ//p9vjETtW7fLeg8dNIIFr/KObFZJ1bTv6ILiF6I/TujjfThUiKYEr7hb2C4zACXasg==
+"@angular/cli@20.3.34":
+  version "20.3.34"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-20.3.34.tgz#0b9f674b1a316c7c07ea2fd97453e0ca9998b4f0"
+  integrity sha512-Q/6dR2TmVTt9GT4tczREqg3DOlqkkMWI+5AVXgM1EcJRbt91XVlbooXw1GKr6gefxCtbdIi1fXjY4Yled/r23A==
   dependencies:
-    "@angular-devkit/architect" "0.2003.27"
-    "@angular-devkit/core" "20.3.27"
-    "@angular-devkit/schematics" "20.3.27"
+    "@angular-devkit/architect" "0.2003.34"
+    "@angular-devkit/core" "20.3.34"
+    "@angular-devkit/schematics" "20.3.34"
     "@inquirer/prompts" "7.8.2"
     "@listr2/prompt-adapter-inquirer" "3.0.1"
-    "@modelcontextprotocol/sdk" "1.26.0"
-    "@schematics/angular" "20.3.27"
+    "@modelcontextprotocol/sdk" "1.30.0"
+    "@schematics/angular" "20.3.34"
     "@yarnpkg/lockfile" "1.1.0"
     algoliasearch "5.35.0"
     ini "5.0.0"
     jsonc-parser "3.3.1"
     listr2 "9.0.1"
     npm-package-arg "13.0.0"
-    pacote "21.0.4"
+    pacote "21.5.1"
     resolve "1.22.10"
     semver "7.7.2"
     yargs "18.0.0"
     zod "4.1.13"
 
-"@angular/common@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-20.3.27.tgz#52405b538e1e662b4b93a4176d6ff86fbb81f7e7"
-  integrity sha512-4ectYP60XatB9zZ40WlfmaTzjmEhaz8SSqLsbZI4VZ8gDb5qNmxWtwwt8UxS3NmDHEgqdNL8UPO4E94+yKCICg==
+"@angular/common@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-20.3.28.tgz#c3b639fe112b62498913cdca8b82330d469df8ef"
+  integrity sha512-vvMrBI0POHYeUE8EnN4ohYOqLkmZXI6oKJnMvarfukySnw7mZ4VuY4DNAnRSbEZEqO55sOmVCQ7jbxDDt34tZw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/compiler-cli@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-20.3.27.tgz#8ad38bfbd64bf7b2382946a0ffd550c0c031f511"
-  integrity sha512-R0j9mFfUdGmmw867V/TfMSOBkLZT6ASxyY5tc1NDNmxQioZDVIDP9pqBOayzhJ0xiuDc9JellQXUTZ+vm+b/Zg==
+"@angular/compiler-cli@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-20.3.28.tgz#07af1834005bfe4630500761e3f16840305f3807"
+  integrity sha512-HZH4HH02mMOlZuXOXnnnHWK39bsPjbKRK6XJhLTu7T/0/iUFOiH0NTkkWrpjKXwn5eSDYhmJGCmWcJyW/LUaLQ==
   dependencies:
     "@babel/core" "7.29.7"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -415,31 +415,31 @@
     tslib "^2.3.0"
     yargs "^18.0.0"
 
-"@angular/compiler@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-20.3.27.tgz#052a968f3830b9279d299b7ee0d1f248bdf0dc23"
-  integrity sha512-in3THZ678GAYuOR9RZV18+zZz0KGhlGikyUEfLeALLjGf9ZaR3n+t19BmYx6G2VkF/Xqadne1omQ2vbl6PRASA==
+"@angular/compiler@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-20.3.28.tgz#d5f6c12a7686fcd4ddb197771b19749eef1c7d79"
+  integrity sha512-3iSkIWJEVrdG4Zv0vQs0ieO185aJfb5Vn3whi/D7QEDUNEsHGZSxRDxT1hyDGIaj52FN6+Qo5SFSSsDf+vgUAA==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-20.3.27.tgz#97ce97a90c3e06564df7d7d8abbb2eeac3afdb07"
-  integrity sha512-8EfYIUST5CKldOF4MAYWTFFRB7EtwqUoQBZdar6US39/EEzWm/wm/iRNkH2jmKe4YuPa2GoeHS1WQ8VRuOk7Dg==
+"@angular/core@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-20.3.28.tgz#ece2fdf6bf0af1b4d76e768eacb3d0bf90cb419c"
+  integrity sha512-R28TMoEr+mBUswemFWZdHAuK2WDSs+6eYFBg6XrBmlMlmG4YkWeNFxRbJNYDkF8RH+fpguS+iUH63yLpts22dA==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-20.3.27.tgz#57d9eac1864454967f112a8b65a542a7d3e72dd9"
-  integrity sha512-cNG26wi3tr3m8At6puxJpAMVk9mBhEqREA4Jk/klalMwWuYEf8ApTEAw0a5NUfMxDkL3dcJJwDRf8rK6ma6TYQ==
+"@angular/forms@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-20.3.28.tgz#45246be5023ba1bb5ffbe79338d863c948b41527"
+  integrity sha512-at81TpBs/NxvOyR5IhtUClG+2WVMLVDieFRz+rAH+ok9dtRrDHoKPQOgMAEw9q5N4yO4CZKhfAPq+5P/gnnjsw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/language-service@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-20.3.27.tgz#0545aace3940741ca4c1c16684a19b3a93732580"
-  integrity sha512-utRPmVoEjiy0cBCtBZLo2Cyc/a/DeKdARpemRlrQjmrAs4wNJ3s2m8kEDbSR8o7DAX8na26aSk0qGikEaj0Q+A==
+"@angular/language-service@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-20.3.28.tgz#0f5768108615ef06251e9f4316ae66d4cc5c9515"
+  integrity sha512-7jx5mXLCmOC6Tub8+r+3GYBFF5IcntsBu7F2oTV9Pg6FuZnbMd2ooBRk9dtn1btX0sK/vqTiUsjjTyQ5vXRJVA==
 
 "@angular/material@20.2.14":
   version "20.2.14"
@@ -448,24 +448,24 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser-dynamic@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.27.tgz#6a5863b79df3ae5cf9d5070720aed73834de553a"
-  integrity sha512-4UUs8vOswgBOWCRoeZrswguarBLrM3j6WGb927Y3GXdN37fVJQYjyKHivNeQwZvwsGgl5Nl6mvpBpZv47n/OrQ==
+"@angular/platform-browser-dynamic@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-20.3.28.tgz#139b0fc545e5c6ddde31b1e6f678e2402de3bb10"
+  integrity sha512-wy3694EfbGyDsnppaoNy4X/JGH3auDFMB4c+B7GZzVAtCO3eNanoNctAKKkkmN0FMAdzGHHEPhIIyJj702S+rw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-20.3.27.tgz#4f98b2941aa1be881c0c6c8da5b7bbb577f7ae73"
-  integrity sha512-IV2zQ4zk6liyw5NE48bQqSk3nOAZ1rmDAQi7W4Kw0N8cs9MYVgK3zulo0zx5UqSv1kuNDAGb0HPR5tUGVOf9kw==
+"@angular/platform-browser@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-20.3.28.tgz#785008d8d0293176c9938a63ee45f700626fefc2"
+  integrity sha512-TER/xSXlDsqlbM4Eufkjzm7HvB88K6pbudl7Xs6H3huTkg9Lw4zuFIpnk+fpLOGcc7/rpFIb00k/LhzkwuQiIw==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/router@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-20.3.27.tgz#5635e1dadd0d6ad02a262598c13cabeae197ed30"
-  integrity sha512-F3hfJQ0GAuD6LdeB7A6fMfaErc4HXCtCQGh3C/8VrbVEbGfIgSveNjQXzGYPNklnOLhj1BmWf5w0WniUAEjLBA==
+"@angular/router@20.3.28":
+  version "20.3.28"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-20.3.28.tgz#5ab760f5e37db5bdbb98ab157f6c41d935eae2f1"
+  integrity sha512-W4sNTrYT2oavpJ/MgUYpnCkhJ0vBS3KXZVRNruURUI/wLirF+AoXvMSlke9SlytrdvPAx8Www+nq0dyY2Ln96Q==
   dependencies:
     tslib "^2.3.0"
 
@@ -484,35 +484,35 @@
   dependencies:
     tslib "^2.0.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.27.1", "@babel/code-frame@^7.28.6", "@babel/code-frame@^7.29.0":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.0.tgz#7cd7a59f15b3cc0dcd803038f7792712a7d0b15c"
-  integrity sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.28.6", "@babel/code-frame@^7.29.0", "@babel/code-frame@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.7.tgz#f2fbbfea87c44a21590ec515b778b2c26d8866e7"
+  integrity sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.28.5"
+    "@babel/helper-validator-identifier" "^7.29.7"
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
-"@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.0", "@babel/compat-data@^7.28.6":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.0.tgz#00d03e8c0ac24dd9be942c5370990cbe1f17d88d"
-  integrity sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==
-
-"@babel/core@7.28.3", "@babel/core@7.29.7", "@babel/core@^7.23.9":
-  version "7.28.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.3.tgz#aceddde69c5d1def69b839d09efa3e3ff59c97cb"
-  integrity sha512-yDBHV9kQNcr2/sUr9jghVyz9C3Y5G2zUM2H2lo+9mKv4sFgbA8s8Z9t8D1jiTkGoO/NoIfKMyKWr4s6CN23ZwQ==
-  dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.3"
-    "@babel/helper-compilation-targets" "^7.27.2"
-    "@babel/helper-module-transforms" "^7.28.3"
-    "@babel/helpers" "^7.28.3"
-    "@babel/parser" "^7.28.3"
-    "@babel/template" "^7.27.2"
-    "@babel/traverse" "^7.28.3"
-    "@babel/types" "^7.28.2"
+"@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.0", "@babel/compat-data@^7.28.6", "@babel/compat-data@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.7.tgz#6f0237f0f36d2e51c0570a636faed9d2d0efe629"
+  integrity sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==
+
+"@babel/core@7.29.7", "@babel/core@^7.23.9":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.29.7.tgz#80c10b17248082968b57a857b91640971f2070f7"
+  integrity sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==
+  dependencies:
+    "@babel/code-frame" "^7.29.7"
+    "@babel/generator" "^7.29.7"
+    "@babel/helper-compilation-targets" "^7.29.7"
+    "@babel/helper-module-transforms" "^7.29.7"
+    "@babel/helpers" "^7.29.7"
+    "@babel/parser" "^7.29.7"
+    "@babel/template" "^7.29.7"
+    "@babel/traverse" "^7.29.7"
+    "@babel/types" "^7.29.7"
+    "@jridgewell/remapping" "^2.3.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -530,13 +530,13 @@
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
 
-"@babel/generator@^7.28.3", "@babel/generator@^7.29.0":
-  version "7.29.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.1.tgz#d09876290111abbb00ef962a7b83a5307fba0d50"
-  integrity sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==
+"@babel/generator@^7.29.0", "@babel/generator@^7.29.7", "@babel/generator@^7.29.8":
+  version "7.29.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.8.tgz#4b0b887885422643339e09022148a4c4ebaa4979"
+  integrity sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==
   dependencies:
-    "@babel/parser" "^7.29.0"
-    "@babel/types" "^7.29.0"
+    "@babel/parser" "^7.29.8"
+    "@babel/types" "^7.29.8"
     "@jridgewell/gen-mapping" "^0.3.12"
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
@@ -548,13 +548,13 @@
   dependencies:
     "@babel/types" "^7.27.3"
 
-"@babel/helper-compilation-targets@^7.27.1", "@babel/helper-compilation-targets@^7.27.2", "@babel/helper-compilation-targets@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz#32c4a3f41f12ed1532179b108a4d746e105c2b25"
-  integrity sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==
+"@babel/helper-compilation-targets@^7.27.1", "@babel/helper-compilation-targets@^7.27.2", "@babel/helper-compilation-targets@^7.28.6", "@babel/helper-compilation-targets@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz#7a1def704302401c47f64fa85589e974ae217042"
+  integrity sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==
   dependencies:
-    "@babel/compat-data" "^7.28.6"
-    "@babel/helper-validator-option" "^7.27.1"
+    "@babel/compat-data" "^7.29.7"
+    "@babel/helper-validator-option" "^7.29.7"
     browserslist "^4.24.0"
     lru-cache "^5.1.1"
     semver "^6.3.1"
@@ -592,10 +592,10 @@
     lodash.debounce "^4.0.8"
     resolve "^1.22.10"
 
-"@babel/helper-globals@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
-  integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
+"@babel/helper-globals@^7.28.0", "@babel/helper-globals@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.29.7.tgz#f04a96fbd8473241b1079243f5b3f03a3010ab7b"
+  integrity sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==
 
 "@babel/helper-member-expression-to-functions@^7.28.5":
   version "7.28.5"
@@ -605,22 +605,22 @@
     "@babel/traverse" "^7.28.5"
     "@babel/types" "^7.28.5"
 
-"@babel/helper-module-imports@^7.27.1", "@babel/helper-module-imports@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz#60632cbd6ffb70b22823187201116762a03e2d5c"
-  integrity sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==
+"@babel/helper-module-imports@^7.27.1", "@babel/helper-module-imports@^7.28.6", "@babel/helper-module-imports@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz#ef25048a518e828d7393fac5882ddd73921d7396"
+  integrity sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==
   dependencies:
-    "@babel/traverse" "^7.28.6"
-    "@babel/types" "^7.28.6"
+    "@babel/traverse" "^7.29.7"
+    "@babel/types" "^7.29.7"
 
-"@babel/helper-module-transforms@^7.27.1", "@babel/helper-module-transforms@^7.28.3", "@babel/helper-module-transforms@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz#9312d9d9e56edc35aeb6e95c25d4106b50b9eb1e"
-  integrity sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==
+"@babel/helper-module-transforms@^7.27.1", "@babel/helper-module-transforms@^7.28.6", "@babel/helper-module-transforms@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz#b062747a5997ba138637201328bbff77960574ae"
+  integrity sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==
   dependencies:
-    "@babel/helper-module-imports" "^7.28.6"
-    "@babel/helper-validator-identifier" "^7.28.5"
-    "@babel/traverse" "^7.28.6"
+    "@babel/helper-module-imports" "^7.29.7"
+    "@babel/helper-validator-identifier" "^7.29.7"
+    "@babel/traverse" "^7.29.7"
 
 "@babel/helper-optimise-call-expression@^7.27.1":
   version "7.27.1"
@@ -667,20 +667,20 @@
   dependencies:
     "@babel/types" "^7.24.7"
 
-"@babel/helper-string-parser@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
-  integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
+"@babel/helper-string-parser@^7.27.1", "@babel/helper-string-parser@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz#7f0871d99824d23137d60f86fcf6130fd5a1b51f"
+  integrity sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==
 
-"@babel/helper-validator-identifier@^7.28.5":
-  version "7.28.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
-  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
+"@babel/helper-validator-identifier@^7.28.5", "@babel/helper-validator-identifier@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz#bd87084ced0c796ec46bda492de6e83d29e89fc2"
+  integrity sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==
 
-"@babel/helper-validator-option@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz#fa52f5b1e7db1ab049445b421c4471303897702f"
-  integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
+"@babel/helper-validator-option@^7.27.1", "@babel/helper-validator-option@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz#cf315be940213b354eb4abcc0bd01ebe3f73bc2a"
+  integrity sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==
 
 "@babel/helper-wrap-function@^7.27.1":
   version "7.28.6"
@@ -691,20 +691,20 @@
     "@babel/traverse" "^7.28.6"
     "@babel/types" "^7.28.6"
 
-"@babel/helpers@^7.28.3":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.6.tgz#fca903a313ae675617936e8998b814c415cbf5d7"
-  integrity sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==
+"@babel/helpers@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.29.7.tgz#45abfde7548997e34376c3e69feb475cffb4a607"
+  integrity sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==
   dependencies:
-    "@babel/template" "^7.28.6"
-    "@babel/types" "^7.28.6"
+    "@babel/template" "^7.29.7"
+    "@babel/types" "^7.29.7"
 
-"@babel/parser@^7.23.9", "@babel/parser@^7.28.3", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.0.tgz#669ef345add7d057e92b7ed15f0bac07611831b6"
-  integrity sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==
+"@babel/parser@^7.23.9", "@babel/parser@^7.28.3", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0", "@babel/parser@^7.29.7", "@babel/parser@^7.29.8":
+  version "7.29.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.8.tgz#9653716a2f10c677b98fbc63d4bfb000c302cf17"
+  integrity sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==
   dependencies:
-    "@babel/types" "^7.29.0"
+    "@babel/types" "^7.29.8"
 
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.27.1":
   version "7.28.5"
@@ -1289,35 +1289,35 @@
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.3.tgz#75c5034b55ba868121668be5d5bb31cc64e6e61a"
   integrity sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==
 
-"@babel/template@^7.27.2", "@babel/template@^7.28.6":
-  version "7.28.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.28.6.tgz#0e7e56ecedb78aeef66ce7972b082fce76a23e57"
-  integrity sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==
-  dependencies:
-    "@babel/code-frame" "^7.28.6"
-    "@babel/parser" "^7.28.6"
-    "@babel/types" "^7.28.6"
-
-"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.5", "@babel/traverse@^7.28.6", "@babel/traverse@^7.29.0":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.0.tgz#f323d05001440253eead3c9c858adbe00b90310a"
-  integrity sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==
-  dependencies:
-    "@babel/code-frame" "^7.29.0"
-    "@babel/generator" "^7.29.0"
-    "@babel/helper-globals" "^7.28.0"
-    "@babel/parser" "^7.29.0"
-    "@babel/template" "^7.28.6"
-    "@babel/types" "^7.29.0"
+"@babel/template@^7.28.6", "@babel/template@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.29.7.tgz#4d9d4004f645cdd304de958c725162784ecac700"
+  integrity sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==
+  dependencies:
+    "@babel/code-frame" "^7.29.7"
+    "@babel/parser" "^7.29.7"
+    "@babel/types" "^7.29.7"
+
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.5", "@babel/traverse@^7.28.6", "@babel/traverse@^7.29.0", "@babel/traverse@^7.29.7":
+  version "7.29.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.8.tgz#4111014cdc71a0f95d9471907590baa0b8a6b28a"
+  integrity sha512-I5z7H3bf/41ktsNVLtpN0wAa336HkqIHQ5BuPLEhTkt1jVSyZpeNKIzTgEWmlxjdg81R0IgUCcaE+Ok3NvrfZg==
+  dependencies:
+    "@babel/code-frame" "^7.29.7"
+    "@babel/generator" "^7.29.8"
+    "@babel/helper-globals" "^7.29.7"
+    "@babel/parser" "^7.29.8"
+    "@babel/template" "^7.29.7"
+    "@babel/types" "^7.29.8"
     debug "^4.3.1"
 
-"@babel/types@^7.24.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.5", "@babel/types@^7.28.6", "@babel/types@^7.29.0", "@babel/types@^7.4.4":
-  version "7.29.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.0.tgz#9f5b1e838c446e72cf3cd4b918152b8c605e37c7"
-  integrity sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==
+"@babel/types@^7.24.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.5", "@babel/types@^7.28.6", "@babel/types@^7.29.0", "@babel/types@^7.29.7", "@babel/types@^7.29.8", "@babel/types@^7.4.4":
+  version "7.29.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.8.tgz#1229eef31d85156d70fa3f4cd859376d0eaf6863"
+  integrity sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==
   dependencies:
-    "@babel/helper-string-parser" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.28.5"
+    "@babel/helper-string-parser" "^7.29.7"
+    "@babel/helper-validator-identifier" "^7.29.7"
 
 "@braintree/sanitize-url@^7.1.1":
   version "7.1.2"
@@ -1609,10 +1609,10 @@
     lodash "4.18.1"
     polyclip-ts "^0.16.8"
 
-"@hono/node-server@^1.19.9":
-  version "1.19.11"
-  resolved "https://registry.yarnpkg.com/@hono/node-server/-/node-server-1.19.11.tgz#dc419f0826dd2504e9fc86ad289d5636a0444e2f"
-  integrity sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==
+"@hono/node-server@^1.19.9 || ^2.0.5":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@hono/node-server/-/node-server-2.1.1.tgz#9cfa8649e9ecbcd48edf505b103002402ea51e70"
+  integrity sha512-ELuehkj5VCBdgEw9zs+ivkKwyzzUCSQuE96YmiPvn1ECBoZCczbFXJLeEGMTYjphP6gydh4pHMqEYPVMYUVgQg==
 
 "@hugerte/framework-integration-shared@^1.0.1":
   version "1.2.0"
@@ -1866,6 +1866,14 @@
     "@jridgewell/sourcemap-codec" "^1.5.0"
     "@jridgewell/trace-mapping" "^0.3.24"
 
+"@jridgewell/remapping@^2.3.5":
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1"
+  integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
@@ -2215,12 +2223,12 @@
   dependencies:
     make-plural "^7.0.0"
 
-"@modelcontextprotocol/sdk@1.26.0":
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/@modelcontextprotocol/sdk/-/sdk-1.26.0.tgz#5b35d73062125f126cc70b0be83cbab53bcdde74"
-  integrity sha512-Y5RmPncpiDtTXDbLKswIJzTqu2hyBKxTNsgKqKclDbhIgg1wgtf1fRuvxgTnRfcnxtvvgbIEcqUOzZrJ6iSReg==
+"@modelcontextprotocol/sdk@1.30.0":
+  version "1.30.0"
+  resolved "https://registry.yarnpkg.com/@modelcontextprotocol/sdk/-/sdk-1.30.0.tgz#dfa8a48347ec2d2c0d47917d7dc57f754e37f5ff"
+  integrity sha512-xKd8OIzlqNzcqcNumGAa6g+PW2kjD5vrpcKOnfldAUPP3j7lnqMPwlTXQm8gF+UwH72z0lqaRbjr9hqGz0eITA==
   dependencies:
-    "@hono/node-server" "^1.19.9"
+    "@hono/node-server" "^1.19.9 || ^2.0.5"
     ajv "^8.17.1"
     ajv-formats "^3.0.1"
     content-type "^1.0.5"
@@ -2404,10 +2412,10 @@
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-20.3.27.tgz#6f5232f0a9a878ebb456399a7157615ad59a310e"
-  integrity sha512-+H6u6RKGIHjkGhvtz1CexGtjLR2WqUB37TnO/RdGxq6xWyH0oEzV5oT73OGSrwrNjQS9TzhVj0xcnVsAhv5HdQ==
+"@ngtools/webpack@20.3.34":
+  version "20.3.34"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-20.3.34.tgz#22ed9dd4afec7285cb944aa773e7889997314eee"
+  integrity sha512-YLnHgzZUmR8zYAD77HUK6rE49/6KYgvTx0aNRGqEV3r67Iue3CcQdbulwNUCtJbX/tWhW4E0j9WpjVhx9Ulb7A==
 
 "@ngx-translate/core@^17.0.0":
   version "17.0.0"
@@ -2416,6 +2424,11 @@
   dependencies:
     tslib "^2.3.0"
 
+"@noble/hashes@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.4.0.tgz#45814aa329f30e4fe0ba49426f49dfccdd066426"
+  integrity sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2613,6 +2626,136 @@
     "@parcel/watcher-win32-ia32" "2.5.6"
     "@parcel/watcher-win32-x64" "2.5.6"
 
+"@peculiar/asn1-cms@^2.6.0", "@peculiar/asn1-cms@^2.9.3":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-cms/-/asn1-cms-2.9.3.tgz#6b37ef792477b4af803e1cbcc1ede95281860704"
+  integrity sha512-N3POfw5RA7efAliAATiudtmvKQqukVEOzrMQuqQY/us2EPKczMy2WiecLt1SX6s3b0OwcFaPUXGF6uIYlBUTbg==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.9.3"
+    "@peculiar/asn1-x509" "^2.9.3"
+    "@peculiar/asn1-x509-attr" "^2.9.3"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-csr@^2.6.0":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-csr/-/asn1-csr-2.9.3.tgz#eab9270c844ae894b6123cd03c2dee871772ded3"
+  integrity sha512-E9zYmC5mk7eiDKqQAOsZGrJ7mUCIDC0031s4Nsl7dj1Za5EBKcHVqY+1vD/a4xbk480PGqvi455W2b4FeHRJ8Q==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.9.3"
+    "@peculiar/asn1-x509" "^2.9.3"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-ecc@^2.6.0":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-ecc/-/asn1-ecc-2.9.3.tgz#4a167c8ed47d35c95bda10eec8d9db3066e9fb3f"
+  integrity sha512-4xmeZiZ46VI2qGbiZPzdv6p9IhMtjWdbwZf3VCgN8OAVcued60ej5Ki2FF94srVH4Ot/h45Co7T5C/fpQXP4rA==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.9.3"
+    "@peculiar/asn1-x509" "^2.9.3"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-pfx@^2.9.3":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-pfx/-/asn1-pfx-2.9.3.tgz#8344148158b056b041e8c2854704f9004072cb8f"
+  integrity sha512-Nzwoj+fRr1XB9CQuc4AanUuvQ3OIXAY+ngZIYP+eZUqd+Sonj+ZHTnrg+egQuUJ64/iMi9HFPN04MokGrFTK0w==
+  dependencies:
+    "@peculiar/asn1-cms" "^2.9.3"
+    "@peculiar/asn1-pkcs8" "^2.9.3"
+    "@peculiar/asn1-rsa" "^2.9.3"
+    "@peculiar/asn1-schema" "^2.9.3"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-pkcs8@^2.9.3":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-pkcs8/-/asn1-pkcs8-2.9.3.tgz#191b877fb7201798a4d242160230601e422e87f3"
+  integrity sha512-ecGZpkY6Lq5bSgTFU+LS74WjawzDgjWHcjFMVNPH/1C0j53Xi9dmLcPMdmZyk8gdsd2RKeV1fP9EbLB6W6zZ1g==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.9.3"
+    "@peculiar/asn1-x509" "^2.9.3"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-pkcs9@^2.6.0":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-pkcs9/-/asn1-pkcs9-2.9.3.tgz#275b4b3e00849e58d17620561f3f2a4e3512390c"
+  integrity sha512-yjWVrQEmPp2y9lWjLLE28BRHbt7wYdwWvwXjFgNuekP9mDD/ofz31muVI8qOg2as7XZs1bZIZGPPnJ/0osTClQ==
+  dependencies:
+    "@peculiar/asn1-cms" "^2.9.3"
+    "@peculiar/asn1-pfx" "^2.9.3"
+    "@peculiar/asn1-pkcs8" "^2.9.3"
+    "@peculiar/asn1-schema" "^2.9.3"
+    "@peculiar/asn1-x509" "^2.9.3"
+    "@peculiar/asn1-x509-attr" "^2.9.3"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-rsa@^2.6.0", "@peculiar/asn1-rsa@^2.9.3":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-rsa/-/asn1-rsa-2.9.3.tgz#9b73ff82e2f88cb2da952e4991cb053df49e5b9d"
+  integrity sha512-t7m3e9p/Gf9YoMM+hLsHUqB+NhOlifiOkENAIG4RV2BFWVGTATVzbXoR8L0EgNWpiriPaeIjBCS5B9PTtkaxQw==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.9.3"
+    "@peculiar/asn1-x509" "^2.9.3"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-schema@^2.6.0", "@peculiar/asn1-schema@^2.9.3":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.9.3.tgz#13398a990b8b89f003e720db9876511af0974a35"
+  integrity sha512-SOux4+jikCnOwoJvpBp/grOqzFmJPnNSwe3sAg1Bn93YdmCiDtvolZifJIhiRq0UWMTnLRPj9/ZCMAc2W9VsMQ==
+  dependencies:
+    "@peculiar/utils" "^2.0.2"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-x509-attr@^2.9.3":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-x509-attr/-/asn1-x509-attr-2.9.3.tgz#0f791e33f39b786d74d0485225aa4d061bc205f8"
+  integrity sha512-v5Oa6p7hCT3ONqYHQyTFQYcycD06eMhHbr0m7evpvPQSpWJIq8GgbdnvA9bVGTUlOx6KOeDrX7Z0W4s/yboNTg==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.9.3"
+    "@peculiar/asn1-x509" "^2.9.3"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/asn1-x509@^2.6.0", "@peculiar/asn1-x509@^2.9.3":
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/asn1-x509/-/asn1-x509-2.9.3.tgz#e029a18de8f06bf8f061b26a2296193e3af29db3"
+  integrity sha512-HE+ejy9dX9JP3yLL6CGYoWym4Cted1lGXH7DxsbNDGiq8KabwVR7mzYidwsyNZ/m0hNWjiS+dzSwrsgMB/OIaQ==
+  dependencies:
+    "@peculiar/asn1-schema" "^2.9.3"
+    "@peculiar/utils" "^2.0.2"
+    asn1js "^3.0.10"
+    tslib "^2.8.1"
+
+"@peculiar/utils@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/utils/-/utils-2.0.3.tgz#a27ca4c4b73652e110f19a7d16d664f458a5528e"
+  integrity sha512-+oL3HPFRIZ1St2K50lWCXiioIgSoxzz7R1J3uF6neO2yl1sgmpgY6XXJH4BdpoDkMWznQTeYF6oWNDZLCdQ4eQ==
+  dependencies:
+    tslib "^2.8.1"
+
+"@peculiar/x509@^1.14.2":
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/@peculiar/x509/-/x509-1.14.3.tgz#2c44c2b89474346afec38a0c2803ec4fb8ce959e"
+  integrity sha512-C2Xj8FZ0uHWeCXXqX5B4/gVFQmtSkiuOolzAgutjTfseNOHT3pUjljDZsTSxXFGgio54bCzVFqmEOUrIVk8RDA==
+  dependencies:
+    "@peculiar/asn1-cms" "^2.6.0"
+    "@peculiar/asn1-csr" "^2.6.0"
+    "@peculiar/asn1-ecc" "^2.6.0"
+    "@peculiar/asn1-pkcs9" "^2.6.0"
+    "@peculiar/asn1-rsa" "^2.6.0"
+    "@peculiar/asn1-schema" "^2.6.0"
+    "@peculiar/asn1-x509" "^2.6.0"
+    pvtsutils "^1.3.6"
+    reflect-metadata "^0.2.2"
+    tslib "^2.8.1"
+    tsyringe "^4.10.0"
+
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -2758,13 +2901,13 @@
   resolved "https://registry.yarnpkg.com/@sanity/diff-match-patch/-/diff-match-patch-3.2.0.tgz#7ce587273f7372a146308cb1075ba26177d42cdb"
   integrity sha512-4hPADs0qUThFZkBK/crnfKKHg71qkRowfktBljH2UIxGHHTxIzt8g8fBiXItyCjxkuNy+zpYOdRMifQNv8+Yww==
 
-"@schematics/angular@20.3.27":
-  version "20.3.27"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-20.3.27.tgz#6f52cefd7f3fcc2d7328cae58d88f2c33894e669"
-  integrity sha512-HGwM7Rr2Yburrp89Rez96KLylwz+fhqRFOrh2BoGF6ztyYxNr45t7ro8HJvaSEELMC1mefXsW5n5xzl3jsastw==
+"@schematics/angular@20.3.34":
+  version "20.3.34"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-20.3.34.tgz#900f8d33eb3bf3c815361080a76178192363d523"
+  integrity sha512-Yja14zhlb59TaADWx2/4FptSJ85FuhSfSlB6RgQx9t8N7mVLNyUVhxBw6RaCcgazhSP4i4XcgOvY9pMiqO8a2g==
   dependencies:
-    "@angular-devkit/core" "20.3.27"
-    "@angular-devkit/schematics" "20.3.27"
+    "@angular-devkit/core" "20.3.34"
+    "@angular-devkit/schematics" "20.3.34"
     jsonc-parser "3.3.1"
 
 "@sigstore/bundle@^4.0.0":
@@ -3338,15 +3481,15 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/express@^4.17.21":
-  version "4.17.21"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.21.tgz#c26d4a151e60efe0084b23dc3369ebc631ed192d"
-  integrity sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==
+"@types/express@^4.17.25":
+  version "4.17.25"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.25.tgz#070c8c73a6fee6936d65c195dbbfb7da5026649b"
+  integrity sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
     "@types/qs" "*"
-    "@types/serve-static" "*"
+    "@types/serve-static" "^1"
 
 "@types/flot@^0.0.36":
   version "0.0.36"
@@ -3475,13 +3618,6 @@
   resolved "https://registry.yarnpkg.com/@types/mousetrap/-/mousetrap-1.6.15.tgz#f144a0c539a4cef553a631824651d48267e53c86"
   integrity sha512-qL0hyIMNPow317QWW/63RvL1x5MVMV+Ru3NaY9f/CuEpCqrmb7WeuK2071ZY5hczOnm38qExWM2i2WtkXLSqFw==
 
-"@types/node-forge@^1.3.0":
-  version "1.3.11"
-  resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
-  integrity sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/node@*", "@types/node@~22.18.13":
   version "22.18.13"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.13.tgz#a037c4f474b860be660e05dbe92a9ef945472e28"
@@ -3514,10 +3650,10 @@
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
   integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
 
-"@types/send@*":
-  version "0.17.4"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a"
-  integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==
+"@types/send@*", "@types/send@<1":
+  version "0.17.6"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.6.tgz#aeb5385be62ff58a52cd5459daa509ae91651d25"
+  integrity sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
@@ -3529,14 +3665,14 @@
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*", "@types/serve-static@^1.15.5":
-  version "1.15.7"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.7.tgz#22174bbd74fb97fe303109738e9b5c2f3064f714"
-  integrity sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==
+"@types/serve-static@*", "@types/serve-static@^1", "@types/serve-static@^1.15.5":
+  version "1.15.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.10.tgz#768169145a778f8f5dfcb6360aead414a3994fee"
+  integrity sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==
   dependencies:
     "@types/http-errors" "*"
     "@types/node" "*"
-    "@types/send" "*"
+    "@types/send" "<1"
 
 "@types/sizzle@*":
   version "2.3.9"
@@ -3849,7 +3985,7 @@ accepts@^2.0.0:
     mime-types "^3.0.0"
     negotiator "^1.0.0"
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
+accepts@~1.3.4, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -4175,6 +4311,15 @@ arraybuffer.prototype.slice@^1.0.4:
     get-intrinsic "^1.2.6"
     is-array-buffer "^3.0.4"
 
+asn1js@^3.0.10, asn1js@^3.0.6:
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.10.tgz#df26c874c8a8b41ca605efea47b2ad07551013dd"
+  integrity sha512-S2s3aOytiKdFRdulw2qPE51MzjzVOisppcVv7jVFR+Kw0kxwvFrDcYA0h7Ndqbmj0HkMIXYWaoj7fli8kgx1eg==
+  dependencies:
+    pvtsutils "^1.3.6"
+    pvutils "^1.1.5"
+    tslib "^2.8.1"
+
 async-function@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
@@ -4187,11 +4332,6 @@ async@~2.6.3:
   dependencies:
     lodash "^4.17.14"
 
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
-
 autoprefixer@10.4.21:
   version "10.4.21"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.21.tgz#77189468e7a8ad1d9a37fbc08efc9f480cf0a95d"
@@ -4327,10 +4467,10 @@ body-parser@^2.2.1:
     raw-body "^3.0.1"
     type-is "^2.0.1"
 
-body-parser@~1.20.3:
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.4.tgz#f8e20f4d06ca8a50a71ed329c15dccad1cdc547f"
-  integrity sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==
+body-parser@~1.20.5:
+  version "1.20.6"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.6.tgz#60c789c78e0992d906da0a29d71ae01d15c1ed76"
+  integrity sha512-p5tAzS57i5MV9fZFDj9LeIiTZEufbSe2eDozP+ElheSUq1m74CRq1jI4mYNDdVs9vQztXFLuk/Gd6BWTdwRJ5g==
   dependencies:
     bytes "~3.1.2"
     content-type "~1.0.5"
@@ -4340,7 +4480,7 @@ body-parser@~1.20.3:
     http-errors "~2.0.1"
     iconv-lite "~0.4.24"
     on-finished "~2.4.1"
-    qs "~6.14.0"
+    qs "~6.15.1"
     raw-body "~2.5.3"
     type-is "~1.6.18"
     unpipe "~1.0.0"
@@ -4403,16 +4543,16 @@ bundle-name@^4.1.0:
   dependencies:
     run-applescript "^7.0.0"
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
-
-bytes@^3.1.2, bytes@~3.1.2:
+bytes@3.1.2, bytes@^3.1.2, bytes@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
+bytestreamjs@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/bytestreamjs/-/bytestreamjs-2.0.1.tgz#a32947c7ce389a6fa11a09a9a563d0a45889535e"
+  integrity sha512-U1Z/ob71V/bXfVABvNr/Kumf5VyeQRBEm6Txb0PQ6S7V5GpBM3w4Cbqz/xPDicR5tN0uvDifng8C+5qECeGwyQ==
+
 cacache@^20.0.0, cacache@^20.0.1:
   version "20.0.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-20.0.3.tgz#bd65205d5e6d86e02bbfaf8e4ce6008f1b81d119"
@@ -4658,13 +4798,6 @@ colorette@^2.0.10, colorette@^2.0.20:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
-combined-stream@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
-  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
-  dependencies:
-    delayed-stream "~1.0.0"
-
 command-line-args@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
@@ -4715,24 +4848,24 @@ comment-parser@1.4.5:
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.5.tgz#6c595cd090737a1010fe5ff40d86e1d21b7bd6ce"
   integrity sha512-aRDkn3uyIlCFfk5NUA+VdwMmMsh8JGhc4hapfV4yxymHGQ3BVskMQfoXGpCo5IoBuQ9tS5iiVKhCpTcB4pW4qw==
 
-compressible@~2.0.16:
+compressible@~2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
-compression@^1.7.4:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+compression@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.8.1.tgz#4a45d909ac16509195a9a28bd91094889c180d79"
+  integrity sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==
   dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
+    bytes "3.1.2"
+    compressible "~2.0.18"
     debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
+    negotiator "~0.6.4"
+    on-headers "~1.1.0"
+    safe-buffer "5.2.1"
     vary "~1.1.2"
 
 concat-map@0.0.1:
@@ -5349,11 +5482,6 @@ delaunator@5:
   dependencies:
     robust-predicates "^3.0.2"
 
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
-
 delegate@^3.1.2:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
@@ -5706,12 +5834,12 @@ es-to-primitive@^1.3.0:
     is-date-object "^1.0.5"
     is-symbol "^1.0.4"
 
-esbuild-wasm@0.28.0:
-  version "0.28.0"
-  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.28.0.tgz#e2e60b86ed19e0f6f5a1e6c1c722f5a811d7d5f7"
-  integrity sha512-5TRVKExcEmeMkccIZMzUq+Az6X2RoMAJyfl6SMMO1dMVhmvt0I2mx7gAb6zYi42n4d1ETcatFXazGKzA+aW7fg==
+esbuild-wasm@0.28.1:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.28.1.tgz#b173826abdc645419c3c7ac77e2d9128286a7a79"
+  integrity sha512-p/GD4E8oYRjg3kjdKrnMb0s4PzXgJF42e0MF4H0+ACyK/kIlFRp3e0fzOleIG+wBBm6MM3XQrbpe7soEA+vJIA==
 
-esbuild@0.28.0, esbuild@0.28.1, esbuild@^0.27.0:
+esbuild@0.28.1, "esbuild@^0.27.0 || ^0.28.0":
   version "0.28.1"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.28.1.tgz#ef45b4634c9c9d97a296aea4114a5f9840f95578"
   integrity sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==
@@ -6015,14 +6143,14 @@ express-rate-limit@^8.2.1:
     debug "^4.4.3"
     ip-address "^10.2.0"
 
-express@^4.21.2:
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.22.1.tgz#1de23a09745a4fffdb39247b344bb5eaff382069"
-  integrity sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==
+express@^4.22.1:
+  version "4.22.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.22.2.tgz#c17ae0981e5efc24b22272f0e041c4662503b700"
+  integrity sha512-IuL+Elrou2ZvCFHs18/CIzy2Nzvo25nZ1/D2eIZlz7c+QUayAcYoiM2BthCjs+EBHVpjYjcuLDAiCWgeIX3X1Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "~1.20.3"
+    body-parser "~1.20.5"
     content-disposition "~0.5.4"
     content-type "~1.0.4"
     cookie "~0.7.1"
@@ -6041,7 +6169,7 @@ express@^4.21.2:
     parseurl "~1.3.3"
     path-to-regexp "~0.1.12"
     proxy-addr "~2.0.7"
-    qs "~6.14.0"
+    qs "~6.15.1"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "~0.19.0"
@@ -6264,17 +6392,6 @@ foreground-child@^3.1.0:
     cross-spawn "^7.0.0"
     signal-exit "^4.0.1"
 
-form-data@>=4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.6.tgz#28e864e1b786dbebb68db1f452f9635278665827"
-  integrity sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    es-set-tostringtag "^2.1.0"
-    hasown "^2.0.4"
-    mime-types "^2.1.35"
-
 formdata-polyfill@^4.0.10:
   version "4.0.10"
   resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
@@ -6558,7 +6675,7 @@ has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
-hasown@^2.0.2, hasown@^2.0.4:
+hasown@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.4.tgz#8c62d8cb90beb2aad5d0a5b67581ad9854c3f003"
   integrity sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==
@@ -6654,7 +6771,7 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
-http-proxy-middleware@3.0.5, http-proxy-middleware@3.0.7:
+http-proxy-middleware@3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-3.0.7.tgz#53d3a1fe175bcacc507711cc52a0b32baf2c3442"
   integrity sha512-iwbQltVlx8bCrqePUM8C+hllHvdawVhQJaLrj1X7qllkvFQdXFsr16pW/mo9+JDVjN+QO2XUx9jd8SmoFkE5qw==
@@ -7853,7 +7970,7 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
   integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
 
-mime-types@^2.1.27, mime-types@^2.1.31, mime-types@^2.1.35, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8097,6 +8214,11 @@ negotiator@^1.0.0:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a"
   integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==
 
+negotiator@~0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
+  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
+
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -8208,11 +8330,6 @@ node-fetch@^3.3.2:
     fetch-blob "^3.1.4"
     formdata-polyfill "^4.0.10"
 
-node-forge@^1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.4.0.tgz#1c7b7d8bdc2d078739f58287d589d903a11b2fc2"
-  integrity sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==
-
 node-gyp-build-optional-packages@5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz#522f50c2d53134d7f3a76cd7255de4ab6c96a3a4"
@@ -8426,10 +8543,10 @@ on-finished@^2.4.1, on-finished@~2.4.1:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+on-headers@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65"
+  integrity sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==
 
 once@^1.4.0:
   version "1.4.0"
@@ -8561,11 +8678,12 @@ package-manager-detector@^1.3.0:
   resolved "https://registry.yarnpkg.com/package-manager-detector/-/package-manager-detector-1.6.0.tgz#70d0cf0aa02c877eeaf66c4d984ede0be9130734"
   integrity sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==
 
-pacote@21.0.4:
-  version "21.0.4"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-21.0.4.tgz#59cd2a2b5a4c8c1b625f33991a96b136d1c05d95"
-  integrity sha512-RplP/pDW0NNNDh3pnaoIWYPvNenS7UqMbXyvMqJczosiFWTeGGwJC2NQBLqKf4rGLFfwCOnntw1aEp9Jiqm1MA==
+pacote@21.5.1:
+  version "21.5.1"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-21.5.1.tgz#74ab896fc7b1f00545ecbbbf666a61895cd50d38"
+  integrity sha512-KvcJ9iy3crysCsgqc4+PknH/w6jkrp8JN36mpZBPwNaDRwTfMZD37YzRazNstiZUOhuF5pno9f78n9mEJBavwg==
   dependencies:
+    "@gar/promise-retry" "^1.0.0"
     "@npmcli/git" "^7.0.0"
     "@npmcli/installed-package-contents" "^4.0.0"
     "@npmcli/package-json" "^7.0.0"
@@ -8579,7 +8697,6 @@ pacote@21.0.4:
     npm-pick-manifest "^11.0.1"
     npm-registry-fetch "^19.0.0"
     proc-log "^6.0.0"
-    promise-retry "^2.0.1"
     sigstore "^4.0.0"
     ssri "^13.0.0"
     tar "^7.4.3"
@@ -8765,7 +8882,7 @@ pirates@^4.0.1:
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
   integrity sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==
 
-piscina@5.1.3, piscina@5.2.0:
+piscina@5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/piscina/-/piscina-5.2.0.tgz#3a9a568ab9e3a0556b5c94522ba305962de13e3b"
   integrity sha512-DszUCKeVN/5G5QKo6jAVHL8fmKnkJvQ0ACiVgY7YGCq3TUB2oznAOayvZPIAdEThvhczkXR+qm3IHsNXpFCYfA==
@@ -8786,6 +8903,18 @@ pkg-types@^1.3.1:
     mlly "^1.7.4"
     pathe "^2.0.1"
 
+pkijs@^3.3.3:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/pkijs/-/pkijs-3.4.0.tgz#d9164def30ff6d97be2d88966d5e36192499ca9c"
+  integrity sha512-emEcLuomt2j03vxD54giVB4SxTjnsqkU692xZOZXHDVoYyypEm+b3jpiTcc+Cf+myooc+/Ly0z01jqeNHVgJGw==
+  dependencies:
+    "@noble/hashes" "1.4.0"
+    asn1js "^3.0.6"
+    bytestreamjs "^2.0.1"
+    pvtsutils "^1.3.6"
+    pvutils "^1.1.3"
+    tslib "^2.8.1"
+
 pngjs@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb"
@@ -8909,7 +9038,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.5.12, postcss@8.5.23, postcss@^8.2.14, postcss@^8.4.33, postcss@^8.4.4, postcss@^8.4.47, postcss@^8.4.49, postcss@^8.5.6:
+postcss@8.5.23, postcss@^8.2.14, postcss@^8.4.33, postcss@^8.4.4, postcss@^8.4.47, postcss@^8.4.49, postcss@^8.5.6:
   version "8.5.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.23.tgz#3493550116f478487298301d2c2e8dc5a56e6594"
   integrity sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==
@@ -8989,6 +9118,18 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
+pvtsutils@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.6.tgz#ec46e34db7422b9e4fdc5490578c1883657d6001"
+  integrity sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==
+  dependencies:
+    tslib "^2.8.1"
+
+pvutils@^1.1.3, pvutils@^1.1.5:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.2.0.tgz#4b5487a9cccd52d275b0538775790a3ca982bc22"
+  integrity sha512-BbubeCEyTuQjVMakvJQ/Sxbc93F2pwmbsxONT/ZRrwU7Ua38d8unYTwXpTVLAKJ4BDuH9IGztCjQcd/N/39Dvg==
+
 qrcode@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.4.tgz#5cb81d86eb57c675febb08cf007fff963405da88"
@@ -8998,12 +9139,13 @@ qrcode@^1.5.4:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
-qs@^6.14.0, qs@^6.14.1, qs@~6.14.0:
-  version "6.14.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.1.tgz#a41d85b9d3902f31d27861790506294881871159"
-  integrity sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==
+qs@^6.14.0, qs@^6.14.1, qs@~6.15.1:
+  version "6.15.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.15.3.tgz#76852132a58ed5c7c0ef67e4441b9bb5d6061b3b"
+  integrity sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==
   dependencies:
-    side-channel "^1.1.0"
+    es-define-property "^1.0.1"
+    side-channel "^1.1.1"
 
 queue-microtask@^1.2.2:
   version "1.2.3"
@@ -9105,7 +9247,7 @@ reduce-flatten@^2.0.0:
   resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27"
   integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==
 
-reflect-metadata@^0.2.0:
+reflect-metadata@^0.2.0, reflect-metadata@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
   integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==
@@ -9366,16 +9508,16 @@ safe-array-concat@^1.1.3:
     has-symbols "^1.1.0"
     isarray "^2.0.5"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
 safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
 safe-identifier@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
@@ -9458,13 +9600,13 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==
 
-selfsigned@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.4.1.tgz#560d90565442a3ed35b674034cec4e95dceb4ae0"
-  integrity sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==
+selfsigned@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-5.5.0.tgz#4c9ab7c7c9f35f18fb6a9882c253eb0e6bd6557b"
+  integrity sha512-ftnu3TW4+3eBfLRFnDEkzGxSF/10BJBkaLJuBHZX0kiPS7bRdlpZGu6YGt4KngMkdTwJE6MbjavFpqHvqVt+Ew==
   dependencies:
-    "@types/node-forge" "^1.3.0"
-    node-forge "^1"
+    "@peculiar/x509" "^1.14.2"
+    pkijs "^3.3.3"
 
 semver@7.7.2:
   version "7.7.2"
@@ -9640,13 +9782,13 @@ shell-quote@^1.8.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.10.0.tgz#482033e192e4f5c07151521ffa03400ec71b1b0f"
   integrity sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==
 
-side-channel-list@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
-  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
+side-channel-list@^1.0.0, side-channel-list@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.1.tgz#c2e0b5a14a540aebee3bbc6c3f8666cc9b509127"
+  integrity sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==
   dependencies:
     es-errors "^1.3.0"
-    object-inspect "^1.13.3"
+    object-inspect "^1.13.4"
 
 side-channel-map@^1.0.1:
   version "1.0.1"
@@ -9669,14 +9811,14 @@ side-channel-weakmap@^1.0.2:
     object-inspect "^1.13.3"
     side-channel-map "^1.0.1"
 
-side-channel@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
-  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+side-channel@^1.1.0, side-channel@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.1.tgz#ea02c62e05dc4bea67d4442f0fb71ee192f8e0ab"
+  integrity sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==
   dependencies:
     es-errors "^1.3.0"
-    object-inspect "^1.13.3"
-    side-channel-list "^1.0.0"
+    object-inspect "^1.13.4"
+    side-channel-list "^1.0.1"
     side-channel-map "^1.0.1"
     side-channel-weakmap "^1.0.2"
 
@@ -10322,6 +10464,18 @@ tslib@2.8.1, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
+tslib@^1.9.3:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tsyringe@^4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/tsyringe/-/tsyringe-4.10.0.tgz#d0c95815d584464214060285eaaadd94aa03299c"
+  integrity sha512-axr3IdNuVIxnaK5XGEUFTu3YmAQ6lllgrvqfEoR16g/HGnYY/6We4oWENtAnzK6/LpJ2ur9PAb80RBt7/U4ugw==
+  dependencies:
+    tslib "^1.9.3"
+
 tuf-js@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-4.1.0.tgz#ae4ef9afa456fcb4af103dc50a43bc031f066603"
@@ -10572,12 +10726,12 @@ vary@^1, vary@^1.1.2, vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
-vite@7.3.2, vite@7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-7.3.5.tgz#90c2d0b7b94a224e7e7dcf22d2912ff0b5291165"
-  integrity sha512-KuOaNhcnGFN2zIPGA7wRmzF+lJA1sea7rHq17aiJ++9lzY1WWG6Jpwqwe1KNbRVPIqHmr8GLYx7jbrQcN/7/ww==
+vite@7.3.6:
+  version "7.3.6"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-7.3.6.tgz#0547a395e68d3746e9a505f1fd4469fe09b49cc4"
+  integrity sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg==
   dependencies:
-    esbuild "^0.27.0"
+    esbuild "^0.27.0 || ^0.28.0"
     fdir "^6.5.0"
     picomatch "^4.0.3"
     postcss "^8.5.6"
@@ -10694,14 +10848,14 @@ webpack-dev-middleware@^7.4.2:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.2.tgz#96a143d50c58fef0c79107e61df911728d7ceb39"
-  integrity sha512-QcQ72gh8a+7JO63TAx/6XZf/CWhgMzu5m0QirvPfGvptOusAxG12w2+aua1Jkjr7hzaWDnJ2n6JFeexMHI+Zjg==
+webpack-dev-server@5.2.5:
+  version "5.2.5"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.5.tgz#648fceaac6a5736b0935e5c1e55d6aa1d0626119"
+  integrity sha512-4wZtCquSuv9CKX8oybo+mqxtxZqWz47uM1Ch94lxowBztOhWCbhqvRbfC/mODOwxgV2brY+JGZpHq58/SuVFYg==
   dependencies:
     "@types/bonjour" "^3.5.13"
     "@types/connect-history-api-fallback" "^1.5.4"
-    "@types/express" "^4.17.21"
+    "@types/express" "^4.17.25"
     "@types/express-serve-static-core" "^4.17.21"
     "@types/serve-index" "^1.9.4"
     "@types/serve-static" "^1.15.5"
@@ -10711,9 +10865,9 @@ webpack-dev-server@5.2.2:
     bonjour-service "^1.2.1"
     chokidar "^3.6.0"
     colorette "^2.0.10"
-    compression "^1.7.4"
+    compression "^1.8.1"
     connect-history-api-fallback "^2.0.0"
-    express "^4.21.2"
+    express "^4.22.1"
     graceful-fs "^4.2.6"
     http-proxy-middleware "^2.0.9"
     ipaddr.js "^2.1.0"
@@ -10721,7 +10875,7 @@ webpack-dev-server@5.2.2:
     open "^10.0.3"
     p-retry "^6.2.0"
     schema-utils "^4.2.0"
-    selfsigned "^2.4.1"
+    selfsigned "^5.5.0"
     serve-index "^1.9.1"
     sockjs "^0.3.24"
     spdy "^4.0.2"

From 600bdf4ce4bb963a252d455538cfa1306c5ff6e3 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 16:09:28 +0200
Subject: [PATCH 88/91] Fixed CVE-2025-71329 and CVE-2025-71330

---
 ui-ngx/package.json |   1 +
 ui-ngx/yarn.lock    | 116 +++++++++++++++++++++++---------------------
 2 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index a37dc39be2..bf65bd90e9 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -139,6 +139,7 @@
   "resolutions": {
     "@babel/core": "7.29.7",
     "esbuild": "0.28.1",
+    "less": "4.9.0",
     "js-beautify/**/minimatch": "^9.0.7"
   }
 }
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 4f85ee0b0f..20e2413b1a 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -484,7 +484,7 @@
   dependencies:
     tslib "^2.0.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.28.6", "@babel/code-frame@^7.29.0", "@babel/code-frame@^7.29.7":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.7.tgz#f2fbbfea87c44a21590ec515b778b2c26d8866e7"
   integrity sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==
@@ -493,7 +493,7 @@
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
-"@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.0", "@babel/compat-data@^7.28.6", "@babel/compat-data@^7.29.7":
+"@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.0", "@babel/compat-data@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.29.7.tgz#6f0237f0f36d2e51c0570a636faed9d2d0efe629"
   integrity sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==
@@ -530,7 +530,7 @@
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
 
-"@babel/generator@^7.29.0", "@babel/generator@^7.29.7", "@babel/generator@^7.29.8":
+"@babel/generator@^7.29.7", "@babel/generator@^7.29.8":
   version "7.29.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.8.tgz#4b0b887885422643339e09022148a4c4ebaa4979"
   integrity sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==
@@ -667,7 +667,7 @@
   dependencies:
     "@babel/types" "^7.24.7"
 
-"@babel/helper-string-parser@^7.27.1", "@babel/helper-string-parser@^7.29.7":
+"@babel/helper-string-parser@^7.29.7":
   version "7.29.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz#7f0871d99824d23137d60f86fcf6130fd5a1b51f"
   integrity sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==
@@ -699,7 +699,7 @@
     "@babel/template" "^7.29.7"
     "@babel/types" "^7.29.7"
 
-"@babel/parser@^7.23.9", "@babel/parser@^7.28.3", "@babel/parser@^7.28.6", "@babel/parser@^7.29.0", "@babel/parser@^7.29.7", "@babel/parser@^7.29.8":
+"@babel/parser@^7.23.9", "@babel/parser@^7.28.3", "@babel/parser@^7.29.7", "@babel/parser@^7.29.8":
   version "7.29.8"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.8.tgz#9653716a2f10c677b98fbc63d4bfb000c302cf17"
   integrity sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==
@@ -1311,7 +1311,7 @@
     "@babel/types" "^7.29.8"
     debug "^4.3.1"
 
-"@babel/types@^7.24.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.5", "@babel/types@^7.28.6", "@babel/types@^7.29.0", "@babel/types@^7.29.7", "@babel/types@^7.29.8", "@babel/types@^7.4.4":
+"@babel/types@^7.24.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.5", "@babel/types@^7.28.6", "@babel/types@^7.29.7", "@babel/types@^7.29.8", "@babel/types@^7.4.4":
   version "7.29.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.8.tgz#1229eef31d85156d70fa3f4cd859376d0eaf6863"
   integrity sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==
@@ -4933,12 +4933,12 @@ cookie@^0.7.1, cookie@~0.7.1:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
   integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
 
-copy-anything@^2.0.1:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"
-  integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==
+copy-anything@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-3.0.5.tgz#2d92dce8c498f790fa7ad16b01a1ae5a45b020a0"
+  integrity sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==
   dependencies:
-    is-what "^3.14.1"
+    is-what "^4.1.8"
 
 copy-webpack-plugin@14.0.0:
   version "14.0.0"
@@ -5391,7 +5391,7 @@ dayjs@1.11.20, dayjs@^1.11.19, dayjs@^1.11.5:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.20.tgz#88d919fd639dc991415da5f4cb6f1b6650811938"
   integrity sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==
 
-debug@2.6.9:
+debug@2, debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -5405,7 +5405,7 @@ debug@4, debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.6, d
   dependencies:
     ms "^2.1.3"
 
-debug@^3.2.7:
+debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -6828,6 +6828,13 @@ iconv-lite@0.6, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
+iconv-lite@^0.4.4, iconv-lite@~0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 iconv-lite@^0.7.0, iconv-lite@~0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.2.tgz#d0bdeac3f12b4835b7359c2ad89c422a4d1cc72e"
@@ -6835,13 +6842,6 @@ iconv-lite@^0.7.0, iconv-lite@~0.7.0:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-iconv-lite@~0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
@@ -6869,11 +6869,6 @@ ignore@^5.2.0:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
-
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -7232,10 +7227,10 @@ is-weakset@^2.0.3:
     call-bound "^1.0.3"
     get-intrinsic "^1.2.6"
 
-is-what@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
-  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
+is-what@^4.1.8:
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/is-what/-/is-what-4.1.16.tgz#1ad860a19da8b4895ad5495da3182ce2acdd7a6f"
+  integrity sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==
 
 is-wsl@^2.1.1:
   version "2.2.0"
@@ -7606,21 +7601,20 @@ less-loader@12.3.0:
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-12.3.0.tgz#d4a00361568be86a97da3df4f16954b0d4c15340"
   integrity sha512-0M6+uYulvYIWs52y0LqN4+QM9TqWAohYSNTo4htE8Z7Cn3G/qQMEmktfHmyJT23k+20kU9zHH2wrfFXkxNLtVw==
 
-less@4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/less/-/less-4.4.0.tgz#deaf881f4880ee80691beae925b8fac699d3a76d"
-  integrity sha512-kdTwsyRuncDfjEs0DlRILWNvxhDG/Zij4YLO4TMJgDLW+8OzpfkdPnRgrsRuY1o+oaxJGWsps5f/RVBgGmmN0w==
+less@4.4.0, less@4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/less/-/less-4.9.0.tgz#df49f940f89a1d158c315609735d3ca12da3e740"
+  integrity sha512-umRhrCH7fCi8Uj2RcwKjJdvUORTjeWqkdKx0LbcZvjIwsAVsnIAGcxHaqowPeBFBjQuWOeC/bve0AlpFzF/+SQ==
   dependencies:
-    copy-anything "^2.0.1"
+    copy-anything "^3.0.5"
     parse-node-version "^1.0.1"
-    tslib "^2.3.0"
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    make-dir "^2.1.0"
+    make-dir "^5.1.0"
     mime "^1.4.1"
     needle "^3.1.0"
+    probe-image-size "^7.2.3"
     source-map "~0.6.0"
 
 levn@^0.4.1:
@@ -7792,13 +7786,10 @@ magic-string@0.30.17:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.0"
 
-make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
+make-dir@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-5.1.0.tgz#59b2d9acf7ffa543d14238617a697458fa8dd5c9"
+  integrity sha512-IfpFq6UM39dUNiphpA6uDezNx/AvWyhwfICWPR3t1VspkgkMZrL+Rk1RbN1bx+aeNYwOrqGJgEgV3yotk+ZUVw==
 
 make-error@^1.1.1:
   version "1.3.6"
@@ -8196,6 +8187,15 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
+needle@^2.5.2:
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684"
+  integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 needle@^3.1.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/needle/-/needle-3.3.1.tgz#63f75aec580c2e77e209f3f324e2cdf3d29bd049"
@@ -8872,11 +8872,6 @@ pify@^2.3.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
 pirates@^4.0.1:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.7.tgz#643b4a18c4257c8a65104b73f3049ce9a0a15e22"
@@ -9067,6 +9062,15 @@ prismjs@^1.30.0:
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.30.0.tgz#d9709969d9d4e16403f6f348c63553b19f0975a9"
   integrity sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==
 
+probe-image-size@^7.2.3:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-7.4.0.tgz#c189ae04e9aad1e3fa3a0998a956a7e9aab7f66d"
+  integrity sha512-cdEprVtZxV+awMde9X+4jILBFYh4CARxVrQaMl4wY4YcPWbul9jntXrIW95NInBDyJwcVUP3U0T6yukN8rMBaQ==
+  dependencies:
+    lodash.merge "^4.6.2"
+    needle "^2.5.2"
+    stream-parser "~0.3.1"
+
 proc-log@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-5.0.0.tgz#e6c93cf37aef33f835c53485f314f50ea906a9d8"
@@ -9618,11 +9622,6 @@ semver@7.7.3:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
   integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
-semver@^5.6.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
-  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-
 semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
@@ -9782,7 +9781,7 @@ shell-quote@^1.8.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.10.0.tgz#482033e192e4f5c07151521ffa03400ec71b1b0f"
   integrity sha512-w1aiOKwKuRgtwAReIIj89puqg+I7GvX4IbLrvmhXbzQsj1+Zwi4VO3+fa6ZF91TWSjIxoEkKnMeHcLEODK5ZXA==
 
-side-channel-list@^1.0.0, side-channel-list@^1.0.1:
+side-channel-list@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.1.tgz#c2e0b5a14a540aebee3bbc6c3f8666cc9b509127"
   integrity sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==
@@ -10029,6 +10028,13 @@ stop-iteration-iterator@^1.1.0:
     es-errors "^1.3.0"
     internal-slot "^1.1.0"
 
+stream-parser@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
+  integrity sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==
+  dependencies:
+    debug "2"
+
 "string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"

From 19c433edd50e98e1e29313664e6bea8de925ef44 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Wed, 19 Aug 2026 18:17:11 +0200
Subject: [PATCH 89/91] Review fixes

---
 ui-ngx/package.json                           |  9 ++--
 .../mobile/common/editor-panel.component.html |  2 +-
 .../mobile/common/editor-panel.component.ts   | 50 +++----------------
 .../sent-notification-dialog.component.html   |  2 +-
 .../sent/sent-notification-dialog.componet.ts | 12 ++---
 ...tion-template-configuration.component.html |  2 +-
 ...cation-template-configuration.component.ts | 44 ++--------------
 .../shared/models/hugerte/hugerte.models.ts   | 34 +++++++++++++
 ui-ngx/src/app/shared/shared.module.ts        |  3 +-
 ui-ngx/src/styles.scss                        | 25 ++++++++++
 ui-ngx/yarn.lock                              |  6 +--
 11 files changed, 88 insertions(+), 101 deletions(-)
 create mode 100644 ui-ngx/src/app/shared/models/hugerte/hugerte.models.ts

diff --git a/ui-ngx/package.json b/ui-ngx/package.json
index bf65bd90e9..023ede7bd1 100644
--- a/ui-ngx/package.json
+++ b/ui-ngx/package.json
@@ -9,7 +9,7 @@
     "build:types": "node generate-types.js",
     "build:icon-metadata": "node generate-icon-metadata.js",
     "lint": "ng lint",
-    "prepare": "patch-package"
+    "prepare": "patch-package --error-on-fail"
   },
   "private": true,
   "dependencies": {
@@ -27,6 +27,7 @@
     "@flowjs/flow.js": "^2.14.1",
     "@flowjs/ngx-flow": "20.0.2",
     "@geoman-io/leaflet-geoman-free": "2.19.3",
+    "@hugerte/hugerte-angular": "~1.1.1",
     "@iplab/ngx-color-picker": "^20.0.0",
     "@mat-datetimepicker/core": "~16.0.1",
     "@mdi/svg": "^7.4.47",
@@ -37,7 +38,6 @@
     "@ngx-translate/core": "^17.0.0",
     "@svgdotjs/svg.filter.js": "^3.0.9",
     "@svgdotjs/svg.js": "3.2.4",
-    "@hugerte/hugerte-angular": "^1.1.1",
     "@svgdotjs/svg.panzoom.js": "^2.1.2",
     "ace-builds": "1.43.6",
     "ace-diff": "^3.3.0",
@@ -51,7 +51,7 @@
     "flot.curvedlines": "https://github.com/MichaelZinsmaier/CurvedLines.git#master",
     "font-awesome": "^4.7.0",
     "html2canvas": "^1.4.1",
-    "hugerte": "^1.0.12",
+    "hugerte": "~1.0.12",
     "jquery": "^3.7.1",
     "jquery.terminal": "^2.45.2",
     "js-beautify": "1.15.4",
@@ -139,7 +139,8 @@
   "resolutions": {
     "@babel/core": "7.29.7",
     "esbuild": "0.28.1",
-    "less": "4.9.0",
+    "rollup": "4.59.0",
+    "less": ">=4.9.0",
     "js-beautify/**/minimatch": "^9.0.7"
   }
 }
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.html b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.html
index f7ab3fe2b3..ea55c06a66 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.html
+++ b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.html
@@ -17,7 +17,7 @@
 -->
 <div class="tb-editor-panel">
   <div class="tb-editor-title">{{ title | translate }}</div>
-  <editor class="tb-editor" [init]="tinyMceOptions" [formControl]="editorControl"></editor>
+  <editor class="tb-editor" [init]="hugeRteOptions" [formControl]="editorControl"></editor>
   <div class="tb-editor-buttons">
     <button mat-button
             color="primary"
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
index 5232162ec3..c1e573e978 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/common/editor-panel.component.ts
@@ -18,6 +18,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } fro
 import { FormBuilder, FormControl } from '@angular/forms';
 import { TbPopoverComponent } from '@shared/components/popover.component';
 import { EditorOptions } from 'hugerte';
+import { defaultHugeRteOptions } from '@shared/models/hugerte/hugerte.models';
 
 @Component({
     selector: 'tb-release-notes-panel',
@@ -45,52 +46,15 @@ export class EditorPanelComponent implements OnInit {
 
   editorControl: FormControl<string>;
 
-  tinyMceOptions: Partial<EditorOptions> = {
-    base_url: '/assets/hugerte',
-    suffix: '.min',
+  hugeRteOptions: Partial<EditorOptions> = defaultHugeRteOptions({
     plugins: ['link', 'table', 'image', 'lists', 'fullscreen'],
     menubar: 'edit insert view format',
     toolbar: ['fontfamily fontsize | bold italic underline strikethrough forecolor backcolor',
       'alignleft aligncenter alignright alignjustify | bullist | link table image | fullscreen'],
     toolbar_mode: 'sliding',
     height: 400,
-    autofocus: false,
-    branding: false,
-    resize: false,
-    setup: (editor) => {
-      editor.on('PostRender', function() {
-        const container = document.querySelector('.tox.tox-hugerte-aux');
-        const styleSheet = document.createElement('style');
-        styleSheet.innerText = `
-          .tox-tiered-menu .tox-menu {
-            width: fit-content;
-            max-width: min(80%, 440px);
-            @media screen and (max-width: 510px) {
-              max-width: calc(100% - 64px);
-            }
-            media screen and (min-width: 511px) and (max-width: 548px) {
-              max-width: calc(100% - 84px);
-            }
-            media screen and (min-width: 549px) and (max-width: 599px) {
-              max-width: calc(100% - 104px);
-            }
-          }
-          .tox-tiered-menu .tox-menu .tox-collection__item-label {
-            word-break: normal;
-          }
-          @media screen and (max-width: 890px) {
-            .tox-tiered-menu > .tox-collection--list:not(:first-child) {
-              left: auto !important;
-              right: 0 !important;
-            }
-          }
-        `;
-        container.prepend(styleSheet);
-      });
-    },
-    relative_urls: false,
-    urlconverter_callback: (url) => url
-  };
+    resize: false
+  });
 
   constructor(private fb: FormBuilder) {
   }
@@ -99,9 +63,9 @@ export class EditorPanelComponent implements OnInit {
     this.editorControl = this.fb.control(this.content);
     if (this.disabled) {
       this.editorControl.disable({emitEvent: false});
-      this.tinyMceOptions.toolbar = false;
-      this.tinyMceOptions.menubar = false;
-      this.tinyMceOptions.statusbar = false;
+      this.hugeRteOptions.toolbar = false;
+      this.hugeRteOptions.menubar = false;
+      this.hugeRteOptions.statusbar = false;
     }
   }
 
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
index 8788622f35..c36f1a5146 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
@@ -213,7 +213,7 @@
           <div class="notification-content">
             <div class="subject">{{ preview.processedTemplates.EMAIL.subject }}</div>
             <mat-divider></mat-divider>
-            <editor [init]="tinyMceOptions" [initialValue]="preview.processedTemplates.EMAIL.body"></editor>
+            <editor [init]="hugeRteOptions" [initialValue]="preview.processedTemplates.EMAIL.body"></editor>
           </div>
         </section>
         <section class="preview-group notification tb-form-panel stroked no-gap" *ngIf="preview.processedTemplates.SLACK?.enabled">
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
index 7ab522b651..7df2ce98c1 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.componet.ts
@@ -47,6 +47,8 @@ import { AuthUser } from '@shared/models/user.model';
 import { getCurrentAuthUser } from '@core/auth/auth.selectors';
 import { TranslateService } from '@ngx-translate/core';
 import { Router } from '@angular/router';
+import { EditorOptions } from 'hugerte';
+import { defaultHugeRteOptions, HUGERTE_BODY_ID } from '@shared/models/hugerte/hugerte.models';
 
 export interface RequestNotificationDialogData {
   request?: NotificationRequest;
@@ -78,9 +80,7 @@ export class SentNotificationDialogComponent extends
 
   showRefresh = false;
 
-  tinyMceOptions: Record<string, any> = {
-    base_url: '/assets/hugerte',
-    suffix: '.min',
+  hugeRteOptions: Partial<EditorOptions> = defaultHugeRteOptions({
     plugins: ['autoresize'],
     menubar: false,
     toolbar: false,
@@ -88,18 +88,16 @@ export class SentNotificationDialogComponent extends
     resize: false,
     readonly: true,
     height: 400,
-    autofocus: false,
-    branding: false,
     setup: (ed) => {
       ed.on('PreInit', () => {
         const document = $(ed.iframeElement.contentDocument);
-        const body = $('#hugerte', document);
+        const body = $(`#${HUGERTE_BODY_ID}`, document);
         body.attr({contenteditable: false});
         body.css('pointerEvents', 'none');
         body.css('userSelect', 'none');
       })
     }
-  };
+  });
 
   private authUser: AuthUser = getCurrentAuthUser(this.store);
 
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html
index 9bbe1eaa5c..cce821361d 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html
@@ -214,7 +214,7 @@
                    [class.tb-error]="(interacted || templateConfigurationForm.get('EMAIL.body').touched) && templateConfigurationForm.get('EMAIL.body').hasError('required')"
                    translate>notification.message
         </mat-label>
-        <editor [init]="tinyMceOptions" formControlName="body"></editor>
+        <editor [init]="hugeRteOptions" formControlName="body"></editor>
         <mat-error class="tb-mat-error"
                    *ngIf="(interacted || templateConfigurationForm.get('EMAIL.body').touched) && templateConfigurationForm.get('EMAIL.body').hasError('required')">
           {{ 'notification.message-required' | translate }}
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
index 971d36d0c3..478e4b4052 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.ts
@@ -38,6 +38,7 @@ import { deepClone, isDefinedAndNotNull } from '@core/utils';
 import { coerceBoolean } from '@shared/decorators/coercion';
 import { TranslateService } from '@ngx-translate/core';
 import { EditorOptions } from 'hugerte';
+import { defaultHugeRteOptions } from '@shared/models/hugerte/hugerte.models';
 
 @Component({
     selector: 'tb-template-configuration',
@@ -83,52 +84,15 @@ export class NotificationTemplateConfigurationComponent implements OnDestroy, Co
   readonly NotificationDeliveryMethod = NotificationDeliveryMethod;
   readonly NotificationTemplateTypeTranslateMap = NotificationTemplateTypeTranslateMap;
 
-  tinyMceOptions: Partial<EditorOptions> = {
-    base_url: '/assets/hugerte',
-    suffix: '.min',
+  hugeRteOptions: Partial<EditorOptions> = defaultHugeRteOptions({
     plugins: ['link', 'table', 'image', 'lists', 'code', 'fullscreen'],
     menubar: 'edit insert tools view format table',
     toolbar: 'undo redo | fontfamily fontsize blocks | bold italic  strikethrough | forecolor backcolor ' +
       '| link table image | alignleft aligncenter alignright alignjustify  ' +
       '| numlist bullist | outdent indent  | removeformat | code | fullscreen',
     toolbar_mode: 'sliding',
-    height: 400,
-    autofocus: false,
-    branding: false,
-    setup: (editor) => {
-      editor.on('PostRender', function() {
-        const container = document.querySelector('.tox.tox-hugerte-aux');
-        const styleSheet = document.createElement('style');
-        styleSheet.innerText = `
-          .tox-tiered-menu .tox-menu {
-            width: fit-content;
-            max-width: min(80%, 440px);
-            @media screen and (max-width: 510px) {
-              max-width: calc(100% - 64px);
-            }
-            media screen and (min-width: 511px) and (max-width: 548px) {
-              max-width: calc(100% - 84px);
-            }
-            media screen and (min-width: 549px) and (max-width: 599px) {
-              max-width: calc(100% - 104px);
-            }
-          }
-          .tox-tiered-menu .tox-menu .tox-collection__item-label {
-            word-break: normal;
-          }
-          @media screen and (max-width: 890px) {
-            .tox-tiered-menu > .tox-collection--list:not(:first-child) {
-              left: auto !important;
-              right: 0 !important;
-            }
-          }
-        `;
-        container.prepend(styleSheet);
-      });
-    },
-    relative_urls: false,
-    urlconverter_callback: (url) => url
-  };
+    height: 400
+  });
 
   private propagateChange = null;
   private readonly destroy$ = new Subject<void>();
diff --git a/ui-ngx/src/app/shared/models/hugerte/hugerte.models.ts b/ui-ngx/src/app/shared/models/hugerte/hugerte.models.ts
new file mode 100644
index 0000000000..435edcd9f7
--- /dev/null
+++ b/ui-ngx/src/app/shared/models/hugerte/hugerte.models.ts
@@ -0,0 +1,34 @@
+///
+/// Copyright © 2016-2026 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+import { EditorOptions } from 'hugerte';
+
+export const HUGERTE_ASSETS_PATH = 'assets/hugerte';
+
+export const HUGERTE_BODY_ID = 'hugerte';
+
+export function defaultHugeRteOptions(overrides: Partial<EditorOptions>): Partial<EditorOptions> {
+  return {
+    base_url: '/' + HUGERTE_ASSETS_PATH,
+    suffix: '.min',
+    body_id: HUGERTE_BODY_ID,
+    autofocus: false,
+    branding: false,
+    relative_urls: false,
+    urlconverter_callback: (url) => url,
+    ...overrides
+  };
+}
diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts
index 5fcf5ace8a..a2ec12d226 100644
--- a/ui-ngx/src/app/shared/shared.module.ts
+++ b/ui-ngx/src/app/shared/shared.module.ts
@@ -65,6 +65,7 @@ import { HotkeyModule } from 'angular2-hotkeys';
 import { ColorPickerModule } from '@iplab/ngx-color-picker';
 import { NgxHmCarouselComponent, NgxHmCarouselDynamicDirective, NgxHmCarouselItemDirective } from 'ngx-hm-carousel';
 import { EditorModule, HUGERTE_SCRIPT_SRC } from '@hugerte/hugerte-angular';
+import { HUGERTE_ASSETS_PATH } from '@shared/models/hugerte/hugerte.models';
 import { UserMenuComponent } from '@shared/components/user-menu.component';
 import { TruncateWithTooltipDirective } from '@shared/directives/truncate-with-tooltip.directive';
 import { ContextMenuDirective } from '@shared/directives/context-menu.directive';
@@ -259,7 +260,7 @@ export function MarkedOptionsFactory(markedOptionsService: MarkedOptionsService)
     },
     {
       provide: HUGERTE_SCRIPT_SRC,
-      useValue: 'assets/hugerte/hugerte.min.js'
+      useValue: `${HUGERTE_ASSETS_PATH}/hugerte.min.js`
     },
     {
       provide: MAT_DATE_LOCALE,
diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index 79a54bbebe..e03328cbea 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -1235,6 +1235,31 @@ pre.tb-highlight {
     }
   }
 
+  .tox-tiered-menu .tox-menu {
+    width: fit-content;
+    max-width: min(80%, 440px);
+    @media screen and (max-width: 510px) {
+      max-width: calc(100% - 64px);
+    }
+    @media screen and (min-width: 511px) and (max-width: 548px) {
+      max-width: calc(100% - 84px);
+    }
+    @media screen and (min-width: 549px) and (max-width: 599px) {
+      max-width: calc(100% - 104px);
+    }
+  }
+
+  .tox-tiered-menu .tox-menu .tox-collection__item-label {
+    word-break: normal;
+  }
+
+  @media screen and (max-width: 890px) {
+    .tox-tiered-menu > .tox-collection--list:not(:first-child) {
+      left: auto !important;
+      right: 0 !important;
+    }
+  }
+
   .tb-toast-panel {
     pointer-events: none !important;
   }
diff --git a/ui-ngx/yarn.lock b/ui-ngx/yarn.lock
index 20e2413b1a..9c3b20dfa9 100644
--- a/ui-ngx/yarn.lock
+++ b/ui-ngx/yarn.lock
@@ -1619,7 +1619,7 @@
   resolved "https://registry.yarnpkg.com/@hugerte/framework-integration-shared/-/framework-integration-shared-1.2.0.tgz#75f04e4249bbb2c314d1f7a962b9c2f5fed7db80"
   integrity sha512-ogcvVO0dFcb/HQAY7itj8xnmeMcHZmtMaOj9uC34ZYopnvj12TGWnfRQwbt8jZMlmoZk2z1TTLmJgvQBuH013A==
 
-"@hugerte/hugerte-angular@^1.1.1":
+"@hugerte/hugerte-angular@~1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@hugerte/hugerte-angular/-/hugerte-angular-1.1.1.tgz#08b2c963d66d7a754e8cd4884b9111ca166781e7"
   integrity sha512-ubh6ZG3+dU6g3BkS2ZHx0FO46nti6N2CpN2gG/URFtF+pau/V59N94E7w7+8VeoPjqsFRpjB6zefRGNUoTJLOA==
@@ -6811,7 +6811,7 @@ https-proxy-agent@7.0.6, https-proxy-agent@^7.0.1:
     agent-base "^7.1.2"
     debug "4"
 
-hugerte@^1.0.12:
+hugerte@~1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/hugerte/-/hugerte-1.0.12.tgz#84337116bd7e76c39e851a51d5dc0214af9882b8"
   integrity sha512-/JDCdJy1C83a7+RjlfWx6EjRvxqmmHFA5Pzcq8Y0ngdBESiC+2xa4ogsqnRPeadF04Cs95YfTd1SKquDdksjRw==
@@ -7601,7 +7601,7 @@ less-loader@12.3.0:
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-12.3.0.tgz#d4a00361568be86a97da3df4f16954b0d4c15340"
   integrity sha512-0M6+uYulvYIWs52y0LqN4+QM9TqWAohYSNTo4htE8Z7Cn3G/qQMEmktfHmyJT23k+20kU9zHH2wrfFXkxNLtVw==
 
-less@4.4.0, less@4.9.0:
+less@4.4.0, less@>=4.9.0:
   version "4.9.0"
   resolved "https://registry.yarnpkg.com/less/-/less-4.9.0.tgz#df49f940f89a1d158c315609735d3ca12da3e740"
   integrity sha512-umRhrCH7fCi8Uj2RcwKjJdvUORTjeWqkdKx0LbcZvjIwsAVsnIAGcxHaqowPeBFBjQuWOeC/bve0AlpFzF/+SQ==

From 61d60f9fa537f408c0f089f6839020313aad4afb Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Thu, 20 Aug 2026 10:09:38 +0200
Subject: [PATCH 90/91] Moved CSS to SCSS

---
 ui-ngx/src/styles.scss | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss
index e03328cbea..d70c11bbd2 100644
--- a/ui-ngx/src/styles.scss
+++ b/ui-ngx/src/styles.scss
@@ -1235,28 +1235,30 @@ pre.tb-highlight {
     }
   }
 
-  .tox-tiered-menu .tox-menu {
-    width: fit-content;
-    max-width: min(80%, 440px);
-    @media screen and (max-width: 510px) {
-      max-width: calc(100% - 64px);
-    }
-    @media screen and (min-width: 511px) and (max-width: 548px) {
-      max-width: calc(100% - 84px);
-    }
-    @media screen and (min-width: 549px) and (max-width: 599px) {
-      max-width: calc(100% - 104px);
-    }
-  }
+  .tox-tiered-menu {
+    .tox-menu {
+      width: fit-content;
+      max-width: min(80%, 440px);
+      @media screen and (max-width: 510px) {
+        max-width: calc(100% - 64px);
+      }
+      @media screen and (min-width: 511px) and (max-width: 548px) {
+        max-width: calc(100% - 84px);
+      }
+      @media screen and (min-width: 549px) and (max-width: 599px) {
+        max-width: calc(100% - 104px);
+      }
 
-  .tox-tiered-menu .tox-menu .tox-collection__item-label {
-    word-break: normal;
-  }
+      .tox-collection__item-label {
+        word-break: normal;
+      }
+    }
 
-  @media screen and (max-width: 890px) {
-    .tox-tiered-menu > .tox-collection--list:not(:first-child) {
-      left: auto !important;
-      right: 0 !important;
+    > .tox-collection--list:not(:first-child) {
+      @media screen and (max-width: 890px) {
+        left: auto !important;
+        right: 0 !important;
+      }
     }
   }
 

From 3a58059931d06ed701ec80cd91a80f6f3130ab1c Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Thu, 20 Aug 2026 12:28:07 +0300
Subject: [PATCH 91/91] Compare deleted alarm comment audit log argument
 against the persisted comment

---
 .../controller/AlarmCommentControllerTest.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
index bebfe832e8..782580002a 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java
@@ -231,6 +231,10 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
                 .comment(JacksonUtil.newObjectNode().put("text", String.format("Comment was deleted by user %s",
                         CUSTOMER_USER_EMAIL)))
                 .build();
+        // The audit log receives the persisted comment, and AlarmComment equality covers the
+        // inherited id and createdTime, which the builder cannot populate.
+        expectedAlarmComment.setId(alarmComment.getId());
+        expectedAlarmComment.setCreatedTime(alarmComment.getCreatedTime());
         testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, customerUserId, CUSTOMER_USER_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
     }
 
@@ -255,6 +259,10 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
                 .comment(JacksonUtil.newObjectNode().put("text", String.format("Comment was deleted by user %s",
                         TENANT_ADMIN_EMAIL)))
                 .build();
+        // The audit log receives the persisted comment, and AlarmComment equality covers the
+        // inherited id and createdTime, which the builder cannot populate.
+        expectedAlarmComment.setId(alarmComment.getId());
+        expectedAlarmComment.setCreatedTime(alarmComment.getCreatedTime());
         testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
     }
 
@@ -286,6 +294,10 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
                 .comment(JacksonUtil.newObjectNode().put("text", String.format("Comment was deleted by user %s",
                         TENANT_ADMIN_EMAIL)))
                 .build();
+        // The audit log receives the persisted comment, and AlarmComment equality covers the
+        // inherited id and createdTime, which the builder cannot populate.
+        expectedAlarmComment.setId(alarmComment.getId());
+        expectedAlarmComment.setCreatedTime(alarmComment.getCreatedTime());
         testLogEntityActionEntityEqClass(alarm, alarm.getId(), tenantId, customerId, tenantAdminUserId, TENANT_ADMIN_EMAIL, ActionType.DELETED_COMMENT, 1, expectedAlarmComment);
     }