Changed Request and Response variables to be non-redundant

Author: thinkingserious

CONTRIBUTING.md

@@ -89,7 +89,7 @@ source ./sendgrid.env
 ```bash
 ./gradelew build
 cd examples
-javac -classpath ./commons-logging-1.2.jar:./httpcore-4.4.4.jar:./httpclient-4.5.2.jar:./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:../target/http-1.0-SNAPSHOT.jar:. Example.java && java -classpath ./commons-logging-1.2.jar:./httpcore-4.4.4.jar:./httpclient-4.5.2.jar:./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:../target/http-1.0-SNAPSHOT.jar:. Example
+javac -classpath ./commons-logging-1.2.jar:./httpcore-4.4.4.jar:./httpclient-4.5.2.jar:./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:../repo/com/sendgrid/2.0.0/sendgrid-java-http-client-2.0.0-jar.jar:. Example.java && java -classpath ./commons-logging-1.2.jar:./httpcore-4.4.4.jar:./httpclient-4.5.2.jar:./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:../repo/com/sendgrid/2.0.0/sendgrid-java-http-client-2.0.0-jar.jar:. Example
 ```
 
 <a name="understanding_the_codebase"></a>

README.md

@@ -61,8 +61,8 @@ request.endpoint = "/your/api/" + param + "/call";
 try {
     Response response = client.api(request);
     System.out.println(response.statusCode);
-    System.out.println(response.responseBody);
-    System.out.println(response.responseHeaders);
+    System.out.println(response.body);
+    System.out.println(response.headers);
 } catch (IOException ex) {
     throw ex;
 }
