Merge branch 'master' of github.com:sendgrid/sendgrid-java

Author: elbuo8

README.md

@@ -103,50 +103,106 @@ sendgrid.send(email);
 
 ### To
 
+#### addTo
+
 ```java
-email.addTo("[email protected]");
+email.addTo("[email protected]");
+// or
+email.addTo(["[email protected]", "[email protected]"]);
+// or
+email.addTo("[email protected]", "Foo Bar");
+```
+
+#### setTo
+
+```java
+email.setTo(["[email protected]", "[email protected]"]);
+```
+
+#### addToName
+
+```java
+email.addToName("Foo");
+// or
+email.addToName(["Foo", "Bar"]);
+```
+
+#### setToName
+
+```java
+email.setToName(["Foo", "Bar"]);
+```
+
+#### addCc
+
+```java
+email.addCc("[email protected]");
 // or
-email.setTo(["[email protected]"]);
+email.addCc(["[email protected]", "[email protected]"]);
+```
+
+#### setCc
+
+```java
+email.setCc(["[email protected]", "[email protected]"]);
+```
+
+#### addBcc
+
+```java
+email.addBcc("[email protected]");
+// or
+email.addBcc(["[email protected]", "[email protected]"]);
+```
+
+#### setBcc
+
+```java
+email.setBcc(["[email protected]", "[email protected]"]);
 ```
 
 ### From
 
+#### setFrom
+
 ```java
 email.setFrom("[email protected]");
 ```
 
-### From Name
+#### setFromName
 
 ```java
 email.setFromName("Other Dude");
 ```
 
-### Reply To
+#### setReplyTo
 
 ```java
 email.setReplyTo("[email protected]");
 ```
 
-### Subject
+#### setSubject
 
 ```java
 email.setSubject("Hello World");
 ```
 
-### Text
+#### setText
 
 ```java
 email.setText("This is some text of the email.");
 ```
 
-### Html
+#### setHtml
 
 ```java
 email.setHtml("<h1>My first email through SendGrid");
 ```
 
 ### Attachments
 
+#### addAttachment
+
 ```java
 email.addAttachment("text.txt", "contents");
 // or
@@ -157,6 +213,8 @@ email.addAttachment("text.txt", new InputStream(new File("./file.txt")));
 
 ### Content IDs
 
+#### addContentId
+
 ```java
 // First, add an attachment
 email.addAttachment("image.png", new File("./image.png"));
@@ -185,25 +243,36 @@ email.getSMTPAPI();
 
 ### Recipients
 
+#### addSmtpApiTo
+
 ```java
-email.addSmtpApiTo("email@email.com");
+email.addSmtpApiTo("foo@example.com");
 // or
-email.addSmtpApiTo(["email@email.com"]);
+email.addSmtpApiTo(["[email protected]", "bar@other.com"]);
 ```
 
-
 ### [Substitutions](http://sendgrid.com/docs/API_Reference/SMTP_API/substitution_tags.html)
 
+#### addSubstitution
+
 ```java
 email.addSubstitution("key", "value");
-// or
+
+JSONObject subs = header.getSubstitutions();
+```
+
+#### setSubstitutions
+
+```java
 email.setSubstitutions("key", ["value1", "value2"]);
 
 JSONObject subs = header.getSubstitutions();
 ```
 
 ### [Unique Arguments](http://sendgrid.com/docs/API_Reference/SMTP_API/unique_arguments.html)
 
+#### addUniqueAarg
+
 ```java
 email.addUniqueAarg("key", "value");
 // or
@@ -219,37 +288,32 @@ email.setUniqueArgs(map);
 
 JSONObject args = email.getUniqueArgs();
 ```
+
 ### [Categories](http://sendgrid.com/docs/API_Reference/SMTP_API/categories.html)
 
+#### addCategory
+
 ```java
 email.addCategory("category");
-// or
-email.addCategory(["categories"]);
-// or
-email.setCategories(["category1", "category2"]);
-// or
-email.setCategories(["category1", category2"]);
 
 String[] cats = email.getCategories();
 ```
 
 ### [Sections](http://sendgrid.com/docs/API_Reference/SMTP_API/section_tags.html)
 
+#### addSection
+
 ```java
 email.addSection("key", "section");
-// or
-Map newSec = new HashMap();
-newSec.put("-section-", "value");
-email.setSections(newSec);
-// or
-JSONObject newSec = new JSONObject();
-newSec.put("-section-", "value");
-email.setSections(newSec);
 
 JSONObject sections = email.getSections();
 ```
 
-### [Filters](http://sendgrid.com/docs/API_Reference/SMTP_API/apps.html)
+### [Filters / Apps](http://sendgrid.com/docs/API_Reference/SMTP_API/apps.html)
+
+You can enable and configure Apps.
+
+#### addFilter
 
 ```java
 email.addFilter("filter", "setting", "value");
@@ -258,15 +322,7 @@ email.addFilter("filter", "setting", 1);
 JSONObject filters = email.getFilters();
 ```
 
-### Get Headers
-
-```java
-String headers = email.jsonString();
-```
-
-### Filters/Apps
-
-You can enable and configure Apps.
+Example enabling bcc app:
 
 ```java
 SendGrid sendgrid = new SendGrid("sendgrid_username", "sendgrid_password");
@@ -276,6 +332,22 @@ sendgrid.addFilter("bcc", "enabled", 1);
 sendgrid.addFilter("bcc", "email", "[email protected]");
 ```
 
+### [ASM - Advanced Supression Manager](https://sendgrid.com/docs/User_Guide/advanced_suppression_manager.html)
+
+#### setASMGroupId
+
+```java
+email.setASMGroupId(1);
+```
+
+### [Schedule Sending](https://sendgrid.com/docs/API_Reference/SMTP_API/scheduling_parameters.html)
+
+#### setSendAt
+
+```java
+email.setSendAt(1409348513);
+```
+
 ## Contributing
 
 1. Fork it