yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WithCollectionBuilder helper methods nullability (#15143)

Browse Source 
* Fix WithCollectionBuilder helper methods nullability

* Remove unnecessary lamba expressions
This commit is contained in:
Ronald Barendse
2023-11-06 18:10:09 +01:00
committed by GitHub
parent e7bab6995a
commit 289ab6740b
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs
View File

@@ -36,9 +36,9 @@ public static partial class UmbracoBuilderExtensions
/// </summary>
internal static void AddAllCoreCollectionBuilders(this IUmbracoBuilder builder)
{
builder.CacheRefreshers().Add(() => builder.TypeLoader.GetCacheRefreshers());
builder.DataEditors().Add(() => builder.TypeLoader.GetDataEditors());
builder.Actions().Add(() => builder .TypeLoader.GetActions());
builder.CacheRefreshers().Add(builder.TypeLoader.GetCacheRefreshers);
builder.DataEditors().Add(builder.TypeLoader.GetDataEditors);
builder.Actions().Add(builder.TypeLoader.GetActions);
// register known content apps
builder.ContentApps()
@@ -242,14 +242,14 @@ public static partial class UmbracoBuilderExtensions
/// Gets the partial view snippets collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static PartialViewSnippetCollectionBuilder? PartialViewSnippets(this IUmbracoBuilder builder)
public static PartialViewSnippetCollectionBuilder PartialViewSnippets(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<PartialViewSnippetCollectionBuilder>();
/// <summary>
/// Gets the partial view macro snippets collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static PartialViewMacroSnippetCollectionBuilder? PartialViewMacroSnippets(this IUmbracoBuilder builder)
public static PartialViewMacroSnippetCollectionBuilder PartialViewMacroSnippets(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<PartialViewMacroSnippetCollectionBuilder>();
/// <summary>

6
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.Collections.cs
View File

@@ -15,21 +15,21 @@ public static partial class UmbracoBuilderExtensions
/// Gets the mappers collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static MapperCollectionBuilder? Mappers(this IUmbracoBuilder builder)
public static MapperCollectionBuilder Mappers(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<MapperCollectionBuilder>();
/// <summary>
/// Gets the NPoco mappers collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static NPocoMapperCollectionBuilder? NPocoMappers(this IUmbracoBuilder builder)
public static NPocoMapperCollectionBuilder NPocoMappers(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<NPocoMapperCollectionBuilder>();
/// <summary>
/// Gets the package migration plans collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static PackageMigrationPlanCollectionBuilder? PackageMigrationPlans(this IUmbracoBuilder builder)
public static PackageMigrationPlanCollectionBuilder PackageMigrationPlans(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<PackageMigrationPlanCollectionBuilder>();
/// <summary>

6
src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs
View File

@@ -78,8 +78,8 @@ public static partial class UmbracoBuilderExtensions
builder.Services.AddSingleton<IDistributedLockingMechanismFactory, DefaultDistributedLockingMechanismFactory>();
builder.Services.AddSingleton<IUmbracoDatabaseFactory, UmbracoDatabaseFactory>();
builder.Services.AddSingleton(factory => factory.GetRequiredService<IUmbracoDatabaseFactory>().SqlContext);
builder.NPocoMappers()?.Add<NullableDateMapper>();
builder.PackageMigrationPlans()?.Add(() => builder.TypeLoader.GetPackageMigrationPlans());
builder.NPocoMappers().Add<NullableDateMapper>();
builder.PackageMigrationPlans().Add(builder.TypeLoader.GetPackageMigrationPlans);
builder.Services.AddSingleton<IRuntimeState, RuntimeState>();
builder.Services.AddSingleton<IRuntime, CoreRuntime>();
@@ -107,7 +107,7 @@ public static partial class UmbracoBuilderExtensions
// register persistence mappers - required by database factory so needs to be done here
// means the only place the collection can be modified is in a runtime - afterwards it
// has been frozen and it is too late
builder.Mappers()?.AddCoreMappers();
builder.Mappers().AddCoreMappers();
// register the scope provider
builder.Services.AddSingleton<ScopeProvider>(sp => ActivatorUtilities.CreateInstance<ScopeProvider>(sp, sp.GetRequiredService<IAmbientScopeStack>())); // implements IScopeProvider, IScopeAccessor