Skip to content

Commit bd8ad5f

Browse files
authored
V17 - Removed obsoleted code from Umbraco.Examine (#19966)
Removing obsoleted code from BackOfficeExamineSearcher.cs and dependencies
1 parent 596389d commit bd8ad5f

File tree

3 files changed

+3
-88
lines changed

3 files changed

+3
-88
lines changed

src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -48,70 +48,6 @@ public BackOfficeExamineSearcher(
4848
_appCaches = appCaches;
4949
}
5050

51-
[Obsolete("Please use the non-obsolete constructor. Will be removed in V18.")]
52-
public BackOfficeExamineSearcher(
53-
IExamineManager examineManager,
54-
ILocalizationService languageService,
55-
IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
56-
IEntityService entityService,
57-
IUmbracoTreeSearcherFields treeSearcherFields,
58-
AppCaches appCaches,
59-
IUmbracoMapper umbracoMapper,
60-
IPublishedUrlProvider publishedUrlProvider)
61-
: this(
62-
examineManager,
63-
StaticServiceProvider.Instance.GetRequiredService<ILanguageService>(),
64-
backOfficeSecurityAccessor,
65-
entityService,
66-
treeSearcherFields,
67-
appCaches)
68-
{
69-
}
70-
71-
[Obsolete("Please use the non-obsolete constructor. Will be removed in V18.")]
72-
public BackOfficeExamineSearcher(
73-
IExamineManager examineManager,
74-
ILocalizationService localizationService,
75-
ILanguageService languageService,
76-
IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
77-
IEntityService entityService,
78-
IUmbracoTreeSearcherFields treeSearcherFields,
79-
AppCaches appCaches,
80-
IUmbracoMapper umbracoMapper,
81-
IPublishedUrlProvider publishedUrlProvider)
82-
: this(
83-
examineManager,
84-
languageService,
85-
backOfficeSecurityAccessor,
86-
entityService,
87-
treeSearcherFields,
88-
appCaches)
89-
{
90-
}
91-
92-
[Obsolete("Please use the method that accepts all parameters. Will be removed in V17.")]
93-
public IEnumerable<ISearchResult> Search(
94-
string query,
95-
UmbracoEntityTypes entityType,
96-
int pageSize,
97-
long pageIndex,
98-
out long totalFound,
99-
string? searchFrom = null,
100-
bool ignoreUserStartNodes = false)
101-
=> Search(query, entityType, pageSize, pageIndex, out totalFound, null, null, searchFrom, ignoreUserStartNodes);
102-
103-
[Obsolete("Please use the method that accepts all parameters. Will be removed in V17.")]
104-
public IEnumerable<ISearchResult> Search(
105-
string query,
106-
UmbracoEntityTypes entityType,
107-
int pageSize,
108-
long pageIndex,
109-
out long totalFound,
110-
string[]? contentTypeAliases,
111-
string? searchFrom = null,
112-
bool ignoreUserStartNodes = false)
113-
=> Search(query, entityType, pageSize, pageIndex, out totalFound, contentTypeAliases, null, searchFrom, ignoreUserStartNodes);
114-
11551
public IEnumerable<ISearchResult> Search(
11652
string query,
11753
UmbracoEntityTypes entityType,

src/Umbraco.Infrastructure/Examine/IBackOfficeExamineSearcher.cs

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,6 @@ namespace Umbraco.Cms.Infrastructure.Examine;
88
/// </summary>
99
public interface IBackOfficeExamineSearcher
1010
{
11-
[Obsolete("Please use the method that accepts all parameters. Will be removed in V17.")]
12-
IEnumerable<ISearchResult> Search(
13-
string query,
14-
UmbracoEntityTypes entityType,
15-
int pageSize,
16-
long pageIndex,
17-
out long totalFound,
18-
string? searchFrom = null,
19-
bool ignoreUserStartNodes = false);
20-
21-
[Obsolete("Please use the method that accepts all parameters. Will be removed in V17.")]
22-
IEnumerable<ISearchResult> Search(
23-
string query,
24-
UmbracoEntityTypes entityType,
25-
int pageSize,
26-
long pageIndex,
27-
out long totalFound,
28-
string[]? contentTypeAliases,
29-
string? searchFrom = null,
30-
bool ignoreUserStartNodes = false)
31-
=> Search(query, entityType, pageSize, pageIndex, out totalFound, searchFrom, ignoreUserStartNodes);
32-
3311
// default implementation to avoid breaking changes falls back to old behaviour
3412
IEnumerable<ISearchResult> Search(
3513
string query,
@@ -40,6 +18,5 @@ IEnumerable<ISearchResult> Search(
4018
string[]? contentTypeAliases,
4119
bool? trashed,
4220
string? searchFrom = null,
43-
bool ignoreUserStartNodes = false)
44-
=> Search(query, entityType, pageSize, pageIndex, out totalFound, null, searchFrom, ignoreUserStartNodes);
21+
bool ignoreUserStartNodes = false);
4522
}

src/Umbraco.Infrastructure/Examine/NoopBackOfficeExamineSearcher.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ public IEnumerable<ISearchResult> Search(
1111
int pageSize,
1212
long pageIndex,
1313
out long totalFound,
14+
string[]? contentTypeAliases,
15+
bool? trashed,
1416
string? searchFrom = null,
1517
bool ignoreUserStartNodes = false)
1618
{

0 commit comments

Comments
 (0)