Modify SendGrid class to use getters and setters, let the tests use setters and getters

Author: diegoc-am

build.gradle

@@ -45,7 +45,7 @@ buildscript {
 }
 
 dependencies {
-  compile 'com.sendgrid:java-http-client:2.3.4'
+  compile 'com.sendgrid:java-http-client:4.0.0'
   compile 'com.fasterxml.jackson.core:jackson-core:2.5.3'
   compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.3'
   compile 'com.fasterxml.jackson.core:jackson-databind:2.5.3'

src/main/java/com/sendgrid/SendGrid.java

@@ -99,12 +99,16 @@ public Response makeCall(Request request) throws IOException {
     */
   public Response api(Request request) throws IOException {
     Request req = new Request();
-    req.method = request.method;
-    req.baseUri = this.host;
-    req.endpoint = "/" + version + "/" + request.endpoint;
-    req.body = request.body;
-    req.headers = this.requestHeaders;
-    req.queryParams = request.queryParams;
+    req.setMethod(request.getMethod());
+    req.setBaseUri(this.host);
+    req.setEndpoint("/" + version + "/" + request.getEndpoint());
+    req.setBody(request.getBody());
+    for (Map.Entry <String, String> header : this.requestHeaders.entrySet()) {
+      req.addHeader(header.getKey(), header.getValue());
+    }
+    for (Map.Entry <String, String> queryParam : request.getQueryParams().entrySet()) {
+      req.addQueryParam(queryParam.getKey(), queryParam.getValue());
+    }
 
     return makeCall(req);
   }

src/test/java/com/sendgrid/MockSendGrid.java

@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 
 public class MockSendGrid extends SendGrid {
   Request request;
@@ -13,10 +14,11 @@ public MockSendGrid(String apiKey) {
   public Response makeCall(Request request) throws IOException {
     this.request = request;
     Response response = new Response();
-    response.statusCode = 200;
-    response.body = "{\"message\":\"success\"}";
-    response.headers = new HashMap<String, String>();
-    response.headers.put("Test", "Header");
+    response.setStatusCode(200);
+    response.setBody("{\"message\":\"success\"}");
+    Map<String, String> headers = new HashMap<>();
+    headers.put("Test", "Header");
+    response.setHeaders(headers);
     return response;
   }