Merge pull request #29 from KSemenenko/main

KSemenenko · web-flow · commit a09ecfb21668 · 2021-02-26T10:02:26.000+02:00
refactoring
diff --git a/ManagedCode.Repository.AzureTable/BaseAzureTableRepository.cs b/ManagedCode.Repository.AzureTable/BaseAzureTableRepository.cs
@@ -68,16 +68,16 @@ protected override async Task<int> InsertAsyncInternal(IEnumerable<TItem> items,
 
         #region InsertOrUpdate
 
-        protected override async Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
+        protected override async Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
             try
             {
-                var result = await _tableAdapter.ExecuteAsync(TableOperation.InsertOrReplace(item), token);
-                return result != null;
+                var result = await _tableAdapter.ExecuteAsync<TItem>(TableOperation.InsertOrReplace(item), token);
+                return result;
             }
             catch (Exception e)
             {
-                return false;
+                return default;
             }
         }
 
@@ -97,7 +97,7 @@ protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem
 
         #region Update
 
-        protected override async Task<bool> UpdateAsyncInternal(TItem item, CancellationToken token = default)
+        protected override async Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
             try
             {
@@ -106,12 +106,12 @@ protected override async Task<bool> UpdateAsyncInternal(TItem item, Cancellation
                     item.ETag = "*";
                 }
 
-                var result = await _tableAdapter.ExecuteAsync(TableOperation.Replace(item), token);
-                return result != null;
+                var result = await _tableAdapter.ExecuteAsync<TItem>(TableOperation.Replace(item), token);
+                return result;
             }
             catch (Exception e)
             {
-                return false;
+                return default;
             }
         }
 
@@ -294,9 +294,9 @@ protected override IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Func<TIt
 
         #region Count
 
