Merge pull request #307 from stefannikolei/stefannikolei/nullable/remove_nullable-disable

Remove nullabel disable

Author: JimBobSquarePants

src/ImageSharp.Web/AsyncHelper.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 

src/ImageSharp.Web/Caching/HexEncoder.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

src/ImageSharp.Web/Caching/ICacheHash.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Caching;
 

src/ImageSharp.Web/Caching/ICacheKey.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using Microsoft.AspNetCore.Http;
 using SixLabors.ImageSharp.Web.Commands;

src/ImageSharp.Web/Caching/IImageCache.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using SixLabors.ImageSharp.Web.Resolvers;
 
@@ -17,7 +16,7 @@ public interface IImageCache
     /// </summary>
     /// <param name="key">The cache key.</param>
     /// <returns>The <see cref="IImageResolver"/>.</returns>
-    Task<IImageCacheResolver> GetAsync(string key);
+    Task<IImageCacheResolver?> GetAsync(string key);
 
     /// <summary>
     /// Sets the value associated with the specified key.

src/ImageSharp.Web/Caching/LegacyV1CacheKey.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Globalization;
 using System.Text;

src/ImageSharp.Web/Caching/LruCache/ConcurrentTLruCache{TKey,TValue}.cs

@@ -1,8 +1,8 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
 namespace SixLabors.ImageSharp.Web.Caching;
@@ -26,6 +26,7 @@ namespace SixLabors.ImageSharp.Web.Caching;
 /// 6. When cold is full, cold tail is moved to warm head or removed from dictionary on depending on WasAccessed.
 /// </remarks>
 internal class ConcurrentTLruCache<TKey, TValue>
+    where TKey : notnull
 {
     private readonly ConcurrentDictionary<TKey, LongTickCountLruItem<TKey, TValue>> dictionary;
 
@@ -97,9 +98,9 @@ public ConcurrentTLruCache(int concurrencyLevel, int capacity, IEqualityComparer
     /// <param name="key">The key of the value to get.</param>
     /// <param name="value">When this method returns, contains the object from the cache that has the specified key, or the default value of the type if the operation failed.</param>
     /// <returns><see langword="true"/> if the key was found in the cache; otherwise, <see langword="false"/>.</returns>
-    public bool TryGet(TKey key, out TValue value)
+    public bool TryGet(TKey key, [NotNullWhen(true)] out TValue? value)
     {
-        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue> item))
+        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue>? item))
         {
             return this.GetOrDiscard(item, out value);
         }
