Merge pull request #293 from sendgrid/owre-master

Fixing merge conflicts with #275

Author: thinkingserious

SendGrid/SendGrid/Helpers/Mail/Mail.cs

@@ -19,7 +19,7 @@ public class Mail
         private Dictionary<String, String> sections;
         private List<String> categories;
         private Dictionary<String, String> customArgs;
-        private long sendAt;
+        private long? sendAt;
         private ASM asm;
         private String batchId;
         private String setIpPoolId;
@@ -183,7 +183,7 @@ public Dictionary<string, string> CustomArgs
         }
 
         [JsonProperty(PropertyName = "send_at")]
-        public long SendAt
+        public long? SendAt
         {
             get
             {
@@ -347,18 +347,18 @@ public String Get()
         {
             return JsonConvert.SerializeObject(this,
                                 Formatting.None,
-                                new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Ignore, StringEscapeHandling = StringEscapeHandling.EscapeHtml });
+                                new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Include, StringEscapeHandling = StringEscapeHandling.EscapeHtml });
         }
     }
 
 
     public class ClickTracking
     {
-        private bool enable;
-        private bool enableText;
+        private bool? enable;
+        private bool? enableText;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -372,7 +372,7 @@ public bool Enable
         }
 
         [JsonProperty(PropertyName = "enable_text")]
-        public bool EnableText
+        public bool? EnableText
         {
             get
             {
@@ -389,11 +389,11 @@ public bool EnableText
 
     public class OpenTracking
     {
-        private bool enable;
+        private bool? enable;
         private String substitutionTag;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -424,13 +424,13 @@ public string SubstitutionTag
 
     public class SubscriptionTracking
     {
-        private bool enable;
+        private bool? enable;
         private String text;
         private String html;
         private String substitutionTag;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -489,15 +489,15 @@ public string SubstitutionTag
 
     public class Ganalytics
     {
-        private bool enable;
+        private bool? enable;
         private String utmSource;
         private String utmMedium;
         private String utmTerm;
         private String utmContent;
         private String utmCampaign;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -649,11 +649,11 @@ public Ganalytics Ganalytics
 
     public class BCCSettings
     {
-        private bool enable;
+        private bool? enable;
         private String email;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -684,10 +684,10 @@ public string Email
 
     public class BypassListManagement
     {
-        private bool enable;
+        private bool? enable;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -704,12 +704,12 @@ public bool Enable
 
     public class FooterSettings
     {
-        private bool enable;
+        private bool? enable;
         private String text;
         private String html;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -754,10 +754,10 @@ public string Html
 
     public class SandboxMode
     {
-        private bool enable;
+        private bool? enable;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -774,12 +774,12 @@ public bool Enable
 
     public class SpamCheck
     {
-        private bool enable;
-        private int threshold;
+        private bool? enable;
+        private int? threshold;
         private String postToUrl;
 
         [JsonProperty(PropertyName = "enable")]
-        public bool Enable
+        public bool? Enable
         {
             get
             {
@@ -793,7 +793,7 @@ public bool Enable
         }
 
         [JsonProperty(PropertyName = "threshold")]
-        public int Threshold
+        public int? Threshold
         {
             get
             {
@@ -904,11 +904,11 @@ public SpamCheck SpamCheck
 
     public class ASM
     {
-        private int groupId;
+        private int? groupId;
         private List<int> groupsToDisplay;
 
         [JsonProperty(PropertyName = "group_id")]
-        public int GroupId
+        public int? GroupId
         {
             get
             {
@@ -1118,7 +1118,7 @@ public class Personalization
         private Dictionary<String, String> headers;
         private Dictionary<String, String> substitutions;
         private Dictionary<String, String> customArgs;
-        private long sendAt;
+        private long? sendAt;
 
         [JsonProperty(PropertyName = "to")]
         public List<Email> Tos
@@ -1219,7 +1219,7 @@ public Dictionary<string, string> CustomArgs
         }
 
         [JsonProperty(PropertyName = "send_at")]
-        public long SendAt
+        public long? SendAt
         {
             get
             {