test: Modify unit tests

Author: zhenlei520

src/BuildingBlocks/Caching/Masa.BuildingBlocks.Caching/TypeAlias/DefaultTypeAliasFactory.cs

@@ -10,12 +10,12 @@ public class DefaultTypeAliasFactory : MasaFactoryBase<ITypeAliasProvider, TypeA
 
     protected override string SpecifyServiceNotFoundMessage => "Please make sure you have used [{0}] TypeAlias, it was not found";
 
-    protected override MasaFactoryOptions<TypeAliasRelationOptions> FactoryOptions => _options.Value;
+    protected override MasaFactoryOptions<TypeAliasRelationOptions> FactoryOptions => _options.CurrentValue;
 
-    private readonly IOptionsSnapshot<TypeAliasFactoryOptions> _options;
+    private readonly IOptionsMonitor<TypeAliasFactoryOptions> _options;
 
     public DefaultTypeAliasFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        _options = serviceProvider.GetRequiredService<IOptionsSnapshot<TypeAliasFactoryOptions>>();
+        _options = serviceProvider.GetRequiredService<IOptionsMonitor<TypeAliasFactoryOptions>>();
     }
 }

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/IdGenerator/DefaultIdGeneratorFactory.cs

@@ -25,13 +25,13 @@ public class DefaultIdGeneratorFactory : MasaFactoryBase<IIdGenerator, IdGenerat
     protected override string SpecifyServiceNotFoundMessage { get; } =
         "Please make sure you have used [{0}] IdGenerator, it was not found";
 
-    protected override MasaFactoryOptions<IdGeneratorRelationOptions> FactoryOptions => _options.Value;
+    protected override MasaFactoryOptions<IdGeneratorRelationOptions> FactoryOptions => _options.CurrentValue;
 
-    private readonly IOptionsSnapshot<IdGeneratorFactoryOptions> _options;
+    private readonly IOptionsMonitor<IdGeneratorFactoryOptions> _options;
 
     public DefaultIdGeneratorFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        _options = serviceProvider.GetRequiredService<IOptionsSnapshot<IdGeneratorFactoryOptions>>();
+        _options = serviceProvider.GetRequiredService<IOptionsMonitor<IdGeneratorFactoryOptions>>();
     }
 
     public IIdGenerator<TOut> Create<TOut>() where TOut : notnull

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/DefaultDeserializerFactory.cs

@@ -9,12 +9,12 @@ public class DefaultDeserializerFactory : MasaFactoryBase<IDeserializer, Deseria
     protected override string DefaultServiceNotFoundMessage => "Default deserializer not found, you need to add it, like services.AddJson()";
 
     protected override string SpecifyServiceNotFoundMessage => "Please make sure you have used [{0}] deserializer, it was not found";
-    protected override MasaFactoryOptions<DeserializerRelationOptions> FactoryOptions => _options.Value;
+    protected override MasaFactoryOptions<DeserializerRelationOptions> FactoryOptions => _options.CurrentValue;
 
-    private readonly IOptionsSnapshot<DeserializerFactoryOptions> _options;
+    private readonly IOptionsMonitor<DeserializerFactoryOptions> _options;
 
     public DefaultDeserializerFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        _options = serviceProvider.GetRequiredService<IOptionsSnapshot<DeserializerFactoryOptions>>();
+        _options = serviceProvider.GetRequiredService<IOptionsMonitor<DeserializerFactoryOptions>>();
     }
 }

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/Serialization/DefaultSerializerFactory.cs

@@ -9,12 +9,12 @@ public class DefaultSerializerFactory : MasaFactoryBase<ISerializer, SerializerR
     protected override string DefaultServiceNotFoundMessage => "Default serializer not found, you need to add it, like services.AddJson()";
 
     protected override string SpecifyServiceNotFoundMessage => "Please make sure you have used [{0}] serializer, it was not found";
-    protected override MasaFactoryOptions<SerializerRelationOptions> FactoryOptions => _options.Value;
+    protected override MasaFactoryOptions<SerializerRelationOptions> FactoryOptions => _options.CurrentValue;
 
-    private readonly IOptionsSnapshot<SerializerFactoryOptions> _options;
+    private readonly IOptionsMonitor<SerializerFactoryOptions> _options;
 
     public DefaultSerializerFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        _options = serviceProvider.GetRequiredService<IOptionsSnapshot<SerializerFactoryOptions>>();
+        _options = serviceProvider.GetRequiredService<IOptionsMonitor<SerializerFactoryOptions>>();
     }
 }

src/BuildingBlocks/Data/Masa.BuildingBlocks.Data/TypeConverts/DefaultTypeConvertFactory.cs

