Skip to content

Commit 66d9d55

Browse files
committed
Apply formatting/analyzers
1 parent b693e35 commit 66d9d55

7 files changed

+40
-41
lines changed

AsyncMemoryCache.Tests/AsyncMemoryCacheTests.cs

+20-20
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void EvictionBehaviorIsStarted()
8787
var evictionBehavior = Substitute.For<IEvictionBehavior>();
8888
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
8989
{
90-
EvictionBehavior = evictionBehavior
90+
EvictionBehavior = evictionBehavior,
9191
};
9292

9393
_ = AsyncMemoryCache<string, IAsyncDisposable>.Create(config);
@@ -124,11 +124,11 @@ public async Task DisposeAsync()
124124
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
125125
{
126126
EvictionBehavior = evictionBehavior,
127-
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>()
127+
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>
128128
{
129129
{ "test1", new CacheEntity<string, IAsyncDisposable>("test1", () => Task.FromResult(cacheObject1), AsyncLazyFlags.None) },
130-
{ "test2", new CacheEntity<string, IAsyncDisposable>("test2", () => Task.FromResult(cacheObject2), AsyncLazyFlags.None ) }
131-
}
130+
{ "test2", new CacheEntity<string, IAsyncDisposable>("test2", () => Task.FromResult(cacheObject2), AsyncLazyFlags.None ) },
131+
},
132132
};
133133

134134
var target = AsyncMemoryCache<string, IAsyncDisposable>.Create(config);
@@ -150,7 +150,7 @@ public void NewCacheEntityReferenceReturnedOnEveryCall()
150150
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
151151
{
152152
EvictionBehavior = evictionBehavior,
153-
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>()
153+
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>(),
154154
};
155155

156156
var target = AsyncMemoryCache<string, IAsyncDisposable>.Create(config);
@@ -180,7 +180,7 @@ public void NewCacheEntityIsCreatedIfUsesIsBelowZero()
180180
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
181181
{
182182
EvictionBehavior = evictionBehavior,
183-
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>()
183+
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>(),
184184
};
185185

186186
var target = AsyncMemoryCache<string, IAsyncDisposable>.Create(config);
@@ -207,7 +207,7 @@ public void TryGetValue_ReturnsFalseIfItemDoesNotExist()
207207
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
208208
{
209209
EvictionBehavior = evictionBehavior,
210-
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>()
210+
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>(),
211211
};
212212

213213
var target = AsyncMemoryCache<string, IAsyncDisposable>.Create(config);
@@ -227,10 +227,10 @@ public void TryGetValue_ReturnsFalseWhenBeingDisposed()
227227
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
228228
{
229229
EvictionBehavior = evictionBehavior,
230-
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>()
230+
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>
231231
{
232-
{ key, new(key, () => Task.FromResult(Substitute.For<IAsyncDisposable>()), AsyncLazyFlags.None) }
233-
}
232+
{ key, new(key, () => Task.FromResult(Substitute.For<IAsyncDisposable>()), AsyncLazyFlags.None) },
233+
},
234234
};
235235

236236
config.CacheBackingStore[key].References = -1;
@@ -253,10 +253,10 @@ public void TryGetValue_ReturnsTrueIfItemExistsAndIncrementsReferenceCount()
253253
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
254254
{
255255
EvictionBehavior = evictionBehavior,
256-
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>()
256+
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>
257257
{
258-
{ key, new(key, () => Task.FromResult(Substitute.For<IAsyncDisposable>()), AsyncLazyFlags.None) }
259-
}
258+
{ key, new(key, () => Task.FromResult(Substitute.For<IAsyncDisposable>()), AsyncLazyFlags.None) },
259+
},
260260
};
261261

262262
var target = AsyncMemoryCache<string, IAsyncDisposable>.Create(config);
@@ -277,14 +277,14 @@ public void TryGetValue_ExistingItemWithExpirationStrategy_CallsCacheEntityAcces
277277

278278
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
279279
{
280-
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>()
280+
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>
281281
{
282282
{
283283
key,
284284
new CacheEntity<string, IAsyncDisposable>(key, () => Task.FromResult(Substitute.For<IAsyncDisposable>()), AsyncLazyFlags.None)
285285
.WithExpirationStrategy(expirationStrategy)
286-
}
287-
}
286+
},
287+
},
288288
};
289289

290290
var target = AsyncMemoryCache<string, IAsyncDisposable>.Create(config);
@@ -303,14 +303,14 @@ public void Indexer_ExistingItemWithExpirationStrategy_CallsCacheEntityAccessed(
303303

304304
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
305305
{
306-
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>()
306+
CacheBackingStore = new Dictionary<string, CacheEntity<string, IAsyncDisposable>>
307307
{
308308
{
309309
key,
310310
new CacheEntity<string, IAsyncDisposable>(key, () => Task.FromResult(Substitute.For<IAsyncDisposable>()), AsyncLazyFlags.None)
311311
.WithExpirationStrategy(expirationStrategy)
312-
}
313-
}
312+
},
313+
},
314314
};
315315

