Revert "Distinguish harder between content indexes and "other" indexes"

This reverts commit 5b29ca4.

Author: kjac

src/Umbraco.Cms.Search.Core/Configuration/IndexOptions.cs

@@ -9,16 +9,7 @@ public sealed class IndexOptions
 {
     private readonly Dictionary<string, IndexRegistration> _register = [];
 
-    public void RegisterIndex<TIndexer, TSearcher>(string indexAlias)
-        where TIndexer : class, IIndexer
-        where TSearcher : class, ISearcher
-    {
-        ArgumentException.ThrowIfNullOrEmpty("Index alias cannot be empty", nameof(indexAlias));
-
-        _register[indexAlias] = new IndexRegistration(indexAlias, typeof(TIndexer), typeof(TSearcher));
-    }
-
-    public void RegisterContentIndex<TIndexer, TSearcher, TContentChangeStrategy>(string indexAlias, params UmbracoObjectTypes[] containedObjectTypes)
+    public void RegisterIndex<TIndexer, TSearcher, TContentChangeStrategy>(string indexAlias, params UmbracoObjectTypes[] containedObjectTypes)
         where TIndexer : class, IIndexer
         where TSearcher : class, ISearcher
         where TContentChangeStrategy : class, IContentChangeStrategy
@@ -29,15 +20,12 @@ public void RegisterContentIndex<TIndexer, TSearcher, TContentChangeStrategy>(st
             throw new ArgumentException($"Index \"{indexAlias}\" must define at least one contained object type",  nameof(containedObjectTypes));
         }
 
-        _register[indexAlias] = new ContentIndexRegistration(indexAlias, typeof(TIndexer), typeof(TSearcher), typeof(TContentChangeStrategy), containedObjectTypes.Distinct());
+        _register[indexAlias] = new IndexRegistration(indexAlias, containedObjectTypes.Distinct(), typeof(TIndexer), typeof(TSearcher), typeof(TContentChangeStrategy));
     }
 
-    public ContentIndexRegistration[] GetContentIndexRegistrations()
-        => _register.Values.OfType<ContentIndexRegistration>().ToArray();
+    public IndexRegistration[] GetIndexRegistrations()
+        => _register.Values.ToArray();
 
     public IndexRegistration? GetIndexRegistration(string indexAlias)
         => _register.TryGetValue(indexAlias, out IndexRegistration? indexRegistration) ? indexRegistration : null;
-
-    public ContentIndexRegistration? GetContentIndexRegistration(string indexAlias)
-        => GetIndexRegistration(indexAlias) as ContentIndexRegistration;
 }

src/Umbraco.Cms.Search.Core/Controllers/GetAllIndexesApiController.cs

