Remove ILuceneSearchQueryService from OrchardCore.Search.Lucene

src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/SearchController.cs

@@ -30,7 +30,7 @@ public class SearchController : Controller
         private readonly LuceneIndexingService _luceneIndexingService;
         private readonly LuceneIndexSettingsService _luceneIndexSettingsService;
         private readonly LuceneAnalyzerManager _luceneAnalyzerManager;
-        private readonly Abstractions.ILuceneSearchQueryService _searchQueryService;
+        private readonly ILuceneSearchQueryService _searchQueryService;
         private readonly ISession _session;
         private readonly IStringLocalizer S;
         private readonly IEnumerable<IPermissionProvider> _permissionProviders;
@@ -44,7 +44,7 @@ public SearchController(
             LuceneIndexingService luceneIndexingService,
             LuceneIndexSettingsService luceneIndexSettingsService,
             LuceneAnalyzerManager luceneAnalyzerManager,
-            Abstractions.ILuceneSearchQueryService searchQueryService,
+            ILuceneSearchQueryService searchQueryService,
             ISession session,
             IStringLocalizer<SearchController> stringLocalizer,
             IEnumerable<IPermissionProvider> permissionProviders,

src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneSearchQueryService.cs

@@ -4,7 +4,7 @@
 
 namespace OrchardCore.Search.Lucene.Services
 {
-    public class LuceneSearchQueryService : Abstractions.ILuceneSearchQueryService
+    public class LuceneSearchQueryService : ILuceneSearchQueryService
     {
         private readonly LuceneIndexManager _luceneIndexManager;
 

src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs

@@ -60,7 +60,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddSingleton<LuceneAnalyzerManager>();
             services.AddScoped<LuceneIndexingService>();
             services.AddScoped<IModularTenantEvents, LuceneIndexInitializerService>();
-            services.AddScoped<Abstractions.ILuceneSearchQueryService, LuceneSearchQueryService>();
+            services.AddScoped<ILuceneSearchQueryService, LuceneSearchQueryService>();
             services.AddScoped<INavigationProvider, AdminMenu>();
             services.AddScoped<IPermissionProvider, Permissions>();
 

src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneSearchQueryService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Lucene.Net.Search;
 
-namespace OrchardCore.Search.Lucene.Abstractions
+namespace OrchardCore.Search.Lucene
 {
     public interface ILuceneSearchQueryService
     {

src/docs/releases/1.5.0.md

@@ -6,6 +6,8 @@
 
 * Lucene breaking changes. See [this pull request](https://github.com/OrchardCMS/OrchardCore/pull/11052) for details.
 
+`ISearchQueryService` moved to `OrchardCore.Search.Lucene.Abstractions` module as `ILuceneSearchQueryService`. The `OrchardCore.Search` module now takes into consideration multiple search provider implementations.
+
 ## Lucene Migration
 
 Manual migration to get back Lucene Indices Settings, Deployment plans, and Queries. (Reference only)