Move settings into ContentSerializerJsonOptionsConfiguration.

Lombiq · Mar 18, 2024 · 3d63542 · 3d63542
1 parent 2f0f2c8
commit 3d63542
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...hardCore/OrchardCore.Abstractions/Extensions/ContentSerializerJsonOptionsConfiguration.cs b/...hardCore/OrchardCore.Abstractions/Extensions/ContentSerializerJsonOptionsConfiguration.cs
@@ -17,8 +17,10 @@ public ContentSerializerJsonOptionsConfiguration(IOptions<JsonDerivedTypesOption
 
     public void Configure(ContentSerializerJsonOptions options)
     {
+        options.SerializerOptions.PreferredObjectCreationHandling = JsonObjectCreationHandling.Populate;
+        options.SerializerOptions.ReferenceHandler = null; // Needed by JsonObjectCreationHandling.Populate.
+
         options.SerializerOptions.DefaultIgnoreCondition = JOptions.Base.DefaultIgnoreCondition;
-        options.SerializerOptions.ReferenceHandler = JOptions.Base.ReferenceHandler;
         options.SerializerOptions.ReadCommentHandling = JOptions.Base.ReadCommentHandling;
         options.SerializerOptions.PropertyNameCaseInsensitive = JOptions.Base.PropertyNameCaseInsensitive;
         options.SerializerOptions.AllowTrailingCommas = JOptions.Base.AllowTrailingCommas;

diff --git a/src/OrchardCore/OrchardCore.Abstractions/Json/JOptions.cs b/src/OrchardCore/OrchardCore.Abstractions/Json/JOptions.cs
@@ -13,8 +13,7 @@ public static class JOptions
     public static readonly JsonSerializerOptions Base = new()
     {
         DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-        PreferredObjectCreationHandling = JsonObjectCreationHandling.Populate,
-        ReferenceHandler = null, // Needed by JsonObjectCreationHandling.Populate.
+        ReferenceHandler = ReferenceHandler.IgnoreCycles,
         ReadCommentHandling = JsonCommentHandling.Skip,
         PropertyNameCaseInsensitive = true,
         AllowTrailingCommas = true,