Added DelimitedStreamBuilderTests, switch lots of code to use nullabl…

…es and cleaned up.
putridparrot · Jun 3, 2023 · fde5e63 · fde5e63
1 parent b4bdc76
commit fde5e63
Show file tree

Hide file tree

Showing 32 changed files with 418 additions and 314 deletions.
diff --git a/PutridParrot.Delimited.Data/Attributes/DelimitedFieldAttribute.cs b/PutridParrot.Delimited.Data/Attributes/DelimitedFieldAttribute.cs
@@ -9,14 +9,14 @@ namespace PutridParrot.Delimited.Data.Attributes
 	public abstract class DelimitedFieldAttribute : Attribute
 	{
 		public int ColumnIndex { get; set; }
-		public string Heading { get; set; }
+		public string? Heading { get; set; }
 
 		protected DelimitedFieldAttribute()
 			: this(-1)
 		{
 		}
 
-		protected DelimitedFieldAttribute(string heading)
+		protected DelimitedFieldAttribute(string? heading)
 			: this(-1)
 		{
 			Heading = heading;
@@ -25,6 +25,6 @@ protected DelimitedFieldAttribute(string heading)
 		protected DelimitedFieldAttribute(int columnIndex)
 		{
 			ColumnIndex = columnIndex;
-		}
+        }
 	}
 }
diff --git a/PutridParrot.Delimited.Data/Attributes/DelimitedFieldReadAttribute.cs b/PutridParrot.Delimited.Data/Attributes/DelimitedFieldReadAttribute.cs
@@ -14,12 +14,12 @@ public DelimitedFieldReadAttribute()
 		{
 		}
 
-		public DelimitedFieldReadAttribute(string heading) :
+		public DelimitedFieldReadAttribute(string? heading) :
 			this(heading, false)
 		{
 		}
 
-		public DelimitedFieldReadAttribute(string heading, bool required) :
+		public DelimitedFieldReadAttribute(string? heading, bool required) :
 			base(heading)
 		{
 			Required = required;
@@ -37,6 +37,6 @@ public DelimitedFieldReadAttribute(int columnIndex, bool required) :
 		}
 
 		public bool Required { get; set; }
-		public string[] AlternateNames { get; set; }
+		public string[]? AlternateNames { get; set; }
 	}
 }
diff --git a/PutridParrot.Delimited.Data/Attributes/DelimitedFieldWriteAttribute.cs b/PutridParrot.Delimited.Data/Attributes/DelimitedFieldWriteAttribute.cs
@@ -14,7 +14,7 @@ public DelimitedFieldWriteAttribute()
 		{
 		}
 
-		public DelimitedFieldWriteAttribute(string heading) :
+		public DelimitedFieldWriteAttribute(string? heading) :
 			base(heading)
 		{
 		}

