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] 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");
         }