ASMO-5264 Fix as review comments

Author: khoanguyen102

src/Samhammer.AzureBlobStorage.Test/IntegrationTest.cs

@@ -38,8 +38,9 @@ public IntegrationTest()
             clientFactory.GetDefaultContainerName().Returns(DefaultContainerName);
             clientFactory.GetClient().Returns(new BlobServiceClient(ConnectionString));
             var options = Substitute.For<IOptions<AzureBlobStorageOptions>>();
+            var streamManagerService = Substitute.For<IStreamManagerService>();
 
-            _service = new AzureBlobStorageService<IAzureBlobStorageClientFactory>(clientFactory, options);
+            _service = new AzureBlobStorageService<IAzureBlobStorageClientFactory>(clientFactory, streamManagerService, options);
 
             _comparisonOptions = o => o
                 .Using<DateTimeOffset>(ctx =>

src/Samhammer.AzureBlobStorage/Options/AzureBlobStorageOptions.cs

@@ -1,11 +1,13 @@
-namespace Samhammer.AzureBlobStorage.Options
+using System;
+
+namespace Samhammer.AzureBlobStorage.Options
 {
     public class AzureBlobStorageOptions
     {
         public string ConnectionString { get; set; }
 
         public string ContainerName { get; set; }
 
-        public int FileUrlExpiresByDays { get; set; } = 1;
+        public TimeSpan? FileUrlExpires { get; set; }
     }
 }

src/Samhammer.AzureBlobStorage/Options/StreamManagerOptions.cs

@@ -0,0 +1,9 @@
+namespace Samhammer.AzureBlobStorage.Options
+{
+    public class StreamManagerOptions
+    {
+        public long? MaxSmallPoolFreeBytes { get; set; }
+
+        public long? MaxLargePoolFreeBytes { get; set; }
+    }
+}

src/Samhammer.AzureBlobStorage/ServiceCollectionExtensions.cs

@@ -12,6 +12,7 @@ public static class ServiceCollectionExtensions
         public static IServiceCollection AddDefaultAzureBlobStorage(this IServiceCollection services, IConfiguration configuration)
         {
             services.Configure<AzureBlobStorageOptions>(configuration.GetSection(nameof(AzureBlobStorageOptions)));
+            services.Configure<StreamManagerOptions>(configuration.GetSection(nameof(StreamManagerOptions)));
 
             RegisterAzureBlobStorage<IDefaultAzureBlobStorageClientFactory, DefaultAzureBlobStorageClientFactory>(services, true);
 
@@ -42,6 +43,7 @@ private static void RegisterAzureBlobStorage<TFactoryInterface, TFactoryImpl>(IS
         {
             services.AddSingleton<TFactoryInterface, TFactoryImpl>();
             services.AddSingleton<IAzureBlobStorageService<TFactoryInterface>, AzureBlobStorageService<TFactoryInterface>>();
+            services.AddSingleton<IStreamManagerService, StreamManagerService>();
 
             if (registerAsDefault)
             {

src/Samhammer.AzureBlobStorage/Services/AzureBlobStorageService.cs

@@ -22,11 +22,14 @@ public class AzureBlobStorageService<T> : IAzureBlobStorageService<T> where T :
 
         private readonly AzureBlobStorageOptions _blobStorageOptions;
 
-        public AzureBlobStorageService(T blobStorageClientFactory, IOptions<AzureBlobStorageOptions> blobStorageOptions)
+        private readonly IStreamManagerService _streamManagerService;
+
+        public AzureBlobStorageService(T blobStorageClientFactory, IStreamManagerService streamManagerService, IOptions<AzureBlobStorageOptions> blobStorageOptions)
         {
             _defaultContainerName = blobStorageClientFactory.GetDefaultContainerName();
             _client = blobStorageClientFactory.GetClient();
             _blobStorageOptions = blobStorageOptions.Value;
+            _streamManagerService = streamManagerService;
         }
 
         public string GetStorageAccountName()
@@ -76,7 +79,7 @@ public async Task<BlobContract> GetBlobContentsAsync(string blobName, string con
             var blobClient = await GetBlobClient(containerClient, blobName);
 
             var properties = (await blobClient.GetPropertiesAsync()).Value;
-            var stream = StreamHelper.StreamManager.GetStream();
+            var stream = _streamManagerService.GetStream();
             await blobClient.DownloadToAsync(stream);
             stream.Position = 0;
 
@@ -117,7 +120,10 @@ private Uri CreateServiceSASBlob(BlobClient blobClient)
                 Resource = "b",
             };
 
-            sasBuilder.ExpiresOn = DateTimeOffset.UtcNow.AddDays(_blobStorageOptions.FileUrlExpiresByDays);
+            sasBuilder.ExpiresOn = _blobStorageOptions.FileUrlExpires.HasValue 
+                ? DateTimeOffset.UtcNow.Add(_blobStorageOptions.FileUrlExpires.Value)
+                : DateTimeOffset.UtcNow.AddDays(1);
+
             sasBuilder.SetPermissions(BlobContainerSasPermissions.Read);
 
             Uri sasURI = blobClient.GenerateSasUri(sasBuilder);

src/Samhammer.AzureBlobStorage/Services/StreamManagerService.cs

@@ -0,0 +1,34 @@
+using System.IO;
+using Microsoft.Extensions.Options;
+using Microsoft.IO;
+using Samhammer.AzureBlobStorage.Options;
+
+namespace Samhammer.AzureBlobStorage.Services
+{
+    public class StreamManagerService : IStreamManagerService
+    {
+        private const long MaxSmallPoolFreeBytes = 1000000;
+
+        private const long MaxLargePoolFreeBytes = 10000000;
+
+        private readonly RecyclableMemoryStreamManager _streamManager;
+
+        public StreamManagerService(IOptions<StreamManagerOptions> streamManagerOptions)
+        {
+            StreamManagerOptions options = streamManagerOptions.Value;
+            _streamManager = new RecyclableMemoryStreamManager(
+                options.MaxSmallPoolFreeBytes.HasValue ? options.MaxSmallPoolFreeBytes.Value : MaxSmallPoolFreeBytes,
+                options.MaxLargePoolFreeBytes.HasValue ? options.MaxLargePoolFreeBytes.Value : MaxLargePoolFreeBytes);
+        }
+
+        public MemoryStream GetStream()
+        {
+            return _streamManager.GetStream();
+        }
+    }
+
+    public interface IStreamManagerService
+    {
+        public MemoryStream GetStream();
+    }
+}