Merge pull request #32 from kalnik-a-a/master

Add 'sandbox' and 'ip_pool' parameters to transmission options

Author: yepher

libs/sparkpost-lib/src/main/java/com/sparkpost/model/OptionsAttributes.java

@@ -50,6 +50,13 @@ public class OptionsAttributes extends Base {
     @Description(value = "Whether message is transactional or non-transactional for unsubscribe and suppression purposes", sample = {""})
     private Boolean transactional = false;
 
+    /**
+     * Whether or not to use the sandbox sending domain ( Note: SparkPost only )
+     */
+    @Description(value = "Whether or not to use the sandbox sending domain ( Note: SparkPost only ). defaults to false.", sample = {""})
+    @SerializedName("sandbox")
+    private Boolean sandbox = false;
+
     /**
      * Unlike most other options, this flag is omitted on a GET transmission
      * response unless the flag's value is true.
@@ -61,6 +68,16 @@ public class OptionsAttributes extends Base {
     @SerializedName("skip_suppression")
     private Boolean skipSuppression;
 
+    /**
+     * The name of a dedicated IP pool associated with your account.
+     * If this field is not provided, the account's default dedicated IP pool is used (if such a pool exists).
+     * To explicitly bypass the account's default dedicated IP pool and instead fallback to the shared pool,
+     * specify a value of "sp_shared".
+     */
+    @Description(value = "The name of a dedicated IP pool associated with your account.", sample = {"sp_shared"})
+    @SerializedName("ip_pool")
+    private String ipPool;
+
     /**
      * Whether or not to perform CSS inlining in HTML content
      * Defaults to false

libs/sparkpost-lib/src/test/java/com/sparkpost/model/OptionsAttributesTest.java

@@ -19,7 +19,9 @@ public class OptionsAttributesTest {
             + "      \"open_tracking\": true,\n"
             + "      \"click_tracking\": true,\n"
             + "      \"transactional\": true,\n"
-            + "      \"skip_suppression\": true\n"
+            + "      \"sandbox\": true,\n"
+            + "      \"skip_suppression\": true,\n"
+            + "      \"ip_pool\":\"sp_shared\"\n"
             + "}";
 
     @BeforeClass
@@ -52,7 +54,9 @@ public void testDecodeOptionsAttributes() {
         Assert.assertTrue(optionsAttributes.getClickTracking());
         Assert.assertTrue(optionsAttributes.getOpenTracking());
         Assert.assertTrue(optionsAttributes.getSkipSuppression());
+        Assert.assertEquals(optionsAttributes.getIpPool(), "sp_shared");
         Assert.assertTrue(optionsAttributes.getTransactional());
+        Assert.assertTrue(optionsAttributes.getSandbox());
 
     }