Remove redundant code and calls in DI extension methods

ronaldbarendse · ronaldbarendse · commit 77e2dc0b61d6 · 2022-04-13T23:14:50.000+02:00
diff --git a/src/Umbraco.StorageProviders.AzureBlob/DependencyInjection/AzureBlobFileSystemExtensions.cs b/src/Umbraco.StorageProviders.AzureBlob/DependencyInjection/AzureBlobFileSystemExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 using Umbraco.StorageProviders.AzureBlob.IO;
 
 // ReSharper disable once CheckNamespace
@@ -12,101 +13,77 @@ namespace Umbraco.Cms.Core.DependencyInjection
     /// </summary>
     public static class AzureBlobFileSystemExtensions
     {
+        internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, string name, Action<OptionsBuilder<AzureBlobFileSystemOptions>>? configure = null)
+        {
+            ArgumentNullException.ThrowIfNull(builder);
+            ArgumentNullException.ThrowIfNull(name);
+
+            builder.Services.TryAddSingleton<IAzureBlobFileSystemProvider, AzureBlobFileSystemProvider>();
+
+            var optionsBuilder = builder.Services.AddOptions<AzureBlobFileSystemOptions>(name)
+                .BindConfiguration($"Umbraco:Storage:AzureBlob:{name}")
+                .ValidateDataAnnotations();
+
+            configure?.Invoke(optionsBuilder);
+
+            return builder;
+        }
+
         /// <summary>
         /// Registers a <see cref="IAzureBlobFileSystem" /> in the <see cref="IServiceCollection" />, with it's configuration
         /// loaded from <c>Umbraco:Storage:AzureBlob:{name}</c> where {name} is the value of the <paramref name="name" /> parameter.
         /// </summary>
         /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
         /// <param name="name">The name of the file system.</param>
-        /// <param name="path">The path to map the filesystem to.</param>
         /// <returns>
         /// The <see cref="IUmbracoBuilder" />.
         /// </returns>
         /// <exception cref="System.ArgumentNullException">builder
         /// or
         /// name</exception>
         /// <exception cref="System.ArgumentException">Value cannot be null or whitespace. - path</exception>
-        public static IUmbracoBuilder AddAzureBlobFileSystem(this IUmbracoBuilder builder, string name, string path)
-        {
-            if (builder == null) throw new ArgumentNullException(nameof(builder));
-            if (name == null) throw new ArgumentNullException(nameof(name));
-            if (string.IsNullOrWhiteSpace(path)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(path));
-
-            builder.Services.TryAddSingleton<IAzureBlobFileSystemProvider, AzureBlobFileSystemProvider>();
-
-            builder.Services
-                .AddOptions<AzureBlobFileSystemOptions>(name)
-                .BindConfiguration($"Umbraco:Storage:AzureBlob:{name}")
-                .Configure(options => options.VirtualPath = path)
-                .ValidateDataAnnotations();
-
-            return builder;
-        }
+        public static IUmbracoBuilder AddAzureBlobFileSystem(this IUmbracoBuilder builder, string name)
+            => builder.AddInternal(name);
 
         /// <summary>
         /// Registers a <see cref="IAzureBlobFileSystem" /> in the <see cref="IServiceCollection" />, with it's configuration
         /// loaded from <c>Umbraco:Storage:AzureBlob:{name}</c> where {name} is the value of the <paramref name="name" /> parameter.
         /// </summary>
         /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
         /// <param name="name">The name of the file system.</param>
-        /// <param name="path">The path to map the filesystem to.</param>
         /// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
         /// <returns>
         /// The <see cref="IUmbracoBuilder" />.
         /// </returns>
