From e49822cd4ed96bbd9083442a9d11ddfcd99b38a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 9 Dec 2019 08:23:43 +0300 Subject: [PATCH] Remove sync extension methods. --- .../Identity/IdentityRoleRepositoryExtensions.cs | 14 -------------- .../Identity/IdentityUserRepositoryExtensions.cs | 15 --------------- .../Abp/Identity/TestPermissionDataBuilder.cs | 3 ++- .../Abp/Identity/AbpIdentityTestDataBuilder.cs | 3 ++- 4 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleRepositoryExtensions.cs delete mode 100644 modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExtensions.cs diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleRepositoryExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleRepositoryExtensions.cs deleted file mode 100644 index feb1cb65df..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleRepositoryExtensions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Volo.Abp.Threading; - -namespace Volo.Abp.Identity -{ - public static class IdentityRoleRepositoryExtensions - { - public static IdentityRole FindByNormalizedName(this IIdentityRoleRepository roleRepository, string normalizedRoleName) - { - return AsyncHelper.RunSync(() => roleRepository.FindByNormalizedNameAsync(normalizedRoleName)); - } - - //TODO: Other sync extension methods - } -} \ No newline at end of file diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExtensions.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExtensions.cs deleted file mode 100644 index 9655caa0e2..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRepositoryExtensions.cs +++ /dev/null @@ -1,15 +0,0 @@ -using JetBrains.Annotations; -using Volo.Abp.Threading; - -namespace Volo.Abp.Identity -{ - public static class IdentityUserRepositoryExtensions - { - public static IdentityUser FindByNormalizedUserName(this IIdentityUserRepository repository, [NotNull] string normalizedUserName) - { - return AsyncHelper.RunSync(() => repository.FindByNormalizedUserNameAsync(normalizedUserName)); - } - - //TODO: Other sync extension methods - } -} \ No newline at end of file diff --git a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/TestPermissionDataBuilder.cs b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/TestPermissionDataBuilder.cs index 0fc834ccc0..b84860a5cc 100644 --- a/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/TestPermissionDataBuilder.cs +++ b/modules/identity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/TestPermissionDataBuilder.cs @@ -3,6 +3,7 @@ using Volo.Abp.Authorization.Permissions; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; using Volo.Abp.PermissionManagement; +using Volo.Abp.Threading; namespace Volo.Abp.Identity { @@ -45,7 +46,7 @@ namespace Volo.Abp.Identity private void AddUserPermissions() { - var david = _userRepository.FindByNormalizedUserName(_lookupNormalizer.NormalizeName("david")); + var david = AsyncHelper.RunSync(() => _userRepository.FindByNormalizedUserNameAsync(_lookupNormalizer.NormalizeName("david"))); AddPermission(TestPermissionNames.MyPermission1, UserPermissionValueProvider.ProviderName, david.Id.ToString()); } diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs index 6df6fd8cb3..ae6b7befc2 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/AbpIdentityTestDataBuilder.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Identity; using Volo.Abp.DependencyInjection; using Volo.Abp.Guids; +using Volo.Abp.Threading; namespace Volo.Abp.Identity { @@ -43,7 +44,7 @@ namespace Volo.Abp.Identity private void AddRoles() { - _adminRole = _roleRepository.FindByNormalizedName(_lookupNormalizer.NormalizeName("admin")); + _adminRole = AsyncHelper.RunSync(()=> _roleRepository.FindByNormalizedNameAsync(_lookupNormalizer.NormalizeName("admin"))); _moderator = new IdentityRole(_testData.RoleModeratorId, "moderator"); _moderator.AddClaim(_guidGenerator, new Claim("test-claim", "test-value"));