Add MicroJson support for DateTimeOffset

Source/Meadow.Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Driver/DateTimeConverters.cs

@@ -41,6 +41,16 @@ public static string ToIso8601(DateTime dateTime)
         return $"{dateTime:yyyy-MM-ddTHH:mm:ss.FFFZ}";
     }
 
+    /// <summary>
+    /// Converts a DateTime object into an ISO 8601 string in UTC format.
+    /// </summary>
+    /// <param name="dateTime">The DateTime to convert.</param>
+    /// <returns>DateTime as an ISO 8601 string in UTC format.</returns>
+    public static string ToIso8601(DateTimeOffset dateTime)
+    {
+        return $"{dateTime:yyyy-MM-ddTHH:mm:ss.FFFZ}";
+    }
+
     /// <summary>
     /// Converts a DateTime to the ASP.NET Ajax JSON format.
     /// </summary>
@@ -51,6 +61,16 @@ public static string ToASPNetAjax(DateTime dateTime)
         return $@"\/Date({dateTime.Ticks})\/";
     }
 
+    /// <summary>
+    /// Converts a DateTime to the ASP.NET Ajax JSON format.
+    /// </summary>
+    /// <param name="dateTime">The DateTime to convert.</param>
+    /// <returns>A string representation of the DateTime in ASP.NET Ajax JSON format.</returns>
+    public static string ToASPNetAjax(DateTimeOffset dateTime)
+    {
+        return $@"\/Date({dateTime.Ticks})\/";
+    }
+
     /// <summary>
     /// Converts an ASP.NET Ajax JSON string to DateTime
     /// </summary>

Source/Meadow.Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Driver/JsonIgnoreAttribute.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace Meadow.Foundation.Serialization;
+
+[AttributeUsage(AttributeTargets.Property, Inherited = true)]
+public class JsonIgnoreAttribute : Attribute
+{
+}

Source/Meadow.Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Driver/MicroJson.TypeSafe.cs

@@ -6,11 +6,6 @@
 
 namespace Meadow.Foundation.Serialization;
 
-[AttributeUsage(AttributeTargets.Property, Inherited = true)]
-public class JsonIgnoreAttribute : Attribute
-{
-}
-
 public static partial class MicroJson
 {
     /// <summary>
@@ -144,7 +139,7 @@
             {
                 var table = DeserializeString(json) as Hashtable;
 
                 return DeserializeHashtableToDictionary(table, type)
                     ?? throw new NotSupportedException($"Type '{type.Name}' not supported");
             }
             throw new NotSupportedException($"Type '{type.Name}' not supported");
@@ -278,6 +273,15 @@
                         Deserialize(hashtableValue, propType, ref complexInstance);
                         prop.SetValue(instance, complexInstance);
                     }
+                    else if (propType == typeof(DateTimeOffset))
+                    {
+                        var dto = DateTimeOffset.Parse(values[v].ToString());
+                        prop.SetValue(instance, dto);
+                    }
+                    else
+                    {
+                        throw new NotSupportedException($"Unable to deserialize type '{propType}'");
+                    }
                 }
                 else
                 {

Source/Meadow.Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Driver/MicroJson.cs

@@ -36,6 +36,7 @@ public static partial class MicroJson
     /// </summary>
     /// <param name="o">The value to convert.</param>
     /// <param name="dateTimeFormat">The format to use for DateTime values. Defaults to ISO 8601 format.</param>
+    /// <param name="convertNamesToCamelCase">True to convert all properties to camel case during serialization</param>
     /// <returns>The JSON object as a string or null when the value type is not supported.</returns>
     /// <remarks>For objects, only public properties with getters are converted.</remarks>
     public static string? Serialize(object o, DateTimeFormat dateTimeFormat = DateTimeFormat.ISO8601, bool convertNamesToCamelCase = true)
@@ -79,6 +80,14 @@ public static partial class MicroJson
                     _ => $"\"{DateTimeConverters.ToIso8601((DateTime)o)}\"",
                 };
             default:
+                if (type == typeof(DateTimeOffset))
+                {
+                    return dateTimeFormat switch
+                    {
+                        DateTimeFormat.Ajax => $"\"{DateTimeConverters.ToASPNetAjax((DateTimeOffset)o)}\"",
+                        _ => $"\"{DateTimeConverters.ToIso8601((DateTimeOffset)o)}\"",
+                    };
+                }
                 if (type == typeof(Guid))
                 {
                     return $"\"{o}\"";

Source/Meadow.Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Tests/MicroJson.Unit.Tests/BasicTests.cs

@@ -1,10 +1,54 @@
 using Meadow.Foundation.Serialization;
+using System;
+using System.Text.Json;
 using Xunit;
 
 namespace Unit.Tests;
 
 public class BasicTests
 {
+    [Fact]
+    public void DateTimeSerializationTest()
+    {
+        var input = new DateTimeClass
+        {
+            DTField = DateTime.Now,
+            DTOField = DateTimeOffset.UtcNow
+        };
+
+        var json = MicroJson.Serialize(input);
+
+        Assert.NotNull(json);
+        var test = JsonSerializer.Deserialize<DateTimeClass>(json,
+            new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true
+            });
+        Assert.NotNull(test);
+        // the fraction of a second will be lost, so equality won't work
+        Assert.True(Math.Abs((input.DTField - test.DTField).TotalSeconds) < 1, "DateTime failed");
+        Assert.True(Math.Abs((input.DTOField - test.DTOField).TotalSeconds) < 1, "DateTimeOffset failed");
+    }
+
+    [Fact]
+    public void DateTimeDeserializationTest()
+    {
+        var input = new DateTimeClass
+        {
+            DTField = DateTime.Now,
+            DTOField = DateTimeOffset.UtcNow
+        };
+
+        var json = JsonSerializer.Serialize(input);
+
+        var test = MicroJson.Deserialize<DateTimeClass>(json);
+
+        Assert.NotNull(test);
+        // the fraction of a second will be lost, so equality won't work
+        Assert.True(Math.Abs((input.DTField - test.DTField).TotalSeconds) < 1, "DateTime failed");
+        Assert.True(Math.Abs((input.DTOField - test.DTOField).TotalSeconds) < 1, "DateTimeOffset failed");
+    }
+
     [Fact]
     public void SimpleIntegerPropertyTest()
     {

Source/Meadow.Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Tests/MicroJson.Unit.Tests/CloudEntityTests.cs

@@ -1,13 +1,40 @@
 using Meadow.Cloud;
 using Meadow.Foundation.Serialization;
 using Meadow.Update;
+using System;
 using System.Collections.Generic;
+using System.Text.Json;
 using Xunit;
 
 namespace Unit.Tests;
 
 public class CloudEntityTests
 {
+    [Fact]
+    public void CloudEventSerializationTest()
+    {
+        var ce = new CloudEvent()
+        {
+            EventId = 2000,
+            Description = "Cloud Sample Data",
+            Timestamp = DateTime.UtcNow,
+            Measurements = new Dictionary<string, object>
+            {
+                { "Int value", 31 },
+                { "StringValue", "37-A2-0A-94-FA-42-EC-3F" }
+            }
+        };
+
+        var json = MicroJson.Serialize(ce);
+        Assert.NotNull(json);
+
+        var item = JsonSerializer.Deserialize<CloudEvent>(json);
+
+        Assert.NotNull(item);
+        // the fraction of a second will be lost, so equality won't work
+        Assert.True(Math.Abs((item.Timestamp - ce.Timestamp).TotalSeconds) < 1, "Timestamp failed");
+    }
+
     [Fact]
     public void UpdateMessageSerializationTest()
     {

Source/Meadow.Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Tests/MicroJson.Unit.Tests/MicroJson.Unit.Tests.csproj

@@ -22,6 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.3" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Source/Meadow.Foundation.Libraries_and_Frameworks/Serialization.MicroJson/Tests/MicroJson.Unit.Tests/test types/TestTypes.cs

@@ -1,7 +1,14 @@
 using Meadow.Foundation.Serialization;
+using System;
 
 namespace Unit.Tests;
 
+internal class DateTimeClass
+{
+    public DateTime DTField { get; set; }
+    public DateTimeOffset DTOField { get; set; }
+}
+
 internal class IntegerClass
 {
     public int Value { get; set; }