Use nameof where possible (#654)

+semver:patch
nhibernate · Mar 11, 2024 · ae0011f · ae0011f
1 parent f19aebc
commit ae0011f
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 37 deletions.
diff --git a/src/FluentNHibernate/AssemblyTypeSource.cs b/src/FluentNHibernate/AssemblyTypeSource.cs
@@ -15,9 +15,7 @@ public class AssemblyTypeSource : ITypeSource
 
     public AssemblyTypeSource(Assembly source)
     {
-        if (source is null) throw new ArgumentNullException("source");
-
-        this.source = source;
+        this.source = source ?? throw new ArgumentNullException(nameof(source));
     }
 
     #region ITypeSource Members
@@ -29,7 +27,7 @@ public IEnumerable<Type> GetTypes()
 
     public void LogSource(IDiagnosticLogger logger)
     {
-        if (logger is null) throw new ArgumentNullException("logger");
+        if (logger is null) throw new ArgumentNullException(nameof(logger));
 
         logger.LoadedFluentMappingsFromSource(this);
     }

diff --git a/src/FluentNHibernate/Cfg/FluentMappingsContainer.cs b/src/FluentNHibernate/Cfg/FluentMappingsContainer.cs
@@ -67,7 +67,7 @@ public FluentMappingsContainer Add<T>()
     public FluentMappingsContainer Add(Type type)
     {
         if (type is null)
-            throw new ArgumentNullException("type");
+            throw new ArgumentNullException(nameof(type));
 
         types.Add(type);
         WasUsed = true;

diff --git a/src/FluentNHibernate/Conventions/ProxyConvention.cs b/src/FluentNHibernate/Conventions/ProxyConvention.cs
@@ -13,19 +13,8 @@ public ProxyConvention(
         Func<Type, Type> mapPersistentTypeToProxyInterfaceType,
         Func<Type, Type> mapProxyInterfaceTypeToPersistentType)
     {
-        if (mapPersistentTypeToProxyInterfaceType is null)
-        {
-            throw new ArgumentNullException("mapPersistentTypeToProxyInterfaceType");
-        }
-
-        if(mapProxyInterfaceTypeToPersistentType is null)
-        {
-            throw new ArgumentNullException("mapProxyInterfaceTypeToPersistentType");
-        }
-
-        this._mapPersistentTypeToProxyInterfaceType = mapPersistentTypeToProxyInterfaceType;
-
-        this._mapProxyInterfaceTypeToPersistentType = mapProxyInterfaceTypeToPersistentType;
+        _mapPersistentTypeToProxyInterfaceType = mapPersistentTypeToProxyInterfaceType ?? throw new ArgumentNullException(nameof(mapPersistentTypeToProxyInterfaceType));
+        _mapProxyInterfaceTypeToPersistentType = mapProxyInterfaceTypeToPersistentType ?? throw new ArgumentNullException(nameof(mapProxyInterfaceTypeToPersistentType));
     }
 
     /// <summary>

diff --git a/src/FluentNHibernate/DummyPropertyInfo.cs b/src/FluentNHibernate/DummyPropertyInfo.cs
@@ -9,11 +9,8 @@ public sealed class DummyPropertyInfo : PropertyInfo
 {
     public DummyPropertyInfo(string name, Type type)
     {
-        if (name is null) throw new ArgumentNullException("name");
-        if (type is null) throw new ArgumentNullException("type");
-
-        this.Name = name;
-        this.DeclaringType = type;
+        Name = name ?? throw new ArgumentNullException(nameof(name));
+        DeclaringType = type ?? throw new ArgumentNullException(nameof(type));
     }
 
     public override Module Module => null;

diff --git a/src/FluentNHibernate/Mapping/FilterDefinition.cs b/src/FluentNHibernate/Mapping/FilterDefinition.cs
@@ -33,8 +33,8 @@ public FilterDefinition WithCondition(string condition)
 
     public FilterDefinition AddParameter(string name, IType type)
     {
-        if (string.IsNullOrEmpty(name)) throw new ArgumentException("The name is mandatory", "name");
-        if (type is null) throw new ArgumentNullException("type");
+        if (string.IsNullOrEmpty(name)) throw new ArgumentException("The name is mandatory", nameof(name));
+        if (type is null) throw new ArgumentNullException(nameof(type));
         parameters.Add(name, type);
         return this;
     }

diff --git a/src/FluentNHibernate/SessionSource.cs b/src/FluentNHibernate/SessionSource.cs
@@ -43,7 +43,7 @@ public SessionSource(FluentConfiguration config)
 
     protected void Initialize(Configuration nhibernateConfig, PersistenceModel model)
     {
-        if( model is null ) throw new ArgumentNullException("model", "Model cannot be null");
+        if (model is null) throw new ArgumentNullException(nameof(model), "Model cannot be null");
 
         Configuration = nhibernateConfig;
 

diff --git a/src/FluentNHibernate/Testing/Values/List.cs b/src/FluentNHibernate/Testing/Values/List.cs
@@ -65,12 +65,12 @@ private void AssertGenericListMatches(IEnumerable actualEnumerable, IEnumerable<
     {
         if (actualEnumerable is null)
         {
-            throw new ArgumentNullException("actualEnumerable",
+            throw new ArgumentNullException(nameof(actualEnumerable),
                 "Actual and expected are not equal (actual was null).");
         }
         if (expectedEnumerable is null)
         {
-            throw new ArgumentNullException("expectedEnumerable",
+            throw new ArgumentNullException(nameof(expectedEnumerable),
                 "Actual and expected are not equal (expected was null).");
         }
 

diff --git a/src/FluentNHibernate/Testing/Values/ReferenceBag.cs b/src/FluentNHibernate/Testing/Values/ReferenceBag.cs
@@ -21,12 +21,12 @@ private void AssertGenericListMatches(IEnumerable actualEnumerable, IEnumerable<
     {
         if (actualEnumerable is null)
         {
-            throw new ArgumentNullException("actualEnumerable",
+            throw new ArgumentNullException(nameof(actualEnumerable),
                 "Actual and expected are not equal (actual was null).");
         }
         if (expectedEnumerable is null)
         {
-            throw new ArgumentNullException("expectedEnumerable",
+            throw new ArgumentNullException(nameof(expectedEnumerable),
                 "Actual and expected are not equal (expected was null).");
         }
 

diff --git a/src/FluentNHibernate/Utils/ObservableDictionary.cs b/src/FluentNHibernate/Utils/ObservableDictionary.cs
@@ -56,7 +56,7 @@ public bool ContainsKey(TKey key) {
     public ICollection<TKey> Keys => Dictionary.Keys;
 
     public bool Remove(TKey key) {
-        if (key is null) throw new ArgumentNullException("key");
+        if (key is null) throw new ArgumentNullException(nameof(key));
 
         TValue value;
         Dictionary.TryGetValue(key, out value);
@@ -140,7 +140,7 @@ IEnumerator IEnumerable.GetEnumerator() {
     #endregion
 
     public void AddRange(IDictionary<TKey, TValue> items) {
-        if (items is null) throw new ArgumentNullException("items");
+        if (items is null) throw new ArgumentNullException(nameof(items));
 
         if (items.Count > 0) {
             if (Dictionary.Count > 0) {
@@ -156,7 +156,7 @@ public void AddRange(IDictionary<TKey, TValue> items) {
     }
 
     private void Insert(TKey key, TValue value, bool add) {
-        if (key is null) throw new ArgumentNullException("key");
+        if (key is null) throw new ArgumentNullException(nameof(key));
 
         TValue item;
         if (Dictionary.TryGetValue(key, out item)) {

diff --git a/src/FluentNHibernate/Utils/Reflection/ReflectionHelper.cs b/src/FluentNHibernate/Utils/Reflection/ReflectionHelper.cs
@@ -75,7 +75,7 @@ private static PropertyInfo GetDynamicComponentProperty(Expression expression)
             }
 
             if (nextOperand.NodeType != ExpressionType.Convert)
-                throw new ArgumentException("Expression not supported", "expression");
+                throw new ArgumentException("Expression not supported", nameof(expression));
 
             var unaryExpression = (UnaryExpression)nextOperand;
             desiredConversionType = unaryExpression.Type;
@@ -107,7 +107,7 @@ private static MemberExpression GetMemberExpression(Expression expression, bool
 
         if (enforceCheck && memberExpression is null)
         {
-            throw new ArgumentException("Not a member access", "expression");
+            throw new ArgumentException("Not a member access", nameof(expression));
         }
 
         return memberExpression;

diff --git a/src/FluentNHibernate/Utils/StringLikeness.cs b/src/FluentNHibernate/Utils/StringLikeness.cs
@@ -12,8 +12,8 @@ public static class StringLikeness
     public static int EditDistance(string x, string y)
     {
         // Validate parameters
-        if (x is null) throw new ArgumentNullException("x");
-        if (y is null) throw new ArgumentNullException("y");
+        if (x is null) throw new ArgumentNullException(nameof(x));
+        if (y is null) throw new ArgumentNullException(nameof(y));
 
         // Convert the parameters into IList instances
         // in order to obtain indexing capabilities