@@ -34,7 +34,7 @@ public GetAllIndexesApiController(
     public async Task<IActionResult> Indexes()
     {
         List<IndexViewModel> indexes = [];
-        foreach (ContentIndexRegistration indexRegistration in _options.GetContentIndexRegistrations())
+        foreach (IndexRegistration indexRegistration in _options.GetIndexRegistrations())
         {
             if (TryGetIndexer(_serviceProvider, indexRegistration.Indexer, _logger, out IIndexer? indexer) is false)
             {

src/Umbraco.Cms.Search.Core/Controllers/GetIndexApiController.cs

@@ -39,7 +39,7 @@ public async Task<IActionResult> Index(string indexAlias)
             return BadRequest("The indexAlias parameter must be provided and cannot be empty.");
         }
 
-        ContentIndexRegistration? indexRegistration = _options.GetContentIndexRegistration(indexAlias);
+        IndexRegistration? indexRegistration = _options.GetIndexRegistration(indexAlias);
         if (indexRegistration is null)
         {
             return NotFound("The specified index alias was not found.");

src/Umbraco.Cms.Search.Core/Controllers/RebuildIndexApiController.cs

@@ -32,7 +32,7 @@ public IActionResult Rebuild(string indexAlias)
         }
 
         // Check if the index exists before calling the service
-        ContentIndexRegistration? indexRegistration = _options.GetContentIndexRegistration(indexAlias);
+        IndexRegistration? indexRegistration = _options.GetIndexRegistration(indexAlias);
         if (indexRegistration is null)
         {
             return NotFound("The specified index alias was not found.");

src/Umbraco.Cms.Search.Core/Models/Configuration/ContentIndexRegistration.cs

@@ -1,3 +1,5 @@
-namespace Umbraco.Cms.Search.Core.Models.Configuration;
+using Umbraco.Cms.Core.Models;
 
-public record IndexRegistration(string IndexAlias, Type Indexer, Type Searcher);
+namespace Umbraco.Cms.Search.Core.Models.Configuration;
+
+public record IndexRegistration(string IndexAlias, IEnumerable<UmbracoObjectTypes> ContainedObjectTypes, Type Indexer, Type Searcher, Type ContentChangeStrategy);

src/Umbraco.Cms.Search.Core/Models/Configuration/IndexRegistration.cs

@@ -3,4 +3,4 @@
 
 namespace Umbraco.Cms.Search.Core.Models.Indexing;
 
-public record ContentIndexInfo(string IndexAlias, IEnumerable<UmbracoObjectTypes> ContainedObjectTypes, IIndexer Indexer);
+public record IndexInfo(string IndexAlias, IEnumerable<UmbracoObjectTypes> ContainedObjectTypes, IIndexer Indexer);

…Core/Models/Indexing/ContentIndexInfo.cs …Search.Core/Models/Indexing/IndexInfo.cssrc/Umbraco.Cms.Search.Core/Models/Indexing/ContentIndexInfo.cs renamed to src/Umbraco.Cms.Search.Core/Models/Indexing/IndexInfo.cs src/Umbraco.Cms.Search.Core/Models/Indexing/ContentIndexInfo.cs renamed to src/Umbraco.Cms.Search.Core/Models/Indexing/IndexInfo.cs

@@ -39,7 +39,7 @@ public async Task HandleAsync(LanguageDeletedNotification notification, Cancella
         _logger.LogInformation("Rebuilding search indexes after language deletion...");
         await _indexDocumentService.DeleteAllAsync();
 
-        foreach (ContentIndexRegistration indexRegistration in _options.GetContentIndexRegistrations())
+        foreach (IndexRegistration indexRegistration in _options.GetIndexRegistrations())
         {
             if (indexRegistration.ContainedObjectTypes.Contains(UmbracoObjectTypes.Document))
             {
@@ -67,7 +67,7 @@ private async Task RebuildByObjectType<T>(IEnumerable<ContentTypeChange<T>> chan
                 continue;
             }
 
-            foreach (ContentIndexRegistration indexRegistration in _options.GetContentIndexRegistrations())
+            foreach (IndexRegistration indexRegistration in _options.GetIndexRegistrations())
             {
                 if (indexRegistration.ContainedObjectTypes.Contains(objectType))
                 {

src/Umbraco.Cms.Search.Core/NotificationHandlers/RebuildIndexesNotificationHandler.cs

@@ -4,23 +4,23 @@
 
 namespace Umbraco.Cms.Search.Core.Notifications;
 
-public sealed class ContentIndexingNotification : ICancelableNotification
+public sealed class IndexingNotification : ICancelableNotification
 {
-    public ContentIndexingNotification(
-        string indexAlias,
+    public IndexingNotification(
+        IndexInfo indexInfo,
         Guid id,
         UmbracoObjectTypes objectType,
         IEnumerable<Variation> variations,
         IEnumerable<IndexField> fields)
     {
-        IndexAlias = indexAlias;
+        IndexInfo = indexInfo;
         Id = id;
         ObjectType = objectType;
         Variations = variations;
         Fields = fields;
     }
 
-    public string IndexAlias { get; }
+    public IndexInfo IndexInfo { get; }
 
     public Guid Id { get; }
 

…fications/ContentIndexingNotification.cs …re/Notifications/IndexingNotification.cssrc/Umbraco.Cms.Search.Core/Notifications/ContentIndexingNotification.cs renamed to src/Umbraco.Cms.Search.Core/Notifications/IndexingNotification.cs src/Umbraco.Cms.Search.Core/Notifications/ContentIndexingNotification.cs renamed to src/Umbraco.Cms.Search.Core/Notifications/IndexingNotification.cs

@@ -63,6 +63,6 @@ protected async Task EnumerateDescendantsByPath<T>(
         while (descendants.Length == ContentEnumerationPageSize);
     }
 
-    protected void LogIndexRebuildCancellation(ContentIndexInfo indexInfo)
+    protected void LogIndexRebuildCancellation(IndexInfo indexInfo)
         => _logger.LogInformation("Cancellation requested for rebuild of index: {indexAlias}", indexInfo.IndexAlias);
 }