From 9060b695ea6c06682a8d11c390463cd84b40423b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 22 Apr 2020 23:18:12 +0300 Subject: [PATCH] Added TemplateDefinitionExtensions. --- .../TemplateDefinitionExtensions.cs | 19 +++++++++++++++++++ .../VirtualFileTemplateContributor.cs | 6 +++--- .../TestTemplateDefinitionProvider.cs | 8 ++------ 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs new file mode 100644 index 0000000000..6508295da7 --- /dev/null +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/TemplateDefinitionExtensions.cs @@ -0,0 +1,19 @@ +using JetBrains.Annotations; +using Volo.Abp.TextTemplating.VirtualFiles; + +namespace Volo.Abp.TextTemplating +{ + public static class TemplateDefinitionExtensions + { + public static TemplateDefinition AddVirtualFiles( + [NotNull] this TemplateDefinition templateDefinition, + [NotNull] string virtualPath) + { + Check.NotNull(templateDefinition, nameof(templateDefinition)); + + return templateDefinition.AddContributor( + new VirtualFileTemplateContributor(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/VirtualFileTemplateContributor.cs index f7a320ab16..869a9cb7b1 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/VirtualFiles/VirtualFileTemplateContributor.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Threading; using JetBrains.Annotations; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; @@ -15,9 +14,10 @@ namespace Volo.Abp.TextTemplating.VirtualFiles private volatile Dictionary _templateDictionary; private readonly object _syncObj = new object(); - public VirtualFileTemplateContributor(string virtualPath) + public VirtualFileTemplateContributor( + [NotNull] string virtualPath) { - _virtualPath = virtualPath; + _virtualPath = Check.NotNullOrWhiteSpace(virtualPath, nameof(virtualPath)); } public void Initialize(TemplateContributorInitializationContext context) diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs index 57244c61c6..f47d31ac4e 100644 --- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs +++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs @@ -1,6 +1,4 @@ -using Volo.Abp.TextTemplating.VirtualFiles; - -namespace Volo.Abp.TextTemplating +namespace Volo.Abp.TextTemplating { public class TestTemplateDefinitionProvider : TemplateDefinitionProvider { @@ -9,9 +7,7 @@ namespace Volo.Abp.TextTemplating context.Add( new TemplateDefinition( TestTemplates.TestTemplate1 - ).AddContributor( - new VirtualFileTemplateContributor("/SampleTemplates/WelcomeEmail") - ) + ).AddVirtualFiles("/SampleTemplates/WelcomeEmail") ); context.Add(new TemplateDefinition(