-        /// <exception cref="System.ArgumentNullException">builder
-        /// or
-        /// name
-        /// or
-        /// configure</exception>
-        /// <exception cref="System.ArgumentException">Value cannot be null or whitespace. - path</exception>
-        public static IUmbracoBuilder AddAzureBlobFileSystem(this IUmbracoBuilder builder, string name, string path, Action<AzureBlobFileSystemOptions> configure)
-        {
-            if (builder == null) throw new ArgumentNullException(nameof(builder));
-            if (name == null) throw new ArgumentNullException(nameof(name));
-            if (string.IsNullOrWhiteSpace(path)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(path));
-            if (configure == null) throw new ArgumentNullException(nameof(configure));
-
-            AddAzureBlobFileSystem(builder, name, path);
-
-            builder.Services
-                .AddOptions<AzureBlobFileSystemOptions>(name)
-                .Configure(configure);
-
-            return builder;
-        }
+        public static IUmbracoBuilder AddAzureBlobFileSystem(this IUmbracoBuilder builder, string name, Action<AzureBlobFileSystemOptions> configure)
+            => builder.AddInternal(name, optionsBuilder => optionsBuilder.Configure(configure));
 
         /// <summary>
         /// Registers a <see cref="IAzureBlobFileSystem" /> in the <see cref="IServiceCollection" />, with it's configuration
         /// loaded from <c>Umbraco:Storage:AzureBlob:{name}</c> where {name} is the value of the <paramref name="name" /> parameter.
         /// </summary>
         /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
         /// <param name="name">The name of the file system.</param>
-        /// <param name="path">The path to map the filesystem to.</param>
         /// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
         /// <returns>
         /// The <see cref="IUmbracoBuilder" />.
         /// </returns>
-        /// <exception cref="System.ArgumentNullException">builder
-        /// or
-        /// name
-        /// or
-        /// configure</exception>
-        /// <exception cref="System.ArgumentException">Value cannot be null or whitespace. - path</exception>
-        public static IUmbracoBuilder AddAzureBlobFileSystem(this IUmbracoBuilder builder, string name, string path, Action<AzureBlobFileSystemOptions, IServiceProvider> configure)
-        {
-            if (builder == null) throw new ArgumentNullException(nameof(builder));
-            if (name == null) throw new ArgumentNullException(nameof(name));
-            if (string.IsNullOrWhiteSpace(path)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(path));
-            if (configure == null) throw new ArgumentNullException(nameof(configure));
-
-            AddAzureBlobFileSystem(builder, name, path);
-
-            builder.Services
-                .AddOptions<AzureBlobFileSystemOptions>(name)
-                .Configure(configure);
+        public static IUmbracoBuilder AddAzureBlobFileSystem(this IUmbracoBuilder builder, string name, Action<AzureBlobFileSystemOptions, IServiceProvider> configure)
+            => builder.AddInternal(name, optionsBuilder => optionsBuilder.Configure(configure));
 
-            return builder;
-        }
+        /// <summary>
+        /// Registers a <see cref="IAzureBlobFileSystem" /> in the <see cref="IServiceCollection" />, with it's configuration
+        /// loaded from <c>Umbraco:Storage:AzureBlob:{name}</c> where {name} is the value of the <paramref name="name" /> parameter.
+        /// </summary>
+        /// <typeparam name="TDep">A dependency used by the configure action.</typeparam>
+        /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
+        /// <param name="name">The name of the file system.</param>
+        /// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
+        /// <returns>
+        /// The <see cref="IUmbracoBuilder" />.
+        /// </returns>
+        public static IUmbracoBuilder AddAzureBlobFileSystem<TDep>(this IUmbracoBuilder builder, string name, Action<AzureBlobFileSystemOptions, TDep> configure)
+            where TDep : class
+            => builder.AddInternal(name, optionsBuilder => optionsBuilder.Configure(configure));
     }
 }
diff --git a/src/Umbraco.StorageProviders.AzureBlob/DependencyInjection/AzureBlobMediaFileSystemExtensions.cs b/src/Umbraco.StorageProviders.AzureBlob/DependencyInjection/AzureBlobMediaFileSystemExtensions.cs
@@ -2,7 +2,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Caching;
-using SixLabors.ImageSharp.Web.Providers;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Infrastructure.DependencyInjection;
 using Umbraco.Extensions;
