Made Response class variables private, issue #12

Diego Andres Camargo · diegoc-am · commit 02034bb0d657 · 2016-10-05T00:39:45.000-05:00
diff --git a/README.md b/README.md
@@ -66,9 +66,9 @@ request.endpoint = "/your/api/" + param + "/call";
 
 try {
     Response response = client.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
 } catch (IOException ex) {
     throw ex;
 }
@@ -91,9 +91,9 @@ request.endpoint = "/your/api/" + param + "/call";
 
 try {
     Response response = client.api(request);
-    System.out.println(response.statusCode);
-    System.out.println(response.body);
-    System.out.println(response.headers);
+    System.out.println(response.getStatusCode());
+    System.out.println(response.getBody());
+    System.out.println(response.getHeaders());
 } catch (IOException ex) {
     throw ex;
 }
diff --git a/examples/Example.java b/examples/Example.java
@@ -33,9 +33,9 @@ public static void main(String[] args) throws IOException {
     request.queryParams = queryParams;
     try {
       response = client.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -48,16 +48,16 @@ public static void main(String[] args) throws IOException {
         "{\"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.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
     String apiKeyId = "";
     try {
       ObjectMapper mapper = new ObjectMapper();
-      JsonNode json = mapper.readTree(response.body);
+      JsonNode json = mapper.readTree(response.getBody());
       apiKeyId = json.path("api_key_id").asText();
     } catch (IOException ex) {
       throw ex;
@@ -69,9 +69,9 @@ public static void main(String[] args) throws IOException {
     request.endpoint = "/v3/api_keys/" + apiKeyId;
     try {
       response = client.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -81,9 +81,9 @@ public static void main(String[] args) throws IOException {
     request.body = "{\"name\": \"A New Hope\"}";
     try {
       response = client.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -95,9 +95,9 @@ public static void main(String[] args) throws IOException {
           "{\"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.body);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getBody());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
@@ -107,8 +107,8 @@ public static void main(String[] args) throws IOException {
     request.method = Method.DELETE;
     try {
       response = client.api(request);
-      System.out.println(response.statusCode);
-      System.out.println(response.headers);
+      System.out.println(response.getStatusCode());
+      System.out.println(response.getHeaders());
     } catch (IOException ex) {
       throw ex;
     }
diff --git a/src/main/java/com/sendgrid/Client.java b/src/main/java/com/sendgrid/Client.java
@@ -285,9 +285,9 @@ private Response executeApiCall(HttpRequestBase httpPost) throws IOException {
 			final StatusLine statusLine = serverResponse.getStatusLine();
 			if(statusLine.getStatusCode()>=300){
 				//throwing IOException here to not break API behavior.
-				throw new IOException("Request returned status Code "+statusLine.getStatusCode()+"Body:"+(response!=null?response.body:null));
+				throw new IOException("Request returned status Code "+statusLine.getStatusCode()+"Body:"+(response!=null?response.getBody():null));
 			}
-	
+
 		} finally {
 			if (serverResponse != null) {
 				serverResponse.close();
diff --git a/src/main/java/com/sendgrid/Response.java b/src/main/java/com/sendgrid/Response.java
@@ -6,9 +6,9 @@
   * Class Response provides a standard interface to an API's response.
   */
 public class Response {
-  public int statusCode;
-  public String body;
-  public Map<String,String> headers;
+  private int statusCode;
+  private String body;
+  private Map<String, String> headers;
 
   /**
     * Set the API's response.
@@ -32,4 +32,27 @@ public void reset() {
     this.headers = null;
   }
 
+  public int getStatusCode() {
+    return this.statusCode;
+  }
+
+  public String getBody() {
+    return this.body;
+  }
+
+  public Map<String, String> getHeaders() {
+    return this.headers;
+  }
+
+  public void setStatusCode(int statusCode) {
+    this.statusCode = statusCode;
+  }
+
+  public void setBody(String body) {
+    this.body = body;
+  }
+
+  public void setHeaders(Map<String, String> headers) {
+    this.headers = headers;
+  }
 }
diff --git a/src/test/java/com/sendgrid/ClientTest.java b/src/test/java/com/sendgrid/ClientTest.java
@@ -101,13 +101,13 @@ public void testGetResponse() {
       Assert.assertTrue(errors.toString(), false);
     }
 
-    Assert.assertTrue(testResponse.statusCode == 200);
-    Assert.assertEquals(testResponse.body, "{\"message\":\"success\"}");
+    Assert.assertTrue(testResponse.getStatusCode() == 200);
+    Assert.assertEquals(testResponse.getBody(), "{\"message\":\"success\"}");
     Map<String,String> headers = new HashMap<String,String>();
     for (Header h:mockedHeaders) {
       headers.put(h.getName(), h.getValue());
     }
-    Assert.assertEquals(testResponse.headers, headers);
+    Assert.assertEquals(testResponse.getHeaders(), headers);
   }
 
   public void testMethod(Method method, int statusCode) {
@@ -140,16 +140,16 @@ public void testMethod(Method method, int statusCode) {
       Assert.assertTrue(errors.toString(), false);
     }
 
-    Assert.assertTrue(testResponse.statusCode == statusCode);
+    Assert.assertTrue(testResponse.getStatusCode() == statusCode);
     if (method != Method.DELETE) {
-      Assert.assertEquals(testResponse.body, "{\"message\":\"success\"}");
+      Assert.assertEquals(testResponse.getBody(), "{\"message\":\"success\"}");
     }
-    Assert.assertEquals(testResponse.body, "{\"message\":\"success\"}");
+    Assert.assertEquals(testResponse.getBody(), "{\"message\":\"success\"}");
     Map<String,String> headers = new HashMap<String,String>();
     for (Header h:mockedHeaders) {
       headers.put(h.getName(), h.getValue());
     }
-    Assert.assertEquals(testResponse.headers, headers);
+    Assert.assertEquals(testResponse.getHeaders(), headers);
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,13 @@ public void testGetResponse() {`
`101`	`101`	`Assert.assertTrue(errors.toString(), false);`
`102`	`102`	`}`
`103`	`103`
`104`		`- Assert.assertTrue(testResponse.statusCode == 200);`
`105`		`- Assert.assertEquals(testResponse.body, "{\"message\":\"success\"}");`
	`104`	`+ Assert.assertTrue(testResponse.getStatusCode() == 200);`
	`105`	`+ Assert.assertEquals(testResponse.getBody(), "{\"message\":\"success\"}");`
`106`	`106`	`Map<String,String> headers = new HashMap<String,String>();`
`107`	`107`	`for (Header h:mockedHeaders) {`
`108`	`108`	`headers.put(h.getName(), h.getValue());`
`109`	`109`	`}`
`110`		`- Assert.assertEquals(testResponse.headers, headers);`
	`110`	`+ Assert.assertEquals(testResponse.getHeaders(), headers);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`public void testMethod(Method method, int statusCode) {`
`@@ -140,16 +140,16 @@ public void testMethod(Method method, int statusCode) {`
`140`	`140`	`Assert.assertTrue(errors.toString(), false);`
`141`	`141`	`}`
`142`	`142`
`143`		`- Assert.assertTrue(testResponse.statusCode == statusCode);`
	`143`	`+ Assert.assertTrue(testResponse.getStatusCode() == statusCode);`
`144`	`144`	`if (method != Method.DELETE) {`
`145`		`- Assert.assertEquals(testResponse.body, "{\"message\":\"success\"}");`
	`145`	`+ Assert.assertEquals(testResponse.getBody(), "{\"message\":\"success\"}");`
`146`	`146`	`}`
`147`		`- Assert.assertEquals(testResponse.body, "{\"message\":\"success\"}");`
	`147`	`+ Assert.assertEquals(testResponse.getBody(), "{\"message\":\"success\"}");`
`148`	`148`	`Map<String,String> headers = new HashMap<String,String>();`
`149`	`149`	`for (Header h:mockedHeaders) {`
`150`	`150`	`headers.put(h.getName(), h.getValue());`
`151`	`151`	`}`
`152`		`- Assert.assertEquals(testResponse.headers, headers);`
	`152`	`+ Assert.assertEquals(testResponse.getHeaders(), headers);`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`@Test`