Register JsonSerializerOptions in the IoC Container (OrchardCMS#15328)

urbanit · Mar 18, 2024 · 9085f0b · 9085f0b
1 parent 1e00bb7
commit 9085f0b
Show file tree

Hide file tree

Showing 119 changed files with 408 additions and 278 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs
@@ -1,11 +1,9 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using OrchardCore.AdminMenu.Services;
 using OrchardCore.Deployment;
-using OrchardCore.Json;
 
 namespace OrchardCore.AdminMenu.Deployment
 {
@@ -14,15 +12,10 @@ public class AdminMenuDeploymentSource : IDeploymentSource
         private readonly IAdminMenuService _adminMenuService;
         private readonly JsonSerializerOptions _serializationOptions;
 
-        public AdminMenuDeploymentSource(IAdminMenuService adminMenuService, IOptions<JsonDerivedTypesOptions> derivedTypesOptions)
+        public AdminMenuDeploymentSource(IAdminMenuService adminMenuService, IOptions<JsonSerializerOptions> serializationOptions)
         {
             _adminMenuService = adminMenuService;
-
-            // The recipe step contains polymorphic types which need to be resolved
-            _serializationOptions = new()
-            {
-                TypeInfoResolver = new PolymorphicJsonTypeInfoResolver(derivedTypesOptions.Value)
-            };
+            _serializationOptions = serializationOptions.Value;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs
@@ -2,11 +2,9 @@
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using OrchardCore.AdminMenu.Services;
-using OrchardCore.Json;
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
@@ -20,15 +18,14 @@ public class AdminMenuStep : IRecipeStepHandler
         private readonly IAdminMenuService _adminMenuService;
         private readonly JsonSerializerOptions _serializationOptions;
 
-        public AdminMenuStep(IAdminMenuService adminMenuService, IOptions<JsonDerivedTypesOptions> derivedTypesOptions)
+        public AdminMenuStep(
+            IAdminMenuService adminMenuService,
+            IOptions<JsonSerializerOptions> serializationOptions)
         {
             _adminMenuService = adminMenuService;
 
             // The recipe step contains polymorphic types (menu items) which need to be resolved
-            _serializationOptions = new()
-            {
-                TypeInfoResolver = new PolymorphicJsonTypeInfoResolver(derivedTypesOptions.Value)
-            };
+            _serializationOptions = serializationOptions.Value;
         }
 
         public async Task ExecuteAsync(RecipeExecutionContext context)
@@ -38,7 +35,7 @@ public async Task ExecuteAsync(RecipeExecutionContext context)
                 return;
             }
 
-            var model = context.Step.ToObject<AdminMenuStepModel>();
+            var model = context.Step.ToObject<AdminMenuStepModel>(_serializationOptions);
 
             foreach (var token in model.Data.Cast<JsonObject>())
             {

diff --git a/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs
@@ -1,3 +1,4 @@
+using System;
 using GraphQL;
 using GraphQL.DataLoader;
 using GraphQL.Execution;
@@ -14,7 +15,6 @@
 using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Security.Permissions;
-using System;
 
 namespace OrchardCore.Apis.GraphQL
 {

diff --git a/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutoroutePartHandler.cs b/src/OrchardCore.Modules/OrchardCore.Autoroute/Handlers/AutoroutePartHandler.cs
@@ -37,6 +37,7 @@ public class AutoroutePartHandler : ContentPartHandler<AutoroutePart>
         private readonly ITagCache _tagCache;
         private readonly ISession _session;
         private readonly IServiceProvider _serviceProvider;
+
         protected readonly IStringLocalizer S;
 
         private IContentManager _contentManager;

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Migrations.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Migrations.cs
@@ -14,7 +14,9 @@ public class Migrations : DataMigration
         private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly ShellDescriptor _shellDescriptor;
 
-        public Migrations(IContentDefinitionManager contentDefinitionManager, ShellDescriptor shellDescriptor)
+        public Migrations(
+            IContentDefinitionManager contentDefinitionManager,
+            ShellDescriptor shellDescriptor)
         {
             _contentDefinitionManager = contentDefinitionManager;
             _shellDescriptor = shellDescriptor;

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/LinkFieldSettingsDriver.cs
@@ -23,8 +23,7 @@ public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefiniti
                 model.TextPlaceholder = settings.TextPlaceholder;
                 model.DefaultUrl = settings.DefaultUrl;
                 model.DefaultText = settings.DefaultText;
-            })
-                .Location("Content");
+            }).Location("Content");
         }
 
         public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettingsDriver.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Settings/TextFieldSettingsDriver.cs
