diff --git a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs index eda4626490..b90a703786 100644 --- a/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs +++ b/src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs @@ -12,91 +12,119 @@ using Umbraco.Cms.Core.Webhooks; namespace Umbraco.Cms.Core.DependencyInjection; /// -/// Contains extensions methods for used for registering content apps. +/// Contains extensions methods for . /// public static partial class UmbracoBuilderExtensions { /// - /// Register a component. + /// Register a component. /// /// The type of the component. /// The builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddComponent(this IUmbracoBuilder builder) - where T : class, IComponent + where T : IComponent { builder.Components().Append(); + return builder; } /// - /// Register a content app. + /// Register a content app. /// /// The type of the content app. /// The builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddContentApp(this IUmbracoBuilder builder) - where T : class, IContentAppFactory + where T : IContentAppFactory { builder.ContentApps().Append(); + return builder; } /// - /// Register a content finder. + /// Register a content finder. /// /// The type of the content finder. /// The builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddContentFinder(this IUmbracoBuilder builder) - where T : class, IContentFinder + where T : IContentFinder { builder.ContentFinders().Append(); + return builder; } /// - /// Register a dashboard. + /// Register a dashboard. /// /// The type of the dashboard. /// The builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddDashboard(this IUmbracoBuilder builder) - where T : class, IDashboard + where T : IDashboard { builder.Dashboards().Add(); + return builder; } /// - /// Register a manifest filter + /// Register a manifest filter. /// /// The type of the manifest filter. /// The Builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddManifestFilter(this IUmbracoBuilder builder) - where T : class, IManifestFilter + where T : IManifestFilter { builder.ManifestFilters().Append(); + return builder; } /// - /// Register a media url provider. + /// Register a media URL provider. /// - /// The type of the media url provider. + /// The type of the media URL provider. /// The builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddMediaUrlProvider(this IUmbracoBuilder builder) - where T : class, IMediaUrlProvider + where T : IMediaUrlProvider { builder.MediaUrlProviders().Append(); + return builder; } /// - /// Register a embed provider. + /// Register a embed provider. /// /// The type of the embed provider. /// The builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddEmbedProvider(this IUmbracoBuilder builder) - where T : class, IEmbedProvider + where T : IEmbedProvider { builder.EmbedProviders().Append(); + return builder; } @@ -105,46 +133,62 @@ public static partial class UmbracoBuilderExtensions /// /// The type of the section. /// The builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddSection(this IUmbracoBuilder builder) - where T : class, ISection + where T : ISection { builder.Sections().Append(); + return builder; } /// - /// Register a url provider. + /// Register a URL provider. /// - /// The type of the url provider. + /// The type of the URL provider. /// The Builder. + /// + /// The builder. + /// public static IUmbracoBuilder AddUrlProvider(this IUmbracoBuilder builder) - where T : class, IUrlProvider + where T : IUrlProvider { builder.UrlProviders().Append(); + return builder; } /// - /// Add an IMapDefinition to the MapDefinitionCollectionBuilder + /// Add a map definition. /// - /// - /// - /// - public static IUmbracoBuilder AddMapDefinition(this IUmbracoBuilder builder) where T : IMapDefinition + /// The type of map definition. + /// The builder. + /// + /// The builder. + /// + public static IUmbracoBuilder AddMapDefinition(this IUmbracoBuilder builder) + where T : IMapDefinition { - builder.WithCollectionBuilder().Add(); + builder.MapDefinitions().Add(); + return builder; } /// - /// Add an IWebhookEvent to the WebhookEventCollectionBuilder. + /// Add a webhook event. /// - /// - /// - /// - public static IUmbracoBuilder AddWebhookEvent(this IUmbracoBuilder builder) where T : IWebhookEvent + /// The type of webhook event. + /// The builder. + /// + /// The builder. + /// + public static IUmbracoBuilder AddWebhookEvent(this IUmbracoBuilder builder) + where T : IWebhookEvent { - builder.WebhookEvents().Append(); + builder.WebhookEvents().Add(); + return builder; } diff --git a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilder.cs b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilder.cs index c6b5ecc0ea..1cd6f3dae8 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilder.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilder.cs @@ -7,7 +7,7 @@ using Umbraco.Extensions; namespace Umbraco.Cms.Core.Webhooks; -public class WebhookEventCollectionBuilder : OrderedCollectionBuilderBase +public class WebhookEventCollectionBuilder : SetCollectionBuilderBase { protected override WebhookEventCollectionBuilder This => this; diff --git a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsContentExtensions.cs b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsContentExtensions.cs index f8495514d8..97e85704c7 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsContentExtensions.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsContentExtensions.cs @@ -18,15 +18,15 @@ public static class WebhookEventCollectionBuilderCmsContentExtensions public static WebhookEventCollectionBuilderCmsContent AddDefault(this WebhookEventCollectionBuilderCmsContent builder) { builder.Builder - .Append() - .Append() - .Append() - .Append() - .Append() - .Append() - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add(); return builder; } @@ -41,8 +41,8 @@ public static class WebhookEventCollectionBuilderCmsContentExtensions public static WebhookEventCollectionBuilderCmsContent AddBlueprint(this WebhookEventCollectionBuilderCmsContent builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -57,8 +57,8 @@ public static class WebhookEventCollectionBuilderCmsContentExtensions public static WebhookEventCollectionBuilderCmsContent AddVersion(this WebhookEventCollectionBuilderCmsContent builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } diff --git a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsContentTypeExtensions.cs b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsContentTypeExtensions.cs index c8b84ef4e1..db87697e2a 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsContentTypeExtensions.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsContentTypeExtensions.cs @@ -18,10 +18,10 @@ public static class WebhookEventCollectionBuilderCmsContentTypeExtensions public static WebhookEventCollectionBuilderCmsContentType AddDocumentType(this WebhookEventCollectionBuilderCmsContentType builder) { builder.Builder - .Append() - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add() + .Add(); return builder; } @@ -36,10 +36,10 @@ public static class WebhookEventCollectionBuilderCmsContentTypeExtensions public static WebhookEventCollectionBuilderCmsContentType AddMediaType(this WebhookEventCollectionBuilderCmsContentType builder) { builder.Builder - .Append() - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add() + .Add(); return builder; } @@ -55,10 +55,10 @@ public static class WebhookEventCollectionBuilderCmsContentTypeExtensions public static WebhookEventCollectionBuilderCmsContentType AddMemberType(this WebhookEventCollectionBuilderCmsContentType builder) { builder.Builder - .Append() - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add() + .Add(); return builder; } diff --git a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsExtensions.cs b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsExtensions.cs index e98495c866..361891de6a 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsExtensions.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsExtensions.cs @@ -22,11 +22,11 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddDefault(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append() - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add() + .Add() + .Add(); return builder; } @@ -108,9 +108,9 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddDataType(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add(); return builder; } @@ -125,8 +125,8 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddDictionary(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -141,8 +141,8 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddDomain(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -189,7 +189,7 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddHealthCheck(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append(); + .Add(); return builder; } @@ -204,8 +204,8 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddLanguage(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -220,11 +220,11 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddMedia(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append() - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add() + .Add() + .Add(); return builder; } @@ -275,7 +275,7 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddPackage(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append(); + .Add(); return builder; } @@ -290,8 +290,8 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddPublicAccess(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -306,8 +306,8 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddRelation(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -322,8 +322,8 @@ public static class WebhookEventCollectionBuilderCmsExtensions public static WebhookEventCollectionBuilderCms AddRelationType(this WebhookEventCollectionBuilderCms builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } diff --git a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsFileExtensions.cs b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsFileExtensions.cs index b229e4d725..21ff19fd3a 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsFileExtensions.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsFileExtensions.cs @@ -18,8 +18,8 @@ public static class WebhookEventCollectionBuilderCmsFileExtensions public static WebhookEventCollectionBuilderCmsFile AddPartialView(this WebhookEventCollectionBuilderCmsFile builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -34,8 +34,8 @@ public static class WebhookEventCollectionBuilderCmsFileExtensions public static WebhookEventCollectionBuilderCmsFile AddScript(this WebhookEventCollectionBuilderCmsFile builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -50,8 +50,8 @@ public static class WebhookEventCollectionBuilderCmsFileExtensions public static WebhookEventCollectionBuilderCmsFile AddStylesheet(this WebhookEventCollectionBuilderCmsFile builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -66,8 +66,8 @@ public static class WebhookEventCollectionBuilderCmsFileExtensions public static WebhookEventCollectionBuilderCmsFile AddTemplate(this WebhookEventCollectionBuilderCmsFile builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } diff --git a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsMemberExtensions.cs b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsMemberExtensions.cs index 12c1ab53f1..15fd7fdd19 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsMemberExtensions.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsMemberExtensions.cs @@ -18,9 +18,9 @@ public static class WebhookEventCollectionBuilderCmsMemberExtensions public static WebhookEventCollectionBuilderCmsMember AddDefault(this WebhookEventCollectionBuilderCmsMember builder) { builder.Builder - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add(); return builder; } @@ -35,8 +35,8 @@ public static class WebhookEventCollectionBuilderCmsMemberExtensions public static WebhookEventCollectionBuilderCmsMember AddRoles(this WebhookEventCollectionBuilderCmsMember builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -51,8 +51,8 @@ public static class WebhookEventCollectionBuilderCmsMemberExtensions public static WebhookEventCollectionBuilderCmsMember AddGroup(this WebhookEventCollectionBuilderCmsMember builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } diff --git a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsUserExtensions.cs b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsUserExtensions.cs index 4e6017c21f..e1d9e0307d 100644 --- a/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsUserExtensions.cs +++ b/src/Umbraco.Core/Webhooks/WebhookEventCollectionBuilderCmsUserExtensions.cs @@ -18,8 +18,8 @@ public static class WebhookEventCollectionBuilderCmsUserExtensions public static WebhookEventCollectionBuilderCmsUser AddDefault(this WebhookEventCollectionBuilderCmsUser builder) { builder.Builder - .Append() - .Append(); + .Add() + .Add(); return builder; } @@ -34,13 +34,13 @@ public static class WebhookEventCollectionBuilderCmsUserExtensions public static WebhookEventCollectionBuilderCmsUser AddLogin(this WebhookEventCollectionBuilderCmsUser builder) { builder.Builder - .Append() - .Append() - .Append() - .Append() - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add() + .Add() + .Add() + .Add() + .Add(); return builder; } @@ -55,9 +55,9 @@ public static class WebhookEventCollectionBuilderCmsUserExtensions public static WebhookEventCollectionBuilderCmsUser AddPassword(this WebhookEventCollectionBuilderCmsUser builder) { builder.Builder - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add(); return builder; } @@ -72,9 +72,9 @@ public static class WebhookEventCollectionBuilderCmsUserExtensions public static WebhookEventCollectionBuilderCmsUser AddGroup(this WebhookEventCollectionBuilderCmsUser builder) { builder.Builder - .Append() - .Append() - .Append(); + .Add() + .Add() + .Add(); return builder; }