refactor null checks, convert lambdas to method groups

kontent-ai · Aug 12, 2024 · 742f458 · 742f458
1 parent cf54056
commit 742f458
Show file tree

Hide file tree

Showing 26 changed files with 122 additions and 428 deletions.
diff --git a/Kontent.Ai.Management.Tests/Data/ElementsData.cs b/Kontent.Ai.Management.Tests/Data/ElementsData.cs
@@ -140,7 +140,7 @@ private static dynamic GetRichTextAsDynamic(Guid? elementId, string value, IEnum
         dynamic element = new ExpandoObject();
         element.element = GetElement(elementId.Value.ToString("d"));
         element.value = value;
-        element.components = compoments.Select(x => GetRichTextComponentAsDynamic(x));
+        element.components = compoments.Select(GetRichTextComponentAsDynamic);
 
         return element;
     }

diff --git a/Kontent.Ai.Management.Tests/ManagementClientTests/AssetTests.cs b/Kontent.Ai.Management.Tests/ManagementClientTests/AssetTests.cs
@@ -33,7 +33,7 @@ public async Task ListAssetsAsync_DynamicallyTyped_WithMorePages_ListsAssets()
             "00000000-0000-0000-0000-000000000000",
             "10000000-0000-0000-0000-000000000000",
             "20000000-0000-0000-0000-000000000000"
-        }.Select(x => GetExpectedDynamicAssetModel(assetId: x));
+        }.Select(GetExpectedDynamicAssetModel);
 
         var response = await client.ListAssetsAsync().GetAllAsync();
 
@@ -49,7 +49,7 @@ public async Task ListAssetsAsync_StronglyTyped_WithMorePages_ListsAssets()
             "00000000-0000-0000-0000-000000000000",
             "10000000-0000-0000-0000-000000000000",
             "20000000-0000-0000-0000-000000000000"
-        }.Select(x => GetExpectedStronglyTypedAssetModel(assetId: x));
+        }.Select(GetExpectedStronglyTypedAssetModel);
 
         var response = await client.ListAssetsAsync<ComplexTestModel>().GetAllAsync();
 

diff --git a/Kontent.Ai.Management.Tests/Modules/Extensions/PropertyInfoExtensionsTests.cs b/Kontent.Ai.Management.Tests/Modules/Extensions/PropertyInfoExtensionsTests.cs
@@ -40,7 +40,7 @@ public void GetKontentElementCodename_ThrowsIfNoAttribute()
     {
         var property = typeof(PropertyInfoExtensionsTestsSampleClass).GetProperty("Property1");
 
-        Assert.Throws<InvalidOperationException>(() => property.GetKontentElementCodename());
+        Assert.Throws<InvalidOperationException>(property.GetKontentElementCodename);
     }
 
     [Fact]

diff --git a/Kontent.Ai.Management/Extensions/ManagementClientExtensions.cs b/Kontent.Ai.Management/Extensions/ManagementClientExtensions.cs
@@ -21,15 +21,9 @@ public static class ManagementClientExtensions
     /// <returns>The <see cref="ContentItemModel"/> instance that represents updated content item.</returns>
     public async static Task<ContentItemModel> UpsertContentItemAsync(this IManagementClient client, Reference identifier, ContentItemModel contentItem)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (contentItem == null)
