RazorComponentResult: change namespace, make executor internal, merge test classes

Author: SteveSandersonMS

src/Components/Endpoints/src/DependencyInjection/RazorComponentsServiceCollectionExtensions.cs

@@ -39,9 +39,6 @@ public static IRazorComponentsBuilder AddRazorComponents(this IServiceCollection
 
         services.TryAddSingleton<RazorComponentsMarkerService>();
 
-        // Results
-        services.TryAddSingleton<RazorComponentResultExecutor>();
-
         // Endpoints
         services.TryAddSingleton<RazorComponentEndpointDataSourceFactory>();
         services.TryAddSingleton<RazorComponentEndpointFactory>();

src/Components/Endpoints/src/PublicAPI.Unshipped.txt

@@ -18,25 +18,6 @@ Microsoft.AspNetCore.Components.Endpoints.Infrastructure.RenderModeEndpointProvi
 Microsoft.AspNetCore.Components.Endpoints.Infrastructure.RenderModeEndpointProvider.RenderModeEndpointProvider() -> void
 Microsoft.AspNetCore.Components.Endpoints.IRazorComponentEndpointInvoker
 Microsoft.AspNetCore.Components.Endpoints.IRazorComponentEndpointInvoker.Render(Microsoft.AspNetCore.Http.HttpContext! context) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.ComponentType.get -> System.Type!
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.ContentType.get -> string?
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.ContentType.set -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.Parameters.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object?>!
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.PreventStreamingRendering.get -> bool
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.PreventStreamingRendering.set -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.RazorComponentResult(System.Type! componentType) -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.RazorComponentResult(System.Type! componentType, object? parameters) -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.RazorComponentResult(System.Type! componentType, System.Collections.Generic.IReadOnlyDictionary<string!, object?>? parameters) -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.StatusCode.get -> int?
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult.StatusCode.set -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult<TComponent>
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult<TComponent>.RazorComponentResult() -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult<TComponent>.RazorComponentResult(object! parameters) -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult<TComponent>.RazorComponentResult(System.Collections.Generic.IReadOnlyDictionary<string!, object?>! parameters) -> void
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResultExecutor
-Microsoft.AspNetCore.Components.Endpoints.RazorComponentResultExecutor.RazorComponentResultExecutor() -> void
 Microsoft.AspNetCore.Components.Endpoints.RazorComponentsOptions
 Microsoft.AspNetCore.Components.Endpoints.RazorComponentsOptions.MaxFormMappingCollectionSize.get -> int
 Microsoft.AspNetCore.Components.Endpoints.RazorComponentsOptions.MaxFormMappingCollectionSize.set -> void
@@ -54,11 +35,26 @@ Microsoft.AspNetCore.Components.PersistedStateSerializationMode
 Microsoft.AspNetCore.Components.PersistedStateSerializationMode.Infer = 1 -> Microsoft.AspNetCore.Components.PersistedStateSerializationMode
 Microsoft.AspNetCore.Components.PersistedStateSerializationMode.Server = 2 -> Microsoft.AspNetCore.Components.PersistedStateSerializationMode
 Microsoft.AspNetCore.Components.PersistedStateSerializationMode.WebAssembly = 3 -> Microsoft.AspNetCore.Components.PersistedStateSerializationMode
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.ComponentType.get -> System.Type!
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.ContentType.get -> string?
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.ContentType.set -> void
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.Parameters.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object?>!
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.PreventStreamingRendering.get -> bool
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.PreventStreamingRendering.set -> void
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.RazorComponentResult(System.Type! componentType) -> void
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.RazorComponentResult(System.Type! componentType, object? parameters) -> void
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.RazorComponentResult(System.Type! componentType, System.Collections.Generic.IReadOnlyDictionary<string!, object?>? parameters) -> void
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.StatusCode.get -> int?
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult.StatusCode.set -> void
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult<TComponent>
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult<TComponent>.RazorComponentResult() -> void
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult<TComponent>.RazorComponentResult(object! parameters) -> void
+Microsoft.AspNetCore.Http.HttpResults.RazorComponentResult<TComponent>.RazorComponentResult(System.Collections.Generic.IReadOnlyDictionary<string!, object?>! parameters) -> void
 Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder
 Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder.Services.get -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 Microsoft.Extensions.DependencyInjection.RazorComponentsServiceCollectionExtensions
 static Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilderExtensions.AddAdditionalAssemblies(this Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder! builder, params System.Reflection.Assembly![]! assemblies) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
 static Microsoft.AspNetCore.Builder.RazorComponentsEndpointRouteBuilderExtensions.MapRazorComponents<TRootComponent>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder! endpoints) -> Microsoft.AspNetCore.Builder.RazorComponentsEndpointConventionBuilder!
 static Microsoft.Extensions.DependencyInjection.RazorComponentsServiceCollectionExtensions.AddRazorComponents(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<Microsoft.AspNetCore.Components.Endpoints.RazorComponentsOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IRazorComponentsBuilder!
-static readonly Microsoft.AspNetCore.Components.Endpoints.RazorComponentResultExecutor.DefaultContentType -> string!
-virtual Microsoft.AspNetCore.Components.Endpoints.RazorComponentResultExecutor.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext, Microsoft.AspNetCore.Components.Endpoints.RazorComponentResult! result) -> System.Threading.Tasks.Task!