@@ -18,136 +17,74 @@ namespace Umbraco.Cms.Core.DependencyInjection
     /// </summary>
     public static class AzureBlobMediaFileSystemExtensions
     {
-        /// <summary>
-        /// Registers an <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
-        /// </summary>
-        /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
-        /// <returns>
-        /// The <see cref="IUmbracoBuilder" />.
-        /// </returns>
-        /// <remarks>
-        /// This will also configure the ImageSharp.Web middleware to use Azure Blob Storage to retrieve the original and cache the processed images.
-        /// </remarks>
-        /// <exception cref="System.ArgumentNullException">builder</exception>
-        public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder builder)
-            => builder.AddAzureBlobMediaFileSystem(true);
-
-        /// <summary>
-        /// Registers an <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
-        /// </summary>
-        /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
-        /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
-        /// <returns>
-        /// The <see cref="IUmbracoBuilder" />.
-        /// </returns>
-        /// <exception cref="System.ArgumentNullException">builder</exception>
-        public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder builder, bool useAzureBlobImageCache)
+        internal static IUmbracoBuilder AddInternal(this IUmbracoBuilder builder, bool useAzureBlobImageCache, Action<OptionsBuilder<AzureBlobFileSystemOptions>>? configure = null)
         {
-            if (builder == null) throw new ArgumentNullException(nameof(builder));
+            ArgumentNullException.ThrowIfNull(builder);
 
-            builder.AddAzureBlobFileSystem(AzureBlobFileSystemOptions.MediaFileSystemName, "~/media",
-                (options, provider) =>
-                {
-                    var globalSettingsOptions = provider.GetRequiredService<IOptions<GlobalSettings>>();
-                    options.VirtualPath = globalSettingsOptions.Value.UmbracoMediaPath;
-                });
+            builder.AddInternal(AzureBlobFileSystemOptions.MediaFileSystemName, optionsBuilder =>
+            {
+                optionsBuilder.Configure<IOptions<GlobalSettings>>((options, globalSettings) => options.VirtualPath = globalSettings.Value.UmbracoMediaPath);
+                configure?.Invoke(optionsBuilder);
+            });
 
             // ImageSharp image cache
             if (useAzureBlobImageCache)
             {
                 builder.Services.AddUnique<IImageCache, AzureBlobFileSystemImageCache>();
             }
 
-            builder.SetMediaFileSystem(provider => provider.GetRequiredService<IAzureBlobFileSystemProvider>()
-                .GetFileSystem(AzureBlobFileSystemOptions.MediaFileSystemName));
+            builder.SetMediaFileSystem(provider => provider.GetRequiredService<IAzureBlobFileSystemProvider>().GetFileSystem(AzureBlobFileSystemOptions.MediaFileSystemName));
 
             return builder;
         }
 
         /// <summary>
-        /// Registers a <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
+        /// Registers an <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
         /// </summary>
         /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
-        /// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
+        /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
         /// <returns>
         /// The <see cref="IUmbracoBuilder" />.
         /// </returns>
-        /// <remarks>
-        /// This will also configure the ImageSharp.Web middleware to use Azure Blob Storage to retrieve the original and cache the processed images.
-        /// </remarks>
-        /// <exception cref="System.ArgumentNullException">builder
-        /// or
-        /// configure</exception>
-        public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder builder, Action<AzureBlobFileSystemOptions> configure)
-            => builder.AddAzureBlobMediaFileSystem(true, configure);
+        public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder builder, bool useAzureBlobImageCache = true)
+            => builder.AddInternal(useAzureBlobImageCache);
 
         /// <summary>
         /// Registers a <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
         /// </summary>
         /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
-        /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
         /// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
+        /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
         /// <returns>
         /// The <see cref="IUmbracoBuilder" />.
         /// </returns>
