978: provide default constructor for HttpClient

core/src/main/java/dev/fitko/fitconnect/core/http/HttpClient.java

@@ -26,6 +26,11 @@ public class HttpClient {
     private final ObjectMapper objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     private final boolean throwExceptionsOnFailure;
 
+    public HttpClient() {
+        this.httpClient = new OkHttpClient();
+        this.throwExceptionsOnFailure = true;
+    }
+
     public HttpClient(boolean throwExceptionsOnFailure) {
         this.httpClient = new OkHttpClient();
         this.throwExceptionsOnFailure = throwExceptionsOnFailure;

core/src/test/java/dev/fitko/fitconnect/core/auth/DefaultOAuthServiceTest.java

@@ -24,7 +24,7 @@ class DefaultOAuthServiceTest extends RestEndpointBase {
     public void setUp() {
         wireMockServer.resetMappings();
         final var config = getTestConfig("http://localhost:" +  wireMockServer.port());
-        underTest = new DefaultOAuthService(new HttpClient(true), "id", "secret", config.getOAuthTokenEndpoint());
+        underTest = new DefaultOAuthService(new HttpClient(), "id", "secret", config.getOAuthTokenEndpoint());
     }
 
     @Test

core/src/test/java/dev/fitko/fitconnect/core/events/EventLogApiServiceTest.java

@@ -57,7 +57,7 @@ class EventLogApiServiceTest extends RestEndpointBase {
         authServiceMock = mock(OAuthService.class);
         verifierMock = mock(EventLogVerificationService.class);
         final var config = getTestConfig("http://localhost:" + wireMockServer.port());
-        underTest = new EventLogApiService(config, authServiceMock, new HttpClient(true), verifierMock);
+        underTest = new EventLogApiService(config, authServiceMock, new HttpClient(), verifierMock);
     }
 
     @Test

core/src/test/java/dev/fitko/fitconnect/core/http/HttpClientTest.java

@@ -43,7 +43,7 @@ public class HttpClientTest {
     @Test
     public void createRequestBodyWithImplicitContentType() throws JsonProcessingException {
 
-        RequestBody requestBody = new HttpClient(true).createRequestBody(Map.of(), "abc");
+        RequestBody requestBody = new HttpClient().createRequestBody(Map.of(), "abc");
 
         assertThat(Objects.requireNonNull(requestBody.contentType()).toString(), is(MimeTypes.APPLICATION_JSON));
     }
@@ -54,7 +54,7 @@ public class HttpClientTest {
     @Test
     public void createRequestBodyWithNoQuotesInString() throws IOException {
 
-        RequestBody requestBody = new HttpClient(true).createRequestBody(Map.of(), "abc");
+        RequestBody requestBody = new HttpClient().createRequestBody(Map.of(), "abc");
 
         assertThat(requestBody.contentLength(), is(3L));
     }
@@ -62,7 +62,7 @@ public class HttpClientTest {
     @Test
     public void createRequestBodyWithExplicitContentType() throws IOException {
 
-        RequestBody requestBody = new HttpClient(true).createRequestBody(
+        RequestBody requestBody = new HttpClient().createRequestBody(
                 Map.of("Content-Type", "application/json"), 10);
 
         assertThat(requestBody.contentLength(), is(2L));
@@ -77,7 +77,7 @@ public class HttpClientTest {
         when(response.isSuccessful()).thenReturn(false);
 
         RestApiException exception = Assertions.assertThrows(RestApiException.class,
-                () -> new HttpClient(true).evaluateStatusAndRespond(response, String.class));
+                () -> new HttpClient().evaluateStatusAndRespond(response, String.class));
 
         assertThat(exception.getMessage(), is("HTTP request failed."));
         assertThat(exception.getStatusCode(), is(400));
@@ -103,7 +103,7 @@ public class HttpClientTest {
         when(response.isSuccessful()).thenReturn(true);
 
         IOException exception = Assertions.assertThrows(IOException.class,
-                () -> new HttpClient(true).evaluateStatusAndRespond(response, String.class));
+                () -> new HttpClient().evaluateStatusAndRespond(response, String.class));
 
         assertThat(exception.getMessage(), is("Response body is null."));
     }
@@ -116,7 +116,7 @@ public class HttpClientTest {
         when(response.isSuccessful()).thenReturn(true);
         when(response.body()).thenReturn(mock(ResponseBody.class));
 
-        HttpResponse<?> httpResponse = new HttpClient(true).evaluateStatusAndRespond(response, Void.class);
+        HttpResponse<?> httpResponse = new HttpClient().evaluateStatusAndRespond(response, Void.class);
 
         assertThat(httpResponse.getBody(), nullValue());
         assertThat(httpResponse.getStatusCode(), is(200));
@@ -132,7 +132,7 @@ public class HttpClientTest {
         when(response.isSuccessful()).thenReturn(true);
         when(response.body()).thenReturn(responseBody);
 
-        HttpResponse<?> httpResponse = new HttpClient(true).evaluateStatusAndRespond(response, String.class);
+        HttpResponse<?> httpResponse = new HttpClient().evaluateStatusAndRespond(response, String.class);
 
         assertThat(httpResponse.getBody(), is("abc"));
         assertThat(httpResponse.getStatusCode(), is(200));
@@ -148,7 +148,7 @@ public class HttpClientTest {
         when(response.isSuccessful()).thenReturn(true);
         when(response.body()).thenReturn(responseBody);
 
-        HttpResponse<?> httpResponse = new HttpClient(true).evaluateStatusAndRespond(response, Map.class);
+        HttpResponse<?> httpResponse = new HttpClient().evaluateStatusAndRespond(response, Map.class);
 
         assertThat(httpResponse.getBody(), is(Map.of("property", "value")));
         assertThat(httpResponse.getStatusCode(), is(200));
@@ -163,7 +163,7 @@ public class HttpClientTest {
                 .willReturn(ok().withBody("success"))
         );
 
-        HttpResponse<String> httpResponse = new HttpClient(true)
+        HttpResponse<String> httpResponse = new HttpClient()
                 .get("http://localhost:8080/test", Map.of("User-Agent", "online service"), String.class);
 
         assertThat(httpResponse.getStatusCode(), is(200));
@@ -180,7 +180,7 @@ public class HttpClientTest {
                 .willReturn(ok().withBody("success"))
         );
 
-        HttpResponse<String> httpResponse = new HttpClient(true)
+        HttpResponse<String> httpResponse = new HttpClient()
                 .post("http://localhost:8080/test", Map.of("User-Agent", "online service"), "data", String.class);
 
         assertThat(httpResponse.getStatusCode(), is(200));
@@ -197,7 +197,7 @@ public class HttpClientTest {
                 .willReturn(ok().withBody("success"))
         );
 
-        HttpResponse<String> httpResponse = new HttpClient(true)
+        HttpResponse<String> httpResponse = new HttpClient()
                 .put("http://localhost:8080/test", Map.of("User-Agent", "online service"), "data", String.class);
 
         assertThat(httpResponse.getStatusCode(), is(200));

core/src/test/java/dev/fitko/fitconnect/core/keys/PublicKeyServiceTest.java

@@ -65,7 +65,7 @@ class PublicKeyServiceTest extends RestEndpointBase {
         config.setEnvironments(Map.of(envName, environment));
         config.setActiveEnvironment(envName);
 
-        underTest = new PublicKeyService(config, new HttpClient(true), authServiceMock, submissionServiceMock, validationServiceMock);
+        underTest = new PublicKeyService(config, new HttpClient(), authServiceMock, submissionServiceMock, validationServiceMock);
     }
 
     @Test
@@ -122,7 +122,7 @@ class PublicKeyServiceTest extends RestEndpointBase {
         config.setEnvironments(Map.of(envName, environment));
         config.setActiveEnvironment(envName);
 
-        final PublicKeyService keyService = new PublicKeyService(config, new HttpClient(true), authServiceMock, submissionServiceMock, validationServiceMock);
+        final PublicKeyService keyService = new PublicKeyService(config, new HttpClient(), authServiceMock, submissionServiceMock, validationServiceMock);
 
         wireMockServer.stubFor(
                 get(urlEqualTo("/v1/destinations/" + destination.getDestinationId() + "/keys/123"))

core/src/test/java/dev/fitko/fitconnect/core/routing/RoutingApiServiceTest.java

@@ -48,7 +48,7 @@ public class RoutingApiServiceTest extends RestEndpointBase {
         config.setEnvironments(Map.of(envName, environment));
         config.setActiveEnvironment(envName);
 
-        underTest = new RoutingApiService(config, new HttpClient(true));
+        underTest = new RoutingApiService(config, new HttpClient());
     }
 
     @Test

core/src/test/java/dev/fitko/fitconnect/core/submission/SubmissionApiServiceTest.java

@@ -55,7 +55,7 @@ class SubmissionApiServiceTest extends RestEndpointBase {
         final var fakeBaseUrl = "http://localhost:" + wireMockServer.port();
         final ApplicationConfig config = getTestConfig(fakeBaseUrl);
 
-        httpClient = new HttpClient(true);
+        httpClient = new HttpClient();
         authServiceMock = Mockito.mock(OAuthService.class);
         underTest = new SubmissionApiService(authServiceMock, httpClient, config);
     }