Add Enum support to Bson serialization

Author: theRainbird

CoreRemoting.Tests/BsonSerializationTests.cs

@@ -2,11 +2,8 @@
 using System.Collections;
 using System.Data;
 using System.Globalization;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Numerics;
-using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using CoreRemoting.RpcMessaging;
 using CoreRemoting.Serialization.Bson;
@@ -285,5 +282,16 @@ public void BsonSerializerAdapter_should_deserialize_Hashtable_original_content_
 
         Assert.Equal(originalValue, deserializedValue); 
         Assert.True(deserializedValue is int);
+        
+        var enumHashtable = new Hashtable();
+        var originalEnumValue = Tools.TestEnum.Second;
+        enumHashtable["StoredEnum"] = originalEnumValue;
+        
+        var enumSerializedBytes = serializer.Serialize(enumHashtable);
+        var deserializedEnumHashtable = serializer.Deserialize<Hashtable>(enumSerializedBytes);
+        var deserializedEnumValue = deserializedEnumHashtable["StoredEnum"];
+        
+        Assert.Equal(originalEnumValue, deserializedEnumValue);
+        Assert.True(deserializedEnumValue is Tools.TestEnum);
     }
 }

CoreRemoting/Serialization/Bson/Converters/HashtableConverter.cs

@@ -149,18 +149,18 @@ public override void WriteJson(JsonWriter writer, Hashtable value, JsonSerialize
             // Convert types if needed
             if (key != null)
             {
-                if (keyPrimitiveType.HasValue)
-                    key = ConvertValueFromPrimitiveType(key, keyPrimitiveType.Value);
-                else if (keyTypeName != null)
+                if (keyTypeName != null)
                     key = ConvertValueOptimized(key, keyTypeName);
+                else if (keyPrimitiveType.HasValue)
+                    key = ConvertValueFromPrimitiveType(key, keyPrimitiveType.Value);
             }
 
             if (value != null)
             {
-                if (valuePrimitiveType.HasValue)
-                    value = ConvertValueFromPrimitiveType(value, valuePrimitiveType.Value);
-                else if (valueTypeName != null)
+                if (valueTypeName != null)
                     value = ConvertValueOptimized(value, valueTypeName);
+                else if (valuePrimitiveType.HasValue)
+                    value = ConvertValueFromPrimitiveType(value, valuePrimitiveType.Value);
             }
 
             return (key, value);
@@ -180,7 +180,7 @@ private void WriteEntryOptimized(JsonWriter writer, object key, object value, Js
             if (keyType != null)
             {
                 var keyPrimitiveType = GetPrimitiveType(keyType);
-                if (keyPrimitiveType != PrimitiveType.Complex)
+                if (keyPrimitiveType != PrimitiveType.Complex && keyPrimitiveType != PrimitiveType.Enum)
                 {
                     writer.WritePropertyName("KP");
                     writer.WriteValue((byte)keyPrimitiveType);
@@ -199,7 +199,7 @@ private void WriteEntryOptimized(JsonWriter writer, object key, object value, Js
             if (valueType != null)
             {
                 var valuePrimitiveType = GetPrimitiveType(valueType);
-                if (valuePrimitiveType != PrimitiveType.Complex)
+                if (valuePrimitiveType != PrimitiveType.Complex && valuePrimitiveType != PrimitiveType.Enum)
                 {
                     writer.WritePropertyName("VP");
                     writer.WriteValue((byte)valuePrimitiveType);
@@ -257,6 +257,11 @@ private object ConvertValueFromPrimitiveType(object value, PrimitiveType primiti
                     return Convert.ToUInt32(value);
                 case PrimitiveType.UInt64:
                     return Convert.ToUInt64(value);
+                case PrimitiveType.Enum:
+                    // For enums, we need the type information from VT field
+                    // This method is called when we have primitive type info only
+                    // So we can't handle enum conversion here without type info
+                    return value;
                 default:
                     return value;
             }
@@ -310,6 +315,8 @@ private object ConvertValueOptimized(object value, string typeName)
                     return Convert.ToUInt32(value);
                 case PrimitiveType.UInt64:
                     return Convert.ToUInt64(value);
+                case PrimitiveType.Enum:
+                    return Enum.ToObject(targetType, value);
                 default:
                     // For complex types, return as-is since they should already be deserialized correctly
                     return value;
@@ -328,9 +335,9 @@ private string GetTypeNameCached(Type type)
             {
                 var sb = _stringBuilder.Value;
                 sb.Clear();
-                sb.Append(t.Assembly.GetName().Name);
-                sb.Append(", ");
                 sb.Append(t.FullName);
+                sb.Append(", ");
+                sb.Append(t.Assembly.GetName().Name);
                 return sb.ToString();
             });
         }
@@ -371,6 +378,7 @@ private PrimitiveType GetPrimitiveType(Type type)
                 if (t == typeof(ushort)) return PrimitiveType.UInt16;
                 if (t == typeof(uint)) return PrimitiveType.UInt32;
                 if (t == typeof(ulong)) return PrimitiveType.UInt64;
+                if (t.IsEnum) return PrimitiveType.Enum;
                 return PrimitiveType.Complex;
             });
         }

CoreRemoting/Serialization/Bson/Converters/PrimitiveType.cs

@@ -21,6 +21,7 @@ internal enum PrimitiveType : byte
         UInt16 = 13,
         UInt32 = 14,
         UInt64 = 15,
+        Enum = 16,
         Complex = 255
     }
 }