-        protected override async Task<uint> CountAsyncInternal(CancellationToken token = default)
+        protected override async Task<int> CountAsyncInternal(CancellationToken token = default)
         {
-            uint count = 0;
+            int count = 0;
 
             Expression<Func<TItem, bool>> predicate = item => true;
 
@@ -310,9 +310,9 @@ protected override async Task<uint> CountAsyncInternal(CancellationToken token =
             return count;
         }
 
-        protected override async Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
+        protected override async Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
         {
-            uint count = 0;
+            int count = 0;
 
             await foreach (var item in _tableAdapter
                 .Query<DynamicTableEntity>(predicate, selectExpression: item => new DynamicTableEntity(item.PartitionKey, item.RowKey),
diff --git a/ManagedCode.Repository.AzureTable/ManagedCode.Repository.AzureTable.csproj b/ManagedCode.Repository.AzureTable/ManagedCode.Repository.AzureTable.csproj
@@ -8,7 +8,7 @@
         <Authors>ManagedCode</Authors>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.4</PackageVersion>
+        <PackageVersion>1.0.5</PackageVersion>
         <Description>Repository for AzureTable</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.Core/BaseRepository.cs b/ManagedCode.Repository.Core/BaseRepository.cs
@@ -47,7 +47,7 @@ public Task<int> InsertAsync(IEnumerable<TItem> items, CancellationToken token =
 
         #region Update
 
-        public Task<bool> UpdateAsync(TItem item, CancellationToken token = default)
+        public Task<TItem> UpdateAsync(TItem item, CancellationToken token = default)
         {
             Contract.Requires(IsInitialized);
             Contract.Requires(item != null);
@@ -61,7 +61,7 @@ public Task<int> UpdateAsync(IEnumerable<TItem> items, CancellationToken token =
             return UpdateAsyncInternal(items, token);
         }
 
-        protected abstract Task<bool> UpdateAsyncInternal(TItem items, CancellationToken token = default);
+        protected abstract Task<TItem> UpdateAsyncInternal(TItem items, CancellationToken token = default);
 
         protected abstract Task<int> UpdateAsyncInternal(IEnumerable<TItem> items, CancellationToken token = default);
 
@@ -126,7 +126,7 @@ public Task<bool> DeleteAllAsync(CancellationToken token = default)
 
         #region InsertOrUpdate
 
-        public Task<bool> InsertOrUpdateAsync(TItem item, CancellationToken token = default)
+        public Task<TItem> InsertOrUpdateAsync(TItem item, CancellationToken token = default)
         {
             Contract.Requires(IsInitialized);
             Contract.Requires(item != null);
@@ -140,7 +140,7 @@ public Task<int> InsertOrUpdateAsync(IEnumerable<TItem> items, CancellationToken
             return InsertOrUpdateAsyncInternal(items, token);
         }
 
-        protected abstract Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default);
+        protected abstract Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default);
 
         protected abstract Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem> items, CancellationToken token = default);
 
@@ -297,22 +297,22 @@ protected abstract IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Func<TIt
 
         #region Count
 
-        public Task<uint> CountAsync(CancellationToken token = default)
+        public Task<int> CountAsync(CancellationToken token = default)
         {
             Contract.Requires(IsInitialized);
             return CountAsyncInternal(token);
         }
 
-        public Task<uint> CountAsync(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
+        public Task<int> CountAsync(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
         {
             Contract.Requires(IsInitialized);
             Contract.Requires(predicate != null);
             return CountAsyncInternal(predicate, token);
         }
 
-        protected abstract Task<uint> CountAsyncInternal(CancellationToken token = default);
+        protected abstract Task<int> CountAsyncInternal(CancellationToken token = default);
 
-        protected abstract Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default);
+        protected abstract Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default);
 
         #endregion
     }
diff --git a/ManagedCode.Repository.Core/IRepository.cs b/ManagedCode.Repository.Core/IRepository.cs
@@ -15,10 +15,10 @@ public interface IRepository<in TId, TItem> where TItem : IItem<TId>
         Task<TItem> InsertAsync(TItem item, CancellationToken token = default);
         Task<int> InsertAsync(IEnumerable<TItem> items, CancellationToken token = default);
 
-        Task<bool> UpdateAsync(TItem item, CancellationToken token = default);
+        Task<TItem> UpdateAsync(TItem item, CancellationToken token = default);
         Task<int> UpdateAsync(IEnumerable<TItem> items, CancellationToken token = default);
 
-        Task<bool> InsertOrUpdateAsync(TItem item, CancellationToken token = default);
+        Task<TItem> InsertOrUpdateAsync(TItem item, CancellationToken token = default);
         Task<int> InsertOrUpdateAsync(IEnumerable<TItem> items, CancellationToken token = default);
 
         Task<bool> DeleteAsync(TId id, CancellationToken token = default);
@@ -86,7 +86,7 @@ IAsyncEnumerable<TItem> FindAsync(Expression<Func<TItem, bool>> predicate,
             int skip = 0,
             CancellationToken token = default);
 
-        Task<uint> CountAsync(CancellationToken token = default);
-        Task<uint> CountAsync(Expression<Func<TItem, bool>> predicate, CancellationToken token = default);
+        Task<int> CountAsync(CancellationToken token = default);
+        Task<int> CountAsync(Expression<Func<TItem, bool>> predicate, CancellationToken token = default);
     }
 }
diff --git a/ManagedCode.Repository.Core/InMemoryRepository.cs b/ManagedCode.Repository.Core/InMemoryRepository.cs
@@ -57,12 +57,12 @@ protected override Task<int> InsertAsyncInternal(IEnumerable<TItem> items, Cance
 
         #region InsertOrUpdate
 
-        protected override Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
+        protected override Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
             lock (_storage)
             {
                 _storage[item.Id] = item;
-                return Task.FromResult(true);
+                return Task.FromResult(item);
             }
         }
 
@@ -86,17 +86,17 @@ protected override Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem> item
 
         #region Update
 
-        protected override Task<bool> UpdateAsyncInternal(TItem item, CancellationToken token = default)
+        protected override Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
             lock (_storage)
             {
                 if (_storage.TryGetValue(item.Id, out var _))
                 {
                     _storage[item.Id] = item;
-                    return Task.FromResult(true);
+                    return Task.FromResult(item);
                 }
 
-                return Task.FromResult(false);
+                return Task.FromResult<TItem>(default);
             }
         }
 