@@ -11,12 +11,12 @@ protected override string DefaultServiceNotFoundMessage
 
     protected override string SpecifyServiceNotFoundMessage => "Please make sure you have used [{0}] typeConvert, it was not found";
 
-    protected override MasaFactoryOptions<TypeConvertRelationOptions> FactoryOptions => _options.Value;
+    protected override MasaFactoryOptions<TypeConvertRelationOptions> FactoryOptions => _options.CurrentValue;
 
-    private readonly IOptionsSnapshot<TypeConvertFactoryOptions> _options;
+    private readonly IOptionsMonitor<TypeConvertFactoryOptions> _options;
 
     public DefaultTypeConvertFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        _options = serviceProvider.GetRequiredService<IOptionsSnapshot<TypeConvertFactoryOptions>>();
+        _options = serviceProvider.GetRequiredService<IOptionsMonitor<TypeConvertFactoryOptions>>();
     }
 }

src/BuildingBlocks/RulesEngine/Masa.BuildingBlocks.RulesEngine/DefaultRulesEngineFactory.cs

@@ -12,12 +12,12 @@ protected override string DefaultServiceNotFoundMessage
     protected override string SpecifyServiceNotFoundMessage
         => $"Please make sure you have used [{0}] {nameof(IRulesEngineClient)}, it was not found";
 
-    protected override MasaFactoryOptions<RulesEngineRelationOptions> FactoryOptions => _options.Value;
+    protected override MasaFactoryOptions<RulesEngineRelationOptions> FactoryOptions => _options.CurrentValue;
 
-    private readonly IOptionsSnapshot<RulesEngineFactoryOptions> _options;
+    private readonly IOptionsMonitor<RulesEngineFactoryOptions> _options;
 
     public DefaultRulesEngineFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        _options = serviceProvider.GetRequiredService<IOptionsSnapshot<RulesEngineFactoryOptions>>();
+        _options = serviceProvider.GetRequiredService<IOptionsMonitor<RulesEngineFactoryOptions>>();
     }
 }

src/BuildingBlocks/SearchEngine/Masa.BuildingBlocks.SearchEngine.AutoComplete/AutoCompleteFactory.cs

@@ -9,13 +9,13 @@ public class AutoCompleteFactory : MasaFactoryBase<IAutoCompleteClient, AutoComp
 {
     protected override string DefaultServiceNotFoundMessage => "No default AutoComplete found";
     protected override string SpecifyServiceNotFoundMessage => "Please make sure you have used [{0}] AutoComplete, it was not found";
-    protected override MasaFactoryOptions<AutoCompleteRelationsOptions> FactoryOptions => _options.Value;
+    protected override MasaFactoryOptions<AutoCompleteRelationsOptions> FactoryOptions => _options.CurrentValue;
 
-    private readonly IOptionsSnapshot<AutoCompleteFactoryOptions> _options;
+    private readonly IOptionsMonitor<AutoCompleteFactoryOptions> _options;
 
     public AutoCompleteFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        _options = serviceProvider.GetRequiredService<IOptionsSnapshot<AutoCompleteFactoryOptions>>();
+        _options = serviceProvider.GetRequiredService<IOptionsMonitor<AutoCompleteFactoryOptions>>();
     }
 
     public IAutoCompleteClient CreateClient() => base.Create();

src/Contrib/SearchEngine/AutoComplete/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch/AutoCompleteClient.cs

@@ -24,29 +24,21 @@ public AutoCompleteClient(
         IElasticClient elasticClient,
         IMasaElasticClient client,
         ILogger<AutoCompleteClient<TDocument>>? logger,
-        string indexName,
-        string? alias,
-        Operator defaultOperator,
-        SearchType defaultSearchType,
-        bool enableMultipleCondition,
-        string queryAnalyzer,
-        Action<IIndexSettings>? indexSettingAction,
-        Action<TypeMappingDescriptor<TDocument>>? action)
+        AutoCompleteOptions<TDocument> options)
     {
         _elasticClient = elasticClient;
         _client = client;
         _logger = logger;
-        _indexName = indexName;
-
-        MasaArgumentException.ThrowIfNullOrWhiteSpace(indexName);
-
-        _alias = alias;
-        _defaultOperator = defaultOperator;
-        _defaultSearchType = defaultSearchType;
-        _enableMultipleCondition = enableMultipleCondition;
-        _queryAnalyzer = queryAnalyzer;
-        _indexSettingAction = indexSettingAction;
-        _action = action;
+        _indexName = options.IndexName;
+
+        MasaArgumentException.ThrowIfNullOrWhiteSpace(options.IndexName);
+        _alias = options.Alias;
+        _defaultOperator = options.DefaultOperator;
+        _defaultSearchType = options.DefaultSearchType;
+        _enableMultipleCondition = options.EnableMultipleCondition;
+        _queryAnalyzer = options.QueryAnalyzer;
+        _indexSettingAction = options.IndexSettingAction;
+        _action = options.Action;
     }
 
     public override async Task<bool> BuildAsync(CancellationToken cancellationToken = default)

