Skip to content

Commit 5966e9c

Browse files
committed
replace RestTemplate by RestClient in PingService
and switch to constructor autowiring see https://docs.spring.io/spring-framework/reference/integration/rest-clients.html#migrating-to-restclient
1 parent 94331c6 commit 5966e9c

1 file changed

Lines changed: 16 additions & 11 deletions

File tree

src/main/java/org/fairdatateam/fairdatapoint/service/ping/PingService.java

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@
2727
import org.fairdatateam.fairdatapoint.config.properties.PingProperties;
2828
import org.fairdatateam.fairdatapoint.entity.settings.Settings;
2929
import org.fairdatateam.fairdatapoint.service.settings.SettingsService;
30-
import org.springframework.beans.factory.annotation.Autowired;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3231
import org.springframework.scheduling.annotation.Async;
3332
import org.springframework.scheduling.annotation.Scheduled;
3433
import org.springframework.stereotype.Service;
35-
import org.springframework.web.client.RestTemplate;
34+
import org.springframework.web.client.RestClient;
3635

3736
import java.util.List;
3837
import java.util.Map;
@@ -43,17 +42,23 @@
4342
@ConditionalOnProperty(name = "ping.enabled", havingValue = "true", matchIfMissing = true)
4443
public class PingService {
4544

46-
@Autowired
47-
private PingProperties pingProperties;
45+
private final PingProperties pingProperties;
4846

49-
@Autowired
50-
private InstanceProperties instanceProperties;
47+
private final InstanceProperties instanceProperties;
5148

52-
@Autowired
53-
private SettingsService settingsService;
49+
private final SettingsService settingsService;
5450

55-
@Autowired
56-
private RestTemplate client;
51+
private final RestClient client;
52+
53+
/**
54+
* Constructor (autowired)
55+
*/
56+
public PingService(PingProperties pingProperties, InstanceProperties instanceProperties, SettingsService settingsService, RestClient client) {
57+
this.pingProperties = pingProperties;
58+
this.instanceProperties = instanceProperties;
59+
this.settingsService = settingsService;
60+
this.client = client;
61+
}
5762

5863
@Scheduled(
5964
initialDelayString = "${ping.initDelay:#{10*1000}}",
@@ -80,7 +85,7 @@ public void ping() {
8085
void pingEndpoint(String endpoint, Map<String, String> request) {
8186
try {
8287
log.info("Pinging {}", endpoint);
83-
client.postForEntity(endpoint, request, String.class);
88+
client.post().uri(endpoint).body(request).retrieve().toEntity(String.class);
8489
}
8590
catch (Exception exception) {
8691
log.warn("Failed to ping {}: {}", endpoint, exception.getMessage());

0 commit comments

Comments
 (0)