Merge pull request #787 from meziantou/fix-nrt-ipropertydescriptor

Fix nullable annotations for IPropertyDescriptor.GetCustomAttribute
aaubry · Mar 11, 2023 · c44a46b · c44a46b
2 parents 6c718ed + b84bca5
commit c44a46b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/YamlDotNet/Serialization/IPropertyDescriptor.cs b/YamlDotNet/Serialization/IPropertyDescriptor.cs
@@ -33,7 +33,7 @@ public interface IPropertyDescriptor
         int Order { get; set; }
         ScalarStyle ScalarStyle { get; set; }
 
-        T GetCustomAttribute<T>() where T : Attribute;
+        T? GetCustomAttribute<T>() where T : Attribute;
 
         IObjectDescriptor Read(object target);
         void Write(object target, object? value);

diff --git a/YamlDotNet/Serialization/PropertyDescriptor.cs b/YamlDotNet/Serialization/PropertyDescriptor.cs
@@ -62,7 +62,7 @@ public void Write(object target, object? value)
             baseDescriptor.Write(target, value);
         }
 
-        public T GetCustomAttribute<T>() where T : Attribute
+        public T? GetCustomAttribute<T>() where T : Attribute
         {
             return baseDescriptor.GetCustomAttribute<T>();
         }

diff --git a/YamlDotNet/Serialization/TypeInspectors/ReadableFieldsTypeInspector.cs b/YamlDotNet/Serialization/TypeInspectors/ReadableFieldsTypeInspector.cs
@@ -70,10 +70,10 @@ public void Write(object target, object? value)
                 fieldInfo.SetValue(target, value);
             }
 
-            public T GetCustomAttribute<T>() where T : Attribute
+            public T? GetCustomAttribute<T>() where T : Attribute
             {
                 var attributes = fieldInfo.GetCustomAttributes(typeof(T), true);
-                return (T)attributes.FirstOrDefault();
+                return (T?)attributes.FirstOrDefault();
             }
 
             public IObjectDescriptor Read(object target)

diff --git a/YamlDotNet/Serialization/TypeInspectors/ReadablePropertiesTypeInspector.cs b/YamlDotNet/Serialization/TypeInspectors/ReadablePropertiesTypeInspector.cs
@@ -84,10 +84,10 @@ public void Write(object target, object? value)
                 propertyInfo.SetValue(target, value, null);
             }
 
-            public T GetCustomAttribute<T>() where T : Attribute
+            public T? GetCustomAttribute<T>() where T : Attribute
             {
                 var attributes = propertyInfo.GetAllCustomAttributes<T>();
-                return (T)attributes.FirstOrDefault();
+                return (T?)attributes.FirstOrDefault();
             }
 
             public IObjectDescriptor Read(object target)

diff --git a/YamlDotNet/Serialization/TypeInspectors/WritablePropertiesTypeInspector.cs b/YamlDotNet/Serialization/TypeInspectors/WritablePropertiesTypeInspector.cs
@@ -85,10 +85,10 @@ public void Write(object target, object? value)
                 propertyInfo.SetValue(target, value, null);
             }
 
-            public T GetCustomAttribute<T>() where T : Attribute
+            public T? GetCustomAttribute<T>() where T : Attribute
             {
                 var attributes = propertyInfo.GetAllCustomAttributes<T>();
-                return (T)attributes.FirstOrDefault();
+                return (T?)attributes.FirstOrDefault();
             }
 
             public IObjectDescriptor Read(object target)

diff --git a/YamlDotNet/Serialization/YamlAttributeOverridesInspector.cs b/YamlDotNet/Serialization/YamlAttributeOverridesInspector.cs
@@ -95,7 +95,7 @@ public void Write(object target, object? value)
                 baseDescriptor.Write(target, value);
             }
 
-            public T GetCustomAttribute<T>() where T : Attribute
+            public T? GetCustomAttribute<T>() where T : Attribute
             {
                 var attr = overrides.GetAttribute<T>(classType, Name);
                 return attr ?? baseDescriptor.GetCustomAttribute<T>();