Fix-up binding source only for ODataQueryOptions and ODataPath

Author: Chris Martinez

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

@@ -484,17 +484,28 @@ void UpdateBindingInfo( ApiParameterContext context, ParameterDescriptor paramet
             Contract.Requires( parameter != null );
             Contract.Requires( metadata != null );
 
-            if ( parameter.BindingInfo != null )
+            var parameterType = parameter.ParameterType;
+            var bindingInfo = parameter.BindingInfo;
+
+            if ( bindingInfo != null )
             {
+                if ( ( parameterType.IsODataQueryOptions() || parameterType.IsODataPath() ) && bindingInfo.BindingSource == Custom )
+                {
+                    bindingInfo.BindingSource = Special;
+                }
+
                 return;
             }
 
-            var bindingInfo = new BindingInfo() { BindingSource = metadata.BindingSource };
-
-            parameter.BindingInfo = bindingInfo;
+            parameter.BindingInfo = bindingInfo = new BindingInfo() { BindingSource = metadata.BindingSource };
 
             if ( bindingInfo.BindingSource != null )
             {
+                if ( ( parameterType.IsODataQueryOptions() || parameterType.IsODataPath() ) && bindingInfo.BindingSource == Custom )
+                {
+                    bindingInfo.BindingSource = Special;
+                }
+
                 return;
             }
 

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

@@ -37,9 +37,6 @@ public void Apply( ActionDescriptorProviderContext context, ControllerActionDesc
             Contract.Requires( context != null );
             Contract.Requires( action != null );
 
-            // any existing AttributeRouteInfo is expected to be fake up to this point so clear it
-            action.AttributeRouteInfo = null;
-
             var model = action.GetApiVersionModel();
             var mappings = RouteCollectionProvider.Items;
             var routeInfos = new HashSet<ODataAttributeRouteInfo>( new ODataAttributeRouteInfoComparer() );
@@ -120,19 +117,30 @@ void UpdateBindingInfo( ActionParameterContext context, ParameterDescriptor para
             Contract.Requires( context != null );
             Contract.Requires( parameter != null );
 
+            var parameterType = parameter.ParameterType;
             var bindingInfo = parameter.BindingInfo;
 
             if ( bindingInfo != null )
             {
+                if ( ( parameterType.IsODataQueryOptions() || parameterType.IsODataPath() ) && bindingInfo.BindingSource == Custom )
+                {
+                    bindingInfo.BindingSource = Special;
+                }
+
                 return;
             }
 
-            var metadata = ModelMetadataProvider.GetMetadataForType( parameter.ParameterType );
+            var metadata = ModelMetadataProvider.GetMetadataForType( parameterType );
 
             parameter.BindingInfo = bindingInfo = new BindingInfo() { BindingSource = metadata.BindingSource };
 
             if ( bindingInfo.BindingSource != null )
             {
+                if ( ( parameterType.IsODataQueryOptions() || parameterType.IsODataPath() ) && bindingInfo.BindingSource == Custom )
+                {
+                    bindingInfo.BindingSource = Special;
+                }
+
                 return;
             }
 

src/Microsoft.AspNetCore.OData.Versioning/AspNetCore.Mvc/Versioning/ODataMvcOptionsSetup.cs

@@ -10,7 +10,6 @@
     using Microsoft.AspNetCore.Mvc.Infrastructure;
     using Microsoft.AspNetCore.Mvc.Versioning;
     using Microsoft.Extensions.DependencyInjection.Extensions;
-    using Microsoft.Extensions.Options;
     using System;
     using System.Diagnostics.Contracts;
     using System.Linq;
@@ -68,7 +67,6 @@ static void AddODataServices( IServiceCollection services )
 
             ConfigureDefaultFeatureProviders( partManager );
             services.Replace( Singleton<IActionSelector, ODataApiVersionActionSelector>() );
-            services.AddTransient<IPostConfigureOptions<MvcOptions>, ODataMvcOptionsSetup>();
             services.TryAdd( Transient<VersionedODataModelBuilder, VersionedODataModelBuilder>() );
             services.TryAdd( Singleton<IODataRouteCollectionProvider, ODataRouteCollectionProvider>() );
             services.AddTransient<IApplicationModelProvider, ODataApplicationModelProvider>();