src/Contrib/SearchEngine/AutoComplete/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch/Extensions/MasaElasticsearchBuilderExtensions.cs

@@ -25,10 +25,7 @@ public static MasaElasticsearchBuilder AddAutoComplete<TValue>(
         string name) where TValue : notnull
     {
         var indexName = builder.ElasticClient.ConnectionSettings.DefaultIndex;
-        if (string.IsNullOrEmpty(indexName))
-            throw new ArgumentNullException(
-                nameof(builder.ElasticClient.ConnectionSettings.DefaultIndex),
-                "The default IndexName is not set");
+        MasaArgumentException.ThrowIfNullOrWhiteSpace(indexName);
 
         return builder.AddAutoComplete<AutoCompleteDocument<TValue>>(name, option => option.UseIndexName(indexName));
     }
@@ -53,21 +50,6 @@ public static MasaElasticsearchBuilder AddAutoComplete<TValue>(
         Action<AutoCompleteOptions<AutoCompleteDocument<TValue>>>? action) where TValue : notnull
         => builder.AddAutoCompleteBySpecifyDocument(name, action);
 
-    [Obsolete($"{nameof(AddAutoComplete)} expired, please use {nameof(AddAutoCompleteBySpecifyDocument)}")]
-    public static MasaElasticsearchBuilder AddAutoComplete<TDocument, TValue>(
-        this MasaElasticsearchBuilder builder)
-        where TDocument : AutoCompleteDocument
-        where TValue : notnull
-        => builder.AddAutoCompleteBySpecifyDocument<TDocument>(DefaultName);
-
-    [Obsolete($"{nameof(AddAutoComplete)} expired, please use {nameof(AddAutoCompleteBySpecifyDocument)}")]
-    public static MasaElasticsearchBuilder AddAutoComplete<TDocument, TValue>(
-        this MasaElasticsearchBuilder builder,
-        Action<AutoCompleteOptions<TDocument>>? action)
-        where TDocument : AutoCompleteDocument
-        where TValue : notnull
-        => builder.AddAutoCompleteBySpecifyDocument(DefaultName, action);
-
     public static MasaElasticsearchBuilder AddAutoCompleteBySpecifyDocument<TDocument>(
         this MasaElasticsearchBuilder builder)
         where TDocument : AutoCompleteDocument
@@ -79,10 +61,8 @@ public static MasaElasticsearchBuilder AddAutoCompleteBySpecifyDocument<TDocumen
         where TDocument : AutoCompleteDocument
     {
         var indexName = builder.ElasticClient.ConnectionSettings.DefaultIndex;
-        if (string.IsNullOrEmpty(indexName))
-            throw new ArgumentNullException(
-                nameof(builder.ElasticClient.ConnectionSettings.DefaultIndex),
-                "The default IndexName is not set");
+
+        MasaArgumentException.ThrowIfNullOrWhiteSpace(indexName);
 
         return builder.AddAutoCompleteBySpecifyDocument<TDocument>(name, option => option.UseIndexName(indexName));
     }
@@ -117,29 +97,15 @@ public static MasaElasticsearchBuilder AddAutoCompleteBySpecifyDocument<TDocumen
                         serviceProvider.GetRequiredService<IElasticClientFactory>().Create(relationsOptions.Name),
                         serviceProvider.GetRequiredService<IMasaElasticClientFactory>().Create(relationsOptions.Name),
                         serviceProvider.GetService<ILogger<AutoCompleteClient<TDocument>>>(),
-                        options.IndexName,
-                        options.Alias,
-                        options.DefaultOperator,
-                        options.DefaultSearchType,
-                        options.EnableMultipleCondition,
-                        options.QueryAnalyzer,
-                        options.IndexSettingAction,
-                        options.Action
+                        options
                     );
                 }
 
                 return new AutoCompleteClient<TDocument>(
                     builder.ElasticClient,
                     builder.Client,
                     serviceProvider.GetService<ILogger<AutoCompleteClient<TDocument>>>(),
-                    options.IndexName,
-                    options.Alias,
-                    options.DefaultOperator,
-                    options.DefaultSearchType,
-                    options.EnableMultipleCondition,
-                    options.QueryAnalyzer,
-                    options.IndexSettingAction,
-                    options.Action
+                    options
                 );
             };
         }, builder.AlwaysGetNewestElasticClient ? ServiceLifetime.Scoped : ServiceLifetime.Singleton);

