share-argument-exception-extension

src/Aspire.Hosting.Azure.CognitiveServices/Aspire.Hosting.Azure.CognitiveServices.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <Compile Include="$(RepoRoot)src\Shared\AzureRoleAssignmentUtils.cs" />
+    <Compile Include="$(ComponentsDir)\Common\ArgumentExceptionExtensions.cs" Link="ArgumentExceptionExtensions.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIDeployment.cs

@@ -1,9 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
 namespace Aspire.Hosting.ApplicationModel;
 
 /// <summary>
@@ -25,17 +22,17 @@ public class AzureOpenAIDeployment(string name, string modelName, string modelVe
     /// <summary>
     /// Gets the name of the deployment.
     /// </summary>
-    public string Name { get; private set; } = ThrowIfNullOrEmpty(name);
+    public string Name { get; private set; } = name.ThrowIfNullOrEmpty();
 
     /// <summary>
     /// Gets the name of the model.
     /// </summary>
-    public string ModelName { get; private set; } = ThrowIfNullOrEmpty(modelName);
+    public string ModelName { get; private set; } = modelName.ThrowIfNullOrEmpty();
 
     /// <summary>
     /// Gets the version of the model.
     /// </summary>
-    public string ModelVersion { get; private set; } = ThrowIfNullOrEmpty(modelVersion);
+    public string ModelVersion { get; private set; } = modelVersion.ThrowIfNullOrEmpty();
 
     /// <summary>
     /// Gets the name of the SKU.
@@ -52,10 +49,4 @@ public class AzureOpenAIDeployment(string name, string modelName, string modelVe
     /// The default value is <inheritdoc cref="DefaultSkuCapacity"/>.
     /// </value>
     public int SkuCapacity { get; set; } = skuCapacity ?? DefaultSkuCapacity;
-
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
 }

src/Aspire.Hosting.Azure.CosmosDB/Aspire.Hosting.Azure.CosmosDB.csproj

@@ -11,6 +11,7 @@
   <ItemGroup>
     <Compile Include="..\Shared\Cosmos\CosmosConstants.cs" Link="Shared\CosmosConstants.cs" />
     <Compile Include="..\Shared\Cosmos\CosmosUtils.cs" Link="Shared\CosmosUtils.cs" />
+    <Compile Include="$(ComponentsDir)\Common\ArgumentExceptionExtensions.cs" Link="ArgumentExceptionExtensions.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBContainerResource.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using Aspire.Hosting.ApplicationModel;
 
 namespace Aspire.Hosting.Azure;
@@ -17,15 +15,27 @@ namespace Aspire.Hosting.Azure;
 public class AzureCosmosDBContainerResource(string name, string containerName, string partitionKeyPath, AzureCosmosDBDatabaseResource parent)
     : Resource(name), IResourceWithParent<AzureCosmosDBDatabaseResource>, IResourceWithConnectionString, IResourceWithAzureFunctionsConfig
 {
+    private string _containerName = containerName.ThrowIfNullOrEmpty();
+
     /// <summary>
     /// Gets or sets the container name.
     /// </summary>
-    public string ContainerName { get; set; } = ThrowIfNullOrEmpty(containerName);
+    public string ContainerName
+    {
+        get => _containerName;
+        set => _containerName = value.ThrowIfNullOrEmpty(nameof(containerName));
+    }
+
+    private string _partitionKeyPath = partitionKeyPath.ThrowIfNullOrEmpty();
 
     /// <summary>
     /// Gets or sets the partition key path.
     /// </summary>
-    public string PartitionKeyPath { get; set; } = ThrowIfNullOrEmpty(partitionKeyPath);
+    public string PartitionKeyPath
+    {
+        get => _partitionKeyPath;
+        set => _partitionKeyPath = value.ThrowIfNullOrEmpty(nameof(partitionKeyPath));
+    }
 
     /// <summary>
     /// Gets the parent Azure Cosmos DB database resource.
@@ -40,10 +50,4 @@ public class AzureCosmosDBContainerResource(string name, string containerName, s
     // ensure Azure Functions projects can WithReference a CosmosDB database container
     void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName) =>
         ((IResourceWithAzureFunctionsConfig)Parent).ApplyAzureFunctionsConfiguration(target, connectionName);
-
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
 }

src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBDatabaseResource.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using Aspire.Hosting.ApplicationModel;
 
 namespace Aspire.Hosting.Azure;
@@ -17,10 +15,16 @@ namespace Aspire.Hosting.Azure;
 public class AzureCosmosDBDatabaseResource(string name, string databaseName, AzureCosmosDBResource parent)
     : Resource(name), IResourceWithParent<AzureCosmosDBResource>, IResourceWithConnectionString, IResourceWithAzureFunctionsConfig
 {
+    private string _databaseName = databaseName.ThrowIfNullOrEmpty();
+
     /// <summary>
     /// Gets or sets the database name.
     /// </summary>
-    public string DatabaseName { get; set; } = ThrowIfNullOrEmpty(databaseName);
+    public string DatabaseName
+    {
+        get => _databaseName;
+        set => _databaseName = value.ThrowIfNullOrEmpty(nameof(databaseName));
+    }
 
     /// <summary>
     /// The containers for this database.
@@ -40,10 +44,4 @@ public class AzureCosmosDBDatabaseResource(string name, string databaseName, Azu
     // ensure Azure Functions projects can WithReference a CosmosDB database
     void IResourceWithAzureFunctionsConfig.ApplyAzureFunctionsConfiguration(IDictionary<string, object> target, string connectionName) =>
         ((IResourceWithAzureFunctionsConfig)Parent).ApplyAzureFunctionsConfiguration(target, connectionName);
-
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
 }

src/Aspire.Hosting.Azure.EventHubs/Aspire.Hosting.Azure.EventHubs.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <Compile Include="$(RepoRoot)src\Shared\AzureRoleAssignmentUtils.cs" />
+    <Compile Include="$(ComponentsDir)\Common\ArgumentExceptionExtensions.cs" Link="ArgumentExceptionExtensions.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.EventHubs/AzureEventHubConsumerGroupResource.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Aspire.Hosting.ApplicationModel;
 using Azure.Provisioning;
@@ -19,10 +17,16 @@ namespace Aspire.Hosting.Azure;
 public class AzureEventHubConsumerGroupResource(string name, string consumerGroupName, AzureEventHubResource parent)
     : Resource(name), IResourceWithParent<AzureEventHubResource>, IResourceWithConnectionString, IResourceWithAzureFunctionsConfig
 {
+    private string _consumerGroupName = consumerGroupName.ThrowIfNullOrEmpty();
+
     /// <summary>
     /// The event hub consumer group name.
     /// </summary>
-    public string ConsumerGroupName { get; set; } = ThrowIfNullOrEmpty(consumerGroupName);
+    public string ConsumerGroupName
+    {
+        get => _consumerGroupName;
+        set => _consumerGroupName = value.ThrowIfNullOrEmpty(nameof(consumerGroupName));
+    }
 
     /// <summary>
     /// Gets the parent Azure Event Hub resource.
@@ -60,10 +64,4 @@ internal void WriteJsonObjectProperties(Utf8JsonWriter writer)
     {
         writer.WriteString(nameof(Name), ConsumerGroupName);
     }
-
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
 }

src/Aspire.Hosting.Azure.EventHubs/AzureEventHubResource.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Aspire.Hosting.ApplicationModel;
 using Azure.Provisioning;
@@ -19,10 +17,16 @@ namespace Aspire.Hosting.Azure;
 public class AzureEventHubResource(string name, string hubName, AzureEventHubsResource parent)
     : Resource(name), IResourceWithParent<AzureEventHubsResource>, IResourceWithConnectionString, IResourceWithAzureFunctionsConfig
 {
+    private string _hubName = hubName.ThrowIfNullOrEmpty();
+
     /// <summary>
     /// The event hub name.
     /// </summary>
-    public string HubName { get; set; } = ThrowIfNullOrEmpty(hubName);
+    public string HubName
+    {
+        get => _hubName;
+        set => _hubName = value.ThrowIfNullOrEmpty(nameof(hubName));
+    }
 
     /// <summary>
     /// Number of partitions created for the Event Hub, allowed values are from
@@ -109,10 +113,4 @@ internal void WriteJsonObjectProperties(Utf8JsonWriter writer)
         writer.WriteEndArray();
     }
 #pragma warning restore CA1507 // Use nameof to express symbol names
-
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
 }

src/Aspire.Hosting.Azure.PostgreSQL/Aspire.Hosting.Azure.PostgreSQL.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedDir)StringComparers.cs" Link="Utils\StringComparers.cs" />
+    <Compile Include="$(ComponentsDir)\Common\ArgumentExceptionExtensions.cs" Link="ArgumentExceptionExtensions.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.PostgreSQL/AzurePostgresFlexibleServerDatabaseResource.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using Aspire.Hosting.ApplicationModel;
 
 namespace Aspire.Hosting.Azure;
