From eaa4ac70e2cf9583ededa6ba2a10c6f713fd6f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 2 Jan 2017 22:51:52 +0300 Subject: [PATCH] Moved DI registration code to proper namespaces. --- .../AbpEfCoreServiceCollectionExtensions.cs | 1 + .../Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs | 2 +- .../AbpDbContextConfigurationContext.cs | 3 +-- .../DependencyInjection/AbpDbContextConfigurerAction.cs | 4 +--- .../DependencyInjection/AbpDbContextRegistrationOptions.cs | 2 +- .../DependencyInjection/DbContextOptionsFactory.cs | 5 ++--- .../DependencyInjection/EfCoreRepositoryRegistrar.cs | 5 ++--- .../DependencyInjection/IAbpDbContextConfigurer.cs | 4 +--- .../IAbpDbContextRegistrationOptionsBuilder.cs | 2 +- .../AbpMongoDbServiceCollectionExtensions.cs | 1 + .../DependencyInjection}/EfCoreRepositoryRegistrar.cs | 7 +++---- .../IMongoDbContextRegistrationOptionsBuilder.cs | 3 +-- .../MongoDbContextRegistrationOptions.cs | 3 +-- .../Repositories}/RepositoryRegistrarBase.cs | 3 ++- 14 files changed, 19 insertions(+), 26 deletions(-) rename src/Volo.Abp.EntityFrameworkCore/{Microsoft/Extensions => Volo/Abp/EntityFrameworkCore}/DependencyInjection/AbpDbContextConfigurationContext.cs (93%) rename src/Volo.Abp.EntityFrameworkCore/{Microsoft/Extensions => Volo/Abp/EntityFrameworkCore}/DependencyInjection/AbpDbContextConfigurerAction.cs (89%) rename src/Volo.Abp.EntityFrameworkCore/{Microsoft/Extensions => Volo/Abp/EntityFrameworkCore}/DependencyInjection/AbpDbContextRegistrationOptions.cs (73%) rename src/Volo.Abp.EntityFrameworkCore/{Microsoft/Extensions => Volo/Abp/EntityFrameworkCore}/DependencyInjection/DbContextOptionsFactory.cs (93%) rename src/Volo.Abp.EntityFrameworkCore/{Microsoft/Extensions => Volo/Abp/EntityFrameworkCore}/DependencyInjection/EfCoreRepositoryRegistrar.cs (89%) rename src/Volo.Abp.EntityFrameworkCore/{Microsoft/Extensions => Volo/Abp/EntityFrameworkCore}/DependencyInjection/IAbpDbContextConfigurer.cs (78%) rename src/Volo.Abp.EntityFrameworkCore/{Microsoft/Extensions => Volo/Abp/EntityFrameworkCore}/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs (70%) rename src/Volo.Abp.MongoDB/Volo/Abp/{Domain/Repositories/MongoDB => MongoDB/DependencyInjection}/EfCoreRepositoryRegistrar.cs (87%) rename src/Volo.Abp.MongoDB/{Microsoft/Extensions => Volo/Abp/MongoDB}/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs (62%) rename src/Volo.Abp.MongoDB/{Microsoft/Extensions => Volo/Abp/MongoDB}/DependencyInjection/MongoDbContextRegistrationOptions.cs (65%) rename src/Volo.Abp/Volo/Abp/{Data => Domain/Repositories}/RepositoryRegistrarBase.cs (97%) diff --git a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreServiceCollectionExtensions.cs b/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreServiceCollectionExtensions.cs index 98ada91e2d..fcb2a8e8fe 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreServiceCollectionExtensions.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpEfCoreServiceCollectionExtensions.cs @@ -1,6 +1,7 @@ using System; using Microsoft.Extensions.DependencyInjection.Extensions; using Volo.Abp.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore.DependencyInjection; namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs index 43acfacdaa..bc62473bd2 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContextOptions.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; -using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.EntityFrameworkCore.DependencyInjection; namespace Volo.Abp.EntityFrameworkCore { diff --git a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextConfigurationContext.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs similarity index 93% rename from src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextConfigurationContext.cs rename to src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs index e9c5467c4c..332d38f005 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextConfigurationContext.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurationContext.cs @@ -1,8 +1,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public class AbpDbContextConfigurationContext { diff --git a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextConfigurerAction.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurerAction.cs similarity index 89% rename from src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextConfigurerAction.cs rename to src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurerAction.cs index b37dbae82d..80868e28a7 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextConfigurerAction.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextConfigurerAction.cs @@ -1,9 +1,7 @@ using System; using JetBrains.Annotations; -using Volo; -using Volo.Abp.EntityFrameworkCore; -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public class AbpDbContextConfigurerAction : IAbpDbContextConfigurer { diff --git a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextRegistrationOptions.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs similarity index 73% rename from src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextRegistrationOptions.cs rename to src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs index ca1597c196..ed4cf4ce57 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/AbpDbContextRegistrationOptions.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs @@ -1,6 +1,6 @@ using Volo.Abp.Data; -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public class AbpDbContextRegistrationOptions : CommonDbContextRegistrationOptions, IAbpDbContextRegistrationOptionsBuilder { diff --git a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/DbContextOptionsFactory.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/DbContextOptionsFactory.cs similarity index 93% rename from src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/DbContextOptionsFactory.cs rename to src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/DbContextOptionsFactory.cs index a45c43926e..d8d2f63627 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/DbContextOptionsFactory.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/DbContextOptionsFactory.cs @@ -1,12 +1,11 @@ using System; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Volo.Abp; using Volo.Abp.Data; -using Volo.Abp.EntityFrameworkCore; using Volo.ExtensionMethods.Collections.Generic; -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { internal static class DbContextOptionsFactory { diff --git a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/EfCoreRepositoryRegistrar.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EfCoreRepositoryRegistrar.cs similarity index 89% rename from src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/EfCoreRepositoryRegistrar.cs rename to src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EfCoreRepositoryRegistrar.cs index 268f8927b1..ab834bef5a 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/EfCoreRepositoryRegistrar.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EfCoreRepositoryRegistrar.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using Volo.Abp.Data; +using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories.EntityFrameworkCore; -using Volo.Abp.EntityFrameworkCore; -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public class EfCoreRepositoryRegistrar : RepositoryRegistrarBase { diff --git a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/IAbpDbContextConfigurer.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextConfigurer.cs similarity index 78% rename from src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/IAbpDbContextConfigurer.cs rename to src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextConfigurer.cs index df6d7a80c2..51ba5532b0 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/IAbpDbContextConfigurer.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextConfigurer.cs @@ -1,6 +1,4 @@ -using Volo.Abp.EntityFrameworkCore; - -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public interface IAbpDbContextConfigurer { diff --git a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs similarity index 70% rename from src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs rename to src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs index aa9fc68458..2de7568857 100644 --- a/src/Volo.Abp.EntityFrameworkCore/Microsoft/Extensions/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs +++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs @@ -1,6 +1,6 @@ using Volo.Abp.Data; -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.EntityFrameworkCore.DependencyInjection { public interface IAbpDbContextRegistrationOptionsBuilder : ICommonDbContextRegistrationOptionsBuilder { diff --git a/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs b/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs index 04180246f8..47c35982e6 100644 --- a/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs +++ b/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/AbpMongoDbServiceCollectionExtensions.cs @@ -1,6 +1,7 @@ using System; using Volo.Abp.Domain.Repositories.MongoDB; using Volo.Abp.MongoDB; +using Volo.Abp.MongoDB.DependencyInjection; namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/EfCoreRepositoryRegistrar.cs b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/EfCoreRepositoryRegistrar.cs similarity index 87% rename from src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/EfCoreRepositoryRegistrar.cs rename to src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/EfCoreRepositoryRegistrar.cs index 8e54893fec..57a3d0654f 100644 --- a/src/Volo.Abp.MongoDB/Volo/Abp/Domain/Repositories/MongoDB/EfCoreRepositoryRegistrar.cs +++ b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/EfCoreRepositoryRegistrar.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Data; -using Volo.Abp.MongoDB; +using Volo.Abp.Domain.Repositories; +using Volo.Abp.Domain.Repositories.MongoDB; -namespace Volo.Abp.Domain.Repositories.MongoDB +namespace Volo.Abp.MongoDB.DependencyInjection { public class MongoDbRepositoryRegistrar : RepositoryRegistrarBase { diff --git a/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs similarity index 62% rename from src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs rename to src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs index 36774e9719..a2c2f77075 100644 --- a/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs +++ b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/IMongoDbContextRegistrationOptionsBuilder.cs @@ -1,7 +1,6 @@ using Volo.Abp.Data; -using Volo.Abp.Domain.Repositories; -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.MongoDB.DependencyInjection { public interface IMongoDbContextRegistrationOptionsBuilder : ICommonDbContextRegistrationOptionsBuilder { diff --git a/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/MongoDbContextRegistrationOptions.cs b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs similarity index 65% rename from src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/MongoDbContextRegistrationOptions.cs rename to src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs index 2bc2f278b1..b3d46f52f3 100644 --- a/src/Volo.Abp.MongoDB/Microsoft/Extensions/DependencyInjection/MongoDbContextRegistrationOptions.cs +++ b/src/Volo.Abp.MongoDB/Volo/Abp/MongoDB/DependencyInjection/MongoDbContextRegistrationOptions.cs @@ -1,7 +1,6 @@ using Volo.Abp.Data; -using Volo.Abp.Domain.Repositories; -namespace Microsoft.Extensions.DependencyInjection +namespace Volo.Abp.MongoDB.DependencyInjection { public class MongoDbContextRegistrationOptions : CommonDbContextRegistrationOptions, IMongoDbContextRegistrationOptionsBuilder { diff --git a/src/Volo.Abp/Volo/Abp/Data/RepositoryRegistrarBase.cs b/src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs similarity index 97% rename from src/Volo.Abp/Volo/Abp/Data/RepositoryRegistrarBase.cs rename to src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs index 0593f6bdec..8d7a51297b 100644 --- a/src/Volo.Abp/Volo/Abp/Data/RepositoryRegistrarBase.cs +++ b/src/Volo.Abp/Volo/Abp/Domain/Repositories/RepositoryRegistrarBase.cs @@ -2,9 +2,10 @@ using System; using System.Collections.Generic; using System.Reflection; using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Data; using Volo.Abp.Domain.Entities; -namespace Volo.Abp.Data +namespace Volo.Abp.Domain.Repositories { public abstract class RepositoryRegistrarBase where TOptions: CommonDbContextRegistrationOptions