316316
var target = AsyncMemoryCache<string, IAsyncDisposable>.Create(config);
@@ -324,7 +324,7 @@ private static AsyncMemoryCacheConfiguration<string, IAsyncDisposable> CreateCon
324324
{
325325
return new()
326326
{
327-
EvictionBehavior = EvictionBehavior.Disabled
327+
EvictionBehavior = EvictionBehavior.Disabled,
328328
};
329329
}
330330
}

AsyncMemoryCache.Tests/CacheEntityReferenceExtensionTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void WithExpirationStrategyExtension()
5454
[Fact]
5555
public void WithExpirationCallbackExtension()
5656
{
57-
var expirationCallback = (string key, IAsyncDisposable obj) => { };
57+
var expirationCallback = (string _, IAsyncDisposable _) => { };
5858

5959
var cacheEntity = new CacheEntity<string, IAsyncDisposable>("test", () => Task.FromResult((IAsyncDisposable)null!), AsyncLazyFlags.None);
6060
var cacheEntityReference = new CacheEntityReference<string, IAsyncDisposable>(cacheEntity);

AsyncMemoryCache.Tests/CacheEntityReferenceTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class CacheEntityReferenceTests
1010
[Fact]
1111
public void IncrementsAndDecrementsProperly()
1212
{
13-
var cacheEntity = new CacheEntity<string, IAsyncDisposable>("", () => Task.FromResult((IAsyncDisposable)null!), AsyncLazyFlags.None);
13+
var cacheEntity = new CacheEntity<string, IAsyncDisposable>(string.Empty, () => Task.FromResult((IAsyncDisposable)null!), AsyncLazyFlags.None);
1414
Assert.Equal(0, cacheEntity.References);
1515

1616
var cacheEntityReference = new CacheEntityReference<string, IAsyncDisposable>(cacheEntity);
@@ -23,7 +23,7 @@ public void IncrementsAndDecrementsProperly()
2323
[Fact]
2424
public void MultipleDisposes_DecrementsOnlyOnce()
2525
{
26-
var cacheEntity = new CacheEntity<string, IAsyncDisposable>("", () => Task.FromResult((IAsyncDisposable)null!), AsyncLazyFlags.None);
26+
var cacheEntity = new CacheEntity<string, IAsyncDisposable>(string.Empty, () => Task.FromResult((IAsyncDisposable)null!), AsyncLazyFlags.None);
2727
Assert.Equal(0, cacheEntity.References);
2828

2929
var cacheEntityReference = new CacheEntityReference<string, IAsyncDisposable>(cacheEntity);
@@ -34,7 +34,7 @@ public void MultipleDisposes_DecrementsOnlyOnce()
3434
cacheEntityReference.Dispose();
3535
cacheEntityReference.Dispose();
3636
cacheEntityReference.Dispose();
37-
#pragma warning enable
37+
#pragma warning restore
3838
Assert.Equal(0, cacheEntity.References);
3939
}
4040
}

AsyncMemoryCache.Tests/EvictionBehaviorTests.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void DefaultEvictionBehavior_TicksAccordingToConfig(int? seconds, int exp
3434

3535
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
3636
{
37-
CacheBackingStore = cache
37+
CacheBackingStore = cache,
3838
};
3939

4040
var timeProvider = new FakeTimeProvider();
@@ -113,7 +113,7 @@ private static async Task Internal_DefaultEvictionBehavior_RemovesExpiredItem_Le
113113

114114
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
115115
{
116-
CacheBackingStore = cache
116+
CacheBackingStore = cache,
117117
};
118118

119119
target.Start(config, _logger);
@@ -143,7 +143,7 @@ public async Task UseSystemTimer()
143143

144144
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
145145
{
146-
CacheBackingStore = cache
146+
CacheBackingStore = cache,
147147
};
148148

149149
var target = new DefaultEvictionBehavior(null, TimeSpan.FromMilliseconds(1));
@@ -180,7 +180,7 @@ public async Task ExpiredCacheItem_AlwaysDisposedIfRefCountBelowZero()
180180
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
181181
{
182182
CacheItemExpired = null,
183-
CacheBackingStore = cache
183+
CacheBackingStore = cache,
184184
};
185185

186186
target.Start(config, _logger);
@@ -203,7 +203,7 @@ public async Task ExpiredCacheItem_NeverDisposedIfRefCountAboveZero()
203203
{
204204
expiredKey, new CacheEntity<string, IAsyncDisposable>(expiredKey, () => Task.FromResult(expiredCacheObject), AsyncLazyFlags.None)
205205
.WithAbsoluteExpiration(DateTimeOffset.UtcNow)
206-
}
206+
},
207207
};
208208

209209
var resetEvent = new ManualResetEvent(false);
@@ -236,7 +236,7 @@ public async Task CacheItemWithoutExpirationStrategy_NeverDisposed()
236236
{
237237
// Not setting any expiration strategy
238238
expiredKey, new CacheEntity<string, IAsyncDisposable>(expiredKey, () => Task.FromResult(expiredCacheObject), AsyncLazyFlags.None)
239-
}
239+
},
240240
};
241241