src/Components/Endpoints/src/Results/RazorComponentResult.cs

@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Endpoints;
 using Microsoft.Extensions.Internal;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
-namespace Microsoft.AspNetCore.Components.Endpoints;
+namespace Microsoft.AspNetCore.Http.HttpResults;
 
 /// <summary>
 /// An <see cref="IResult"/> that renders a Razor Component.
@@ -87,15 +87,10 @@ public RazorComponentResult([DynamicallyAccessedMembers(Component)] Type compone
     public bool PreventStreamingRendering { get; set; }
 
     /// <summary>
-    /// Requests the service of
-    /// <see cref="RazorComponentResultExecutor.ExecuteAsync(HttpContext, RazorComponentResult)" />
-    /// to process itself in the given <paramref name="httpContext" />.
+    /// Processes this result in the given <paramref name="httpContext" />.
     /// </summary>
     /// <param name="httpContext">An <see cref="HttpContext" /> associated with the current request.</param >
     /// <returns >A <see cref="T:System.Threading.Tasks.Task" /> which will complete when execution is completed.</returns >
     public Task ExecuteAsync(HttpContext httpContext)
-    {
-        var executor = httpContext.RequestServices.GetRequiredService<RazorComponentResultExecutor>();
-        return executor.ExecuteAsync(httpContext, this);
-    }
+        => RazorComponentResultExecutor.ExecuteAsync(httpContext, this);
 }

src/Components/Endpoints/src/Results/RazorComponentResultExecutor.cs

@@ -9,23 +9,15 @@
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.DependencyInjection;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
+using Microsoft.AspNetCore.Http.HttpResults;
 
 namespace Microsoft.AspNetCore.Components.Endpoints;
 
-/// <summary>
-/// Executes a <see cref="RazorComponentResult"/>.
-/// </summary>
-public class RazorComponentResultExecutor
+internal static class RazorComponentResultExecutor
 {
-    /// <summary>
-    /// The default content-type header value for Razor Components, <c>text/html; charset=utf-8</c>.
-    /// </summary>
-    public static readonly string DefaultContentType = "text/html; charset=utf-8";
+    public const string DefaultContentType = "text/html; charset=utf-8";
 
-    /// <summary>
-    /// Executes a <see cref="RazorComponentResult"/> asynchronously.
-    /// </summary>
-    public virtual Task ExecuteAsync(HttpContext httpContext, RazorComponentResult result)
+    public static Task ExecuteAsync(HttpContext httpContext, RazorComponentResult result)
     {
         ArgumentNullException.ThrowIfNull(httpContext);
 
@@ -44,7 +36,7 @@ public virtual Task ExecuteAsync(HttpContext httpContext, RazorComponentResult r
             result.PreventStreamingRendering);
     }
 
-    internal static Task RenderComponentToResponse(
+    private static Task RenderComponentToResponse(
         HttpContext httpContext,
         [DynamicallyAccessedMembers(Component)] Type componentType,
         IReadOnlyDictionary<string, object?>? componentParameters,

src/Components/Endpoints/src/Results/RazorComponentResultOfT.cs

@@ -2,15 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Components;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
-namespace Microsoft.AspNetCore.Components.Endpoints;
+namespace Microsoft.AspNetCore.Http.HttpResults;
 
 /// <summary>
 /// An <see cref="IResult"/> that renders a Razor Component.
 /// </summary>
-public class RazorComponentResult<[DynamicallyAccessedMembers(Component)] TComponent> : RazorComponentResult where TComponent: IComponent
+public class RazorComponentResult<[DynamicallyAccessedMembers(Component)] TComponent>
+    : RazorComponentResult where TComponent: IComponent
 {
     /// <summary>
     /// Constructs an instance of <see cref="RazorComponentResult"/>.