feat(AutoComplete): update UseElasticSearch method signature (#749)

MayueCif · web-flow · commit 618fe456ea8f · 2025-06-04T14:59:24.000+08:00
Changed the parameter type of the `UseElasticSearch` method in `AutoCompleteOptionsExtensions.cs` from `Action&lt;ElasticSearchAutoCompleteOptions&gt;` to `Action&lt;IServiceProvider, ElasticSearchAutoCompleteOptions&gt;`. Updated internal method calls accordingly to pass the `IServiceProvider` instance.

Modified all calls to `UseElasticSearch` in `AutoCompleteTest.cs` to accommodate the new method signature, ensuring proper passing of `IServiceProvider` and `ElasticSearchAutoCompleteOptions` instances.

These changes enhance the flexibility of the `UseElasticSearch` method, allowing access to the service provider for configuring `ElasticSearchAutoCompleteOptions` with additional services and dependencies.
diff --git a/src/Contrib/SearchEngine/AutoComplete/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch/Extensions/AutoCompleteOptionsExtensions.cs b/src/Contrib/SearchEngine/AutoComplete/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch/Extensions/AutoCompleteOptionsExtensions.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) MASA Stack All rights reserved.
+// Copyright (c) MASA Stack All rights reserved.
 // Licensed under the MIT License. See LICENSE.txt in the project root for license information.
 
 // ReSharper disable once CheckNamespace
