Merge eaa00ab83b into 767fdbef6d

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

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

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

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