From 98f4e2560b3a2c987b6b85d29120a1477fd9c512 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:03:27 +0100 Subject: [PATCH 1/5] Implement DeliveryApiCompositeIdHandler --- .../UmbracoBuilder.Examine.cs | 1 + .../Examine/DeliveryApiCompositeIdHandler.cs | 23 +++++++++++++++++++ .../DeliveryApiIndexCompositeIdModel.cs | 8 +++++++ .../Examine/IDeliveryApiCompositeIdHandler.cs | 8 +++++++ 4 files changed, 40 insertions(+) create mode 100644 src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs create mode 100644 src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs create mode 100644 src/Umbraco.Infrastructure/Examine/IDeliveryApiCompositeIdHandler.cs diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs index 5139cba48fec..60da7003d04a 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs @@ -57,6 +57,7 @@ public static IUmbracoBuilder AddExamine(this IUmbracoBuilder builder) builder.Services.AddUnique(); builder.Services.AddSingleton(); builder.Services.AddSingleton(); + builder.Services.AddUnique(); builder.AddNotificationHandler(); builder.AddNotificationHandler(); diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs b/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs new file mode 100644 index 000000000000..58be2312f507 --- /dev/null +++ b/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs @@ -0,0 +1,23 @@ +using Umbraco.Cms.Core; + +namespace Umbraco.Cms.Infrastructure.Examine; + +public class DeliveryApiCompositeIdHandler : IDeliveryApiCompositeIdHandler +{ + public string IndexId(int id, string culture) => $"{id}|{culture}"; + + public DeliveryApiIndexCompositeIdModel Decompose(string indexId) + { + var parts = indexId.Split(Constants.CharArrays.VerticalTab); + if (parts.Length == 2 && int.TryParse(parts[0], out _)) + { + return new DeliveryApiIndexCompositeIdModel + { + Id = parts[0], + Culture = parts[1], + }; + } + + return new DeliveryApiIndexCompositeIdModel(); + } +} diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs b/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs new file mode 100644 index 000000000000..3b54841c125e --- /dev/null +++ b/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs @@ -0,0 +1,8 @@ +namespace Umbraco.Cms.Infrastructure.Examine; + +public class DeliveryApiIndexCompositeIdModel +{ + public string? Id { get; set; } + + public string? Culture { get; set; } +} diff --git a/src/Umbraco.Infrastructure/Examine/IDeliveryApiCompositeIdHandler.cs b/src/Umbraco.Infrastructure/Examine/IDeliveryApiCompositeIdHandler.cs new file mode 100644 index 000000000000..6f37f2b3471d --- /dev/null +++ b/src/Umbraco.Infrastructure/Examine/IDeliveryApiCompositeIdHandler.cs @@ -0,0 +1,8 @@ +namespace Umbraco.Cms.Infrastructure.Examine; + +public interface IDeliveryApiCompositeIdHandler +{ + string IndexId(int id, string culture); + + DeliveryApiIndexCompositeIdModel Decompose(string indexId); +} From b458435c1efb97776da832d2cb27b495f3415f00 Mon Sep 17 00:00:00 2001 From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:30:38 +0100 Subject: [PATCH 2/5] Replace duplicate decomposing with Handler instead --- .../DeliveryApiContentIndex.cs | 29 +++++++++++-------- ...ApiContentIndexHandleContentTypeChanges.cs | 26 ++++++++++++++--- .../DeliveryApiContentIndexUtilites.cs | 8 ----- .../DeliveryApiContentIndexValueSetBuilder.cs | 28 +++++++++++++++++- 4 files changed, 66 insertions(+), 25 deletions(-) delete mode 100644 src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexUtilites.cs diff --git a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs index c70c9d4da021..1d675d564643 100644 --- a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs +++ b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs @@ -1,8 +1,10 @@ using Examine; using Examine.Lucene; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; +using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; using Umbraco.Extensions; @@ -11,6 +13,7 @@ namespace Umbraco.Cms.Infrastructure.Examine; public class DeliveryApiContentIndex : UmbracoExamineIndex { + private readonly IDeliveryApiCompositeIdHandler _deliveryApiCompositeIdHandler; private readonly ILogger _logger; public DeliveryApiContentIndex( @@ -19,8 +22,20 @@ public DeliveryApiContentIndex( IOptionsMonitor indexOptions, IHostingEnvironment hostingEnvironment, IRuntimeState runtimeState) + : this(loggerFactory, name, indexOptions, hostingEnvironment, runtimeState, StaticServiceProvider.Instance.GetRequiredService()) + { + } + + public DeliveryApiContentIndex( + ILoggerFactory loggerFactory, + string name, + IOptionsMonitor indexOptions, + IHostingEnvironment hostingEnvironment, + IRuntimeState runtimeState, + IDeliveryApiCompositeIdHandler deliveryApiCompositeIdHandler) : base(loggerFactory, name, indexOptions, hostingEnvironment, runtimeState) { + _deliveryApiCompositeIdHandler = deliveryApiCompositeIdHandler; PublishedValuesOnly = false; EnableDefaultEventHandler = false; @@ -108,18 +123,8 @@ protected override void PerformDeleteFromIndex(IEnumerable itemIds, Acti private (string? ContentId, string? Culture) ParseItemId(string id) { - if (int.TryParse(id, out _)) - { - return (id, null); - } - - var parts = id.Split(Constants.CharArrays.VerticalTab); - if (parts.Length == 2 && int.TryParse(parts[0], out _)) - { - return (parts[0], parts[1]); - } - - return (null, null); + DeliveryApiIndexCompositeIdModel compositeIdModel = _deliveryApiCompositeIdHandler.Decompose(id); + return (compositeIdModel.Id ?? id, compositeIdModel.Culture); } protected override void OnTransformingIndexValues(IndexingItemEventArgs e) diff --git a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs index 32dc801dd3d0..f423787cf5f6 100644 --- a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs +++ b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs @@ -1,6 +1,8 @@ using Examine; using Examine.Search; +using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core; +using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Cms.Core.Services.Changes; @@ -18,6 +20,7 @@ internal sealed class DeliveryApiContentIndexHandleContentTypeChanges : Delivery private readonly IDeliveryApiContentIndexValueSetBuilder _deliveryApiContentIndexValueSetBuilder; private readonly IContentService _contentService; private readonly IBackgroundTaskQueue _backgroundTaskQueue; + private readonly IDeliveryApiCompositeIdHandler _deliveryApiCompositeIdHandler; public DeliveryApiContentIndexHandleContentTypeChanges( IList> changes, @@ -25,12 +28,24 @@ public DeliveryApiContentIndexHandleContentTypeChanges( IDeliveryApiContentIndexValueSetBuilder deliveryApiContentIndexValueSetBuilder, IContentService contentService, IBackgroundTaskQueue backgroundTaskQueue) + : this(changes, deliveryApiIndexingHandler, deliveryApiContentIndexValueSetBuilder, contentService, backgroundTaskQueue, StaticServiceProvider.Instance.GetRequiredService()) + { + } + + public DeliveryApiContentIndexHandleContentTypeChanges( + IList> changes, + DeliveryApiIndexingHandler deliveryApiIndexingHandler, + IDeliveryApiContentIndexValueSetBuilder deliveryApiContentIndexValueSetBuilder, + IContentService contentService, + IBackgroundTaskQueue backgroundTaskQueue, + IDeliveryApiCompositeIdHandler deliveryApiCompositeIdHandler) { _changes = changes; _deliveryApiIndexingHandler = deliveryApiIndexingHandler; _deliveryApiContentIndexValueSetBuilder = deliveryApiContentIndexValueSetBuilder; _contentService = contentService; _backgroundTaskQueue = backgroundTaskQueue; + _deliveryApiCompositeIdHandler = deliveryApiCompositeIdHandler; } public void Execute() => _backgroundTaskQueue.QueueBackgroundWorkItem(_ => @@ -79,10 +94,13 @@ private void HandleUpdatedContentTypes(IEnumerable updatedContentTypesIds, var indexIdsByContentIds = indexIds .Select(id => { - var parts = id.Split(Constants.CharArrays.VerticalTab); - return parts.Length == 2 && int.TryParse(parts[0], out var contentId) - ? (ContentId: contentId, IndexId: id) - : throw new InvalidOperationException($"Delivery API identifier should be composite of ID and culture, got: {id}"); + DeliveryApiIndexCompositeIdModel compositeIdModel = _deliveryApiCompositeIdHandler.Decompose(id); + if (int.TryParse(compositeIdModel.Id, out var contentId) is false) + { + throw new InvalidOperationException($"Delivery API identifier should be composite of ID and culture, got: {id}"); + } + + return (ContentId: contentId, IndexId: compositeIdModel.Culture!); }) .GroupBy(tuple => tuple.ContentId) .ToDictionary( diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexUtilites.cs b/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexUtilites.cs deleted file mode 100644 index 2bfd3d6f80ba..000000000000 --- a/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexUtilites.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Umbraco.Cms.Core.Models; - -namespace Umbraco.Cms.Infrastructure.Examine; - -internal static class DeliveryApiContentIndexUtilites -{ - public static string IndexId(IContent content, string culture) => $"{content.Id}|{culture}"; -} diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexValueSetBuilder.cs b/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexValueSetBuilder.cs index abf19b6bfef0..e8226d994c22 100644 --- a/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexValueSetBuilder.cs +++ b/src/Umbraco.Infrastructure/Examine/DeliveryApiContentIndexValueSetBuilder.cs @@ -1,9 +1,11 @@ using Examine; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; using Umbraco.Cms.Core.Configuration.Models; using Umbraco.Cms.Core.DeliveryApi; +using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; using Umbraco.Extensions; @@ -18,8 +20,10 @@ internal sealed class DeliveryApiContentIndexValueSetBuilder : IDeliveryApiConte private readonly ILogger _logger; private readonly IDeliveryApiContentIndexFieldDefinitionBuilder _deliveryApiContentIndexFieldDefinitionBuilder; private readonly IMemberService _memberService; + private readonly IDeliveryApiCompositeIdHandler _deliveryApiCompositeIdHandler; private DeliveryApiSettings _deliveryApiSettings; + [Obsolete("Please use ctor that takes an IDeliveryApiCompositeIdHandler. Scheduled for removal in v15")] public DeliveryApiContentIndexValueSetBuilder( ContentIndexHandlerCollection contentIndexHandlerCollection, IContentService contentService, @@ -28,12 +32,34 @@ public DeliveryApiContentIndexValueSetBuilder( IDeliveryApiContentIndexFieldDefinitionBuilder deliveryApiContentIndexFieldDefinitionBuilder, IOptionsMonitor deliveryApiSettings, IMemberService memberService) + : this( + contentIndexHandlerCollection, + contentService, + publicAccessService, + logger, + deliveryApiContentIndexFieldDefinitionBuilder, + deliveryApiSettings, + memberService, + StaticServiceProvider.Instance.GetRequiredService()) + { + } + + public DeliveryApiContentIndexValueSetBuilder( + ContentIndexHandlerCollection contentIndexHandlerCollection, + IContentService contentService, + IPublicAccessService publicAccessService, + ILogger logger, + IDeliveryApiContentIndexFieldDefinitionBuilder deliveryApiContentIndexFieldDefinitionBuilder, + IOptionsMonitor deliveryApiSettings, + IMemberService memberService, + IDeliveryApiCompositeIdHandler deliveryApiCompositeIdHandler) { _contentIndexHandlerCollection = contentIndexHandlerCollection; _publicAccessService = publicAccessService; _logger = logger; _deliveryApiContentIndexFieldDefinitionBuilder = deliveryApiContentIndexFieldDefinitionBuilder; _memberService = memberService; + _deliveryApiCompositeIdHandler = deliveryApiCompositeIdHandler; _contentService = contentService; _deliveryApiSettings = deliveryApiSettings.CurrentValue; deliveryApiSettings.OnChange(settings => _deliveryApiSettings = settings); @@ -73,7 +99,7 @@ public IEnumerable GetValueSets(params IContent[] contents) AddContentIndexHandlerFields(content, culture, fieldDefinitions, indexValues); - yield return new ValueSet(DeliveryApiContentIndexUtilites.IndexId(content, indexCulture), IndexTypes.Content, content.ContentType.Alias, indexValues); + yield return new ValueSet(_deliveryApiCompositeIdHandler.IndexId(content.Id, indexCulture), IndexTypes.Content, content.ContentType.Alias, indexValues); } } } From 51f9d9b92e4f6cc883720ea674907703885304f5 Mon Sep 17 00:00:00 2001 From: Zeegaan Date: Tue, 28 Nov 2023 09:49:05 +0100 Subject: [PATCH 3/5] Add obsolete messages --- src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs | 1 + .../Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs index 1d675d564643..18adac759fbe 100644 --- a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs +++ b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs @@ -16,6 +16,7 @@ public class DeliveryApiContentIndex : UmbracoExamineIndex private readonly IDeliveryApiCompositeIdHandler _deliveryApiCompositeIdHandler; private readonly ILogger _logger; + [Obsolete("Use the constructor that takes an IDeliveryApiCompositeIdHandler instead, scheduled for removal in v15")] public DeliveryApiContentIndex( ILoggerFactory loggerFactory, string name, diff --git a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs index f423787cf5f6..18532b5118d1 100644 --- a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs +++ b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs @@ -22,6 +22,7 @@ internal sealed class DeliveryApiContentIndexHandleContentTypeChanges : Delivery private readonly IBackgroundTaskQueue _backgroundTaskQueue; private readonly IDeliveryApiCompositeIdHandler _deliveryApiCompositeIdHandler; + [Obsolete("Use the constructor that takes an IDeliveryApiCompositeIdHandler instead, scheduled for removal in v15")] public DeliveryApiContentIndexHandleContentTypeChanges( IList> changes, DeliveryApiIndexingHandler deliveryApiIndexingHandler, From 9959e4ede8627c2a571140f7b1862bbb26ee64e1 Mon Sep 17 00:00:00 2001 From: Zeegaan Date: Tue, 28 Nov 2023 12:56:08 +0100 Subject: [PATCH 4/5] Make Id integer instead of string --- src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs | 2 +- .../DeliveryApiContentIndexHandleContentTypeChanges.cs | 4 ++-- .../Examine/DeliveryApiCompositeIdHandler.cs | 4 ++-- .../Examine/DeliveryApiIndexCompositeIdModel.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs index 18adac759fbe..ba3fb8e29709 100644 --- a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs +++ b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs @@ -125,7 +125,7 @@ protected override void PerformDeleteFromIndex(IEnumerable itemIds, Acti private (string? ContentId, string? Culture) ParseItemId(string id) { DeliveryApiIndexCompositeIdModel compositeIdModel = _deliveryApiCompositeIdHandler.Decompose(id); - return (compositeIdModel.Id ?? id, compositeIdModel.Culture); + return (compositeIdModel.Id.ToString() ?? id, compositeIdModel.Culture); } protected override void OnTransformingIndexValues(IndexingItemEventArgs e) diff --git a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs index 18532b5118d1..b6fe0e43686d 100644 --- a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs +++ b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs @@ -96,12 +96,12 @@ private void HandleUpdatedContentTypes(IEnumerable updatedContentTypesIds, .Select(id => { DeliveryApiIndexCompositeIdModel compositeIdModel = _deliveryApiCompositeIdHandler.Decompose(id); - if (int.TryParse(compositeIdModel.Id, out var contentId) is false) + if (compositeIdModel.Id is null) { throw new InvalidOperationException($"Delivery API identifier should be composite of ID and culture, got: {id}"); } - return (ContentId: contentId, IndexId: compositeIdModel.Culture!); + return (ContentId: compositeIdModel.Id.Value, IndexId: compositeIdModel.Culture!); }) .GroupBy(tuple => tuple.ContentId) .ToDictionary( diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs b/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs index 58be2312f507..94051def4719 100644 --- a/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs +++ b/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs @@ -9,11 +9,11 @@ public class DeliveryApiCompositeIdHandler : IDeliveryApiCompositeIdHandler public DeliveryApiIndexCompositeIdModel Decompose(string indexId) { var parts = indexId.Split(Constants.CharArrays.VerticalTab); - if (parts.Length == 2 && int.TryParse(parts[0], out _)) + if (parts.Length == 2 && int.TryParse(parts[0], out var id)) { return new DeliveryApiIndexCompositeIdModel { - Id = parts[0], + Id = id, Culture = parts[1], }; } diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs b/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs index 3b54841c125e..563f0cedc6ac 100644 --- a/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs +++ b/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs @@ -2,7 +2,7 @@ public class DeliveryApiIndexCompositeIdModel { - public string? Id { get; set; } + public int? Id { get; set; } public string? Culture { get; set; } } From d0f528fc092779686dcb49eb95c77d7270b573a3 Mon Sep 17 00:00:00 2001 From: Zeegaan Date: Tue, 28 Nov 2023 12:59:18 +0100 Subject: [PATCH 5/5] Move from examine to core --- .../DeliveryApi}/DeliveryApiCompositeIdHandler.cs | 4 +--- .../DeliveryApi}/DeliveryApiIndexCompositeIdModel.cs | 2 +- .../DeliveryApi}/IDeliveryApiCompositeIdHandler.cs | 2 +- src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs | 1 + .../DependencyInjection/UmbracoBuilder.Examine.cs | 1 + .../DeliveryApiContentIndexHandleContentTypeChanges.cs | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) rename src/{Umbraco.Infrastructure/Examine => Umbraco.Core/DeliveryApi}/DeliveryApiCompositeIdHandler.cs (88%) rename src/{Umbraco.Infrastructure/Examine => Umbraco.Core/DeliveryApi}/DeliveryApiIndexCompositeIdModel.cs (72%) rename src/{Umbraco.Infrastructure/Examine => Umbraco.Core/DeliveryApi}/IDeliveryApiCompositeIdHandler.cs (76%) diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs b/src/Umbraco.Core/DeliveryApi/DeliveryApiCompositeIdHandler.cs similarity index 88% rename from src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs rename to src/Umbraco.Core/DeliveryApi/DeliveryApiCompositeIdHandler.cs index 94051def4719..a3c1f0fceb77 100644 --- a/src/Umbraco.Infrastructure/Examine/DeliveryApiCompositeIdHandler.cs +++ b/src/Umbraco.Core/DeliveryApi/DeliveryApiCompositeIdHandler.cs @@ -1,6 +1,4 @@ -using Umbraco.Cms.Core; - -namespace Umbraco.Cms.Infrastructure.Examine; +namespace Umbraco.Cms.Core.DeliveryApi; public class DeliveryApiCompositeIdHandler : IDeliveryApiCompositeIdHandler { diff --git a/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs b/src/Umbraco.Core/DeliveryApi/DeliveryApiIndexCompositeIdModel.cs similarity index 72% rename from src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs rename to src/Umbraco.Core/DeliveryApi/DeliveryApiIndexCompositeIdModel.cs index 563f0cedc6ac..d3b876b5aac8 100644 --- a/src/Umbraco.Infrastructure/Examine/DeliveryApiIndexCompositeIdModel.cs +++ b/src/Umbraco.Core/DeliveryApi/DeliveryApiIndexCompositeIdModel.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Infrastructure.Examine; +namespace Umbraco.Cms.Core.DeliveryApi; public class DeliveryApiIndexCompositeIdModel { diff --git a/src/Umbraco.Infrastructure/Examine/IDeliveryApiCompositeIdHandler.cs b/src/Umbraco.Core/DeliveryApi/IDeliveryApiCompositeIdHandler.cs similarity index 76% rename from src/Umbraco.Infrastructure/Examine/IDeliveryApiCompositeIdHandler.cs rename to src/Umbraco.Core/DeliveryApi/IDeliveryApiCompositeIdHandler.cs index 6f37f2b3471d..a472d0f9ffc2 100644 --- a/src/Umbraco.Infrastructure/Examine/IDeliveryApiCompositeIdHandler.cs +++ b/src/Umbraco.Core/DeliveryApi/IDeliveryApiCompositeIdHandler.cs @@ -1,4 +1,4 @@ -namespace Umbraco.Cms.Infrastructure.Examine; +namespace Umbraco.Cms.Core.DeliveryApi; public interface IDeliveryApiCompositeIdHandler { diff --git a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs index ba3fb8e29709..a3508a3fedda 100644 --- a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs +++ b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Umbraco.Cms.Core; +using Umbraco.Cms.Core.DeliveryApi; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Hosting; using Umbraco.Cms.Core.Services; diff --git a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs index 60da7003d04a..19aa10312393 100644 --- a/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs +++ b/src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Examine.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.DependencyInjection; +using Umbraco.Cms.Core.DeliveryApi; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Notifications; diff --git a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs index b6fe0e43686d..0cdfc10db6bc 100644 --- a/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs +++ b/src/Umbraco.Infrastructure/Examine/Deferred/DeliveryApiContentIndexHandleContentTypeChanges.cs @@ -2,6 +2,7 @@ using Examine.Search; using Microsoft.Extensions.DependencyInjection; using Umbraco.Cms.Core; +using Umbraco.Cms.Core.DeliveryApi; using Umbraco.Cms.Core.DependencyInjection; using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services;