242242
var resetEvent = new ManualResetEvent(false);
@@ -263,10 +263,8 @@ public async Task DefaultEvictionBehavior_CallsCallbacks_ForExpiredItem()
263263
const string expiredKey = "expired";
264264

265265
var resetEvent = new ManualResetEvent(false);
266-
var globalCacheItemExpiredCallbackCalled = false;
267-
var globalCacheItemExpiredCallback = (string key, IAsyncDisposable value) => { globalCacheItemExpiredCallbackCalled = true; };
268266
var cacheItemExpirationCallbackCalled = false;
269-
var cacheItemExpirationCallback = (string key, IAsyncDisposable value) =>
267+
var cacheItemExpirationCallback = (string _, IAsyncDisposable _) =>
270268
{
271269
cacheItemExpirationCallbackCalled = true;
272270
resetEvent.Set();
@@ -288,10 +286,11 @@ public async Task DefaultEvictionBehavior_CallsCallbacks_ForExpiredItem()
288286

289287
var timeProvider = new FakeTimeProvider(DateTime.UtcNow);
290288
var target = new DefaultEvictionBehavior(timeProvider);
289+
var globalCacheItemExpiredCallbackCalled = false;
291290
var config = new AsyncMemoryCacheConfiguration<string, IAsyncDisposable>
292291
{
293-
CacheItemExpired = globalCacheItemExpiredCallback,
294-
CacheBackingStore = cache
292+
CacheItemExpired = (string _, IAsyncDisposable _) => globalCacheItemExpiredCallbackCalled = true,
293+
CacheBackingStore = cache,
295294
};
296295

297296
target.Start(config, _logger);

AsyncMemoryCache.Tests/ExpirationStrategyTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void SlidingExpirationStrategy(int lastUseOffset, bool expectedExpiryStat
2222
{
2323
var target = new SlidingExpirationStrategy(TimeSpan.FromMinutes(1))
2424
{
25-
LastUse = DateTimeOffset.UtcNow.AddMinutes(lastUseOffset)
25+
LastUse = DateTimeOffset.UtcNow.AddMinutes(lastUseOffset),
2626
};
2727

2828
Assert.Equal(expectedExpiryState, target.IsExpired());
@@ -34,7 +34,7 @@ public void SlidingExpirationStrategy_CacheEntityAccessed_SetsLastUse()
3434
var lastUse = DateTimeOffset.MinValue;
3535
var target = new SlidingExpirationStrategy(TimeSpan.Zero)
3636
{
37-
LastUse = lastUse
37+
LastUse = lastUse,
3838
};
3939

4040
target.CacheEntityAccessed();

AsyncMemoryCache/AsyncMemoryCache.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using AsyncMemoryCache.EvictionBehaviors;
2-
using Microsoft.Extensions.Logging;
1+
using Microsoft.Extensions.Logging;
32
using Microsoft.Extensions.Logging.Abstractions;
43
using Nito.AsyncEx;
54
using System;
@@ -91,6 +90,7 @@ private AsyncMemoryCache(IAsyncMemoryCacheConfiguration<TKey, TValue> configurat
9190
/// </summary>
9291
/// <param name="configuration">The <see cref="IAsyncMemoryCacheConfiguration{TKey, TValue}"/>.</param>
9392
/// <param name="logger">The optional <see cref="ILogger{CategoryName}">ILogger</see>&lt;<see cref="AsyncMemoryCache{TKey, TValue}"></see>&gt;</param>
93+
/// <exception cref="ArgumentNullException">When <paramref name="configuration"/> is null</exception>
9494
public static AsyncMemoryCache<TKey, TValue> Create(IAsyncMemoryCacheConfiguration<TKey, TValue> configuration, ILogger<AsyncMemoryCache<TKey, TValue>>? logger = null)
9595
{
9696
var asyncMemoryCache = new AsyncMemoryCache<TKey, TValue>(configuration, logger);
@@ -162,7 +162,7 @@ public async ValueTask DisposeAsync()
162162
var diposeTasks = _configuration.CacheBackingStore
163163
.Select(async x =>
164164
{
165-
var cachedObject = await x.Value;
165+
var cachedObject = await x.Value.ConfigureAwait(false);
166166
await cachedObject.DisposeAsync().ConfigureAwait(false);
167167
});
168168

AsyncMemoryCache/EvictionBehaviors/DefaultEvictionBehavior.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private static async Task CheckExpiredItems<TKey, TValue>(IAsyncMemoryCacheConfi
103103
foreach (var expiredItem in expiredItems)
104104
{
105105
logger.LogTrace("Expiring item with key {Key}", expiredItem.Key);
106-
var item = await expiredItem;
106+
var item = await expiredItem.ConfigureAwait(false);
107107
if (cache.Remove(expiredItem.Key))
108108
{
109109
configuration.CacheItemExpired?.Invoke(expiredItem.Key, item);

0 commit comments

Comments
 (0)