From 2ab26c9399b5357fe4aa432c76858e07a5f8394e Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 28 Dec 2018 18:07:46 +0800 Subject: [PATCH] Contributor misspelled. --- .../AbpAspNetCoreMultiTenancyModule.cs | 8 ++++---- ...uter.cs => CookieTenantResolveContributor.cs} | 2 +- ...uter.cs => DomainTenantResolveContributor.cs} | 4 ++-- ...uter.cs => HeaderTenantResolveContributor.cs} | 4 ++-- .../HttpTenantResolveContributerBase.cs | 4 ++-- ...cs => QueryStringTenantResolveContributor.cs} | 2 +- ...buter.cs => RouteTenantResolveContributor.cs} | 2 +- .../MultiTenancyOptionsExtensions.cs | 4 ++-- .../JQueryValidationScriptContributor.cs | 2 +- .../InternalServiceCollectionExtensions.cs | 8 ++++---- ...r.cs => DefaultModuleLifecycleContributor.cs} | 8 ++++---- ...ributer.cs => IModuleLifecycleContributor.cs} | 2 +- .../Modularity/ModuleLifecycleContributerBase.cs | 2 +- .../Abp/Modularity/ModuleLifecycleOptions.cs | 4 ++-- .../Volo/Abp/Modularity/ModuleManager.cs | 16 ++++++++-------- ...uter.cs => ActionTenantResolveContributor.cs} | 4 ++-- ...ntClaimsPrincipalTenantResolveContributor.cs} | 2 +- ...ntributer.cs => ITenantResolveContributor.cs} | 2 +- .../Volo/Abp/MultiTenancy/ITenantResolver.cs | 2 +- .../Abp/MultiTenancy/TenantResolveOptions.cs | 6 +++--- .../Volo/Abp/Ui/Navigation/MenuManager_Tests.cs | 8 ++++---- 21 files changed, 48 insertions(+), 48 deletions(-) rename framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/{CookieTenantResolveContributer.cs => CookieTenantResolveContributor.cs} (81%) rename framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/{DomainTenantResolveContributer.cs => DomainTenantResolveContributor.cs} (87%) rename framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/{HeaderTenantResolveContributer.cs => HeaderTenantResolveContributor.cs} (93%) rename framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/{QueryStringTenantResolveContributer.cs => QueryStringTenantResolveContributor.cs} (85%) rename framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/{RouteTenantResolveContributer.cs => RouteTenantResolveContributor.cs} (87%) rename framework/src/Volo.Abp.Core/Volo/Abp/Modularity/{DefaultModuleLifecycleContributer.cs => DefaultModuleLifecycleContributor.cs} (83%) rename framework/src/Volo.Abp.Core/Volo/Abp/Modularity/{IModuleLifecycleContributer.cs => IModuleLifecycleContributor.cs} (83%) rename framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/{ActionTenantResolveContributer.cs => ActionTenantResolveContributor.cs} (75%) rename framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/{CurrentClaimsPrincipalTenantResolveContributer.cs => CurrentClaimsPrincipalTenantResolveContributor.cs} (86%) rename framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/{ITenantResolveContributer.cs => ITenantResolveContributor.cs} (67%) diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs index 7f00a58069..7ba8766dd8 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs @@ -14,10 +14,10 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { Configure(options => { - options.TenantResolvers.Add(new QueryStringTenantResolveContributer()); - options.TenantResolvers.Add(new RouteTenantResolveContributer()); - options.TenantResolvers.Add(new HeaderTenantResolveContributer()); - options.TenantResolvers.Add(new CookieTenantResolveContributer()); + options.TenantResolvers.Add(new QueryStringTenantResolveContributor()); + options.TenantResolvers.Add(new RouteTenantResolveContributor()); + options.TenantResolvers.Add(new HeaderTenantResolveContributor()); + options.TenantResolvers.Add(new CookieTenantResolveContributor()); }); } } diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributer.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs similarity index 81% rename from framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributer.cs rename to framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs index ebce890ea9..5b27a9d93c 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributer.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributor.cs @@ -3,7 +3,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.AspNetCore.MultiTenancy { - public class CookieTenantResolveContributer : HttpTenantResolveContributerBase + public class CookieTenantResolveContributor : HttpTenantResolveContributorBase { protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext) { diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributer.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs similarity index 87% rename from framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributer.cs rename to framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs index 2894fcf0df..e342cb8f40 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributer.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributor.cs @@ -7,11 +7,11 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { //TODO: Create a better domain format. We can accept regex for example. - public class DomainTenantResolveContributer : HttpTenantResolveContributerBase + public class DomainTenantResolveContributor : HttpTenantResolveContributorBase { private readonly string _domainFormat; - public DomainTenantResolveContributer(string domainFormat) + public DomainTenantResolveContributor(string domainFormat) { _domainFormat = domainFormat.RemovePreFix("http://", "https://"); } diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributer.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs similarity index 93% rename from framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributer.cs rename to framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs index 58acdc493c..3f5e93bd36 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributer.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributor.cs @@ -7,7 +7,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.AspNetCore.MultiTenancy { - public class HeaderTenantResolveContributer : HttpTenantResolveContributerBase + public class HeaderTenantResolveContributor : HttpTenantResolveContributorBase { protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext) { @@ -36,7 +36,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy { context .ServiceProvider - .GetRequiredService>() + .GetRequiredService>() .LogWarning(text); } } diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs index 51bdc57323..d2971063a5 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HttpTenantResolveContributerBase.cs @@ -7,7 +7,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.AspNetCore.MultiTenancy { - public abstract class HttpTenantResolveContributerBase : ITenantResolveContributer + public abstract class HttpTenantResolveContributorBase : ITenantResolveContributor { public virtual void Resolve(ITenantResolveContext context) { @@ -24,7 +24,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy catch (Exception e) { context.ServiceProvider - .GetRequiredService>() + .GetRequiredService>() .LogWarning(e.ToString()); } } diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributer.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs similarity index 85% rename from framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributer.cs rename to framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs index 88bd3bcc0d..9899e2613e 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributer.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributor.cs @@ -3,7 +3,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.AspNetCore.MultiTenancy { - public class QueryStringTenantResolveContributer : HttpTenantResolveContributerBase + public class QueryStringTenantResolveContributor : HttpTenantResolveContributorBase { protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext) { diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributer.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs similarity index 87% rename from framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributer.cs rename to framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs index 10d4f1ebe1..3be155c68d 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributer.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributor.cs @@ -5,7 +5,7 @@ using Volo.Abp.MultiTenancy; namespace Volo.Abp.AspNetCore.MultiTenancy { - public class RouteTenantResolveContributer : HttpTenantResolveContributerBase + public class RouteTenantResolveContributor : HttpTenantResolveContributorBase { protected override string GetTenantIdOrNameFromHttpContextOrNull(ITenantResolveContext context, HttpContext httpContext) { diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs index 8e6d3ae7ea..a162f1750e 100644 --- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs +++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyOptionsExtensions.cs @@ -8,8 +8,8 @@ namespace Volo.Abp.MultiTenancy public static void AddDomainTenantResolver(this TenantResolveOptions options, string domainFormat) { options.TenantResolvers.InsertAfter( - r => r is CurrentClaimsPrincipalTenantResolveContributer, - new DomainTenantResolveContributer(domainFormat) + r => r is CurrentClaimsPrincipalTenantResolveContributor, + new DomainTenantResolveContributor(domainFormat) ); } } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs index 83fad24207..2ac0d58acf 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs @@ -20,7 +20,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidation { //TODO: Can we optimize these points: // - Can we get rid of context.FileProvider.GetFileInfo call? - // - What if the same contributer is used twice for a page. + // - What if the same Contributor is used twice for a page. // Duplication is prevented by the bundle manager, however the logic below will execute twice var cultureName = CultureInfo.CurrentUICulture.TwoLetterISOLanguageName.Replace('-', '_'); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs index b653f8d2a1..5b50e6fee2 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs @@ -40,10 +40,10 @@ namespace Volo.Abp.Internal services.Configure(options => { - options.Contributers.Add(); - options.Contributers.Add(); - options.Contributers.Add(); - options.Contributers.Add(); + options.Contributors.Add(); + options.Contributors.Add(); + options.Contributors.Add(); + options.Contributors.Add(); }); } } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributer.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributor.cs similarity index 83% rename from framework/src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributer.cs rename to framework/src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributor.cs index 063fe0cf12..b20c48e97e 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributer.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributor.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Modularity { - public class OnApplicationInitializationModuleLifecycleContributer : ModuleLifecycleContributerBase + public class OnApplicationInitializationModuleLifecycleContributor : ModuleLifecycleContributorBase { public override void Initialize(ApplicationInitializationContext context, IAbpModule module) { @@ -8,7 +8,7 @@ } } - public class OnApplicationShutdownModuleLifecycleContributer : ModuleLifecycleContributerBase + public class OnApplicationShutdownModuleLifecycleContributor : ModuleLifecycleContributorBase { public override void Shutdown(ApplicationShutdownContext context, IAbpModule module) { @@ -16,7 +16,7 @@ } } - public class OnPreApplicationInitializationModuleLifecycleContributer : ModuleLifecycleContributerBase + public class OnPreApplicationInitializationModuleLifecycleContributor : ModuleLifecycleContributorBase { public override void Initialize(ApplicationInitializationContext context, IAbpModule module) { @@ -24,7 +24,7 @@ } } - public class OnPostApplicationInitializationModuleLifecycleContributer : ModuleLifecycleContributerBase + public class OnPostApplicationInitializationModuleLifecycleContributor : ModuleLifecycleContributorBase { public override void Initialize(ApplicationInitializationContext context, IAbpModule module) { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributer.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributor.cs similarity index 83% rename from framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributer.cs rename to framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributor.cs index b1ec934100..7c1931310f 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributer.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributor.cs @@ -3,7 +3,7 @@ using Volo.Abp.DependencyInjection; namespace Volo.Abp.Modularity { - public interface IModuleLifecycleContributer : ISingletonDependency + public interface IModuleLifecycleContributor : ISingletonDependency { void Initialize([NotNull] ApplicationInitializationContext context, [NotNull] IAbpModule module); diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleContributerBase.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleContributerBase.cs index b78aac1df0..c7238f0628 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleContributerBase.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleContributerBase.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Modularity { - public abstract class ModuleLifecycleContributerBase : IModuleLifecycleContributer + public abstract class ModuleLifecycleContributorBase : IModuleLifecycleContributor { public virtual void Initialize(ApplicationInitializationContext context, IAbpModule module) { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs index 75f53357b4..8136a32677 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs @@ -4,11 +4,11 @@ namespace Volo.Abp.Modularity { public class ModuleLifecycleOptions { - public ITypeList Contributers { get; } + public ITypeList Contributors { get; } public ModuleLifecycleOptions() { - Contributers = new TypeList(); + Contributors = new TypeList(); } } } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs index 57488692e3..d79ae0b843 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs @@ -11,7 +11,7 @@ namespace Volo.Abp.Modularity public class ModuleManager : IModuleManager, ISingletonDependency { private readonly IModuleContainer _moduleContainer; - private readonly IEnumerable _lifecycleContributers; + private readonly IEnumerable _lifecycleContributors; private readonly ILogger _logger; public ModuleManager( @@ -23,10 +23,10 @@ namespace Volo.Abp.Modularity _moduleContainer = moduleContainer; _logger = logger; - _lifecycleContributers = options.Value - .Contributers + _lifecycleContributors = options.Value + .Contributors .Select(serviceProvider.GetRequiredService) - .Cast() + .Cast() .ToArray(); } @@ -34,11 +34,11 @@ namespace Volo.Abp.Modularity { LogListOfModules(); - foreach (var contributer in _lifecycleContributers) + foreach (var Contributor in _lifecycleContributors) { foreach (var module in _moduleContainer.Modules) { - contributer.Initialize(context, module.Instance); + Contributor.Initialize(context, module.Instance); } } @@ -59,11 +59,11 @@ namespace Volo.Abp.Modularity { var modules = _moduleContainer.Modules.Reverse().ToList(); - foreach (var contributer in _lifecycleContributers) + foreach (var Contributor in _lifecycleContributors) { foreach (var module in modules) { - contributer.Shutdown(context, module.Instance); + Contributor.Shutdown(context, module.Instance); } } } diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributer.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs similarity index 75% rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributer.cs rename to framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs index f54a3acfe1..ac2cdeee5a 100644 --- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributer.cs +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributor.cs @@ -3,11 +3,11 @@ using JetBrains.Annotations; namespace Volo.Abp.MultiTenancy { - public class ActionTenantResolveContributer : ITenantResolveContributer + public class ActionTenantResolveContributor : ITenantResolveContributor { private readonly Action _resolveAction; - public ActionTenantResolveContributer([NotNull] Action resolveAction) + public ActionTenantResolveContributor([NotNull] Action resolveAction) { Check.NotNull(resolveAction, nameof(resolveAction)); diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributer.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs similarity index 86% rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributer.cs rename to framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs index 4d9beb36e6..4a2709129a 100644 --- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributer.cs +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributor.cs @@ -4,7 +4,7 @@ using Volo.Abp.Security.Claims; namespace Volo.Abp.MultiTenancy { - public class CurrentClaimsPrincipalTenantResolveContributer : ITenantResolveContributer + public class CurrentClaimsPrincipalTenantResolveContributor : ITenantResolveContributor { public void Resolve(ITenantResolveContext context) { diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributer.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs similarity index 67% rename from framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributer.cs rename to framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs index f4cfa0b353..bff87d35ab 100644 --- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributer.cs +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributor.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.MultiTenancy { - public interface ITenantResolveContributer + public interface ITenantResolveContributor { void Resolve(ITenantResolveContext context); } diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolver.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolver.cs index 5d6a62ac2d..35efdd14b0 100644 --- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolver.cs +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolver.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.MultiTenancy public interface ITenantResolver { /// - /// Tries to resolve current tenant using registered implementations. + /// Tries to resolve current tenant using registered implementations. /// /// /// Tenant id, unique name or null (if could not resolve). diff --git a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveOptions.cs b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveOptions.cs index 6cee735e84..9d12f2b0b6 100644 --- a/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveOptions.cs +++ b/framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/TenantResolveOptions.cs @@ -6,13 +6,13 @@ namespace Volo.Abp.MultiTenancy public class TenantResolveOptions { [NotNull] - public List TenantResolvers { get; } + public List TenantResolvers { get; } public TenantResolveOptions() { - TenantResolvers = new List + TenantResolvers = new List { - new CurrentClaimsPrincipalTenantResolveContributer() + new CurrentClaimsPrincipalTenantResolveContributor() }; } } diff --git a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs index 8b06afd001..c7f2093e83 100644 --- a/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs +++ b/framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs @@ -38,8 +38,8 @@ namespace Volo.Abp.UI.Navigation { Configure(options => { - options.MenuContributors.Add(new TestMenuContributer1()); - options.MenuContributors.Add(new TestMenuContributer2()); + options.MenuContributors.Add(new TestMenuContributor1()); + options.MenuContributors.Add(new TestMenuContributor2()); }); } } @@ -49,7 +49,7 @@ namespace Volo.Abp.UI.Navigation * - User Management * - Role Management */ - public class TestMenuContributer1 : IMenuContributor + public class TestMenuContributor1 : IMenuContributor { public Task ConfigureMenuAsync(MenuConfigurationContext context) { @@ -77,7 +77,7 @@ namespace Volo.Abp.UI.Navigation * - Administration * - Dashboard Settings */ - public class TestMenuContributer2 : IMenuContributor + public class TestMenuContributor2 : IMenuContributor { public Task ConfigureMenuAsync(MenuConfigurationContext context) {