diff --git a/samples/ConsoleApp/Program.cs b/samples/ConsoleApp/Program.cs index bc824fb..7fde19e 100644 --- a/samples/ConsoleApp/Program.cs +++ b/samples/ConsoleApp/Program.cs @@ -20,7 +20,7 @@ { for (int i = 1; i <= 5; ++i) { - Console.Write($"Try: {i}: {url} "); + Console.Write($"Attempt: {i}: {url} "); var stopwatch = Stopwatch.StartNew(); var result = await httpClient.GetAsync(url); diff --git a/src/HttpClient.Cache/CacheDataExtensions.cs b/src/HttpClient.Cache/CacheDataExtensions.cs index cce68fe..edab7d6 100644 --- a/src/HttpClient.Cache/CacheDataExtensions.cs +++ b/src/HttpClient.Cache/CacheDataExtensions.cs @@ -3,9 +3,9 @@ namespace HttpClient.Cache; -public static class CacheDataExtensions +internal static class CacheDataExtensions { - public static byte[] Pack(this CacheData cacheData) + internal static byte[] Pack(this CacheData cacheData) { var json = JsonConvert.SerializeObject(cacheData); var bytes = new byte[json.Length * sizeof(char)]; @@ -14,7 +14,7 @@ public static byte[] Pack(this CacheData cacheData) return bytes; } - public static CacheData? Unpack(this byte[] cacheData) + internal static CacheData? Unpack(this byte[] cacheData) { try { diff --git a/src/HttpClient.Cache/CacheEntryExtensions.cs b/src/HttpClient.Cache/CacheEntryExtensions.cs index 590dc7a..808e7ee 100644 --- a/src/HttpClient.Cache/CacheEntryExtensions.cs +++ b/src/HttpClient.Cache/CacheEntryExtensions.cs @@ -1,8 +1,8 @@ namespace HttpClient.Cache; -public static class CacheEntryExtensions +internal static class CacheEntryExtensions { - public static ICacheEntry AddExpirationToken(this ICacheEntry entry, IChangeToken token) + internal static ICacheEntry AddExpirationToken(this ICacheEntry entry, IChangeToken token) { if (token == null) { diff --git a/src/HttpClient.Cache/InMemory/Clock/SystemClock.cs b/src/HttpClient.Cache/InMemory/Clock/SystemClock.cs index 8cbccef..3e768cc 100644 --- a/src/HttpClient.Cache/InMemory/Clock/SystemClock.cs +++ b/src/HttpClient.Cache/InMemory/Clock/SystemClock.cs @@ -1,6 +1,6 @@ namespace HttpClient.Cache.InMemory.Clock; -public class SystemClock: ISystemClock +internal class SystemClock: ISystemClock { public DateTimeOffset UtcNow => DateTimeOffset.UtcNow; } \ No newline at end of file diff --git a/src/HttpClient.Cache/InMemory/MemoryCacheExtensions.cs b/src/HttpClient.Cache/InMemory/MemoryCacheExtensions.cs index 49a8f32..145c278 100644 --- a/src/HttpClient.Cache/InMemory/MemoryCacheExtensions.cs +++ b/src/HttpClient.Cache/InMemory/MemoryCacheExtensions.cs @@ -2,7 +2,7 @@ namespace HttpClient.Cache.InMemory; -public static class MemoryCacheExtensions +internal static class MemoryCacheExtensions { public static Task TryGetAsync(this IMemoryCache cache, string key, out CacheData? cacheData) { diff --git a/src/HttpClient.Cache/InMemory/MemoryCacheOptions.cs b/src/HttpClient.Cache/InMemory/MemoryCacheOptions.cs index bd61cbc..4f9f99f 100644 --- a/src/HttpClient.Cache/InMemory/MemoryCacheOptions.cs +++ b/src/HttpClient.Cache/InMemory/MemoryCacheOptions.cs @@ -4,7 +4,7 @@ namespace HttpClient.Cache.InMemory; public class MemoryCacheOptions { - public TimeSpan ExpirationScanFrequency { get; } = TimeSpan.FromMinutes(1.0); - - public ISystemClock? Clock { get; set; } + public TimeSpan ExpirationScanFrequency { get; set; } = TimeSpan.FromSeconds(1.0); + + public ISystemClock Clock { get; set; } = new SystemClock(); } \ No newline at end of file diff --git a/src/HttpClient.Cache/Utils/HttpStatusCodeExtensions.cs b/src/HttpClient.Cache/Utils/HttpStatusCodeExtensions.cs index 5ea3820..f7d6627 100644 --- a/src/HttpClient.Cache/Utils/HttpStatusCodeExtensions.cs +++ b/src/HttpClient.Cache/Utils/HttpStatusCodeExtensions.cs @@ -2,7 +2,7 @@ namespace HttpClient.Cache.Utils; -public static class HttpStatusCodeExtensions +internal static class HttpStatusCodeExtensions { public static TimeSpan GetAbsoluteExpirationRelativeToNow(this HttpStatusCode statusCode, IDictionary mapping) @@ -13,11 +13,8 @@ public static TimeSpan GetAbsoluteExpirationRelativeToNow(this HttpStatusCode st } var code = (int)statusCode; - if (mapping.TryGetValue((HttpStatusCode)(Math.Floor(code / 100.0) * 100), out expiration)) - { - return expiration; - } - - return TimeSpan.FromDays(1); + return mapping.TryGetValue((HttpStatusCode)(Math.Floor(code / 100.0) * 100), out expiration) + ? expiration + : TimeSpan.FromDays(1); } } \ No newline at end of file