fix: ability to serialize GUIDs (#203)

Co-authored-by: Mateusz Kryszczak <[email protected]>
aws · Mar 28, 2022 · 4f354c1 · 4f354c1
1 parent 975f356
commit 4f354c1
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/sdk/src/Core/ThirdParty/LitJson/JsonMapper.cs b/sdk/src/Core/ThirdParty/LitJson/JsonMapper.cs
@@ -732,6 +732,12 @@ private static void WriteValue (object obj, JsonWriter writer,
                 return;
             }
 
+            if (obj is Guid)
+            {
+                writer.Write(obj.ToString());
+                return;
+            }
+
             if (obj is Array) {
                 writer.WriteArrayStart ();
 

diff --git a/sdk/test/UnitTests/JsonMapperTest.cs b/sdk/test/UnitTests/JsonMapperTest.cs
@@ -17,6 +17,7 @@
 
 using Amazon.XRay.Recorder.Core.Sampling.Model;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
 using ThirdParty.LitJson;
 
 namespace Amazon.XRay.Recorder.UnitTests
@@ -271,5 +272,31 @@ public void TestUnmarshallSamplingTargetResponseWithNull()
 
             Assert.IsNull(samplingTargetResponseModel);
         }
+
+        [TestMethod]
+        public void SerializeObjectContainingEmptyGuid()
+        {
+            var obj = new AnythingWithGuid();
+            var actual = JsonMapper.ToJson(obj);
+            var expected = "{\"Id\":\"00000000-0000-0000-0000-000000000000\"}";
+
+            Assert.AreEqual(expected, actual);
+        }
+
+        [TestMethod]
+        public void SerializeObjectContainingNonEmptyGuid()
+        {
+            var guid = Guid.Parse("b2aee583-770c-42c5-b5d8-d25e0df4d161");
+            var obj = new AnythingWithGuid { Id = guid };
+            var actual = JsonMapper.ToJson(obj);
+            var expected = "{\"Id\":\"b2aee583-770c-42c5-b5d8-d25e0df4d161\"}";
+
+            Assert.AreEqual(expected, actual);
+        }
+
+        public class AnythingWithGuid
+        {
+            public Guid Id { get; set; }
+        }
     }
 }