Simplify FormatUtilities injection

Author: JimBobSquarePants

src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs

@@ -281,21 +281,5 @@ public static IImageSharpBuilder Configure<TOptions>(this IImageSharpBuilder bui
             builder.Services.Configure(configureOptions);
             return builder;
         }
-
-        /// <summary>
-        /// Sets the <see cref="FormatUtilities"/> configured by <see cref="ImageSharpMiddlewareOptions.Configuration"/>.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        internal static IImageSharpBuilder SetFormatUtilitesFromMiddlewareOptions(this IImageSharpBuilder builder)
-        {
-            static FormatUtilities FormatUtilitiesFactory(IServiceProvider s)
-            {
-                return new FormatUtilities(s.GetRequiredService<IOptions<ImageSharpMiddlewareOptions>>().Value.Configuration);
-            }
-
-            builder.Services.AddSingleton(FormatUtilitiesFactory);
-            return builder;
-        }
     }
 }

src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs

@@ -54,7 +54,7 @@ private static void AddDefaultServices(
         {
             builder.Services.Configure(setupAction);
 
-            builder.SetFormatUtilitesFromMiddlewareOptions();
+            builder.Services.AddSingleton<FormatUtilities>();
 
             builder.SetRequestParser<QueryCollectionRequestParser>();
 

src/ImageSharp.Web/FormatUtilities.cs

@@ -5,8 +5,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Web.Middleware;
 using SixLabors.ImageSharp.Web.Processors;
 
 namespace SixLabors.ImageSharp.Web
@@ -23,12 +25,14 @@ public sealed class FormatUtilities
         /// <summary>
         /// Initializes a new instance of the <see cref="FormatUtilities"/> class.
         /// </summary>
-        /// <param name="configuration">The configuration.</param>
-        public FormatUtilities(Configuration configuration)
+        /// <param name="options">The middleware options.</param>
+        public FormatUtilities(IOptions<ImageSharpMiddlewareOptions> options)
         {
+            Guard.NotNull(options, nameof(options));
+
             // The formats contained in the configuration are used a lot in hash generation
             // so we need them to be enumerated to remove allocations and allow indexing.
-            this.imageFormats = configuration.ImageFormats.ToArray();
+            this.imageFormats = options.Value.Configuration.ImageFormats.ToArray();
             for (int i = 0; i < this.imageFormats.Length; i++)
             {
                 string[] extensions = this.imageFormats[i].FileExtensions.ToArray();

tests/ImageSharp.Web.Tests/Helpers/FormatUtilitiesTests.cs

@@ -3,6 +3,8 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp.Web.Middleware;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Web.Tests.Helpers
@@ -12,7 +14,7 @@ public class FormatUtilitiesTests
         public static IEnumerable<object[]> DefaultExtensions =
             Configuration.Default.ImageFormats.SelectMany(f => f.FileExtensions.Select(e => new object[] { e, e }));
 
-        private static readonly FormatUtilities FormatUtilities = new FormatUtilities(Configuration.Default);
+        private static readonly FormatUtilities FormatUtilities = new FormatUtilities(Options.Create(new ImageSharpMiddlewareOptions()));
 
         [Theory]
         [MemberData(nameof(DefaultExtensions))]