@@ -392,20 +392,20 @@ protected override async IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Fu
 
         #region Count
 
-        protected override Task<uint> CountAsyncInternal(CancellationToken token = default)
+        protected override Task<int> CountAsyncInternal(CancellationToken token = default)
         {
             lock (_storage)
             {
-                return Task.FromResult(Convert.ToUInt32(_storage.Count));
+                return Task.FromResult(_storage.Count);
             }
         }
 
-        protected override Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
+        protected override Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
         {
             lock (_storage)
             {
                 var count = _storage.Values.Count(predicate.Compile());
-                return Task.FromResult(Convert.ToUInt32(count));
+                return Task.FromResult(count);
             }
         }
 
diff --git a/ManagedCode.Repository.Core/ManagedCode.Repository.Core.csproj b/ManagedCode.Repository.Core/ManagedCode.Repository.Core.csproj
@@ -9,7 +9,7 @@
         <PackageProjectUrl>https://github.com/managed-code-hub/Repository</PackageProjectUrl>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.4</PackageVersion>
+        <PackageVersion>1.0.5</PackageVersion>
         <Description>Base implementation for Repository</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.CosmosDB/CosmosDbRepository.cs b/ManagedCode.Repository.CosmosDB/CosmosDbRepository.cs
@@ -105,17 +105,17 @@ protected override async Task<int> InsertAsyncInternal(IEnumerable<TItem> items,
 
         #region InsertOrUpdate
 
-        protected override async Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
+        protected override async Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
             try
             {
                 var container = await _cosmosDbAdapter.GetContainer();
                 var result = await container.UpsertItemAsync(item, item.PartitionKey, cancellationToken: token);
-                return result != null;
+                return result.Resource;
             }
             catch (Exception e)
             {
-                return false;
+                return default;
             }
         }
 
@@ -165,17 +165,17 @@ protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem
 
         #region Update
 
-        protected override async Task<bool> UpdateAsyncInternal(TItem item, CancellationToken token = default)
+        protected override async Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
             try
             {
                 var container = await _cosmosDbAdapter.GetContainer();
                 var result = await container.ReplaceItemAsync(item, item.Id, cancellationToken: token);
-                return result != null;
+                return result.Resource;
             }
             catch (Exception e)
             {
-                return false;
+                return default;
             }
         }
 
@@ -662,16 +662,16 @@ protected override async IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Fu
 
         #region Count
 
-        protected override async Task<uint> CountAsyncInternal(CancellationToken token = default)
+        protected override async Task<int> CountAsyncInternal(CancellationToken token = default)
         {
             var container = await _cosmosDbAdapter.GetContainer();
-            return Convert.ToUInt32(await container.GetItemLinqQueryable<TItem>().Where(SplitByType()).CountAsync(token));
+            return await container.GetItemLinqQueryable<TItem>().Where(SplitByType()).CountAsync(token);
         }
 
-        protected override async Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
+        protected override async Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
         {
             var container = await _cosmosDbAdapter.GetContainer();
-            return Convert.ToUInt32(await container.GetItemLinqQueryable<TItem>().Where(SplitByType()).Where(predicate).CountAsync(token));
+            return await container.GetItemLinqQueryable<TItem>().Where(SplitByType()).Where(predicate).CountAsync(token);
         }
 
         #endregion
diff --git a/ManagedCode.Repository.CosmosDB/ManagedCode.Repository.CosmosDB.csproj b/ManagedCode.Repository.CosmosDB/ManagedCode.Repository.CosmosDB.csproj
@@ -8,7 +8,7 @@
         <Authors>ManagedCode</Authors>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.4</PackageVersion>