@@ -18,8 +18,7 @@ public override IDisplayResult Edit(ContentPartFieldDefinition partFieldDefiniti
                 model.Hint = settings.Hint;
                 model.Required = settings.Required;
                 model.DefaultValue = settings.DefaultValue;
-            })
-                .Location("Content");
+            }).Location("Content");
         }
 
         public override async Task<IDisplayResult> UpdateAsync(ContentPartFieldDefinition partFieldDefinition, UpdatePartFieldEditorContext context)

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentFields/Startup.cs
@@ -1,3 +1,4 @@
+using System;
 using Fluid;
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.ContentFields.Drivers;
@@ -15,7 +16,6 @@
 using OrchardCore.Data.Migration;
 using OrchardCore.Indexing;
 using OrchardCore.Modules;
-using System;
 
 namespace OrchardCore.ContentFields
 {

diff --git a/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs b/src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Globalization;
 using Fluid;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -23,8 +25,6 @@
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 using OrchardCore.Sitemaps.Builders;
-using System;
-using System.Globalization;
 
 namespace OrchardCore.ContentLocalization
 {

diff --git a/...re.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentEventDisplayDriver.cs b/...re.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentEventDisplayDriver.cs
@@ -22,7 +22,9 @@ public class AuditTrailContentEventDisplayDriver : AuditTrailEventSectionDisplay
         private readonly IAuditTrailManager _auditTrailManager;
         private readonly ISession _session;
 
-        public AuditTrailContentEventDisplayDriver(IAuditTrailManager auditTrailManager, ISession session)
+        public AuditTrailContentEventDisplayDriver(
+            IAuditTrailManager auditTrailManager,
+            ISession session)
         {
             _auditTrailManager = auditTrailManager;
             _session = session;

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadController.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Deployment/Download/DownloadController.cs
@@ -18,8 +18,7 @@ public class DownloadController : Controller
 
         public DownloadController(
             IAuthorizationService authorizationService,
-            IContentManager contentManager
-            )
+            IContentManager contentManager)
         {
             _authorizationService = authorizationService;
             _contentManager = contentManager;

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/BuildDisplayFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/BuildDisplayFilter.cs
@@ -19,7 +19,8 @@ public class BuildDisplayFilter : ILiquidFilter
         private readonly IContentItemDisplayManager _contentItemDisplayManager;
         private readonly IUpdateModelAccessor _updateModelAccessor;
 
-        public BuildDisplayFilter(IContentItemRecursionHelper<BuildDisplayFilter> buildDisplayRecursionHelper,
+        public BuildDisplayFilter(
+            IContentItemRecursionHelper<BuildDisplayFilter> buildDisplayRecursionHelper,
             IContentItemDisplayManager contentItemDisplayManager,
             IUpdateModelAccessor updateModelAccessor)
         {

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/FullTextFilter.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Liquid/FullTextFilter.cs
@@ -15,7 +15,9 @@ public class FullTextFilter : ILiquidFilter
         private readonly IContentManager _contentManager;
         private readonly IContentItemRecursionHelper<FullTextFilter> _fullTextRecursionHelper;
 
-        public FullTextFilter(IContentManager contentManager, IContentItemRecursionHelper<FullTextFilter> fullTextRecursionHelper)
+        public FullTextFilter(
+            IContentManager contentManager,
+            IContentItemRecursionHelper<FullTextFilter> fullTextRecursionHelper)
         {
             _contentManager = contentManager;
             _fullTextRecursionHelper = fullTextRecursionHelper;

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Recipes/ContentStep.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Recipes/ContentStep.cs
@@ -32,7 +32,7 @@ public Task ExecuteAsync(RecipeExecutionContext context)
             }
 
             // Otherwise, the import of content items is deferred after all migrations are completed,
-            // this prevents e.g. a content handler to trigger a workflow before worflows migrations.
+            // this prevents e.g. a content handler to trigger a workflow before workflows migrations.
             ShellScope.AddDeferredTask(scope =>
             {
                 var contentManager = scope.ServiceProvider.GetRequiredService<IContentManager>();

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Threading.Tasks;
 using Fluid;
 using Fluid.Values;
 using Microsoft.AspNetCore.Authorization;
@@ -50,8 +52,6 @@
 using OrchardCore.Sitemaps.Handlers;
 using OrchardCore.Sitemaps.Models;
 using OrchardCore.Sitemaps.Services;
-using System;
-using System.Threading.Tasks;
 using YesSql.Filters.Query;
 
 namespace OrchardCore.Contents

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentActivity.cs
@@ -16,6 +16,7 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public abstract class ContentActivity : Activity
     {
+
         protected readonly IStringLocalizer S;
 
         protected ContentActivity(

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentCreatedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentCreatedEvent.cs
@@ -6,7 +6,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class ContentCreatedEvent : ContentEvent
     {
-        public ContentCreatedEvent(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ContentCreatedEvent> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public ContentCreatedEvent(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<ContentCreatedEvent> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDeletedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDeletedEvent.cs
@@ -6,7 +6,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class ContentDeletedEvent : ContentEvent
     {
-        public ContentDeletedEvent(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ContentDeletedEvent> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public ContentDeletedEvent(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<ContentDeletedEvent> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDraftSavedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentDraftSavedEvent.cs
@@ -6,7 +6,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class ContentDraftSavedEvent : ContentEvent
     {
-        public ContentDraftSavedEvent(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ContentDraftSavedEvent> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public ContentDraftSavedEvent(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<ContentDraftSavedEvent> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentEvent.cs
@@ -11,7 +11,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public abstract class ContentEvent : ContentActivity, IEvent
     {
-        protected ContentEvent(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer) : base(contentManager, scriptEvaluator, localizer)
+        protected ContentEvent(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentPublishedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentPublishedEvent.cs
@@ -6,7 +6,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class ContentPublishedEvent : ContentEvent
     {
-        public ContentPublishedEvent(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ContentPublishedEvent> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public ContentPublishedEvent(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<ContentPublishedEvent> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentTask.cs
@@ -7,7 +7,10 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public abstract class ContentTask : ContentActivity, ITask
     {
-        protected ContentTask(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer localizer)
+        protected ContentTask(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer localizer)
             : base(contentManager, scriptEvaluator, localizer)
         {
         }

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUnpublishedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUnpublishedEvent.cs
@@ -6,7 +6,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class ContentUnpublishedEvent : ContentEvent
     {
-        public ContentUnpublishedEvent(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ContentUnpublishedEvent> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public ContentUnpublishedEvent(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<ContentUnpublishedEvent> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUpdatedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentUpdatedEvent.cs
@@ -6,7 +6,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class ContentUpdatedEvent : ContentEvent
     {
-        public ContentUpdatedEvent(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ContentUpdatedEvent> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public ContentUpdatedEvent(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<ContentUpdatedEvent> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentVersionedEvent.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/ContentVersionedEvent.cs
@@ -6,7 +6,10 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class ContentVersionedEvent : ContentEvent
     {
-        public ContentVersionedEvent(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<ContentVersionedEvent> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public ContentVersionedEvent(IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<ContentVersionedEvent> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/DeleteContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/DeleteContentTask.cs
@@ -12,7 +12,10 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class DeleteContentTask : ContentTask
     {
-        public DeleteContentTask(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<DeleteContentTask> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public DeleteContentTask(IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<DeleteContentTask> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/PublishContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/PublishContentTask.cs
@@ -12,7 +12,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class PublishContentTask : ContentTask
     {
-        public PublishContentTask(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<PublishContentTask> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public PublishContentTask(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<PublishContentTask> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/RetrieveContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/RetrieveContentTask.cs
@@ -13,7 +13,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class RetrieveContentTask : ContentTask
     {
-        public RetrieveContentTask(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<RetrieveContentTask> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public RetrieveContentTask(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<RetrieveContentTask> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UnpublishContentTask.cs b/src/OrchardCore.Modules/OrchardCore.Contents/Workflows/Activities/UnpublishContentTask.cs
@@ -12,7 +12,11 @@ namespace OrchardCore.Contents.Workflows.Activities
 {
     public class UnpublishContentTask : ContentTask
     {
-        public UnpublishContentTask(IContentManager contentManager, IWorkflowScriptEvaluator scriptEvaluator, IStringLocalizer<UnpublishContentTask> localizer) : base(contentManager, scriptEvaluator, localizer)
+        public UnpublishContentTask(
+            IContentManager contentManager,
+            IWorkflowScriptEvaluator scriptEvaluator,
+            IStringLocalizer<UnpublishContentTask> localizer)
+            : base(contentManager, scriptEvaluator, localizer)
         {
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ namespace OrchardCore.Contents.Workflows.Activities @@
     {
         public abstract class ContentActivity : Activity
         {
             protected readonly IStringLocalizer S;
             protected ContentActivity(
@@ Expand Down @@