diff --git a/src/main/java/nl/tudelft/tam/TAMApplication.java b/src/main/java/nl/tudelft/tam/TAMApplication.java
index de723d6b5804677ec56f18949c6ac38e7c8a04be..c69a28097a94258e24a67f96e8eee1c623f0abf0 100644
--- a/src/main/java/nl/tudelft/tam/TAMApplication.java
+++ b/src/main/java/nl/tudelft/tam/TAMApplication.java
@@ -22,10 +22,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Import;
import nl.tudelft.labracore.lib.LabracoreApiConfig;
+import nl.tudelft.labracore.lib.LabracoreAppConfig;
import nl.tudelft.librador.EnableLibrador;
@EnableLibrador
@Import(LabracoreApiConfig.class)
+@Import(LabracoreAppConfig.class)
@SpringBootApplication(scanBasePackageClasses = TAMApplication.class)
public class TAMApplication {
public static void main(String[] args) {
diff --git a/src/main/java/nl/tudelft/tam/service/PersonService.java b/src/main/java/nl/tudelft/tam/service/PersonService.java
index 2de03bc60a0f619e1b9b4db6329d97aa61eb6b53..a8bd6f52d0a444c37ab9eb21cdbbedf7a14ef35a 100644
--- a/src/main/java/nl/tudelft/tam/service/PersonService.java
+++ b/src/main/java/nl/tudelft/tam/service/PersonService.java
@@ -28,9 +28,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import org.springframework.web.reactive.function.client.WebClient;
+import nl.tudelft.labracore.lib.service.AppConnectionService;
import lombok.NonNull;
import nl.tudelft.labracore.api.PersonControllerApi;
@@ -52,6 +53,9 @@ public class PersonService {
@Autowired
PersonCacheManager personCache;
+ @Autowired
+ AppConnectionService appConnectionService;
+
private RestTemplate restTemplate = new RestTemplate();
@Autowired
@@ -161,13 +165,21 @@ public class PersonService {
* @return The average star ratings
*/
public Map<Long, Double> getQueueFeedbacks(List<Long> ids) {
- return WebClient.create(queueURL)
- .get()
- .uri(builder -> builder.path("/average-star-rating").queryParam("ids", ids.toArray()).build())
- .retrieve()
- .bodyToMono(new ParameterizedTypeReference<Map<Long, Double>>() {
- })
- .block();
+ RestTemplate restTemplate = appConnectionService.connect(queueURL);
+ return restTemplate.exchange(
+ queueURL + "/average-star-rating?ids={ids}",
+ HttpMethod.GET,
+ null,
+ new ParameterizedTypeReference<Map<Long, Double>>() {},
+ ids.toArray()
+ ).getBody();
+// return WebClient.create(queueURL)
+// .get()
+// .uri(builder -> builder.path("/average-star-rating").queryParam("ids", ids.toArray()).build())
+// .retrieve()
+// .bodyToMono(new ParameterizedTypeReference<Map<Long, Double>>() {
+// })
+// .block();
}
/**