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

Add nullability to web.common

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-03-29 13:44:21 +02:00
parent 86ae730b1e
commit b52c4e50cf
151 changed files with 731 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/DependencyInjection/IScopedServiceProvider.cs
View File

@@ -14,6 +14,6 @@ namespace Umbraco.Cms.Core.DependencyInjection
/// <remarks>
/// Can be null.
/// </remarks>
IServiceProvider ServiceProvider { get; }
IServiceProvider? ServiceProvider { get; }
}
}

2
src/Umbraco.Core/DependencyInjection/IUmbracoBuilder.cs
View File

@@ -31,7 +31,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
IProfiler Profiler { get; }
AppCaches AppCaches { get; }
TBuilder WithCollectionBuilder<TBuilder>() where TBuilder : ICollectionBuilder;
TBuilder? WithCollectionBuilder<TBuilder>() where TBuilder : ICollectionBuilder;
void Build();
}
}

16
src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs
View File

@@ -21,7 +21,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
public static IUmbracoBuilder AddComponent<T>(this IUmbracoBuilder builder)
where T : class, IComponent
{
builder.Components().Append<T>();
builder.Components()?.Append<T>();
return builder;
}
@@ -33,7 +33,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
public static IUmbracoBuilder AddContentApp<T>(this IUmbracoBuilder builder)
where T : class, IContentAppFactory
{
builder.ContentApps().Append<T>();
builder.ContentApps()?.Append<T>();
return builder;
}
@@ -45,7 +45,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
public static IUmbracoBuilder AddContentFinder<T>(this IUmbracoBuilder builder)
where T : class, IContentFinder
{
builder.ContentFinders().Append<T>();
builder.ContentFinders()?.Append<T>();
return builder;
}
@@ -57,7 +57,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
public static IUmbracoBuilder AddDashboard<T>(this IUmbracoBuilder builder)
where T : class, IDashboard
{
builder.Dashboards().Add<T>();
builder.Dashboards()?.Add<T>();
return builder;
}
@@ -69,7 +69,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
public static IUmbracoBuilder AddMediaUrlProvider<T>(this IUmbracoBuilder builder)
where T : class, IMediaUrlProvider
{
builder.MediaUrlProviders().Append<T>();
builder.MediaUrlProviders()?.Append<T>();
return builder;
}
@@ -81,7 +81,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
public static IUmbracoBuilder AddEmbedProvider<T>(this IUmbracoBuilder builder)
where T : class, IEmbedProvider
{
builder.EmbedProviders().Append<T>();
builder.EmbedProviders()?.Append<T>();
return builder;
}
@@ -97,7 +97,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
public static IUmbracoBuilder AddSection<T>(this IUmbracoBuilder builder)
where T : class, ISection
{
builder.Sections().Append<T>();
builder.Sections()?.Append<T>();
return builder;
}
@@ -109,7 +109,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
public static IUmbracoBuilder AddUrlProvider<T>(this IUmbracoBuilder builder)
where T : class, IUrlProvider
{
builder.UrlProviders().Append<T>();
builder.UrlProviders()?.Append<T>();
return builder;
}
}

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

