Cleanup Results helper

src/Http/Http.Extensions/src/ResponseHeaders.cs

@@ -153,7 +153,7 @@ public DateTimeOffset? Expires
         }
 
         /// <summary>
-        /// Gets or sets the <c>Last=Modified</c> header for an HTTP response.
+        /// Gets or sets the <c>Last-Modified</c> header for an HTTP response.
         /// </summary>
         public DateTimeOffset? LastModified
         {

src/Http/Http.Results/src/AcceptedAtRouteResult.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -48,7 +47,7 @@ public AcceptedAtRouteResult(
         public RouteValueDictionary RouteValues { get; }
 
         /// <inheritdoc />
-        protected override void OnFormatting(HttpContext context)
+        protected override void ConfigureResponseHeaders(HttpContext context)
         {
             var linkGenerator = context.RequestServices.GetRequiredService<LinkGenerator>();
             var url = linkGenerator.GetUriByAddress(

src/Http/Http.Results/src/AcceptedResult.cs

@@ -58,13 +58,8 @@ public AcceptedResult(Uri locationUri, object? value)
         public string? Location { get; set; }
 
         /// <inheritdoc />
-        protected override void OnFormatting(HttpContext context)
+        protected override void ConfigureResponseHeaders(HttpContext context)
         {
-            if (context == null)
-            {
-                throw new ArgumentNullException(nameof(context));
-            }
-
             if (!string.IsNullOrEmpty(Location))
             {
                 context.Response.Headers.Location = Location;

src/Http/Http.Results/src/CreatedAtRouteResult.cs

@@ -48,7 +48,7 @@ public CreatedAtRouteResult(
         public RouteValueDictionary? RouteValues { get; set; }
 
         /// <inheritdoc />
-        protected override void OnFormatting(HttpContext context)
+        protected override void ConfigureResponseHeaders(HttpContext context)
         {
             var linkGenerator = context.RequestServices.GetRequiredService<LinkGenerator>();
             var url = linkGenerator.GetUriByRouteValues(

src/Http/Http.Results/src/CreatedResult.cs

@@ -49,7 +49,7 @@ public CreatedResult(Uri location, object? value)
         public string Location { get; init; }
 
         /// <inheritdoc />
-        protected override void OnFormatting(HttpContext context)
+        protected override void ConfigureResponseHeaders(HttpContext context)
         {
             context.Response.Headers.Location = Location;
         }

src/Http/Http.Results/src/FileContentResult.cs

@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.IO;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -18,7 +16,7 @@ internal sealed partial class FileContentResult : FileResult, IResult
         /// </summary>
         /// <param name="fileContents">The bytes that represent the file contents.</param>
         /// <param name="contentType">The Content-Type header of the response.</param>
-        public FileContentResult(byte[] fileContents, string contentType)
+        public FileContentResult(byte[] fileContents, string? contentType)
             : base(contentType)
         {
             FileContents = fileContents;

src/Http/Http.Results/src/FileResult.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
@@ -17,14 +16,9 @@ internal abstract partial class FileResult
         /// the provided <paramref name="contentType"/>.
         /// </summary>
         /// <param name="contentType">The Content-Type header of the response.</param>
-        protected FileResult(string contentType)
+        protected FileResult(string? contentType)
         {
-            if (contentType == null)
-            {
-                throw new ArgumentNullException(nameof(contentType));
-            }
-
-            ContentType = contentType;
+            ContentType = contentType ?? "application/octet-stream";
         }
 
         /// <summary>

src/Http/Http.Results/src/FileStreamResult.cs

@@ -1,13 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.IO;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNetCore.Http.Result
 {
@@ -24,26 +20,8 @@ internal sealed class FileStreamResult : FileResult, IResult
         /// </summary>
         /// <param name="fileStream">The stream with the file.</param>
         /// <param name="contentType">The Content-Type header of the response.</param>
-        public FileStreamResult(Stream fileStream, string contentType)
-            : this(fileStream, MediaTypeHeaderValue.Parse(contentType))
-        {
-            if (fileStream == null)
-            {
-                throw new ArgumentNullException(nameof(fileStream));
-            }
-
-            FileStream = fileStream;
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="FileStreamResult"/> instance with
-        /// the provided <paramref name="fileStream"/> and the
-        /// provided <paramref name="contentType"/>.
-        /// </summary>
-        /// <param name="fileStream">The stream with the file.</param>
-        /// <param name="contentType">The Content-Type header of the response.</param>
-        public FileStreamResult(Stream fileStream, MediaTypeHeaderValue contentType)
-            : base(contentType.ToString())
+        public FileStreamResult(Stream fileStream, string? contentType)
+            : base(contentType)
         {
             if (fileStream == null)
             {
@@ -58,10 +36,10 @@ public FileStreamResult(Stream fileStream, MediaTypeHeaderValue contentType)
         /// </summary>
         public Stream FileStream { get; }
 
-        public Task ExecuteAsync(HttpContext httpContext)
+        public async Task ExecuteAsync(HttpContext httpContext)
         {
             var logger = httpContext.RequestServices.GetRequiredService<ILogger<FileStreamResult>>();
-            using (FileStream)
+            await using (FileStream)
             {
                 Log.ExecutingFileResult(logger, this);
 
@@ -90,20 +68,20 @@ public Task ExecuteAsync(HttpContext httpContext)
 
                 if (!serveBody)
                 {
-                    return Task.CompletedTask;
+                    return;
                 }
 
                 if (range != null && rangeLength == 0)
                 {
-                    return Task.CompletedTask;
+                    return;
                 }
 
                 if (range != null)
                 {
                     FileResultHelper.Log.WritingRangeToBody(logger);
                 }
 
-                return FileResultHelper.WriteFileAsync(httpContext, FileStream, range, rangeLength);
+                await FileResultHelper.WriteFileAsync(httpContext, FileStream, range, rangeLength);
             }
         }
     }

src/Http/Http.Results/src/ObjectResult.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
@@ -42,7 +41,7 @@ public Task ExecuteAsync(HttpContext httpContext)
         {
             var loggerFactory = httpContext.RequestServices.GetRequiredService<ILoggerFactory>();
             var logger = loggerFactory.CreateLogger(GetType());
-            Log.ObjectResultExecuting(logger, Value);
+            Log.ObjectResultExecuting(logger, Value, StatusCode);
 
             if (Value is ProblemDetails problemDetails)
             {
@@ -54,10 +53,25 @@ public Task ExecuteAsync(HttpContext httpContext)
                 httpContext.Response.StatusCode = statusCode;
             }
 
+            ConfigureResponseHeaders(httpContext);
+
+            if (Value is null)
+            {
+                return Task.CompletedTask;
+            }
+
             OnFormatting(httpContext);
             return httpContext.Response.WriteAsJsonAsync(Value);
         }
 
+        protected virtual void OnFormatting(HttpContext httpContext)
+        {
+        }
+
+        protected virtual void ConfigureResponseHeaders(HttpContext httpContext)
+        {
+        }
+
         private void ApplyProblemDetailsDefaults(ProblemDetails problemDetails)
         {
             // We allow StatusCode to be specified either on ProblemDetails or on the ObjectResult and use it to configure the other.
@@ -89,23 +103,29 @@ private void ApplyProblemDetailsDefaults(ProblemDetails problemDetails)
             }
         }
 
-        protected virtual void OnFormatting(HttpContext httpContext)
-        {
-        }
-
         private static partial class Log
         {
-            public static void ObjectResultExecuting(ILogger logger, object? value)
+            public static void ObjectResultExecuting(ILogger logger, object? value, int? statusCode)
             {
                 if (logger.IsEnabled(LogLevel.Information))
                 {
-                    var valueType = value is null ? "null" : value.GetType().FullName!;
-                    ObjectResultExecuting(logger, valueType);
+                    if (value is null)
+                    {
+                        ObjectResultExecutingWithoutValue(logger, statusCode ?? StatusCodes.Status200OK);
+                    }
+                    else
+                    {
+                        var valueType = value.GetType().FullName!;
+                        ObjectResultExecuting(logger, valueType, statusCode ?? StatusCodes.Status200OK);
+                    }
                 }
             }
 
-            [LoggerMessage(1, LogLevel.Information, "Writing value of type '{Type}'.", EventName = "ObjectResultExecuting", SkipEnabledCheck = true)]
-            public static partial void ObjectResultExecuting(ILogger logger, string type);
+            [LoggerMessage(1, LogLevel.Information, "Writing value of type '{Type}' with status code '{StatusCode}'.", EventName = "ObjectResultExecuting", SkipEnabledCheck = true)]
+            private static partial void ObjectResultExecuting(ILogger logger, string type, int statusCode);
+
+            [LoggerMessage(2, LogLevel.Information, "Executing result with status code '{StatusCode}'.", EventName = "ObjectResultExecutingWithoutValue", SkipEnabledCheck = true)]
+            private static partial void ObjectResultExecutingWithoutValue(ILogger logger, int statusCode);
         }
     }
 }

src/Http/Http.Results/src/PhysicalFileResult.cs

@@ -1,9 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.IO;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -22,7 +19,7 @@ internal sealed partial class PhysicalFileResult : FileResult, IResult
         /// </summary>
         /// <param name="fileName">The path to the file. The path must be an absolute path.</param>
         /// <param name="contentType">The Content-Type header of the response.</param>
-        public PhysicalFileResult(string fileName, string contentType)
+        public PhysicalFileResult(string fileName, string? contentType)
             : base(contentType)
         {
             FileName = fileName;