servicetitan · SergeiPavlov · Sep 19, 2024 · Sep 18, 2024
diff --git a/Orm/Xtensive.Orm.Tests.Framework/Measurement.cs b/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();
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm.Tests.Framework/TestSqlDriver.cs b/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)
       }
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Collections/TypeRegistry.cs b/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));
     }
 

diff --git a/Orm/Xtensive.Orm/Core/ArgumentValidator.cs b/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.

diff --git a/Orm/Xtensive.Orm/Linq/SerializableExpressions/Internals/ReflectionExtensions.cs b/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];

diff --git a/Orm/Xtensive.Orm/Modelling/Actions/CreateNodeAction.cs b/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()));
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Modelling/Comparison/Hints/DataHint.cs b/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();
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Modelling/Comparison/Hints/IgnoreHint.cs b/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;
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Modelling/Nesting.cs b/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();
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Modelling/Node.cs b/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)
       }
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Modelling/NodeCollection.cs b/Orm/Xtensive.Orm/Modelling/NodeCollection.cs
@@ -372,7 +372,7 @@ protected virtual void Initialize()
     protected NodeCollection(Node parent, string name)
     {
       ArgumentNullException.ThrowIfNull(parent);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       this.name = name;
       this.parent = parent;
       Initialize();
@@ -394,4 +394,3 @@ void IDeserializationCallback.OnDeserialization(object sender)
     }
   }
 }
-
diff --git a/Orm/Xtensive.Orm/Orm/Building/Definitions/TypeDef.cs b/Orm/Xtensive.Orm/Orm/Building/Definitions/TypeDef.cs
@@ -171,7 +171,7 @@ public FieldDef DefineField(PropertyInfo property)
     /// <returns></returns>
     public FieldDef DefineField(string name, Type valueType)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, nameof(name));
+      ArgumentException.ThrowIfNullOrEmpty(name);
       ArgumentNullException.ThrowIfNull(valueType);
 
       var field = builder.DefineField(UnderlyingType, name, valueType);
@@ -221,4 +221,4 @@ internal TypeDef(ModelDefBuilder builder, Type type, Validator validator)
         : NodeCollection<TypeDef>.Empty;
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/DatabaseConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/DatabaseConfiguration.cs
@@ -28,7 +28,7 @@ public string Name
       get { return name; }
       set
       {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         EnsureNotLocked();
         name = value;
       }