+        <PackageVersion>1.0.5</PackageVersion>
         <Description>Repository for CosmosDB</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.LiteDB/LiteDbRepository.cs b/ManagedCode.Repository.LiteDB/LiteDbRepository.cs
@@ -73,10 +73,15 @@ protected override async Task<int> InsertAsyncInternal(IEnumerable<TItem> items,
 
         #region InsertOrUpdate
 
-        protected override async Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
+        protected override async Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
             await Task.Yield();
-            return GetDatabase().Upsert(item);
+            if (GetDatabase().Upsert(item))
+            {
+                return GetDatabase().FindById(new BsonValue(item.Id));
+            }
+
+            return default;
         }
 
         protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem> items, CancellationToken token = default)
@@ -89,10 +94,15 @@ protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem
 
         #region Update
 
-        protected override async Task<bool> UpdateAsyncInternal(TItem item, CancellationToken token = default)
+        protected override async Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)
         {
             await Task.Yield();
-            return GetDatabase().Update(item);
+            if (GetDatabase().Update(item))
+            {
+                return GetDatabase().FindById(new BsonValue(item.Id));
+            }
+
+            return default;
         }
 
         protected override async Task<int> UpdateAsyncInternal(IEnumerable<TItem> items, CancellationToken token = default)
@@ -349,16 +359,16 @@ protected override async IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Fu
 
         #region Count
 
-        protected override async Task<uint> CountAsyncInternal(CancellationToken token = default)
+        protected override async Task<int> CountAsyncInternal(CancellationToken token = default)
         {
             await Task.Yield();
-            return (uint) GetDatabase().Count();
+            return GetDatabase().Count();
         }
 
-        protected override async Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
+        protected override async Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)
         {
             await Task.Yield();
-            return (uint) GetDatabase().Count(predicate);
+            return GetDatabase().Count(predicate);
         }
 
         #endregion
diff --git a/ManagedCode.Repository.LiteDB/ManagedCode.Repository.LiteDB.csproj b/ManagedCode.Repository.LiteDB/ManagedCode.Repository.LiteDB.csproj
@@ -8,7 +8,7 @@
         <Authors>ManagedCode</Authors>
         <PackageLicenseUrl>https://github.com/managed-code-hub/Repository/blob/main/LICENSE</PackageLicenseUrl>
         <RepositoryUrl>https://github.com/managed-code-hub/Repository</RepositoryUrl>
-        <PackageVersion>1.0.4</PackageVersion>
+        <PackageVersion>1.0.5</PackageVersion>
         <Description>Repository for LiteDB</Description>
     </PropertyGroup>
 
diff --git a/ManagedCode.Repository.Tests/AzureTableRepositoryTests.cs b/ManagedCode.Repository.Tests/AzureTableRepositoryTests.cs
diff --git a/ManagedCode.Repository.Tests/CosmosDbRepositoryTests.cs b/ManagedCode.Repository.Tests/CosmosDbRepositoryTests.cs
diff --git a/ManagedCode.Repository.Tests/InMemoryRepositoryTests.cs b/ManagedCode.Repository.Tests/InMemoryRepositoryTests.cs
diff --git a/ManagedCode.Repository.Tests/LiteDbRepositoryTests.cs b/ManagedCode.Repository.Tests/LiteDbRepositoryTests.cs

Original file line number	Diff line number	Diff line change
`@@ -68,16 +68,16 @@ protected override async Task<int> InsertAsyncInternal(IEnumerable<TItem> items,`
`68`	`68`
`69`	`69`	`#region InsertOrUpdate`
`70`	`70`
`71`		`- protected override async Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)`
	`71`	`+ protected override async Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)`
`72`	`72`	`{`
`73`	`73`	`try`
`74`	`74`	`{`
`75`		`- var result = await _tableAdapter.ExecuteAsync(TableOperation.InsertOrReplace(item), token);`
`76`		`- return result != null;`
	`75`	`+ var result = await _tableAdapter.ExecuteAsync<TItem>(TableOperation.InsertOrReplace(item), token);`
	`76`	`+ return result;`
