diff --git a/framework/src/Volo.Abp.Data/Volo/Abp/Data/ConcurrencyStampExtensions.cs b/framework/src/Volo.Abp.Data/Volo/Abp/Data/ConcurrencyStampExtensions.cs index 769cec9b7f..0d97d3a68a 100644 --- a/framework/src/Volo.Abp.Data/Volo/Abp/Data/ConcurrencyStampExtensions.cs +++ b/framework/src/Volo.Abp.Data/Volo/Abp/Data/ConcurrencyStampExtensions.cs @@ -1,12 +1,13 @@ using System; using System.Collections.Generic; using Volo.Abp.Domain.Entities; +using JetBrains.Annotations; namespace Volo.Abp.Data { public static class ConcurrencyStampExtensions { - public static void SetConcurrencyStamp(this IHasConcurrencyStamp entity, string concurrencyStamp) + public static void SetConcurrencyStampIfNotNull(this IHasConcurrencyStamp entity, [CanBeNull] string concurrencyStamp) { if (!concurrencyStamp.IsNullOrEmpty()) { diff --git a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/Blogs/BlogManagementAppService.cs b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/Blogs/BlogManagementAppService.cs index e30dea7385..d24240b64c 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/Blogs/BlogManagementAppService.cs +++ b/modules/blogging/src/Volo.Blogging.Admin.Application/Volo/Blogging/Admin/Blogs/BlogManagementAppService.cs @@ -59,7 +59,7 @@ namespace Volo.Blogging.Admin.Blogs blog.SetName(input.Name); blog.SetShortName(input.ShortName); blog.Description = input.Description; - blog.SetConcurrencyStamp(input.ConcurrencyStamp); + blog.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); return ObjectMapper.Map(blog); } diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Comments/CommentAppService.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Comments/CommentAppService.cs index 3be6b3cd2f..0b36f8ec37 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Comments/CommentAppService.cs +++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Comments/CommentAppService.cs @@ -100,7 +100,7 @@ namespace Volo.Blogging.Comments await AuthorizationService.CheckAsync(comment, CommonOperations.Update); comment.SetText(input.Text); - comment.SetConcurrencyStamp(input.ConcurrencyStamp); + comment.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); comment = await _commentRepository.UpdateAsync(comment); diff --git a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs index 80cd57787c..be53ac4139 100644 --- a/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs +++ b/modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Posts/PostAppService.cs @@ -174,7 +174,7 @@ namespace Volo.Blogging.Posts post.SetTitle(input.Title); post.SetUrl(input.Url); - post.SetConcurrencyStamp(input.ConcurrencyStamp); + post.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); post.Content = input.Content; post.Description = input.Description; post.CoverImage = input.CoverImage; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogAdminAppService.cs index 1a1124160b..d278086fab 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogAdminAppService.cs @@ -68,7 +68,7 @@ namespace Volo.CmsKit.Admin.Blogs blog = await BlogManager.UpdateAsync(blog, input.Name, input.Slug); - blog.SetConcurrencyStamp(input.ConcurrencyStamp); + blog.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); await BlogRepository.UpdateAsync(blog); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs index 7fbc623741..1b0a8b1d2e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Blogs/BlogPostAdminAppService.cs @@ -63,7 +63,7 @@ namespace Volo.CmsKit.Admin.Blogs blogPost.SetTitle(input.Title); blogPost.SetShortDescription(input.ShortDescription); blogPost.SetContent(input.Content); - blogPost.SetConcurrencyStamp(input.ConcurrencyStamp); + blogPost.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); blogPost.CoverImageMediaId = input.CoverImageMediaId; if (blogPost.Slug != input.Slug) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs index dde50cda0d..f3fadf56fb 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Menus/MenuItemAdminAppService.cs @@ -88,7 +88,7 @@ namespace Volo.CmsKit.Admin.Menus menuItem.Target = input.Target; menuItem.ElementId = input.ElementId; menuItem.CssClass = input.CssClass; - menuItem.SetConcurrencyStamp(input.ConcurrencyStamp); + menuItem.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); await MenuItemRepository.UpdateAsync(menuItem); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs index f3dc3cb617..f04f2bc9b6 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Pages/PageAdminAppService.cs @@ -73,7 +73,7 @@ namespace Volo.CmsKit.Admin.Pages page.SetContent(input.Content); page.SetScript(input.Script); page.SetStyle(input.Style); - page.SetConcurrencyStamp(input.ConcurrencyStamp); + page.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); await PageRepository.UpdateAsync(page); diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs index de01d101ed..f5e9e0f7dd 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Application/Volo/CmsKit/Admin/Tags/TagAdminAppService.cs @@ -54,7 +54,7 @@ namespace Volo.CmsKit.Admin.Tags id, input.Name); - tag.SetConcurrencyStamp(input.ConcurrencyStamp); + tag.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); await Repository.UpdateAsync(tag); diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs index e2e7617772..9d21d603d9 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Application/Volo/CmsKit/Public/Comments/CommentPublicAppService.cs @@ -87,7 +87,7 @@ namespace Volo.CmsKit.Public.Comments } comment.SetText(input.Text); - comment.SetConcurrencyStamp(input.ConcurrencyStamp); + comment.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); var updatedComment = await CommentRepository.UpdateAsync(comment); diff --git a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs index 7aeca0ac6a..078288572b 100644 --- a/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs +++ b/modules/docs/src/Volo.Docs.Admin.Application/Volo/Docs/Admin/Projects/ProjectAdminAppService.cs @@ -97,7 +97,7 @@ namespace Volo.Docs.Admin.Projects project.SetFormat(input.Format); project.SetNavigationDocumentName(input.NavigationDocumentName); project.SetDefaultDocumentName(input.DefaultDocumentName); - project.SetConcurrencyStamp(input.ConcurrencyStamp); + project.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); project.MinimumVersion = input.MinimumVersion; project.MainWebsiteUrl = input.MainWebsiteUrl; diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs index 2686eb6cba..c219d4b24d 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityRoleAppService.cs @@ -75,7 +75,7 @@ namespace Volo.Abp.Identity { var role = await RoleManager.GetByIdAsync(id); - role.SetConcurrencyStamp(input.ConcurrencyStamp); + role.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); (await RoleManager.SetRoleNameAsync(role, input.Name)).CheckErrors(); diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs index 08a517d38e..351059a305 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs @@ -100,7 +100,7 @@ namespace Volo.Abp.Identity var user = await UserManager.GetByIdAsync(id); - user.SetConcurrencyStamp(input.ConcurrencyStamp); + user.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); (await UserManager.SetUserNameAsync(user, input.UserName)).CheckErrors(); diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs index 52a68dc9b4..cdc96d92aa 100644 --- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs +++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/ProfileAppService.cs @@ -63,7 +63,7 @@ namespace Volo.Abp.Identity user.Name = input.Name; user.Surname = input.Surname; - user.SetConcurrencyStamp(input.ConcurrencyStamp); + user.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); input.MapExtraPropertiesTo(user); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs index 9188a9edd9..d01df8ffc9 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application/Volo/Abp/TenantManagement/TenantAppService.cs @@ -101,7 +101,7 @@ namespace Volo.Abp.TenantManagement await TenantManager.ChangeNameAsync(tenant, input.Name); - tenant.SetConcurrencyStamp(input.ConcurrencyStamp); + tenant.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); input.MapExtraPropertiesTo(tenant); await TenantRepository.UpdateAsync(tenant);