diff --git a/PutridParrot.Delimited.Data/DelimitedDataEnumerator.cs b/PutridParrot.Delimited.Data/DelimitedDataEnumerator.cs
@@ -35,7 +35,7 @@ public static IEnumerable Deserialize(IDelimitedSeparatedReader delimiterSeparat
 		/// <param name="data">A string representing delimited data</param>
 		/// <param name="options">Options for how the deserializer should handle data</param>
 		/// <returns>An IEnumerable representing the dynamic row data</returns>
-		public static IEnumerable Deserialize(IDelimitedSeparatedReader delimiterSeparatedReader, string data, DelimitedDeserializeOptions options)
+		public static IEnumerable Deserialize(IDelimitedSeparatedReader delimiterSeparatedReader, string data, DelimitedDeserializeOptions? options)
         {
             using var memoryStream = new MemoryStream();
 
@@ -76,11 +76,11 @@ private static string[] CreateColumnHeadings(int length)
 		/// <param name="stream">A stream representing the delimited data</param>
 		/// <param name="options">Options for how the deserializer should handle data</param>
 		/// <returns>An IEnumerable representing the dynamic row data</returns>
-		public static IEnumerable Deserialize(IDelimitedSeparatedReader delimiterSeparatedReader, Stream stream, DelimitedDeserializeOptions options)
+		public static IEnumerable Deserialize(IDelimitedSeparatedReader delimiterSeparatedReader, Stream stream, DelimitedDeserializeOptions? options)
         {
             using var reader = new DelimitedStreamReader(delimiterSeparatedReader, stream);
             // remove any "ignore rows"
-            if (options != null && options.IgnoreFirstNRows > 0)
+            if (options is { IgnoreFirstNRows: > 0 })
             {
                 var nRow = 0;
                 while (nRow < options.IgnoreFirstNRows && reader.ReadLine() != null)
@@ -91,26 +91,26 @@ public static IEnumerable Deserialize(IDelimitedSeparatedReader delimiterSeparat
 
             if (options != null && !options.UseHeadings)
             {
-                IEnumerable<string> fields;
+                IEnumerable<string>? fields;
                 while ((fields = reader.ReadLine()) != null)
                 {
-                    var f = fields.ToArray();
+                    string?[] f = fields.ToArray();
                     yield return new DelimitedRow(CreateColumnHeadings(f.Length), f);
                 }
             }
             else
             {
-                IEnumerable<string> headings = reader.ReadLine();
+                var headings = reader.ReadLine();
                 if (headings != null)
                 {
                     var columnHeadings = headings.ToArray();
 
-                    IEnumerable<string> fields;
+                    IEnumerable<string>? fields;
                     while ((fields = reader.ReadLine()) != null)
                     {
-                        if (options != null && options.IgnoreEmptyRows)
+                        if (options is { IgnoreEmptyRows: true })
                         {
-                            if (fields.All(String.IsNullOrEmpty))
+                            if (fields.All(string.IsNullOrEmpty))
                                 continue;
                         }
 

diff --git a/PutridParrot.Delimited.Data/DelimitedDeserializeOptions.cs b/PutridParrot.Delimited.Data/DelimitedDeserializeOptions.cs
@@ -29,7 +29,7 @@ public DelimitedDeserializeOptions()
 		/// <summary>
 		/// Gets/Sets the mappings for the object to deserialize to
 		/// </summary>
-		public IList<FieldReadProperty> Mappings { get; set; }
+		public IList<FieldReadProperty>? Mappings { get; set; }
 		/// <summary>
 		/// Gets/Sets whether we should ignore empty rows
 		/// </summary>

diff --git a/PutridParrot.Delimited.Data/DelimitedRow.cs b/PutridParrot.Delimited.Data/DelimitedRow.cs
@@ -33,7 +33,7 @@ namespace PutridParrot.Delimited.Data
 	public class DelimitedRow : DynamicObject
 	{
 		private readonly string[] _headings;
-		private readonly string[] _fields;
+		private readonly string?[] _fields;
 
 		[DebuggerStepThrough]
 		static DelimitedRow()
@@ -42,13 +42,13 @@ static DelimitedRow()
 		}
 
 		[DebuggerStepThrough]
-		internal DelimitedRow(string[] headings, string[] fields)
+		internal DelimitedRow(string[] headings, string?[] fields)
 		{
 			_headings = headings;
 			_fields = fields;
 		}
 
-		private bool GetField(string header, out string field)
+		private bool GetField(string header, out string? field)
 		{
 			field = null;
 			for (var i = 0; i < _headings.Length; i++)
@@ -67,7 +67,7 @@ private bool GetField(string header, out string field)
 
 		public static CultureInfo CultureInfo { get; set; }
 
-		public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
+		public override bool TryGetIndex(GetIndexBinder binder, object[]? indexes, out object? result)
 		{
 			result = null;
 
@@ -94,7 +94,7 @@ public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out ob
 			return false;
 		}
 
-		public override bool TryGetMember(GetMemberBinder binder, out object result)
+		public override bool TryGetMember(GetMemberBinder binder, out object? result)
 		{
 			if (binder == null)
 			{

diff --git a/PutridParrot.Delimited.Data/DelimitedSeparatedReader.cs b/PutridParrot.Delimited.Data/DelimitedSeparatedReader.cs
@@ -21,7 +21,7 @@ public DelimitedSeparatedReader(DelimitedOptions options)
 
 		public DelimitedOptions Options { get; set; }
 
-		public IList<string> Read(StreamReader reader)
+		public IList<string>? Read(StreamReader reader)
 		{
 			if (reader == null)
 			{
@@ -37,7 +37,7 @@ public IList<string> Read(StreamReader reader)
 			return line == null ? null : Split(line, Options.Delimiter, Options.Qualifier);
         }
 
-        public async Task<IList<string>> ReadAsync(StreamReader reader)
+        public async Task<IList<string>?> ReadAsync(StreamReader reader)
         {
             if (reader == null)
             {

diff --git a/PutridParrot.Delimited.Data/DelimitedSerializeOptions.cs b/PutridParrot.Delimited.Data/DelimitedSerializeOptions.cs
@@ -10,7 +10,7 @@ public class DelimitedSerializeOptions
 		/// <summary>
 		/// Gets/Sets the mappings for how data should be serialized
 		/// </summary>
-		public IList<FieldWriteProperty> Mappings { get; set; }
+		public IList<FieldWriteProperty>? Mappings { get; set; }
 		/// <summary>
 		/// Gets/Sets whether we should include headers in the serialized data
 		/// </summary>