Use ArgumentException.ThrowIfNullOrEmpty and ThrowIfNullOrWhitespace (#52897)

Author: joegoldman2

src/Caching/SqlServer/src/Microsoft.Extensions.Caching.SqlServer.csproj

@@ -24,6 +24,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentNullThrowHelper.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentThrowHelper.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)CallerArgument\CallerArgumentExpressionAttribute.cs" LinkBase="Shared" />
   </ItemGroup>
 

src/Caching/SqlServer/src/SqlServerCache.cs

@@ -35,21 +35,10 @@ public SqlServerCache(IOptions<SqlServerCacheOptions> options)
     {
         var cacheOptions = options.Value;
 
-        if (string.IsNullOrEmpty(cacheOptions.ConnectionString))
-        {
-            throw new ArgumentException(
-                $"{nameof(SqlServerCacheOptions.ConnectionString)} cannot be empty or null.");
-        }
-        if (string.IsNullOrEmpty(cacheOptions.SchemaName))
-        {
-            throw new ArgumentException(
-                $"{nameof(SqlServerCacheOptions.SchemaName)} cannot be empty or null.");
-        }
-        if (string.IsNullOrEmpty(cacheOptions.TableName))
-        {
-            throw new ArgumentException(
-                $"{nameof(SqlServerCacheOptions.TableName)} cannot be empty or null.");
-        }
+        ArgumentThrowHelper.ThrowIfNullOrEmpty(cacheOptions.ConnectionString);
+        ArgumentThrowHelper.ThrowIfNullOrEmpty(cacheOptions.SchemaName);
+        ArgumentThrowHelper.ThrowIfNullOrEmpty(cacheOptions.TableName);
+
         if (cacheOptions.ExpiredItemsDeletionInterval.HasValue &&
             cacheOptions.ExpiredItemsDeletionInterval.Value < MinimumExpiredItemsDeletionInterval)
         {

src/Components/Components/src/Routing/Resources.resx

@@ -159,9 +159,6 @@
   <data name="ArgumentMustBeGreaterThanOrEqualTo" xml:space="preserve">
     <value>Value must be greater than or equal to {0}.</value>
   </data>
-  <data name="Argument_NullOrEmpty" xml:space="preserve">
-    <value>Value cannot be null or empty.</value>
-  </data>
   <data name="TemplateRoute_CannotHaveCatchAllInMultiSegment" xml:space="preserve">
     <value>A path segment that contains more than one section, such as a literal section or a parameter, cannot contain a catch-all parameter.</value>
   </data>

src/Components/Server/src/ProtectedBrowserStorage/ProtectedBrowserStorage.cs

@@ -33,10 +33,7 @@ private protected ProtectedBrowserStorage(string storeName, IJSRuntime jsRuntime
             throw new PlatformNotSupportedException($"{GetType()} cannot be used when running in a browser.");
         }
 
-        if (string.IsNullOrEmpty(storeName))
-        {
-            throw new ArgumentException("The value cannot be null or empty", nameof(storeName));
-        }
+        ArgumentException.ThrowIfNullOrEmpty(storeName);
 
         _storeName = storeName;
         _jsRuntime = jsRuntime ?? throw new ArgumentNullException(nameof(jsRuntime));
@@ -71,15 +68,8 @@ public ValueTask SetAsync(string key, object value)
     /// <returns>A <see cref="ValueTask"/> representing the completion of the operation.</returns>
     public ValueTask SetAsync(string purpose, string key, object value)
     {
-        if (string.IsNullOrEmpty(purpose))
-        {
-            throw new ArgumentException("Cannot be null or empty", nameof(purpose));
-        }
-
-        if (string.IsNullOrEmpty(key))
-        {
-            throw new ArgumentException("Cannot be null or empty", nameof(key));
-        }
+        ArgumentException.ThrowIfNullOrEmpty(purpose);
+        ArgumentException.ThrowIfNullOrEmpty(key);
 
         return SetProtectedJsonAsync(key, Protect(purpose, value));
     }

src/Components/Web/src/JSComponents/JSComponentConfigurationStore.cs

@@ -56,10 +56,7 @@ internal void Add([DynamicallyAccessedMembers(LinkerFlags.Component)] Type compo
     {
         Add(componentType, identifier);
 
-        if (string.IsNullOrEmpty(javaScriptInitializer))
-        {
-            throw new ArgumentException($"'{nameof(javaScriptInitializer)}' cannot be null or empty.", nameof(javaScriptInitializer));
-        }
+        ArgumentException.ThrowIfNullOrEmpty(javaScriptInitializer);
 
         // Since it has a JS initializer, prepare the metadata we'll supply to JS code
         if (!JSComponentIdentifiersByInitializer.TryGetValue(javaScriptInitializer, out var identifiersForInitializer))

src/FileProviders/Embedded/src/Manifest/ManifestDirectory.cs

@@ -47,11 +47,7 @@ public override ManifestEntry Traverse(StringSegment segment)
 
     public static ManifestDirectory CreateDirectory(string name, ManifestEntry[] children)
     {
-        if (string.IsNullOrWhiteSpace(name))
-        {
-            throw new ArgumentException($"'{nameof(name)}' must not be null, empty or whitespace.", nameof(name));
-        }
-
+        ArgumentThrowHelper.ThrowIfNullOrWhiteSpace(name);
         ArgumentNullThrowHelper.ThrowIfNull(children);
 
         var result = new ManifestDirectory(name, children);

src/FileProviders/Embedded/src/Manifest/ManifestFile.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Microsoft.AspNetCore.Shared;
 using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.Extensions.FileProviders.Embedded.Manifest;
@@ -11,15 +12,8 @@ internal sealed class ManifestFile : ManifestEntry
     public ManifestFile(string name, string resourcePath)
         : base(name)
     {
-        if (string.IsNullOrWhiteSpace(name))
-        {
-            throw new ArgumentException($"'{nameof(name)}' must not be null, empty or whitespace.", nameof(name));
-        }
-
-        if (string.IsNullOrWhiteSpace(resourcePath))
-        {
-            throw new ArgumentException($"'{nameof(resourcePath)}' must not be null, empty or whitespace.", nameof(resourcePath));
-        }
+        ArgumentThrowHelper.ThrowIfNullOrWhiteSpace(name);
+        ArgumentThrowHelper.ThrowIfNullOrWhiteSpace(resourcePath);
 
         ResourcePath = resourcePath;
     }

src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.csproj

@@ -41,6 +41,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentNullThrowHelper.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentThrowHelper.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)CallerArgument\CallerArgumentExpressionAttribute.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)TrimmingAttributes.cs" LinkBase="Shared"
              Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'" />

src/Hosting/Hosting/src/Internal/HostingEnvironmentExtensions.cs

@@ -13,10 +13,7 @@ internal static void Initialize(this IHostingEnvironment hostingEnvironment, str
 #pragma warning restore CS0618 // Type or member is obsolete
     {
         ArgumentNullException.ThrowIfNull(options);
-        if (string.IsNullOrEmpty(contentRootPath))
-        {
-            throw new ArgumentException("A valid non-empty content root must be provided.", nameof(contentRootPath));
-        }
+        ArgumentException.ThrowIfNullOrEmpty(contentRootPath);
         if (!Directory.Exists(contentRootPath))
         {
             throw new ArgumentException($"The content root '{contentRootPath}' does not exist.", nameof(contentRootPath));
@@ -67,10 +64,7 @@ internal static void Initialize(
         IHostEnvironment? baseEnvironment = null)
     {
         ArgumentNullException.ThrowIfNull(options);
-        if (string.IsNullOrEmpty(contentRootPath))
-        {
-            throw new ArgumentException("A valid non-empty content root must be provided.", nameof(contentRootPath));
-        }
+        ArgumentException.ThrowIfNullOrEmpty(contentRootPath);
         if (!Directory.Exists(contentRootPath))
         {
             throw new ArgumentException($"The content root '{contentRootPath}' does not exist.", nameof(contentRootPath));

src/Hosting/Server.IntegrationTesting/src/Common/DeploymentParameters.cs

@@ -52,10 +52,7 @@ public DeploymentParameters(
         RuntimeFlavor runtimeFlavor,
         RuntimeArchitecture runtimeArchitecture)
     {
-        if (string.IsNullOrEmpty(applicationPath))
-        {
-            throw new ArgumentException("Value cannot be null.", nameof(applicationPath));
-        }
+        ArgumentException.ThrowIfNullOrEmpty(applicationPath);
 
         if (!Directory.Exists(applicationPath))
         {