fix check on parameters, plus some cleanup

Author: petrhaus

src/MongoDbCache/MongoContext.cs

@@ -88,12 +88,12 @@ public MongoContext(string connectionString, MongoClientSettings mongoClientSett
             var client = mongoClientSettings == null ? new MongoClient(connectionString) : new MongoClient(mongoClientSettings);
             var database = client.GetDatabase(databaseName);
 
-            IndexKeysDefinition<CacheItem> expireAtIndexModel =
-                new IndexKeysDefinitionBuilder<CacheItem>().Ascending(p => p.ExpiresAt);
+            var expireAtIndexModel = new IndexKeysDefinitionBuilder<CacheItem>().Ascending(p => p.ExpiresAt);
 
             _collection = database.GetCollection<CacheItem>(collectionName);
 
-            _collection.Indexes.CreateOne(new CreateIndexModel<CacheItem>(expireAtIndexModel, new CreateIndexOptions {
+            _collection.Indexes.CreateOne(new CreateIndexModel<CacheItem>(expireAtIndexModel, new CreateIndexOptions
+            {
                 Background = true
             }));
         }
@@ -148,7 +148,7 @@ public byte[] GetCacheItem(string key, bool withoutValue)
 
             if (CheckIfExpired(utcNow, cacheItem))
             {
-                Remove(cacheItem.Key);
+                await RemoveAsync(cacheItem.Key, token);
                 return null;
             }
 

src/MongoDbCache/MongoDbCache.cs

@@ -13,9 +13,9 @@ public class MongoDbCache : IDistributedCache
         private readonly TimeSpan _defaultScanInterval = TimeSpan.FromMinutes(5);
         private readonly MongoContext _mongoContext;
 
-        private void ValidateOptions(MongoDbCacheOptions cacheOptions)
+        private static void ValidateOptions(MongoDbCacheOptions cacheOptions)
         {
-            if (!string.IsNullOrEmpty(cacheOptions.ConnectionString) && cacheOptions.MongoClientSettings == null)
+            if (!string.IsNullOrEmpty(cacheOptions.ConnectionString) && cacheOptions.MongoClientSettings != null)
             {
                 throw new ArgumentException(
                     $"Only one of {nameof(cacheOptions.ConnectionString)} and {nameof(cacheOptions.MongoClientSettings)} can be set.");
@@ -51,7 +51,9 @@ public MongoDbCache(IOptions<MongoDbCacheOptions> optionsAccessor)
         {
             var options = optionsAccessor.Value;
             ValidateOptions(options);
+
             _mongoContext = new MongoContext(options.ConnectionString, options.MongoClientSettings, options.DatabaseName, options.CollectionName);
+            
             SetScanInterval(options.ExpiredScanInterval);
         }
 
@@ -78,37 +80,7 @@ public void Refresh(string key)
             ScanAndDeleteExpired();
         }
 
-        public async Task<byte[]> GetAsync(string key)
-        {
-            var value = await _mongoContext.GetCacheItemAsync(key, withoutValue: false);
-
-            ScanAndDeleteExpired();
-
-            return value;
-        }
-
-        public async Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options = null)
-        {
-            await _mongoContext.SetAsync(key, value, options);
-
-            ScanAndDeleteExpired();
-        }
-
-        public async Task RefreshAsync(string key)
-        {
-            await _mongoContext.GetCacheItemAsync(key, withoutValue: true);
-
-            ScanAndDeleteExpired();
-        }
-
-        public async Task RemoveAsync(string key)
-        {
-            await _mongoContext.RemoveAsync(key);
-
-            ScanAndDeleteExpired();
-        }
-
-        public async Task<byte[]> GetAsync(string key, CancellationToken token = default(CancellationToken))
+        public async Task<byte[]> GetAsync(string key, CancellationToken token = default)
         {
             var value = await _mongoContext.GetCacheItemAsync(key, withoutValue: false, token: token);
 
@@ -117,21 +89,21 @@ public async Task RemoveAsync(string key)
             return value;
         }
 
-        public async Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options, CancellationToken token = default(CancellationToken))
+        public async Task SetAsync(string key, byte[] value, DistributedCacheEntryOptions options, CancellationToken token = default)
         {
             await _mongoContext.SetAsync(key, value, options, token);
 
             ScanAndDeleteExpired();
         }
 
-        public async Task RefreshAsync(string key, CancellationToken token = default(CancellationToken))
+        public async Task RefreshAsync(string key, CancellationToken token = default)
         {
             await _mongoContext.GetCacheItemAsync(key, withoutValue: true, token: token);
 
             ScanAndDeleteExpired();
         }
 
-        public async Task RemoveAsync(string key, CancellationToken token = default(CancellationToken))
+        public async Task RemoveAsync(string key, CancellationToken token = default)
         {
             await _mongoContext.RemoveAsync(key, token);
 

src/MongoDbCache/MongoDbCache.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>2.4.0</Version>
+    <Version>2.4.1</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>Copyright (c) OUTMATIC Alessandro Petrelli &amp; Contributors</Copyright>
     <Authors>Alessandro Petrelli &amp; Contributors</Authors>

src/MongoDbCache/MongoDbCacheServicesExtensions.cs

@@ -1,7 +1,6 @@
 using System;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace MongoDbCache
 {