`77`	`77`	`}`
`78`	`78`	`catch (Exception e)`
`79`	`79`	`{`
`80`		`- return false;`
	`80`	`+ return default;`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`@@ -97,7 +97,7 @@ protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem`
`97`	`97`
`98`	`98`	`#region Update`
`99`	`99`
`100`		`- protected override async Task<bool> UpdateAsyncInternal(TItem item, CancellationToken token = default)`
	`100`	`+ protected override async Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)`
`101`	`101`	`{`
`102`	`102`	`try`
`103`	`103`	`{`
`@@ -106,12 +106,12 @@ protected override async Task<bool> UpdateAsyncInternal(TItem item, Cancellation`
`106`	`106`	`item.ETag = "*";`
`107`	`107`	`}`
`108`	`108`
`109`		`- var result = await _tableAdapter.ExecuteAsync(TableOperation.Replace(item), token);`
`110`		`- return result != null;`
	`109`	`+ var result = await _tableAdapter.ExecuteAsync<TItem>(TableOperation.Replace(item), token);`
	`110`	`+ return result;`
`111`	`111`	`}`
`112`	`112`	`catch (Exception e)`
`113`	`113`	`{`
`114`		`- return false;`
	`114`	`+ return default;`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
`@@ -294,9 +294,9 @@ protected override IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Func<TIt`
`294`	`294`
`295`	`295`	`#region Count`
`296`	`296`
`297`		`- protected override async Task<uint> CountAsyncInternal(CancellationToken token = default)`
	`297`	`+ protected override async Task<int> CountAsyncInternal(CancellationToken token = default)`
`298`	`298`	`{`
`299`		`- uint count = 0;`
	`299`	`+ int count = 0;`
`300`	`300`
`301`	`301`	`Expression<Func<TItem, bool>> predicate = item => true;`
`302`	`302`
`@@ -310,9 +310,9 @@ protected override async Task<uint> CountAsyncInternal(CancellationToken token =`
`310`	`310`	`return count;`
`311`	`311`	`}`
`312`	`312`
`313`		`- protected override async Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)`
	`313`	`+ protected override async Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)`
`314`	`314`	`{`
`315`		`- uint count = 0;`
	`315`	`+ int count = 0;`
