Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove ILuceneSearchQueryService from OrchardCore.Search.Lucene #12624

Merged
merged 5 commits into from
Oct 12, 2022
Merged

Remove ILuceneSearchQueryService from OrchardCore.Search.Lucene #12624

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
146a47b
Remove ILuceneSearchQueryService from OrchardCore.Search.Lucene
Skrypt Oct 11, 2022
d53b23d
Add doc and remove Abstraction.ILuceneSearchQueryService
Skrypt Oct 11, 2022
7fe319d
Rename namespace
Skrypt Oct 11, 2022
b500bcb
doc
Skrypt Oct 11, 2022
46d047b
doc
Skrypt Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Search.Lucene/Controllers/SearchController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand Down
21 changes: 0 additions & 21 deletions src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/ILuceneSearchQueryService.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneSearchQueryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.Search.Lucene.Services
{
public class LuceneSearchQueryService : Abstractions.ILuceneSearchQueryService
public class LuceneSearchQueryService : ILuceneSearchQueryService
{
private readonly LuceneIndexManager _luceneIndexManager;

Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();

Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore/OrchardCore.Search.Lucene.Abstractions/ILuceneSearchQueryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Threading.Tasks;
using Lucene.Net.Search;

namespace OrchardCore.Search.Lucene.Abstractions
namespace OrchardCore.Search.Lucene
{
public interface ILuceneSearchQueryService
{
Expand Down
2 changes: 2 additions & 0 deletions src/docs/releases/1.5.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Skrypt marked this conversation as resolved.
Show resolved Hide resolved

## Lucene Migration

Manual migration to get back Lucene Indices Settings, Deployment plans, and Queries. (Reference only)
Expand Down