[Add] ParameterValidation

DEH-CSV.Tests/Services/DataSourceSelectorTestFixture.cs

@@ -57,7 +57,7 @@ public void Verify_that_when_a_file_uri_is_provided_a_file_dal_is_returned()
 
             var dal = this.dataSourceSelector.Select(uri);
 
-            Assert.That(dal, Is.InstanceOf(typeof(CDP4JsonFileDal.JsonFileDal)));
+            Assert.That(dal, Is.InstanceOf<CDP4JsonFileDal.JsonFileDal>());
         }
 
         [Test]
@@ -68,11 +68,11 @@ public void Verify_that_when_a_http_uri_is_provided_a_file_dal_is_returned()
 
             var dal = this.dataSourceSelector.Select(httpUri);
 
-            Assert.That(dal, Is.InstanceOf(typeof(CDP4ServicesDal.CdpServicesDal)));
+            Assert.That(dal, Is.InstanceOf<CDP4ServicesDal.CdpServicesDal>());
 
             dal = this.dataSourceSelector.Select(httpsUri);
 
-            Assert.That(dal, Is.InstanceOf(typeof(CDP4ServicesDal.CdpServicesDal)));
+            Assert.That(dal, Is.InstanceOf<CDP4ServicesDal.CdpServicesDal>());
         }
 
         [Test]

DEH-CSV/CsvWriter.cs

@@ -89,6 +89,11 @@ public CsvWriter(ILoggerFactory loggerFactory = null)
         /// </param>
         public void Write(Iteration iteration, bool includeNestedElements, IEnumerable<TypeMap> maps, DirectoryInfo target, object options)
         {
+            if (iteration == null)
+            {
+                throw new ArgumentNullException(nameof(iteration));
+            }
+
             var things = iteration.Cache.Select(item => item.Value.Value).ToList();
 
             if (includeNestedElements)
@@ -105,15 +110,15 @@ public void Write(Iteration iteration, bool includeNestedElements, IEnumerable<T
                 }
             }
 
-            this.logger.LogDebug("A total of {count} are available in the data set", things.Count);
+            this.logger.LogDebug("A total of {Count} are available in the data set", things.Count);
 
             foreach (var typeMap in maps)
             {
                 var targetThings = things.Where(x => x.ClassKind == typeMap.ClassKind).ToList();
 
                 this.Write(targetThings, typeMap, target, options);
 
-                this.logger.LogInformation("Writing CSV file for {classKind}", typeMap.ClassKind);
+                this.logger.LogInformation("Writing CSV file for {ClassKind}", typeMap.ClassKind);
             }
         }
 
@@ -182,7 +187,7 @@ public virtual void Write(IEnumerable<Thing> things, TypeMap typeMap, DirectoryI
                     {
                         if (queryResult != null)
                         {
-                            var csvValue = propertyMap.ValuePrefix + queryResult.ToString();
+                            var csvValue = propertyMap.ValuePrefix + queryResult;
 
                             csvWriter.WriteField(csvValue, true);
                         }
@@ -198,7 +203,7 @@ public virtual void Write(IEnumerable<Thing> things, TypeMap typeMap, DirectoryI
 
             csvWriter.Flush();
 
-            this.logger.LogDebug("A total of {records} records was written to {filepath} in {time} [ms]",
+            this.logger.LogDebug("A total of {Records} records was written to {Filepath} in {Time} [ms]",
                 things.Count(), path, sw.ElapsedMilliseconds);
         }
 
@@ -228,6 +233,16 @@ public virtual void Write(IEnumerable<Thing> things, TypeMap typeMap, DirectoryI
         /// </remarks>
         protected virtual object QueryValue(Thing thing, PropertyMap propertyMap, object options)
         {
+            if (thing == null)
+            {
+                throw new ArgumentNullException(nameof(thing));
+            }
+
+            if (propertyMap == null)
+            {
+                throw new ArgumentNullException(nameof(propertyMap));
+            }
+
             return thing.QueryValue(propertyMap.Source);
         }
 
@@ -242,7 +257,7 @@ protected virtual object QueryValue(Thing thing, PropertyMap propertyMap, object
         /// </param>
         protected void WriteHeader(CsvHelper.CsvWriter csvWriter, TypeMap typeMap)
         {
-            this.logger.LogDebug("Writing Header for {typeMap}", typeMap.ClassKind.ToString());
+            this.logger.LogDebug("Writing Header for {TypeMap}", typeMap.ClassKind.ToString());
 
             foreach (var propertyMap in typeMap.Properties)
             {
@@ -281,4 +296,4 @@ protected internal string QueryFileName(TypeMap typeMap)
             return string.Join("-", result);
         }
     }
-}
+}

DEH-CSV/CustomProperties/ThingTimeStampPropertyEvaluator.cs

@@ -61,6 +61,11 @@ public string QueryValue(Thing thing, PropertyMap propertyMap, object options)
             // ThingTimeStamp or ThingTimeStampPropertyEvaluator and override the
             // CsvWriter.QueryValue method
 
+            if (thing == null)
+            {
+                throw new ArgumentNullException(nameof(thing));
+            }
+
             return $"{thing.ClassKind}:{DateTime.UtcNow}";
         }
     }

DEH-CSV/CustomProperties/ThingTimeStampedCSVWriter.cs

@@ -23,6 +23,7 @@ namespace STARIONGROUP.DEHCSV.CustomProperties
     using CDP4Common.CommonData;
 
     using  STARIONGROUP.DEHCSV.Mapping;
+    using System;
 
     /// <summary>
     /// Custom CSV Writer that used the <see cref="ThingTimeStampPropertyEvaluator"/>
@@ -56,6 +57,16 @@ public class ThingTimeStampedCSVWriter : CsvWriter
         /// </remarks>
         protected override object QueryValue(Thing thing, PropertyMap propertyMap, object options)
         {
+            if (thing == null)
+            {
+                throw new ArgumentNullException(nameof(thing));
+            }
+
+            if (propertyMap == null)
+            {
+                throw new ArgumentNullException(nameof(propertyMap));
+            }
+
             switch (propertyMap.Source)
             {
                 case "ThingTimeStamp":

DEH-CSV/ICsvWriter.cs

@@ -63,4 +63,4 @@ public interface ICsvWriter
         /// </param>
         public void Write(Iteration iteration, bool includeNestedElements, IEnumerable<TypeMap> maps, DirectoryInfo target, object options);
     }
-}
+}

