8.0.0 beta 3

Author: petriashev

src/MicroElements.Metadata.AspNetCore/AspNetCore/AspNetJsonSerializerOptions.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Text.Json;
+using Microsoft.Extensions.Options;
+
+namespace MicroElements.Metadata.AspNetCore;
+
+/// <summary>
+/// JsonSerializerOptions for Metadata serialization. Value wrapper that can be used in netstandard.
+/// </summary>
+public class AspNetJsonSerializerOptions
+{
+    /// <summary>
+    /// Gets the <see cref="System.Text.Json.JsonSerializerOptions"/> from AspNet host.
+    /// </summary>
+    public JsonSerializerOptions JsonSerializerOptions { get; set; }
+}
+
+internal sealed class ConfigureAspNetJsonSerializerOptions(IServiceProvider serviceProvider)
+    : IConfigureNamedOptions<AspNetJsonSerializerOptions>
+{
+    /// <inheritdoc />
+    public void Configure(string? name, AspNetJsonSerializerOptions options)
+    {
+        JsonSerializerOptions jsonOptions = serviceProvider.GetJsonSerializerOptionsOrDefault();
+        options.JsonSerializerOptions = jsonOptions;
+    }
+
+    /// <inheritdoc />
+    public void Configure(AspNetJsonSerializerOptions options) => Configure(null, options);
+}

src/MicroElements.Metadata.AspNetCore/AspNetCore/DependencyInjectionExtensions.cs

@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Options;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace MicroElements.Metadata.AspNetCore
@@ -40,15 +41,12 @@ public static IServiceCollection AddMetadata(
             configureMetadataJson ??= options => { };
             services.Configure<MetadataJsonSerializationOptions>(configureMetadataJson);
 
-            // Allows to serialize property containers
-            // NOTE: Not the same as AspNet JsonSerializerOptions. Use AspNetJsonSerializerOptions wrapper
-            services.Configure<JsonSerializerOptions>(options => options.ConfigureJsonForPropertyContainers(configureMetadataJson));
-
-            // Configures serialization for AspNetCore
+            // Configures System.Text.Json serialization for AspNetCore and MinimalApi
             services.ConfigureJsonOptionsForAspNetCore(options => options.ConfigureJsonForPropertyContainers(configureMetadataJson));
+            services.ConfigureJsonOptionsForMinimalApi(options => options.ConfigureJsonForPropertyContainers(configureMetadataJson));
 
             // Register wrapper for AspNetCore json options.
-            services.AddTransient<AspNetJsonSerializerOptions>(provider => new AspNetJsonSerializerOptions(provider.GetJsonSerializerOptionsOrDefault()));
+            services.ConfigureOptions<ConfigureAspNetJsonSerializerOptions>();
 
             // Allows to use property containers in swagger
             services.ConfigureSwaggerForPropertyContainers(configureSwaggerOptions);
@@ -66,6 +64,23 @@ public static IServiceCollection AddMetadata(
             return services;
         }
 
+        public static void ConfigureJsonOptionsForAspNetCore(this IServiceCollection services, Action<JsonSerializerOptions> configureJson)
+        {
+            services.Configure<JsonOptions>(options => configureJson(options.JsonSerializerOptions));
+        }
+
+        public static void ConfigureJsonOptionsForMinimalApi(this IServiceCollection services, Action<JsonSerializerOptions> configureJson)
+        {
+            services.ConfigureHttpJsonOptions(options => configureJson(options.SerializerOptions));
+        }
+
+        public static JsonSerializerOptions GetJsonSerializerOptionsOrDefault(this IServiceProvider serviceProvider)
+        {
+            return serviceProvider.GetService<IOptions<JsonOptions>>()?.Value.JsonSerializerOptions
+                   ?? serviceProvider.GetService<IOptions<Microsoft.AspNetCore.Http.Json.JsonOptions>>()?.Value.SerializerOptions
+                   ?? new JsonSerializerOptions();
+        }
+
         internal static IServiceCollection Decorate<TService>(
             this IServiceCollection services,
             Func<TService, TService> decorate)
@@ -108,24 +123,4 @@ ServiceDescriptor CreateServiceDescriptor(Func<IServiceProvider, TService> func)
             return services;
         }
     }
-
-    /// <summary>
-    /// AspNetCore MVC JsonOptions. Value wrapper that can be used in netstandard.
-    /// </summary>
-    public class AspNetJsonSerializerOptions
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AspNetJsonSerializerOptions"/> class.
-        /// </summary>
-        /// <param name="value"><see cref="JsonSerializerOptions"/> from AspNet host.</param>
-        public AspNetJsonSerializerOptions(JsonSerializerOptions value)
-        {
-            Value = value;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="JsonSerializerOptions"/> from AspNet host.
-        /// </summary>
-        public JsonSerializerOptions Value { get; }
-    }
 }

src/MicroElements.Metadata.AspNetCore/AspNetCore/ReflectionDependencyInjectionExtensions.cs

@@ -6,36 +6,35 @@
 using MicroElements.Reflection.TypeExtensions;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace MicroElements.Metadata.Swashbuckle
+namespace MicroElements.Metadata.Swashbuckle;
+
+/// <summary>
+/// Configures serialization for <see cref="IPropertyContainer"/> as for collections.
+/// Also <see cref="IPropertyValue"/> replaces for <see cref="PropertyValueContract"/> because swagger generates schemas for many unnecessary system types.
+/// </summary>
+public class MetadataSerializerBehavior : ISerializerDataContractResolver
 {
+    private readonly ISerializerDataContractResolver _dataContractResolver;
+
     /// <summary>
-    /// Configures serialization for <see cref="IPropertyContainer"/> as for collections.
-    /// Also <see cref="IPropertyValue"/> replaces for <see cref="PropertyValueContract"/> because swagger generates schemas for many unnecessary system types.
+    /// Initializes a new instance of the <see cref="MetadataSerializerBehavior"/> class.
     /// </summary>
-    public class MetadataSerializerBehavior : ISerializerDataContractResolver
+    /// <param name="dataContractResolver">Base service.</param>
+    public MetadataSerializerBehavior(ISerializerDataContractResolver dataContractResolver)
     {
-        private readonly ISerializerDataContractResolver _dataContractResolver;
+        _dataContractResolver = dataContractResolver;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MetadataSerializerBehavior"/> class.
-        /// </summary>
-        /// <param name="dataContractResolver">Base service.</param>
-        public MetadataSerializerBehavior(ISerializerDataContractResolver dataContractResolver)
+    /// <inheritdoc />
+    public DataContract GetDataContractForType(Type type)
+    {
+        if (type.IsAssignableTo<IPropertyContainer>())
         {
-            _dataContractResolver = dataContractResolver;
+            // Array is used for schema inlining.
+            // If IPropertyContainer is not collection then schema will be generated as a reference but we need to make it dependent on PropertySet.
+            return DataContract.ForArray(type, typeof(PropertyValueContract));
         }
 
-        /// <inheritdoc />
-        public DataContract GetDataContractForType(Type type)
-        {
-            if (type.IsAssignableTo<IPropertyContainer>())
-            {
-                // Array is used for schema inlining.
-                // If IPropertyContainer is not collection then schema will be generated as a reference but we need to make it dependent on PropertySet.
-                return DataContract.ForArray(type, typeof(PropertyValueContract));
-            }
-
-            return _dataContractResolver.GetDataContractForType(type);
-        }
+        return _dataContractResolver.GetDataContractForType(type);
     }
-}
+}