@@ -111,7 +112,7 @@ public bool TryGet(TKey key, out TValue value)
     // AggressiveInlining forces the JIT to inline policy.ShouldDiscard(). For LRU policy
     // the first branch is completely eliminated due to JIT time constant propogation.
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private bool GetOrDiscard(LongTickCountLruItem<TKey, TValue> item, out TValue value)
+    private bool GetOrDiscard(LongTickCountLruItem<TKey, TValue> item, out TValue? value)
     {
         if (this.policy.ShouldDiscard(item))
         {
@@ -135,7 +136,7 @@ private bool GetOrDiscard(LongTickCountLruItem<TKey, TValue> item, out TValue va
     /// in the cache, or the new value if the key was not in the dictionary.</returns>
     public TValue GetOrAdd(TKey key, Func<TKey, TValue> valueFactory)
     {
-        if (this.TryGet(key, out TValue value))
+        if (this.TryGet(key, out TValue? value))
         {
             return value;
         }
@@ -164,7 +165,7 @@ public TValue GetOrAdd(TKey key, Func<TKey, TValue> valueFactory)
     /// <returns>A task that represents the asynchronous <see cref="GetOrAdd(TKey, Func{TKey, TValue})"/> operation.</returns>
     public async Task<TValue> GetOrAddAsync(TKey key, Func<TKey, Task<TValue>> valueFactory)
     {
-        if (this.TryGet(key, out TValue value))
+        if (this.TryGet(key, out TValue? value))
         {
             return value;
         }
@@ -202,7 +203,7 @@ public bool TryRemove(TKey key)
         // and it will not be marked as removed. If key 1 is fetched while LruItem1* is still in the queue, there will
         // be two queue entries for key 1, and neither is marked as removed. Thus when LruItem1 * ages out, it will
         // incorrectly remove 1 from the dictionary, and this cycle can repeat.
-        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue> existing))
+        if (this.dictionary.TryGetValue(key, out LongTickCountLruItem<TKey, TValue>? existing))
         {
             if (existing.WasRemoved)
             {
@@ -219,7 +220,7 @@ public bool TryRemove(TKey key)
                 existing.WasRemoved = true;
             }
 
-            if (this.dictionary.TryRemove(key, out LongTickCountLruItem<TKey, TValue> removedItem))
+            if (this.dictionary.TryRemove(key, out LongTickCountLruItem<TKey, TValue>? removedItem))
             {
                 // Mark as not accessed, it will later be cycled out of the queues because it can never be fetched
                 // from the dictionary. Note: Hot/Warm/Cold count will reflect the removed item until it is cycled
@@ -261,7 +262,7 @@ private void CycleHot()
         {
             Interlocked.Decrement(ref this.hotCount);
 
-            if (this.hotQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+            if (this.hotQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue>? item))
             {
                 ItemDestination where = this.policy.RouteHot(item);
                 this.Move(item, where);
@@ -279,7 +280,7 @@ private void CycleWarm()
         {
             Interlocked.Decrement(ref this.warmCount);
 
-            if (this.warmQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+            if (this.warmQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue>? item))
             {
                 ItemDestination where = this.policy.RouteWarm(item);
 
@@ -308,7 +309,7 @@ private void CycleCold()
         {
             Interlocked.Decrement(ref this.coldCount);
 
-            if (this.coldQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue> item))
+            if (this.coldQueue.TryDequeue(out LongTickCountLruItem<TKey, TValue>? item))
             {
                 ItemDestination where = this.policy.RouteCold(item);
 
@@ -354,7 +355,7 @@ private void Move(LongTickCountLruItem<TKey, TValue> item, ItemDestination where
                             break;
                         }
 
-                        if (this.dictionary.TryRemove(item.Key, out LongTickCountLruItem<TKey, TValue> removedItem))
+                        if (this.dictionary.TryRemove(item.Key, out LongTickCountLruItem<TKey, TValue>? removedItem))
                         {
                             item.WasRemoved = true;
                             if (removedItem.Value is IDisposable d)

src/ImageSharp.Web/Caching/LruCache/LongTickCountLruItem{TKey,TValue}.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 namespace SixLabors.ImageSharp.Web.Caching;
 

src/ImageSharp.Web/Caching/LruCache/TLruLongTicksPolicy{TKey,TValue}.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Diagnostics;
 using System.Runtime.CompilerServices;

src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
-#nullable disable
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -77,17 +76,17 @@ internal static string GetCacheRoot(PhysicalFileSystemCacheOptions cacheOptions,
     }
 
     /// <inheritdoc/>
-    public Task<IImageCacheResolver> GetAsync(string key)
+    public Task<IImageCacheResolver?> GetAsync(string key)
     {
         string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
 
         FileInfo metaFileInfo = new(ToMetaDataFilePath(path));
         if (!metaFileInfo.Exists)
         {
-            return Task.FromResult<IImageCacheResolver>(null);
+            return Task.FromResult<IImageCacheResolver?>(null);
         }
 
-        return Task.FromResult<IImageCacheResolver>(new PhysicalFileSystemCacheResolver(metaFileInfo, this.formatUtilities));
+        return Task.FromResult<IImageCacheResolver?>(new PhysicalFileSystemCacheResolver(metaFileInfo, this.formatUtilities));
     }
 
     /// <inheritdoc/>
@@ -96,10 +95,10 @@ public async Task SetAsync(string key, Stream stream, ImageCacheMetadata metadat
         string path = Path.Combine(this.cacheRootPath, ToFilePath(key, this.cacheFolderDepth));
         string imagePath = this.ToImageFilePath(path, metadata);
         string metaPath = ToMetaDataFilePath(path);
-        string directory = Path.GetDirectoryName(path);
+        string? directory = Path.GetDirectoryName(path);
 
         // Ensure cache directory is created before creating files
-        if (!Directory.Exists(directory))
+        if (!Directory.Exists(directory) && directory is not null)
         {
             Directory.CreateDirectory(directory);
         }