src/Contrib/SearchEngine/AutoComplete/Tests/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests/AutoCompleteTest.cs

@@ -348,7 +348,7 @@ public async Task TestPreciseAsync()
             option => option.UseNodes(_defaultNode).UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false)));
 
         await builder.Client.DeleteIndexByAliasAsync(employeeAlias);
-        builder.AddAutoComplete<Employee, int>(option => option
+        builder.AddAutoCompleteBySpecifyDocument<Employee>(option => option
             .UseIndexName(employeeIndexName)
             .UseAlias(employeeAlias)
             .UseDefaultSearchType(SearchType.Precise)

src/Contrib/Service/Caller/Masa.Contrib.Service.Caller/DefaultCallerFactory.cs

@@ -9,12 +9,12 @@ internal class DefaultCallerFactory : MasaFactoryBase<ICaller, CallerRelationOpt
 
     protected override string SpecifyServiceNotFoundMessage => "Please make sure you have used [{0}] Caller, it was not found";
 
-    protected override MasaFactoryOptions<CallerRelationOptions> FactoryOptions => _options.Value;
+    protected override MasaFactoryOptions<CallerRelationOptions> FactoryOptions => _options.CurrentValue;
 
-    private readonly IOptionsSnapshot<CallerFactoryOptions> _options;
+    private readonly IOptionsMonitor<CallerFactoryOptions> _options;
 
     public DefaultCallerFactory(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        _options = serviceProvider.GetRequiredService<IOptionsSnapshot<CallerFactoryOptions>>();
+        _options = serviceProvider.GetRequiredService<IOptionsMonitor<CallerFactoryOptions>>();
     }
 }

src/Utils/Data/Masa.Utils.Data.Elasticsearch/DefaultElasticClientFactory.cs

@@ -6,37 +6,37 @@ namespace Masa.Utils.Data.Elasticsearch;
 public class DefaultElasticClientFactory : IElasticClientFactory
 {
     private readonly IServiceProvider _serviceProvider;
-    private readonly IOptionsSnapshot<ElasticsearchFactoryOptions> _elasticsearchFactoryOptions;
+    private readonly IOptionsMonitor<ElasticsearchFactoryOptions> _elasticsearchFactoryOptions;
 
     public DefaultElasticClientFactory(IServiceProvider serviceProvider,
-        IOptionsSnapshot<ElasticsearchFactoryOptions> elasticsearchFactoryOptions)
+        IOptionsMonitor<ElasticsearchFactoryOptions> elasticsearchFactoryOptions)
     {
         _serviceProvider = serviceProvider;
         _elasticsearchFactoryOptions = elasticsearchFactoryOptions;
     }
 
     public IElasticClient Create()
     {
-        var options = _elasticsearchFactoryOptions.Value;
+        var options = _elasticsearchFactoryOptions.CurrentValue;
         var defaultOptions = GetDefaultOptions(options.Options);
         if (defaultOptions == null)
             throw new NotSupportedException("No default ElasticClient found");
 
         return defaultOptions.Func.Invoke(_serviceProvider);
     }
 
-    private static ElasticsearchRelationsOptions? GetDefaultOptions(List<ElasticsearchRelationsOptions> optionsList)
-    {
-        return optionsList.SingleOrDefault(c => c.Name == Microsoft.Extensions.Options.Options.DefaultName) ??
-            optionsList.FirstOrDefault();
-    }
-
     public IElasticClient Create(string name)
     {
-        var options = _elasticsearchFactoryOptions.Value.Options.SingleOrDefault(c => c.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
+        var options = _elasticsearchFactoryOptions.CurrentValue.Options.SingleOrDefault(c => c.Name.Equals(name, StringComparison.OrdinalIgnoreCase));
         if (options == null)
             throw new NotSupportedException($"Please make sure you have used [{name}] ElasticClient, it was not found");
 
         return options.Func.Invoke(_serviceProvider);
     }
+
+    private static ElasticsearchRelationsOptions? GetDefaultOptions(List<ElasticsearchRelationsOptions> optionsList)
+    {
+        return optionsList.SingleOrDefault(c => c.Name == Microsoft.Extensions.Options.Options.DefaultName) ??
+            optionsList.FirstOrDefault();
+    }
 }