Browse Source

feat(dapr): Change the syntax for checking empty objects

pull/1416/head
colin 4 weeks ago
parent
commit
73cf1de8d5
  1. 33
      aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DaprClientBuilderExtensions.cs
  2. 5
      aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Dapr/Client/DefaultDaprClientFactory.cs
  3. 44
      aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/Microsoft/Extensions/DependencyInjection/ServiceCollectionDaprClientExtensions.cs

33
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<DaprClient> 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<DaprClientFactoryOptions>(builder.Name, options =>
{
@ -28,15 +21,8 @@ public static class DaprClientBuilderExtensions
public static IDaprClientBuilder ConfigureDaprClient(this IDaprClientBuilder builder, Action<DaprClientBuilder> 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<DaprClientFactoryOptions>(builder.Name, options =>
{
@ -48,15 +34,8 @@ public static class DaprClientBuilderExtensions
public static IDaprClientBuilder ConfigureDaprClient(this IDaprClientBuilder builder, Action<IServiceProvider, DaprClientBuilder> 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<IConfigureOptions<DaprClientFactoryOptions>>(services =>
{

5
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;

44
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<DaprClientBuilder> 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<IServiceProvider, DaprClientBuilder> 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);

Loading…
Cancel
Save