address pr feedback

Author: halter73

src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj

@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <Compile Include="$(SharedSourceRoot)ObjectMethodExecutor\**\*.cs" />
-    <Compile Include="$(SharedSourceRoot)RequestDelegateFactoryUtilities.cs" />
+    <Compile Include="$(SharedSourceRoot)TryParseMethodCache.cs" />
     <Compile Include="..\..\Shared\StreamCopyOperationInternal.cs" />
   </ItemGroup>
 

src/Http/Http.Extensions/src/RequestDelegateFactory.cs

@@ -225,7 +225,7 @@ private static Expression CreateArgument(ParameterInfo parameter, FactoryContext
             {
                 return RequestAbortedExpr;
             }
-            else if (parameter.ParameterType == typeof(string) || RequestDelegateFactoryUtilities.HasTryParseMethod(parameter))
+            else if (parameter.ParameterType == typeof(string) || TryParseMethodCache.HasTryParseMethod(parameter))
             {
                 return BindParameterFromRouteValueOrQueryString(parameter, parameter.Name, factoryContext);
             }
@@ -503,7 +503,7 @@ private static Expression BindParameterFromValue(ParameterInfo parameter, Expres
             var isNotNullable = underlyingNullableType is null;
 
             var nonNullableParameterType = underlyingNullableType ?? parameter.ParameterType;
-            var tryParseMethod = RequestDelegateFactoryUtilities.FindTryParseMethod(nonNullableParameterType);
+            var tryParseMethod = TryParseMethodCache.FindTryParseMethod(nonNullableParameterType);
 
             if (tryParseMethod is null)
             {

src/Mvc/Mvc.ApiExplorer/src/DependencyInjection/EndpointMethodInfoApiExplorerServiceCollectionExtensions.cs

@@ -17,14 +17,16 @@ public static class EndpointMetadataApiExplorerServiceCollectionExtensions
         /// Configures ApiExplorer using <see cref="Endpoint.Metadata"/>.
         /// </summary>
         /// <param name="services">The <see cref="IServiceCollection"/>.</param>
-        public static void AddEndpointsApiExplorer(this IServiceCollection services)
+        public static IServiceCollection AddEndpointsApiExplorer(this IServiceCollection services)
         {
             // Try to add default services in case MVC services aren't added.
             services.TryAddSingleton<IActionDescriptorCollectionProvider, DefaultActionDescriptorCollectionProvider>();
             services.TryAddSingleton<IApiDescriptionGroupCollectionProvider, ApiDescriptionGroupCollectionProvider>();
 
             services.TryAddEnumerable(
                 ServiceDescriptor.Transient<IApiDescriptionProvider, EndpointMetadataApiDescriptionProvider>());
+
+            return services;
         }
     }
 }

src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs

@@ -27,7 +27,7 @@ internal class EndpointMetadataApiDescriptionProvider : IApiDescriptionProvider
         private readonly IHostEnvironment _environment;
         private readonly IServiceProviderIsService? _serviceProviderIsService;
 
-        // Executes before MVC's DefaultApiDescriptionProvider and GrpcHttpApiDescriptionProvider for no particular reason :D
+        // Executes before MVC's DefaultApiDescriptionProvider and GrpcHttpApiDescriptionProvider for no particular reason.
         public int Order => -1100;
 
         public EndpointMetadataApiDescriptionProvider(EndpointDataSource endpointDataSource, IHostEnvironment environment)
@@ -81,7 +81,7 @@ private ApiDescription CreateApiDescription(RouteEndpoint routeEndpoint, string
             else
             {
                 // If the declaring type is null or compiler-generated (e.g. lambdas),
-                // group the methods under a "Map" controller.
+                // group the methods under the application name.
                 controllerName = _environment.ApplicationName;
             }
 
@@ -161,7 +161,7 @@ private ApiParameterDescription CreateApiParameterDescription(ParameterInfo para
             {
                 return (BindingSource.Services, parameter.Name ?? string.Empty);
             }
-            else if (parameter.ParameterType == typeof(string) || RequestDelegateFactoryUtilities.HasTryParseMethod(parameter))
+            else if (parameter.ParameterType == typeof(string) || TryParseMethodCache.HasTryParseMethod(parameter))
             {
                 // Path vs query cannot be determined by RequestDelegateFactory at startup currently because of the layering, but can be done here.
                 if (parameter.Name is { } name && pattern.GetParameter(name) is not null)

src/Mvc/Mvc.ApiExplorer/src/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)RequestDelegateFactoryUtilities.cs" />
+    <Compile Include="$(SharedSourceRoot)TryParseMethodCache.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/Mvc/Mvc.ApiExplorer/src/PublicAPI.Unshipped.txt

@@ -23,7 +23,7 @@ Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollection.Items.get ->
 Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollectionProvider.ApiDescriptionGroupCollectionProvider(Microsoft.AspNetCore.Mvc.Infrastructure.IActionDescriptorCollectionProvider! actionDescriptorCollectionProvider, System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider!>! apiDescriptionProviders) -> void
 Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollectionProvider.ApiDescriptionGroups.get -> Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollection!
 Microsoft.Extensions.DependencyInjection.EndpointMetadataApiExplorerServiceCollectionExtensions
-static Microsoft.Extensions.DependencyInjection.EndpointMetadataApiExplorerServiceCollectionExtensions.AddEndpointsApiExplorer(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
+static Microsoft.Extensions.DependencyInjection.EndpointMetadataApiExplorerServiceCollectionExtensions.AddEndpointsApiExplorer(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 ~Microsoft.AspNetCore.Mvc.ApiExplorer.DefaultApiDescriptionProvider.DefaultApiDescriptionProvider(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcOptions!>! optionsAccessor, Microsoft.AspNetCore.Routing.IInlineConstraintResolver! constraintResolver, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider! modelMetadataProvider, Microsoft.AspNetCore.Mvc.Infrastructure.IActionResultTypeMapper! mapper, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Routing.RouteOptions!>! routeOptions) -> void
 Microsoft.AspNetCore.Mvc.ApiExplorer.DefaultApiDescriptionProvider.OnProvidersExecuted(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext! context) -> void
 Microsoft.AspNetCore.Mvc.ApiExplorer.DefaultApiDescriptionProvider.OnProvidersExecuting(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext! context) -> void

src/Shared/RequestDelegateFactoryUtilities.cs renamed to src/Shared/TryParseMethodCache.cs

@@ -3,17 +3,17 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Diagnostics;
 using System.Reflection;
 
 namespace Microsoft.AspNetCore.Http
 {
-    // REVIEW: Better name?
-    internal static class RequestDelegateFactoryUtilities
+    internal static class TryParseMethodCache
     {
         private static readonly MethodInfo EnumTryParseMethod = GetEnumTryParseMethod();
 
         // Since this is shared source, the cache won't be shared between RequestDelegateFactory and the ApiDescriptionProvider sadly :(
-        private static readonly ConcurrentDictionary<Type, MethodInfo?> TryParseMethodCache = new();
+        private static readonly ConcurrentDictionary<Type, MethodInfo?> Cache = new();
 
         public static bool HasTryParseMethod(ParameterInfo parameter)
         {
@@ -54,7 +54,7 @@ public static bool HasTryParseMethod(ParameterInfo parameter)
                 return null;
             }
 
-            return TryParseMethodCache.GetOrAdd(type, Finder);
+            return Cache.GetOrAdd(type, Finder);
         }
 
         private static MethodInfo GetEnumTryParseMethod()
@@ -63,7 +63,7 @@ private static MethodInfo GetEnumTryParseMethod()
 
             foreach (var method in staticEnumMethods)
             {
-                if (!method.IsGenericMethod || method.Name != "TryParse" || method.ReturnType != typeof(bool))
+                if (!method.IsGenericMethod || method.Name != nameof(Enum.TryParse) || method.ReturnType != typeof(bool))
                 {
                     continue;
                 }
@@ -78,7 +78,8 @@ private static MethodInfo GetEnumTryParseMethod()
                 }
             }
 
-            throw new Exception("static bool System.Enum.TryParse<TEnum>(string? value, out TEnum result) does not exist!!?!?");
+            Debug.Fail("static bool System.Enum.TryParse<TEnum>(string? value, out TEnum result) not found.");
+            throw new Exception("static bool System.Enum.TryParse<TEnum>(string? value, out TEnum result) not found.");
         }
     }
 }