Merge pull request #3 from sendgrid/request_body

Request body

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 {

examples/Example.java

@@ -15,16 +15,16 @@
 public class Example {
   public static void main(String[] args) throws IOException {
     Client client = new Client();
-    
+
     Request request = new Request();
     request.baseUri = "api.sendgrid.com";
     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;
+
     Response response = new Response();
-    
+
     // GET Collection
     request.method = Method.GET;
     request.endpoint = "/v3/api_keys";
@@ -35,81 +35,81 @@ public static void main(String[] args) throws IOException {
     try {
       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;
     }
     request.queryParams = null;
-    
+
     // POST
     request.method = Method.POST;
     request.endpoint = "/v3/api_keys";
-    request.requestBody =
+    request.body =
         "{\"name\": \"My api Key\",\"scopes\": [\"mail.send\",\"alerts.create\",\"alerts.read\"]}";
     try {
       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;
     }
     String apiKeyId = "";
     try {
       ObjectMapper mapper = new ObjectMapper();
-      JsonNode json = mapper.readTree(response.responseBody);
-      apiKeyId = json.path("api_key_id").asText(); 
+      JsonNode json = mapper.readTree(response.body);
+      apiKeyId = json.path("api_key_id").asText();
     } catch (IOException ex) {
       throw ex;
     }
-    request.requestBody = "";
-    
+    request.body = "";
+
     // GET Single
     request.method = Method.GET;
     request.endpoint = "/v3/api_keys/" + apiKeyId;
     try {
       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;
     }
-    
+
     // PATCH
     request.method = Method.PATCH;
-    request.requestBody = "{\"name\": \"A New Hope\"}";
+    request.body = "{\"name\": \"A New Hope\"}";
     try {
       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;
     }
-    request.requestBody = "";
-    
+    request.body = "";
+
     // PUT
     request.method = Method.PUT;
-    request.requestBody =
+    request.body =
           "{\"name\": \"A New Hope\",\"scopes\": [\"user.profile.read\",\"user.profile.update\"]}";
     try {
       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;
     }
-    request.requestBody = "";
-    
+    request.body = "";
+
     // DELETE
     request.method = Method.DELETE;
     try {
       response = client.api(request);
       System.out.println(response.statusCode);
-      System.out.println(response.responseHeaders);
+      System.out.println(response.headers);
     } catch (IOException ex) {
       throw ex;
     }