update to use naming strategy

feinoujc · Dec 9, 2018 · 60b6363 · 60b6363
1 parent b490a29
commit 60b6363
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 33 deletions.
diff --git a/src/Mandrill.net/Model/WebHook/MandrillMessageEventType.cs b/src/Mandrill.net/Model/WebHook/MandrillMessageEventType.cs
@@ -6,8 +6,8 @@ public enum MandrillMessageEventType
     {
         Send,
         Deferral,
-        [EnumMember(Value = "hard_bounce")] HardBounce,
-        [EnumMember(Value = "soft_bounce")] SoftBounce,
+        HardBounce,
+        SoftBounce,
         Open,
         Click,
         Spam,

diff --git a/src/Mandrill.net/Model/WebHook/MandrillWebHookEventType.cs b/src/Mandrill.net/Model/WebHook/MandrillWebHookEventType.cs
@@ -5,9 +5,7 @@ namespace Mandrill.Model
     public enum MandrillWebHookEventType
     {
         Send,
-        [EnumMember(Value = "hard_bounce")]
         HardBounce,
-        [EnumMember(Value = "soft_bounce")]
         SoftBounce,
         Open,
         Click,

diff --git a/src/Mandrill.net/Serialization/MandrillJsonContractResolver.cs b/src/Mandrill.net/Serialization/MandrillJsonContractResolver.cs
@@ -9,22 +9,11 @@ namespace Mandrill.Serialization
 {
     internal class MandrillJsonContractResolver : DefaultContractResolver
     {
-        private static readonly Regex CamelCaseRegex = new Regex("^[A-Z][a-z]+(?:[A-Z][a-z]+)*$", RegexOptions.Compiled);
-
-        protected static string ConvertCamelCasePropertyNamesToLowerCaseUnderscoreStyle(string propertyName)
+        public MandrillJsonContractResolver()
         {
-            if (CamelCaseRegex.IsMatch(propertyName))
-            {
-                return Regex.Replace(
-                    Regex.Replace(
-                        Regex.Replace(propertyName, @"([A-Z]+)([A-Z][a-z])", "$1_$2"), @"([a-z\d])([A-Z])",
-                        "$1_$2"), @"[-\s]", "_").ToLower();
-
-            }
-            return (propertyName).ToLower();
+            NamingStrategy = new SnakeCaseNamingStrategy(false, false);
         }
 
-
         protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
         {
             var jsonProperty = base.CreateProperty(member, memberSerialization);
@@ -37,7 +26,7 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
                 if (propertyType.GetTypeInfo().IsGenericType && propertyType.GenericTypeArguments.Length == 1)
                 {
                     var t = propertyType.GenericTypeArguments[0];
-                    if (typeof (IList<>).MakeGenericType(t).GetTypeInfo().IsAssignableFrom(propertyType.GetTypeInfo()))
+                    if (typeof(IList<>).MakeGenericType(t).GetTypeInfo().IsAssignableFrom(propertyType.GetTypeInfo()))
                     {
                         var prop = jsonProperty.DeclaringType.GetTypeInfo().GetDeclaredProperty(member.Name);
                         jsonProperty.ShouldSerialize = instance =>
@@ -48,7 +37,7 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
                     }
                 }
 
-                if (typeof (IDictionary<string, string>).GetTypeInfo().IsAssignableFrom(propertyType.GetTypeInfo()))
+                if (typeof(IDictionary<string, string>).GetTypeInfo().IsAssignableFrom(propertyType.GetTypeInfo()))
                 {
                     var prop = jsonProperty.DeclaringType.GetTypeInfo().GetDeclaredProperty(member.Name);
 
@@ -72,19 +61,7 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
                 }
             }
 
-            //leave the keys of a dictionary alone, otherwise convert to lowercase underscore
-            if (!PropertyIsInDictionary(jsonProperty))
-            {
-                jsonProperty.PropertyName = ConvertCamelCasePropertyNamesToLowerCaseUnderscoreStyle(jsonProperty.PropertyName);
-            }
-
             return jsonProperty;
         }
-
-        private static bool PropertyIsInDictionary(JsonProperty jsonProperty)
-        {
-            return typeof (IDictionary<string, string>).GetTypeInfo().IsAssignableFrom(jsonProperty.DeclaringType.GetTypeInfo())
-                || typeof (IDictionary<string, object>).GetTypeInfo().IsAssignableFrom(jsonProperty.DeclaringType.GetTypeInfo());
-        }
     }
 }
diff --git a/src/Mandrill.net/Serialization/MandrillSerializer.cs b/src/Mandrill.net/Serialization/MandrillSerializer.cs
@@ -16,7 +16,7 @@ private static JsonSerializer CreateSerializer()
             var settings = new JsonSerializerSettings { ContractResolver = new MandrillJsonContractResolver() };
 
             settings.Converters.Add(new UnixDateTimeConverter());
-            settings.Converters.Add(new StringEnumConverter { NamingStrategy = new CamelCaseNamingStrategy(), AllowIntegerValues = false });
+            settings.Converters.Add(new StringEnumConverter { NamingStrategy = new SnakeCaseNamingStrategy(), AllowIntegerValues = false });
             settings.NullValueHandling = NullValueHandling.Ignore;
             settings.DateTimeZoneHandling = DateTimeZoneHandling.Utc;
             return JsonSerializer.Create(settings);

diff --git a/tests/SerializationTests.cs b/tests/SerializationTests.cs
@@ -449,7 +449,7 @@ public TestModel()
         private enum TestEnum
         {
             Reject,
-            [EnumMember(Value = "soft_bounce")] SoftBounce
+            SoftBounce
         }
 
         private class TestSubModel