@@ -109,10 +109,10 @@ public DatabaseConfiguration Clone()
     /// <param name="name">Database name.</param>
     public DatabaseConfiguration(string name)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       Name = name;
       minTypeId = TypeInfo.MinTypeId;
       maxTypeId = int.MaxValue;
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs
@@ -170,7 +170,7 @@ public static string SectionName
     {
       get => sectionName;
       set {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         if (sectionNameIsDefined) {
           throw Exceptions.AlreadyInitialized(nameof(SectionName));
         }

diff --git a/Orm/Xtensive.Orm/Orm/Configuration/KeyGeneratorConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/KeyGeneratorConfiguration.cs
@@ -26,7 +26,7 @@ public string Name
       get { return name; }
       set
       {
-        ArgumentValidator.EnsureArgumentNotNullOrEmpty(value, "value");
+        ArgumentException.ThrowIfNullOrEmpty(value);
         EnsureNotLocked();
         name = value;
       }
@@ -96,4 +96,4 @@ public KeyGeneratorConfiguration(string name)
       CacheSize = DomainConfiguration.DefaultKeyGeneratorCacheSize;
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs
@@ -43,7 +43,7 @@ public static LoggingConfiguration Load()
     /// <returns>Loaded configuration.</returns>
     public static LoggingConfiguration Load(string sectionName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, "sectionName");
+      ArgumentException.ThrowIfNullOrEmpty(sectionName);
 
       var section = (ConfigurationSection)ConfigurationManager.GetSection(sectionName);
       if (section==null)
@@ -71,7 +71,7 @@ public static LoggingConfiguration Load(System.Configuration.Configuration confi
     public static LoggingConfiguration Load(System.Configuration.Configuration configuration, string sectionName)
     {
       ArgumentNullException.ThrowIfNull(configuration);
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, "sectionName");
+      ArgumentException.ThrowIfNullOrEmpty(sectionName);
 
       var section = (ConfigurationSection) configuration.GetSection(sectionName);
       if (section==null)

diff --git a/Orm/Xtensive.Orm/Orm/Configuration/NameMappingCollection.cs b/Orm/Xtensive.Orm/Orm/Configuration/NameMappingCollection.cs
@@ -38,8 +38,8 @@ public class NameMappingCollection : LockableBase, IEnumerable<KeyValuePair<stri
     /// <param name="mappedName"></param>
     public void Add([NotNull] string originalName, [NotNull] string mappedName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(originalName, "originalName");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(mappedName, "mappedName");
+      ArgumentException.ThrowIfNullOrEmpty(originalName);
+      ArgumentException.ThrowIfNullOrEmpty(mappedName);
       EnsureNotLocked();
       items[originalName] = mappedName;
     }
@@ -50,7 +50,7 @@ public void Add([NotNull] string originalName, [NotNull] string mappedName)
     /// <param name="originalName"></param>
     public bool Remove([NotNull] string originalName)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(originalName, "originalName");
+      ArgumentException.ThrowIfNullOrEmpty(originalName);
       EnsureNotLocked();
       return items.Remove(originalName);
     }
@@ -61,7 +61,7 @@ public bool Remove([NotNull] string originalName)
     /// <param name="name">Mapped name for <paramref name="name"/>.</param>
     public string Apply([NotNull] string name)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
       string result;
       if (items.TryGetValue(name, out result))
         return result;
@@ -126,4 +126,4 @@ static NameMappingCollection()
       Empty.Lock();
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Orm/Configuration/SessionConfiguration.cs b/Orm/Xtensive.Orm/Orm/Configuration/SessionConfiguration.cs
@@ -305,7 +305,7 @@ public SessionConfiguration(string name)
     /// <param name="name">Value for <see cref="Name"/>.</param>
     public SessionConfiguration(string name, SessionOptions sessionOptions)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(name, "name");
+      ArgumentException.ThrowIfNullOrEmpty(name);
 
       Name = name;
       Options = sessionOptions;

diff --git a/Orm/Xtensive.Orm/Orm/Configuration/SessionConfigurationCollection.cs b/Orm/Xtensive.Orm/Orm/Configuration/SessionConfigurationCollection.cs
@@ -91,7 +91,7 @@ public override void AddRange(IEnumerable<SessionConfiguration> items)
 
     private void EnsureItemIsValid(SessionConfiguration item)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(item.Name, "SessionConfiguration.Name");
+      ArgumentException.ThrowIfNullOrEmpty(item.Name, "SessionConfiguration.Name");
       var current = this[item.Name];
       if (current != null)
         throw new InvalidOperationException(string.Format(Strings.ExConfigurationWithXNameAlreadyRegistered, current.Name));

diff --git a/Orm/Xtensive.Orm/Orm/ConnectionInfo.cs b/Orm/Xtensive.Orm/Orm/ConnectionInfo.cs
@@ -93,8 +93,8 @@ public bool Equals(ConnectionInfo other)
     /// <param name="connectionString">A value for <see cref="ConnectionString"/>.</param>
     public ConnectionInfo(string provider, string connectionString)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(provider, "provider");
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(connectionString, "connectionString");
+      ArgumentException.ThrowIfNullOrEmpty(provider);
+      ArgumentException.ThrowIfNullOrEmpty(connectionString);
 
       ConnectionString = connectionString;
       Provider = provider.ToLowerInvariant();

diff --git a/Orm/Xtensive.Orm/Orm/ConnectionInitEventData.cs b/Orm/Xtensive.Orm/Orm/ConnectionInitEventData.cs
@@ -20,7 +20,7 @@ public class ConnectionInitEventData : ConnectionEventData
     public ConnectionInitEventData(string initializationScript, DbConnection connection, bool reconnect = false)
       : base(connection, reconnect)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmpty(initializationScript, nameof(initializationScript));
+      ArgumentException.ThrowIfNullOrEmpty(initializationScript);
       InitializationScript = initializationScript;
     }
   }

diff --git a/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/PrefixTerm.cs b/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/PrefixTerm.cs
@@ -30,8 +30,8 @@ internal PrefixTerm(string prefix)
     internal PrefixTerm(IOperator source, string prefix)
       : base(SearchConditionNodeType.Prefix, source)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmptyOrWhiteSpace(prefix, "prefix");
+      ArgumentException.ThrowIfNullOrWhiteSpace(prefix);
       Prefix = prefix;
     }
   }
-}
+}
diff --git a/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/SimpleTerm.cs b/Orm/Xtensive.Orm/Orm/FullTextSearchCondition/Nodes/SimpleTerm.cs
@@ -30,7 +30,7 @@ internal SimpleTerm(string term)
     internal SimpleTerm(IOperator source, string term)
       : base(SearchConditionNodeType.SimpleTerm, source)
     {
-      ArgumentValidator.EnsureArgumentNotNullOrEmptyOrWhiteSpace(term, "term");
+      ArgumentException.ThrowIfNullOrWhiteSpace(term);
       Term = term;
     }
   }