Map OData-specific route name property. Fixes #670

Author: Chris Martinez

src/Microsoft.AspNetCore.OData.Versioning.ApiExplorer/AspNetCore.Mvc/ApiExplorer/ODataApiDescriptionProvider.cs

@@ -249,8 +249,8 @@ protected virtual void ExploreQueryOptions( IEnumerable<ApiDescription> apiDescr
         }
 
         static bool IsMappedTo( ControllerActionDescriptor action, ODataRouteMapping mapping ) =>
-            action.AttributeRouteInfo != null &&
-            StringComparer.OrdinalIgnoreCase.Equals( action.AttributeRouteInfo.Name, mapping.RouteName );
+            action.AttributeRouteInfo is ODataAttributeRouteInfo routeInfo &&
+            StringComparer.OrdinalIgnoreCase.Equals( routeInfo.RouteName, mapping.RouteName );
 
         static Type? GetDeclaredReturnType( ControllerActionDescriptor action )
         {
@@ -346,7 +346,7 @@ IEnumerable<ApiDescription> NewODataApiDescriptions(
             var responseMetadataAttributes = GetResponseMetadataAttributes( action );
             var declaredReturnType = GetDeclaredReturnType( action );
             var runtimeReturnType = GetRuntimeReturnType( declaredReturnType! );
-            var apiResponseTypes = GetApiResponseTypes( responseMetadataAttributes!, runtimeReturnType!, mapping.Services );
+            var apiResponseTypes = GetApiResponseTypes( responseMetadataAttributes!, runtimeReturnType!, mapping.Services, version );
             var routeContext = new ODataRouteBuilderContext( mapping, version, action, Options ) { ModelMetadataProvider = MetadataProvider };
 
             if ( routeContext.IsRouteExcluded )
@@ -640,7 +640,8 @@ static void UpdateBindingInfo( ApiParameterContext context, ParameterDescriptor
         IReadOnlyList<ApiResponseType> GetApiResponseTypes(
             IReadOnlyList<IApiResponseMetadataProvider> responseMetadataAttributes,
             Type responseType,
-            IServiceProvider serviceProvider )
+            IServiceProvider serviceProvider,
+            ApiVersion version )
         {
             var results = new List<ApiResponseType>();
             var objectTypes = new Dictionary<int, Type>();
@@ -682,7 +683,7 @@ IReadOnlyList<ApiResponseType> GetApiResponseTypes(
 
                 if ( objectType.Value == typeof( void ) )
                 {
-                    type = objectType.Value.SubstituteIfNecessary( new TypeSubstitutionContext( serviceProvider, ModelTypeBuilder ) );
+                    type = objectType.Value.SubstituteIfNecessary( new TypeSubstitutionContext( serviceProvider, ModelTypeBuilder, version ) );
 
                     results.Add( new ApiResponseType()
                     {
@@ -694,7 +695,7 @@ IReadOnlyList<ApiResponseType> GetApiResponseTypes(
                     continue;
                 }
 
-                type = objectType.Value.SubstituteIfNecessary( new TypeSubstitutionContext( serviceProvider, ModelTypeBuilder ) );
+                type = objectType.Value.SubstituteIfNecessary( new TypeSubstitutionContext( serviceProvider, ModelTypeBuilder, version ) );
 
                 var apiResponseType = new ApiResponseType()
                 {

src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/ODataAttributeRouteInfo.cs

@@ -25,6 +25,15 @@ public ODataAttributeRouteInfo()
         /// <value>The <see cref="ODataPathTemplate">OData path template</see> for the action.</value>
         public ODataPathTemplate? ODataTemplate { get; set; }
 
+        /// <summary>
+        /// Gets or sets the corresponding route name.
+        /// </summary>
+        /// <value>The associated route name.</value>
+        /// <remarks>This property is different from <see cref="AttributeRouteInfo.Name"/> in that
+        /// attribute routes may have a unique key per route definition. OData routes, on the other
+        /// hand, use OData-specific conventions on a single registered route.</remarks>
+        public string? RouteName { get; set; }
+
         /// <summary>
         /// Gets or sets the corresponding route prefix.
         /// </summary>

src/Microsoft.AspNetCore.OData.Versioning/AspNet.OData/Routing/ODataRouteBindingInfoConvention.cs

@@ -147,9 +147,9 @@ static void UpdateBindingInfo(
             var handler = mapping.Services.GetRequiredService<IODataPathTemplateHandler>();
             var routeInfo = new ODataAttributeRouteInfo()
             {
-                Name = mapping.RouteName,
                 Template = template,
                 ODataTemplate = handler.ParseTemplate( path, mapping.Services ),
+                RouteName = mapping.RouteName,
                 RoutePrefix = mapping.RoutePrefix,
             };
 
@@ -189,9 +189,9 @@ void UpdateBindingInfo(
                 var template = templates[i];
                 var routeInfo = new ODataAttributeRouteInfo()
                 {
-                    Name = mapping.RouteName,
                     Template = template.RouteTemplate,
                     ODataTemplate = template.PathTemplate,
+                    RouteName = mapping.RouteName,
                     RoutePrefix = mapping.RoutePrefix,
                 };
 
@@ -368,7 +368,7 @@ public bool Equals( ODataAttributeRouteInfo? x, ODataAttributeRouteInfo? y )
                 var comparer = StringComparer.OrdinalIgnoreCase;
 
                 return comparer.Equals( x.Template, y.Template ) &&
-                       comparer.Equals( x.Name, y.Name );
+                       comparer.Equals( x.RouteName, y.RouteName );
             }
 
             public int GetHashCode( ODataAttributeRouteInfo obj ) =>