Browse Source

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

pull/1416/head
colin 3 months 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) public static IDaprClientBuilder ConfigureDaprClient(this IDaprClientBuilder builder, Action<DaprClient> configureClient)
{ {
if (builder == null) ArgumentNullException.ThrowIfNull(builder, nameof(builder));
{ ArgumentNullException.ThrowIfNull(configureClient, nameof(configureClient));
throw new ArgumentNullException(nameof(builder));
}
if (configureClient == null)
{
throw new ArgumentNullException(nameof(configureClient));
}
builder.Services.Configure<DaprClientFactoryOptions>(builder.Name, options => 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) public static IDaprClientBuilder ConfigureDaprClient(this IDaprClientBuilder builder, Action<DaprClientBuilder> configureBuilder)
{ {
if (builder == null) ArgumentNullException.ThrowIfNull(builder, nameof(builder));
{ ArgumentNullException.ThrowIfNull(configureBuilder, nameof(configureBuilder));
throw new ArgumentNullException(nameof(builder));
}
if (configureBuilder == null)
{
throw new ArgumentNullException(nameof(configureBuilder));
}
builder.Services.Configure<DaprClientFactoryOptions>(builder.Name, options => 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) public static IDaprClientBuilder ConfigureDaprClient(this IDaprClientBuilder builder, Action<IServiceProvider, DaprClientBuilder> configureClientBuilder)
{ {
if (builder == null) ArgumentNullException.ThrowIfNull(builder, nameof(builder));
{ ArgumentNullException.ThrowIfNull(configureClientBuilder, nameof(configureClientBuilder));
throw new ArgumentNullException(nameof(builder));
}
if (configureClientBuilder == null)
{
throw new ArgumentNullException(nameof(configureClientBuilder));
}
builder.Services.AddTransient<IConfigureOptions<DaprClientFactoryOptions>>(services => 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) public DaprClient CreateClient(string name)
{ {
if (name == null) ArgumentNullException.ThrowIfNull(name, nameof(name));
{
throw new ArgumentNullException(nameof(name));
}
var client = _daprClients.GetOrAdd(name, _daprClientFactory).Value; 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( public static IServiceCollection AddDaprClient(
[NotNull] this IServiceCollection services) [NotNull] this IServiceCollection services)
{ {
if (services == null) ArgumentNullException.ThrowIfNull(services, nameof(services));
{
throw new ArgumentNullException(nameof(services));
}
services.AddLogging(); services.AddLogging();
services.AddOptions(); services.AddOptions();
@ -30,10 +27,7 @@ public static class ServiceCollectionDaprClientExtensions
[NotNull] this IServiceCollection services, [NotNull] this IServiceCollection services,
string name) string name)
{ {
if (services == null) ArgumentNullException.ThrowIfNull(services, nameof(services));
{
throw new ArgumentNullException(nameof(services));
}
services.AddDaprClient(); services.AddDaprClient();
@ -45,20 +39,9 @@ public static class ServiceCollectionDaprClientExtensions
string name, string name,
Action<DaprClientBuilder> configureClient) Action<DaprClientBuilder> configureClient)
{ {
if (services == null) ArgumentNullException.ThrowIfNull(services, nameof(services));
{ ArgumentNullException.ThrowIfNull(name, nameof(name));
throw new ArgumentNullException(nameof(services)); ArgumentNullException.ThrowIfNull(configureClient, nameof(configureClient));
}
if (name == null)
{
throw new ArgumentNullException(nameof(name));
}
if (configureClient == null)
{
throw new ArgumentNullException(nameof(configureClient));
}
services.AddDaprClient(); services.AddDaprClient();
@ -72,20 +55,9 @@ public static class ServiceCollectionDaprClientExtensions
string name, string name,
Action<IServiceProvider, DaprClientBuilder> configureClient) Action<IServiceProvider, DaprClientBuilder> configureClient)
{ {
if (services == null) ArgumentNullException.ThrowIfNull(services, nameof(services));
{ ArgumentNullException.ThrowIfNull(name, nameof(name));
throw new ArgumentNullException(nameof(services)); ArgumentNullException.ThrowIfNull(configureClient, nameof(configureClient));
}
if (name == null)
{
throw new ArgumentNullException(nameof(name));
}
if (configureClient == null)
{
throw new ArgumentNullException(nameof(configureClient));
}
services.AddDaprClient(); services.AddDaprClient();
var builder = new DefaultDaprClientBuilder(services, name); var builder = new DefaultDaprClientBuilder(services, name);

Loading…
Cancel
Save