Code cleanup (seal classes, parameter null checking, expression bodies)

Author: ronaldbarendse

src/Umbraco.StorageProviders.AzureBlob/AzureBlobDirectoryContents.cs

@@ -12,10 +12,10 @@ namespace Umbraco.StorageProviders.AzureBlob
     /// Represents a virtual hierarchy of Azure Blob Storage blobs.
     /// </summary>
     /// <seealso cref="Microsoft.Extensions.FileProviders.IDirectoryContents" />
-    public class AzureBlobDirectoryContents : IDirectoryContents
+    public sealed class AzureBlobDirectoryContents : IDirectoryContents
     {
         private readonly BlobContainerClient _containerClient;
-        private readonly IList<BlobHierarchyItem> _items;
+        private readonly IReadOnlyCollection<BlobHierarchyItem> _items;
 
         /// <inheritdoc />
         public bool Exists { get; }
@@ -28,12 +28,12 @@ public class AzureBlobDirectoryContents : IDirectoryContents
         /// <exception cref="System.ArgumentNullException">containerClient
         /// or
         /// items</exception>
-        public AzureBlobDirectoryContents(BlobContainerClient containerClient, IList<BlobHierarchyItem> items)
+        public AzureBlobDirectoryContents(BlobContainerClient containerClient, IReadOnlyCollection<BlobHierarchyItem> items)
         {
             _containerClient = containerClient ?? throw new ArgumentNullException(nameof(containerClient));
             _items = items ?? throw new ArgumentNullException(nameof(items));
 
-            Exists = _items.Count > 0;
+            Exists = items.Count > 0;
         }
 
         /// <inheritdoc />

src/Umbraco.StorageProviders.AzureBlob/AzureBlobFileProvider.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections.Generic;
+using System.Linq;
 using System.Net;
 using Azure;
 using Azure.Storage.Blobs;
@@ -16,7 +16,7 @@ namespace Umbraco.StorageProviders.AzureBlob
     /// Represents a read-only Azure Blob Storage file provider.
     /// </summary>
     /// <seealso cref="Microsoft.Extensions.FileProviders.IFileProvider" />
-    public class AzureBlobFileProvider : IFileProvider
+    public sealed class AzureBlobFileProvider : IFileProvider
     {
         private readonly BlobContainerClient _containerClient;
         private readonly string? _containerRootPath;
@@ -40,10 +40,7 @@ public AzureBlobFileProvider(BlobContainerClient containerClient, string? contai
         /// <exception cref="System.ArgumentNullException">options</exception>
         public AzureBlobFileProvider(AzureBlobFileSystemOptions options)
         {
-            if (options is null)
-            {
-                throw new ArgumentNullException(nameof(options));
-            }
+            ArgumentNullException.ThrowIfNull(options);
 
             _containerClient = new BlobContainerClient(options.ConnectionString, options.ContainerName);
             _containerRootPath = options.ContainerRootPath?.Trim(Constants.CharArrays.ForwardSlash);
@@ -55,18 +52,11 @@ public IDirectoryContents GetDirectoryContents(string subpath)
             var path = GetFullPath(subpath);
 
             // Get all blobs and iterate to fetch all pages
-            var blobs = new List<BlobHierarchyItem>();
-            foreach (var item in _containerClient.GetBlobsByHierarchy(delimiter: "/", prefix: path))
-            {
-                blobs.Add(item);
-            }
-
-            if (blobs.Count == 0)
-            {
-                return NotFoundDirectoryContents.Singleton;
-            }
+            var blobs = _containerClient.GetBlobsByHierarchy(delimiter: "/", prefix: path).ToList();
 
-            return new AzureBlobDirectoryContents(_containerClient, blobs);
+            return blobs.Count == 0
+                ? NotFoundDirectoryContents.Singleton
+                : new AzureBlobDirectoryContents(_containerClient, blobs);
         }
 
         /// <inheritdoc />

src/Umbraco.StorageProviders.AzureBlob/AzureBlobItemInfo.cs

@@ -10,7 +10,7 @@ namespace Umbraco.StorageProviders.AzureBlob
     /// Represents an Azure Blob Storage blob item.
     /// </summary>
     /// <seealso cref="Microsoft.Extensions.FileProviders.IFileInfo" />
-    public class AzureBlobItemInfo : IFileInfo
+    public sealed class AzureBlobItemInfo : IFileInfo
     {
         private readonly BlobClient _blobClient;
 
@@ -37,7 +37,7 @@ public class AzureBlobItemInfo : IFileInfo
         /// </summary>
         /// <param name="blobClient">The blob client.</param>
         /// <exception cref="System.ArgumentNullException">blobClient</exception>
-        protected AzureBlobItemInfo(BlobClient blobClient)
+        private AzureBlobItemInfo(BlobClient blobClient)
         {
             _blobClient = blobClient ?? throw new ArgumentNullException(nameof(blobClient));
 
@@ -53,10 +53,7 @@ protected AzureBlobItemInfo(BlobClient blobClient)
         public AzureBlobItemInfo(BlobClient blobClient, BlobProperties properties)
             : this(blobClient)
         {
-            if (properties == null)
-            {
-                throw new ArgumentNullException(nameof(properties));
-            }
+            ArgumentNullException.ThrowIfNull(properties);
 
             LastModified = properties.LastModified;
             Length = properties.ContentLength;
@@ -71,10 +68,7 @@ public AzureBlobItemInfo(BlobClient blobClient, BlobProperties properties)
         public AzureBlobItemInfo(BlobClient blobClient, BlobItemProperties properties)
             : this(blobClient)
         {
-            if (properties == null)
-            {
-                throw new ArgumentNullException(nameof(properties));
-            }
+            ArgumentNullException.ThrowIfNull(properties);
 
             LastModified = properties.LastModified.GetValueOrDefault();
             Length = properties.ContentLength.GetValueOrDefault(-1);

src/Umbraco.StorageProviders.AzureBlob/AzureBlobPrefixInfo.cs

@@ -8,7 +8,7 @@ namespace Umbraco.StorageProviders.AzureBlob
     /// Represents an Azure Blob Storage prefix.
     /// </summary>
     /// <seealso cref="Microsoft.Extensions.FileProviders.IFileInfo" />
-    public class AzureBlobPrefixInfo : IFileInfo
+    public sealed class AzureBlobPrefixInfo : IFileInfo
     {
         /// <inheritdoc />
         public bool Exists => true;
@@ -34,10 +34,7 @@ public class AzureBlobPrefixInfo : IFileInfo
         /// <param name="prefix">The prefix.</param>
         public AzureBlobPrefixInfo(string prefix)
         {
-            if (prefix == null)
-            {
-                throw new ArgumentNullException(nameof(prefix));
-            }
+            ArgumentNullException.ThrowIfNull(prefix);
 
             Name = ParseName(prefix);
         }