Skip to content

Refactor null check: Replaced IsNullOrWhiteSpace with explicit null c… #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SeppeDejonckheere merged 1 commit into from
Mar 26, 2025
Merged

Refactor null check: Replaced IsNullOrWhiteSpace with explicit null c… #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions SecureCoding/SecureSerialization/Json/Newtonsoft/SecureNewtonsoftDeserialization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ public static class SecureNewtonsoftDeserialization
/// <exception cref="JsonSerializationException">Thrown if the <paramref name="json"/> cannot be deserialized.</exception>
public static T DeserializeObject<T>(string json)
{
if (string.IsNullOrWhiteSpace(json))
if (json is null)
{
throw new ArgumentException($"'{nameof(json)}' cannot be null or whitespace.", nameof(json));
throw new ArgumentException($"'{nameof(json)}' cannot be null.", nameof(json));
}

JsonSerializerSettings settings = new JsonSerializerSettings
Expand All @@ -51,9 +51,9 @@ public static T DeserializeObject<T>(string json)
/// <exception cref="JsonSerializationException">Thrown if the <paramref name="json"/> cannot be deserialized.</exception>
public static T DeserializeObject<T>(string json, JsonSerializerSettings settings)
{
if (string.IsNullOrWhiteSpace(json))
if (json is null)
{
throw new ArgumentException($"'{nameof(json)}' cannot be null or whitespace.", nameof(json));
throw new ArgumentException($"'{nameof(json)}' cannot be null.", nameof(json));
}

if (settings is null)
Expand All @@ -63,7 +63,7 @@ public static T DeserializeObject<T>(string json, JsonSerializerSettings setting

if (settings.TypeNameHandling != TypeNameHandling.None)
{
throw new InsecureSerializationSettingsException($"Setting the Typenamehandling to {settings.TypeNameHandling} may result in insecure deserialization.");
throw new InsecureSerializationSettingsException($"Setting the TypeNameHandling to {settings.TypeNameHandling} may result in insecure deserialization.");
}

settings.SerializationBinder = null;
Expand All @@ -89,9 +89,9 @@ public static T DeserializeObject<T>(string json, JsonSerializerSettings setting
/// <exception cref="JsonSerializationException">Thrown if the <paramref name="json"/> cannot be deserialized.</exception>
public static T DeserializeObject<T>(string json, IEnumerable<Type> knownTypes)
{
if (string.IsNullOrWhiteSpace(json))
if (json is null)
{
throw new ArgumentException($"'{nameof(json)}' cannot be null or whitespace.", nameof(json));
throw new ArgumentException($"'{nameof(json)}' cannot be null.", nameof(json));
}

if (knownTypes is null || !knownTypes.Any())
Expand Down Expand Up @@ -127,9 +127,9 @@ public static T DeserializeObject<T>(string json, IEnumerable<Type> knownTypes)
/// <exception cref="JsonSerializationException">Thrown if the <paramref name="json"/> cannot be deserialized.</exception>
public static T DeserializeObject<T>(string json, IEnumerable<Type> knownTypes, JsonSerializerSettings settings)
{
if (string.IsNullOrWhiteSpace(json))
if (json is null)
{
throw new ArgumentException($"'{nameof(json)}' cannot be null or whitespace.", nameof(json));
throw new ArgumentException($"'{nameof(json)}' cannot be null.", nameof(json));
}

if (knownTypes is null || !knownTypes.Any())
Expand All @@ -148,4 +148,4 @@ public static T DeserializeObject<T>(string json, IEnumerable<Type> knownTypes,
return JsonConvert.DeserializeObject<T>(json, settings);
}
}
}
}