Browse Source

rename template contributor to template content contributor

pull/3792/head
Halil İbrahim Kalkan 6 years ago
parent
commit
e1990d1a3f
  1. 4
      framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs
  2. 4
      framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContentContributor.cs
  3. 4
      framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorInitializationContext.cs
  4. 2
      framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorList.cs
  5. 2
      framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentProvider.cs
  6. 8
      framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs
  7. 2
      framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs
  8. 6
      framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContentContributor.cs
  9. 8
      framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs

4
framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs

@ -44,12 +44,12 @@ namespace Volo.Abp.TextTemplating
foreach (var templateDefinition in templateDefinitionManager.GetAll()) foreach (var templateDefinition in templateDefinitionManager.GetAll())
{ {
var contributorInitializationContext = new TemplateContributorInitializationContext( var contributorInitializationContext = new TemplateContentContributorInitializationContext(
templateDefinition, templateDefinition,
scope.ServiceProvider scope.ServiceProvider
); );
foreach (var contributor in templateDefinition.Contributors) foreach (var contributor in templateDefinition.ContentContributors)
{ {
contributor.Initialize(contributorInitializationContext); contributor.Initialize(contributorInitializationContext);
} }

4
framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContributor.cs → framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/ITemplateContentContributor.cs

@ -3,9 +3,9 @@ using JetBrains.Annotations;
namespace Volo.Abp.TextTemplating namespace Volo.Abp.TextTemplating
{ {
public interface ITemplateContributor public interface ITemplateContentContributor
{ {
void Initialize(TemplateContributorInitializationContext context); void Initialize(TemplateContentContributorInitializationContext context);
Task<string> GetOrNullAsync([CanBeNull] string cultureName); Task<string> GetOrNullAsync([CanBeNull] string cultureName);
} }

4
framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorInitializationContext.cs → framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorInitializationContext.cs

@ -3,7 +3,7 @@ using JetBrains.Annotations;
namespace Volo.Abp.TextTemplating namespace Volo.Abp.TextTemplating
{ {
public class TemplateContributorInitializationContext public class TemplateContentContributorInitializationContext
{ {
[NotNull] [NotNull]
public TemplateDefinition TemplateDefinition { get; } public TemplateDefinition TemplateDefinition { get; }
@ -11,7 +11,7 @@ namespace Volo.Abp.TextTemplating
[NotNull] [NotNull]
public IServiceProvider ServiceProvider { get; } public IServiceProvider ServiceProvider { get; }
public TemplateContributorInitializationContext( public TemplateContentContributorInitializationContext(
[NotNull] TemplateDefinition templateDefinition, [NotNull] TemplateDefinition templateDefinition,
[NotNull] IServiceProvider serviceProvider) [NotNull] IServiceProvider serviceProvider)
{ {

2
framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContributorList.cs → framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentContributorList.cs

@ -2,7 +2,7 @@
namespace Volo.Abp.TextTemplating namespace Volo.Abp.TextTemplating
{ {
public class TemplateContributorList : List<ITemplateContributor> public class TemplateContentContributorList : List<ITemplateContentContributor>
{ {
} }

2
framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateContentProvider.cs

@ -29,7 +29,7 @@ namespace Volo.Abp.TextTemplating
{ {
Check.NotNull(templateDefinition, nameof(templateDefinition)); Check.NotNull(templateDefinition, nameof(templateDefinition));
foreach (var contributor in templateDefinition.Contributors) foreach (var contributor in templateDefinition.ContentContributors)
{ {
var templateString = await contributor.GetOrNullAsync(cultureName); var templateString = await contributor.GetOrNullAsync(cultureName);
if (templateString != null) if (templateString != null)

8
framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinition.cs

@ -16,7 +16,7 @@ namespace Volo.Abp.TextTemplating
[CanBeNull] [CanBeNull]
public Type LocalizationResource { get; set; } public Type LocalizationResource { get; set; }
public TemplateContributorList Contributors { get; } public TemplateContentContributorList ContentContributors { get; }
[CanBeNull] [CanBeNull]
public string DefaultCultureName { get; } public string DefaultCultureName { get; }
@ -30,15 +30,15 @@ namespace Volo.Abp.TextTemplating
{ {
Name = Check.NotNullOrWhiteSpace(name, nameof(name)); Name = Check.NotNullOrWhiteSpace(name, nameof(name));
LocalizationResource = localizationResource; LocalizationResource = localizationResource;
Contributors = new TemplateContributorList(); ContentContributors = new TemplateContentContributorList();
IsLayout = isLayout; IsLayout = isLayout;
Layout = layout; Layout = layout;
DefaultCultureName = defaultCultureName; DefaultCultureName = defaultCultureName;
} }
public virtual TemplateDefinition WithContributor(ITemplateContributor contributor) public virtual TemplateDefinition WithContributor(ITemplateContentContributor contentContributor)
{ {
Contributors.Add(contributor); ContentContributors.Add(contentContributor);
return this; return this;
} }
} }

2
framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs

@ -18,7 +18,7 @@ namespace Volo.Abp.TextTemplating
Check.NotNull(templateDefinition, nameof(templateDefinition)); Check.NotNull(templateDefinition, nameof(templateDefinition));
return templateDefinition.WithContributor( return templateDefinition.WithContributor(
new VirtualFileTemplateContributor(virtualPath) new VirtualFileTemplateContentContributor(virtualPath)
); );
} }
} }

6
framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor.cs → framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContentContributor.cs

@ -10,7 +10,7 @@ using Volo.Abp.VirtualFileSystem;
namespace Volo.Abp.TextTemplating.VirtualFiles namespace Volo.Abp.TextTemplating.VirtualFiles
{ {
public class VirtualFileTemplateContributor : ITemplateContributor public class VirtualFileTemplateContentContributor : ITemplateContentContributor
{ {
public TemplateDefinition TemplateDefinition { get; private set; } public TemplateDefinition TemplateDefinition { get; private set; }
@ -19,13 +19,13 @@ namespace Volo.Abp.TextTemplating.VirtualFiles
private volatile Dictionary<string, string> _templateDictionary; private volatile Dictionary<string, string> _templateDictionary;
private readonly object _syncObj = new object(); private readonly object _syncObj = new object();
public VirtualFileTemplateContributor( public VirtualFileTemplateContentContributor(
[NotNull] string virtualPath) [NotNull] string virtualPath)
{ {
_virtualPath = Check.NotNullOrWhiteSpace(virtualPath, nameof(virtualPath)); _virtualPath = Check.NotNullOrWhiteSpace(virtualPath, nameof(virtualPath));
} }
public void Initialize(TemplateContributorInitializationContext context) public void Initialize(TemplateContentContributorInitializationContext context)
{ {
_virtualFileProvider = context.ServiceProvider.GetRequiredService<IVirtualFileProvider>(); _virtualFileProvider = context.ServiceProvider.GetRequiredService<IVirtualFileProvider>();
TemplateDefinition = context.TemplateDefinition; TemplateDefinition = context.TemplateDefinition;

8
framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor_Tests.cs

@ -9,12 +9,12 @@ namespace Volo.Abp.TextTemplating.VirtualFiles
[Fact] [Fact]
public async Task Should_Get_Localized_Content_By_Culture() public async Task Should_Get_Localized_Content_By_Culture()
{ {
var contributor = new VirtualFileTemplateContributor( var contributor = new VirtualFileTemplateContentContributor(
"/SampleTemplates/WelcomeEmail" "/SampleTemplates/WelcomeEmail"
); );
contributor.Initialize( contributor.Initialize(
new TemplateContributorInitializationContext( new TemplateContentContributorInitializationContext(
new TemplateDefinition("Test"), new TemplateDefinition("Test"),
ServiceProvider ServiceProvider
) )
@ -30,12 +30,12 @@ namespace Volo.Abp.TextTemplating.VirtualFiles
[Fact] [Fact]
public async Task Should_Get_Non_Localized_Template_Content() public async Task Should_Get_Non_Localized_Template_Content()
{ {
var contributor = new VirtualFileTemplateContributor( var contributor = new VirtualFileTemplateContentContributor(
"/SampleTemplates/ForgotPasswordEmail.tpl" "/SampleTemplates/ForgotPasswordEmail.tpl"
); );
contributor.Initialize( contributor.Initialize(
new TemplateContributorInitializationContext( new TemplateContentContributorInitializationContext(
new TemplateDefinition("Test"), new TemplateDefinition("Test"),
ServiceProvider ServiceProvider
) )

Loading…
Cancel
Save