Merge pull request #699 from cnAbp/misspelled

Contributor misspelled.

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/AbpAspNetCoreMultiTenancyModule.cs

@@ -14,10 +14,10 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         {
             Configure<TenantResolveOptions>(options =>
             {
-                options.TenantResolvers.Add(new QueryStringTenantResolveContributer());
+                options.TenantResolvers.Add(new QueryStringTenantResolveContributor());
-                options.TenantResolvers.Add(new RouteTenantResolveContributer());
+                options.TenantResolvers.Add(new RouteTenantResolveContributor());
-                options.TenantResolvers.Add(new HeaderTenantResolveContributer());
+                options.TenantResolvers.Add(new HeaderTenantResolveContributor());
-                options.TenantResolvers.Add(new CookieTenantResolveContributer());
+                options.TenantResolvers.Add(new CookieTenantResolveContributor());
             });
         }
     }

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/CookieTenantResolveContributer.cs → 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)
         {

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/DomainTenantResolveContributer.cs → 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://");
         }

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/HeaderTenantResolveContributer.cs → 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<ILogger<HeaderTenantResolveContributer>>()
+                .GetRequiredService<ILogger<HeaderTenantResolveContributor>>()
                 .LogWarning(text);
         }
     }

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<ILogger<HttpTenantResolveContributerBase>>()
+                    .GetRequiredService<ILogger<HttpTenantResolveContributorBase>>()
                     .LogWarning(e.ToString());
             }
         }

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/QueryStringTenantResolveContributer.cs → 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)
         {

framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/RouteTenantResolveContributer.cs → 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)
         {

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,
+                r => r is CurrentClaimsPrincipalTenantResolveContributor,
-                new DomainTenantResolveContributer(domainFormat)
+                new DomainTenantResolveContributor(domainFormat)
             );
         }
     }

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('-', '_');

framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs

@@ -40,10 +40,10 @@ namespace Volo.Abp.Internal
 
             services.Configure<ModuleLifecycleOptions>(options =>
             {
-                options.Contributers.Add<OnPreApplicationInitializationModuleLifecycleContributer>();
+                options.Contributors.Add<OnPreApplicationInitializationModuleLifecycleContributor>();
-                options.Contributers.Add<OnApplicationInitializationModuleLifecycleContributer>();
+                options.Contributors.Add<OnApplicationInitializationModuleLifecycleContributor>();
-                options.Contributers.Add<OnPostApplicationInitializationModuleLifecycleContributer>();
+                options.Contributors.Add<OnPostApplicationInitializationModuleLifecycleContributor>();
-                options.Contributers.Add<OnApplicationShutdownModuleLifecycleContributer>();
+                options.Contributors.Add<OnApplicationShutdownModuleLifecycleContributor>();
             });
         }
     }

framework/src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributer.cs → 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)
         {

framework/src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributer.cs → 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);
 

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)
         {

framework/src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs

@@ -4,11 +4,11 @@ namespace Volo.Abp.Modularity
 {
     public class ModuleLifecycleOptions
     {
-        public ITypeList<IModuleLifecycleContributer> Contributers { get; }
+        public ITypeList<IModuleLifecycleContributor> Contributors { get; }
 
         public ModuleLifecycleOptions()
         {
-            Contributers = new TypeList<IModuleLifecycleContributer>();
+            Contributors = new TypeList<IModuleLifecycleContributor>();
         }
     }
 }

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<IModuleLifecycleContributer> _lifecycleContributers;
+        private readonly IEnumerable<IModuleLifecycleContributor> _lifecycleContributors;
         private readonly ILogger<ModuleManager> _logger;
 
         public ModuleManager(
@@ -23,10 +23,10 @@ namespace Volo.Abp.Modularity
             _moduleContainer = moduleContainer;
             _logger = logger;
 
-            _lifecycleContributers = options.Value
+            _lifecycleContributors = options.Value
-                .Contributers
+                .Contributors
                 .Select(serviceProvider.GetRequiredService)
-                .Cast<IModuleLifecycleContributer>()
+                .Cast<IModuleLifecycleContributor>()
                 .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);
                 }
             }
         }

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ActionTenantResolveContributer.cs → 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<ITenantResolveContext> _resolveAction;
 
-        public ActionTenantResolveContributer([NotNull] Action<ITenantResolveContext> resolveAction)
+        public ActionTenantResolveContributor([NotNull] Action<ITenantResolveContext> resolveAction)
         {
             Check.NotNull(resolveAction, nameof(resolveAction));
 

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentClaimsPrincipalTenantResolveContributer.cs → 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)
         {

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolveContributer.cs → 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);
     }

framework/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ITenantResolver.cs

@@ -5,7 +5,7 @@ namespace Volo.Abp.MultiTenancy
     public interface ITenantResolver
     {
         /// <summary>
-        /// Tries to resolve current tenant using registered <see cref="ITenantResolveContributer"/> implementations.
+        /// Tries to resolve current tenant using registered <see cref="ITenantResolveContributor"/> implementations.
         /// </summary>
         /// <returns>
         /// Tenant id, unique name or null (if could not resolve).

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<ITenantResolveContributer> TenantResolvers { get; }
+        public List<ITenantResolveContributor> TenantResolvers { get; }
 
         public TenantResolveOptions()
         {
-            TenantResolvers = new List<ITenantResolveContributer>
+            TenantResolvers = new List<ITenantResolveContributor>
             {
-                new CurrentClaimsPrincipalTenantResolveContributer()
+                new CurrentClaimsPrincipalTenantResolveContributor()
             };
         }
     }

framework/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs

@@ -38,8 +38,8 @@ namespace Volo.Abp.UI.Navigation
             {
                 Configure<NavigationOptions>(options =>
                 {
-                    options.MenuContributors.Add(new TestMenuContributer1());
+                    options.MenuContributors.Add(new TestMenuContributor1());
-                    options.MenuContributors.Add(new TestMenuContributer2());
+                    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)
             {