Refactor to ArgumentException.ThrowIfNullOrEmpty() usage (#269)

Author: SergeiPavlov

Orm/Xtensive.Orm.Tests.Framework/Measurement.cs

@@ -34,7 +34,7 @@ public string Name
       get { return name; }
       [DebuggerStepThrough]
       set {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         name = value;
         UpdateFullName();
       }
@@ -231,4 +231,4 @@ void IDisposable.Dispose()
         Complete();
     }
   }
-}
+}

Orm/Xtensive.Orm.Tests.Framework/TestSqlDriver.cs

@@ -24,14 +24,14 @@ public static SqlDriver Create(UrlInfo connectionUrl)
 
     public static SqlDriver Create(string connectionUrl)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(connectionUrl, "connectionUrl");
+      ArgumentException.ThrowIfNullOrEmpty(connectionUrl);
       return BuildDriver(new ConnectionInfo(connectionUrl));
     }
 
     public static SqlDriver Create(string provider, string connectionString)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(provider, "provider");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(connectionString, "connectionString");
+      ArgumentException.ThrowIfNullOrEmpty(provider);
+      ArgumentException.ThrowIfNullOrEmpty(connectionString);
       return BuildDriver(new ConnectionInfo(provider, connectionString));
     }
 
@@ -59,4 +59,4 @@ private static SqlDriverFactory GetFactory(string provider)
       }
     }
   }
-}
+}

Orm/Xtensive.Orm/Collections/TypeRegistry.cs

@@ -96,7 +96,7 @@ public void Register(Assembly assembly, string @namespace)
     {
       EnsureNotLocked();
       ArgumentNullException.ThrowIfNull(assembly);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(@namespace, "@namespace");
+      ArgumentException.ThrowIfNullOrEmpty(@namespace);
       Register(new TypeRegistration(assembly, @namespace));
     }
 

Orm/Xtensive.Orm/Core/ArgumentValidator.cs

@@ -37,43 +37,6 @@ public static void EnsureArgumentIsNotDefault<T>(T value, [InvokerParameterName]
       }
     }
 
-    /// <summary>
-    /// Ensures argument (<paramref name="value"/>) is not
-    /// <see langoword="null"/> or <see cref="string.Empty"/> string.
-    /// </summary>
-    /// <param name="value">Value to check.</param>
-    /// <param name="parameterName">Name of the method parameter.</param>
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-#if NET7_0_OR_GREATER
-    [Obsolete("Use ArgumentException.ThrowIfNullOrEmpty()")]
-#endif
-    internal static void EnsureArgumentNotNullOrEmpty(string value, [InvokerParameterName] string parameterName)
-    {
-#if NET7_0_OR_GREATER
-      ArgumentException.ThrowIfNullOrEmpty(value, parameterName);
-#else
-      ArgumentNullException.ThrowIfNull(value, parameterName);
-      if (value.Length == 0) {
-        throw new ArgumentException(Strings.ExArgumentCannotBeEmptyString, parameterName);
-      }
-#endif
-    }
-
-    [Obsolete("Use CommunityToolkit.Diagnostics.Guard.IsNotNullOrWhiteSpace()")]
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    internal static void EnsureArgumentNotNullOrEmptyOrWhiteSpace(string value, [InvokerParameterName] string parameterName)
-    {
-      ArgumentNullException.ThrowIfNull(value, parameterName);
-
-      if (value.Length==0) {
-        throw new ArgumentException(Strings.ExArgumentCannotBeEmptyString, parameterName);
-      }
-
-      if (value.Trim().Length==0) {
-        throw new ArgumentException(Strings.ExArgumentCannotBeWhiteSpacesOnlyString, parameterName);
-      }
-    }
-
     /// <summary>
     /// Ensures argument (<paramref name="value"/>) is not <see langword="null"/>
     /// and of <typeparamref name="T"/> type.

