Remove BindingSource.PathOrQuery

Author: halter73

src/Mvc/Mvc.Abstractions/src/ModelBinding/BindingSource.cs

@@ -78,15 +78,6 @@ public class BindingSource : IEquatable<BindingSource?>
             isGreedy: false,
             isFromRequest: true);
 
-        /// <summary>
-        /// A <see cref="BindingSource"/> for the request url path or query string.
-        /// </summary>
-        public static readonly BindingSource PathOrQuery = new BindingSource(
-            "PathOrQuery",
-            "PathOrQuery",
-            isGreedy: false,
-            isFromRequest: true);
-
         /// <summary>
         /// A <see cref="BindingSource"/> for request services.
         /// </summary>

src/Mvc/Mvc.Abstractions/src/PublicAPI.Unshipped.txt

@@ -102,7 +102,6 @@ abstract Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata.TemplateHint.get ->
 static Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptorExtensions.GetProperty<T>(this Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor! actionDescriptor) -> T?
 static Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult.Success(object? model) -> Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult!
 static Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult.SuccessAsync(object? model) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult!>!
-static readonly Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource.PathOrQuery -> Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource!
 virtual Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext.Result.get -> Microsoft.AspNetCore.Mvc.IActionResult?
 virtual Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext.ActionArguments.get -> System.Collections.Generic.IDictionary<string!, object?>!
 virtual Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata.BoundConstructorInvoker.get -> System.Func<object?[]!, object!>?

src/Mvc/Mvc.ApiExplorer/src/EndpointMethodInfoApiDescriptionProvider.cs

@@ -21,6 +21,7 @@ internal class EndpointMethodInfoApiDescriptionProvider : IApiDescriptionProvide
         private readonly EndpointDataSource _endpointDataSource;
 
         // Executes before MVC's DefaultApiDescriptionProvider and GrpcHttpApiDescriptionProvider
+        // REVIEW: Does order matter here? Should this run after MVC?
         public int Order => -1100;
 
         public EndpointMethodInfoApiDescriptionProvider(EndpointDataSource endpointDataSource)
@@ -71,7 +72,7 @@ private static ApiDescription CreateApiDescription(RoutePattern pattern, string
 
             foreach (var parameter in actionMethodInfo.GetParameters())
             {
-                apiDescription.ParameterDescriptions.Add(CreateApiParameterDescription(parameter));
+                apiDescription.ParameterDescriptions.Add(CreateApiParameterDescription(parameter, pattern));
             }
 
             var responseType = actionMethodInfo.ReturnType;
@@ -91,11 +92,11 @@ private static ApiDescription CreateApiDescription(RoutePattern pattern, string
             return apiDescription;
         }
 
-        private static ApiParameterDescription CreateApiParameterDescription(ParameterInfo parameter)
+        private static ApiParameterDescription CreateApiParameterDescription(ParameterInfo parameter, RoutePattern pattern)
         {
             var parameterType = parameter.ParameterType;
 
-            var (source, name) = GetBindingSourceAndName(parameter);
+            var (source, name) = GetBindingSourceAndName(parameter, pattern);
 
             return new ApiParameterDescription
             {
@@ -108,7 +109,7 @@ private static ApiParameterDescription CreateApiParameterDescription(ParameterIn
 
         // TODO: Share more of this logic with RequestDelegateFactory.CreateArgument(...) using RequestDelegateFactoryUtilities
         // which is shared source.
-        private static (BindingSource, string) GetBindingSourceAndName(ParameterInfo parameter)
+        private static (BindingSource, string) GetBindingSourceAndName(ParameterInfo parameter, RoutePattern pattern)
         {
             var attributes = parameter.GetCustomAttributes();
 
@@ -137,9 +138,15 @@ private static (BindingSource, string) GetBindingSourceAndName(ParameterInfo par
             }
             else if (parameter.ParameterType == typeof(string) || RequestDelegateFactoryUtilities.HasTryParseMethod(parameter))
             {
-                // TODO: Look at the pattern and infer whether it's really the path or query.
-                // This cannot be done by RequestDelegateFactory currently because of the layering, but could be done here.
-                return (BindingSource.PathOrQuery, parameter.Name ?? string.Empty);
+                // 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)
+                {
+                    return (BindingSource.Path, name);
+                }
+                else
+                {
+                    return (BindingSource.Query, parameter.Name ?? string.Empty);
+                }
             }
             else
             {