com.xmobitea.changx.gn-unity 2.0.2 → 2.3.0

package/Runtime/Helper/ConverterService.cs

@@ -7,40 +7,52 @@
     using XmobiTea.GN.Common;
     using XmobiTea.GN.Entity;
 
+    /// <summary>
+    /// Mapper class for extracting and caching metadata of fields in a class decorated with DataMember attributes.
+    /// </summary>
     internal class DataMemberFieldInfoTypeMapper
     {
+        // A cache to store metadata mappings of fields for each class type
         private Dictionary<Type, GNEnhancedObjectFieldMetadata[]> declaredFieldsMap;
 
+        // Retrieves metadata for all fields in a class, including inherited ones
         public GNEnhancedObjectFieldMetadata[] getGNEnhancedObjectFieldMetadata(System.Type cls)
         {
             GNEnhancedObjectFieldMetadata[] declaredFields;
 
-            if (this.declaredFieldsMap.ContainsKey(cls)) declaredFields = this.declaredFieldsMap[cls];
+            // If the class has been mapped, return the cached metadata
+            if (this.declaredFieldsMap.ContainsKey(cls))
+            {
+                declaredFields = this.declaredFieldsMap[cls];
+            }
             else
             {
+                // List to store all found fields
                 var fieldInfoLst = new List<FieldInfo>();
 
                 var currentCls = cls;
 
+                // Iterate through the class hierarchy to find all fields
                 while (true)
                 {
-                    var allDeclaredFields = currentCls.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly).Where(field => field.GetCustomAttribute<DataMemberAttribute>(true) != null);
+                    // Retrieve all fields marked with the DataMemberAttribute
+                    var allDeclaredFields = currentCls.GetFields(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly)
+                        .Where(field => field.GetCustomAttribute<DataMemberAttribute>(true) != null);
 
                     foreach (var field in allDeclaredFields)
                     {
+                        // Check if the field already exists in the list, add it if not
                         var thisDeclaredField = fieldInfoLst.Find(x => x.Name.Equals(field.Name));
-
                         if (thisDeclaredField == null) fieldInfoLst.Add(field);
                     }
 
-                    if (currentCls.BaseType == typeof(object))
-                    {
-                        break;
-                    }
+                    // If we have reached the base class (object), exit the loop
+                    if (currentCls.BaseType == typeof(object)) break;
 
                     currentCls = currentCls.BaseType;
                 }
 
+                // Create an array to hold the metadata for the fields
                 declaredFields = new GNEnhancedObjectFieldMetadata[fieldInfoLst.Count];
 
                 for (var i = 0; i < fieldInfoLst.Count; i++)
@@ -49,12 +61,13 @@
 
                     var field = fieldInfoLst[i];
 
+                    // Retrieve the attribute information for the field
                     var dataMemberAnno = field.GetCustomAttribute<DataMemberAttribute>(true);
 
+                    // Handle each specific type of attribute and map its data to GNEnhancedObjectFieldMetadata
                     if (dataMemberAnno is StringDataMemberAttribute stringDataMemberAnno)
                     {
                         gnEnhancedObjectFieldMetadata = new GNEnhancedObjectFieldMetadata(field.Name, FieldDataType.String, field.FieldType, field);
-
                         gnEnhancedObjectFieldMetadata.defaultValue = stringDataMemberAnno.defaultValue;
                         gnEnhancedObjectFieldMetadata.mustNonNull = stringDataMemberAnno.mustNonNull;
                         gnEnhancedObjectFieldMetadata.minLength = stringDataMemberAnno.minLength;
@@ -63,13 +76,11 @@
                     else if (dataMemberAnno is BooleanDataMemberAttribute booleanDataMemberAnno)
                     {
                         gnEnhancedObjectFieldMetadata = new GNEnhancedObjectFieldMetadata(field.Name, FieldDataType.Boolean, field.FieldType, field);
-
                         gnEnhancedObjectFieldMetadata.defaultValue = booleanDataMemberAnno.defaultValue;
                     }
                     else if (dataMemberAnno is GNHashtableDataMemberAttribute gnHashtableDataMemberAnno)
                     {
                         gnEnhancedObjectFieldMetadata = new GNEnhancedObjectFieldMetadata(field.Name, FieldDataType.Object, field.FieldType, field);
-
                         gnEnhancedObjectFieldMetadata.defaultValue = gnHashtableDataMemberAnno.defaultValue;
                         gnEnhancedObjectFieldMetadata.mustNonNull = gnHashtableDataMemberAnno.mustNonNull;
                         gnEnhancedObjectFieldMetadata.minLength = gnHashtableDataMemberAnno.minLength;
@@ -78,7 +89,6 @@
                     else if (dataMemberAnno is GNArrayDataMemberAttribute gnArrayDataMemberAnno)
                     {
                         gnEnhancedObjectFieldMetadata = new GNEnhancedObjectFieldMetadata(field.Name, FieldDataType.Array, gnArrayDataMemberAnno.elementCls == null ? field.FieldType : gnArrayDataMemberAnno.elementCls, field);
-
                         gnEnhancedObjectFieldMetadata.defaultValue = gnArrayDataMemberAnno.defaultValue;
                         gnEnhancedObjectFieldMetadata.mustNonNull = gnArrayDataMemberAnno.mustNonNull;
                         gnEnhancedObjectFieldMetadata.minLength = gnArrayDataMemberAnno.minLength;
@@ -87,7 +97,6 @@
                     else if (dataMemberAnno is NumberDataMemberAttribute numberDataMemberAnno)
                     {
                         gnEnhancedObjectFieldMetadata = new GNEnhancedObjectFieldMetadata(field.Name, FieldDataType.Number, field.FieldType, field);
-
                         gnEnhancedObjectFieldMetadata.defaultValue = numberDataMemberAnno.defaultValue;
                         gnEnhancedObjectFieldMetadata.minValue = numberDataMemberAnno.minValue;
                         gnEnhancedObjectFieldMetadata.maxValue = numberDataMemberAnno.maxValue;
@@ -96,33 +105,41 @@
                     else
                     {
                         gnEnhancedObjectFieldMetadata = new GNEnhancedObjectFieldMetadata(field.Name, FieldDataType.Object, field.FieldType, field);
-
                         gnEnhancedObjectFieldMetadata.defaultValue = dataMemberAnno.defaultValue;
                     }
 
+                    // Map common properties from the attribute to the metadata
                     gnEnhancedObjectFieldMetadata.code = dataMemberAnno.code;
                     gnEnhancedObjectFieldMetadata.isOptional = dataMemberAnno.isOptional;
                     gnEnhancedObjectFieldMetadata.gnFieldType = dataMemberAnno.gnFieldType;
 
+                    // Add the field metadata to the array
                     declaredFields[i] = gnEnhancedObjectFieldMetadata;
                 }
 
+                // Cache the metadata for future access
                 this.declaredFieldsMap[cls] = declaredFields;
             }
 
             return declaredFields;
         }
 
+        // Constructor initializes the declaredFieldsMap dictionary
         public DataMemberFieldInfoTypeMapper()
         {
             this.declaredFieldsMap = new Dictionary<Type, GNEnhancedObjectFieldMetadata[]>();
         }
     }
 
+    /// <summary>
+    /// Class responsible for deserializing objects and arrays from GNHashtable and GNArray
+    /// </summary>
     internal class DeserializeConverter
     {
+        // Mapper to retrieve metadata for fields with DataMember attributes
         private DataMemberFieldInfoTypeMapper dataMemberFieldInfoMapper;
 
+        // Cached type definitions for common types
         private Type typeOfByte;
         private Type typeOfSByte;
         private Type typeOfShort;
@@ -135,112 +152,149 @@
         private Type typeOfGNArray;
         private Type typeOfGNHashtable;
 
+        bool TryGetNullable(FieldInfo fieldInfo, out Type tType)
+        {
+            tType = Nullable.GetUnderlyingType(fieldInfo.FieldType);
+            return tType != null;
+        }
+
+        /// <summary>
+        /// Deserializes a GNHashtable into an object of the specified type.
+        /// </summary>
+        /// <param name="gnHashtable">The GNHashtable to deserialize.</param>
+        /// <param name="cls">The type of the object to create.</param>
+        /// <returns>An instance of the specified type populated with data from the GNHashtable.</returns>
         public object deserializeObject(GNHashtable gnHashtable, Type cls)
         {
+            // Return null if the input is null
             if (gnHashtable == null) return null;
 
+            // Retrieve metadata for all fields in the target type
             var declaredFields = this.dataMemberFieldInfoMapper.getGNEnhancedObjectFieldMetadata(cls);
 
+            // Create an instance of the target class
             var answer = Activator.CreateInstance(cls);
 
+            // Iterate through each field and populate its value from the GNHashtable
             foreach (var declaredField in declaredFields)
             {
+                // Retrieve the value for the field based on its code
                 var value = gnHashtable.getObject(declaredField.code);
 
+                // Handle field types based on GNFieldDataType
                 if (declaredField.gnFieldType == GNFieldDataType.String)
                 {
-                    if (value == null)
-                    {
-                        if (declaredField.defaultValue != null) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                    }
+                    if (value == null) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
                     else if (value is string) declaredField.fieldInfo.SetValue(answer, value);
                 }
                 else if (declaredField.gnFieldType == GNFieldDataType.Boolean)
                 {
-                    if (value == null)
-                    {
-                        if (declaredField.defaultValue != null) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(declaredField.defaultValue, declaredField.fieldInfo.FieldType));
-                    }
+                    if (value == null) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
                     else if (value is bool) declaredField.fieldInfo.SetValue(answer, value);
                 }
                 else if (declaredField.gnFieldType == GNFieldDataType.GNHashtable)
                 {
+                    // Handle nested objects
                     if (value == null)
                     {
                         if (declaredField.defaultValue != null)
                         {
-                            if (declaredField.fieldInfo.FieldType == typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(declaredField.defaultValue, declaredField.fieldInfo.FieldType));
-                            else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(((GNHashtable)(declaredField.defaultValue)).toData(), declaredField.fieldInfo.FieldType));
+                            if (declaredField.fieldInfo.FieldType == this.typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, ((GNHashtable)(declaredField.defaultValue)).toData());
                             else declaredField.fieldInfo.SetValue(answer, this.deserializeObject((GNHashtable)declaredField.defaultValue, declaredField.cls));
                         }
                     }
                     else
                     {
-                        if (declaredField.fieldInfo.FieldType == typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(value, declaredField.fieldInfo.FieldType));
-                        else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(((IGNData)value).toData(), declaredField.fieldInfo.FieldType));
+                        if (declaredField.fieldInfo.FieldType == this.typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, ((IGNData)value).toData());
                         else declaredField.fieldInfo.SetValue(answer, this.deserializeObject((GNHashtable)value, declaredField.cls));
                     }
                 }
                 else if (declaredField.gnFieldType == GNFieldDataType.GNArray)
                 {
+                    // Handle arrays
                     if (value == null)
                     {
                         if (declaredField.defaultValue != null)
                         {
-                            if (declaredField.fieldInfo.FieldType == typeOfGNArray) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(declaredField.defaultValue, declaredField.fieldInfo.FieldType));
-                            else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(((GNArray)declaredField.defaultValue).toData(), declaredField.fieldInfo.FieldType));
+                            if (declaredField.fieldInfo.FieldType == this.typeOfGNArray) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, ((GNArray)declaredField.defaultValue).toData());
                         }
                     }
                     else
                     {
-                        if (declaredField.fieldInfo.FieldType == typeOfGNArray) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(value, declaredField.fieldInfo.FieldType));
-                        else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(((IGNData)value).toData(), declaredField.fieldInfo.FieldType));
+                        if (declaredField.fieldInfo.FieldType == this.typeOfGNArray) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, ((IGNData)value).toData());
                     }
                 }
                 else if (declaredField.gnFieldType == GNFieldDataType.Number)
                 {
-                    if (value == null)
+                    object lastValue;
+
+                    if (value == null) lastValue = declaredField.defaultValue;
+                    else lastValue = value;
+
+                    if (ConverterService.isNumber(lastValue))
                     {
-                        if (declaredField.defaultValue != null) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(declaredField.defaultValue, declaredField.fieldInfo.FieldType));
+                        if (TryGetNullable(declaredField.fieldInfo, out var tType))
+                        {
+                            var typeCode = Type.GetTypeCode(tType);
+
+                            if (typeCode == TypeCode.SByte) declaredField.fieldInfo.SetValue(answer, Convert.ToSByte(lastValue));
+                            else if (typeCode == TypeCode.Byte) declaredField.fieldInfo.SetValue(answer, Convert.ToByte(lastValue));
+                            else if (typeCode == TypeCode.Int16) declaredField.fieldInfo.SetValue(answer, Convert.ToInt16(lastValue));
+                            else if (typeCode == TypeCode.UInt16) declaredField.fieldInfo.SetValue(answer, Convert.ToUInt16(lastValue));
+                            else if (typeCode == TypeCode.Int32) declaredField.fieldInfo.SetValue(answer, Convert.ToInt32(lastValue));
+                            else if (typeCode == TypeCode.UInt32) declaredField.fieldInfo.SetValue(answer, Convert.ToUInt32(lastValue));
+                            else if (typeCode == TypeCode.Int64) declaredField.fieldInfo.SetValue(answer, Convert.ToInt64(lastValue));
+                            else if (typeCode == TypeCode.UInt64) declaredField.fieldInfo.SetValue(answer, Convert.ToUInt64(lastValue));
+                            else if (typeCode == TypeCode.Single) declaredField.fieldInfo.SetValue(answer, Convert.ToSingle(lastValue));
+                            else if (typeCode == TypeCode.Double) declaredField.fieldInfo.SetValue(answer, Convert.ToDouble(lastValue));
+                        }
+                        else
+                        {
+                            declaredField.fieldInfo.SetValue(answer, lastValue);
+                        }
                     }
