diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DaprClientBuilderExtensions.cs b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DaprClientBuilderExtensions.cs index 60af08b2e..b3a0c29ec 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DaprClientBuilderExtensions.cs +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DaprClientBuilderExtensions.cs @@ -8,15 +8,8 @@ public static class DaprClientBuilderExtensions { public static IDaprClientBuilder ConfigureDaprClient(this IDaprClientBuilder builder, Action configureClient) { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - if (configureClient == null) - { - throw new ArgumentNullException(nameof(configureClient)); - } + ArgumentNullException.ThrowIfNull(builder, nameof(builder)); + ArgumentNullException.ThrowIfNull(configureClient, nameof(configureClient)); builder.Services.Configure(builder.Name, options => { @@ -28,15 +21,8 @@ public static class DaprClientBuilderExtensions public static IDaprClientBuilder ConfigureDaprClient(this IDaprClientBuilder builder, Action configureBuilder) { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - if (configureBuilder == null) - { - throw new ArgumentNullException(nameof(configureBuilder)); - } + ArgumentNullException.ThrowIfNull(builder, nameof(builder)); + ArgumentNullException.ThrowIfNull(configureBuilder, nameof(configureBuilder)); builder.Services.Configure(builder.Name, options => { @@ -48,15 +34,8 @@ public static class DaprClientBuilderExtensions public static IDaprClientBuilder ConfigureDaprClient(this IDaprClientBuilder builder, Action configureClientBuilder) { - if (builder == null) - { - throw new ArgumentNullException(nameof(builder)); - } - - if (configureClientBuilder == null) - { - throw new ArgumentNullException(nameof(configureClientBuilder)); - } + ArgumentNullException.ThrowIfNull(builder, nameof(builder)); + ArgumentNullException.ThrowIfNull(configureClientBuilder, nameof(configureClientBuilder)); builder.Services.AddTransient>(services => { diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DefaultDaprClientFactory.cs b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DefaultDaprClientFactory.cs index 439222a0b..4ccaaa38c 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DefaultDaprClientFactory.cs +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DefaultDaprClientFactory.cs @@ -37,10 +37,7 @@ public class DefaultDaprClientFactory : IDaprClientFactory public DaprClient CreateClient(string name) { - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } + ArgumentNullException.ThrowIfNull(name, nameof(name)); var client = _daprClients.GetOrAdd(name, _daprClientFactory).Value; diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Microsoft/Extensions/DependencyInjection/ServiceCollectionDaprClientExtensions.cs b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Microsoft/Extensions/DependencyInjection/ServiceCollectionDaprClientExtensions.cs index a37244086..c22ea045e 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Microsoft/Extensions/DependencyInjection/ServiceCollectionDaprClientExtensions.cs +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Microsoft/Extensions/DependencyInjection/ServiceCollectionDaprClientExtensions.cs @@ -12,10 +12,7 @@ public static class ServiceCollectionDaprClientExtensions public static IServiceCollection AddDaprClient( [NotNull] this IServiceCollection services) { - if (services == null) - { - throw new ArgumentNullException(nameof(services)); - } + ArgumentNullException.ThrowIfNull(services, nameof(services)); services.AddLogging(); services.AddOptions(); @@ -30,10 +27,7 @@ public static class ServiceCollectionDaprClientExtensions [NotNull] this IServiceCollection services, string name) { - if (services == null) - { - throw new ArgumentNullException(nameof(services)); - } + ArgumentNullException.ThrowIfNull(services, nameof(services)); services.AddDaprClient(); @@ -45,20 +39,9 @@ public static class ServiceCollectionDaprClientExtensions string name, Action configureClient) { - if (services == null) - { - throw new ArgumentNullException(nameof(services)); - } - - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - if (configureClient == null) - { - throw new ArgumentNullException(nameof(configureClient)); - } + ArgumentNullException.ThrowIfNull(services, nameof(services)); + ArgumentNullException.ThrowIfNull(name, nameof(name)); + ArgumentNullException.ThrowIfNull(configureClient, nameof(configureClient)); services.AddDaprClient(); @@ -72,20 +55,9 @@ public static class ServiceCollectionDaprClientExtensions string name, Action configureClient) { - if (services == null) - { - throw new ArgumentNullException(nameof(services)); - } - - if (name == null) - { - throw new ArgumentNullException(nameof(name)); - } - - if (configureClient == null) - { - throw new ArgumentNullException(nameof(configureClient)); - } + ArgumentNullException.ThrowIfNull(services, nameof(services)); + ArgumentNullException.ThrowIfNull(name, nameof(name)); + ArgumentNullException.ThrowIfNull(configureClient, nameof(configureClient)); services.AddDaprClient(); var builder = new DefaultDaprClientBuilder(services, name);