Adds ability to set sub account

Author: Chris Wilson

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

@@ -38,5 +38,8 @@ public class WebhookDescription extends Base {
             value = "Restrict which inbound messages will be relayed to the target",
             sample = {"\"match\": { \"protocol\": \"SMTP\", \"domain\": \"replies.customer.example\" }"})
     private Match match;
+    
+    @Description(value = "Describes status of the webhook")
+    private Boolean active;
 
 }

libs/sparkpost-lib/src/main/java/com/sparkpost/transport/IRestConnection.java

@@ -11,12 +11,22 @@ public interface IRestConnection {
 
     String SPC_US_ENDPOINT = "https://api.sparkpost.com/api/v1";
 
+    String SUBACCOUNT_HEADER = "X-MSYS-SUBACCOUNT";
+
     /**
      * Default endpoint to use for connections :
      * https://api.sparkpost.com/api/v1
      */
     String defaultApiEndpoint = SPC_US_ENDPOINT;
 
+    /**
+     * @param key
+     *            The HTTP header key
+     * @param value
+     *            The HTTP header value
+     */
+    void addHeader(String key, String value);
+
     /**
      * Perform an HTTP GET request. This method throws an exception if the
      * server returns anything else than a 200.

libs/sparkpost-lib/src/main/java/com/sparkpost/transport/RestConnection.java

@@ -10,6 +10,10 @@
 import java.net.MalformedURLException;
 import java.net.ProtocolException;
 import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
@@ -48,6 +52,8 @@ public class RestConnection implements IRestConnection {
     @Getter
     private final String baseUrl;
 
+    private final Map<String, String> extraHeaders = new HashMap<String, String>();
+
     /**
      * Supported HTTP methods
      */
@@ -417,6 +423,13 @@ private Response doHttpMethod(Endpoint endpoint, Method method, String data, Res
             String path = endpoint.toString();
             response.setRequest(path);
             conn = createConnectionObject(path, method);
+
+            // Add additional request headers
+            Set<Entry<String, String>> entrySet = this.extraHeaders.entrySet();
+            for (Entry<String, String> entry : entrySet) {
+                conn.setRequestProperty(entry.getKey(), entry.getValue());
+            }
+
             sendRequest(conn, data, response);
             receiveResponse(conn, response);
 
@@ -538,4 +551,10 @@ public Response delete(Endpoint endpoint) throws SparkPostException {
         Response response = new Response();
         return doHttpMethod(endpoint, Method.DELETE, null, response);
     }
+
+    @Override
+    public void addHeader(String key, String value) {
+        this.extraHeaders.put(key, value);
+
+    }
 }

libs/sparkpost-lib/src/test/java/com/sparkpost/testhelpers/StubRestConnection.java

@@ -1,6 +1,9 @@
 
 package com.sparkpost.testhelpers;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.sparkpost.exception.SparkPostException;
 import com.sparkpost.model.responses.Response;
 import com.sparkpost.resources.Endpoint;
@@ -11,6 +14,8 @@ public class StubRestConnection implements IRestConnection {
     private String path;
 
     private Endpoint endpoint;
+    
+    private final Map<String, String> extraHeaders = new HashMap<String, String>();
 
     private String json;
 
@@ -144,4 +149,9 @@ public boolean wasDelete() {
         return this.wasDelete;
     }
 
+    @Override
+    public void addHeader(String key, String value) {
+        this.extraHeaders.put(key, value);
+
+    }
 }