Make YamlMemberAttribute.DefaultValuesHandling actually usable

Fixes #466
aaubry · Feb 17, 2020 · 5db187e · 5db187e
1 parent c452b9e
commit 5db187e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/YamlDotNet/Serialization/ObjectGraphVisitors/DefaultValuesObjectGraphVisitor.cs b/YamlDotNet/Serialization/ObjectGraphVisitors/DefaultValuesObjectGraphVisitor.cs
@@ -42,7 +42,13 @@ public DefaultValuesObjectGraphVisitor(DefaultValuesHandling handling, IObjectGr
 
         public override bool EnterMapping(IPropertyDescriptor key, IObjectDescriptor value, IEmitter context)
         {
-            var configuration = key.GetCustomAttribute<YamlMemberAttribute>()?.DefaultValuesHandling ?? this.handling;
+            var configuration = this.handling;
+            var yamlMember = key.GetCustomAttribute<YamlMemberAttribute>();
+            if (yamlMember != null && yamlMember.IsDefaultValuesHandlingSpecified)
+            {
+                configuration = yamlMember.DefaultValuesHandling;
+            }
+
             switch (configuration)
             {
                 case DefaultValuesHandling.OmitNull:

diff --git a/YamlDotNet/Serialization/YamlMember.cs b/YamlDotNet/Serialization/YamlMember.cs
@@ -55,10 +55,18 @@ public sealed class YamlMemberAttribute : Attribute
         /// </summary>
         public ScalarStyle ScalarStyle { get; set; }
 
+        private DefaultValuesHandling? defaultValuesHandling;
+
         /// <summary>
         /// Overrides how null and default values should be handled for this property.
         /// </summary>
-        public DefaultValuesHandling? DefaultValuesHandling { get; set; }
+        public DefaultValuesHandling DefaultValuesHandling
+        {
+            get => defaultValuesHandling.GetValueOrDefault();
+            set => defaultValuesHandling = value;
+        }
+
+        public bool IsDefaultValuesHandlingSpecified => defaultValuesHandling.HasValue;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="YamlMemberAttribute" /> class.