Merge pull request #110 from SixLabors/js/code-quality-2

Simplify middleware workflow.

Author: JimBobSquarePants

src/ImageSharp.Web.Providers.Azure/Providers/AzureBlobStorageImageProvider.cs

@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Options;
-using Microsoft.IO;
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Resolvers.Azure;
 
@@ -35,12 +34,6 @@ private readonly Dictionary<string, BlobContainerClient> containers
         /// </summary>
         private readonly AzureBlobStorageImageProviderOptions storageOptions;
 
-        /// <summary>
-        /// The recyclable memorystream manager used for managing pooled stream
-        /// buffers independently from image buffer pooling.
-        /// </summary>
-        private readonly RecyclableMemoryStreamManager memoryStreamManager;
-
         /// <summary>
         /// Contains various helper methods based on the current configuration.
         /// </summary>
@@ -55,21 +48,14 @@ private readonly Dictionary<string, BlobContainerClient> containers
         /// Initializes a new instance of the <see cref="AzureBlobStorageImageProvider"/> class.
         /// </summary>
         /// <param name="storageOptions">The blob storage options.</param>
-        /// <param name="memoryStreamManager">
-        /// The recyclable memorystream manager used for managing pooled stream
-        /// buffers independently from image buffer pooling.
-        /// </param>
         /// <param name="formatUtilities">Contains various format helper methods based on the current configuration.</param>
         public AzureBlobStorageImageProvider(
             IOptions<AzureBlobStorageImageProviderOptions> storageOptions,
-            RecyclableMemoryStreamManager memoryStreamManager,
             FormatUtilities formatUtilities)
         {
             Guard.NotNull(storageOptions, nameof(storageOptions));
-            Guard.NotNull(memoryStreamManager, nameof(memoryStreamManager));
 
             this.storageOptions = storageOptions.Value;
-            this.memoryStreamManager = memoryStreamManager;
             this.formatUtilities = formatUtilities;
 
             foreach (AzureBlobContainerClientOptions container in this.storageOptions.BlobContainers)
@@ -136,7 +122,7 @@ public async Task<IImageResolver> GetAsync(HttpContext context)
                 return null;
             }
 
-            return new AzureBlobStorageImageResolver(blob, this.memoryStreamManager);
+            return new AzureBlobStorageImageResolver(blob);
         }
 
         /// <inheritdoc/>

src/ImageSharp.Web.Providers.Azure/Resolvers/AzureBlobStorageImageResolver.cs

@@ -1,13 +1,11 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using System;
 using System.IO;
 using System.Threading.Tasks;
 using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
-using Microsoft.IO;
 
 namespace SixLabors.ImageSharp.Web.Resolvers.Azure
 {
@@ -16,42 +14,25 @@ namespace SixLabors.ImageSharp.Web.Resolvers.Azure
     /// </summary>
     public class AzureBlobStorageImageResolver : IImageResolver
     {
-        private readonly RecyclableMemoryStreamManager memoryStreamManager;
         private readonly BlobClient blob;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AzureBlobStorageImageResolver"/> class.
         /// </summary>
         /// <param name="blob">The Azure blob.</param>
-        /// <param name="memoryStreamManager">
-        /// The recyclable memorystream manager used for managing pooled stream
-        /// buffers independently from image buffer pooling.
-        /// </param>
-        public AzureBlobStorageImageResolver(BlobClient blob, RecyclableMemoryStreamManager memoryStreamManager)
-        {
-            this.blob = blob;
-            this.memoryStreamManager = memoryStreamManager;
-        }
+        public AzureBlobStorageImageResolver(BlobClient blob) => this.blob = blob;
 
         /// <inheritdoc/>
         public async Task<ImageMetadata> GetMetaDataAsync()
         {
+            // I've had a good read through the SDK source and I believe we cannot get
+            // a 304 here since 'If-Modified-Since' header is not set by default.
             Response<BlobProperties> properties = await this.blob.GetPropertiesAsync();
-            return new ImageMetadata(properties?.Value.LastModified.DateTime ?? DateTime.UtcNow);
+            return new ImageMetadata(properties.Value.LastModified.DateTime);
         }
 
         /// <inheritdoc/>
         public async Task<Stream> OpenReadAsync()
-        {
-            // Copy to a MemoryStream first because RetriableStreamImpl
-            // doesn't support Position.
-            Stream blobStream = (await this.blob.DownloadAsync()).Value.Content;
-            var memoryStream = new RecyclableMemoryStream(this.memoryStreamManager);
-
-            await blobStream.CopyToAsync(memoryStream);
-            memoryStream.Seek(0, SeekOrigin.Begin);
-
-            return memoryStream;
-        }
+            => (await this.blob.DownloadAsync()).Value.Content;
     }
 }

src/ImageSharp.Web/DependencyInjection/ImageSharpCoreBuilderExtensions.cs

@@ -8,7 +8,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Microsoft.IO;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
@@ -275,35 +274,6 @@ static MemoryAllocator AllocatorFactory(IServiceProvider s)
             return builder;
         }
 
-        /// <summary>
-        /// Sets the <see cref="RecyclableMemoryStream"/> configured in  <see cref="ImageSharpMiddlewareOptions"/>.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        internal static IImageSharpBuilder SetMemoryStreamManagerFromMiddlewareOptions(this IImageSharpBuilder builder)
-        {
-            static RecyclableMemoryStreamManager AllocatorFactory(IServiceProvider s)
-            {
-                return s.GetRequiredService<IOptions<ImageSharpMiddlewareOptions>>().Value.MemoryStreamManager;
-            }
-
-            builder.SetMemoryStreamManager(AllocatorFactory);
-            return builder;
-        }
-
-        /// <summary>
-        /// Sets the given <see cref="RecyclableMemoryStreamManager"/> adding it to the service collection.
-        /// </summary>
-        /// <param name="builder">The core builder.</param>
-        /// <param name="implementationFactory">The factory method for returning a <see cref="RecyclableMemoryStreamManager"/>.</param>
-        /// <returns>The <see cref="IImageSharpBuilder"/>.</returns>
-        private static IImageSharpBuilder SetMemoryStreamManager(this IImageSharpBuilder builder, Func<IServiceProvider, RecyclableMemoryStreamManager> implementationFactory)
-        {
-            var descriptor = new ServiceDescriptor(typeof(RecyclableMemoryStreamManager), implementationFactory, ServiceLifetime.Singleton);
-            builder.Services.Replace(descriptor);
-            return builder;
-        }
-
         /// <summary>
         /// Sets the <see cref="FormatUtilities"/> configured by <see cref="ImageSharpMiddlewareOptions.Configuration"/>.
         /// </summary>

src/ImageSharp.Web/DependencyInjection/ServiceCollectionExtensions.cs

@@ -65,7 +65,6 @@ public static IImageSharpBuilder AddImageSharpCore(this IServiceCollection servi
             builder.Services.Configure(setupAction);
 
             builder.SetMemoryAllocatorFromMiddlewareOptions();
-            builder.SetMemoryStreamManagerFromMiddlewareOptions();
             builder.SetFormatUtilitesFromMiddlewareOptions();
 
             return builder;