@@ -33,12 +33,12 @@ namespace Umbraco.Cms.Core.DependencyInjection
/// </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()
builder.ContentApps()?
.Append<ListViewContentAppFactory>()
.Append<ContentEditorContentAppFactory>()
.Append<ContentInfoContentAppFactory>()
@@ -51,24 +51,24 @@ namespace Umbraco.Cms.Core.DependencyInjection
// all built-in finders in the correct order,
// devs can then modify this list on application startup
builder.ContentFinders()
builder.ContentFinders()?
.Append<ContentFinderByPageIdQuery>()
.Append<ContentFinderByUrl>()
.Append<ContentFinderByIdPath>()
/*.Append<ContentFinderByUrlAndTemplate>() // disabled, this is an odd finder */
.Append<ContentFinderByUrlAlias>()
.Append<ContentFinderByRedirectUrl>();
builder.EditorValidators().Add(() => builder.TypeLoader.GetTypes<IEditorValidator>());
builder.HealthChecks().Add(() => builder.TypeLoader.GetTypes<HealthCheck>());
builder.HealthCheckNotificationMethods().Add(() => builder.TypeLoader.GetTypes<IHealthCheckNotificationMethod>());
builder.EditorValidators()?.Add(() => builder.TypeLoader.GetTypes<IEditorValidator>());
builder.HealthChecks()?.Add(() => builder.TypeLoader.GetTypes<HealthCheck>());
builder.HealthCheckNotificationMethods()?.Add(() => builder.TypeLoader.GetTypes<IHealthCheckNotificationMethod>());
builder.TourFilters();
builder.UrlProviders()
builder.UrlProviders()?
.Append<AliasUrlProvider>()
.Append<DefaultUrlProvider>();
builder.MediaUrlProviders()
builder.MediaUrlProviders()?
.Append<DefaultMediaUrlProvider>();
// register back office sections in the order we want them rendered
builder.Sections()
builder.Sections()?
.Append<ContentSection>()
.Append<MediaSection>()
.Append<SettingsSection>()
@@ -79,7 +79,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
.Append<TranslationSection>();
builder.Components();
// register core CMS dashboards and 3rd party types - will be ordered by weight attribute & merged with package.manifest dashboards
builder.Dashboards()
builder.Dashboards()?
.Add<ContentDashboard>()
.Add<ExamineDashboard>()
.Add<FormsDashboard>()
@@ -93,9 +93,9 @@ namespace Umbraco.Cms.Core.DependencyInjection
.Add<SettingsDashboard>()
.Add(builder.TypeLoader.GetTypes<IDashboard>());
builder.DataValueReferenceFactories();
builder.PropertyValueConverters().Append(builder.TypeLoader.GetTypes<IPropertyValueConverter>());
builder.UrlSegmentProviders().Append<DefaultUrlSegmentProvider>();
builder.ManifestValueValidators()
builder.PropertyValueConverters()?.Append(builder.TypeLoader.GetTypes<IPropertyValueConverter>());
builder.UrlSegmentProviders()?.Append<DefaultUrlSegmentProvider>();
builder.ManifestValueValidators()?
.Add<RequiredValidator>()
.Add<RegexValidator>()
.Add<DelimitedValueValidator>()
@@ -105,7 +105,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
builder.ManifestFilters();
builder.MediaUrlGenerators();
// register OEmbed providers - no type scanning - all explicit opt-in of adding types, IEmbedProvider is not IDiscoverable
builder.EmbedProviders()
builder.EmbedProviders()?
.Append<YouTube>()
.Append<Twitter>()
.Append<Vimeo>()
@@ -119,7 +119,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
.Append<Issuu>()
.Append<Hulu>()
.Append<Giphy>();
builder.SearchableTrees().Add(() => builder.TypeLoader.GetTypes<ISearchableTree>());
builder.SearchableTrees()?.Add(() => builder.TypeLoader.GetTypes<ISearchableTree>());
builder.BackOfficeAssets();
}
@@ -127,141 +127,141 @@ namespace Umbraco.Cms.Core.DependencyInjection
/// Gets the actions collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static ActionCollectionBuilder Actions(this IUmbracoBuilder builder)
public static ActionCollectionBuilder? Actions(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<ActionCollectionBuilder>();
/// <summary>
/// Gets the content apps collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static ContentAppFactoryCollectionBuilder ContentApps(this IUmbracoBuilder builder)
public static ContentAppFactoryCollectionBuilder? ContentApps(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<ContentAppFactoryCollectionBuilder>();
/// <summary>
/// Gets the content finders collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static ContentFinderCollectionBuilder ContentFinders(this IUmbracoBuilder builder)
public static ContentFinderCollectionBuilder? ContentFinders(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<ContentFinderCollectionBuilder>();
/// <summary>
/// Gets the editor validators collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static EditorValidatorCollectionBuilder EditorValidators(this IUmbracoBuilder builder)
public static EditorValidatorCollectionBuilder? EditorValidators(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<EditorValidatorCollectionBuilder>();
/// <summary>
/// Gets the health checks collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static HealthCheckCollectionBuilder HealthChecks(this IUmbracoBuilder builder)
public static HealthCheckCollectionBuilder? HealthChecks(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<HealthCheckCollectionBuilder>();
public static HealthCheckNotificationMethodCollectionBuilder HealthCheckNotificationMethods(this IUmbracoBuilder builder)
public static HealthCheckNotificationMethodCollectionBuilder? HealthCheckNotificationMethods(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<HealthCheckNotificationMethodCollectionBuilder>();
/// <summary>
/// Gets the TourFilters collection builder.
/// </summary>
public static TourFilterCollectionBuilder TourFilters(this IUmbracoBuilder builder)
public static TourFilterCollectionBuilder? TourFilters(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<TourFilterCollectionBuilder>();
/// <summary>
/// Gets the URL providers collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static UrlProviderCollectionBuilder UrlProviders(this IUmbracoBuilder builder)
public static UrlProviderCollectionBuilder? UrlProviders(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<UrlProviderCollectionBuilder>();
/// <summary>
/// Gets the media url providers collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static MediaUrlProviderCollectionBuilder MediaUrlProviders(this IUmbracoBuilder builder)
public static MediaUrlProviderCollectionBuilder? MediaUrlProviders(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<MediaUrlProviderCollectionBuilder>();
/// <summary>
/// Gets the backoffice sections/applications collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static SectionCollectionBuilder Sections(this IUmbracoBuilder builder)
public static SectionCollectionBuilder? Sections(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<SectionCollectionBuilder>();
/// <summary>
/// Gets the components collection builder.
/// </summary>
public static ComponentCollectionBuilder Components(this IUmbracoBuilder builder)
public static ComponentCollectionBuilder? Components(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<ComponentCollectionBuilder>();
/// <summary>
/// Gets the backoffice dashboards collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static DashboardCollectionBuilder Dashboards(this IUmbracoBuilder builder)
public static DashboardCollectionBuilder? Dashboards(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<DashboardCollectionBuilder>();
/// <summary>
/// Gets the cache refreshers collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static CacheRefresherCollectionBuilder CacheRefreshers(this IUmbracoBuilder builder)
public static CacheRefresherCollectionBuilder? CacheRefreshers(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<CacheRefresherCollectionBuilder>();
/// <summary>
/// Gets the map definitions collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static MapDefinitionCollectionBuilder MapDefinitions(this IUmbracoBuilder builder)
public static MapDefinitionCollectionBuilder? MapDefinitions(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<MapDefinitionCollectionBuilder>();
/// <summary>
/// Gets the data editor collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static DataEditorCollectionBuilder DataEditors(this IUmbracoBuilder builder)
public static DataEditorCollectionBuilder? DataEditors(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<DataEditorCollectionBuilder>();
/// <summary>
/// Gets the data value reference factory collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static DataValueReferenceFactoryCollectionBuilder DataValueReferenceFactories(this IUmbracoBuilder builder)
public static DataValueReferenceFactoryCollectionBuilder? DataValueReferenceFactories(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<DataValueReferenceFactoryCollectionBuilder>();
/// <summary>
/// Gets the property value converters collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static PropertyValueConverterCollectionBuilder PropertyValueConverters(this IUmbracoBuilder builder)
public static PropertyValueConverterCollectionBuilder? PropertyValueConverters(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
/// <summary>
/// Gets the url segment providers collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static UrlSegmentProviderCollectionBuilder UrlSegmentProviders(this IUmbracoBuilder builder)
public static UrlSegmentProviderCollectionBuilder? UrlSegmentProviders(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>();
/// <summary>
/// Gets the validators collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
internal static ManifestValueValidatorCollectionBuilder ManifestValueValidators(this IUmbracoBuilder builder)
internal static ManifestValueValidatorCollectionBuilder? ManifestValueValidators(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<ManifestValueValidatorCollectionBuilder>();
/// <summary>
/// Gets the manifest filter collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static ManifestFilterCollectionBuilder ManifestFilters(this IUmbracoBuilder builder)
public static ManifestFilterCollectionBuilder? ManifestFilters(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<ManifestFilterCollectionBuilder>();
/// <summary>
/// Gets the content finders collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static MediaUrlGeneratorCollectionBuilder MediaUrlGenerators(this IUmbracoBuilder builder)
public static MediaUrlGeneratorCollectionBuilder? MediaUrlGenerators(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<MediaUrlGeneratorCollectionBuilder>();
/// <summary>
@@ -269,26 +269,26 @@ namespace Umbraco.Cms.Core.DependencyInjection
/// </summary>
/// <param name="builder">The builder.</param>
[Obsolete("Use EmbedProviders() instead")]
public static EmbedProvidersCollectionBuilder OEmbedProviders(this IUmbracoBuilder builder)
public static EmbedProvidersCollectionBuilder? OEmbedProviders(this IUmbracoBuilder builder)
=> EmbedProviders(builder);
/// <summary>
/// Gets the backoffice Embed Providers collection builder.
/// </summary>
/// <param name="builder">The builder.</param>
public static EmbedProvidersCollectionBuilder EmbedProviders(this IUmbracoBuilder builder)
public static EmbedProvidersCollectionBuilder? EmbedProviders(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<EmbedProvidersCollectionBuilder>();
/// <summary>
/// Gets the back office searchable tree collection builder
/// </summary>
public static SearchableTreeCollectionBuilder SearchableTrees(this IUmbracoBuilder builder)
public static SearchableTreeCollectionBuilder? SearchableTrees(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<SearchableTreeCollectionBuilder>();
/// <summary>
/// Gets the back office custom assets collection builder
/// </summary>
public static CustomBackOfficeAssetsCollectionBuilder BackOfficeAssets(this IUmbracoBuilder builder)
public static CustomBackOfficeAssetsCollectionBuilder? BackOfficeAssets(this IUmbracoBuilder builder)
=> builder.WithCollectionBuilder<CustomBackOfficeAssetsCollectionBuilder>();
}
}

14
src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs
View File

@@ -49,7 +49,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
{
public class UmbracoBuilder : IUmbracoBuilder
{
private readonly Dictionary<Type, ICollectionBuilder> _builders = new Dictionary<Type, ICollectionBuilder>();
private readonly Dictionary<Type, ICollectionBuilder?> _builders = new Dictionary<Type, ICollectionBuilder?>();
public IServiceCollection Services { get; }
@@ -102,17 +102,17 @@ namespace Umbraco.Cms.Core.DependencyInjection
/// </summary>
/// <typeparam name="TBuilder">The type of the collection builder.</typeparam>
/// <returns>The collection builder.</returns>
public TBuilder WithCollectionBuilder<TBuilder>()
public TBuilder? WithCollectionBuilder<TBuilder>()
where TBuilder : ICollectionBuilder
{
Type typeOfBuilder = typeof(TBuilder);
if (_builders.TryGetValue(typeOfBuilder, out ICollectionBuilder? o))
{
return (TBuilder)o;
return (TBuilder?)o;
}
TBuilder builder;
TBuilder? builder;
if (typeof(TBuilder).GetConstructor(Type.EmptyTypes) != null)
{
@@ -121,7 +121,7 @@ namespace Umbraco.Cms.Core.DependencyInjection
else if (typeof(TBuilder).GetConstructor(new[] { typeof(IUmbracoBuilder) }) != null)
{
// Handle those collection builders which need a reference to umbraco builder i.e. DistributedLockingCollectionBuilder.
builder = (TBuilder)Activator.CreateInstance(typeof(TBuilder), this);
builder = (TBuilder?)Activator.CreateInstance(typeof(TBuilder), this);
}
else
{
@@ -134,9 +134,9 @@ namespace Umbraco.Cms.Core.DependencyInjection
public void Build()
{
foreach (ICollectionBuilder builder in _builders.Values)
foreach (ICollectionBuilder? builder in _builders.Values)
{
builder.RegisterWith(Services);
builder?.RegisterWith(Services);
}
_builders.Clear();