Extracting httpClient for mocking

Author: thinkingserious

http/src/main/java/com/sendgrid/Client.java

@@ -35,6 +35,7 @@ public class Client {
     private CloseableHttpClient httpClient;
 
     public Client(){
+        this.httpClient = HttpClients.createDefault();
     }
 
     public Client(CloseableHttpClient httpClient){
@@ -85,17 +86,18 @@ public Response getResponse(CloseableHttpResponse resp){
 
     public Response Get(Request request){
         Response response = new Response();
-        CloseableHttpClient httpclient = HttpClients.createDefault();
 
         URI url = buildURL(request.baseURL, request.endpoint, request.queryParams);
         HttpGet httpGet = new HttpGet(url.toString());
 
-        for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
-            httpGet.setHeader(entry.getKey(), entry.getValue());
+        if(request.requestHeaders != null){
+            for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+                httpGet.setHeader(entry.getKey(), entry.getValue());
+            }            
         }
 
         try{
-            CloseableHttpResponse resp = httpclient.execute(httpGet);
+            CloseableHttpResponse resp = httpClient.execute(httpGet);
             response = getResponse(resp);
             resp.close();
         }catch(IOException ex){
@@ -107,22 +109,24 @@ public Response Get(Request request){
 
     public Response Post(Request request){
         Response response = new Response();
-        CloseableHttpClient httpclient = HttpClients.createDefault();
 
         URI url = buildURL(request.baseURL, request.endpoint, request.queryParams);
         HttpPost httpPost = new HttpPost(url.toString());
 
-        for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
-            httpPost.setHeader(entry.getKey(), entry.getValue());
+        if(request.requestHeaders != null){
+            for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+                httpPost.setHeader(entry.getKey(), entry.getValue());
+            }            
         }
+        
         try{
             httpPost.setEntity(new StringEntity(request.requestBody));
         }catch(IOException ex){
             ex.printStackTrace();
         }
 
         try{
-            CloseableHttpResponse resp = httpclient.execute(httpPost);
+            CloseableHttpResponse resp = httpClient.execute(httpPost);
             response = getResponse(resp);
             resp.close();
         }catch(IOException ex){
@@ -134,13 +138,14 @@ public Response Post(Request request){
 
     public Response Patch(Request request){
         Response response = new Response();
-        CloseableHttpClient httpclient = HttpClients.createDefault();
 
         URI url = buildURL(request.baseURL, request.endpoint, request.queryParams);
         HttpPatch httpPatch = new HttpPatch(url.toString());
 
-        for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
-            httpPatch.setHeader(entry.getKey(), entry.getValue());
+        if(request.requestHeaders != null){
+            for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+                httpPatch.setHeader(entry.getKey(), entry.getValue());
+            }            
         }
 
         try{
@@ -150,7 +155,7 @@ public Response Patch(Request request){
         }
 
         try{
-            CloseableHttpResponse resp = httpclient.execute(httpPatch);
+            CloseableHttpResponse resp = httpClient.execute(httpPatch);
             response = getResponse(resp);
             resp.close();
         }catch(IOException ex){
@@ -162,12 +167,14 @@ public Response Patch(Request request){
 
     public Response Put(Request request){
         Response response = new Response();
-        CloseableHttpClient httpclient = HttpClients.createDefault();
 
         URI url = buildURL(request.baseURL, request.endpoint, request.queryParams);
         HttpPut httpPut = new HttpPut(url.toString());
-        for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
-            httpPut.setHeader(entry.getKey(), entry.getValue());
+        
+        if(request.requestHeaders != null){
+            for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+                httpPut.setHeader(entry.getKey(), entry.getValue());
+            }            
         }
 
         try{
@@ -177,7 +184,7 @@ public Response Put(Request request){
         }
 
         try{
-            CloseableHttpResponse resp = httpclient.execute(httpPut);
+            CloseableHttpResponse resp = httpClient.execute(httpPut);
             response = getResponse(resp);
             resp.close();
         }catch(IOException ex){
@@ -189,17 +196,18 @@ public Response Put(Request request){
 
     public Response Delete(Request request){
         Response response = new Response();
-        CloseableHttpClient httpclient = HttpClients.createDefault();
 
         URI url = buildURL(request.baseURL, request.endpoint, request.queryParams);
         HttpDelete httpDelete = new HttpDelete(url.toString());
 
-        for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
-            httpDelete.setHeader(entry.getKey(), entry.getValue());
+        if(request.requestHeaders != null){
+            for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+                httpDelete.setHeader(entry.getKey(), entry.getValue());
+            }            
         }
 
         try{
-            CloseableHttpResponse resp = httpclient.execute(httpDelete);
+            CloseableHttpResponse resp = httpClient.execute(httpDelete);
             response = getResponse(resp);
             resp.close();
         }catch(IOException ex){

http/src/test/java/com/sendgrid/ClientTest.java

@@ -92,4 +92,41 @@ public void testGetResponse()
         }
         Assert.assertEquals(testResponse.responseHeaders, headers);
     }
+    
+    @Test
+    public void testGet()
+    {
+        Response testResponse = new Response();
+        Request request = new Request(); 
+        Header[] mockedHeaders = null;
+        try{
+            CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+            HttpEntity entity = mock(HttpEntity.class);
+            StatusLine statusline = mock(StatusLine.class);
+            when(statusline.getStatusCode()).thenReturn(200);
+            when(response.getStatusLine()).thenReturn(statusline);
+            when(response.getEntity()).thenReturn(new InputStreamEntity(new ByteArrayInputStream("{\"message\":\"success\"}".getBytes())));
+            mockedHeaders = new Header[] { new BasicHeader("headerA", "valueA") };
+            when(response.getAllHeaders()).thenReturn(mockedHeaders);
+            when(httpClient.execute(Matchers.any(HttpGet.class))).thenReturn(response);
+            Client client = new Client(httpClient);
+            request.method = Method.GET;
+            request.endpoint = "/test";
+            Map<String,String> requestHeaders = new HashMap<String, String>();
+            requestHeaders.put("Authorization", "Bearer XXXX");
+            requestHeaders.put("Content-Type", "application/json");
+            request.requestHeaders = requestHeaders;
+            testResponse = client.Get(request);         
+        }catch(IOException ex){
+            ex.printStackTrace();
+        }
+
+        Assert.assertTrue(testResponse.statusCode == 200);
+        Assert.assertEquals(testResponse.responseBody, "{\"message\":\"success\"}");
+        Map<String,String> headers = new HashMap<String,String>();
+        for(Header h:mockedHeaders){
+           headers.put(h.getName(), h.getValue());
+        }
+        Assert.assertEquals(testResponse.responseHeaders, headers);
+    }    
 }