From 60bdc06d2979a978d2788ef68d300ec22f455960 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <stef.heyenrath@gmail.com>
Date: Thu, 6 Jan 2022 21:25:15 +0100
Subject: [PATCH] Small refactor on Template logic

---
 .../Transformers/Handlebars/HandlebarsContextFactory.cs  | 5 +++--
 src/WireMock.Net/Transformers/Scriban/ScribanContext.cs  | 4 ++--
 .../Transformers/Scriban/ScribanContextFactory.cs        | 9 +++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs b/src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs
index 07368377..8488b3da 100644
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using HandlebarsDotNet;
 using JetBrains.Annotations;
+using Stef.Validation;
 using WireMock.Handlers;
 
 namespace WireMock.Transformers.Handlebars
@@ -12,7 +13,7 @@ namespace WireMock.Transformers.Handlebars
 
         public HandlebarsContextFactory([NotNull] IFileSystemHandler fileSystemHandler, [CanBeNull] Action<IHandlebars, IFileSystemHandler> action)
         {
-            _fileSystemHandler = fileSystemHandler ?? throw new ArgumentNullException(nameof(fileSystemHandler));
+            _fileSystemHandler = Guard.NotNull(fileSystemHandler);
             _action = action;
         }
 
diff --git a/src/WireMock.Net/Transformers/Scriban/ScribanContext.cs b/src/WireMock.Net/Transformers/Scriban/ScribanContext.cs
index 5f347fcf..4c33b783 100644
--- a/src/WireMock.Net/Transformers/Scriban/ScribanContext.cs
+++ b/src/WireMock.Net/Transformers/Scriban/ScribanContext.cs
@@ -1,5 +1,5 @@
-using System;
 using Scriban;
+using Stef.Validation;
 using WireMock.Handlers;
 using WireMock.Types;
 
@@ -13,7 +13,7 @@ namespace WireMock.Transformers.Scriban
 
         public ScribanContext(IFileSystemHandler fileSystemHandler, TransformerType transformerType)
         {
-            FileSystemHandler = fileSystemHandler ?? throw new ArgumentNullException(nameof(fileSystemHandler));
+            FileSystemHandler = Guard.NotNull(fileSystemHandler);
             _transformerType = transformerType;
         }
 
diff --git a/src/WireMock.Net/Transformers/Scriban/ScribanContextFactory.cs b/src/WireMock.Net/Transformers/Scriban/ScribanContextFactory.cs
index d4614f5c..6649deb7 100644
--- a/src/WireMock.Net/Transformers/Scriban/ScribanContextFactory.cs
+++ b/src/WireMock.Net/Transformers/Scriban/ScribanContextFactory.cs
@@ -1,4 +1,4 @@
-using WireMock.Handlers;
+using WireMock.Handlers;
 using WireMock.Types;
 using Stef.Validation;
 
@@ -11,11 +11,8 @@ namespace WireMock.Transformers.Scriban
 
         public ScribanContextFactory(IFileSystemHandler fileSystemHandler, TransformerType transformerType)
         {
-            Guard.NotNull(fileSystemHandler, nameof(fileSystemHandler));
-            Guard.Condition(transformerType, t => t == TransformerType.Scriban || t == TransformerType.ScribanDotLiquid, nameof(transformerType));
-
-            _fileSystemHandler = fileSystemHandler;
-            _transformerType = transformerType;
+            _fileSystemHandler = Guard.NotNull(fileSystemHandler);
+            _transformerType = Guard.Condition(transformerType, t => t == TransformerType.Scriban || t == TransformerType.ScribanDotLiquid);
         }
 
         public ITransformerContext Create()