`316`	`316`
`317`	`317`	`await foreach (var item in _tableAdapter`
`318`	`318`	`.Query<DynamicTableEntity>(predicate, selectExpression: item => new DynamicTableEntity(item.PartitionKey, item.RowKey),`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public Task<int> InsertAsync(IEnumerable<TItem> items, CancellationToken token =`
`47`	`47`
`48`	`48`	`#region Update`
`49`	`49`
`50`		`- public Task<bool> UpdateAsync(TItem item, CancellationToken token = default)`
	`50`	`+ public Task<TItem> UpdateAsync(TItem item, CancellationToken token = default)`
`51`	`51`	`{`
`52`	`52`	`Contract.Requires(IsInitialized);`
`53`	`53`	`Contract.Requires(item != null);`
`@@ -61,7 +61,7 @@ public Task<int> UpdateAsync(IEnumerable<TItem> items, CancellationToken token =`
`61`	`61`	`return UpdateAsyncInternal(items, token);`
`62`	`62`	`}`
`63`	`63`
`64`		`- protected abstract Task<bool> UpdateAsyncInternal(TItem items, CancellationToken token = default);`
	`64`	`+ protected abstract Task<TItem> UpdateAsyncInternal(TItem items, CancellationToken token = default);`
`65`	`65`
`66`	`66`	`protected abstract Task<int> UpdateAsyncInternal(IEnumerable<TItem> items, CancellationToken token = default);`
`67`	`67`
`@@ -126,7 +126,7 @@ public Task<bool> DeleteAllAsync(CancellationToken token = default)`
`126`	`126`
`127`	`127`	`#region InsertOrUpdate`
`128`	`128`
`129`		`- public Task<bool> InsertOrUpdateAsync(TItem item, CancellationToken token = default)`
	`129`	`+ public Task<TItem> InsertOrUpdateAsync(TItem item, CancellationToken token = default)`
`130`	`130`	`{`
`131`	`131`	`Contract.Requires(IsInitialized);`
`132`	`132`	`Contract.Requires(item != null);`
`@@ -140,7 +140,7 @@ public Task<int> InsertOrUpdateAsync(IEnumerable<TItem> items, CancellationToken`
`140`	`140`	`return InsertOrUpdateAsyncInternal(items, token);`
`141`	`141`	`}`
`142`	`142`
`143`		`- protected abstract Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default);`
	`143`	`+ protected abstract Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default);`
`144`	`144`
`145`	`145`	`protected abstract Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem> items, CancellationToken token = default);`
`146`	`146`
`@@ -297,22 +297,22 @@ protected abstract IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Func<TIt`
`297`	`297`
`298`	`298`	`#region Count`
`299`	`299`
`300`		`- public Task<uint> CountAsync(CancellationToken token = default)`
	`300`	`+ public Task<int> CountAsync(CancellationToken token = default)`
`301`	`301`	`{`
`302`	`302`	`Contract.Requires(IsInitialized);`
`303`	`303`	`return CountAsyncInternal(token);`
`304`	`304`	`}`
`305`	`305`
`306`		`- public Task<uint> CountAsync(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)`
	`306`	`+ public Task<int> CountAsync(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)`
`307`	`307`	`{`
`308`	`308`	`Contract.Requires(IsInitialized);`
`309`	`309`	`Contract.Requires(predicate != null);`
`310`	`310`	`return CountAsyncInternal(predicate, token);`
`311`	`311`	`}`
`312`	`312`
`313`		`- protected abstract Task<uint> CountAsyncInternal(CancellationToken token = default);`
	`313`	`+ protected abstract Task<int> CountAsyncInternal(CancellationToken token = default);`
`314`	`314`
`315`		`- protected abstract Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default);`
	`315`	`+ protected abstract Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default);`
`316`	`316`
`317`	`317`	`#endregion`
`318`	`318`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,12 @@ protected override Task<int> InsertAsyncInternal(IEnumerable<TItem> items, Cance`
`57`	`57`
`58`	`58`	`#region InsertOrUpdate`
`59`	`59`
`60`		`- protected override Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)`
	`60`	`+ protected override Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)`
`61`	`61`	`{`
`62`	`62`	`lock (_storage)`
`63`	`63`	`{`
`64`	`64`	`_storage[item.Id] = item;`
`65`		`- return Task.FromResult(true);`
	`65`	`+ return Task.FromResult(item);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`@@ -86,17 +86,17 @@ protected override Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem> item`
`86`	`86`
`87`	`87`	`#region Update`
`88`	`88`
`89`		`- protected override Task<bool> UpdateAsyncInternal(TItem item, CancellationToken token = default)`
	`89`	`+ protected override Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)`
`90`	`90`	`{`
`91`	`91`	`lock (_storage)`
`92`	`92`	`{`
`93`	`93`	`if (_storage.TryGetValue(item.Id, out var _))`
`94`	`94`	`{`
`95`	`95`	`_storage[item.Id] = item;`
`96`		`- return Task.FromResult(true);`
	`96`	`+ return Task.FromResult(item);`
`97`	`97`	`}`
`98`	`98`
`99`		`- return Task.FromResult(false);`
	`99`	`+ return Task.FromResult<TItem>(default);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`@@ -392,20 +392,20 @@ protected override async IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Fu`
`392`	`392`
`393`	`393`	`#region Count`
`394`	`394`
`395`		`- protected override Task<uint> CountAsyncInternal(CancellationToken token = default)`
	`395`	`+ protected override Task<int> CountAsyncInternal(CancellationToken token = default)`
`396`	`396`	`{`
`397`	`397`	`lock (_storage)`
`398`	`398`	`{`
`399`		`- return Task.FromResult(Convert.ToUInt32(_storage.Count));`
	`399`	`+ return Task.FromResult(_storage.Count);`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`
`403`		`- protected override Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)`
	`403`	`+ protected override Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)`
`404`	`404`	`{`
`405`	`405`	`lock (_storage)`
`406`	`406`	`{`
`407`	`407`	`var count = _storage.Values.Count(predicate.Compile());`
`408`		`- return Task.FromResult(Convert.ToUInt32(count));`
	`408`	`+ return Task.FromResult(count);`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`
Original file line number	Diff line number	Diff line change
`@@ -105,17 +105,17 @@ protected override async Task<int> InsertAsyncInternal(IEnumerable<TItem> items,`
`105`	`105`
`106`	`106`	`#region InsertOrUpdate`
`107`	`107`
`108`		`- protected override async Task<bool> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)`
	`108`	`+ protected override async Task<TItem> InsertOrUpdateAsyncInternal(TItem item, CancellationToken token = default)`
`109`	`109`	`{`
`110`	`110`	`try`
`111`	`111`	`{`
`112`	`112`	`var container = await _cosmosDbAdapter.GetContainer();`
`113`	`113`	`var result = await container.UpsertItemAsync(item, item.PartitionKey, cancellationToken: token);`
`114`		`- return result != null;`
	`114`	`+ return result.Resource;`
`115`	`115`	`}`
`116`	`116`	`catch (Exception e)`
`117`	`117`	`{`
`118`		`- return false;`
	`118`	`+ return default;`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`@@ -165,17 +165,17 @@ protected override async Task<int> InsertOrUpdateAsyncInternal(IEnumerable<TItem`
`165`	`165`
`166`	`166`	`#region Update`
`167`	`167`
`168`		`- protected override async Task<bool> UpdateAsyncInternal(TItem item, CancellationToken token = default)`
	`168`	`+ protected override async Task<TItem> UpdateAsyncInternal(TItem item, CancellationToken token = default)`
`169`	`169`	`{`
`170`	`170`	`try`
`171`	`171`	`{`
`172`	`172`	`var container = await _cosmosDbAdapter.GetContainer();`
`173`	`173`	`var result = await container.ReplaceItemAsync(item, item.Id, cancellationToken: token);`
`174`		`- return result != null;`
	`174`	`+ return result.Resource;`
`175`	`175`	`}`
`176`	`176`	`catch (Exception e)`
`177`	`177`	`{`
`178`		`- return false;`
	`178`	`+ return default;`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`@@ -662,16 +662,16 @@ protected override async IAsyncEnumerable<TItem> FindAsyncInternal(Expression<Fu`
`662`	`662`
`663`	`663`	`#region Count`
`664`	`664`
`665`		`- protected override async Task<uint> CountAsyncInternal(CancellationToken token = default)`
	`665`	`+ protected override async Task<int> CountAsyncInternal(CancellationToken token = default)`
`666`	`666`	`{`
`667`	`667`	`var container = await _cosmosDbAdapter.GetContainer();`
`668`		`- return Convert.ToUInt32(await container.GetItemLinqQueryable<TItem>().Where(SplitByType()).CountAsync(token));`
	`668`	`+ return await container.GetItemLinqQueryable<TItem>().Where(SplitByType()).CountAsync(token);`
`669`	`669`	`}`
`670`	`670`
`671`		`- protected override async Task<uint> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)`
	`671`	`+ protected override async Task<int> CountAsyncInternal(Expression<Func<TItem, bool>> predicate, CancellationToken token = default)`
`672`	`672`	`{`
`673`	`673`	`var container = await _cosmosDbAdapter.GetContainer();`
`674`		`- return Convert.ToUInt32(await container.GetItemLinqQueryable<TItem>().Where(SplitByType()).Where(predicate).CountAsync(token));`
	`674`	`+ return await container.GetItemLinqQueryable<TItem>().Where(SplitByType()).Where(predicate).CountAsync(token);`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`#endregion`