Reuse the Deploy JsonSerializerOptions for any custom serialize/deserialize needs

Author: mattbrailsford

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

@@ -4,20 +4,29 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http.Json;
+using Microsoft.Extensions.Options;
 using Umbraco.Commerce.Core.Api;
 using Umbraco.Commerce.Core.Models;
 using Umbraco.Commerce.Deploy.Artifacts;
 using Umbraco.Commerce.Deploy.Configuration;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
-
+using Umbraco.Deploy.Core;
 using StringExtensions = Umbraco.Commerce.Extensions.StringExtensions;
 
 namespace Umbraco.Commerce.Deploy.Connectors.ServiceConnectors
 {
     [UdiDefinition(UmbracoCommerceConstants.UdiEntityType.ShippingMethod, UdiType.GuidUdi)]
-    public class UmbracoCommerceShippingMethodServiceConnector : UmbracoCommerceStoreEntityServiceConnectorBase<ShippingMethodArtifact, ShippingMethodReadOnly, ShippingMethod, ShippingMethodState>
+    public class UmbracoCommerceShippingMethodServiceConnector(
+        IUmbracoCommerceApi umbracoCommerceApi,
+        UmbracoCommerceDeploySettingsAccessor settingsAccessor,
+        IOptionsMonitor<JsonOptions> jsonOptions)
+        : UmbracoCommerceStoreEntityServiceConnectorBase<ShippingMethodArtifact, ShippingMethodReadOnly, ShippingMethod,
+            ShippingMethodState>(umbracoCommerceApi, settingsAccessor)
     {
+        private readonly JsonSerializerOptions _jsonSerializerOptions = jsonOptions.Get(DeployConstants.JsonOptionsNames.Deploy).SerializerOptions;
+
         protected override int[] ProcessPasses => new[]
         {
             2,4
@@ -34,10 +43,6 @@ public class UmbracoCommerceShippingMethodServiceConnector : UmbracoCommerceStor
 
         public override string UdiEntityType => UmbracoCommerceConstants.UdiEntityType.ShippingMethod;
 
-        public UmbracoCommerceShippingMethodServiceConnector(IUmbracoCommerceApi umbracoCommerceApi, UmbracoCommerceDeploySettingsAccessor settingsAccessor)
-            : base(umbracoCommerceApi, settingsAccessor)
-        { }
-
         public override string GetEntityName(ShippingMethodReadOnly entity)
             => entity.Name;
 
@@ -137,12 +142,12 @@ public override IAsyncEnumerable<ShippingMethodReadOnly> GetEntitiesAsync(Guid s
                     artifact.CalculationConfig = JsonSerializer.SerializeToElement(new FixedRateShippingCalculationConfigArtifact
                     {
                         Prices = servicesPrices
-                    }, Constants.DefaultJsonSerializerOptions);
+                    }, _jsonSerializerOptions);
                 }
                 else
                 {
                     // No additional processing required
-                    artifact.CalculationConfig = JsonSerializer.SerializeToElement(entity.CalculationConfig, Constants.DefaultJsonSerializerOptions);
+                    artifact.CalculationConfig = JsonSerializer.SerializeToElement(entity.CalculationConfig, _jsonSerializerOptions);
                 }
             }
 