-                    else if (ConverterService.isNumber(value)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(value, declaredField.fieldInfo.FieldType));
                 }
                 else
                 {
+                    // Handle other primitive types
                     if (value == null)
                     {
                         if (declaredField.defaultValue != null)
                         {
-                            if (declaredField.fieldInfo.FieldType == typeOfByte) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfSByte) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfShort) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfInt) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfFloat) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfLong) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfDouble) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfBool) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfString) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeOfGNArray) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            if (declaredField.fieldInfo.FieldType == this.typeOfByte) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfSByte) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfShort) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfInt) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfFloat) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfLong) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfDouble) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfBool) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfString) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfGNArray) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
                             else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, ((IGNData)declaredField.defaultValue).toData());
-                            else if (declaredField.fieldInfo.FieldType == typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                            else if (declaredField.fieldInfo.FieldType == this.typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
                             else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, ((IGNData)declaredField.defaultValue).toData());
                             else declaredField.fieldInfo.SetValue(answer, this.deserializeObject((GNHashtable)declaredField.defaultValue, declaredField.cls));
                         }
                     }
                     else
                     {
-                        if (declaredField.fieldInfo.FieldType == typeOfByte) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfSByte) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfShort) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfInt) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfFloat) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfLong) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfDouble) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfBool) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfString) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeOfGNArray) declaredField.fieldInfo.SetValue(answer, value);
+                        if (declaredField.fieldInfo.FieldType == this.typeOfByte) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfSByte) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfShort) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfInt) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfFloat) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfLong) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfDouble) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfBool) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfString) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfGNArray) declaredField.fieldInfo.SetValue(answer, value);
                         else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, ((IGNData)value).toData());
