From 792f9aee965bfcd84d0836415ef24f23bb215af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sun, 18 Dec 2016 13:22:10 +0300 Subject: [PATCH] Refactored. --- .../Volo/Abp/ServiceProviderAccessorExtensions.cs | 1 + .../MultiTenancy/ICurrentTenantResolveContext.cs | 2 ++ src/Volo.Abp/Volo/Abp/AbpApplication.cs | 11 +++++++++-- .../Volo/Abp/AbpApplicationCreationOptions.cs | 2 ++ .../DependencyInjection/IServiceProviderAccessor.cs | 9 +++++++++ src/Volo.Abp/Volo/Abp/IServiceProviderAccessor.cs | 9 --------- src/Volo.Abp/Volo/Abp/Modularity/ModuleLoader.cs | 13 +++++++++---- src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs | 1 + 8 files changed, 33 insertions(+), 15 deletions(-) create mode 100644 src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs delete mode 100644 src/Volo.Abp/Volo/Abp/IServiceProviderAccessor.cs diff --git a/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs b/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs index ccc7901875..e5349f771f 100644 --- a/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs +++ b/src/Volo.Abp.AspNetCore/Volo/Abp/ServiceProviderAccessorExtensions.cs @@ -1,6 +1,7 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.DependencyInjection; namespace Volo.Abp { diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenantResolveContext.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenantResolveContext.cs index 158d93516f..0830e792d4 100644 --- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenantResolveContext.cs +++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ICurrentTenantResolveContext.cs @@ -1,3 +1,5 @@ +using Volo.Abp.DependencyInjection; + namespace Volo.Abp.MultiTenancy { public interface ICurrentTenantResolveContext : IServiceProviderAccessor diff --git a/src/Volo.Abp/Volo/Abp/AbpApplication.cs b/src/Volo.Abp/Volo/Abp/AbpApplication.cs index 95903a9cb2..acd362bd3a 100644 --- a/src/Volo.Abp/Volo/Abp/AbpApplication.cs +++ b/src/Volo.Abp/Volo/Abp/AbpApplication.cs @@ -8,10 +8,12 @@ namespace Volo.Abp { public class AbpApplication { + [NotNull] public Type StartupModuleType { get; } public IServiceProvider ServiceProvider { get; private set; } + [NotNull] internal AbpModuleDescriptor[] Modules { get; } private AbpApplication( @@ -65,7 +67,10 @@ namespace Volo.Abp Check.NotNull(serviceProvider, nameof(serviceProvider)); ServiceProvider = serviceProvider; - ServiceProvider.GetRequiredService().InitializeModules(new ApplicationInitializationContext(serviceProvider)); + + ServiceProvider + .GetRequiredService() + .InitializeModules(new ApplicationInitializationContext(serviceProvider)); } private AbpModuleDescriptor[] LoadModules(IServiceCollection services, AbpApplicationCreationOptions options) @@ -81,7 +86,9 @@ namespace Volo.Abp public void Shutdown() { - ServiceProvider.GetRequiredService().ShutdownModules(new ApplicationShutdownContext()); + ServiceProvider + .GetRequiredService() + .ShutdownModules(new ApplicationShutdownContext()); } } } diff --git a/src/Volo.Abp/Volo/Abp/AbpApplicationCreationOptions.cs b/src/Volo.Abp/Volo/Abp/AbpApplicationCreationOptions.cs index 2c13bb6c5c..869d7eb8a2 100644 --- a/src/Volo.Abp/Volo/Abp/AbpApplicationCreationOptions.cs +++ b/src/Volo.Abp/Volo/Abp/AbpApplicationCreationOptions.cs @@ -1,9 +1,11 @@ +using JetBrains.Annotations; using Volo.Abp.Modularity.PlugIns; namespace Volo.Abp { public class AbpApplicationCreationOptions { + [NotNull] public PlugInSourceList PlugInSources { get; private set; } public AbpApplicationCreationOptions() diff --git a/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs new file mode 100644 index 0000000000..22c4a7d627 --- /dev/null +++ b/src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs @@ -0,0 +1,9 @@ +using System; + +namespace Volo.Abp.DependencyInjection +{ + public interface IServiceProviderAccessor //TODO: Move to Volo.DependencyInjection package? + { + IServiceProvider ServiceProvider { get; } + } +} \ No newline at end of file diff --git a/src/Volo.Abp/Volo/Abp/IServiceProviderAccessor.cs b/src/Volo.Abp/Volo/Abp/IServiceProviderAccessor.cs deleted file mode 100644 index 529ec880f8..0000000000 --- a/src/Volo.Abp/Volo/Abp/IServiceProviderAccessor.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace Volo.Abp -{ - public interface IServiceProviderAccessor - { - IServiceProvider ServiceProvider { get; } - } -} \ No newline at end of file diff --git a/src/Volo.Abp/Volo/Abp/Modularity/ModuleLoader.cs b/src/Volo.Abp/Volo/Abp/Modularity/ModuleLoader.cs index 5d5f5a691f..72c79a0518 100644 --- a/src/Volo.Abp/Volo/Abp/Modularity/ModuleLoader.cs +++ b/src/Volo.Abp/Volo/Abp/Modularity/ModuleLoader.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using JetBrains.Annotations; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity.PlugIns; using Volo.ExtensionMethods.Collections.Generic; @@ -10,8 +9,10 @@ namespace Volo.Abp.Modularity { public class ModuleLoader : IModuleLoader { - [NotNull] - public AbpModuleDescriptor[] LoadModules([NotNull] IServiceCollection services, [NotNull] Type startupModuleType, [NotNull] PlugInSourceList plugInSources) + public AbpModuleDescriptor[] LoadModules( + IServiceCollection services, + Type startupModuleType, + PlugInSourceList plugInSources) { Check.NotNull(services, nameof(services)); Check.NotNull(startupModuleType, nameof(startupModuleType)); @@ -27,7 +28,11 @@ namespace Volo.Abp.Modularity return modules.ToArray(); } - protected virtual void FillModules(List modules, IServiceCollection services, Type startupModuleType, PlugInSourceList plugInSources) + protected virtual void FillModules( + List modules, + IServiceCollection services, + Type startupModuleType, + PlugInSourceList plugInSources) { //All modules starting from the startup module var moduleTypes = AbpModuleHelper.FindAllModuleTypes(startupModuleType); diff --git a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs b/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs index e333ee56f8..c59bbe858c 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs +++ b/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using JetBrains.Annotations; +using Volo.Abp.DependencyInjection; using Volo.DependencyInjection; namespace Volo.Abp.Uow