-        {
-            throw new ArgumentNullException(nameof(contentItem));
-        }
+        ArgumentNullException.ThrowIfNull(contentItem);
 
         var contentItemUpdateModel = new ContentItemUpsertModel
         {
@@ -52,14 +46,8 @@ public async static Task<ContentItemModel> UpsertContentItemAsync(this IManageme
     /// <param name="assetCreateModel">Updated values for the asset.</param>
     public async static Task<AssetModel> CreateAssetAsync(this IManagementClient client, FileContentSource fileContent, AssetCreateModel assetCreateModel)
     {
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
-        if (assetCreateModel == null)
-        {
-            throw new ArgumentNullException(nameof(assetCreateModel));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
+        ArgumentNullException.ThrowIfNull(assetCreateModel);
 
         var fileResult = await client.UploadFileAsync(fileContent);
 
@@ -78,14 +66,8 @@ public async static Task<AssetModel> CreateAssetAsync(this IManagementClient cli
     /// <param name="assetCreateModel">Updated values for the strongly typed asset.</param>
     public async static Task<AssetModel<T>> CreateAssetAsync<T>(this IManagementClient client, FileContentSource fileContent, AssetCreateModel<T> assetCreateModel) where T : new()
     {
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
-        if (assetCreateModel == null)
-        {
-            throw new ArgumentNullException(nameof(assetCreateModel));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
+        ArgumentNullException.ThrowIfNull(assetCreateModel);
 
         var fileResult = await client.UploadFileAsync(fileContent);
 
@@ -106,20 +88,11 @@ public async static Task<AssetModel> CreateAssetAsync(this IManagementClient cli
     /// <returns>The <see cref="AssetModel"/> instance that represents created or updated asset.</returns>
     public async static Task<AssetModel> UpsertAssetAsync(this IManagementClient client, Reference identifier, FileContentSource fileContent, AssetUpsertModel upsertModel)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
 
-        if (upsertModel == null)
-        {
-            throw new ArgumentNullException(nameof(upsertModel));
-        }
+        ArgumentNullException.ThrowIfNull(upsertModel);
 
         var fileResult = await client.UploadFileAsync(fileContent);
 
@@ -140,20 +113,11 @@ public async static Task<AssetModel> UpsertAssetAsync(this IManagementClient cli
     /// <returns>The <see cref="AssetModel{T}"/> instance that represents created or updated strongly typed asset.</returns>
     public async static Task<AssetModel<T>> UpsertAssetAsync<T>(this IManagementClient client, Reference identifier, FileContentSource fileContent, AssetUpsertModel<T> upsertModel) where T : new()
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
 
-        if (upsertModel == null)
-        {
-            throw new ArgumentNullException(nameof(upsertModel));
-        }
+        ArgumentNullException.ThrowIfNull(upsertModel);
 
         var fileResult = await client.UploadFileAsync(fileContent);
 

diff --git a/Kontent.Ai.Management/ManagementClient.Asset.cs b/Kontent.Ai.Management/ManagementClient.Asset.cs
@@ -39,10 +39,7 @@ public async Task<IListingResponseModel<AssetModel>> ListAssetsAsync()
     /// <inheritdoc />
     public async Task<AssetModel> GetAssetAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildAssetsUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<AssetModel>(endpointUrl, HttpMethod.Get);
@@ -61,15 +58,9 @@ public async Task<AssetModel> GetAssetAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<AssetModel> UpsertAssetAsync(Reference identifier, AssetUpsertModel asset)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (asset == null)
-        {
-            throw new ArgumentNullException(nameof(asset));
-        }
+        ArgumentNullException.ThrowIfNull(asset);
 
         var endpointUrl = _urlBuilder.BuildAssetsUrl(identifier);
         var response = await _actionInvoker.InvokeMethodAsync<AssetUpsertModel, AssetModel>(endpointUrl, HttpMethod.Put, asset);
@@ -80,10 +71,7 @@ public async Task<AssetModel> UpsertAssetAsync(Reference identifier, AssetUpsert
     /// <inheritdoc />
     public async Task<AssetModel<T>> UpsertAssetAsync<T>(Reference identifier, AssetUpsertModel<T> asset) where T : new()
     {
-        if (asset == null)
-        {
-            throw new ArgumentNullException(nameof(asset));
-        }
+        ArgumentNullException.ThrowIfNull(asset);
 
         var result = await UpsertAssetAsync(identifier, _modelProvider.GetAssetUpsertModel(asset));
 
@@ -93,10 +81,7 @@ public async Task<AssetModel> UpsertAssetAsync(Reference identifier, AssetUpsert
     /// <inheritdoc />
     public async Task<AssetModel> CreateAssetAsync(AssetCreateModel asset)
     {
-        if (asset == null)
-        {
-            throw new ArgumentNullException(nameof(asset));
-        }
+        ArgumentNullException.ThrowIfNull(asset);
 
         var endpointUrl = _urlBuilder.BuildAssetsUrl();
         var response = await _actionInvoker.InvokeMethodAsync<AssetCreateModel, AssetModel>(endpointUrl, HttpMethod.Post, asset);
@@ -107,10 +92,7 @@ public async Task<AssetModel> CreateAssetAsync(AssetCreateModel asset)
     /// <inheritdoc />
     public async Task<AssetModel<T>> CreateAssetAsync<T>(AssetCreateModel<T> asset) where T : new()
     {
-        if (asset == null)
-        {
-            throw new ArgumentNullException(nameof(asset));
-        }
+        ArgumentNullException.ThrowIfNull(asset);
 
         var result = await CreateAssetAsync(_modelProvider.GetAssetCreateModel(asset));
 
@@ -120,10 +102,7 @@ public async Task<AssetModel> CreateAssetAsync(AssetCreateModel asset)
     /// <inheritdoc />
     public async Task DeleteAssetAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildAssetsUrl(identifier);
         await _actionInvoker.InvokeMethodAsync(endpointUrl, HttpMethod.Delete);
@@ -132,10 +111,7 @@ public async Task DeleteAssetAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<FileReference> UploadFileAsync(FileContentSource fileContent)
     {
-        if (fileContent == null)
-        {
-            throw new ArgumentNullException(nameof(fileContent));
-        }
+        ArgumentNullException.ThrowIfNull(fileContent);
 
         var stream = fileContent.OpenReadStream();
         try

diff --git a/Kontent.Ai.Management/ManagementClient.AssetFolder.cs b/Kontent.Ai.Management/ManagementClient.AssetFolder.cs
@@ -21,10 +21,7 @@ public async Task<AssetFoldersModel> GetAssetFoldersAsync()
     /// <inheritdoc />
     public async Task<AssetFoldersModel> CreateAssetFoldersAsync(AssetFolderCreateModel folder)
     {
-        if (folder == null)
-        {
-            throw new ArgumentNullException(nameof(folder));
-        }
+        ArgumentNullException.ThrowIfNull(folder);
 
         var endpointUrl = _urlBuilder.BuildAssetFoldersUrl();
         var response = await _actionInvoker.InvokeMethodAsync<AssetFolderCreateModel, AssetFoldersModel>(endpointUrl, HttpMethod.Post, folder);
@@ -35,10 +32,7 @@ public async Task<AssetFoldersModel> CreateAssetFoldersAsync(AssetFolderCreateMo
     /// <inheritdoc />
     public async Task<AssetFoldersModel> ModifyAssetFoldersAsync(IEnumerable<AssetFolderOperationBaseModel> changes)
     {
-        if (changes == null)
-        {
-            throw new ArgumentNullException(nameof(changes));
-        }
+        ArgumentNullException.ThrowIfNull(changes);
 
         var endpointUrl = _urlBuilder.BuildAssetFoldersUrl();
         var response = await _actionInvoker.InvokeMethodAsync<IEnumerable<AssetFolderOperationBaseModel>, AssetFoldersModel>(endpointUrl, new HttpMethod("PATCH"), changes);

diff --git a/Kontent.Ai.Management/ManagementClient.AssetRendition.cs b/Kontent.Ai.Management/ManagementClient.AssetRendition.cs
@@ -11,10 +11,7 @@ public partial class ManagementClient
     /// <inheritdoc />
     public async Task<IListingResponseModel<AssetRenditionModel>> ListAssetRenditionsAsync(Reference assetIdentifier)
     {
-        if (assetIdentifier == null)
-        {
-            throw new ArgumentNullException(nameof(assetIdentifier));
-        }
+        ArgumentNullException.ThrowIfNull(assetIdentifier);
 
         var endpointUrl = _urlBuilder.BuildAssetRenditionsUrl(assetIdentifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<AssetRenditionsListingResponseServerModel>(endpointUrl, HttpMethod.Get);
@@ -29,10 +26,7 @@ public async Task<IListingResponseModel<AssetRenditionModel>> ListAssetRendition
     /// <inheritdoc />
     public async Task<AssetRenditionModel> GetAssetRenditionAsync(AssetRenditionIdentifier identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildAssetRenditionsUrl(identifier);
         return await _actionInvoker.InvokeReadOnlyMethodAsync<AssetRenditionModel>(endpointUrl, HttpMethod.Get);
@@ -41,14 +35,8 @@ public async Task<AssetRenditionModel> GetAssetRenditionAsync(AssetRenditionIden
     /// <inheritdoc />
     public async Task<AssetRenditionModel> UpdateAssetRenditionAsync(AssetRenditionIdentifier identifier, AssetRenditionUpdateModel updateModel)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
-        if (updateModel == null)
-        {
-            throw new ArgumentNullException(nameof(updateModel));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
+        ArgumentNullException.ThrowIfNull(updateModel);
 
         var endpointUrl = _urlBuilder.BuildAssetRenditionsUrl(identifier);
         return await _actionInvoker.InvokeMethodAsync<AssetRenditionUpdateModel, AssetRenditionModel>(endpointUrl, HttpMethod.Put, updateModel);
@@ -57,15 +45,9 @@ public async Task<AssetRenditionModel> UpdateAssetRenditionAsync(AssetRenditionI
     /// <inheritdoc />
     public async Task<AssetRenditionModel> CreateAssetRenditionAsync(Reference assetIdentifier, AssetRenditionCreateModel createModel)
     {
-        if (assetIdentifier == null)
-        {
-            throw new ArgumentNullException(nameof(assetIdentifier));
-        }
+        ArgumentNullException.ThrowIfNull(assetIdentifier);
 
-        if (createModel == null)
-        {
-            throw new ArgumentNullException(nameof(createModel));
-        }
+        ArgumentNullException.ThrowIfNull(createModel);
 
         var endpointUrl = _urlBuilder.BuildAssetRenditionsUrl(assetIdentifier);
         return await _actionInvoker.InvokeMethodAsync<AssetRenditionCreateModel, AssetRenditionModel>(endpointUrl, HttpMethod.Post, createModel);

diff --git a/Kontent.Ai.Management/ManagementClient.Collection.cs b/Kontent.Ai.Management/ManagementClient.Collection.cs
@@ -19,10 +19,7 @@ public async Task<CollectionsModel> ListCollectionsAsync()
     /// <inheritdoc />
     public async Task<CollectionsModel> ModifyCollectionAsync(IEnumerable<CollectionOperationBaseModel> changes)
     {
-        if (changes == null)
-        {
-            throw new ArgumentNullException(nameof(changes));
-        }
+        ArgumentNullException.ThrowIfNull(changes);
 
         var endpointUrl = _urlBuilder.BuildCollectionsUrl();
         return await _actionInvoker.InvokeMethodAsync<IEnumerable<CollectionOperationBaseModel>, CollectionsModel>(endpointUrl, new HttpMethod("PATCH"), changes);

diff --git a/Kontent.Ai.Management/ManagementClient.ContentItem.cs b/Kontent.Ai.Management/ManagementClient.ContentItem.cs
@@ -15,7 +15,7 @@ public async Task<IListingResponseModel<ContentItemModel>> ListContentItemsAsync
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<ContentItemListingResponseServerModel>(endpointUrl, HttpMethod.Get);
 
         return new ListingResponseModel<ContentItemModel>(
-            (token, url) => GetNextListingPageAsync<ContentItemListingResponseServerModel, ContentItemModel>(token, url),
+            GetNextListingPageAsync<ContentItemListingResponseServerModel, ContentItemModel>,
             response.Pagination?.Token,
             endpointUrl,
             response.Items);
@@ -24,10 +24,7 @@ public async Task<IListingResponseModel<ContentItemModel>> ListContentItemsAsync
     /// <inheritdoc />
     public async Task<ContentItemModel> GetContentItemAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildItemUrl(identifier);
         var response = await _actionInvoker.InvokeReadOnlyMethodAsync<ContentItemModel>(endpointUrl, HttpMethod.Get);
@@ -38,10 +35,7 @@ public async Task<ContentItemModel> GetContentItemAsync(Reference identifier)
     /// <inheritdoc />
     public async Task<ContentItemModel> CreateContentItemAsync(ContentItemCreateModel contentItem)
     {
-        if (contentItem == null)
-        {
-            throw new ArgumentNullException(nameof(contentItem));
-        }
+        ArgumentNullException.ThrowIfNull(contentItem);
 
         var endpointUrl = _urlBuilder.BuildItemsUrl();
         var response = await _actionInvoker.InvokeMethodAsync<ContentItemCreateModel, ContentItemModel>(endpointUrl, HttpMethod.Post, contentItem);
@@ -52,15 +46,9 @@ public async Task<ContentItemModel> CreateContentItemAsync(ContentItemCreateMode
     /// <inheritdoc />
     public async Task<ContentItemModel> UpsertContentItemAsync(Reference identifier, ContentItemUpsertModel contentItem)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
-        if (contentItem == null)
-        {
-            throw new ArgumentNullException(nameof(contentItem));
-        }
+        ArgumentNullException.ThrowIfNull(contentItem);
 
         var endpointUrl = _urlBuilder.BuildItemUrl(identifier);
         var response = await _actionInvoker.InvokeMethodAsync<ContentItemUpsertModel, ContentItemModel>(endpointUrl, HttpMethod.Put, contentItem);
@@ -71,10 +59,7 @@ public async Task<ContentItemModel> UpsertContentItemAsync(Reference identifier,
     /// <inheritdoc />
     public async Task DeleteContentItemAsync(Reference identifier)
     {
-        if (identifier == null)
-        {
-            throw new ArgumentNullException(nameof(identifier));
-        }
+        ArgumentNullException.ThrowIfNull(identifier);
 
         var endpointUrl = _urlBuilder.BuildItemUrl(identifier);