clean up : 3

j0nimost · Oct 29, 2023 · deddfd3 · deddfd3
1 parent 79ecaf0
commit deddfd3
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 89 deletions.
diff --git a/src/Kafa/Kafa.Span.cs b/src/Kafa/Kafa.Span.cs
@@ -1,7 +1,4 @@
 using nyingi.Kafa.Reader;
-using nyingi.Kafa.Reflection;
-using System;
-using System.Xml;
 using static nyingi.Kafa.Reader.KafaReader;
 
 namespace nyingi.Kafa
@@ -17,7 +14,7 @@ public static RowEnumerable Read(ReadOnlySpan<char> span, KafaOptions? options =
 
         public static IEnumerable<T> Read<T>(string content, KafaOptions? options = null)
         {
-            ArgumentNullException.ThrowIfNullOrEmpty(content, nameof(content));
+            ArgumentException.ThrowIfNullOrEmpty(content, nameof(content));
             var rows = Read(content.AsSpan(), options);
             var reflection = SetupOptions<T>(options);
             return reflection.SetProperties<T>(rows);

diff --git a/src/Kafa/Kafa.Stream.cs b/src/Kafa/Kafa.Stream.cs
@@ -1,11 +1,6 @@
 using System.Buffers;
 using nyingi.Kafa.Reader;
 using nyingi.Kafa.Reflection;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Text;
-using System.Threading;
-using System.Xml;
 using nyingi.Kafa.Writer;
 using static nyingi.Kafa.Reader.KafaReader;
 
@@ -77,48 +72,48 @@ private static async ValueTask<RowEnumerable> ReadProcessorAsync(KafaReadState k
             return reader.GetRows();
         }
 
-        public static void Write<T>(IBufferWriter<byte> bufferWriter, List<T> entities, KafaOptions options = null)
+        public static void Write<T>(IBufferWriter<byte> bufferWriter, List<T> entities, KafaOptions? options = null)
         {
             ArgumentNullException.ThrowIfNull(entities, nameof(entities));
             var reflection = SetupOptions<T>(options);
             using var writer = new KafaWriter(bufferWriter, reflection.TypeInfo.KafaOptions);
-            reflection.GetProperties<T>(writer, entities);
+            reflection.GetProperties(writer, entities);
         }
 
 
-        public static ReadOnlySpan<byte> Write<T>(List<T> entities, KafaOptions options = null)
+        public static ReadOnlySpan<byte> Write<T>(List<T> entities, KafaOptions? options = null)
         {
             ArgumentNullException.ThrowIfNull(entities, nameof(entities));
             var reflection = SetupOptions<T>(options);
             using var pooledBufferWriter = new KafaPooledWriter();
             using var bufferWriter = new KafaWriter(pooledBufferWriter, reflection.TypeInfo.KafaOptions);
-            reflection.GetProperties<T>(bufferWriter, entities);
+            reflection.GetProperties(bufferWriter, entities);
             return pooledBufferWriter.WrittenAsSpan;
         }
 
-        public static async ValueTask<Stream> WriteToStreamAsync<T>(List<T> entities, KafaOptions options = null, CancellationToken token = default)
+        public static async ValueTask<Stream> WriteToStreamAsync<T>(List<T> entities, KafaOptions? options = null, CancellationToken token = default)
         {
             ArgumentNullException.ThrowIfNull(entities, nameof(entities));
             var reflection = SetupOptions<T>(options);
             var memoryStream = new MemoryStream();
             using var bufferWriter = new KafaWriter(memoryStream, reflection.TypeInfo.KafaOptions);
-            reflection.GetProperties<T>(bufferWriter, entities);
+            reflection.GetProperties(bufferWriter, entities);
             await bufferWriter.FlushAsync(token).ConfigureAwait(false);
             return memoryStream;
         }
 
-        public static async ValueTask WriteToFileAsync<T>(List<T> entities, string path, KafaOptions options = null, CancellationToken token=default)
+        public static async ValueTask WriteToFileAsync<T>(List<T> entities, string path, KafaOptions? options = null, CancellationToken token=default)
         {
             ArgumentNullException.ThrowIfNull(entities, nameof(entities));
             ArgumentNullException.ThrowIfNull(path, nameof(path));
             var reflection = SetupOptions<T>(options);
             using var fs = new FileStream(path, FileMode.Create);
             using var bufferWriter = new KafaWriter(fs, reflection.TypeInfo.KafaOptions);
-            reflection.GetProperties<T>(bufferWriter, entities);
+            reflection.GetProperties(bufferWriter, entities);
             await bufferWriter.FlushAsync(token).ConfigureAwait(false);
         }
 
-        private static KafaReflection SetupOptions<T>(KafaOptions options)
+        private static KafaReflection SetupOptions<T>(KafaOptions? options)
         {
             options = KafaOptions.ResolveKafaOptions(options);
             var typeInfo = new KafaTypeInfo(typeof(T), options);

diff --git a/src/Kafa/KafaColumnAttribute.cs b/src/Kafa/KafaColumnAttribute.cs
@@ -1,9 +1,4 @@
-
-using System.Diagnostics.CodeAnalysis;
-
-#nullable disable warnings
-
-namespace nyingi.Kafa
+namespace nyingi.Kafa
 {
     [System.AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple =false)]
     public class KafaColumnAttribute : Attribute

diff --git a/src/Kafa/KafaOptions.cs b/src/Kafa/KafaOptions.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
+using System.Globalization;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace nyingi.Kafa
 {
@@ -12,7 +8,7 @@ public class SeparatorFileType
         public const char CSV = ',';
         public const char TSV = ';';
     }
-    public sealed partial class KafaOptions
+    public sealed class KafaOptions
     {
         public CultureInfo? CultureInfo { get; set; }
         public Encoding? Encoding { get; set; }

diff --git a/src/Kafa/KafaTypeInfo.cs b/src/Kafa/KafaTypeInfo.cs
@@ -1,12 +1,9 @@
-using nyingi.Kafa;
-
-namespace nyingi.Kafa
+namespace nyingi.Kafa
 {
     internal class KafaTypeInfo
     {
         public readonly Type Type;
         public readonly KafaOptions KafaOptions;
-        public bool HasAttributes { get; private set;}
         public KafaTypeInfo(Type type, KafaOptions kafaOptions)
         {
             Type = type;

diff --git a/src/Kafa/Reader/KafaReadState.cs b/src/Kafa/Reader/KafaReadState.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Buffers;
+using System.Buffers;
 using System.Collections.Specialized;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -18,7 +17,7 @@ public sealed class KafaReadState : IDisposable
 
         public int OffSet { get; private set; }
 
-        public bool HasCRLF { get; private set; } = false;
+        public bool HasCRLF { get; private set; }
 
         public int LastBufferIndex { get; private set; }
 
@@ -29,7 +28,7 @@ public sealed class KafaReadState : IDisposable
         public readonly int BufferLength;
 
 
-        public OrderedDictionary Headers { get; private set; } = default;
+        public OrderedDictionary? Headers { get; private set; } = default;
         public KafaReadState(int bufferLength, KafaOptions kafaOptions)
         {
             BufferLength = bufferLength;
@@ -119,7 +118,7 @@ private void ReadColMarkers()
                     i = j + 1;
                     continue;
                 }
-                else if (Buffer[i] == (int)Options.Separator || Buffer[i] == '\n' ||  Buffer[i + 1] == '\0')
+                else if (Buffer[i] == Options.Separator || Buffer[i] == '\n' ||  Buffer[i + 1] == '\0')
                 {
                     ColMarker[colIndexer] = i;
                     colIndexer++;
@@ -175,7 +174,7 @@ private void ReadColCount()
                     i = j + 1;
                     continue;
                 }
-                else if (Buffer[i] == (int)Options.Separator)
+                else if (Buffer[i] == Options.Separator)
                 {
                     ColCount++;
                 }

diff --git a/src/Kafa/Reader/KafaReader.Col.cs b/src/Kafa/Reader/KafaReader.Col.cs
@@ -8,14 +8,8 @@ public readonly ref struct Col
         {
             public readonly ReadOnlySpan<char> Value;
             private readonly ColEnumerable _colEnumerable;
-
-            public int Length
-            {
-                get
-                {
-                    return Value.Length;
-                }
-            }
+
+            public int Length => Value.Length;
 
             public Col(ColEnumerable colEnumerable, int index)
             {

diff --git a/src/Kafa/Reader/KafaReader.Row.cs b/src/Kafa/Reader/KafaReader.Row.cs
@@ -1,6 +1,4 @@
-
-using System.Collections;
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 
 namespace nyingi.Kafa.Reader
 {

diff --git a/src/Kafa/Reader/KafaReader.cs b/src/Kafa/Reader/KafaReader.cs
@@ -1,5 +1,4 @@
 using System.Collections.Specialized;
-using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -8,11 +7,9 @@ namespace nyingi.Kafa.Reader
     public partial class KafaReader : IDisposable
     {
         private readonly KafaReadState _kafaReadState;
-        private readonly CultureInfo? cultureInfo;
         public KafaReader(KafaReadState kafaReadState)
         {
             _kafaReadState = kafaReadState;
-            cultureInfo = kafaReadState.Options.CultureInfo;
         }
 
         public int ColumnCount => _kafaReadState.ColCount;

diff --git a/src/Kafa/Reflection/KafaListOfT.cs b/src/Kafa/Reflection/KafaListOfT.cs
@@ -6,20 +6,5 @@ public void CreateCollection(KafaTypeInfo kafaTypeInfo, int length)
         {
             kafaTypeInfo.ReturnValue = Array.CreateInstance(kafaTypeInfo.Type, length);
         }
-
-        public void AddElement(T t, KafaTypeInfo kafaTypeInfo)
-        {
-            ((ICollection<T>)kafaTypeInfo.ReturnValue!).Add(t);
-        }
-
-        public IEnumerable<T> Write<T>(Type t, KafaTypeInfo kafaTypeInfo)
-        {
-
-            // Create a list of the required type, passing the values to the constructor
-            Type genericListType = typeof(List<>);
-            Type concreteListType = genericListType.MakeGenericType(t);
-
-            return (List<T>)Activator.CreateInstance(concreteListType, new object[] { kafaTypeInfo.ReturnValue });
-        }
     }
 }
diff --git a/src/Kafa/Reflection/KafaReflection.Reader.cs b/src/Kafa/Reflection/KafaReflection.Reader.cs
@@ -1,8 +1,4 @@
-using System.Diagnostics.Metrics;
-using System.IO;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Text;
+using System.Reflection;
 using nyingi.Kafa.Writer;
 
 namespace nyingi.Kafa.Reflection

diff --git a/src/Kafa/Reflection/KafaReflection.Writer.cs b/src/Kafa/Reflection/KafaReflection.Writer.cs
@@ -8,7 +8,7 @@ namespace nyingi.Kafa.Reflection
 {
     internal partial class KafaReflection
     {
-        private Dictionary<int, PropertyInfo> properties= default;
+        private Dictionary<int, PropertyInfo>? _properties= default;
 
         public readonly KafaTypeInfo TypeInfo;
         private readonly CultureInfo? _cultureInfo;
@@ -19,9 +19,9 @@ public KafaReflection(KafaTypeInfo typeInfo)
             _cultureInfo = TypeInfo.KafaOptions.CultureInfo;
         }
 
-        private void ReadHeader(OrderedDictionary headers = null)
+        private void ReadHeader(OrderedDictionary? headers = null)
         {
-            properties = new Dictionary<int, PropertyInfo>(TypeInfo.Type.GetProperties().Length); // ahead
+            _properties = new Dictionary<int, PropertyInfo>(TypeInfo.Type.GetProperties().Length); // ahead
 
             int count = 0;
             foreach (var property in TypeInfo.Type.GetProperties())
@@ -34,22 +34,22 @@ private void ReadHeader(OrderedDictionary headers = null)
                     {
                         if (!string.IsNullOrEmpty(kafa.FieldName))
                         {
-                            properties.Add((int)headers[kafa.FieldName], property);
+                            _properties.Add((int)headers[kafa.FieldName], property);
 
                         }
                         else
                         {
-                            properties.Add((int)headers[kafa.FieldIndex], property);
+                            _properties.Add((int)headers[kafa.FieldIndex], property);
                         }
                     }
                     else if (headers.Contains(property.Name))
                     {
-                        properties.Add((int)headers[property.Name], property);
+                        _properties.Add((int)headers[property.Name], property);
                     }
                 }
                 else
                 {
-                    properties.Add(count, property);
+                    _properties.Add(count, property);
                     count++;
                 }
             }
@@ -61,7 +61,7 @@ public IEnumerable<T> SetProperties<T>(RowEnumerable rows)
             // process header first
             ReadHeader(rows.Headers);
 
-            if(properties.Count == 0)
+            if(_properties.Count == 0)
             {
                 throw new Exception("{0} class is empty");
             }
@@ -79,7 +79,7 @@ public IEnumerable<T> SetProperties<T>(RowEnumerable rows)
                 foreach (var col in row.Cols)
                 {
                     // populate the properties
-                    var propertyInfo = properties[colIndex];
+                    var propertyInfo = _properties[colIndex];
                     propertyInfo.SetValue(instanceOft, TypeResolver(propertyInfo.PropertyType, col));
                     colIndex++;
                 }

diff --git a/src/Kafa/Writer/KafaPooledWriter.cs b/src/Kafa/Writer/KafaPooledWriter.cs
@@ -54,10 +54,10 @@ private void Resize(int sizeHint)
                 {
                     newCapacity += growBy;
                 }
-                var newBuffer = ArrayPool<byte>.Shared.Rent(newCapacity);
-                Array.Copy(_buffer, newBuffer, Capacity);
-                _buffer = null!;
-                _buffer = newBuffer;
+
+                var newBuffer = _buffer;
+                _buffer = ArrayPool<byte>.Shared.Rent(newCapacity);
+                Array.Copy(newBuffer, _buffer, Capacity);
                 ArrayPool<byte>.Shared.Return(newBuffer);
             }
         }

diff --git a/src/Kafa/Writer/KafaWriter.cs b/src/Kafa/Writer/KafaWriter.cs
@@ -1,5 +1,4 @@
 using System.Buffers;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace nyingi.Kafa.Writer
@@ -26,7 +25,7 @@ public KafaWriter(in Stream stream, KafaOptions options)
         {
             _stream = stream;
             _options = options;
-            _kafaPooledWriter = new KafaPooledWriter(0); // use the default 65k
+            _kafaPooledWriter = new KafaPooledWriter(); // use the default 65k
         }
 
         public void WriteSeparator()