-                        else if (declaredField.fieldInfo.FieldType == typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, value);
+                        else if (declaredField.fieldInfo.FieldType == this.typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, value);
                         else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, ((IGNData)value).toData());
                         else declaredField.fieldInfo.SetValue(answer, this.deserializeObject((GNHashtable)value, declaredField.cls));
                     }
@@ -250,12 +304,19 @@
             return answer;
         }
 
+        /// <summary>
+        /// Deserializes a GNArray into a list of objects of the specified type.
+        /// </summary>
+        /// <param name="gnArray">The GNArray to deserialize.</param>
+        /// <param name="cls">The type of objects in the resulting list.</param>
+        /// <returns>A list of objects of the specified type.</returns>
         public System.Collections.IList deserializeArray(GNArray gnArray, Type cls)
         {
             if (gnArray == null) return null;
 
             var answer = new System.Collections.Generic.List<object>();
 
+            // Deserialize each element in the array
             for (var i = 0; i < gnArray.count(); i++)
             {
                 var value = gnArray.getObject(i);
@@ -264,17 +325,17 @@
                 {
                     var typeOfValue = value.GetType();
 
-                    if (cls == typeOfByte) answer.Add(value);
-                    else if (cls == typeOfSByte) answer.Add(value);
-                    else if (cls == typeOfShort) answer.Add(value);
-                    else if (cls == typeOfInt) answer.Add(value);
-                    else if (cls == typeOfFloat) answer.Add(value);
-                    else if (cls == typeOfLong) answer.Add(value);
-                    else if (cls == typeOfDouble) answer.Add(value);
-                    else if (cls == typeOfBool) answer.Add(value);
-                    else if (cls == typeOfString) answer.Add(value);
-                    else if (cls == typeOfGNArray) answer.Add(value);
-                    else if (cls == typeOfGNHashtable) answer.Add(value);
+                    if (cls == this.typeOfByte) answer.Add(value);
+                    else if (cls == this.typeOfSByte) answer.Add(value);
+                    else if (cls == this.typeOfShort) answer.Add(value);
+                    else if (cls == this.typeOfInt) answer.Add(value);
+                    else if (cls == this.typeOfFloat) answer.Add(value);
+                    else if (cls == this.typeOfLong) answer.Add(value);
+                    else if (cls == this.typeOfDouble) answer.Add(value);
+                    else if (cls == this.typeOfBool) answer.Add(value);
+                    else if (cls == this.typeOfString) answer.Add(value);
+                    else if (cls == this.typeOfGNArray) answer.Add(value);
+                    else if (cls == this.typeOfGNHashtable) answer.Add(value);
                     else if (typeOfValue == typeof(System.Collections.IList))
                         answer.Add(this.deserializeArray(gnArray.getGNArray(i), cls));
                     else
@@ -285,6 +346,11 @@
             return answer;
         }
 
+        /// <summary>
+        /// Constructor for DeserializeConverter.
+        /// Initializes type mappings and field info mapper.
+        /// </summary>
+        /// <param name="dataMemberFieldInfoMapper">The mapper for field metadata.</param>
         public DeserializeConverter(DataMemberFieldInfoTypeMapper dataMemberFieldInfoMapper)
         {
             this.typeOfByte = typeof(byte);
@@ -303,30 +369,47 @@
         }
     }
 
+    /// <summary>
+    /// Class responsible for serializing objects and arrays into GNHashtable and GNArray.
+    /// </summary>
     internal class SerializeConverter
     {
+        // Mapper to retrieve metadata for fields with DataMember attributes.
         private DataMemberFieldInfoTypeMapper dataMemberFieldInfoMapper;
 
+        /// <summary>
+        /// Serializes an object into a GNHashtable.
+        /// </summary>
+        /// <param name="obj">The object to serialize.</param>
+        /// <returns>A GNHashtable representing the serialized object.</returns>
         public GNHashtable serializeObject(object obj)
         {
+            // Return null if the input object is null.
             if (obj == null) return null;
 
+            // Get the type of the input object.
             var type = obj.GetType();
 
+            // Retrieve metadata for all fields in the object's type.
             var declaredFields = this.dataMemberFieldInfoMapper.getGNEnhancedObjectFieldMetadata(type);
 
+            // Initialize the result GNHashtable.
             var answer = new GNHashtable();
 
+            // Iterate through each field and populate the GNHashtable.
             foreach (var declaredField in declaredFields)
             {
+                // Get the value of the field from the object.
                 var value = declaredField.fieldInfo.GetValue(obj);
 
                 if (value == null)
                 {
+                    // Add null value if the field is not optional.
                     if (!declaredField.isOptional) answer.add(declaredField.code, null);
                 }
                 else
                 {
+                    // Handle serialization based on the GNFieldDataType.
                     if (declaredField.gnFieldType == GNFieldDataType.String)
                     {
                         if (value is string) answer.add(declaredField.code, value);
@@ -337,21 +420,25 @@
                     }
                     else if (declaredField.gnFieldType == GNFieldDataType.GNHashtable)
                     {
+                        // Handle GNHashtable fields or nested objects.
                         if (value is GNHashtable) answer.add(declaredField.code, value);
                         else if (value is System.Collections.IDictionary valueDict) answer.add(declaredField.code, new GNHashtable.Builder().addAll(valueDict).build());
                         else answer.add(declaredField.code, this.serializeObject(value));
                     }
                     else if (declaredField.gnFieldType == GNFieldDataType.GNArray)
                     {
+                        // Handle GNArray fields or lists.
                         if (value is GNArray) answer.add(declaredField.code, value);
                         else if (value is System.Collections.IList valueLst) answer.add(declaredField.code, this.serializeArray(valueLst));
                     }
                     else if (declaredField.gnFieldType == GNFieldDataType.Number)
                     {
+                        // Handle numeric fields.
                         if (ConverterService.isNumber(value)) answer.add(declaredField.code, value);
                     }
                     else
                     {
+                        // Handle other types.
                         if (value is string) answer.add(declaredField.code, value);
                         else if (value is bool) answer.add(declaredField.code, value);
                         else if (ConverterService.isNumber(value)) answer.add(declaredField.code, value);
@@ -366,12 +453,20 @@
             return answer;
         }
 
+        /// <summary>
+        /// Serializes a list into a GNArray.
+        /// </summary>
+        /// <param name="objLst">The list to serialize.</param>
+        /// <returns>A GNArray representing the serialized list.</returns>
         public GNArray serializeArray(System.Collections.IList objLst)
         {
+            // Return null if the input list is null.
             if (objLst == null) return null;
 
+            // Initialize the result GNArray.
             var answer = new GNArray();
 
+            // Iterate through each element in the list.
             for (var i = 0; i < objLst.Count; i++)
             {
                 var obj = objLst[i];
@@ -388,75 +483,107 @@
             return answer;
         }
 
+        /// <summary>
+        /// Constructor for SerializeConverter.
+        /// </summary>
+        /// <param name="dataMemberFieldInfoMapper">The mapper for field metadata.</param>
         public SerializeConverter(DataMemberFieldInfoTypeMapper dataMemberFieldInfoMapper)
         {
             this.dataMemberFieldInfoMapper = dataMemberFieldInfoMapper;
         }
     }
 
-    internal class CustomConvert
-    {
-        public static object ChangeType(object value, Type conversion)
-        {
-            var t = conversion;
-
-            if (t.IsGenericType && t.GetGenericTypeDefinition().Equals(typeof(Nullable<>)))
-            {
-                if (value == null)
-                {
-                    return null;
-                }
-
-                t = Nullable.GetUnderlyingType(t);
-            }
-
-            return Convert.ChangeType(value, t);
-        }
-    }
-
+    /// <summary>
+    /// Service class providing serialization and deserialization functionality.
+    /// Handles conversion of objects to GNHashtable/GNArray and vice versa.
+    /// </summary>
     public class ConverterService
     {
+        // Private static instances for serialization and deserialization operations.
         private static SerializeConverter serializeConverter;
         private static DeserializeConverter deserializeConverter;
 
+        /// <summary>
+        /// Deserializes a GNHashtable into a strongly-typed object.
+        /// </summary>
+        /// <typeparam name="T">The target object type.</typeparam>
+        /// <param name="gnHashtable">The GNHashtable to deserialize.</param>
+        /// <returns>The deserialized object of type T.</returns>
         public static T deserializeObject<T>(GNHashtable gnHashtable)
         {
             return (T)ConverterService.deserializeObject(gnHashtable, typeof(T));
         }
 
+        /// <summary>
+        /// Deserializes a GNHashtable into an object of the specified type.
+        /// </summary>
+        /// <param name="gnHashtable">The GNHashtable to deserialize.</param>
+        /// <param name="cls">The type to deserialize into.</param>
+        /// <returns>The deserialized object.</returns>
         public static object deserializeObject(GNHashtable gnHashtable, Type cls)
         {
             return ConverterService.deserializeConverter.deserializeObject(gnHashtable, cls);
         }
 
+        /// <summary>
+        /// Deserializes a GNArray into a strongly-typed list.
+        /// </summary>
+        /// <typeparam name="T">The element type of the resulting list.</typeparam>
+        /// <param name="gnArray">The GNArray to deserialize.</param>
+        /// <returns>A list of deserialized elements.</returns>
         public static System.Collections.IList deserializeArray<T>(GNArray gnArray)
         {
             return ConverterService.deserializeArray<T>(gnArray);
         }
 
+        /// <summary>
+        /// Deserializes a GNArray into a list of a specified type.
+        /// </summary>
+        /// <param name="gnArray">The GNArray to deserialize.</param>
+        /// <param name="cls">The target element type.</param>
+        /// <returns>A list of deserialized elements.</returns>
         public static System.Collections.IList deserializeArray(GNArray gnArray, Type cls)
         {
             return ConverterService.deserializeConverter.deserializeArray(gnArray, cls);
         }
 
+        /// <summary>
+        /// Serializes an object into a GNHashtable.
+        /// </summary>
+        /// <param name="obj">The object to serialize.</param>
+        /// <returns>A GNHashtable representing the serialized object.</returns>
         public static GNHashtable serializeObject(object obj)
         {
             return ConverterService.serializeConverter.serializeObject(obj);
         }
 
+        /// <summary>
+        /// Serializes a list into a GNArray.
+        /// </summary>
+        /// <param name="objLst">The list to serialize.</param>
+        /// <returns>A GNArray representing the serialized list.</returns>
         public static GNArray serializeArray(System.Collections.IList objLst)
         {
             return ConverterService.serializeConverter.serializeArray(objLst);
         }
 
+        /// <summary>
+        /// Static constructor to initialize the SerializeConverter and DeserializeConverter instances.
+        /// </summary>
         static ConverterService()
         {
+            // Create a shared DataMemberFieldInfoTypeMapper for both converters.
             var dataMemberFieldInfoMapper = new DataMemberFieldInfoTypeMapper();
 
             ConverterService.serializeConverter = new SerializeConverter(dataMemberFieldInfoMapper);
             ConverterService.deserializeConverter = new DeserializeConverter(dataMemberFieldInfoMapper);
         }
 
+        /// <summary>
+        /// Checks if a value is a numeric type.
+        /// </summary>
+        /// <param name="value">The value to check.</param>
+        /// <returns>True if the value is a numeric type; otherwise, false.</returns>
         public static bool isNumber(object value)
         {
             return (value is byte
@@ -468,6 +595,11 @@
                     || value is double);
         }
 
+        /// <summary>
+        /// Checks if a value is an integer type.
+        /// </summary>
+        /// <param name="value">The value to check.</param>
+        /// <returns>True if the value is an integer type; otherwise, false.</returns>
         public static bool isInteger(object value)
         {
             return (value is byte
@@ -478,4 +610,27 @@
         }
     }
 
+    public class ConverterServiceV2
+    {
+        class DetectSupport
+        {
+            public static bool isNumber(object value)
+            {
+                return value is byte
+                        || value is sbyte
+                        || value is short
+                        || value is ushort
+                        || value is int
+                        || value is uint
+                        || value is float
+                        || value is long
+                        || value is ulong
+                        || value is double;
+            }
+
+        }
+
+
+    }
+
 }