diff --git a/client/src/main/java/client/utils/server/ServerUtils.java b/client/src/main/java/client/utils/server/ServerUtils.java index 0d7be80..5fe3a49 100644 --- a/client/src/main/java/client/utils/server/ServerUtils.java +++ b/client/src/main/java/client/utils/server/ServerUtils.java @@ -1,5 +1,6 @@ package client.utils.server; +import client.utils.ConfigService; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.Inject; @@ -13,6 +14,7 @@ import org.glassfish.jersey.client.ClientConfig; import java.io.IOException; import java.net.ConnectException; +import java.net.URI; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; @@ -27,14 +29,16 @@ public class ServerUtils { private Logger logger = Logger.getLogger(ServerUtils.class.getName()); private final HttpClient client; private final ObjectMapper objectMapper = new ObjectMapper(); + private final ConfigService configService; private final int statusOK = 200; private final Endpoints endpoints; @Inject - public ServerUtils(HttpClient client, Endpoints endpoints) { + public ServerUtils(HttpClient client, Endpoints endpoints, ConfigService configService) { this.client = client; this.endpoints = endpoints; + this.configService = configService; } /** @@ -64,7 +68,7 @@ public class ServerUtils { */ public List getRecipesFiltered(String filter, List locales) throws IOException, InterruptedException { //TODO add limit integration - String uri = SERVER + "/recipes?search=" + filter + "&locales=" + String.join(",", locales); + String uri = configService.getConfig().getServerUrl() + "/recipes?search=" + filter + "&locales=" + String.join(",", locales); HttpRequest request = HttpRequest.newBuilder() .uri(URI.create(uri)) .GET() diff --git a/client/src/test/java/client/ServerUtilsMockTest.java b/client/src/test/java/client/ServerUtilsMockTest.java index 55ff5c9..df65246 100644 --- a/client/src/test/java/client/ServerUtilsMockTest.java +++ b/client/src/test/java/client/ServerUtilsMockTest.java @@ -53,7 +53,7 @@ class ServerUtilsMockTest { var endpoints = new Endpoints(configService); objectMapper = new ObjectMapper(); - serverUtils = new ServerUtils(HttpClient.newHttpClient(), endpoints); + serverUtils = new ServerUtils(HttpClient.newHttpClient(), endpoints, configService); } /** diff --git a/client/src/test/java/client/ServerUtilsTest.java b/client/src/test/java/client/ServerUtilsTest.java index 7b6b419..fe70573 100644 --- a/client/src/test/java/client/ServerUtilsTest.java +++ b/client/src/test/java/client/ServerUtilsTest.java @@ -45,7 +45,7 @@ class ServerUtilsTest { configService.getConfig().setServerUrl("http://localhost:8080"); var endpoints = new Endpoints(configService); - dv = new ServerUtils(HttpClient.newHttpClient(), endpoints); + dv = new ServerUtils(HttpClient.newHttpClient(), endpoints, configService); Assumptions.assumeTrue(dv.isServerAvailable(), "Server not available");