From 80ed8bf0c135f04b076e784f1e795d9fccae7b29 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Mon, 13 Jan 2020 16:40:34 -0800 Subject: [PATCH] Fixing DaprHttp and its tests. (#93) --- .../java/io/dapr/client/DaprClientBuilder.java | 2 +- sdk/src/main/java/io/dapr/client/DaprHttp.java | 11 +++++------ sdk/src/test/java/io/dapr/client/DaprHttpStub.java | 2 +- sdk/src/test/java/io/dapr/client/DaprHttpTest.java | 14 +++++++------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java b/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java index 5a1256ade..e880bdb6f 100644 --- a/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java +++ b/sdk/src/main/java/io/dapr/client/DaprClientBuilder.java @@ -84,7 +84,7 @@ public class DaprClientBuilder { synchronized (DaprClientBuilder.class) { if (this.daprHttClient == null) { OkHttpClient okHttpClient = new OkHttpClient.Builder().build(); - DaprHttp daprHtt = new DaprHttp(Constants.DEFAULT_BASE_HTTP_URL, port, okHttpClient); + DaprHttp daprHtt = new DaprHttp(port, okHttpClient); this.daprHttClient = new DaprClientHttpAdapter(daprHtt); } diff --git a/sdk/src/main/java/io/dapr/client/DaprHttp.java b/sdk/src/main/java/io/dapr/client/DaprHttp.java index 4b3928324..82736f64f 100644 --- a/sdk/src/main/java/io/dapr/client/DaprHttp.java +++ b/sdk/src/main/java/io/dapr/client/DaprHttp.java @@ -74,9 +74,9 @@ class DaprHttp { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); /** - * The base url used for form urls. This is typically "http://localhost:3500". + * Port used to communicate to Dapr's HTTP endpoint. */ - private final String baseUrl; + private final int port; /** * Http client used for all API calls. @@ -91,12 +91,11 @@ class DaprHttp { /** * Creates a new instance of {@link DaprHttp}. * - * @param baseUrl Base url calling Dapr (e.g. http://localhost) * @param port Port for calling Dapr. (e.g. 3500) * @param httpClient RestClient used for all API calls in this new instance. */ - DaprHttp(String baseUrl, int port, OkHttpClient httpClient) { - this.baseUrl = String.format("%s:%d/", baseUrl, port); + DaprHttp(int port, OkHttpClient httpClient) { + this.port = port; this.httpClient = httpClient; this.pool = Executors.newWorkStealingPool(); } @@ -148,7 +147,7 @@ class DaprHttp { body = RequestBody.Companion.create(content, mediaType); } HttpUrl.Builder urlBuilder = new HttpUrl.Builder(); - urlBuilder.host(this.baseUrl).addPathSegment(urlString); + urlBuilder.scheme("http").host(Constants.DEFAULT_HOSTNAME).port(this.port).addPathSegments(urlString); Optional.ofNullable(urlParameters).orElse(Collections.emptyMap()).entrySet().stream() .forEach(urlParameter -> urlBuilder.addQueryParameter(urlParameter.getKey(), urlParameter.getValue())); diff --git a/sdk/src/test/java/io/dapr/client/DaprHttpStub.java b/sdk/src/test/java/io/dapr/client/DaprHttpStub.java index 75c60c0bb..6d920d1d3 100644 --- a/sdk/src/test/java/io/dapr/client/DaprHttpStub.java +++ b/sdk/src/test/java/io/dapr/client/DaprHttpStub.java @@ -24,7 +24,7 @@ public class DaprHttpStub extends DaprHttp { * Instantiates a stub for DaprHttp */ public DaprHttpStub() { - super("http://localhost", 3000, null); + super(3000, null); } /** diff --git a/sdk/src/test/java/io/dapr/client/DaprHttpTest.java b/sdk/src/test/java/io/dapr/client/DaprHttpTest.java index 26d980661..95957218a 100644 --- a/sdk/src/test/java/io/dapr/client/DaprHttpTest.java +++ b/sdk/src/test/java/io/dapr/client/DaprHttpTest.java @@ -42,7 +42,7 @@ public class DaprHttpTest { .post("http://localhost:3500/v1.0/state") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp("http://localhost",3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("POST","v1.0/state",null, null); DaprHttp.Response response = mono.block(); @@ -58,7 +58,7 @@ public class DaprHttpTest { .delete("http://localhost:3500/v1.0/state") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp("http://localhost",3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("DELETE","v1.0/state", null, null); DaprHttp.Response response = mono.block(); @@ -74,7 +74,7 @@ public class DaprHttpTest { .get("http://localhost:3500/v1.0/get") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp("http://localhost",3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("GET","v1.0/get",null, null); DaprHttp.Response response = mono.block(); @@ -91,11 +91,11 @@ public class DaprHttpTest { headers.put("header1","value1"); mockInterceptor.addRule() - .get("http://localhost:3500/v1.0/get") + .get("http://localhost:3500/v1.0/get?header1=value1&header=value") .respond(EXPECTED_RESULT); - DaprHttp daprHttp = new DaprHttp("http://localhost",3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); - Mono mono = daprHttp.invokeAPI("GET","v1.0/get",headers, null); + Mono mono = daprHttp.invokeAPI("GET","v1.0/get", headers, null); DaprHttp.Response response = mono.block(); String body = serializer.deserialize(response.getBody(), String.class); assertEquals(EXPECTED_RESULT,body); @@ -114,7 +114,7 @@ public class DaprHttpTest { .respond(500, ResponseBody.create(MediaType.parse("application/json"), "{\"errorCode\":\"500\",\"message\":\"Error\"}")); - DaprHttp daprHttp = new DaprHttp("http://localhost",3500,okHttpClient); + DaprHttp daprHttp = new DaprHttp(3500, okHttpClient); Mono mono = daprHttp.invokeAPI("GET","v1.0/get", headers, null); DaprHttp.Response response = mono.block();