diff --git a/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/CallerBase.cs b/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/CallerBase.cs index 80910f010..1b13f374a 100644 --- a/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/CallerBase.cs +++ b/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/CallerBase.cs @@ -19,7 +19,7 @@ public abstract class CallerBase /// protected virtual Func? ResponseMessageFactory => null; - protected CallerBuilder CallerOptions { get; private set; } = default!; + protected CallerBuilder CallerBuilder { get; private set; } = default!; public ILogger? Logger { get; private set; } @@ -41,9 +41,9 @@ protected virtual ICaller GetCaller() public abstract void UseCallerExtension(); - public void SetCallerOptions(CallerBuilder callerOptionsBuilder, string name) + internal void SetCallerBuilder(CallerBuilder callerBuilder, string name) { - CallerOptions = callerOptionsBuilder; + CallerBuilder = callerBuilder; Name = name; } diff --git a/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/CallerBuilderExtensions.cs b/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/CallerBuilderExtensions.cs index 49efc8f50..3270b9a53 100644 --- a/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/CallerBuilderExtensions.cs +++ b/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/CallerBuilderExtensions.cs @@ -7,17 +7,17 @@ namespace Masa.BuildingBlocks.Service.Caller; public static class CallerBuilderExtensions { public static void UseCustomCaller( - this CallerBuilder callerOptionsBuilder, + this CallerBuilder callerBuilder, Func implementationFactory) { - callerOptionsBuilder.Services.Configure(callerOptions => + callerBuilder.Services.Configure(factoryOptions => { - if (callerOptions.Options.Any(relation => relation.Name.Equals(callerOptionsBuilder.Name, StringComparison.OrdinalIgnoreCase))) + if (factoryOptions.Options.Any(relation => relation.Name.Equals(callerBuilder.Name, StringComparison.OrdinalIgnoreCase))) throw new ArgumentException( - $"The caller name already exists, please change the name, the repeat name is [{callerOptionsBuilder.Name}]"); + $"The caller name already exists, please change the name, the repeat name is [{callerBuilder.Name}]"); - callerOptions.Options.Add(new MasaRelationOptions( - callerOptionsBuilder.Name, + factoryOptions.Options.Add(new MasaRelationOptions( + callerBuilder.Name, implementationFactory)); }); } diff --git a/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/MasaCallerClientBuilderExtensions.cs b/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/MasaCallerClientBuilderExtensions.cs index 7c393c61d..800a155f6 100644 --- a/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/MasaCallerClientBuilderExtensions.cs +++ b/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/MasaCallerClientBuilderExtensions.cs @@ -39,14 +39,14 @@ public static void UseAuthentication( AddAuthenticationCore(masaCallerClientBuilder.Services); - masaCallerClientBuilder.Services.Configure(callerOptions => + masaCallerClientBuilder.Services.Configure(factoryOptions => { - if (callerOptions.Options.Any(relation + if (factoryOptions.Options.Any(relation => relation.Name.Equals(masaCallerClientBuilder.Name, StringComparison.OrdinalIgnoreCase))) throw new ArgumentException( $"The caller name already exists, please change the name, the repeat name is [{masaCallerClientBuilder.Name}]"); - callerOptions.Options.Add(new AuthenticationServiceRelationOptions(masaCallerClientBuilder.Name, implementationFactory)); + factoryOptions.Options.Add(new AuthenticationServiceRelationOptions(masaCallerClientBuilder.Name, implementationFactory)); }); } diff --git a/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/ServiceCollectionExtensions.cs b/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/ServiceCollectionExtensions.cs index 6f4c22330..47b53847b 100644 --- a/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/ServiceCollectionExtensions.cs +++ b/src/BuildingBlocks/Service/Masa.BuildingBlocks.Service.Caller/Extensions/ServiceCollectionExtensions.cs @@ -87,7 +87,7 @@ private static void AddAutomaticCaller( var callerBase = (constructorInfo.Invoke(parameters.ToArray()) as CallerBase)!; var name = callerBase.Name ?? type.FullName ?? type.Name; - callerBase.SetCallerOptions(new CallerBuilder(services, name), name); + callerBase.SetCallerBuilder(new CallerBuilder(services, name), name); callerBase.Initialize(serviceProvider, type); return callerBase; diff --git a/src/BuildingBlocks/Storage/Masa.BuildingBlocks.Storage.ObjectStorage/Extensions/ObjectStorageBuilderExtensions.cs b/src/BuildingBlocks/Storage/Masa.BuildingBlocks.Storage.ObjectStorage/Extensions/ObjectStorageBuilderExtensions.cs index 3e78d46f5..6f8444fe0 100644 --- a/src/BuildingBlocks/Storage/Masa.BuildingBlocks.Storage.ObjectStorage/Extensions/ObjectStorageBuilderExtensions.cs +++ b/src/BuildingBlocks/Storage/Masa.BuildingBlocks.Storage.ObjectStorage/Extensions/ObjectStorageBuilderExtensions.cs @@ -12,22 +12,22 @@ public static void UseCustomObjectStorage( Func implementationFactory, Func bucketNameImplementationFactory) { - objectStorageBuilder.Services.Configure(callerOptions => + objectStorageBuilder.Services.Configure(factoryOptions => { - if (callerOptions.Options.Any(relation => relation.Name.Equals(objectStorageBuilder.Name, StringComparison.OrdinalIgnoreCase))) + if (factoryOptions.Options.Any(relation => relation.Name.Equals(objectStorageBuilder.Name, StringComparison.OrdinalIgnoreCase))) throw new ArgumentException( $"The ObjectStorage name already exists, please change the name, the repeat name is [{objectStorageBuilder.Name}]"); - callerOptions.Options.Add(new(objectStorageBuilder.Name, implementationFactory)); + factoryOptions.Options.Add(new(objectStorageBuilder.Name, implementationFactory)); }); - objectStorageBuilder.Services.Configure(callerOptions => + objectStorageBuilder.Services.Configure(factoryOptions => { - if (callerOptions.Options.Any(relation => relation.Name.Equals(objectStorageBuilder.Name, StringComparison.OrdinalIgnoreCase))) + if (factoryOptions.Options.Any(relation => relation.Name.Equals(objectStorageBuilder.Name, StringComparison.OrdinalIgnoreCase))) throw new ArgumentException( $"The Bucket name already exists, please change the name, the repeat name is [{objectStorageBuilder.Name}]"); - callerOptions.Options.Add(new(objectStorageBuilder.Name, bucketNameImplementationFactory)); + factoryOptions.Options.Add(new(objectStorageBuilder.Name, bucketNameImplementationFactory)); }); } } diff --git a/src/Contrib/Configuration/ConfigurationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/MasaConfigurationExtensions.cs b/src/Contrib/Configuration/ConfigurationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/MasaConfigurationExtensions.cs index a5a49a72a..c66fa587c 100644 --- a/src/Contrib/Configuration/ConfigurationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/MasaConfigurationExtensions.cs +++ b/src/Contrib/Configuration/ConfigurationApi/Masa.Contrib.Configuration.ConfigurationApi.Dcc/MasaConfigurationExtensions.cs @@ -10,12 +10,12 @@ public static class MasaConfigurationExtensions public static IMasaConfigurationBuilder UseDcc( this IMasaConfigurationBuilder builder, Action? jsonSerializerOptions = null, - Action? callerOptions = null, + Action? callerBuilder = null, string sectionName = "DccOptions") { var configurationSection = builder.Configuration.GetSection(sectionName); var dccOptions = configurationSection.Get(); - return builder.UseDcc(dccOptions, jsonSerializerOptions, callerOptions); + return builder.UseDcc(dccOptions, jsonSerializerOptions, callerBuilder); } public static IMasaConfigurationBuilder UseDcc( diff --git a/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/DaprCallerBase.cs b/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/DaprCallerBase.cs index 1cf8afeb6..ad604d596 100644 --- a/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/DaprCallerBase.cs +++ b/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/DaprCallerBase.cs @@ -27,7 +27,7 @@ MasaDaprClientBuilder UseDapr() { UseDaprPre(); - var daprClientBuilder = CallerOptions.UseDapr(callerClient => + var daprClientBuilder = CallerBuilder.UseDapr(callerClient => { callerClient.AppId = AppId; ConfigMasaCallerClient(callerClient); diff --git a/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/Extensions/CallerOptionsExtensions.cs b/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/Extensions/CallerBuilderExtensions.cs similarity index 66% rename from src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/Extensions/CallerOptionsExtensions.cs rename to src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/Extensions/CallerBuilderExtensions.cs index 83a6e6f86..6027fe86a 100644 --- a/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/Extensions/CallerOptionsExtensions.cs +++ b/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.DaprClient/Extensions/CallerBuilderExtensions.cs @@ -5,19 +5,19 @@ namespace Masa.BuildingBlocks.Service.Caller; -public static class CallerOptionsExtensions +public static class CallerBuilderExtensions { - public static MasaDaprClientBuilder UseDapr(this CallerBuilder callerOptionsBuilder, + public static MasaDaprClientBuilder UseDapr(this CallerBuilder callerBuilder, Action masDaprClientConfigure, Action? configure = null) { MasaArgumentException.ThrowIfNull(masDaprClientConfigure); - callerOptionsBuilder.Services.AddDaprClient(configure); + callerBuilder.Services.AddDaprClient(configure); - return callerOptionsBuilder.UseDaprCore(() => + return callerBuilder.UseDaprCore(() => { - callerOptionsBuilder.UseCustomCaller(serviceProvider => + callerBuilder.UseCustomCaller(serviceProvider => { var masaDaprClient = new MasaDaprClient(serviceProvider); masDaprClientConfigure.Invoke(masaDaprClient); @@ -25,7 +25,7 @@ public static MasaDaprClientBuilder UseDapr(this CallerBuilder callerOptionsBuil return new DaprCaller( serviceProvider, - callerOptionsBuilder.Name, + callerBuilder.Name, appid, masaDaprClient.RequestMessageFactory, masaDaprClient.ResponseMessageFactory); @@ -33,12 +33,12 @@ public static MasaDaprClientBuilder UseDapr(this CallerBuilder callerOptionsBuil }); } - private static MasaDaprClientBuilder UseDaprCore(this CallerBuilder callerOptionsBuilder, + private static MasaDaprClientBuilder UseDaprCore(this CallerBuilder callerBuilder, Action action) { - callerOptionsBuilder.Services.TryAddSingleton(); - callerOptionsBuilder.Services.AddOptions(); + callerBuilder.Services.TryAddSingleton(); + callerBuilder.Services.AddOptions(); action.Invoke(); - return new MasaDaprClientBuilder(callerOptionsBuilder.Services, callerOptionsBuilder.Name); + return new MasaDaprClientBuilder(callerBuilder.Services, callerBuilder.Name); } } diff --git a/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/Extensions/CallerOptionsExtensions.cs b/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/Extensions/CallerBuilderExtensions.cs similarity index 64% rename from src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/Extensions/CallerOptionsExtensions.cs rename to src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/Extensions/CallerBuilderExtensions.cs index 20b56bae8..16e9ce57d 100644 --- a/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/Extensions/CallerOptionsExtensions.cs +++ b/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/Extensions/CallerBuilderExtensions.cs @@ -5,38 +5,38 @@ namespace Masa.BuildingBlocks.Service.Caller; -public static class CallerOptionsExtensions +public static class CallerBuilderExtensions { - public static MasaHttpClientBuilder UseHttpClient(this CallerBuilder callerOptionsBuilder) - => callerOptionsBuilder.UseHttpClientCore(null); + public static MasaHttpClientBuilder UseHttpClient(this CallerBuilder callerBuilder) + => callerBuilder.UseHttpClientCore(null); - public static MasaHttpClientBuilder UseHttpClient(this CallerBuilder callerOptionsBuilder, + public static MasaHttpClientBuilder UseHttpClient(this CallerBuilder callerBuilder, Action clientConfigure) { MasaArgumentException.ThrowIfNull(clientConfigure); - return callerOptionsBuilder.UseHttpClientCore(clientConfigure); + return callerBuilder.UseHttpClientCore(clientConfigure); } - private static MasaHttpClientBuilder UseHttpClientCore(this CallerBuilder callerOptionsBuilder, + private static MasaHttpClientBuilder UseHttpClientCore(this CallerBuilder callerBuilder, Action? clientConfigure) { - callerOptionsBuilder.Services.AddHttpClient(callerOptionsBuilder.Name); + callerBuilder.Services.AddHttpClient(callerBuilder.Name); - callerOptionsBuilder.UseCustomCaller(serviceProvider => + callerBuilder.UseCustomCaller(serviceProvider => { var masaHttpClient = new MasaHttpClient(serviceProvider); clientConfigure?.Invoke(masaHttpClient); - var httpClient = serviceProvider.GetRequiredService().CreateClient(callerOptionsBuilder.Name); + var httpClient = serviceProvider.GetRequiredService().CreateClient(callerBuilder.Name); masaHttpClient.ConfigureHttpClient(httpClient); return new HttpClientCaller( httpClient, serviceProvider, - callerOptionsBuilder.Name, + callerBuilder.Name, masaHttpClient.Prefix, masaHttpClient.RequestMessageFactory, masaHttpClient.ResponseMessageFactory); }); - return new MasaHttpClientBuilder(callerOptionsBuilder.Services, callerOptionsBuilder.Name); + return new MasaHttpClientBuilder(callerBuilder.Services, callerBuilder.Name); } } diff --git a/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/HttpClientCallerBase.cs b/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/HttpClientCallerBase.cs index 81c20e89f..35cad8b00 100644 --- a/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/HttpClientCallerBase.cs +++ b/src/Contrib/Service/Caller/Masa.Contrib.Service.Caller.HttpClient/HttpClientCallerBase.cs @@ -28,7 +28,7 @@ private MasaHttpClientBuilder UseHttpClient() { UseHttpClientPre(); - var masaHttpClientBuilder = CallerOptions.UseHttpClient(callerClient => + var masaHttpClientBuilder = CallerBuilder.UseHttpClient(callerClient => { callerClient.Prefix = Prefix; callerClient.BaseAddress = BaseAddress; diff --git a/src/Contrib/Service/Caller/Tests/Masa.Contrib.Service.Caller.DaprClient.Tests/CallerTest.cs b/src/Contrib/Service/Caller/Tests/Masa.Contrib.Service.Caller.DaprClient.Tests/CallerTest.cs index 19d7f0582..532e486ae 100644 --- a/src/Contrib/Service/Caller/Tests/Masa.Contrib.Service.Caller.DaprClient.Tests/CallerTest.cs +++ b/src/Contrib/Service/Caller/Tests/Masa.Contrib.Service.Caller.DaprClient.Tests/CallerTest.cs @@ -16,9 +16,9 @@ public class CallerTest public void TestAppIdByUseDapr() { var services = new ServiceCollection(); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseDapr(client => client.AppId = DEFAULT_APP_ID); + callerBuilder.UseDapr(client => client.AppId = DEFAULT_APP_ID); }); var serviceProvider = services.BuildServiceProvider(); @@ -37,9 +37,9 @@ public void TestAppIdByUseDaprAndAlwaysGetNewestDaprClient() var services = new ServiceCollection(); var key = "callerBaseAddress" + Guid.NewGuid(); Environment.SetEnvironmentVariable(key, DEFAULT_APP_ID); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseDapr(client => + callerBuilder.UseDapr(client => { client.AppId = Environment.GetEnvironmentVariable(key)!; }); @@ -74,9 +74,9 @@ public void TestAppIdByUseDaprAndSetEnvironment() var services = new ServiceCollection(); var actualAppId = Guid.NewGuid().ToString(); Environment.SetEnvironmentVariable(DEFAULT_APP_ID, actualAppId); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseDapr(client => client.AppId = DEFAULT_APP_ID); + callerBuilder.UseDapr(client => client.AppId = DEFAULT_APP_ID); }); var serviceProvider = services.BuildServiceProvider(); @@ -98,9 +98,9 @@ public void TestAppIdByUseDaprAndSetEnvironmentAndUseJsonConfig() var actualAppId = Guid.NewGuid().ToString(); Environment.SetEnvironmentVariable(DEFAULT_APP_ID, actualAppId); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseDapr(client => client.AppId = DEFAULT_APP_ID); + callerBuilder.UseDapr(client => client.AppId = DEFAULT_APP_ID); }); var serviceProvider = services.BuildServiceProvider(); @@ -120,9 +120,9 @@ public void TestAppIdByUseDaprAndUseJsonConfig() var services = new ServiceCollection(); AddJsonConfig(services); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseDapr(client => client.AppId = DEFAULT_APP_ID); + callerBuilder.UseDapr(client => client.AppId = DEFAULT_APP_ID); }); var serviceProvider = services.BuildServiceProvider(); diff --git a/src/Contrib/Service/Caller/Tests/Masa.Contrib.Service.Caller.HttpClient.Tests/CallerTest.cs b/src/Contrib/Service/Caller/Tests/Masa.Contrib.Service.Caller.HttpClient.Tests/CallerTest.cs index d105dad92..6919d2426 100644 --- a/src/Contrib/Service/Caller/Tests/Masa.Contrib.Service.Caller.HttpClient.Tests/CallerTest.cs +++ b/src/Contrib/Service/Caller/Tests/Masa.Contrib.Service.Caller.HttpClient.Tests/CallerTest.cs @@ -18,14 +18,14 @@ public class CallerTest private const string FRAMEWORK_BASE_ADDRESS = "https://github.com/masastack/MASA.Framework"; - private CallerBuilder _callerOptions; + private CallerBuilder _callerBuilder; private const string NAME = ""; [TestInitialize] public void Initialize() { var services = new ServiceCollection(); - _callerOptions = new CallerBuilder(services, NAME); + _callerBuilder = new CallerBuilder(services, NAME); } [TestMethod] @@ -34,12 +34,12 @@ public void TestUseHttpClient() var docBaseAddress = "https://docs.masastack.com"; var key = "callerBaseAddress" + Guid.NewGuid(); Environment.SetEnvironmentVariable(key, FRAMEWORK_BASE_ADDRESS); - var masaHttpClientBuilder = _callerOptions.UseHttpClient(httpClient => + var masaHttpClientBuilder = _callerBuilder.UseHttpClient(httpClient => { httpClient.BaseAddress = Environment.GetEnvironmentVariable(key)!; }); Assert.AreEqual(NAME, masaHttpClientBuilder.Name); - Assert.AreEqual(_callerOptions.Services, masaHttpClientBuilder.Services); + Assert.AreEqual(_callerBuilder.Services, masaHttpClientBuilder.Services); var serviceProvider = masaHttpClientBuilder.Services.BuildServiceProvider(); var httpClientFactory = serviceProvider.GetService(); @@ -60,9 +60,9 @@ public void TestHttpClientByUseHttpClient() Environment.SetEnvironmentVariable(key, FRAMEWORK_BASE_ADDRESS); var services = new ServiceCollection(); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseHttpClient(client => + callerBuilder.UseHttpClient(client => { client.Prefix = "masa"; client.BaseAddress = Environment.GetEnvironmentVariable(key)!; @@ -95,9 +95,9 @@ public void TestHttpClientByUseHttpClient() public void TestMiddlewaresByUseHttpClient() { var services = new ServiceCollection(); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseHttpClient(client => + callerBuilder.UseHttpClient(client => { client.BaseAddress = FRAMEWORK_BASE_ADDRESS; }).UseI18n(); @@ -116,9 +116,9 @@ public void TestMiddlewaresByUseHttpClient() public void TestRequestMessageByUseHttpClient() { var services = new ServiceCollection(); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseHttpClient(client => + callerBuilder.UseHttpClient(client => { client.BaseAddress = FRAMEWORK_BASE_ADDRESS; }); @@ -145,9 +145,9 @@ public void TestRequestMessageByUseHttpClient() public void TestCustomRequestMessageByUseHttpClient() { var services = new ServiceCollection(); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseHttpClient(client => + callerBuilder.UseHttpClient(client => { client.UseXml(); client.BaseAddress = FRAMEWORK_BASE_ADDRESS; diff --git a/src/Contrib/Service/Caller/Tests/Scenes/Masa.Contrib.Service.Caller.DaprClient.Tests.Scenes.MasaConfiguration/CallerTest.cs b/src/Contrib/Service/Caller/Tests/Scenes/Masa.Contrib.Service.Caller.DaprClient.Tests.Scenes.MasaConfiguration/CallerTest.cs index bd7e13f91..0d9c415b6 100644 --- a/src/Contrib/Service/Caller/Tests/Scenes/Masa.Contrib.Service.Caller.DaprClient.Tests.Scenes.MasaConfiguration/CallerTest.cs +++ b/src/Contrib/Service/Caller/Tests/Scenes/Masa.Contrib.Service.Caller.DaprClient.Tests.Scenes.MasaConfiguration/CallerTest.cs @@ -22,9 +22,9 @@ public void TestAppIdByUseDaprAndSetEnvironmentAndUseJsonConfig() var services = builder.Services; AddJsonConfig(services); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseDapr(client => client.AppId = DEFAULT_APP_ID); + callerBuilder.UseDapr(client => client.AppId = DEFAULT_APP_ID); }); var serviceProvider = services.BuildServiceProvider(); @@ -45,9 +45,9 @@ public void TestAppIdByUseDaprAndUseJsonConfig() var services = builder.Services; AddJsonConfig(services); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseDapr(client => client.AppId = DEFAULT_APP_ID); + callerBuilder.UseDapr(client => client.AppId = DEFAULT_APP_ID); }); var serviceProvider = services.BuildServiceProvider(); @@ -67,9 +67,9 @@ public void TestAppIdByUseDaprAndUseJsonConfig2() AddJsonConfig(services); - services.AddCaller(callerOptions => + services.AddCaller(callerBuilder => { - callerOptions.UseDapr(client => client.AppId = DEFAULT_APP_ID); + callerBuilder.UseDapr(client => client.AppId = DEFAULT_APP_ID); }); var serviceProvider = services.BuildServiceProvider(); diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/ServiceCollectionExtensions.cs index 53714fd4b..06b5f2b05 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/ServiceCollectionExtensions.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Alert/ServiceCollectionExtensions.cs @@ -9,9 +9,9 @@ public static IServiceCollection AddAlertClient(this IServiceCollection services { MasaArgumentException.ThrowIfNullOrEmpty(alertServiceBaseAddress); - return services.AddAlertClient(callerOptions => + return services.AddAlertClient(callerBuilder => { - callerOptions.UseHttpClient(builder => + callerBuilder.UseHttpClient(builder => { builder.Configure = opt => opt.BaseAddress = new Uri(alertServiceBaseAddress); }).UseAuthentication(); @@ -22,9 +22,9 @@ public static IServiceCollection AddAlertClient(this IServiceCollection services { MasaArgumentException.ThrowIfNull(alertServiceBaseAddressFunc); - return services.AddAlertClient(callerOptionsBuilder => + return services.AddAlertClient(callerBuilder => { - callerOptionsBuilder + callerBuilder .UseHttpClient(builder => { builder.BaseAddress = alertServiceBaseAddressFunc.Invoke(); @@ -32,14 +32,14 @@ public static IServiceCollection AddAlertClient(this IServiceCollection services }); } - public static IServiceCollection AddAlertClient(this IServiceCollection services, Action callerOptionsBuilder) + public static IServiceCollection AddAlertClient(this IServiceCollection services, Action callerBuilder) { - MasaArgumentException.ThrowIfNull(callerOptionsBuilder); + MasaArgumentException.ThrowIfNull(callerBuilder); if (services.Any(service => service.ServiceType == typeof(IAlertClient))) return services; - services.AddCaller(DEFAULT_CLIENT_NAME, callerOptionsBuilder); + services.AddCaller(DEFAULT_CLIENT_NAME, callerBuilder); services.AddScoped(serviceProvider => { diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs index 2b6e3735f..d89704112 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/ServiceCollectionExtensions.cs @@ -22,23 +22,23 @@ public static IServiceCollection AddAuthClient(this IServiceCollection services, { MasaArgumentException.ThrowIfNullOrEmpty(authServiceBaseAddress); - return services.AddAuthClient(callerOptionsBuilder => + return services.AddAuthClient(callerBuilder => { - callerOptionsBuilder + callerBuilder .UseHttpClient(builder => builder.BaseAddress = authServiceBaseAddress) .UseAuthentication(); }, redisOptions); } - private static IServiceCollection AddAuthClient(this IServiceCollection services, Action callerOptionsBuilder, + private static IServiceCollection AddAuthClient(this IServiceCollection services, Action callerBuilder, RedisConfigurationOptions redisOptions) { - MasaArgumentException.ThrowIfNull(callerOptionsBuilder); + MasaArgumentException.ThrowIfNull(callerBuilder); if (services.All(service => service.ServiceType != typeof(IMultiEnvironmentUserContext))) throw new Exception("Please add IMultiEnvironmentUserContext first."); services.TryAddScoped(); - services.AddCaller(DEFAULT_CLIENT_NAME, callerOptionsBuilder); + services.AddCaller(DEFAULT_CLIENT_NAME, callerBuilder); services.AddAuthClientMultilevelCache(redisOptions); services.AddScoped(serviceProvider => diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/ServiceCollectionExtensions.cs index d5b856e9c..a3407f9e4 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/ServiceCollectionExtensions.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Mc/ServiceCollectionExtensions.cs @@ -11,9 +11,9 @@ public static IServiceCollection AddMcClient(this IServiceCollection services, s { MasaArgumentException.ThrowIfNullOrEmpty(mcServiceBaseAddress); - return services.AddMcClient(callerOptions => + return services.AddMcClient(callerBuilder => { - callerOptions.UseHttpClient(builder => + callerBuilder.UseHttpClient(builder => { builder.Configure = opt => opt.BaseAddress = new Uri(mcServiceBaseAddress); }).UseAuthentication(); @@ -24,9 +24,9 @@ public static IServiceCollection AddMcClient(this IServiceCollection services, F { MasaArgumentException.ThrowIfNull(mcServiceBaseAddressFunc); - return services.AddMcClient(callerOptionsBuilder => + return services.AddMcClient(callerBuilder => { - callerOptionsBuilder + callerBuilder .UseHttpClient(builder => { builder.BaseAddress = mcServiceBaseAddressFunc.Invoke(); @@ -34,14 +34,14 @@ public static IServiceCollection AddMcClient(this IServiceCollection services, F }); } - public static IServiceCollection AddMcClient(this IServiceCollection services, Action callerOptionsBuilder) + public static IServiceCollection AddMcClient(this IServiceCollection services, Action callerBuilder) { - MasaArgumentException.ThrowIfNull(callerOptionsBuilder); + MasaArgumentException.ThrowIfNull(callerBuilder); if (services.Any(service => service.ServiceType == typeof(IMcClient))) return services; - services.AddCaller(DEFAULT_CLIENT_NAME, callerOptionsBuilder); + services.AddCaller(DEFAULT_CLIENT_NAME, callerBuilder); services.AddScoped(serviceProvider => { diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/ServiceCollectionExtensions.cs index dbe2d3cea..690a67d40 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/ServiceCollectionExtensions.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Pm/ServiceCollectionExtensions.cs @@ -11,9 +11,9 @@ public static IServiceCollection AddPmClient(this IServiceCollection services, s { MasaArgumentException.ThrowIfNullOrEmpty(pmServiceBaseAddress); - return services.AddPmClient(callerOptions => + return services.AddPmClient(callerBuilder => { - callerOptions.UseHttpClient(builder => + callerBuilder.UseHttpClient(builder => { builder.BaseAddress = pmServiceBaseAddress; }).UseAuthentication(); @@ -24,23 +24,23 @@ public static IServiceCollection AddPmClient(this IServiceCollection services, F { MasaArgumentException.ThrowIfNull(pmServiceBaseAddressFunc); - return services.AddPmClient(callerOptions => + return services.AddPmClient(callerBuilder => { - callerOptions.UseHttpClient(builder => + callerBuilder.UseHttpClient(builder => { builder.BaseAddress = pmServiceBaseAddressFunc.Invoke(); }).UseAuthentication(); }); } - public static IServiceCollection AddPmClient(this IServiceCollection services, Action callerOptions) + public static IServiceCollection AddPmClient(this IServiceCollection services, Action callerBuilder) { - MasaArgumentException.ThrowIfNull(callerOptions); + MasaArgumentException.ThrowIfNull(callerBuilder); if (services.Any(service => service.ServiceType == typeof(IPmClient))) return services; - services.AddCaller(DEFAULT_CLIENT_NAME, callerOptions.Invoke); + services.AddCaller(DEFAULT_CLIENT_NAME, callerBuilder.Invoke); services.AddScoped(serviceProvider => { diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/ServiceCollectionExtensions.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/ServiceCollectionExtensions.cs index d3cc17280..2a62456cc 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/ServiceCollectionExtensions.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Scheduler/ServiceCollectionExtensions.cs @@ -14,9 +14,9 @@ public static IServiceCollection AddSchedulerClient(this IServiceCollection serv throw new ArgumentNullException(nameof(schedulerServiceBaseAddress)); } - return services.AddSchedulerClient(callerOptions => + return services.AddSchedulerClient(callerBuilder => { - callerOptions + callerBuilder .UseHttpClient(builder => { builder.Configure = opt => opt.BaseAddress = new Uri(schedulerServiceBaseAddress); @@ -24,15 +24,15 @@ public static IServiceCollection AddSchedulerClient(this IServiceCollection serv }); } - public static IServiceCollection AddSchedulerClient(this IServiceCollection services, Action callerOptionsBuilder) + public static IServiceCollection AddSchedulerClient(this IServiceCollection services, Action callerBuilder) { - ArgumentNullException.ThrowIfNull(callerOptionsBuilder, nameof(callerOptionsBuilder)); + ArgumentNullException.ThrowIfNull(callerBuilder, nameof(callerBuilder)); if (services.Any(service => service.ImplementationType == typeof(SchedulerProvider))) return services; services.AddSingleton(); - services.AddCaller(DEFAULT_CLIENT_NAME, callerOptionsBuilder); + services.AddCaller(DEFAULT_CLIENT_NAME, callerBuilder); services.AddScoped(serviceProvider => { diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Tsc.Elasticsearch/Extenistions/ServiceExtenistion.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Tsc.Elasticsearch/Extenistions/ServiceExtenistion.cs index edda1ad09..3a34b21de 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Tsc.Elasticsearch/Extenistions/ServiceExtenistion.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Tsc.Elasticsearch/Extenistions/ServiceExtenistion.cs @@ -77,9 +77,9 @@ private static IServiceCollection AddElasticsearch(IServiceCollection services, options.UseNodes(nodes).UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false)); }) - .AddCaller(name, callerOptionsBuilder => + .AddCaller(name, callerBuilder => { - callerOptionsBuilder.UseHttpClient(builder => + callerBuilder.UseHttpClient(builder => { builder.BaseAddress = nodes[0]; }).UseAuthentication(); diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Alert.Tests/AlertClientTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Alert.Tests/AlertClientTest.cs index c06db1d9c..22b10dbf5 100644 --- a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Alert.Tests/AlertClientTest.cs +++ b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Alert.Tests/AlertClientTest.cs @@ -27,6 +27,6 @@ public void TestAddAlertClientShouldThrowArgumentNullException() public void TestAddAlertClientShouldThrowArgumentNullException2() { var services = new ServiceCollection(); - Assert.ThrowsException(() => services.AddAlertClient(callerOptionsBuilder: null!)); + Assert.ThrowsException(() => services.AddAlertClient(callerBuilder: null!)); } } diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/McClientTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/McClientTest.cs index 27b8d1f20..40100b2d6 100644 --- a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/McClientTest.cs +++ b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Mc.Tests/McClientTest.cs @@ -27,6 +27,6 @@ public void TestAddMcClientShouldThrowArgumentNullException() public void TestAddMcClientShouldThrowArgumentNullException2() { var services = new ServiceCollection(); - Assert.ThrowsException(() => services.AddMcClient(callerOptionsBuilder: null!)); + Assert.ThrowsException(() => services.AddMcClient(callerBuilder: null!)); } } diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Scheduler.Tests/SchedulerClientTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Scheduler.Tests/SchedulerClientTest.cs index b914d4c9c..3d84ad681 100644 --- a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Scheduler.Tests/SchedulerClientTest.cs +++ b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Scheduler.Tests/SchedulerClientTest.cs @@ -45,7 +45,7 @@ public void TestAddSchedulerClientShouldThrowArgumentNullException2() { var services = new ServiceCollection(); - Assert.ThrowsException(() => services.AddSchedulerClient(callerOptionsBuilder: null!)); + Assert.ThrowsException(() => services.AddSchedulerClient(callerBuilder: null!)); } } diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Tsc.Elasticsearch.Tests/Service/TraceServiceTests.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Tsc.Elasticsearch.Tests/Service/TraceServiceTests.cs index d5860b417..85895016e 100644 --- a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Tsc.Elasticsearch.Tests/Service/TraceServiceTests.cs +++ b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Tsc.Elasticsearch.Tests/Service/TraceServiceTests.cs @@ -34,9 +34,9 @@ public void Initialize() options.UseNodes(new string[] { StaticConfig.HOST }). UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false)); }, - callerOptions => + callerBuilder => { - callerOptions.BaseAddress = StaticConfig.HOST; + callerBuilder.BaseAddress = StaticConfig.HOST; }, StaticConfig.TRACE_INDEX_NAME); var serviceProvider = services.BuildServiceProvider(); @@ -135,6 +135,6 @@ public async Task GetScrollAsyncTest() var secondResult = await _traceService.ScrollAsync(query); Assert.IsNotNull(secondResult); - Assert.IsTrue(secondResult.Result.Any()); + Assert.IsTrue(secondResult.Result.Any()); } }