Refactoring

Author: RelaxSpirit

Shared/MessagePack/ConverterContext.cs

@@ -10,11 +10,6 @@
 using nanoFramework.MessagePack.Extensions;
 using nanoFramework.MessagePack.Exceptions;
 using System.Diagnostics.CodeAnalysis;
-
-
-
-
-
 #if !NANOFRAMEWORK_1_0
 using System.Collections.Concurrent;
 #endif
@@ -112,6 +107,11 @@ public static void Replace(Type type, IConverter converter)
             Add(type, converter);
         }
 
+        /// <summary>
+        /// Return converter by type
+        /// </summary>
+        /// <param name="type">Type from converter</param>
+        /// <returns>Converter interface <see cref="IConverter"/></returns>
         public static IConverter GetConverter(Type type)
         {
             if (type == typeof(object))

Shared/MessagePack/Converters/IConverter.cs

@@ -3,18 +3,24 @@
 
 namespace nanoFramework.MessagePack.Converters
 {
-//    public interface IConverter<T> : IConverter
-//    {
-//#nullable enable
-//        void Write(T? value, [NotNull] IMessagePackWriter writer);
-//        new T? Read([NotNull] IMessagePackReader reader);
-//    }
-
+    /// <summary>
+    /// Converter interface
+    /// </summary>
     public interface IConverter
     {
+        /// <summary>
+        /// Write object in to target MessagePack stream
+        /// </summary>
+        /// <param name="value">Source object</param>
+        /// <param name="writer">Target MessagePack stream</param>
 #nullable enable
         void Write(object? value, [NotNull] IMessagePackWriter writer);
 
+        /// <summary>
+        /// Read object from MessagePack stream
+        /// </summary>
+        /// <param name="reader">MessagePack stream</param>
+        /// <returns>Readied object</returns>
         object? Read([NotNull] IMessagePackReader reader);
     }
 }

Shared/MessagePack/DataTypes.cs

@@ -1,5 +1,8 @@
 namespace nanoFramework.MessagePack
 {
+    /// <summary>
+    /// Supporting MessagePack types
+    /// </summary>
     public enum DataTypes : byte
     {
         Null = 0xc0,

Shared/MessagePack/Extensions/MemberInfoExtension.cs

@@ -39,7 +39,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Exceptions\ConverterNotFoundException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Exceptions\SerializationException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DataTypesExtension.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\MemberInfoExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\NumberConverterHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MessagePackSerializer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ObjectTokenHelper.cs" />

Shared/MessagePack/MessagePack.projitems

@@ -33,18 +33,6 @@ public static void Serialize(object data, MemoryStream stream)
             Serialize(data, writer);
         }
 
-        private static void Serialize(object data, IMessagePackWriter writer)
-        {
-            var type = data.GetType();
-
-            var converter = ConverterContext.GetConverter(type);
-
-            if (converter != null)
-                converter.Write(data, writer);
-            else
-                ConverterContext.SerializeObject(type, data, writer);
-        }
-
         /// <summary>
         /// Deserialize MessagePack data in to object
         /// </summary>
@@ -79,6 +67,18 @@ private static void Serialize(object data, IMessagePackWriter writer)
             else
                 return ConverterContext.DeserializeObject(type, reader);
         }
-        
+
+        private static void Serialize(object data, IMessagePackWriter writer)
+        {
+            var type = data.GetType();
+
+            var converter = ConverterContext.GetConverter(type);
+
+            if (converter != null)
+                converter.Write(data, writer);
+            else
+                ConverterContext.SerializeObject(type, data, writer);
+        }
+
     }
 }

Shared/MessagePack/MessagePackSerializer.cs

@@ -148,6 +148,14 @@ public void SkipToken()
 
             throw new ArgumentOutOfRangeException();
         }
+#nullable enable
+        public ArraySegment? ReadToken()
+        {
+            StartTokenGathering();
+            SkipToken();
+            var gatheredBytes = StopTokenGathering();
+            return gatheredBytes;
+        }
 
         private void SkipMapItems(uint count)
         {
@@ -190,17 +198,9 @@ protected static bool TryGetLengthFromFixMap(DataTypes type, out uint length)
             length = type - DataTypes.FixMap;
             return type.GetHighBits(4) == DataTypes.FixMap.GetHighBits(4);
         }
-#nullable enable
+
         protected abstract ArraySegment? StopTokenGathering();
 
         protected abstract void StartTokenGathering();
-
-        public ArraySegment? ReadToken()
-        {
-            StartTokenGathering();
-            SkipToken();
-            var gatheredBytes = StopTokenGathering();
-            return gatheredBytes;
-        }
     }
 }