Adding STJ Polymorphism to Result Types

src/Http/Http.Results/src/Accepted.cs

@@ -69,7 +69,7 @@ public Task ExecuteAsync(HttpContext httpContext)
             httpContext.Response.Headers.Location = Location;
         }
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
         return Task.CompletedTask;

src/Http/Http.Results/src/AcceptedAtRoute.cs

@@ -81,7 +81,7 @@ public Task ExecuteAsync(HttpContext httpContext)
 
         httpContext.Response.Headers.Location = url;
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
         return Task.CompletedTask;

src/Http/Http.Results/src/AcceptedAtRouteOfT.cs

@@ -44,7 +44,7 @@ internal AcceptedAtRoute(
         Value = value;
         RouteName = routeName;
         RouteValues = new RouteValueDictionary(routeValues);
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 
     /// <summary>
@@ -94,10 +94,10 @@ public Task ExecuteAsync(HttpContext httpContext)
 
         httpContext.Response.Headers.Location = url;
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(httpContext, logger, Value);
+        return HttpResultsWriter.WriteResultAsJsonAsync(httpContext, logger, Value);
     }
 
     /// <inheritdoc/>

src/Http/Http.Results/src/AcceptedOfT.cs

@@ -26,7 +26,7 @@ internal Accepted(string? location, TValue? value)
     {
         Value = value;
         Location = location;
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 
     /// <summary>
@@ -38,7 +38,7 @@ internal Accepted(string? location, TValue? value)
     internal Accepted(Uri locationUri, TValue? value)
     {
         Value = value;
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
 
         if (locationUri == null)
         {
@@ -88,10 +88,10 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.AcceptedResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(
+        return HttpResultsWriter.WriteResultAsJsonAsync(
                 httpContext,
                 logger,
                 Value);

src/Http/Http.Results/src/BadRequest.cs

@@ -39,7 +39,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.BadRequestObjectResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
         return Task.CompletedTask;

src/Http/Http.Results/src/BadRequestOfT.cs

@@ -24,7 +24,7 @@ public sealed class BadRequest<TValue> : IResult, IEndpointMetadataProvider, ISt
     internal BadRequest(TValue? error)
     {
         Value = error;
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 
     /// <summary>
@@ -50,10 +50,10 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.BadRequestObjectResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(
+        return HttpResultsWriter.WriteResultAsJsonAsync(
                 httpContext,
                 logger: logger,
                 Value);

src/Http/Http.Results/src/Conflict.cs

@@ -39,7 +39,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.ConflictObjectResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
         return Task.CompletedTask;

src/Http/Http.Results/src/ConflictOfT.cs

@@ -24,7 +24,7 @@ public sealed class Conflict<TValue> : IResult, IEndpointMetadataProvider, IStat
     internal Conflict(TValue? error)
     {
         Value = error;
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 
     /// <summary>
@@ -50,10 +50,10 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.ConflictObjectResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(
+        return HttpResultsWriter.WriteResultAsJsonAsync(
                 httpContext,
                 logger: logger,
                 Value);

src/Http/Http.Results/src/ContentHttpResult.cs

@@ -65,11 +65,11 @@ public Task ExecuteAsync(HttpContext httpContext)
 
         if (StatusCode is { } statusCode)
         {
-            HttpResultsHelper.Log.WritingResultAsStatusCode(logger, statusCode);
+            HttpResultsWriter.Log.WritingResultAsStatusCode(logger, statusCode);
             httpContext.Response.StatusCode = statusCode;
         }
 
-        return HttpResultsHelper.WriteResultAsContentAsync(
+        return HttpResultsWriter.WriteResultAsContentAsync(
             httpContext,
             logger,
             ResponseContent,

src/Http/Http.Results/src/Created.cs

@@ -69,7 +69,7 @@ public Task ExecuteAsync(HttpContext httpContext)
             httpContext.Response.Headers.Location = Location;
         }
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
         return Task.CompletedTask;

src/Http/Http.Results/src/CreatedAtRoute.cs

@@ -81,7 +81,7 @@ public Task ExecuteAsync(HttpContext httpContext)
 
         httpContext.Response.Headers.Location = url;
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
         return Task.CompletedTask;

src/Http/Http.Results/src/CreatedAtRouteOfT.cs

@@ -44,7 +44,7 @@ internal CreatedAtRoute(
         Value = value;
         RouteName = routeName;
         RouteValues = new RouteValueDictionary(routeValues);
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 
     /// <summary>
@@ -94,10 +94,10 @@ public Task ExecuteAsync(HttpContext httpContext)
 
         httpContext.Response.Headers.Location = url;
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(
+        return HttpResultsWriter.WriteResultAsJsonAsync(
                 httpContext,
                 logger,
                 Value);

src/Http/Http.Results/src/CreatedOfT.cs

@@ -26,7 +26,7 @@ internal Created(string? location, TValue? value)
     {
         Value = value;
         Location = location;
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 
     /// <summary>
@@ -38,7 +38,7 @@ internal Created(string? location, TValue? value)
     internal Created(Uri? locationUri, TValue? value)
     {
         Value = value;
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
 
         if (locationUri != null)
         {
@@ -84,10 +84,10 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.CreatedResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(
+        return HttpResultsWriter.WriteResultAsJsonAsync(
                 httpContext,
                 logger,
                 Value);

src/Http/Http.Results/src/FileContentHttpResult.cs

@@ -112,7 +112,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.FileContentResult");
 
-        var (range, rangeLength, completed) = HttpResultsHelper.WriteResultAsFileCore(
+        var (range, rangeLength, completed) = HttpResultsWriter.WriteResultAsFileCore(
             httpContext,
             logger,
             FileDownloadName,

src/Http/Http.Results/src/FileStreamHttpResult.cs

@@ -123,7 +123,7 @@ public async Task ExecuteAsync(HttpContext httpContext)
 
         await using (FileStream)
         {
-            var (range, rangeLength, completed) = HttpResultsHelper.WriteResultAsFileCore(
+            var (range, rangeLength, completed) = HttpResultsWriter.WriteResultAsFileCore(
                 httpContext,
                 logger,
                 FileDownloadName,

src/Http/Http.Results/src/HttpResultsHelper.cs → src/Http/Http.Results/src/HttpResultsWriter.cs

@@ -3,17 +3,23 @@
 
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
+using Microsoft.AspNetCore.Http.Json;
 using Microsoft.AspNetCore.Internal;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Http;
 
-internal static partial class HttpResultsHelper
+internal static partial class HttpResultsWriter
 {
     internal const string DefaultContentType = "text/plain; charset=utf-8";
     private static readonly Encoding DefaultEncoding = Encoding.UTF8;
+    private static JsonSerializerOptions? _defaultSerializerOptions;
+    private readonly static object _syncObj = new();
 
     public static Task WriteResultAsJsonAsync<T>(
         HttpContext httpContext,
@@ -27,32 +33,45 @@ public static Task WriteResultAsJsonAsync<T>(
             return Task.CompletedTask;
         }
 
-        var declaredType = typeof(T);
-        if (declaredType.IsValueType)
-        {
-            Log.WritingResultAsJson(logger, declaredType.Name);
+        jsonSerializerOptions ??= GetDefaultOptions(httpContext);
 
+        var declaredTypeInfo = (JsonTypeInfo<T>)jsonSerializerOptions.GetTypeInfo(typeof(T));
+        if (value is null || declaredTypeInfo.IsPolymorphicSafe())
+        {
             // In this case the polymorphism is not
             // relevant and we don't need to box.
             return httpContext.Response.WriteAsJsonAsync(
-                        value,
-                        options: jsonSerializerOptions,
-                        contentType: contentType);
+                value,
+                declaredTypeInfo,
+                contentType: contentType);
         }
 
-        var runtimeType = value.GetType();
-
-        Log.WritingResultAsJson(logger, runtimeType.Name);
-
         // Call WriteAsJsonAsync() with the runtime type to serialize the runtime type rather than the declared type
         // and avoid source generators issues.
         // https://github.com/dotnet/aspnetcore/issues/43894
         // https://docs.microsoft.com/en-us/dotnet/standard/serialization/system-text-json-polymorphism
+
+        var jsonTypeInfo = jsonSerializerOptions.GetTypeInfo(value.GetType());
+        Log.WritingResultAsJson(logger, jsonTypeInfo.Type.Name);
+
         return httpContext.Response.WriteAsJsonAsync(
             value,
-            runtimeType,
-            options: jsonSerializerOptions,
+            jsonTypeInfo,
             contentType: contentType);
+
+        static JsonSerializerOptions GetDefaultOptions(HttpContext httpContext)
+        {
+            if (_defaultSerializerOptions != null)
+            {
+                return _defaultSerializerOptions;
+            }
+
+            // TODO: Should I lock it???
+            lock (_syncObj)
+            {
+                return _defaultSerializerOptions = httpContext.RequestServices.GetService<IOptions<JsonOptions>>()?.Value.SerializerOptions ?? new JsonOptions().SerializerOptions;
+            }
+        }
     }
 
     public static Task WriteResultAsContentAsync(

src/Http/Http.Results/src/JsonHttpResultOfT.cs

@@ -89,11 +89,11 @@ public Task ExecuteAsync(HttpContext httpContext)
 
         if (StatusCode is { } statusCode)
         {
-            HttpResultsHelper.Log.WritingResultAsStatusCode(logger, statusCode);
+            HttpResultsWriter.Log.WritingResultAsStatusCode(logger, statusCode);
             httpContext.Response.StatusCode = statusCode;
         }
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(
+        return HttpResultsWriter.WriteResultAsJsonAsync(
             httpContext,
             logger,
             Value,

src/Http/Http.Results/src/Microsoft.AspNetCore.Http.Results.csproj

@@ -19,6 +19,7 @@
     <Compile Include="$(SharedSourceRoot)ProblemDetails\ProblemDetailsDefaults.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)ApiExplorerTypes\*.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)RoutingMetadata\AcceptsMetadata.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Json\JsonSerializerExtensions.cs" LinkBase="Shared"/>
   </ItemGroup>
 
   <ItemGroup>

src/Http/Http.Results/src/NoContent.cs

@@ -38,7 +38,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.NoContentResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
 
         httpContext.Response.StatusCode = StatusCode;
 

src/Http/Http.Results/src/NotFound.cs

@@ -38,7 +38,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.NotFoundObjectResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
         return Task.CompletedTask;

src/Http/Http.Results/src/NotFoundOfT.cs

@@ -23,7 +23,7 @@ public sealed class NotFound<TValue> : IResult, IEndpointMetadataProvider, IStat
     internal NotFound(TValue? value)
     {
         Value = value;
-        HttpResultsHelper.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
+        HttpResultsWriter.ApplyProblemDetailsDefaultsIfNeeded(Value, StatusCode);
     }
 
     /// <summary>
@@ -49,10 +49,10 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.NotFoundObjectResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
-        return HttpResultsHelper.WriteResultAsJsonAsync(
+        return HttpResultsWriter.WriteResultAsJsonAsync(
                 httpContext,
                 logger: logger,
                 Value);

src/Http/Http.Results/src/Ok.cs

@@ -38,7 +38,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
         var logger = loggerFactory.CreateLogger("Microsoft.AspNetCore.Http.Result.OkObjectResult");
 
-        HttpResultsHelper.Log.WritingResultAsStatusCode(logger, StatusCode);
+        HttpResultsWriter.Log.WritingResultAsStatusCode(logger, StatusCode);
         httpContext.Response.StatusCode = StatusCode;
 
         return Task.CompletedTask;