Refactoring, correct package and fluent interface

README.md

@@ -99,7 +99,10 @@ The following is the minimum needed code to send an email with the [/mail/send H
 
 ```java
 import com.sendgrid.*;
-import java.io.IOException;
+import com.sendgrid.helpers.mail.Mail;
+import com.sendgrid.helpers.mail.objects.Content;
+import com.sendgrid.helpers.mail.objects.Email;
+import com.sendgrid.helpers.mail.objects.Personalization;
 
 public class Example {
   public static void main(String[] args) throws IOException {
@@ -126,6 +129,40 @@ public class Example {
 }
 ```
 
+or using fluence interface
+
+```java
+import com.sendgrid.*;
+import com.sendgrid.helpers.mail.Mail;
+import com.sendgrid.helpers.mail.objects.Content;
+import com.sendgrid.helpers.mail.objects.Email;
+import com.sendgrid.helpers.mail.objects.Personalization;
+
+public class Example {
+    public static void main(String[] args) throws IOException {
+        Mail mail = new Mail()
+                .setFrom(new Email("[email protected]"))
+                .setSubject("Hello World from the SendGrid Java Library!")
+                .addPersonalization(new Personalization()
+                        .addTo(new Email("[email protected]")))
+                .addContent(new Content("text/plain", "Hello, Email!"));
+        SendGrid sg = new SendGrid(System.getenv("SENDGRID_API_KEY"));
+        Request request = new Request();
+        try {
+            request.method = Method.POST;
+            request.endpoint = "mail/send";
+            request.body = mail.build();
+            Response response = sg.api(request);
+            System.out.println(response.statusCode);
+            System.out.println(response.body);
+            System.out.println(response.headers);
+        } catch (IOException ex) {
+            throw ex;
+        }
+    }
+}
+```
+
 The `Mail` constructor creates a [personalization object](https://sendgrid.com/docs/Classroom/Send/v3_Mail_Send/personalizations.html) for you. [Here](https://github.com/sendgrid/sendgrid-java/blob/master/examples/helpers/mail/Example.java#L221) is an example of how to add to it.
 
 ### Without Mail Helper Class

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

@@ -5,107 +5,107 @@
 import java.util.Map;
 
 /**
-  * Class SendGrid allows for quick and easy access to the SendGrid API.
-  */
+ * Class SendGrid allows for quick and easy access to the SendGrid API.
+ */
 public class SendGrid {
-  private static final String VERSION = "3.0.0";
-  private static final String USER_AGENT = "sendgrid/" + VERSION + ";java";
-
-  private String apiKey;
-  private String host;
-  private String version;
-  private Client client;
-  private Map<String,String> requestHeaders;
-
-  /**
-    * @param apiKey is your SendGrid API Key: https://app.sendgrid.com/settings/api_keys
-    */
-  public SendGrid(String apiKey) {
-    this.client = new Client();
-    initializeSendGrid(apiKey);
-  }
-
-  /**
-    * @param apiKey is your SendGrid API Key: https://app.sendgrid.com/settings/api_keys
-    * @param test is true if you are unit testing
-    */
-  public SendGrid(String apiKey, Boolean test) {
-    this.client = new Client(test);
-    initializeSendGrid(apiKey);
-  }
-
-  /**
-   * @param apiKey is your SendGrid API Key: https://app.sendgrid.com/settings/api_keys
-   * @param client the Client to use (allows to customize its configuration)
-   */
-  public SendGrid(String apiKey, Client client) {
-    this.client = client;
-    initializeSendGrid(apiKey);
-  }
-
-  public void initializeSendGrid(String apiKey) {
-    this.apiKey = apiKey;
-    this.host = "api.sendgrid.com";
-    this.version = "v3";
-    this.requestHeaders = new HashMap<String, String>();
-    this.requestHeaders.put("Authorization", "Bearer " + apiKey);
-    this.requestHeaders.put("User-agent", USER_AGENT);
-    this.requestHeaders.put("Accept", "application/json");
-  }
-
-  public String getLibraryVersion() {
-    return this.VERSION;
-  }
-
-  public String getVersion() {
-    return this.version;
-  }
-
-  public void setVersion(String version) {
-    this.version = version;
-  }
-
-  public Map<String,String> getRequestHeaders() {
-    return this.requestHeaders;
-  }
-
-  public Map<String,String> addRequestHeader(String key, String value) {
-    this.requestHeaders.put(key, value);
-    return getRequestHeaders();
-  }
-
-  public Map<String,String> removeRequestHeader(String key) {
-    this.requestHeaders.remove(key);
-    return getRequestHeaders();
-  }
-
-  public String getHost() {
-    return this.host;
-  }
-
-  public void setHost(String host) {
-    this.host = host;
-  }
-
-  /**
-    * Class makeCall makes the call to the SendGrid API, override this method for testing.
-    */
-  public Response makeCall(Request request) throws IOException {
-    return client.api(request);
-  }
-
-  /**
-    * Class api sets up the request to the SendGrid API, this is main interface.
-    */
-  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;
-
-    return makeCall(req);
-  }
+	private static final String VERSION = "3.0.0";
+	private static final String USER_AGENT = "sendgrid/" + VERSION + ";java";
+
+	private String apiKey;
+	private String host;
+	private String version;
+	private final Client client;
+	private Map<String, String> requestHeaders;
+
+	/**
+	 * @param apiKey is your SendGrid API Key: https://app.sendgrid.com/settings/api_keys
+	 */
+	public SendGrid(final String apiKey) {
+		this.client = new Client();
+		initializeSendGrid(apiKey);
+	}
+
+	/**
+	 * @param apiKey is your SendGrid API Key: https://app.sendgrid.com/settings/api_keys
+	 * @param test   is true if you are unit testing
+	 */
+	public SendGrid(final String apiKey, final Boolean test) {
+		this.client = new Client(test);
+		initializeSendGrid(apiKey);
+	}
+
+	/**
+	 * @param apiKey is your SendGrid API Key: https://app.sendgrid.com/settings/api_keys
+	 * @param client the Client to use (allows to customize its configuration)
+	 */
+	public SendGrid(final String apiKey, final Client client) {
+		this.client = client;
+		initializeSendGrid(apiKey);
+	}
+
+	private void initializeSendGrid(final String apiKey) {
+		this.apiKey = apiKey;
+		this.host = "api.sendgrid.com";
+		this.version = "v3";
+		this.requestHeaders = new HashMap<>();
+		this.requestHeaders.put("Authorization", "Bearer " + apiKey);
+		this.requestHeaders.put("User-agent", USER_AGENT);
+		this.requestHeaders.put("Accept", "application/json");
+	}
+
+	public String getLibraryVersion() {
+		return VERSION;
+	}
+
+	public String getVersion() {
+		return this.version;
+	}
+
+	public void setVersion(final String version) {
+		this.version = version;
+	}
+
+	public Map<String, String> getRequestHeaders() {
+		return this.requestHeaders;
+	}
+
+	public Map<String, String> addRequestHeader(final String key, final String value) {
+		this.requestHeaders.put(key, value);
+		return getRequestHeaders();
+	}
+
+	public Map<String, String> removeRequestHeader(final String key) {
+		this.requestHeaders.remove(key);
+		return getRequestHeaders();
+	}
+
+	public String getHost() {
+		return this.host;
+	}
+
+	public void setHost(final String host) {
+		this.host = host;
+	}
+
+	/**
+	 * Class makeCall makes the call to the SendGrid API, override this method for testing.
+	 */
+	public Response makeCall(final Request request) throws IOException {
+		return this.client.api(request);
+	}
+
+	/**
+	 * Class api sets up the request to the SendGrid API, this is main interface.
+	 */
+	public Response api(final Request request) throws IOException {
+		final Request req = new Request();
+		req.method = request.method;
+		req.baseUri = this.host;
+		req.endpoint = "/" + this.version + "/" + request.endpoint;
+		req.body = request.body;
+		req.headers = this.requestHeaders;
+		req.queryParams = request.queryParams;
+
+		return makeCall(req);
+	}
 }