diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs index e49f271c1c..831de9c1c4 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs @@ -44,12 +44,12 @@ namespace Volo.Abp.TextTemplating foreach (var templateDefinition in templateDefinitionManager.GetAll()) { - var contributorInitializationContext = new TemplateContributorInitializationContext( + var contributorInitializationContext = new TemplateContentContributorInitializationContext( templateDefinition, scope.ServiceProvider ); - foreach (var contributor in templateDefinition.Contributors) + foreach (var contributor in templateDefinition.ContentContributors) { contributor.Initialize(contributorInitializationContext); } diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContributor.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContentContributor.cs similarity index 57% rename from framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContributor.cs rename to framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContentContributor.cs index 2174a65bcd..26aef67e94 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContributor.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContentContributor.cs @@ -3,9 +3,9 @@ using JetBrains.Annotations; namespace Volo.Abp.TextTemplating { - public interface ITemplateContributor + public interface ITemplateContentContributor { - void Initialize(TemplateContributorInitializationContext context); + void Initialize(TemplateContentContributorInitializationContext context); Task GetOrNullAsync([CanBeNull] string cultureName); } diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorInitializationContext.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorInitializationContext.cs similarity index 81% rename from framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorInitializationContext.cs rename to framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorInitializationContext.cs index ffe97a3484..523f7a6edf 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorInitializationContext.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorInitializationContext.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; namespace Volo.Abp.TextTemplating { - public class TemplateContributorInitializationContext + public class TemplateContentContributorInitializationContext { [NotNull] public TemplateDefinition TemplateDefinition { get; } @@ -11,7 +11,7 @@ namespace Volo.Abp.TextTemplating [NotNull] public IServiceProvider ServiceProvider { get; } - public TemplateContributorInitializationContext( + public TemplateContentContributorInitializationContext( [NotNull] TemplateDefinition templateDefinition, [NotNull] IServiceProvider serviceProvider) { diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorList.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorList.cs similarity index 52% rename from framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorList.cs rename to framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorList.cs index e737897dae..3c67a03dcc 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorList.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorList.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.TextTemplating { - public class TemplateContributorList : List + public class TemplateContentContributorList : List { } diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentProvider.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentProvider.cs index b983c75f11..7c7031c980 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentProvider.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentProvider.cs @@ -29,7 +29,7 @@ namespace Volo.Abp.TextTemplating { Check.NotNull(templateDefinition, nameof(templateDefinition)); - foreach (var contributor in templateDefinition.Contributors) + foreach (var contributor in templateDefinition.ContentContributors) { var templateString = await contributor.GetOrNullAsync(cultureName); if (templateString != null) diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs index 09de7bf458..4c4703d5e3 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs @@ -16,7 +16,7 @@ namespace Volo.Abp.TextTemplating [CanBeNull] public Type LocalizationResource { get; set; } - public TemplateContributorList Contributors { get; } + public TemplateContentContributorList ContentContributors { get; } [CanBeNull] public string DefaultCultureName { get; } @@ -30,15 +30,15 @@ namespace Volo.Abp.TextTemplating { Name = Check.NotNullOrWhiteSpace(name, nameof(name)); LocalizationResource = localizationResource; - Contributors = new TemplateContributorList(); + ContentContributors = new TemplateContentContributorList(); IsLayout = isLayout; Layout = layout; DefaultCultureName = defaultCultureName; } - public virtual TemplateDefinition WithContributor(ITemplateContributor contributor) + public virtual TemplateDefinition WithContributor(ITemplateContentContributor contentContributor) { - Contributors.Add(contributor); + ContentContributors.Add(contentContributor); return this; } } diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs index 9bd932c947..c9a644fedc 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs @@ -18,7 +18,7 @@ namespace Volo.Abp.TextTemplating Check.NotNull(templateDefinition, nameof(templateDefinition)); return templateDefinition.WithContributor( - new VirtualFileTemplateContributor(virtualPath) + new VirtualFileTemplateContentContributor(virtualPath) ); } } diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContentContributor.cs similarity index 93% rename from framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor.cs rename to framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContentContributor.cs index eded060a2e..5a6958e29b 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContentContributor.cs @@ -10,7 +10,7 @@ using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.TextTemplating.VirtualFiles { - public class VirtualFileTemplateContributor : ITemplateContributor + public class VirtualFileTemplateContentContributor : ITemplateContentContributor { public TemplateDefinition TemplateDefinition { get; private set; } @@ -19,13 +19,13 @@ namespace Volo.Abp.TextTemplating.VirtualFiles private volatile Dictionary _templateDictionary; private readonly object _syncObj = new object(); - public VirtualFileTemplateContributor( + public VirtualFileTemplateContentContributor( [NotNull] string virtualPath) { _virtualPath = Check.NotNullOrWhiteSpace(virtualPath, nameof(virtualPath)); } - public void Initialize(TemplateContributorInitializationContext context) + public void Initialize(TemplateContentContributorInitializationContext context) { _virtualFileProvider = context.ServiceProvider.GetRequiredService(); TemplateDefinition = context.TemplateDefinition; diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs index 1ff2596342..0bf54a5bee 100644 --- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs +++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs @@ -9,12 +9,12 @@ namespace Volo.Abp.TextTemplating.VirtualFiles [Fact] public async Task Should_Get_Localized_Content_By_Culture() { - var contributor = new VirtualFileTemplateContributor( + var contributor = new VirtualFileTemplateContentContributor( "/SampleTemplates/WelcomeEmail" ); contributor.Initialize( - new TemplateContributorInitializationContext( + new TemplateContentContributorInitializationContext( new TemplateDefinition("Test"), ServiceProvider ) @@ -30,12 +30,12 @@ namespace Volo.Abp.TextTemplating.VirtualFiles [Fact] public async Task Should_Get_Non_Localized_Template_Content() { - var contributor = new VirtualFileTemplateContributor( + var contributor = new VirtualFileTemplateContentContributor( "/SampleTemplates/ForgotPasswordEmail.tpl" ); contributor.Initialize( - new TemplateContributorInitializationContext( + new TemplateContentContributorInitializationContext( new TemplateDefinition("Test"), ServiceProvider )