@@ -265,7 +270,7 @@ private Task Pass4Async(ArtifactDeployState<ShippingMethodArtifact, ShippingMeth
                         {
                             if (artifact.CalculationMode == (int)ShippingCalculationMode.Fixed)
                             {
-                                FixedRateShippingCalculationConfigArtifact? cfgArtifact = artifact.CalculationConfig?.Deserialize<FixedRateShippingCalculationConfigArtifact>(Constants.DefaultJsonSerializerOptions);
+                                FixedRateShippingCalculationConfigArtifact? cfgArtifact = artifact.CalculationConfig?.Deserialize<FixedRateShippingCalculationConfigArtifact>(_jsonSerializerOptions);
 
                                 var prices = new List<ServicePrice>();
 
@@ -290,11 +295,11 @@ private Task Pass4Async(ArtifactDeployState<ShippingMethodArtifact, ShippingMeth
                             }
                             else if (artifact.CalculationMode == (int)ShippingCalculationMode.Dynamic)
                             {
-                                entity.SetCalculationConfig(artifact.CalculationConfig?.Deserialize<DynamicRateShippingCalculationConfig>(Constants.DefaultJsonSerializerOptions));
+                                entity.SetCalculationConfig(artifact.CalculationConfig?.Deserialize<DynamicRateShippingCalculationConfig>(_jsonSerializerOptions));
                             }
                             else if (artifact.CalculationMode == (int)ShippingCalculationMode.Realtime)
                             {
-                                entity.SetCalculationConfig(artifact.CalculationConfig?.Deserialize<RealtimeRateShippingCalculationConfig>(Constants.DefaultJsonSerializerOptions));
+                                entity.SetCalculationConfig(artifact.CalculationConfig?.Deserialize<RealtimeRateShippingCalculationConfig>(_jsonSerializerOptions));
                             }
                             else
                             {

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

@@ -3,21 +3,26 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http.Json;
+using Microsoft.Extensions.Options;
 using Umbraco.Commerce.Core.Api;
 using Umbraco.Commerce.Deploy.Configuration;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Commerce.Core.Models;
+using Umbraco.Deploy.Core;
 using Umbraco.Deploy.Core.Connectors.ValueConnectors;
 
 namespace Umbraco.Commerce.Deploy.Connectors.ValueConnectors
 {
     public class UmbracoCommercePriceValueConnector(
         IUmbracoCommerceApi umbracoCommerceApi,
-        UmbracoCommerceDeploySettingsAccessor settingsAccessor)
+        IOptionsMonitor<JsonOptions> jsonOptions)
         : ValueConnectorBase
     {
+        private readonly JsonSerializerOptions _jsonSerializerOptions = jsonOptions.Get(DeployConstants.JsonOptionsNames.Deploy).SerializerOptions;
+
         public override IEnumerable<string> PropertyEditorAliases => new[] { "Umbraco.Commerce.Price" };
 
         public override async Task<string?> ToArtifactAsync(
@@ -34,7 +39,7 @@ public class UmbracoCommercePriceValueConnector(
                 return null;
             }
 
-            Dictionary<Guid, decimal?>? srcDict = JsonSerializer.Deserialize<Dictionary<Guid, decimal?>>(svalue, Constants.DefaultJsonSerializerOptions);
+            Dictionary<Guid, decimal?>? srcDict = JsonSerializer.Deserialize<Dictionary<Guid, decimal?>>(svalue, _jsonSerializerOptions);
 
             var dstDict = new Dictionary<GuidUdi, decimal?>();
 
@@ -54,7 +59,7 @@ public class UmbracoCommercePriceValueConnector(
                 dstDict.Add(udi, kvp.Value);
             }
 
-            return JsonSerializer.Serialize(dstDict, Constants.DefaultJsonSerializerOptions);
+            return JsonSerializer.Serialize(dstDict, _jsonSerializerOptions);
         }
 
 
@@ -73,7 +78,7 @@ public class UmbracoCommercePriceValueConnector(
                 return null;
             }
 
-            Dictionary<string, decimal?>? srcDict = JsonSerializer.Deserialize<Dictionary<string, decimal?>>(svalue, Constants.DefaultJsonSerializerOptions);
+            Dictionary<string, decimal?>? srcDict = JsonSerializer.Deserialize<Dictionary<string, decimal?>>(svalue, _jsonSerializerOptions);
 
             var dstDict = new Dictionary<Guid, decimal?>();
 
@@ -89,7 +94,7 @@ public class UmbracoCommercePriceValueConnector(
                 }
             }
 
-            return JsonSerializer.Serialize(dstDict, Constants.DefaultJsonSerializerOptions);
+            return JsonSerializer.Serialize(dstDict, _jsonSerializerOptions);
         }
     }
 }