fix: 修复缓存拓展类泛型为集合类的bug

MarsonShine · Sep 10, 2024 · f5a779a · f5a779a
1 parent 43eebd6
commit f5a779a
Showing 1 changed file with 80 additions and 52 deletions.
diff --git a/src/MS.Microservice.Core/Ceching/Extensions/Distributed/IDestributedCacheExtensions.cs b/src/MS.Microservice.Core/Ceching/Extensions/Distributed/IDestributedCacheExtensions.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Text.Encodings.Web;
 using System.Text.Json;
@@ -8,56 +10,82 @@
 
 namespace Microsoft.Extensions.Caching.Distributed
 {
-    public static class IDestributedCacheExtensions
-    {
-        public static async Task<TCache?> GetAsync<TCache>(this IDistributedCache cache, string key, CancellationToken cancellationToken = default)
-        {
-            var bytes = await cache.GetAsync(key, cancellationToken);
-            if (bytes == null) return default;
-
-            return await JsonSerializer.DeserializeAsync<TCache>(new MemoryStream(bytes), new JsonSerializerOptions
-            {
-                PropertyNameCaseInsensitive = false,
-                Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
-            }, cancellationToken: cancellationToken);
-        }
-
-        public static async Task<TCache> GetAsync<TCache>(this IDistributedCache cache, string key, Func<Task<TCache>> getFromDatabaseAsyncCallback, CancellationToken cancellationToken = default)
-        {
-            if (getFromDatabaseAsyncCallback == null)
-            {
-                throw new ArgumentNullException(nameof(getFromDatabaseAsyncCallback));
-            }
-
-            var obj = await cache.GetAsync<TCache>(key, cancellationToken);
-            if (obj == null)
-            {
-                var cacheItem = await getFromDatabaseAsyncCallback();
-                if (cacheItem != null)
-                {
-                    await SetAsync(cache, key, cacheItem, null, null, cancellationToken);
-                }
-                return cacheItem;
-            }
-            return obj;
-        }
-
-        public static async Task SetAsync(this IDistributedCache cache, string key, object obj, TimeSpan? absoluteExpiration, TimeSpan? slidingExpiration, CancellationToken cancellationToken = default)
-        {
-            if (obj == null)
-            {
-                throw new ArgumentNullException(nameof(obj));
-            }
-            var bytes = JsonSerializer.SerializeToUtf8Bytes(obj,
-                new JsonSerializerOptions
-                {
-                    PropertyNameCaseInsensitive = false,
-                    Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
-                });
-            await cache.SetAsync(key
-                , bytes
-                , new DistributedCacheEntryOptions { AbsoluteExpirationRelativeToNow = absoluteExpiration, SlidingExpiration = slidingExpiration }
-                , cancellationToken);
-        }
-    }
+	public static class IDestributedCacheExtensions
+	{
+		public static async Task<(bool Success, T? Value)> TryGetValueAsync<T>(this IDistributedCache cache, string key, [NotNull] Func<Task<T?>> getAsync, DistributedCacheEntryOptions? cacheEntryOptions = null, CancellationToken cancellationToken = default)
+		{
+			ArgumentNullException.ThrowIfNull(getAsync);
+
+			var item = await cache.GetAsync<T>(key, cancellationToken);
+			if (IsNullOrEmpty(item))
+			{
+				item = await getAsync();
+				if (IsNullOrEmpty(item)) return (false, default);
+				await cache.SetAsync(key, item, cacheEntryOptions?.AbsoluteExpirationRelativeToNow, cacheEntryOptions?.SlidingExpiration, cancellationToken);
+			}
+			return (true, item);
+		}
+
+		public static async Task<TCache?> GetAsync<TCache>(this IDistributedCache cache, string key, CancellationToken cancellationToken = default)
+		{
+			var bytes = await cache.GetAsync(key, cancellationToken);
+			if (bytes == null) return default;
+
+			return await JsonSerializer.DeserializeAsync<TCache>(new MemoryStream(bytes), new JsonSerializerOptions
+			{
+				PropertyNameCaseInsensitive = false,
+				Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+			}, cancellationToken: cancellationToken);
+		}
+
+		public static async Task<TCache> GetAsync<TCache>(this IDistributedCache cache, string key, Func<Task<TCache>> getFromDatabaseAsyncCallback, DistributedCacheEntryOptions? cacheEntryOptions = null, CancellationToken cancellationToken = default)
+		{
+			ArgumentNullException.ThrowIfNull(getFromDatabaseAsyncCallback);
+
+			var obj = await cache.GetAsync<TCache>(key, cancellationToken);
+			if (IsNullOrEmpty(obj))
+			{
+				var cacheItem = await getFromDatabaseAsyncCallback();
+				if (!IsNullOrEmpty(cacheItem))
+				{
+					await SetAsync(cache, key, cacheItem, cacheEntryOptions?.AbsoluteExpirationRelativeToNow, cacheEntryOptions?.SlidingExpiration, cancellationToken);
+				}
+				return cacheItem;
+			}
+			return obj;
+		}
+
+		private static bool IsNullOrEmpty<T>([NotNullWhen(false)] T obj)
+		{
+			if (obj == null)
+			{
+				return true;
+			}
+			if (obj is string s)
+			{
+				return string.IsNullOrEmpty(s);
+			}
+			if (obj is IEnumerable enumerable)
+			{
+				return !enumerable.GetEnumerator().MoveNext();
+			}
+			return false;
+		}
+
+		public static async Task SetAsync(this IDistributedCache cache, string key, object obj, TimeSpan? absoluteExpiration, TimeSpan? slidingExpiration, CancellationToken cancellationToken = default)
+		{
+			ArgumentNullException.ThrowIfNull(obj);
+
+			var bytes = JsonSerializer.SerializeToUtf8Bytes(obj,
+				new JsonSerializerOptions
+				{
+					PropertyNameCaseInsensitive = false,
+					Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+				});
+			await cache.SetAsync(key
+				, bytes
+				, new DistributedCacheEntryOptions { AbsoluteExpirationRelativeToNow = absoluteExpiration, SlidingExpiration = slidingExpiration }
+				, cancellationToken);
+		}
+	}
 }