@@ -29,7 +27,7 @@ public class AzurePostgresFlexibleServerDatabaseResource(string name, string dat
     /// <summary>
     /// Gets the database name.
     /// </summary>
-    public string DatabaseName { get; } = ThrowIfNullOrEmpty(databaseName);
+    public string DatabaseName { get; } = databaseName.ThrowIfNullOrEmpty();
 
     /// <summary>
     /// Gets the inner PostgresDatabaseResource resource.
@@ -41,12 +39,6 @@ public class AzurePostgresFlexibleServerDatabaseResource(string name, string dat
     /// <inheritdoc />
     public override ResourceAnnotationCollection Annotations => InnerResource?.Annotations ?? base.Annotations;
 
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
-
     internal void SetInnerResource(PostgresDatabaseResource innerResource)
     {
         // Copy the annotations to the inner resource before making it the inner resource

src/Aspire.Hosting.Azure.ServiceBus/Aspire.Hosting.Azure.ServiceBus.csproj

@@ -11,6 +11,7 @@
   <ItemGroup>
     <Compile Include="$(RepoRoot)src\Aspire.Hosting\Utils\PasswordGenerator.cs" Link="Utils\PasswordGenerator.cs" />
     <Compile Include="$(RepoRoot)src\Shared\AzureRoleAssignmentUtils.cs" />
+    <Compile Include="$(ComponentsDir)\Common\ArgumentExceptionExtensions.cs" Link="ArgumentExceptionExtensions.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusQueueResource.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Xml;
 using Aspire.Hosting.ApplicationModel;
@@ -20,15 +18,15 @@ namespace Aspire.Hosting.Azure;
 public class AzureServiceBusQueueResource(string name, string queueName, AzureServiceBusResource parent)
     : Resource(name), IResourceWithParent<AzureServiceBusResource>, IResourceWithConnectionString, IResourceWithAzureFunctionsConfig
 {
-    private string _queueName = ThrowIfNullOrEmpty(queueName);
+    private string _queueName = queueName.ThrowIfNullOrEmpty();
 
     /// <summary>
     /// The queue name.
     /// </summary>
     public string QueueName
     {
         get => _queueName;
-        set => _queueName = ThrowIfNullOrEmpty(value, nameof(queueName));
+        set => _queueName = value.ThrowIfNullOrEmpty(nameof(queueName));
     }
 
     /// <summary>
@@ -198,10 +196,4 @@ internal void WriteJsonObjectProperties(Utf8JsonWriter writer)
         }
         writer.WriteEndObject();
     }
-
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
 }

src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusRule.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Azure.Provisioning;
 
@@ -17,15 +15,15 @@ namespace Aspire.Hosting.Azure;
 /// </remarks>
 public class AzureServiceBusRule(string name)
 {
-    private string _name = ThrowIfNullOrEmpty(name);
+    private string _name = name.ThrowIfNullOrEmpty();
 
     /// <summary>
     /// The rule name.
     /// </summary>
     public string Name
     {
         get => _name;
-        set => _name = ThrowIfNullOrEmpty(value, nameof(name));
+        set => _name = value.ThrowIfNullOrEmpty(nameof(name));
     }
 
     /// <summary>
@@ -181,10 +179,4 @@ internal void WriteJsonObjectProperties(Utf8JsonWriter writer)
 
         writer.WriteEndObject(); // Properties
     }
-
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
 }

src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusSubscriptionResource.cs

@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Xml;
 using Aspire.Hosting.ApplicationModel;
@@ -20,15 +18,15 @@ namespace Aspire.Hosting.Azure;
 public class AzureServiceBusSubscriptionResource(string name, string subscriptionName, AzureServiceBusTopicResource parent)
     : Resource(name), IResourceWithParent<AzureServiceBusTopicResource>, IResourceWithConnectionString, IResourceWithAzureFunctionsConfig
 {
-    private string _subscriptionName = ThrowIfNullOrEmpty(subscriptionName);
+    private string _subscriptionName = subscriptionName.ThrowIfNullOrEmpty();
 
     /// <summary>
     /// The subscription name.
     /// </summary>
     public string SubscriptionName
     {
         get => _subscriptionName;
-        set => _subscriptionName = ThrowIfNullOrEmpty(value, nameof(subscriptionName));
+        set => _subscriptionName = value.ThrowIfNullOrEmpty(nameof(subscriptionName));
     }
 
     /// <summary>
@@ -183,10 +181,4 @@ internal void WriteJsonObjectProperties(Utf8JsonWriter writer)
 
         writer.WriteEndObject();
     }
-
-    private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(argument, paramName);
-        return argument;
-    }
 }