simplified Apache5HttpClientService

Author: Hakky54

client/src/main/java/nl/altindag/client/service/Apache5HttpClientService.java

@@ -20,10 +20,11 @@
 import org.apache.hc.client5.http.classic.methods.ClassicHttpRequests;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.springframework.stereotype.Service;
 
+import java.net.URI;
+
 import static nl.altindag.client.ClientType.APACHE5_HTTP_CLIENT;
 import static nl.altindag.client.Constants.HEADER_KEY_CLIENT_TYPE;
 
@@ -38,12 +39,10 @@ public Apache5HttpClientService(CloseableHttpClient httpClient) {
 
     @Override
     public ClientResponse executeRequest(String url) throws Exception {
-        HttpUriRequest request = ClassicHttpRequests.get(url);
+        HttpUriRequest request = ClassicHttpRequests.get(URI.create(url));
         request.addHeader(HEADER_KEY_CLIENT_TYPE, getClientType().getValue());
 
-        CloseableHttpResponse response = httpClient.execute(request);
-
-        return new ClientResponse(EntityUtils.toString(response.getEntity()), response.getCode());
+        return httpClient.execute(request, response -> new ClientResponse(EntityUtils.toString(response.getEntity()), response.getCode()));
     }
 
     @Override

client/src/test/java/nl/altindag/client/service/Apache5HttpClientServiceShould.java

@@ -17,26 +17,21 @@
 
 import nl.altindag.client.model.ClientResponse;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.core5.http.ClassicHttpRequest;
-import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.io.HttpClientResponseHandler;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
 import static nl.altindag.client.ClientType.APACHE5_HTTP_CLIENT;
 import static nl.altindag.client.Constants.HEADER_KEY_CLIENT_TYPE;
 import static nl.altindag.client.TestConstants.GET_METHOD;
 import static nl.altindag.client.TestConstants.HTTP_URL;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -51,25 +46,16 @@ class Apache5HttpClientServiceShould {
 
     @Test
     void executeRequest() throws Exception {
-        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
-        HttpEntity entity = mock(HttpEntity.class);
-        InputStream stream = new ByteArrayInputStream("Hello".getBytes());
-
-        when(entity.getContent()).thenReturn(stream);
-        when(response.getEntity()).thenReturn(entity);
-        when(response.getCode()).thenReturn(200);
-
-        when(httpClient.execute(any(ClassicHttpRequest.class))).thenReturn(response);
+        ClientResponse mockClientResponse = new ClientResponse("Hello", 200);
+        when(httpClient.execute(any(ClassicHttpRequest.class), any(HttpClientResponseHandler.class))).thenReturn(mockClientResponse);
 
         ArgumentCaptor<ClassicHttpRequest> requestArgumentCaptor = ArgumentCaptor.forClass(ClassicHttpRequest.class);
         ClientResponse clientResponse = victim.executeRequest(HTTP_URL);
 
-        stream.close();
-
         assertThat(clientResponse.getStatusCode()).isEqualTo(200);
         assertThat(clientResponse.getResponseBody()).isEqualTo("Hello");
 
-        verify(httpClient, times(1)).execute(requestArgumentCaptor.capture());
+        verify(httpClient, times(1)).execute(requestArgumentCaptor.capture(), any(HttpClientResponseHandler.class));
         assertThat(requestArgumentCaptor.getValue().getUri()).hasToString(HTTP_URL);
         assertThat(requestArgumentCaptor.getValue().getMethod()).isEqualTo(GET_METHOD);
         assertThat(requestArgumentCaptor.getValue().getHeaders()).hasSize(1);