Orm/Xtensive.Orm/Linq/SerializableExpressions/Internals/ReflectionExtensions.cs

@@ -87,7 +87,7 @@ public static ConstructorInfo GetConstructorFromSerializableForm(this string ser
 
     public static void AddArray<T>(this SerializationInfo info, string key, T[] array)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(key, "key");
+      ArgumentException.ThrowIfNullOrEmpty(key);
       ArgumentNullException.ThrowIfNull(array);
 
       info.AddValue($"{key}Count", array.Length);
@@ -97,7 +97,7 @@ public static void AddArray<T>(this SerializationInfo info, string key, T[] arra
 
     public static T[] GetArrayFromSerializableForm<T>(this SerializationInfo info, string key)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(key, "key");
+      ArgumentException.ThrowIfNullOrEmpty(key);
 
       var count = info.GetInt32($"{key}Count");
       var array = new T[count];

Orm/Xtensive.Orm/Modelling/Actions/CreateNodeAction.cs

@@ -43,7 +43,7 @@ public Type Type {
     public string Name {
       get { return name; }
       set {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         EnsureNotLocked();
         name = value;
       }
@@ -122,4 +122,4 @@ protected override void GetParameters(List<Pair<string>> parameters)
         parameters.Add(new Pair<string>("Parameters", this.parameters.ToCommaDelimitedString()));
     }
   }
-}
+}

Orm/Xtensive.Orm/Modelling/Comparison/Hints/DataHint.cs

@@ -49,11 +49,11 @@ public override List<HintTarget> GetTargets()
     /// </summary>
     protected DataHint(string sourceTablePath,  IReadOnlyList<IdentityPair> identities)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sourceTablePath, "sourceTablePath");
+      ArgumentException.ThrowIfNullOrEmpty(sourceTablePath);
       ArgumentNullException.ThrowIfNull(identities, "pairs");
 
       SourceTablePath = sourceTablePath;
       Identities = identities.AsSafeWrapper();
     }
   }
-}
+}

Orm/Xtensive.Orm/Modelling/Comparison/Hints/IgnoreHint.cs

@@ -44,8 +44,8 @@ public override string ToString()
     /// <param name="path">The ignored node path.</param>
     public IgnoreHint(string path)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(path, "path");
+      ArgumentException.ThrowIfNullOrEmpty(path);
       Path = path;
     }
   }
-}
+}

Orm/Xtensive.Orm/Modelling/Nesting.cs

@@ -73,7 +73,7 @@ internal virtual void Initialize()
     internal Nesting(Node node, string propertyName)
     {
       ArgumentNullException.ThrowIfNull(node);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(propertyName, "propertyName");
+      ArgumentException.ThrowIfNullOrEmpty(propertyName);
       Node = node;
       PropertyName = propertyName;
       Initialize();
@@ -86,4 +86,4 @@ internal Nesting(Node node)
       Initialize();
     }
   }
-}
+}

Orm/Xtensive.Orm/Modelling/Node.cs

@@ -428,7 +428,7 @@ protected virtual void CopyPropertyValue(Node target, PropertyAccessor accessor)
     /// <exception cref="InvalidOperationException">newName!=newIndex for <see cref="IUnnamedNode"/>.</exception>
     protected virtual void ValidateMove(Node newParent, string newName, int newIndex)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(newName, nameof(newName));
+      ArgumentException.ThrowIfNullOrEmpty(newName);
       if (this is IModel) {
         ArgumentValidator.EnsureArgumentIsInRange(newIndex, 0, 0, nameof(newIndex));
         return;
@@ -1012,7 +1012,7 @@ protected Node(Node parent, string name)
       }
 
       if (!(this is IUnnamedNode)) {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, nameof(name));
+        ArgumentException.ThrowIfNullOrEmpty(name);
       }
 
       Initialize();
@@ -1044,4 +1044,4 @@ void IDeserializationCallback.OnDeserialization(object sender)
       }
     }
   }
-}
+}