Remove weird memoryallocator injection

Author: JimBobSquarePants

src/ImageSharp.Web/Caching/CacheHash.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Text;
@@ -18,19 +19,14 @@ namespace SixLabors.ImageSharp.Web.Caching
     /// </summary>
     public sealed class CacheHash : ICacheHash
     {
-        private readonly MemoryAllocator memoryAllocator;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="CacheHash"/> class.
         /// </summary>
         /// <param name="options">The middleware configuration options.</param>
-        /// <param name="memoryAllocator">The memory allocator.</param>
-        public CacheHash(IOptions<ImageSharpMiddlewareOptions> options, MemoryAllocator memoryAllocator)
+        public CacheHash(IOptions<ImageSharpMiddlewareOptions> options)
         {
             Guard.NotNull(options, nameof(options));
             Guard.MustBeBetweenOrEqualTo<uint>(options.Value.CachedNameLength, 2, 64, nameof(options.Value.CachedNameLength));
-
-            this.memoryAllocator = memoryAllocator;
         }
 
         /// <inheritdoc/>
@@ -46,8 +42,19 @@ public string Create(string value, uint length)
                 return HashValue(value, length, stackalloc byte[byteCount]);
             }
 
-            using IManagedByteBuffer buffer = this.memoryAllocator.AllocateManagedByteBuffer(byteCount);
-            return HashValue(value, length, buffer.Memory.Span);
+            byte[] buffer = null;
+            try
+            {
+                buffer = ArrayPool<byte>.Shared.Rent(byteCount);
+                return HashValue(value, length, buffer.AsSpan(0, byteCount));
+            }
+            finally
+            {
+                if (buffer != null)
+                {
+                    ArrayPool<byte>.Shared.Return(buffer);
+                }
+            }
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/ImageSharp.Web/DependencyInjection/ImageSharpBuilderExtensions.cs

@@ -282,22 +282,6 @@ public static IImageSharpBuilder Configure<TOptions>(this IImageSharpBuilder bui
             return builder;
         }
 
-        /// <summary>
-        /// Sets the memory allocator configured in <see cref="Configuration.MemoryAllocator"/> of <see cref="ImageSharpMiddlewareOptions.Configuration"/>.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        internal static IImageSharpBuilder SetMemoryAllocatorFromMiddlewareOptions(this IImageSharpBuilder builder)
-        {
-            static MemoryAllocator AllocatorFactory(IServiceProvider s)
-            {
-                return s.GetRequiredService<IOptions<ImageSharpMiddlewareOptions>>().Value.Configuration.MemoryAllocator;
-            }
-
-            builder.SetMemoryAllocator(AllocatorFactory);
-            return builder;
-        }
-
         /// <summary>
         /// Sets the <see cref="FormatUtilities"/> configured by <see cref="ImageSharpMiddlewareOptions.Configuration"/>.
         /// </summary>

src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs

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

tests/ImageSharp.Web.Benchmarks/Caching/CacheHashBenchmarks.cs

@@ -13,7 +13,7 @@ public class CacheHashBenchmarks
     {
         private const string URL = "http://testwebsite.com/image-12345.jpeg?width=400";
         private static readonly IOptions<ImageSharpMiddlewareOptions> MWOptions = Options.Create(new ImageSharpMiddlewareOptions());
-        private static readonly CacheHash Sha256Hasher = new CacheHash(MWOptions, MWOptions.Value.Configuration.MemoryAllocator);
+        private static readonly CacheHash Sha256Hasher = new CacheHash(MWOptions);
         private static readonly CacheHashBaseline NaiveSha256Hasher = new CacheHashBaseline();
 
         [Benchmark(Baseline = true, Description = "Baseline Sha256Hasher")]

tests/ImageSharp.Web.Tests/Caching/CacheHashTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Text;
 using Microsoft.Extensions.Options;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Middleware;
@@ -13,7 +14,7 @@ namespace SixLabors.ImageSharp.Web.Tests.Caching
     public class CacheHashTests
     {
         private static readonly IOptions<ImageSharpMiddlewareOptions> Options = MSOptions.Create(new ImageSharpMiddlewareOptions());
-        private static readonly ICacheHash CacheHash = new CacheHash(Options, Options.Value.Configuration.MemoryAllocator);
+        private static readonly ICacheHash CacheHash = new CacheHash(Options);
 
         [Fact]
         public void CachHashProducesIdenticalResults()
@@ -42,11 +43,28 @@ public void CachHashLengthIsIdentical()
             const int Length = 12;
             const string Input = "http://testwebsite.com/image-12345.jpeg?width=400";
             const string Input2 = "http://testwebsite.com/image-12345.jpeg";
+            string input3 = CreateLongString();
+
             int expected = CacheHash.Create(Input, Length).Length;
             int actual = CacheHash.Create(Input2, Length).Length;
+            int actual2 = CacheHash.Create(input3, Length).Length;
 
             Assert.Equal(expected, actual);
             Assert.Equal(Length, actual);
+            Assert.Equal(Length, actual2);
+        }
+
+        private static string CreateLongString()
+        {
+            const int Length = 2048;
+            var sb = new StringBuilder(Length);
+
+            for (int i = 0; i < Length; i++)
+            {
+                sb.Append(i.ToString());
+            }
+
+            return sb.ToString();
         }
     }
 }