Browse Source

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.
pull/15517/head
Oleksandra Matviienko 5 months ago
parent
commit
eaa00ab83b
  1. 4
      application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java
  2. 4
      monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
  3. 4
      monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
  4. 4
      monitoring/src/main/java/org/thingsboard/monitoring/service/transport/impl/HttpTransportHealthChecker.java

4
application/src/main/java/org/thingsboard/server/service/notification/channels/MicrosoftTeamsNotificationChannel.java

@ -54,8 +54,8 @@ public class MicrosoftTeamsNotificationChannel implements NotificationChannel<Mi
@Setter @Setter
private RestTemplate restTemplate = new RestTemplateBuilder() private RestTemplate restTemplate = new RestTemplateBuilder()
.setConnectTimeout(Duration.of(15, ChronoUnit.SECONDS)) .connectTimeout(Duration.of(15, ChronoUnit.SECONDS))
.setReadTimeout(Duration.of(15, ChronoUnit.SECONDS)) .readTimeout(Duration.of(15, ChronoUnit.SECONDS))
.build(); .build();
@Override @Override

4
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, public TbClient(@Value("${monitoring.rest.base_url}") String baseUrl,
@Value("${monitoring.rest.request_timeout_ms}") int requestTimeoutMs) { @Value("${monitoring.rest.request_timeout_ms}") int requestTimeoutMs) {
super(new RestTemplateBuilder() super(new RestTemplateBuilder()
.setConnectTimeout(Duration.ofMillis(requestTimeoutMs)) .connectTimeout(Duration.ofMillis(requestTimeoutMs))
.setReadTimeout(Duration.ofMillis(requestTimeoutMs)) .readTimeout(Duration.ofMillis(requestTimeoutMs))
.build(), baseUrl); .build(), baseUrl);
} }

4
monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java

@ -40,8 +40,8 @@ public class SlackNotificationChannel implements NotificationChannel {
@PostConstruct @PostConstruct
private void init() { private void init() {
restTemplate = new RestTemplateBuilder() restTemplate = new RestTemplateBuilder()
.setConnectTimeout(Duration.ofSeconds(5)) .connectTimeout(Duration.ofSeconds(5))
.setReadTimeout(Duration.ofSeconds(2)) .readTimeout(Duration.ofSeconds(2))
.build(); .build();
} }

4
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 { protected void initClient() throws Exception {
if (restTemplate == null) { if (restTemplate == null) {
restTemplate = new RestTemplateBuilder() restTemplate = new RestTemplateBuilder()
.setConnectTimeout(Duration.ofMillis(config.getRequestTimeoutMs())) .connectTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
.setReadTimeout(Duration.ofMillis(config.getRequestTimeoutMs())) .readTimeout(Duration.ofMillis(config.getRequestTimeoutMs()))
.build(); .build();
log.debug("Initialized HTTP client"); log.debug("Initialized HTTP client");
} }

Loading…
Cancel
Save