-        /// <exception cref="System.ArgumentNullException">builder
-        /// or
-        /// configure</exception>
-        public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder builder, bool useAzureBlobImageCache, Action<AzureBlobFileSystemOptions> configure)
-        {
-            if (builder == null) throw new ArgumentNullException(nameof(builder));
-            if (configure == null) throw new ArgumentNullException(nameof(configure));
-
-            AddAzureBlobMediaFileSystem(builder, useAzureBlobImageCache);
-
-            builder.Services
-                .AddOptions<AzureBlobFileSystemOptions>(AzureBlobFileSystemOptions.MediaFileSystemName)
-                .Configure(configure);
-
-            return builder;
-        }
+        public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder builder, Action<AzureBlobFileSystemOptions> configure, bool useAzureBlobImageCache = true)
+            => builder.AddInternal(useAzureBlobImageCache, x => x.Configure(configure));
 
         /// <summary>
         /// Registers a <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
         /// </summary>
         /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
         /// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
+        /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
         /// <returns>
         /// The <see cref="IUmbracoBuilder" />.
         /// </returns>
-        /// <remarks>
-        /// This will also configure the ImageSharp.Web middleware to use Azure Blob Storage to retrieve the original and cache the processed images.
-        /// </remarks>
-        /// <exception cref="System.ArgumentNullException">builder
-        /// or
-        /// configure</exception>
-        public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder builder, Action<AzureBlobFileSystemOptions, IServiceProvider> configure)
-            => builder.AddAzureBlobMediaFileSystem(true, configure);
+        public static IUmbracoBuilder AddAzureBlobFileSystem(this IUmbracoBuilder builder, Action<AzureBlobFileSystemOptions, IServiceProvider> configure, bool useAzureBlobImageCache = true)
+            => builder.AddInternal(useAzureBlobImageCache, x => x.Configure(configure));
 
         /// <summary>
         /// Registers a <see cref="IAzureBlobFileSystem" /> and it's dependencies configured for media.
         /// </summary>
+        /// <typeparam name="TDep">A dependency used by the configure action.</typeparam>
         /// <param name="builder">The <see cref="IUmbracoBuilder" />.</param>
-        /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
         /// <param name="configure">An action used to configure the <see cref="AzureBlobFileSystemOptions" />.</param>
+        /// <param name="useAzureBlobImageCache">If set to <c>true</c> also configures Azure Blob Storage for the image cache.</param>
         /// <returns>
         /// The <see cref="IUmbracoBuilder" />.
         /// </returns>
-        /// <exception cref="System.ArgumentNullException">builder
-        /// or
-        /// configure</exception>
-        public static IUmbracoBuilder AddAzureBlobMediaFileSystem(this IUmbracoBuilder builder, bool useAzureBlobImageCache, Action<AzureBlobFileSystemOptions, IServiceProvider> configure)
-        {
-            if (builder == null) throw new ArgumentNullException(nameof(builder));
-            if (configure == null) throw new ArgumentNullException(nameof(configure));
-
-            AddAzureBlobMediaFileSystem(builder, useAzureBlobImageCache);
-
-            builder.Services
-                .AddOptions<AzureBlobFileSystemOptions>(AzureBlobFileSystemOptions.MediaFileSystemName)
-                .Configure(configure);
-
-            return builder;
-        }
+        public static IUmbracoBuilder AddAzureBlobFileSystem<TDep>(this IUmbracoBuilder builder, Action<AzureBlobFileSystemOptions, TDep> configure, bool useAzureBlobImageCache = true)
+            where TDep : class
+            => builder.AddInternal(useAzureBlobImageCache, x => x.Configure(configure));
     }
 }
diff --git a/src/Umbraco.StorageProviders/DependencyInjection/CdnMediaUrlProviderExtensions.cs b/src/Umbraco.StorageProviders/DependencyInjection/CdnMediaUrlProviderExtensions.cs