DEH-CSV/Mapping/MappingProvider.cs

@@ -60,7 +60,7 @@ public MappingProvider(ILoggerFactory loggerFactory = null)
         /// </returns>
         public IEnumerable<TypeMap> QueryMappings(string path)
         {
-            this.logger.LogDebug("Reading the mapping from {path}", path);
+            this.logger.LogDebug("Reading the mapping from {Path}", path);
 
             var json = File.ReadAllText(path);
 
@@ -74,7 +74,7 @@ public IEnumerable<TypeMap> QueryMappings(string path)
 
             var mappings = JsonSerializer.Deserialize<List<TypeMap>>(json, options);
 
-            this.logger.LogDebug("A total of {count} mappings have been found", mappings.Count);
+            this.logger.LogDebug("A total of {Count} mappings have been found", mappings.Count);
 
             return mappings;
         }

DEH-CSV/Properties/AssemblyInfo.cs

@@ -19,4 +19,4 @@
 //  -------------------------------------------------------------------------------------------------
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("DEH-CSV.Tests")]
+[assembly: InternalsVisibleTo("DEH-CSV.Tests")]

DEH-CSV/Services/DataSourceSelector.cs

@@ -21,6 +21,7 @@
 namespace STARIONGROUP.DEHCSV.Services
 {
     using System;
+    using System.Globalization;
 
     using CDP4Dal.DAL;
 
@@ -61,7 +62,12 @@ public DataSourceSelector(ILoggerFactory loggerFactory = null)
         /// </returns>
         public IDal Select(Uri uri)
         {
-            switch (uri.Scheme.ToLower())
+            if (uri == null)
+            {
+                throw new ArgumentNullException(nameof(uri));
+            }
+
+            switch (uri.Scheme.ToLower(CultureInfo.InvariantCulture))
             {
                 case "http":
                 case "https":

DEH-CSV/Services/IterationReader.cs

@@ -32,6 +32,7 @@ namespace STARIONGROUP.DEHCSV.Services
 
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Logging.Abstractions;
+    using System;
 
     /// <summary>
     /// The purpose of the <see cref="IIterationReader"/> is to read an <see cref="Iteration"/>
@@ -75,7 +76,12 @@ public IterationReader(ILoggerFactory loggerFactory = null)
         /// </returns>
         public async Task<Iteration> ReadAsync(ISession session, string modelShortName, int iterationNumber, string domainOfExpertiseShortName)
         {
-            this.logger.LogDebug("Setting up the read request for {modelShortName}:{iterationNumber}", modelShortName, iterationNumber);
+            if (session == null)
+            {
+                throw new ArgumentNullException(nameof(session));
+            }
+
+            this.logger.LogDebug("Setting up the read request for {ModelShortName}:{IterationNumber}", modelShortName, iterationNumber);
 
             var siteDirectory = session.RetrieveSiteDirectory();
             var engineeringModelSetup = siteDirectory.Model.SingleOrDefault(x => x.ShortName == modelShortName);
@@ -107,7 +113,7 @@ public async Task<Iteration> ReadAsync(ISession session, string modelShortName,
 
             engineeringModel.Iteration.Add(iteration);
 
-            this.logger.LogDebug("Reading iteration data from the data-source {dataSource}", session.DataSourceUri);
+            this.logger.LogDebug("Reading iteration data from the data-source {DataSource}", session.DataSourceUri);
             await session.Read(iteration, domainOfExpertise);
 
             this.logger.LogDebug("Reading iteration from cache");