Merge pull request #74 from IvanMurzak/feat/null-guard-exceptions

IvanMurzak · web-flow · commit 3545ebb58cd0 · 2026-03-25T03:16:37.000-07:00
fix: add ArgumentNullException guards to BaseReflectionConverter
diff --git a/ReflectorNet/src/Converter/Reflection/Base/BaseReflectionConverter.DefaultValue.cs b/ReflectorNet/src/Converter/Reflection/Base/BaseReflectionConverter.DefaultValue.cs
@@ -43,8 +43,8 @@ public abstract partial class BaseReflectionConverter<T> : IReflectionConverter
         /// <exception cref="ArgumentException">Thrown when type cannot be instantiated due to constructor limitations.</exception>
         public virtual object? CreateInstance(Reflector reflector, Type type)
         {
-            if (type == null)
-                throw new ArgumentNullException(nameof(type));
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (type == null) throw new ArgumentNullException(nameof(type));
 
             // Handle enums
             if (type.IsEnum)
@@ -155,6 +155,9 @@ public abstract partial class BaseReflectionConverter<T> : IReflectionConverter
         /// <returns>An appropriate default value for the specified type.</returns>
         public virtual object? GetDefaultValue(Reflector reflector, Type type)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (type == null) throw new ArgumentNullException(nameof(type));
+
             // Handle nullable types first
             if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
                 return null;
diff --git a/ReflectorNet/src/Converter/Reflection/Base/BaseReflectionConverter.Deserialize.cs b/ReflectorNet/src/Converter/Reflection/Base/BaseReflectionConverter.Deserialize.cs
@@ -59,6 +59,9 @@ public abstract partial class BaseReflectionConverter<T> : IReflectionConverter
             ILogger? logger = null,
             DeserializationContext? context = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (data == null) throw new ArgumentNullException(nameof(data));
+
             if (!TryDeserializeValue(
                 reflector,
                 data: data,
@@ -216,6 +219,8 @@ protected virtual bool TryDeserializeValue(
             Logs? logs = null,
             ILogger? logger = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+
             if (data == null)
             {
                 result = null;
@@ -270,6 +275,10 @@ protected virtual bool TryDeserializeValueInternal(
             Logs? logs = null,
             ILogger? logger = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (data == null) throw new ArgumentNullException(nameof(data));
+            if (type == null) throw new ArgumentNullException(nameof(type));
+
             var padding = StringUtils.GetPadding(depth);
 
             if (AllowCascadeSerialization)
@@ -361,6 +370,10 @@ protected virtual bool TryDeserializeValueInternal(
             Logs? logs = null,
             ILogger? logger = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (data == null) throw new ArgumentNullException(nameof(data));
+            if (type == null) throw new ArgumentNullException(nameof(type));
+
             return reflector.JsonSerializer.Deserialize(
                 reflector,
                 data.valueJsonElement,
diff --git a/ReflectorNet/src/Converter/Reflection/Base/BaseReflectionConverter.Modify.cs b/ReflectorNet/src/Converter/Reflection/Base/BaseReflectionConverter.Modify.cs
@@ -57,6 +57,10 @@ public virtual bool TryModify(
             BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
             ILogger? logger = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (data == null) throw new ArgumentNullException(nameof(data));
+            if (type == null) throw new ArgumentNullException(nameof(type));
+
             var padding = StringUtils.GetPadding(depth);
 
             if (obj == null)
@@ -256,6 +260,11 @@ protected virtual bool TryModifyField(
             BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
             ILogger? logger = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (obj == null) throw new ArgumentNullException(nameof(obj));
+            if (objType == null) throw new ArgumentNullException(nameof(objType));
+            if (fieldValue == null) throw new ArgumentNullException(nameof(fieldValue));
+
             var padding = StringUtils.GetPadding(depth);
 
             if (string.IsNullOrEmpty(fieldValue.name))
@@ -371,6 +380,11 @@ protected virtual bool TryModifyProperty(
             BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
             ILogger? logger = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (obj == null) throw new ArgumentNullException(nameof(obj));
+            if (objType == null) throw new ArgumentNullException(nameof(objType));
+            if (propertyValue == null) throw new ArgumentNullException(nameof(propertyValue));
+
             var padding = StringUtils.GetPadding(depth);
 
             if (string.IsNullOrEmpty(propertyValue.name))
diff --git a/ReflectorNet/src/Converter/Reflection/Base/BaseReflectionConverter.Serialize.cs b/ReflectorNet/src/Converter/Reflection/Base/BaseReflectionConverter.Serialize.cs
@@ -32,6 +32,8 @@ public virtual SerializedMember Serialize(
             ILogger? logger = null,
             SerializationContext? context = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+
             var actualType = fallbackType ?? obj?.GetType() ?? typeof(T);
 
             return InternalSerialize(
@@ -56,6 +58,9 @@ public virtual SerializedMember Serialize(
             ILogger? logger = null,
             SerializationContext? context = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (obj == null) throw new ArgumentNullException(nameof(obj));
+
             var serializedFields = default(SerializedMemberList);
             var objType = obj.GetType();
 
@@ -116,6 +121,9 @@ public virtual SerializedMember Serialize(
             ILogger? logger = null,
             SerializationContext? context = null)
         {
+            if (reflector == null) throw new ArgumentNullException(nameof(reflector));
+            if (obj == null) throw new ArgumentNullException(nameof(obj));
+
             var serializedProperties = default(SerializedMemberList);
             var objType = obj.GetType();
 
diff --git a/ReflectorNet/src/Reflector/Reflector.Modify.cs b/ReflectorNet/src/Reflector/Reflector.Modify.cs
@@ -43,6 +43,9 @@ public bool TryModify(
             BindingFlags flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
             ILogger? logger = null)
         {
+            if (data == null)
+                throw new ArgumentNullException(nameof(data));
+
             var padding = StringUtils.GetPadding(depth);
 
             if (obj == null && data.IsNull())

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,9 @@ public bool TryModify(`
`43`	`43`	`BindingFlags flags = BindingFlags.Public \| BindingFlags.NonPublic \| BindingFlags.Instance,`
`44`	`44`	`ILogger? logger = null)`
`45`	`45`	`{`
	`46`	`+ if (data == null)`
	`47`	`+ throw new ArgumentNullException(nameof(data));`
	`48`	`+`
`46`	`49`	`var padding = StringUtils.GetPadding(depth);`
`47`	`50`
`48`	`51`	`if (obj == null && data.IsNull())`