From 27807c855ab0b70c93dc6c875f8dfd22a8a3b4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Thu, 15 Dec 2016 21:11:26 +0300 Subject: [PATCH] Renamed tenancy classes. --- ...der.cs => AsyncLocalTenantScopeProvider.cs} | 14 +++++++------- .../IAmbientTenantScopeProvider.cs | 11 ----------- .../Abp/MultiTenancy/ITenantScopeProvider.cs | 11 +++++++++++ .../Abp/MultiTenancy/MultiTenancyManager.cs | 12 ++++++------ ...solverAction.cs => SimpleTenantResolver.cs} | 4 ++-- .../{AmbientTenantScope.cs => TenantScope.cs} | 7 ++++--- ...yncLocalAmbientTenantScopeProvider_Tests.cs | 2 +- .../MultiTenantManager_TenantResolver_Tests.cs | 18 +++++++++--------- 8 files changed, 40 insertions(+), 39 deletions(-) rename src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/{AsyncLocalAmbientTenantScopeProvider.cs => AsyncLocalTenantScopeProvider.cs} (50%) delete mode 100644 src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IAmbientTenantScopeProvider.cs create mode 100644 src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs rename src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/{TenantResolverAction.cs => SimpleTenantResolver.cs} (79%) rename src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/{AmbientTenantScope.cs => TenantScope.cs} (63%) diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalAmbientTenantScopeProvider.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs similarity index 50% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalAmbientTenantScopeProvider.cs rename to src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs index a77e8d8b27..fb70cdf378 100644 --- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalAmbientTenantScopeProvider.cs +++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AsyncLocalTenantScopeProvider.cs @@ -4,25 +4,25 @@ using Volo.DependencyInjection; namespace Volo.Abp.MultiTenancy { - public class AsyncLocalAmbientTenantScopeProvider : IAmbientTenantScopeProvider, IScopedDependency + public class AsyncLocalTenantScopeProvider : ITenantScopeProvider, IScopedDependency { - public AmbientTenantScope CurrentScope + public TenantScope CurrentScope { get { return _tenant.Value; } - set { _tenant.Value = value; } + private set { _tenant.Value = value; } } - private readonly AsyncLocal _tenant; + private readonly AsyncLocal _tenant; - public AsyncLocalAmbientTenantScopeProvider() + public AsyncLocalTenantScopeProvider() { - _tenant = new AsyncLocal(); + _tenant = new AsyncLocal(); } public IDisposable EnterScope(TenantInfo tenantInfo) { var parentScope = CurrentScope; - CurrentScope = new AmbientTenantScope(tenantInfo); + CurrentScope = new TenantScope(tenantInfo); return new DisposeAction(() => { CurrentScope = parentScope; diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IAmbientTenantScopeProvider.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IAmbientTenantScopeProvider.cs deleted file mode 100644 index ed8d3ca4e1..0000000000 --- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/IAmbientTenantScopeProvider.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace Volo.Abp.MultiTenancy -{ - public interface IAmbientTenantScopeProvider - { - AmbientTenantScope CurrentScope { get; set; } - - IDisposable EnterScope(TenantInfo tenantInfo); - } -} \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs new file mode 100644 index 0000000000..cf469f22b2 --- /dev/null +++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantScopeProvider.cs @@ -0,0 +1,11 @@ +using System; + +namespace Volo.Abp.MultiTenancy +{ + public interface ITenantScopeProvider + { + TenantScope CurrentScope { get; } + + IDisposable EnterScope(TenantInfo tenantInfo); + } +} \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs index 095a466802..e40ffc098b 100644 --- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs +++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs @@ -8,22 +8,22 @@ namespace Volo.Abp.MultiTenancy { public TenantInfo CurrentTenant => GetCurrentTenant(); - private readonly IAmbientTenantScopeProvider _ambientTenantScopeProvider; + private readonly ITenantScopeProvider _tenantScopeProvider; private readonly IEnumerable _currentTenantResolvers; public MultiTenancyManager( - IAmbientTenantScopeProvider ambientTenantScopeProvider, + ITenantScopeProvider tenantScopeProvider, IEnumerable currentTenantResolvers) { - _ambientTenantScopeProvider = ambientTenantScopeProvider; + _tenantScopeProvider = tenantScopeProvider; _currentTenantResolvers = currentTenantResolvers; } protected virtual TenantInfo GetCurrentTenant() { - if (_ambientTenantScopeProvider.CurrentScope != null) + if (_tenantScopeProvider.CurrentScope != null) { - return _ambientTenantScopeProvider.CurrentScope.Tenant; + return _tenantScopeProvider.CurrentScope.Tenant; } var context = new CurrentTenantResolveContext(); @@ -42,7 +42,7 @@ namespace Volo.Abp.MultiTenancy public IDisposable ChangeTenant(TenantInfo tenantInfo) { - return _ambientTenantScopeProvider.EnterScope(tenantInfo); + return _tenantScopeProvider.EnterScope(tenantInfo); } } } diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolverAction.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/SimpleTenantResolver.cs similarity index 79% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolverAction.cs rename to src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/SimpleTenantResolver.cs index 7652c1352c..acbe453601 100644 --- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantResolverAction.cs +++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/SimpleTenantResolver.cs @@ -3,11 +3,11 @@ using JetBrains.Annotations; namespace Volo.Abp.MultiTenancy { - public class TenantResolverAction : ITenantResolver + public class SimpleTenantResolver : ITenantResolver { private readonly Action _resolveAction; - public TenantResolverAction([NotNull] Action resolveAction) + public SimpleTenantResolver([NotNull] Action resolveAction) { Check.NotNull(resolveAction, nameof(resolveAction)); diff --git a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AmbientTenantScope.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantScope.cs similarity index 63% rename from src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AmbientTenantScope.cs rename to src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantScope.cs index f3cc1b8ed0..7476ac0a1f 100644 --- a/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AmbientTenantScope.cs +++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantScope.cs @@ -2,15 +2,16 @@ namespace Volo.Abp.MultiTenancy { - public class AmbientTenantScope + public class TenantScope { /// /// Null indicates the host. /// Not null value for a tenant. /// - public TenantInfo Tenant { get; set; } + [CanBeNull] + public TenantInfo Tenant { get; } - public AmbientTenantScope([CanBeNull] TenantInfo tenant) + public TenantScope([CanBeNull] TenantInfo tenant) { Tenant = tenant; } diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/AsyncLocalAmbientTenantScopeProvider_Tests.cs b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/AsyncLocalAmbientTenantScopeProvider_Tests.cs index 5a14ed7450..35a8998986 100644 --- a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/AsyncLocalAmbientTenantScopeProvider_Tests.cs +++ b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/AsyncLocalAmbientTenantScopeProvider_Tests.cs @@ -8,7 +8,7 @@ namespace Volo.Abp.MultiTenancy [Fact] public void Should_Support_Inner_Scopes() { - var scopeProvider = new AsyncLocalAmbientTenantScopeProvider(); + var scopeProvider = new AsyncLocalTenantScopeProvider(); scopeProvider.CurrentScope.ShouldBeNull(); diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantManager_TenantResolver_Tests.cs b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantManager_TenantResolver_Tests.cs index 33bebe6088..c87189e0db 100644 --- a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantManager_TenantResolver_Tests.cs +++ b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenantManager_TenantResolver_Tests.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.MultiTenancy { //Arrange - var manager = new MultiTenancyManager(Substitute.For(), new ITenantResolver[0]); + var manager = new MultiTenancyManager(Substitute.For(), new ITenantResolver[0]); //Assert @@ -26,9 +26,9 @@ namespace Volo.Abp.MultiTenancy var fakeTenant = new TenantInfo(Guid.NewGuid().ToString(), "acme"); - var manager = new MultiTenancyManager(Substitute.For(), new[] + var manager = new MultiTenancyManager(Substitute.For(), new[] { - new TenantResolverAction(context => + new SimpleTenantResolver(context => { context.Tenant = fakeTenant; context.Handled = true; @@ -48,18 +48,18 @@ namespace Volo.Abp.MultiTenancy var fakeTenant = new TenantInfo(Guid.NewGuid().ToString(), "acme"); - var manager = new MultiTenancyManager(Substitute.For(), new[] + var manager = new MultiTenancyManager(Substitute.For(), new[] { - new TenantResolverAction(context => + new SimpleTenantResolver(context => { context.Tenant = new TenantInfo(Guid.NewGuid().ToString(), "skipped-tenant-1"); }), - new TenantResolverAction(context => + new SimpleTenantResolver(context => { context.Tenant = fakeTenant; context.Handled = true; }), - new TenantResolverAction(context => + new SimpleTenantResolver(context => { context.Tenant = new TenantInfo(Guid.NewGuid().ToString(), "skipped-tenant-2"); context.Handled = true; @@ -78,9 +78,9 @@ namespace Volo.Abp.MultiTenancy var oldTenant = new TenantInfo(Guid.NewGuid().ToString(), "old-tenant"); - var manager = new MultiTenancyManager(new AsyncLocalAmbientTenantScopeProvider(), new[] + var manager = new MultiTenancyManager(new AsyncLocalTenantScopeProvider(), new[] { - new TenantResolverAction(context => + new SimpleTenantResolver(context => { context.Tenant = oldTenant; context.Handled = true;