From 6751ce6628370bb581895ad3e5da0d28a784de26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 15 Jan 2018 21:20:56 +0300 Subject: [PATCH] Do not use Entity and Repository default PK interfaces. --- .../AbpDesk/Blogging/BlogPost.cs | 2 +- .../AbpDesk/Blogging/BlogPostComment.cs | 5 +++-- src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll | Bin 15360 -> 15360 bytes .../Application/Services/ICrudAppService.cs | 8 -------- .../Abp/Identity/IIdentityRoleRepository.cs | 3 ++- .../Abp/Identity/IIdentityUserRepository.cs | 2 +- .../Volo/Abp/Identity/IdentityRole.cs | 2 +- .../Volo/Abp/Identity/IdentityRoleClaim.cs | 2 +- .../Volo/Abp/Identity/IdentityUser.cs | 2 +- .../Volo/Abp/Identity/IdentityUserClaim.cs | 2 +- .../Volo/Abp/Identity/IdentityUserLogin.cs | 2 +- .../Volo/Abp/Identity/IdentityUserRole.cs | 2 +- .../Volo/Abp/Identity/IdentityUserToken.cs | 2 +- .../Identity/EfCoreIdentityRoleRepository.cs | 2 +- .../Identity/EfCoreIdentityUserRepository.cs | 2 +- .../ApiResources/ApiResource.cs | 2 +- .../IdentityServer/ApiResources/ApiScope.cs | 2 +- .../ApiResources/IApiResourceRepository.cs | 5 +++-- .../Volo/Abp/IdentityServer/Clients/Client.cs | 2 +- .../Abp/IdentityServer/Clients/ClientClaim.cs | 2 +- .../Clients/ClientCorsOrigin.cs | 2 +- .../Clients/ClientIdPRestriction.cs | 2 +- .../Clients/ClientPostLogoutRedirectUri.cs | 2 +- .../IdentityServer/Clients/ClientProperty.cs | 2 +- .../Clients/ClientRedirectUri.cs | 2 +- .../Abp/IdentityServer/Clients/ClientScope.cs | 2 +- .../Clients/IClientRepository.cs | 5 +++-- .../Grants/IPersistentGrantRepository.cs | 5 +++-- .../IdentityServer/Grants/PersistedGrant.cs | 2 +- .../Grants/PersistedGrantStore.cs | 2 -- .../IIdentityResourceRepository.cs | 5 +++-- .../IdentityResources/IdentityResource.cs | 2 +- .../Volo/Abp/IdentityServer/Secret.cs | 2 +- .../Volo/Abp/IdentityServer/UserClaim.cs | 2 +- .../IdentityServer/ApiResourceRepository.cs | 5 +++-- .../Abp/IdentityServer/ClientRepository.cs | 5 +++-- .../IdentityResourceRepository.cs | 5 +++-- .../PersistedGrantRepository.cs | 5 +++-- .../Abp/MultiTenancy/ITenantRepository.cs | 2 +- .../Volo/Abp/MultiTenancy/Tenant.cs | 2 +- .../MultiTenancy/TenantConnectionString.cs | 2 +- .../MultiTenancy/EfCoreTenantRepository.cs | 2 +- .../Abp/AutoMapper/SampleClasses/MyEntity.cs | 5 +++-- .../RepositoryRegistration_Tests.cs | 7 +++---- .../SecondContext/BookInSecondDbContext.cs | 5 +++-- .../SecondContextTestDataBuilder.cs | 7 ++++--- .../ThirdDbContextDummyEntity.cs | 5 +++-- .../DataFiltering/MultiTenant_Filter_Tests.cs | 4 ++-- .../DataFiltering/SoftDelete_Filter_Tests.cs | 7 ++++--- .../DbContext_Replace_Tests.cs | 7 ++++--- .../Repositories/Basic_Repository_Tests.cs | 8 ++++---- .../EntityFrameworkCore/Transaction_Tests.cs | 8 ++++---- .../PersonAppServiceClientProxy_Tests.cs | 4 ++-- .../DataFilters/MultiTenant_Filter_Tests.cs | 4 ++-- .../Volo/Abp/TestApp/Domain/Person.cs | 2 +- .../Volo/Abp/TestApp/TestDataBuilder.cs | 4 ++-- 56 files changed, 99 insertions(+), 94 deletions(-) diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs index 1ead1ae0d5..004b14843c 100644 --- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs +++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPost.cs @@ -6,7 +6,7 @@ using Volo.Abp.Domain.Entities; namespace AbpDesk.Blogging { - public class BlogPost : AggregateRoot + public class BlogPost : AggregateRoot { public virtual string Title { get; protected set; } diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPostComment.cs b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPostComment.cs index f8298acc4d..b352faa92a 100644 --- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPostComment.cs +++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk/Blogging/BlogPostComment.cs @@ -1,9 +1,10 @@ -using JetBrains.Annotations; +using System; +using JetBrains.Annotations; using Volo.Abp.Domain.Entities; namespace AbpDesk.Blogging { - public class BlogPostComment : Entity + public class BlogPostComment : Entity { [NotNull] public virtual string Name { get; protected set; } diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 879b5f90bd5119f9448d4fee92d477a960437704..a6bb0c90e4f934c925e089b4398fc610bba4a6ab 100644 GIT binary patch delta 3019 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 G)&3tUSwtlO diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ICrudAppService.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ICrudAppService.cs index a67aa83210..9400f8825c 100644 --- a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ICrudAppService.cs +++ b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ICrudAppService.cs @@ -1,15 +1,7 @@ -using System; using Volo.Abp.Application.Dtos; namespace Volo.Abp.Application.Services { - public interface ICrudAppService - : ICrudAppService - where TEntityDto : IEntityDto - { - - } - public interface ICrudAppService : ICrudAppService where TEntityDto : IEntityDto diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs index c6033714f8..97fb33377b 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityRoleRepository.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; @@ -5,7 +6,7 @@ using Volo.Abp.Domain.Repositories; namespace Volo.Abp.Identity { - public interface IIdentityRoleRepository : IRepository + public interface IIdentityRoleRepository : IRepository { Task FindByNormalizedNameAsync(string normalizedRoleName, CancellationToken cancellationToken); diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs index 39b1b649bb..cc376acdc8 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs @@ -8,7 +8,7 @@ using Volo.Abp.Domain.Repositories; namespace Volo.Abp.Identity { - public interface IIdentityUserRepository : IRepository + public interface IIdentityUserRepository : IRepository { Task FindByNormalizedUserNameAsync([NotNull] string normalizedUserName, CancellationToken cancellationToken); diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs index d7054c95e5..fe6af2e7f6 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRole.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.Identity /// /// Represents a role in the identity system /// - public class IdentityRole : AggregateRoot, IHasConcurrencyStamp + public class IdentityRole : AggregateRoot, IHasConcurrencyStamp { /// /// Gets or sets the name for this role. diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleClaim.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleClaim.cs index d9860bff28..ec659f3f03 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleClaim.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleClaim.cs @@ -8,7 +8,7 @@ namespace Volo.Abp.Identity /// /// Represents a claim that is granted to all users within a role. /// - public class IdentityRoleClaim : Entity + public class IdentityRoleClaim : Entity { /// /// Gets or sets the of the primary key of the role associated with this claim. diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs index fe039d2b00..4e3b7097ec 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUser.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.Identity { //Add Name and Surname properties? - public class IdentityUser : AggregateRoot, IHasConcurrencyStamp + public class IdentityUser : AggregateRoot, IHasConcurrencyStamp { /// /// Gets or sets the user name for this user. diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserClaim.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserClaim.cs index e505db833e..4129034547 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserClaim.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserClaim.cs @@ -8,7 +8,7 @@ namespace Volo.Abp.Identity /// /// Represents a claim that a user possesses. /// - public class IdentityUserClaim : Entity + public class IdentityUserClaim : Entity { /// /// Gets or sets the primary key of the user associated with this claim. diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs index f4263445c3..8556fee9d7 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserLogin.cs @@ -8,7 +8,7 @@ namespace Volo.Abp.Identity /// /// Represents a login and its associated provider for a user. /// - public class IdentityUserLogin : Entity + public class IdentityUserLogin : Entity { /// /// Gets or sets the of the primary key of the user associated with this login. diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRole.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRole.cs index 1867ec582e..2740b67323 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRole.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserRole.cs @@ -6,7 +6,7 @@ namespace Volo.Abp.Identity /// /// Represents the link between a user and a role. /// - public class IdentityUserRole : Entity + public class IdentityUserRole : Entity { /// /// Gets or sets the primary key of the user that is linked to a role. diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserToken.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserToken.cs index 2e1ed4d302..e37c5b9d43 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserToken.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityUserToken.cs @@ -7,7 +7,7 @@ namespace Volo.Abp.Identity /// /// Represents an authentication token for a user. /// - public class IdentityUserToken : Entity + public class IdentityUserToken : Entity { /// /// Gets or sets the primary key of the user that the token belongs to. diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityRoleRepository.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityRoleRepository.cs index 7ab50948e8..2a6c6db2bb 100644 --- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityRoleRepository.cs +++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityRoleRepository.cs @@ -11,7 +11,7 @@ using System; namespace Volo.Abp.Identity { - public class EfCoreIdentityRoleRepository : EfCoreRepository, IIdentityRoleRepository + public class EfCoreIdentityRoleRepository : EfCoreRepository, IIdentityRoleRepository { public EfCoreIdentityRoleRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs index 8deac6bef1..3b33b65390 100644 --- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs +++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs @@ -12,7 +12,7 @@ using Volo.Abp.Identity.EntityFrameworkCore; namespace Volo.Abp.Identity { - public class EfCoreIdentityUserRepository : EfCoreRepository, IIdentityUserRepository + public class EfCoreIdentityUserRepository : EfCoreRepository, IIdentityUserRepository { public EfCoreIdentityUserRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiResource.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiResource.cs index 2bd9339c13..73eb194e5f 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiResource.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiResource.cs @@ -5,7 +5,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.ApiResources { - public class ApiResource : AggregateRoot + public class ApiResource : AggregateRoot { public virtual bool Enabled { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiScope.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiScope.cs index ab4056d657..9512190497 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiScope.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/ApiScope.cs @@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.ApiResources { - public class ApiScope : Entity + public class ApiScope : Entity { public virtual string Name { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/IApiResourceRepository.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/IApiResourceRepository.cs index 759bbbdf02..1ae0e26295 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/IApiResourceRepository.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/ApiResources/IApiResourceRepository.cs @@ -1,8 +1,9 @@ -using Volo.Abp.Domain.Repositories; +using System; +using Volo.Abp.Domain.Repositories; namespace Volo.Abp.IdentityServer.ApiResources { - public interface IApiResourceRepository : IRepository + public interface IApiResourceRepository : IRepository { } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs index 17b35d1a05..2154495e18 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs @@ -8,7 +8,7 @@ using Volo.Abp.Guids; namespace Volo.Abp.IdentityServer.Clients { - public class Client : AggregateRoot + public class Client : AggregateRoot { public virtual string ClientId { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientClaim.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientClaim.cs index bb0cb7e0f5..ef1330d412 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientClaim.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientClaim.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.Clients { - public class ClientClaim : Entity + public class ClientClaim : Entity { public virtual string Type { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientCorsOrigin.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientCorsOrigin.cs index 4decc3132e..91d55c3348 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientCorsOrigin.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientCorsOrigin.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.Clients { - public class ClientCorsOrigin : Entity + public class ClientCorsOrigin : Entity { public virtual string Origin { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientIdPRestriction.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientIdPRestriction.cs index 936dc71042..9515d1fb88 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientIdPRestriction.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientIdPRestriction.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.Clients { - public class ClientIdPRestriction : Entity + public class ClientIdPRestriction : Entity { public virtual string Provider { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientPostLogoutRedirectUri.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientPostLogoutRedirectUri.cs index fa30e00819..a1e0230f2a 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientPostLogoutRedirectUri.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientPostLogoutRedirectUri.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.Clients { - public class ClientPostLogoutRedirectUri : Entity + public class ClientPostLogoutRedirectUri : Entity { public virtual string PostLogoutRedirectUri { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientProperty.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientProperty.cs index 843884cf3b..da6174d366 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientProperty.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientProperty.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.Clients { - public class ClientProperty : Entity + public class ClientProperty : Entity { public virtual string Key { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientRedirectUri.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientRedirectUri.cs index 689d15a681..073aae7c48 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientRedirectUri.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientRedirectUri.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.Clients { - public class ClientRedirectUri : Entity + public class ClientRedirectUri : Entity { public virtual string RedirectUri { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientScope.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientScope.cs index e28d33cacb..07e038ca5e 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientScope.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientScope.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.Clients { - public class ClientScope : Entity + public class ClientScope : Entity { public virtual string Scope { get; protected set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/IClientRepository.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/IClientRepository.cs index c8cd46af63..d0c54dffd1 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/IClientRepository.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/IClientRepository.cs @@ -1,10 +1,11 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using JetBrains.Annotations; using Volo.Abp.Domain.Repositories; namespace Volo.Abp.IdentityServer.Clients { - public interface IClientRepository : IRepository + public interface IClientRepository : IRepository { Task FindByCliendIdIncludingAllAsync([NotNull] string clientId); } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/IPersistentGrantRepository.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/IPersistentGrantRepository.cs index 709fe00d62..53059b4ce9 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/IPersistentGrantRepository.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/IPersistentGrantRepository.cs @@ -1,10 +1,11 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Domain.Repositories; namespace Volo.Abp.IdentityServer.Grants { - public interface IPersistentGrantRepository : IRepository + public interface IPersistentGrantRepository : IRepository { Task FindByKeyAsync(string key); diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrant.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrant.cs index e47401d607..4a2bccd456 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrant.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrant.cs @@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.Grants { - public class PersistedGrant : AggregateRoot + public class PersistedGrant : AggregateRoot { public virtual string Key { get; set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs index f312132900..31ab551053 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Grants/PersistedGrantStore.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using System.Linq; -using System.Linq.Dynamic.Core; using System.Threading.Tasks; using IdentityServer4.Stores; using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Repositories; using Volo.Abp.ObjectMapping; namespace Volo.Abp.IdentityServer.Grants diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs index 94b86754da..1312daa1a0 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IIdentityResourceRepository.cs @@ -1,11 +1,12 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using Volo.Abp.Domain.Repositories; using ApiResource = Volo.Abp.IdentityServer.ApiResources.ApiResource; namespace Volo.Abp.IdentityServer.IdentityResources { - public interface IIdentityResourceRepository : IRepository + public interface IIdentityResourceRepository : IRepository { Task> FindIdentityResourcesByScopeAsync(string[] scopeNames); diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResource.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResource.cs index 9251862c96..04dcd847ca 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResource.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/IdentityResources/IdentityResource.cs @@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.IdentityServer.IdentityResources { - public class IdentityResource : AggregateRoot + public class IdentityResource : AggregateRoot { public virtual bool Enabled { get; set; } = true; diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Secret.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Secret.cs index 6e7f753124..45302a97f8 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Secret.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Secret.cs @@ -6,7 +6,7 @@ namespace Volo.Abp.IdentityServer { //TODO: Eleminate Secret class for simplicity. - public abstract class Secret : Entity + public abstract class Secret : Entity { public virtual string Description { get; protected set; } diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/UserClaim.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/UserClaim.cs index 9529a42ed1..f6d911d547 100644 --- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/UserClaim.cs +++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/UserClaim.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.IdentityServer { //TODO: Eleminate UserClaim class for simplicity. - public abstract class UserClaim : Entity + public abstract class UserClaim : Entity { public virtual string Type { get; set; } diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResourceRepository.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResourceRepository.cs index bd62b96b6b..359930e2e4 100644 --- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResourceRepository.cs +++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ApiResourceRepository.cs @@ -1,11 +1,12 @@ -using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using System; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.IdentityServer.ApiResources; using Volo.Abp.IdentityServer.EntityFrameworkCore; namespace Volo.Abp.IdentityServer { - public class ApiResourceRepository : EfCoreRepository, IApiResourceRepository + public class ApiResourceRepository : EfCoreRepository, IApiResourceRepository { public ApiResourceRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) { diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ClientRepository.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ClientRepository.cs index e0d44d2183..da142e91e9 100644 --- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ClientRepository.cs +++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/ClientRepository.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore; @@ -7,7 +8,7 @@ using Volo.Abp.IdentityServer.EntityFrameworkCore; namespace Volo.Abp.IdentityServer { - public class ClientRepository : EfCoreRepository, IClientRepository + public class ClientRepository : EfCoreRepository, IClientRepository { public ClientRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) { diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResourceRepository.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResourceRepository.cs index ff49b87a8e..80659d6f28 100644 --- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResourceRepository.cs +++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/IdentityResourceRepository.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; @@ -13,7 +14,7 @@ namespace Volo.Abp.IdentityServer { //TODO: This is not true implementation! This repository works for 2 different aggregate root! - public class IdentityResourceRepository : EfCoreRepository, IIdentityResourceRepository + public class IdentityResourceRepository : EfCoreRepository, IIdentityResourceRepository { public IdentityResourceRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/PersistedGrantRepository.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/PersistedGrantRepository.cs index 0b1011992c..999192a27c 100644 --- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/PersistedGrantRepository.cs +++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/PersistedGrantRepository.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; @@ -9,7 +10,7 @@ using Volo.Abp.IdentityServer.Grants; namespace Volo.Abp.IdentityServer { - public class PersistentGrantRepository : EfCoreRepository, IPersistentGrantRepository + public class PersistentGrantRepository : EfCoreRepository, IPersistentGrantRepository { public PersistentGrantRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) { diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantRepository.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantRepository.cs index d8486c8ae6..563cf8dc0d 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantRepository.cs +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/ITenantRepository.cs @@ -4,7 +4,7 @@ using Volo.Abp.Domain.Repositories; namespace Volo.Abp.MultiTenancy { - public interface ITenantRepository : IRepository + public interface ITenantRepository : IRepository { Task FindByNameIncludeDetailsAsync(string name); diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/Tenant.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/Tenant.cs index 4a572526c5..4c6d4feac4 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/Tenant.cs +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/Tenant.cs @@ -6,7 +6,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.MultiTenancy { - public class Tenant : AggregateRoot + public class Tenant : AggregateRoot { public virtual string Name { get; protected set; } diff --git a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs index 2d3c5235e1..c65163aaac 100644 --- a/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs +++ b/src/Volo.Abp.MultiTenancy.Domain/Volo/Abp/MultiTenancy/TenantConnectionString.cs @@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.MultiTenancy { - public class TenantConnectionString : Entity //TODO: This should be a value object! + public class TenantConnectionString : Entity //TODO: PK should be TenantId + Name (so, inherit from Entity) { public virtual Guid TenantId { get; protected set; } diff --git a/src/Volo.Abp.MultiTenancy.EntityFrameworkCore/Volo/Abp/MultiTenancy/EfCoreTenantRepository.cs b/src/Volo.Abp.MultiTenancy.EntityFrameworkCore/Volo/Abp/MultiTenancy/EfCoreTenantRepository.cs index 66b6ed0fa3..6b52af0d1d 100644 --- a/src/Volo.Abp.MultiTenancy.EntityFrameworkCore/Volo/Abp/MultiTenancy/EfCoreTenantRepository.cs +++ b/src/Volo.Abp.MultiTenancy.EntityFrameworkCore/Volo/Abp/MultiTenancy/EfCoreTenantRepository.cs @@ -7,7 +7,7 @@ using Volo.Abp.MultiTenancy.EntityFrameworkCore; namespace Volo.Abp.MultiTenancy { - public class EfCoreTenantRepository : EfCoreRepository, ITenantRepository + public class EfCoreTenantRepository : EfCoreRepository, ITenantRepository { public EfCoreTenantRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntity.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntity.cs index 0a0b2f6bf4..8f24cb0966 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntity.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/SampleClasses/MyEntity.cs @@ -1,8 +1,9 @@ -using Volo.Abp.Domain.Entities; +using System; +using Volo.Abp.Domain.Entities; namespace Volo.Abp.AutoMapper.SampleClasses { - public class MyEntity : Entity + public class MyEntity : Entity { public int Number { get; set; } } diff --git a/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs index fbbbc0c77c..8a0f7ae652 100644 --- a/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs +++ b/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Entities; using Xunit; @@ -127,7 +126,7 @@ namespace Volo.Abp.Domain.Repositories public class MyFakeDbContext { } - public class MyTestAggregateRootWithDefaultPk : AggregateRoot + public class MyTestAggregateRootWithDefaultPk : AggregateRoot { } @@ -137,7 +136,7 @@ namespace Volo.Abp.Domain.Repositories } - public class MyTestDefaultRepository : MyTestDefaultRepository, IRepository + public class MyTestDefaultRepository : MyTestDefaultRepository where TEntity : class, IEntity { @@ -182,7 +181,7 @@ namespace Volo.Abp.Domain.Repositories } - public class MyTestCustomBaseRepository : MyTestCustomBaseRepository, IRepository + public class MyTestCustomBaseRepository : MyTestCustomBaseRepository where TEntity : class, IEntity { diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/SecondContext/BookInSecondDbContext.cs b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/SecondContext/BookInSecondDbContext.cs index 61bc73b5ec..0e22533c11 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/SecondContext/BookInSecondDbContext.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/SecondContext/BookInSecondDbContext.cs @@ -1,8 +1,9 @@ -using Volo.Abp.Domain.Entities; +using System; +using Volo.Abp.Domain.Entities; namespace Volo.Abp.EntityFrameworkCore.TestApp.SecondContext { - public class BookInSecondDbContext : AggregateRoot + public class BookInSecondDbContext : AggregateRoot { public string Name { get; set; } } diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/SecondContext/SecondContextTestDataBuilder.cs b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/SecondContext/SecondContextTestDataBuilder.cs index 1beb893d17..5e7658706c 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/SecondContext/SecondContextTestDataBuilder.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/SecondContext/SecondContextTestDataBuilder.cs @@ -1,4 +1,5 @@ -using Volo.Abp.DependencyInjection; +using System; +using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.Guids; @@ -6,10 +7,10 @@ namespace Volo.Abp.EntityFrameworkCore.TestApp.SecondContext { public class SecondContextTestDataBuilder : ITransientDependency { - private readonly IRepository _bookRepository; + private readonly IRepository _bookRepository; private readonly IGuidGenerator _guidGenerator; - public SecondContextTestDataBuilder(IRepository bookRepository, IGuidGenerator guidGenerator) + public SecondContextTestDataBuilder(IRepository bookRepository, IGuidGenerator guidGenerator) { _bookRepository = bookRepository; _guidGenerator = guidGenerator; diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/ThirdDbContext/ThirdDbContextDummyEntity.cs b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/ThirdDbContext/ThirdDbContextDummyEntity.cs index f88dfc2cb8..bcb1cf65b7 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/ThirdDbContext/ThirdDbContextDummyEntity.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo/Abp/EntityFrameworkCore/TestApp/ThirdDbContext/ThirdDbContextDummyEntity.cs @@ -1,8 +1,9 @@ -using Volo.Abp.Domain.Entities; +using System; +using Volo.Abp.Domain.Entities; namespace Volo.Abp.EntityFrameworkCore.TestApp.ThirdDbContext { - public class ThirdDbContextDummyEntity : AggregateRoot + public class ThirdDbContextDummyEntity : AggregateRoot { public string Value { get; set; } } diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/MultiTenant_Filter_Tests.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/MultiTenant_Filter_Tests.cs index ab9dda2e72..6fe033ebce 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/MultiTenant_Filter_Tests.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/MultiTenant_Filter_Tests.cs @@ -17,12 +17,12 @@ namespace Volo.Abp.EntityFrameworkCore.DataFiltering public class MultiTenant_Filter_Tests : EntityFrameworkCoreTestBase { private ICurrentTenant _fakeCurrentTenant; - private readonly IRepository _personRepository; + private readonly IRepository _personRepository; private readonly IDataFilter _multiTenantFilter; public MultiTenant_Filter_Tests() { - _personRepository = GetRequiredService>(); + _personRepository = GetRequiredService>(); _multiTenantFilter = GetRequiredService>(); } diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/SoftDelete_Filter_Tests.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/SoftDelete_Filter_Tests.cs index ba28f82b5c..fd087a4268 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/SoftDelete_Filter_Tests.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/SoftDelete_Filter_Tests.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using Shouldly; using Volo.Abp.Data; using Volo.Abp.Domain.Repositories; @@ -9,12 +10,12 @@ namespace Volo.Abp.EntityFrameworkCore.DataFiltering { public class SoftDelete_Filter_Tests : EntityFrameworkCoreTestBase { - private readonly IRepository _personRepository; + private readonly IRepository _personRepository; private readonly IDataFilter _dataFilter; public SoftDelete_Filter_Tests() { - _personRepository = GetRequiredService>(); + _personRepository = GetRequiredService>(); _dataFilter = GetRequiredService(); } diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DbContext_Replace_Tests.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DbContext_Replace_Tests.cs index a86797feed..755ea0b3f7 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DbContext_Replace_Tests.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DbContext_Replace_Tests.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using System; +using Microsoft.Extensions.DependencyInjection; using Shouldly; using Volo.Abp.Domain.Repositories; using Volo.Abp.EntityFrameworkCore.TestApp.ThirdDbContext; @@ -9,11 +10,11 @@ namespace Volo.Abp.EntityFrameworkCore { public class DbContext_Replace_Tests : EntityFrameworkCoreTestBase { - private readonly IRepository _dummyRepository; + private readonly IRepository _dummyRepository; public DbContext_Replace_Tests() { - _dummyRepository = ServiceProvider.GetRequiredService>(); + _dummyRepository = ServiceProvider.GetRequiredService>(); } [Fact] diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/Basic_Repository_Tests.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/Basic_Repository_Tests.cs index 3c2edb33f9..55f35f94da 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/Basic_Repository_Tests.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/Basic_Repository_Tests.cs @@ -12,14 +12,14 @@ namespace Volo.Abp.EntityFrameworkCore.Repositories { public class Basic_Repository_Tests : EntityFrameworkCoreTestBase { - private readonly IRepository _personRepository; - private readonly IRepository _bookRepository; + private readonly IRepository _personRepository; + private readonly IRepository _bookRepository; private readonly IRepository _phoneInSecondDbContextRepository; public Basic_Repository_Tests() { - _personRepository = ServiceProvider.GetRequiredService>(); - _bookRepository = ServiceProvider.GetRequiredService>(); + _personRepository = ServiceProvider.GetRequiredService>(); + _bookRepository = ServiceProvider.GetRequiredService>(); _phoneInSecondDbContextRepository = ServiceProvider.GetRequiredService>(); } diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transaction_Tests.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transaction_Tests.cs index 572b4efc3f..58fe4b0a38 100644 --- a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transaction_Tests.cs +++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transaction_Tests.cs @@ -12,14 +12,14 @@ namespace Volo.Abp.EntityFrameworkCore { public class Transaction_Tests : EntityFrameworkCoreTestBase { - private readonly IRepository _personRepository; - private readonly IRepository _bookRepository; + private readonly IRepository _personRepository; + private readonly IRepository _bookRepository; private readonly IUnitOfWorkManager _unitOfWorkManager; public Transaction_Tests() { - _personRepository = ServiceProvider.GetRequiredService>(); - _bookRepository = ServiceProvider.GetRequiredService>(); + _personRepository = ServiceProvider.GetRequiredService>(); + _bookRepository = ServiceProvider.GetRequiredService>(); _unitOfWorkManager = ServiceProvider.GetRequiredService(); } diff --git a/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs b/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs index e4af66fa62..71fa487415 100644 --- a/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs +++ b/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/PersonAppServiceClientProxy_Tests.cs @@ -15,12 +15,12 @@ namespace Volo.Abp.Http.DynamicProxying public class PersonAppServiceClientProxy_Tests : AbpHttpTestBase { private readonly IPeopleAppService _peopleAppService; - private readonly IRepository _personRepository; + private readonly IRepository _personRepository; public PersonAppServiceClientProxy_Tests() { _peopleAppService = ServiceProvider.GetRequiredService(); - _personRepository = ServiceProvider.GetRequiredService>(); + _personRepository = ServiceProvider.GetRequiredService>(); } [Fact] diff --git a/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/DataFilters/MultiTenant_Filter_Tests.cs b/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/DataFilters/MultiTenant_Filter_Tests.cs index 33d79461e4..e3c5c5fc24 100644 --- a/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/DataFilters/MultiTenant_Filter_Tests.cs +++ b/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/DataFilters/MultiTenant_Filter_Tests.cs @@ -17,12 +17,12 @@ namespace Volo.Abp.MemoryDb.DataFilters public class MemoryDb_MultiTenant_Filter_Tests : MemoryDbTestBase { private ICurrentTenant _fakeCurrentTenant; - private readonly IRepository _personRepository; + private readonly IRepository _personRepository; private readonly IDataFilter _multiTenantFilter; public MemoryDb_MultiTenant_Filter_Tests() { - _personRepository = GetRequiredService>(); + _personRepository = GetRequiredService>(); _multiTenantFilter = GetRequiredService>(); } diff --git a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs index 6f91db9c30..553ca30abd 100644 --- a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs +++ b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/Person.cs @@ -5,7 +5,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.TestApp.Domain { - public class Person : AggregateRoot, IMultiTenant, ISoftDelete + public class Person : AggregateRoot, IMultiTenant, ISoftDelete { public virtual Guid? TenantId { get; set; } diff --git a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs index 80e6e8e2a7..a87691ffe8 100644 --- a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs +++ b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestDataBuilder.cs @@ -10,9 +10,9 @@ namespace Volo.Abp.TestApp public static Guid TenantId1 { get; } = new Guid("55687dce-595c-41b4-a024-2a5e991ac8f4"); public static Guid TenantId2 { get; } = new Guid("f522d19f-5a86-4278-98fb-0577319c544a"); - private readonly IRepository _personRepository; + private readonly IRepository _personRepository; - public TestDataBuilder(IRepository personRepository) + public TestDataBuilder(IRepository personRepository) { _personRepository = personRepository; }