Use JsonUdiConverter when serializing / deserializing

Author: mattbrailsford

src/Umbraco.Commerce.Deploy/Connectors/ServiceConnectors/UmbracoCommerceShippingMethodServiceConnector.cs

@@ -137,12 +137,12 @@ public override IAsyncEnumerable<ShippingMethodReadOnly> GetEntitiesAsync(Guid s
                     artifact.CalculationConfig = JsonSerializer.SerializeToElement(new FixedRateShippingCalculationConfigArtifact
                     {
                         Prices = servicesPrices
-                    });
+                    }, Constants.DefaultJsonSerializerOptions);
                 }
                 else
                 {
                     // No additional processing required
-                    artifact.CalculationConfig = JsonSerializer.SerializeToElement(entity.CalculationConfig);
+                    artifact.CalculationConfig = JsonSerializer.SerializeToElement(entity.CalculationConfig, Constants.DefaultJsonSerializerOptions);
                 }
             }
 
@@ -265,7 +265,7 @@ private Task Pass4Async(ArtifactDeployState<ShippingMethodArtifact, ShippingMeth
                         {
                             if (artifact.CalculationMode == (int)ShippingCalculationMode.Fixed)
                             {
-                                FixedRateShippingCalculationConfigArtifact? cfgArtifact = artifact.CalculationConfig?.Deserialize<FixedRateShippingCalculationConfigArtifact>();
+                                FixedRateShippingCalculationConfigArtifact? cfgArtifact = artifact.CalculationConfig?.Deserialize<FixedRateShippingCalculationConfigArtifact>(Constants.DefaultJsonSerializerOptions);
 
                                 var prices = new List<ServicePrice>();
 
@@ -290,11 +290,11 @@ private Task Pass4Async(ArtifactDeployState<ShippingMethodArtifact, ShippingMeth
                             }
                             else if (artifact.CalculationMode == (int)ShippingCalculationMode.Dynamic)
                             {
-                                entity.SetCalculationConfig(artifact.CalculationConfig?.Deserialize<DynamicRateShippingCalculationConfig>());
+                                entity.SetCalculationConfig(artifact.CalculationConfig?.Deserialize<DynamicRateShippingCalculationConfig>(Constants.DefaultJsonSerializerOptions));
                             }
                             else if (artifact.CalculationMode == (int)ShippingCalculationMode.Realtime)
                             {
-                                entity.SetCalculationConfig(artifact.CalculationConfig?.Deserialize<RealtimeRateShippingCalculationConfig>());
+                                entity.SetCalculationConfig(artifact.CalculationConfig?.Deserialize<RealtimeRateShippingCalculationConfig>(Constants.DefaultJsonSerializerOptions));
                             }
                             else
                             {

src/Umbraco.Commerce.Deploy/Connectors/ValueConnectors/UmbracoCommercePriceValueConnector.cs

@@ -34,7 +34,7 @@ public class UmbracoCommercePriceValueConnector(
                 return null;
             }
 
-            Dictionary<Guid, decimal?>? srcDict = JsonSerializer.Deserialize<Dictionary<Guid, decimal?>>(svalue);
+            Dictionary<Guid, decimal?>? srcDict = JsonSerializer.Deserialize<Dictionary<Guid, decimal?>>(svalue, Constants.DefaultJsonSerializerOptions);
 
             var dstDict = new Dictionary<GuidUdi, decimal?>();
 
@@ -54,7 +54,7 @@ public class UmbracoCommercePriceValueConnector(
                 dstDict.Add(udi, kvp.Value);
             }
 
-            return JsonSerializer.Serialize(dstDict);
+            return JsonSerializer.Serialize(dstDict, Constants.DefaultJsonSerializerOptions);
         }
 
 
@@ -73,7 +73,7 @@ public class UmbracoCommercePriceValueConnector(
                 return null;
             }
 
-            Dictionary<string, decimal?>? srcDict = JsonSerializer.Deserialize<Dictionary<string, decimal?>>(svalue);
+            Dictionary<string, decimal?>? srcDict = JsonSerializer.Deserialize<Dictionary<string, decimal?>>(svalue, Constants.DefaultJsonSerializerOptions);
 
             var dstDict = new Dictionary<Guid, decimal?>();
 
@@ -89,7 +89,7 @@ public class UmbracoCommercePriceValueConnector(
                 }
             }
 
-            return JsonSerializer.Serialize(dstDict);
+            return JsonSerializer.Serialize(dstDict, Constants.DefaultJsonSerializerOptions);
         }
     }
 }

src/Umbraco.Commerce.Deploy/Constants.cs

@@ -0,0 +1,15 @@
+using System.Text.Json;
+using Umbraco.Cms.Infrastructure.Serialization;
+
+namespace Umbraco.Commerce.Deploy;
+
+public static class Constants
+{
+    internal static JsonSerializerOptions DefaultJsonSerializerOptions => new()
+    {
+        Converters =
+        {
+            new JsonUdiConverter()
+        }
+    };
+}