Refactored GetEdmModels to use IHttpControllerTypeResolver instead of IHttpControllerSelector, which prevents a recursive call into a Lazy<T> initializer in some cases. API version discovery is also now filtered to only OData controllers.

Author: Chris Martinez

src/Microsoft.AspNet.OData.Versioning/TypeExtensions.cs

@@ -0,0 +1,10 @@
+namespace Microsoft
+{
+    using System;
+    using System.Web.OData;
+
+    internal static class TypeExtensions
+    {
+        internal static bool IsODataController( this Type controllerType ) => typeof( ODataController ).IsAssignableFrom( controllerType );
+    }
+}

src/Microsoft.AspNet.OData.Versioning/Web.OData/Builder/VersionedODataModelBuilder.cs

@@ -17,7 +17,7 @@
     /// </summary>
     public class VersionedODataModelBuilder
     {
-        private readonly IHttpControllerSelector controllerSelector;
+        private readonly HttpConfiguration configuration;
         private Func<ODataModelBuilder> modelBuilderFactory = () => new ODataConventionModelBuilder();
 
         /// <summary>
@@ -31,17 +31,7 @@ public class VersionedODataModelBuilder
         public VersionedODataModelBuilder( HttpConfiguration configuration )
         {
             Arg.NotNull( configuration, nameof( configuration ) );
-            controllerSelector = configuration.Services.GetHttpControllerSelector();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VersionedODataModelBuilder"/>
-        /// </summary>
-        /// <param name="controllerSelector">The <see cref="IHttpControllerSelector">controller selector</see> associated with the builder.</param>
-        public VersionedODataModelBuilder( IHttpControllerSelector controllerSelector )
-        {
-            Arg.NotNull( controllerSelector, nameof( controllerSelector ) );
-            this.controllerSelector = controllerSelector;
+            this.configuration = configuration;
         }
 
         /// <summary>
@@ -107,9 +97,13 @@ public virtual IEnumerable<IEdmModel> GetEdmModels()
         {
             var configurations = GetMergedConfigurations();
             var models = new List<IEdmModel>();
-            var apiVersions = ( from mapping in controllerSelector.GetControllerMapping().Values
-                                let descriptorGroup = mapping as IEnumerable<HttpControllerDescriptor> ?? new[] { mapping }
-                                from descriptor in descriptorGroup
+            var services = configuration.Services;
+            var assembliesResolver = services.GetAssembliesResolver();
+            var typeResolver = services.GetHttpControllerTypeResolver();
+            var controllerTypes = typeResolver.GetControllerTypes( assembliesResolver );
+            var apiVersions = ( from controllerType in controllerTypes
+                                where controllerType.IsODataController()
+                                let descriptor = new HttpControllerDescriptor( configuration, string.Empty, controllerType )
                                 from version in descriptor.GetImplementedApiVersions()
                                 select version ).Distinct();
 

test/Microsoft.AspNet.OData.Versioning.Tests/System.Web.OData/HttpConfigurationExtensionsTest.cs

@@ -1,12 +1,10 @@
 namespace System.Web.OData
 {
-    using FluentAssertions;
     using Batch;
     using Builder;
     using Collections.Generic;
-    using Collections.ObjectModel;
+    using FluentAssertions;
     using Http;
-    using Http.Controllers;
     using Http.Dispatcher;
     using Linq;
     using Microsoft.OData.Edm;
@@ -19,16 +17,25 @@
 
     public class HttpConfigurationExtensionsTest
     {
+        [ApiVersion( "1.0" )]
+        private sealed class ControllerV1 : ODataController
+        {
+        }
+
+        [ApiVersion( "2.0" )]
+        private sealed class ControllerV2 : ODataController
+        {
+        }
+
         private static IEnumerable<IEdmModel> CreateModels( HttpConfiguration configuration )
         {
-            var controllerDescriptor = new Mock<HttpControllerDescriptor>( configuration, "Test", typeof( IHttpController ) ) { CallBase = true };
-            var controllerMapping = new Dictionary<string, HttpControllerDescriptor>() { { "Test", controllerDescriptor.Object } };
-            var controllerSelector = new Mock<IHttpControllerSelector>();
-            var apiVersions = new Collection<ApiVersionAttribute>( new[] { new ApiVersionAttribute( "1.0" ), new ApiVersionAttribute( "2.0" ) } );
-            var builder = new VersionedODataModelBuilder( controllerSelector.Object );
+            var controllerTypeResolver = new Mock<IHttpControllerTypeResolver>();
+            var controllerTypes = new List<Type>() { typeof( ControllerV1 ), typeof( ControllerV2 ) };
+
+            controllerTypeResolver.Setup( ctr => ctr.GetControllerTypes( It.IsAny<IAssembliesResolver>() ) ).Returns( controllerTypes );
+            configuration.Services.Replace( typeof( IHttpControllerTypeResolver ), controllerTypeResolver.Object );
 
-            controllerDescriptor.Setup( cd => cd.GetCustomAttributes<ApiVersionAttribute>( It.IsAny<bool>() ) ).Returns( apiVersions );
-            controllerSelector.Setup( cs => cs.GetControllerMapping() ).Returns( controllerMapping );
+            var builder = new VersionedODataModelBuilder( configuration );
 
             return builder.GetEdmModels();
         }
@@ -51,7 +58,7 @@ public void map_versioned_odata_routes_should_return_expected_result()
             var batchRoute = configuration.Routes["odataBatch"];
 
             // assert
-            constraint.RoutingConventions[0].Should().BeOfType<AttributeRoutingConvention>();
+            constraint.RoutingConventions[0].Should().BeOfType<VersionedAttributeRoutingConvention>();
             constraint.RoutingConventions[1].Should().BeOfType<VersionedMetadataRoutingConvention>();
             constraint.RoutingConventions.OfType<MetadataRoutingConvention>().Should().BeEmpty();
             constraint.RouteName.Should().Be( routeName );
@@ -82,7 +89,7 @@ public void map_versioned_odata_routes_should_return_expected_results()
                 var apiVersion = constraint.EdmModel.GetAnnotationValue<ApiVersionAnnotation>( constraint.EdmModel ).ApiVersion;
                 var versionedRouteName = routeName + "-" + apiVersion.ToString();
 
-                constraint.RoutingConventions[0].Should().BeOfType<AttributeRoutingConvention>();
+                constraint.RoutingConventions[0].Should().BeOfType<VersionedAttributeRoutingConvention>();
                 constraint.RoutingConventions[1].Should().BeOfType<VersionedMetadataRoutingConvention>();
                 constraint.RoutingConventions.OfType<MetadataRoutingConvention>().Should().BeEmpty();
                 constraint.RouteName.Should().Be( versionedRouteName );

test/Microsoft.AspNet.OData.Versioning.Tests/Web.OData/Builder/VersionedODataModelBuilderTest.cs

@@ -8,32 +8,38 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Web.Http;
-    using System.Web.Http.Controllers;
     using System.Web.Http.Dispatcher;
+    using System.Web.OData;
     using System.Web.OData.Builder;
     using Xunit;
 
     public class VersionedODataModelBuilderTest
     {
+        [ApiVersion( "1.0" )]
+        private sealed class ControllerV1 : ODataController
+        {
+        }
+
         [Fact]
         public void get_edm_models_should_return_expected_results()
         {
             // arrange
             var configuration = new HttpConfiguration();
-            var controllerDescriptor = new HttpControllerDescriptor( configuration, "Test", typeof( IHttpController ) );
-            var controllerMapping = new Dictionary<string, HttpControllerDescriptor>() { { "Test", controllerDescriptor } };
-            var controllerSelector = new Mock<IHttpControllerSelector>();
+            var controllerTypeResolver = new Mock<IHttpControllerTypeResolver>();
+            var controllerTypes = new List<Type>() { typeof( ControllerV1 ) };
+
+            controllerTypeResolver.Setup( ctr => ctr.GetControllerTypes( It.IsAny<IAssembliesResolver>() ) ).Returns( controllerTypes );
+            configuration.Services.Replace( typeof( IHttpControllerTypeResolver ), controllerTypeResolver.Object );
+
             var defaultConfiguration = new Mock<Action<ODataModelBuilder, ApiVersion>>();
             var modelCreated = new Mock<Action<ODataModelBuilder, IEdmModel>>();
             var apiVersion = new ApiVersion( 1, 0 );
-            var builder = new VersionedODataModelBuilder( controllerSelector.Object )
+            var builder = new VersionedODataModelBuilder( configuration )
             {
                 DefaultModelConfiguration = defaultConfiguration.Object,
                 OnModelCreated = modelCreated.Object
             };
 
-            controllerSelector.Setup( cs => cs.GetControllerMapping() ).Returns( controllerMapping );
-
             // act
             var model = builder.GetEdmModels().Single();