@@ -9,15 +9,15 @@ public static class AutoCompleteOptionsExtensions
 {
     public static ElasticSearchBuilder UseElasticSearch(
         this AutoCompleteOptionsBuilder autoCompleteOptionsBuilder,
-        Action<ElasticSearchAutoCompleteOptions> action)
+        Action<IServiceProvider, ElasticSearchAutoCompleteOptions> action)
     {
         MasaArgumentException.ThrowIfNull(action);
 
         autoCompleteOptionsBuilder.Services.TryAddSingleton<IElasticClientProvider, DefaultElasticClientProvider>();
         autoCompleteOptionsBuilder.UseCustomAutoComplete(serviceProvider =>
         {
             var elasticSearchAutoCompleteOptions = new ElasticSearchAutoCompleteOptions();
-            action.Invoke(elasticSearchAutoCompleteOptions);
+            action.Invoke(serviceProvider, elasticSearchAutoCompleteOptions);
             MasaArgumentException.ThrowIfNullOrWhiteSpace(elasticSearchAutoCompleteOptions.IndexName);
 
             var elasticClientProvider = serviceProvider.GetRequiredService<IElasticClientProvider>();
diff --git a/src/Contrib/SearchEngine/AutoComplete/Tests/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests/AutoCompleteTest.cs b/src/Contrib/SearchEngine/AutoComplete/Tests/Masa.Contrib.SearchEngine.AutoComplete.ElasticSearch.Tests/AutoCompleteTest.cs
@@ -22,7 +22,7 @@ public void TestAddAutoComplete()
         string indexName = $"index_{Guid.NewGuid()}";
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting =>
@@ -50,7 +50,7 @@ public async Task TestGetAsync()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -103,7 +103,7 @@ public async Task TestMultiConditionsAsyncReturnTotalIs2()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -134,7 +134,7 @@ public async Task TestMultiConditionsAsyncReturnTotalIs1()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -166,7 +166,7 @@ public async Task TestDisableMultiConditionsAsyncReturnTotalIs0()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -211,7 +211,7 @@ public async Task TestCustomModelAsync()
 
         _services.AddAutoCompleteBySpecifyDocument<Employee>("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -257,7 +257,7 @@ public async Task TestCustomModel2Async()
         string analyzer = "ik_max_word_pinyin";
         _services.AddAutoCompleteBySpecifyDocument<Employee>("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -366,7 +366,7 @@ public async Task TestPreciseAsync()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -415,7 +415,7 @@ public async Task TestOperatorAndAsync()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -454,7 +454,7 @@ public async Task TestOperatorOrAsync()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -493,7 +493,7 @@ public async Task DeleteAsyncReturnDocumentIsNotExist()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -531,7 +531,7 @@ public async Task DeleteAsyncReturnDeleteSuccess()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -572,7 +572,7 @@ public async Task DeleteUserReturnEmpty()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -619,7 +619,7 @@ public async Task DeleteMultiUserReturnEmpty()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -671,7 +671,7 @@ public async Task TestAsync()
     {
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));
@@ -721,7 +721,7 @@ public async Task TestRebuildAsync()
         var indexName = $"index_{Guid.NewGuid()}";
         _services.AddAutoComplete("es", autoCompleteOptions =>
         {
-            autoCompleteOptions.UseElasticSearch(options =>
+            autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>
             {
                 options.ElasticsearchOptions.UseNodes(_defaultNode);
                 options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void TestAddAutoComplete()`
`22`	`22`	`string indexName = $"index_{Guid.NewGuid()}";`
`23`	`23`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`24`	`24`	`{`
`25`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`25`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`26`	`26`	`{`
`27`	`27`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`28`	`28`	`options.ElasticsearchOptions.UseConnectionSettings(setting =>`
`@@ -50,7 +50,7 @@ public async Task TestGetAsync()`
`50`	`50`	`{`
`51`	`51`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`52`	`52`	`{`
`53`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`53`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`54`	`54`	`{`
`55`	`55`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`56`	`56`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -103,7 +103,7 @@ public async Task TestMultiConditionsAsyncReturnTotalIs2()`
`103`	`103`	`{`
`104`	`104`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`105`	`105`	`{`
`106`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`106`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`107`	`107`	`{`
`108`	`108`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`109`	`109`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -134,7 +134,7 @@ public async Task TestMultiConditionsAsyncReturnTotalIs1()`
`134`	`134`	`{`
`135`	`135`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`136`	`136`	`{`
`137`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`137`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`138`	`138`	`{`
`139`	`139`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`140`	`140`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -166,7 +166,7 @@ public async Task TestDisableMultiConditionsAsyncReturnTotalIs0()`
`166`	`166`	`{`
`167`	`167`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`168`	`168`	`{`
`169`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`169`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`170`	`170`	`{`
`171`	`171`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`172`	`172`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -211,7 +211,7 @@ public async Task TestCustomModelAsync()`
`211`	`211`
`212`	`212`	`_services.AddAutoCompleteBySpecifyDocument<Employee>("es", autoCompleteOptions =>`
`213`	`213`	`{`
`214`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`214`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`215`	`215`	`{`
`216`	`216`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`217`	`217`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -257,7 +257,7 @@ public async Task TestCustomModel2Async()`
`257`	`257`	`string analyzer = "ik_max_word_pinyin";`
`258`	`258`	`_services.AddAutoCompleteBySpecifyDocument<Employee>("es", autoCompleteOptions =>`
`259`	`259`	`{`
`260`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`260`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`261`	`261`	`{`
`262`	`262`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`263`	`263`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -366,7 +366,7 @@ public async Task TestPreciseAsync()`
`366`	`366`	`{`
`367`	`367`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`368`	`368`	`{`
`369`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`369`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`370`	`370`	`{`
`371`	`371`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`372`	`372`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -415,7 +415,7 @@ public async Task TestOperatorAndAsync()`
`415`	`415`	`{`
`416`	`416`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`417`	`417`	`{`
`418`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`418`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`419`	`419`	`{`
`420`	`420`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`421`	`421`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -454,7 +454,7 @@ public async Task TestOperatorOrAsync()`
`454`	`454`	`{`
`455`	`455`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`456`	`456`	`{`
`457`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`457`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`458`	`458`	`{`
`459`	`459`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`460`	`460`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -493,7 +493,7 @@ public async Task DeleteAsyncReturnDocumentIsNotExist()`
`493`	`493`	`{`
`494`	`494`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`495`	`495`	`{`
`496`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`496`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`497`	`497`	`{`
`498`	`498`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`499`	`499`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -531,7 +531,7 @@ public async Task DeleteAsyncReturnDeleteSuccess()`
`531`	`531`	`{`
`532`	`532`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`533`	`533`	`{`
`534`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`534`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`535`	`535`	`{`
`536`	`536`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`537`	`537`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -572,7 +572,7 @@ public async Task DeleteUserReturnEmpty()`
`572`	`572`	`{`
`573`	`573`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`574`	`574`	`{`
`575`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`575`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`576`	`576`	`{`
`577`	`577`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`578`	`578`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -619,7 +619,7 @@ public async Task DeleteMultiUserReturnEmpty()`
`619`	`619`	`{`
`620`	`620`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`621`	`621`	`{`
`622`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`622`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`623`	`623`	`{`
`624`	`624`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`625`	`625`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -671,7 +671,7 @@ public async Task TestAsync()`
`671`	`671`	`{`
`672`	`672`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`673`	`673`	`{`
`674`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`674`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`675`	`675`	`{`
`676`	`676`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`677`	`677`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`
`@@ -721,7 +721,7 @@ public async Task TestRebuildAsync()`
`721`	`721`	`var indexName = $"index_{Guid.NewGuid()}";`
`722`	`722`	`_services.AddAutoComplete("es", autoCompleteOptions =>`
`723`	`723`	`{`
`724`		`- autoCompleteOptions.UseElasticSearch(options =>`
	`724`	`+ autoCompleteOptions.UseElasticSearch((serviceProvider, options) =>`
`725`	`725`	`{`
`726`	`726`	`options.ElasticsearchOptions.UseNodes(_defaultNode);`
`727`	`727`	`options.ElasticsearchOptions.UseConnectionSettings(setting => setting.EnableApiVersioningHeader(false));`