Updated appropriate null checks to all use pattern matching (#550)

ArmoryNode · web-flow · commit c4e023f47e6d · 2025-01-14T21:13:36.000-05:00
diff --git a/src/SmartEnum.Dapper/SmartEnumByNameTypeHandler.cs b/src/SmartEnum.Dapper/SmartEnumByNameTypeHandler.cs
@@ -37,7 +37,7 @@ public SmartEnumByNameTypeHandler()
         /// <inheritdoc/>
         public override TEnum Parse(object value)
         {
-            if (value == null || value is DBNull)
+            if (value is null || value is DBNull)
                 return null;
 
             if (value is string stringValue)
diff --git a/src/SmartEnum.Dapper/SmartEnumByValueTypeHandler.cs b/src/SmartEnum.Dapper/SmartEnumByValueTypeHandler.cs
@@ -34,7 +34,7 @@ public SmartEnumByValueTypeHandler()
         /// <inheritdoc/>
         public override TEnum Parse(object value)
         {
-            if (value == null || value is DBNull)
+            if (value is null || value is DBNull)
                 return null;
 
             if (value is not TValue tValue)
diff --git a/src/SmartEnum.EFCore/SmartEnumConverterExtensions.cs b/src/SmartEnum.EFCore/SmartEnumConverterExtensions.cs
@@ -27,7 +27,7 @@ public static void ConfigureSmartEnum(this ModelConfigurationBuilder configurati
         var propertyTypes = modelBuilder.Model.GetEntityTypes()
             .SelectMany(e => e.ClrType.GetProperties())
             .Where(p => TypeUtil.IsDerived(p.PropertyType, typeof(SmartEnum<,>)))
-            .Where(p => p.GetCustomAttribute<NotMappedAttribute>() == null)
+            .Where(p => p.GetCustomAttribute<NotMappedAttribute>() is null)
             .Select(p => p.PropertyType)
             .Distinct();
 
@@ -58,7 +58,7 @@ public static void ConfigureSmartEnum(this ModelBuilder modelBuilder)
         {
             var properties = entityType.ClrType.GetProperties()
                 .Where(p => TypeUtil.IsDerived(p.PropertyType, typeof(SmartEnum<,>)))
-                .Where(p => p.GetCustomAttribute<NotMappedAttribute>() == null);
+                .Where(p => p.GetCustomAttribute<NotMappedAttribute>() is null);
 
             foreach (var property in properties)
             {
@@ -74,7 +74,7 @@ public static void ConfigureSmartEnum(this ModelBuilder modelBuilder)
                 var converter = (ValueConverter)Activator.CreateInstance(converterType);
 
                 var propertyBuilder = GetPropertyBuilder(modelBuilder, entityType, property.Name);
-                if (propertyBuilder == null)
+                if (propertyBuilder is null)
                 {
                     continue;
                 }
@@ -111,7 +111,7 @@ private static PropertyBuilder GetPropertyBuilder(
         }
 
         var ownedNavigationBuilder = GetOwnedNavigationBuilder(entityTypeBuilder, ownershipPath);
-        if (ownedNavigationBuilder == null)
+        if (ownedNavigationBuilder is null)
         {
             return null;
         }
@@ -129,12 +129,12 @@ private static OwnedNavigationBuilder GetOwnedNavigationBuilder(
             var ownership = ownershipPath[i];
 
             var navigation = ownership.GetNavigation(pointsToPrincipal: false);
-            if (navigation == null)
+            if (navigation is null)
             {
                 return null;
             }
 
-            if (ownedNavigationBuilder == null)
+            if (ownedNavigationBuilder is null)
             {
                 if (ownership.IsUnique)
                 {
diff --git a/src/SmartEnum.ModelBinding/SmartEnumBinderProvider.cs b/src/SmartEnum.ModelBinding/SmartEnumBinderProvider.cs
@@ -8,7 +8,7 @@ public class SmartEnumBinderProvider : IModelBinderProvider
     {
         public IModelBinder GetBinder(ModelBinderProviderContext context)
         {
-            if (context == null)
+            if (context is null)
                 throw new ArgumentNullException(nameof(context));
 
             if (TypeUtil.IsDerived(context.Metadata.ModelType, typeof(SmartEnum<,>)))
diff --git a/src/SmartEnum/SmartEnum.cs b/src/SmartEnum/SmartEnum.cs
@@ -61,7 +61,7 @@ public abstract class SmartEnum<TEnum, TValue> :
                 var dictionary = new Dictionary<TValue, TEnum>(GetValueComparer());
                 foreach (var item in _enumOptions.Value)
                 {
-                    if (item._value != null && !dictionary.ContainsKey(item._value))
+                    if (item._value is not null && !dictionary.ContainsKey(item._value))
                         dictionary.Add(item._value, item);
                 }
                 return dictionary;
@@ -217,7 +217,7 @@ public static TEnum FromValue(TValue value)
         {
             TEnum result;
 
-            if (value != null)
+            if (value is not null)
             {
                 if (!_fromValue.Value.TryGetValue(value, out result))
                 {
@@ -226,7 +226,7 @@ public static TEnum FromValue(TValue value)
             }
             else
             {
-                result = _enumOptions.Value.FirstOrDefault(x => x.Value == null);
+                result = _enumOptions.Value.FirstOrDefault(x => x.Value is null);
                 if (result == null)
                 {
                     ThrowHelper.ThrowValueNotFoundException<TEnum, TValue>(value);
@@ -248,7 +248,7 @@ public static TEnum FromValue(TValue value)
         /// <seealso cref="SmartEnum{TEnum, TValue}.TryFromValue(TValue, out TEnum)"/>
         public static TEnum FromValue(TValue value, TEnum defaultValue)
         {
-            if (value == null)
+            if (value is null)
                 ThrowHelper.ThrowArgumentNullException(nameof(value));
 
             if (!_fromValue.Value.TryGetValue(value, out var result))
@@ -272,7 +272,7 @@ public static TEnum FromValue(TValue value, TEnum defaultValue)
         /// <seealso cref="SmartEnum{TEnum, TValue}.FromValue(TValue, TEnum)"/>
         public static bool TryFromValue(TValue value, out TEnum result)
         {
-            if (value == null)
+            if (value is null)
             {
                 result = default;
                 return false;
diff --git a/src/SmartEnum/SmartEnumExtensions.cs b/src/SmartEnum/SmartEnumExtensions.cs
@@ -42,7 +42,7 @@ public static bool IsSmartEnum(this Type type, out Type[] genericArguments)
 
                 type = type.BaseType;
             }
-            while (!(type is null));
+            while (type is not null);
 
             genericArguments = null;
             return false;
diff --git a/src/SmartEnum/SmartFlagEngine.cs b/src/SmartEnum/SmartFlagEngine.cs
@@ -69,7 +69,7 @@ protected static IEnumerable<TEnum> GetFlagEnumValues(TValue value, IEnumerable<
 
         private static void GuardAgainstNull(TValue value)
         {
-            if (value == null)
+            if (value is null)
                 ThrowHelper.ThrowArgumentNullException(nameof(value));
         }
 
@@ -84,7 +84,7 @@ private static void GuardAgainstNegativeInputValue(TValue value)
             AllowNegativeInputValuesAttribute attribute = (AllowNegativeInputValuesAttribute)
                 Attribute.GetCustomAttribute(typeof(TEnum), typeof(AllowNegativeInputValuesAttribute));
 
-            if (attribute == null && int.Parse(value.ToString()) < -1)
+            if (attribute is null && int.Parse(value.ToString()) < -1)
             {
                 ThrowHelper.ThrowNegativeValueArgumentException<TEnum, TValue>(value);
             }
@@ -130,7 +130,7 @@ private static void ApplyUnsafeFlagEnumAttributeSettings(IEnumerable<TEnum> list
             AllowUnsafeFlagEnumValuesAttribute attribute = (AllowUnsafeFlagEnumValuesAttribute)
                 Attribute.GetCustomAttribute(typeof(TEnum), typeof(AllowUnsafeFlagEnumValuesAttribute));
 
-            if (attribute == null)
+            if (attribute is null)
             {
                 CheckEnumListForPowersOfTwo(list);
             }
diff --git a/src/SmartEnum/SmartFlagEnum.cs b/src/SmartEnum/SmartFlagEnum.cs
@@ -100,7 +100,7 @@ protected SmartFlagEnum(string name, TValue value)
         {
             if (String.IsNullOrEmpty(name))
                 ThrowHelper.ThrowArgumentNullOrEmptyException(nameof(name));
-            if (value == null)
+            if (value is null)
                 ThrowHelper.ThrowArgumentNullException(nameof(value));
 
             _name = name;
@@ -187,10 +187,10 @@ public static bool TryFromName(string names, bool ignoreCase, out IEnumerable<TE
         [SuppressMessage("Minor Code Smell", "S4136:Method overloads should be grouped together", Justification = "<Pending>")]
         public static IEnumerable<TEnum> FromValue(TValue value)
         {
-            if (value == null)
+            if (value is null)
                 ThrowHelper.ThrowArgumentNullException(nameof(value));
 
-            if (GetFlagEnumValues(value, GetAllOptions()) == null)
+            if (GetFlagEnumValues(value, GetAllOptions()) is null)
             {
                 ThrowHelper.ThrowValueNotFoundException<TEnum, TValue>(value);
             }
@@ -231,7 +231,7 @@ public static TEnum DeserializeValue(TValue value)
         /// <seealso cref="SmartFlagEnum{TEnum, TValue}.FromValue(TValue)"/>
         public static IEnumerable<TEnum> FromValue(TValue value, IEnumerable<TEnum> defaultValue)
         {
-            if (value == null)
+            if (value is null)
                 ThrowHelper.ThrowArgumentNullException(nameof(value));
 
             return !TryFromValue(value, out var result) ? defaultValue : result;
@@ -250,15 +250,15 @@ public static IEnumerable<TEnum> FromValue(TValue value, IEnumerable<TEnum> defa
         /// <seealso cref="SmartFlagEnum{TEnum, TValue}.FromValue(TValue)"/>
         public static bool TryFromValue(TValue value, out IEnumerable<TEnum> result)
         {
-            if (value == null || !int.TryParse(value.ToString(), out _))
+            if (value is null || !int.TryParse(value.ToString(), out _))
             {
                 result = default;
                 return false;
             }
 
 
             result = GetFlagEnumValues(value, GetAllOptions());
-            if (result == null)
+            if (result is null)
             {
                 return false;
             }
diff --git a/src/SmartEnum/SmartFlagEnumExtensions.cs b/src/SmartEnum/SmartFlagEnumExtensions.cs
@@ -42,7 +42,7 @@ public static bool IsSmartFlagEnum(this Type type, out Type[] genericArguments)
 
                 type = type.BaseType;
             }
-            while (!(type is null));
+            while (type is not null);
 
             genericArguments = null;
             return false;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public SmartEnumByNameTypeHandler()`
`37`	`37`	`/// <inheritdoc/>`
`38`	`38`	`public override TEnum Parse(object value)`
`39`	`39`	`{`
`40`		`- if (value == null \|\| value is DBNull)`
	`40`	`+ if (value is null \|\| value is DBNull)`
`41`	`41`	`return null;`
`42`	`42`
`43`	`43`	`if (value is string stringValue)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public SmartEnumByValueTypeHandler()`
`34`	`34`	`/// <inheritdoc/>`
`35`	`35`	`public override TEnum Parse(object value)`
`36`	`36`	`{`
`37`		`- if (value == null \|\| value is DBNull)`
	`37`	`+ if (value is null \|\| value is DBNull)`
`38`	`38`	`return null;`
`39`	`39`
`40`	`40`	`if (value is not TValue tValue)`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public static void ConfigureSmartEnum(this ModelConfigurationBuilder configurati`
`27`	`27`	`var propertyTypes = modelBuilder.Model.GetEntityTypes()`
`28`	`28`	`.SelectMany(e => e.ClrType.GetProperties())`
`29`	`29`	`.Where(p => TypeUtil.IsDerived(p.PropertyType, typeof(SmartEnum<,>)))`
`30`		`- .Where(p => p.GetCustomAttribute<NotMappedAttribute>() == null)`
	`30`	`+ .Where(p => p.GetCustomAttribute<NotMappedAttribute>() is null)`
`31`	`31`	`.Select(p => p.PropertyType)`
`32`	`32`	`.Distinct();`
`33`	`33`
`@@ -58,7 +58,7 @@ public static void ConfigureSmartEnum(this ModelBuilder modelBuilder)`
`58`	`58`	`{`
`59`	`59`	`var properties = entityType.ClrType.GetProperties()`
`60`	`60`	`.Where(p => TypeUtil.IsDerived(p.PropertyType, typeof(SmartEnum<,>)))`
`61`		`- .Where(p => p.GetCustomAttribute<NotMappedAttribute>() == null);`
	`61`	`+ .Where(p => p.GetCustomAttribute<NotMappedAttribute>() is null);`
`62`	`62`
`63`	`63`	`foreach (var property in properties)`
`64`	`64`	`{`
`@@ -74,7 +74,7 @@ public static void ConfigureSmartEnum(this ModelBuilder modelBuilder)`
`74`	`74`	`var converter = (ValueConverter)Activator.CreateInstance(converterType);`
`75`	`75`
`76`	`76`	`var propertyBuilder = GetPropertyBuilder(modelBuilder, entityType, property.Name);`
`77`		`- if (propertyBuilder == null)`
	`77`	`+ if (propertyBuilder is null)`
`78`	`78`	`{`
`79`	`79`	`continue;`
`80`	`80`	`}`
`@@ -111,7 +111,7 @@ private static PropertyBuilder GetPropertyBuilder(`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`var ownedNavigationBuilder = GetOwnedNavigationBuilder(entityTypeBuilder, ownershipPath);`
`114`		`- if (ownedNavigationBuilder == null)`
	`114`	`+ if (ownedNavigationBuilder is null)`
`115`	`115`	`{`
`116`	`116`	`return null;`
`117`	`117`	`}`
`@@ -129,12 +129,12 @@ private static OwnedNavigationBuilder GetOwnedNavigationBuilder(`
`129`	`129`	`var ownership = ownershipPath[i];`
`130`	`130`
`131`	`131`	`var navigation = ownership.GetNavigation(pointsToPrincipal: false);`
`132`		`- if (navigation == null)`
	`132`	`+ if (navigation is null)`
`133`	`133`	`{`
`134`	`134`	`return null;`
`135`	`135`	`}`
`136`	`136`
`137`		`- if (ownedNavigationBuilder == null)`
	`137`	`+ if (ownedNavigationBuilder is null)`
`138`	`138`	`{`
`139`	`139`	`if (ownership.IsUnique)`
`140`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class SmartEnumBinderProvider : IModelBinderProvider`
`8`	`8`	`{`
`9`	`9`	`public IModelBinder GetBinder(ModelBinderProviderContext context)`
`10`	`10`	`{`
`11`		`- if (context == null)`
	`11`	`+ if (context is null)`
`12`	`12`	`throw new ArgumentNullException(nameof(context));`
`13`	`13`
`14`	`14`	`if (TypeUtil.IsDerived(context.Metadata.ModelType, typeof(SmartEnum<,>)))`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public abstract class SmartEnum<TEnum, TValue> :`
`61`	`61`	`var dictionary = new Dictionary<TValue, TEnum>(GetValueComparer());`
`62`	`62`	`foreach (var item in _enumOptions.Value)`
`63`	`63`	`{`
`64`		`- if (item._value != null && !dictionary.ContainsKey(item._value))`
	`64`	`+ if (item._value is not null && !dictionary.ContainsKey(item._value))`
`65`	`65`	`dictionary.Add(item._value, item);`
`66`	`66`	`}`
`67`	`67`	`return dictionary;`
`@@ -217,7 +217,7 @@ public static TEnum FromValue(TValue value)`
`217`	`217`	`{`
`218`	`218`	`TEnum result;`
`219`	`219`
`220`		`- if (value != null)`
	`220`	`+ if (value is not null)`
`221`	`221`	`{`
`222`	`222`	`if (!_fromValue.Value.TryGetValue(value, out result))`
`223`	`223`	`{`
`@@ -226,7 +226,7 @@ public static TEnum FromValue(TValue value)`
`226`	`226`	`}`
`227`	`227`	`else`
`228`	`228`	`{`
`229`		`- result = _enumOptions.Value.FirstOrDefault(x => x.Value == null);`
	`229`	`+ result = _enumOptions.Value.FirstOrDefault(x => x.Value is null);`
`230`	`230`	`if (result == null)`
`231`	`231`	`{`
`232`	`232`	`ThrowHelper.ThrowValueNotFoundException<TEnum, TValue>(value);`
`@@ -248,7 +248,7 @@ public static TEnum FromValue(TValue value)`
`248`	`248`	`/// <seealso cref="SmartEnum{TEnum, TValue}.TryFromValue(TValue, out TEnum)"/>`
`249`	`249`	`public static TEnum FromValue(TValue value, TEnum defaultValue)`
`250`	`250`	`{`
`251`		`- if (value == null)`
	`251`	`+ if (value is null)`
`252`	`252`	`ThrowHelper.ThrowArgumentNullException(nameof(value));`
`253`	`253`
`254`	`254`	`if (!_fromValue.Value.TryGetValue(value, out var result))`
`@@ -272,7 +272,7 @@ public static TEnum FromValue(TValue value, TEnum defaultValue)`
`272`	`272`	`/// <seealso cref="SmartEnum{TEnum, TValue}.FromValue(TValue, TEnum)"/>`
`273`	`273`	`public static bool TryFromValue(TValue value, out TEnum result)`
`274`	`274`	`{`
`275`		`- if (value == null)`
	`275`	`+ if (value is null)`
`276`	`276`	`{`
`277`	`277`	`result = default;`
`278`	`278`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static bool IsSmartEnum(this Type type, out Type[] genericArguments)`
`42`	`42`
`43`	`43`	`type = type.BaseType;`
`44`	`44`	`}`
`45`		`- while (!(type is null));`
	`45`	`+ while (type is not null);`
`46`	`46`
`47`	`47`	`genericArguments = null;`
`48`	`48`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ protected static IEnumerable<TEnum> GetFlagEnumValues(TValue value, IEnumerable<`
`69`	`69`
`70`	`70`	`private static void GuardAgainstNull(TValue value)`
`71`	`71`	`{`
`72`		`- if (value == null)`
	`72`	`+ if (value is null)`
`73`	`73`	`ThrowHelper.ThrowArgumentNullException(nameof(value));`
`74`	`74`	`}`
`75`	`75`
`@@ -84,7 +84,7 @@ private static void GuardAgainstNegativeInputValue(TValue value)`
`84`	`84`	`AllowNegativeInputValuesAttribute attribute = (AllowNegativeInputValuesAttribute)`
`85`	`85`	`Attribute.GetCustomAttribute(typeof(TEnum), typeof(AllowNegativeInputValuesAttribute));`
`86`	`86`
`87`		`- if (attribute == null && int.Parse(value.ToString()) < -1)`
	`87`	`+ if (attribute is null && int.Parse(value.ToString()) < -1)`
`88`	`88`	`{`
`89`	`89`	`ThrowHelper.ThrowNegativeValueArgumentException<TEnum, TValue>(value);`
`90`	`90`	`}`
`@@ -130,7 +130,7 @@ private static void ApplyUnsafeFlagEnumAttributeSettings(IEnumerable<TEnum> list`
`130`	`130`	`AllowUnsafeFlagEnumValuesAttribute attribute = (AllowUnsafeFlagEnumValuesAttribute)`
`131`	`131`	`Attribute.GetCustomAttribute(typeof(TEnum), typeof(AllowUnsafeFlagEnumValuesAttribute));`
`132`	`132`
`133`		`- if (attribute == null)`
	`133`	`+ if (attribute is null)`
`134`	`134`	`{`
`135`	`135`	`CheckEnumListForPowersOfTwo(list);`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ protected SmartFlagEnum(string name, TValue value)`
`100`	`100`	`{`
`101`	`101`	`if (String.IsNullOrEmpty(name))`
`102`	`102`	`ThrowHelper.ThrowArgumentNullOrEmptyException(nameof(name));`
`103`		`- if (value == null)`
	`103`	`+ if (value is null)`
`104`	`104`	`ThrowHelper.ThrowArgumentNullException(nameof(value));`
`105`	`105`
`106`	`106`	`_name = name;`
`@@ -187,10 +187,10 @@ public static bool TryFromName(string names, bool ignoreCase, out IEnumerable<TE`
`187`	`187`	`[SuppressMessage("Minor Code Smell", "S4136:Method overloads should be grouped together", Justification = "<Pending>")]`
`188`	`188`	`public static IEnumerable<TEnum> FromValue(TValue value)`
`189`	`189`	`{`
`190`		`- if (value == null)`
	`190`	`+ if (value is null)`
`191`	`191`	`ThrowHelper.ThrowArgumentNullException(nameof(value));`
`192`	`192`
`193`		`- if (GetFlagEnumValues(value, GetAllOptions()) == null)`
	`193`	`+ if (GetFlagEnumValues(value, GetAllOptions()) is null)`
`194`	`194`	`{`
`195`	`195`	`ThrowHelper.ThrowValueNotFoundException<TEnum, TValue>(value);`
`196`	`196`	`}`
`@@ -231,7 +231,7 @@ public static TEnum DeserializeValue(TValue value)`
`231`	`231`	`/// <seealso cref="SmartFlagEnum{TEnum, TValue}.FromValue(TValue)"/>`
`232`	`232`	`public static IEnumerable<TEnum> FromValue(TValue value, IEnumerable<TEnum> defaultValue)`
`233`	`233`	`{`
`234`		`- if (value == null)`
	`234`	`+ if (value is null)`
`235`	`235`	`ThrowHelper.ThrowArgumentNullException(nameof(value));`
`236`	`236`
`237`	`237`	`return !TryFromValue(value, out var result) ? defaultValue : result;`
`@@ -250,15 +250,15 @@ public static IEnumerable<TEnum> FromValue(TValue value, IEnumerable<TEnum> defa`
`250`	`250`	`/// <seealso cref="SmartFlagEnum{TEnum, TValue}.FromValue(TValue)"/>`
`251`	`251`	`public static bool TryFromValue(TValue value, out IEnumerable<TEnum> result)`
`252`	`252`	`{`
`253`		`- if (value == null \|\| !int.TryParse(value.ToString(), out _))`
	`253`	`+ if (value is null \|\| !int.TryParse(value.ToString(), out _))`
`254`	`254`	`{`
`255`	`255`	`result = default;`
`256`	`256`	`return false;`
`257`	`257`	`}`
`258`	`258`
`259`	`259`
`260`	`260`	`result = GetFlagEnumValues(value, GetAllOptions());`
`261`		`- if (result == null)`
	`261`	`+ if (result is null)`
`262`	`262`	`{`
`263`	`263`	`return false;`
`264`	`264`	`}`