@@ -74,21 +74,21 @@ try {
 Map<String,String> requestHeaders = new HashMap<String, String>();
 requestHeaders.put("Authorization", "Bearer " + System.getenv("SENDGRID_API_KEY"));
 requestHeaders.put("Content-Type", "application/json");
-request.requestHeaders = requestHeaders;
+request.headers = requestHeaders;
 Map<String,String> queryParams = new HashMap<String, String>();
 queryParams.put("limit", "100");
 queryParams.put("offset", "0");
 request.queryParams = queryParams;
-request.requestBody ="{\"name\": \"My Request Body\"}";
+request.body ="{\"name\": \"My Request Body\"}";
 request.method = Method.POST;
 String param = "param";
 request.endpoint = "/your/api/" + param + "/call";
 
 try {
     Response response = client.api(request);
     System.out.println(response.statusCode);
-    System.out.println(response.responseBody);
-    System.out.println(response.responseHeaders);
+    System.out.println(response.body);
+    System.out.println(response.headers);
 } catch (IOException ex) {
     throw ex;
 }
@@ -111,7 +111,7 @@ source ./sendgrid.env
 ```bash
 mvn package
 cd examples
-javac -classpath ./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:/{path_to}/java-http-client-1.0.0-jar.jar:. Example.java && java -classpath ./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:/{path_to}/java-http-client-1.0.0-jar.jar:. Example
+javac -classpath ./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:/{path_to}/java-http-client-2.0.0-jar.jar:. Example.java && java -classpath ./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:/{path_to}/java-http-client-2.0.0-jar.jar:. Example
 ```
 
 ## Roadmap

build.gradle

@@ -17,7 +17,7 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 group         = 'com.sendgrid'
-version       = '1.0.0'
+version       = '2.0.0'
 ext.packaging = 'jar'
 
 allprojects {

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

@@ -39,14 +39,14 @@
 public class Client {
 
   private CloseableHttpClient httpClient;
-  
+
   /**
   * Constructor for using the default CloseableHttpClient.
   */
   public Client() {
     this.httpClient = HttpClients.createDefault();
   }
-  
+
   /**
   * Constructor for passing in an httpClient for mocking.
   *
@@ -55,7 +55,7 @@ public Client() {
   public Client(CloseableHttpClient httpClient) {
     this.httpClient = httpClient;
   }
-  
+
   /**
     * Add query parameters to a URL.
     *
@@ -67,22 +67,22 @@ public URI buildUri(String baseUri, String endpoint, Map<String,String> queryPar
       throws URISyntaxException {
     URIBuilder builder = new URIBuilder();
     URI uri;
-    
+
     builder.setScheme("https");
-    builder.setHost(baseUri); 
-    builder.setPath(endpoint);          
+    builder.setHost(baseUri);
+    builder.setPath(endpoint);
     if (queryParams != null) {
       for (Map.Entry<String, String> entry : queryParams.entrySet()) {
         builder.setParameter(entry.getKey(), entry.getValue());
-      }   
+      }
     }
-    
+
     try {
       uri = builder.build();
     } catch (URISyntaxException ex) {
       throw ex;
     }
-    
+
     return uri;
   }
 
@@ -94,24 +94,24 @@ public URI buildUri(String baseUri, String endpoint, Map<String,String> queryPar
   public Response getResponse(CloseableHttpResponse response) throws IOException {
     ResponseHandler<String> handler = new BasicResponseHandler();
     String responseBody = "";
-    
+
     int statusCode = response.getStatusLine().getStatusCode();
-    
+
     try {
       responseBody = handler.handleResponse(response);
     } catch (IOException ex) {
       throw ex;
     }
-    
+
     Header[] headers = response.getAllHeaders();
     Map<String,String> responseHeaders = new HashMap<String,String>();
     for (Header h:headers) {
       responseHeaders.put(h.getName(), h.getValue());
     }
-    
+
     return new Response(statusCode, responseBody, responseHeaders);
   }
-  
+
   /**
     * Make a GET request and provide the status code, response body and response headers.
     */
@@ -120,21 +120,21 @@ public Response get(Request request) throws URISyntaxException, IOException {
     Response response = new Response();
     URI uri = null;
     HttpGet httpGet = null;
-    
+
     try {
       uri = buildUri(request.baseUri, request.endpoint, request.queryParams);
-      httpGet = new HttpGet(uri.toString()); 
+      httpGet = new HttpGet(uri.toString());
     } catch (URISyntaxException ex) {
       throw ex;
     }
-    
-    if (request.requestHeaders != null) {
-      for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+
+    if (request.headers != null) {
+      for (Map.Entry<String, String> entry : request.headers.entrySet()) {
         httpGet.setHeader(entry.getKey(), entry.getValue());
-      }            
+      }
     }
-    
-    
+
+
     try {
       serverResponse = httpClient.execute(httpGet);
       response = getResponse(serverResponse);
@@ -145,10 +145,10 @@ public Response get(Request request) throws URISyntaxException, IOException {
         serverResponse.close();
       }
     }
-    
+
     return response;
   }
-  
+
   /**
     * Make a POST request and provide the status code, response body and response headers.
     */
@@ -157,26 +157,26 @@ public Response post(Request request) throws URISyntaxException, IOException {
     Response response = new Response();
     URI uri = null;
     HttpPost httpPost = null;
-    
+
     try {
       uri = buildUri(request.baseUri, request.endpoint, request.queryParams);
-      httpPost = new HttpPost(uri.toString()); 
+      httpPost = new HttpPost(uri.toString());
     } catch (URISyntaxException ex) {
       throw ex;
     }
-    
-    if (request.requestHeaders != null) {
-      for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+
+    if (request.headers != null) {
+      for (Map.Entry<String, String> entry : request.headers.entrySet()) {
         httpPost.setHeader(entry.getKey(), entry.getValue());
-      }            
+      }
     }
-    
+
     try {
-      httpPost.setEntity(new StringEntity(request.requestBody));
+      httpPost.setEntity(new StringEntity(request.body));
     } catch (IOException ex) {
       throw ex;
     }
-    
+
     try {
       serverResponse = httpClient.execute(httpPost);
       response = getResponse(serverResponse);
@@ -188,38 +188,38 @@ public Response post(Request request) throws URISyntaxException, IOException {
         serverResponse.close();
       }
     }
-    
+
     return response;
   }
 
   /**
     * Make a PATCH request and provide the status code, response body and response headers.
-    */    
+    */
   public Response patch(Request request) throws URISyntaxException, IOException {
     CloseableHttpResponse serverResponse = null;
     Response response = new Response();
     URI uri = null;
     HttpPatch httpPatch = null;
-    
+
     try {
       uri = buildUri(request.baseUri, request.endpoint, request.queryParams);
-      httpPatch = new HttpPatch(uri.toString()); 
+      httpPatch = new HttpPatch(uri.toString());
     } catch (URISyntaxException ex) {
       throw ex;
     }
-    
-    if (request.requestHeaders != null) {
-      for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+
+    if (request.headers != null) {
+      for (Map.Entry<String, String> entry : request.headers.entrySet()) {
         httpPatch.setHeader(entry.getKey(), entry.getValue());
-      }            
+      }
     }
-    
+
     try {
-      httpPatch.setEntity(new StringEntity(request.requestBody));
+      httpPatch.setEntity(new StringEntity(request.body));
     } catch (IOException ex) {
       throw ex;
     }
-    
+
     try {
       serverResponse = httpClient.execute(httpPatch);
       response = getResponse(serverResponse);
@@ -231,7 +231,7 @@ public Response patch(Request request) throws URISyntaxException, IOException {
         serverResponse.close();
       }
     }
-    
+
     return response;
   }
 
@@ -243,27 +243,27 @@ public Response put(Request request) throws URISyntaxException, IOException {
     Response response = new Response();
     URI uri = null;
     HttpPut httpPut = null;
-    
+
     try {
       uri = buildUri(request.baseUri, request.endpoint, request.queryParams);
-      httpPut = new HttpPut(uri.toString()); 
+      httpPut = new HttpPut(uri.toString());
     } catch (URISyntaxException ex) {
       throw ex;
     }
-    
-    if (request.requestHeaders != null) {
-      for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+
+    if (request.headers != null) {
+      for (Map.Entry<String, String> entry : request.headers.entrySet()) {
         httpPut.setHeader(entry.getKey(), entry.getValue());
-      }            
+      }
     }
-    
-    
+
+
     try {
-      httpPut.setEntity(new StringEntity(request.requestBody));
+      httpPut.setEntity(new StringEntity(request.body));
     } catch (IOException ex) {
       throw ex;
     }
-    
+
     try {
       serverResponse = httpClient.execute(httpPut);
       response = getResponse(serverResponse);
@@ -275,7 +275,7 @@ public Response put(Request request) throws URISyntaxException, IOException {
         serverResponse.close();
       }
     }
-    
+
     return response;
   }
 
@@ -287,20 +287,20 @@ public Response delete(Request request) throws URISyntaxException, IOException {
     Response response = new Response();
     URI uri = null;
     HttpDelete httpDelete = null;
-    
+
     try {
       uri = buildUri(request.baseUri, request.endpoint, request.queryParams);
-      httpDelete = new HttpDelete(uri.toString()); 
+      httpDelete = new HttpDelete(uri.toString());
     } catch (URISyntaxException ex) {
       throw ex;
     }
-    
-    if (request.requestHeaders != null) {
-      for (Map.Entry<String, String> entry : request.requestHeaders.entrySet()) {
+
+    if (request.headers != null) {
+      for (Map.Entry<String, String> entry : request.headers.entrySet()) {
         httpDelete.setHeader(entry.getKey(), entry.getValue());
-      }            
+      }
     }
-    
+
     try {
       serverResponse = httpClient.execute(httpDelete);
       response = getResponse(serverResponse);
@@ -312,10 +312,10 @@ public Response delete(Request request) throws URISyntaxException, IOException {
         serverResponse.close();
       }
     }
-    
+
     return response;
   }
-  
+
   /**
     * A thin wrapper around the HTTP methods.
     */
@@ -325,15 +325,15 @@ public Response api(Request request) throws IOException {
         throw new IOException("We only support GET, PUT, PATCH, POST and DELETE.");
       }
       switch (request.method) {
-        case GET:  
+        case GET:
           return get(request);
-        case POST:  
+        case POST:
           return post(request);
-        case PUT:  
+        case PUT:
           return put(request);
         case PATCH:
           return patch(request);
-        case DELETE:  
+        case DELETE:
           return delete(request);
         default:
           throw new IOException("We only support GET, PUT, PATCH, POST and DELETE.");