From 8146c20a57e56cd81899321c1eb71c521cc18f99 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:43:02 +0300 Subject: [PATCH] CommonDbContextRegistrationOptions to AbpCommonDbContextRegistrationOptions --- ...> AbpCommonDbContextRegistrationOptions.cs} | 18 +++++++++--------- ...mmonDbContextRegistrationOptionsBuilder.cs} | 16 ++++++++-------- .../Repositories/RepositoryRegistrarBase.cs | 2 +- .../AbpDbContextRegistrationOptions.cs | 2 +- .../IAbpDbContextRegistrationOptionsBuilder.cs | 2 +- ...emoryDbContextRegistrationOptionsBuilder.cs | 2 +- .../MemoryDbContextRegistrationOptions.cs | 2 +- ...MongoDbContextRegistrationOptionsBuilder.cs | 2 +- .../MongoDbContextRegistrationOptions.cs | 2 +- .../RepositoryRegistration_Tests.cs | 6 +++--- 10 files changed, 27 insertions(+), 27 deletions(-) rename framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/{CommonDbContextRegistrationOptions.cs => AbpCommonDbContextRegistrationOptions.cs} (81%) rename framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/{ICommonDbContextRegistrationOptionsBuilder.cs => IAbpCommonDbContextRegistrationOptionsBuilder.cs} (74%) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs similarity index 81% rename from framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs rename to framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs index b4ce91d615..c7f7230710 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/CommonDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/AbpCommonDbContextRegistrationOptions.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.DependencyInjection /// /// This is a base class for dbcoUse derived /// - public abstract class CommonDbContextRegistrationOptions : ICommonDbContextRegistrationOptionsBuilder + public abstract class AbpCommonDbContextRegistrationOptions : IAbpCommonDbContextRegistrationOptionsBuilder { public Type OriginalDbContextType { get; } @@ -31,7 +31,7 @@ namespace Volo.Abp.DependencyInjection public bool SpecifiedDefaultRepositoryTypes => DefaultRepositoryImplementationType != null && DefaultRepositoryImplementationTypeWithoutKey != null; - protected CommonDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) + protected AbpCommonDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) { OriginalDbContextType = originalDbContextType; Services = services; @@ -40,12 +40,12 @@ namespace Volo.Abp.DependencyInjection ReplacedDbContextTypes = new List(); } - public ICommonDbContextRegistrationOptionsBuilder ReplaceDbContext() + public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext() { return ReplaceDbContext(typeof(TOtherDbContext)); } - public ICommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType) + public IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType) { if (!otherDbContextType.IsAssignableFrom(OriginalDbContextType)) { @@ -57,7 +57,7 @@ namespace Volo.Abp.DependencyInjection return this; } - public ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false) + public IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false) { RegisterDefaultRepositories = true; IncludeAllEntitiesForDefaultRepositories = includeAllEntities; @@ -65,7 +65,7 @@ namespace Volo.Abp.DependencyInjection return this; } - public ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false) + public IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false) { if (!defaultRepositoryDbContextType.IsAssignableFrom(OriginalDbContextType)) { @@ -77,19 +77,19 @@ namespace Volo.Abp.DependencyInjection return AddDefaultRepositories(includeAllEntities); } - public ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false) + public IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false) { return AddDefaultRepositories(typeof(TDefaultRepositoryDbContext), includeAllEntities); } - public ICommonDbContextRegistrationOptionsBuilder AddRepository() + public IAbpCommonDbContextRegistrationOptionsBuilder AddRepository() { AddCustomRepository(typeof(TEntity), typeof(TRepository)); return this; } - public ICommonDbContextRegistrationOptionsBuilder SetDefaultRepositoryClasses( + public IAbpCommonDbContextRegistrationOptionsBuilder SetDefaultRepositoryClasses( Type repositoryImplementationType, Type repositoryImplementationTypeWithoutKey ) diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs similarity index 74% rename from framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs rename to framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs index 32403707c2..368fa2dc96 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/ICommonDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/DependencyInjection/IAbpCommonDbContextRegistrationOptionsBuilder.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection; namespace Volo.Abp.DependencyInjection { - public interface ICommonDbContextRegistrationOptionsBuilder + public interface IAbpCommonDbContextRegistrationOptionsBuilder { IServiceCollection Services { get; } @@ -15,7 +15,7 @@ namespace Volo.Abp.DependencyInjection /// Registers repositories only for aggregate root entities by default. /// set to true to include all entities. /// - ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false); + IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false); /// /// Registers default repositories for this DbContext. @@ -26,7 +26,7 @@ namespace Volo.Abp.DependencyInjection /// Registers repositories only for aggregate root entities by default. /// set to true to include all entities. /// - ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false); + IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(bool includeAllEntities = false); /// /// Registers default repositories for this DbContext. @@ -37,7 +37,7 @@ namespace Volo.Abp.DependencyInjection /// Registers repositories only for aggregate root entities by default. /// set to true to include all entities. /// - ICommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false); + IAbpCommonDbContextRegistrationOptionsBuilder AddDefaultRepositories(Type defaultRepositoryDbContextType, bool includeAllEntities = false); /// /// Registers custom repository for a specific entity. @@ -45,7 +45,7 @@ namespace Volo.Abp.DependencyInjection /// /// Entity type /// Repository type - ICommonDbContextRegistrationOptionsBuilder AddRepository(); + IAbpCommonDbContextRegistrationOptionsBuilder AddRepository(); /// /// Uses given class(es) for default repositories. @@ -53,18 +53,18 @@ namespace Volo.Abp.DependencyInjection /// Repository implementation type /// Repository implementation type (without primary key) /// - ICommonDbContextRegistrationOptionsBuilder SetDefaultRepositoryClasses([NotNull] Type repositoryImplementationType, [NotNull] Type repositoryImplementationTypeWithoutKey); + IAbpCommonDbContextRegistrationOptionsBuilder SetDefaultRepositoryClasses([NotNull] Type repositoryImplementationType, [NotNull] Type repositoryImplementationTypeWithoutKey); /// /// Replaces given DbContext type with this DbContext type. /// /// The DbContext type to be replaced - ICommonDbContextRegistrationOptionsBuilder ReplaceDbContext(); + IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(); /// /// Replaces given DbContext type with this DbContext type. /// /// The DbContext type to be replaced - ICommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType); + IAbpCommonDbContextRegistrationOptionsBuilder ReplaceDbContext(Type otherDbContextType); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs index 3ffe507d29..f3b2fc388f 100644 --- a/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs +++ b/framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs @@ -7,7 +7,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.Domain.Repositories { public abstract class RepositoryRegistrarBase - where TOptions: CommonDbContextRegistrationOptions + where TOptions: AbpCommonDbContextRegistrationOptions { public TOptions Options { get; } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs index be5f504ffd..50f2a4bce5 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs @@ -6,7 +6,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { - public class AbpDbContextRegistrationOptions : CommonDbContextRegistrationOptions, IAbpDbContextRegistrationOptionsBuilder + public class AbpDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IAbpDbContextRegistrationOptionsBuilder { public Dictionary EntityOptions { get; } diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs index d72bbe414f..b2eb839944 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs @@ -5,7 +5,7 @@ using Volo.Abp.Domain.Entities; namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { - public interface IAbpDbContextRegistrationOptionsBuilder : ICommonDbContextRegistrationOptionsBuilder + public interface IAbpDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder { void Entity([NotNull] Action> optionsAction) where TEntity : IEntity; diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs index 27081fe83c..74eb0317f7 100644 --- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/IMemoryDbContextRegistrationOptionsBuilder.cs @@ -2,7 +2,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MemoryDb.DependencyInjection { - public interface IMemoryDbContextRegistrationOptionsBuilder : ICommonDbContextRegistrationOptionsBuilder + public interface IMemoryDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder { } diff --git a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs index d3380ffc41..a605576bbd 100644 --- a/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.MemoryDb/Volo/Abp/MemoryDb/DependencyInjection/MemoryDbContextRegistrationOptions.cs @@ -4,7 +4,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MemoryDb.DependencyInjection { - public class MemoryDbContextRegistrationOptions : CommonDbContextRegistrationOptions, IMemoryDbContextRegistrationOptionsBuilder + public class MemoryDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IMemoryDbContextRegistrationOptionsBuilder { public MemoryDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) : base(originalDbContextType, services) diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs index 6504639862..0e82c8755c 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs @@ -2,7 +2,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MongoDB.DependencyInjection { - public interface IMongoDbContextRegistrationOptionsBuilder : ICommonDbContextRegistrationOptionsBuilder + public interface IMongoDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder { } diff --git a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs index bc748e12e9..2915a3ccdd 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs +++ b/framework/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs @@ -4,7 +4,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.MongoDB.DependencyInjection { - public class MongoDbContextRegistrationOptions : CommonDbContextRegistrationOptions, IMongoDbContextRegistrationOptionsBuilder + public class MongoDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IMongoDbContextRegistrationOptionsBuilder { public MongoDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) : base(originalDbContextType, services) diff --git a/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs index 24f14ddf6e..820a62892e 100644 --- a/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs +++ b/framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs @@ -187,9 +187,9 @@ namespace Volo.Abp.Domain.Repositories services.ShouldContainTransient(typeof(IRepository), typeof(MyTestCustomBaseRepository)); } - public class MyTestRepositoryRegistrar : RepositoryRegistrarBase + public class MyTestRepositoryRegistrar : RepositoryRegistrarBase { - public MyTestRepositoryRegistrar(CommonDbContextRegistrationOptions options) + public MyTestRepositoryRegistrar(AbpCommonDbContextRegistrationOptions options) : base(options) { } @@ -331,7 +331,7 @@ namespace Volo.Abp.Domain.Repositories } - public class TestDbContextRegistrationOptions : CommonDbContextRegistrationOptions + public class TestDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions { public TestDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services) : base(originalDbContextType, services)