Revert to using Reflection to invoke default container configuration. Fixes #525

Author: Chris Martinez

src/Microsoft.AspNet.OData.Versioning/System.Web.Http/IContainerBuilderExtensions.cs

@@ -1,93 +1,28 @@
 namespace System.Web.Http
 {
-    using Microsoft.AspNet.OData;
-    using Microsoft.AspNet.OData.Formatter.Deserialization;
-    using Microsoft.AspNet.OData.Formatter.Serialization;
-    using Microsoft.AspNet.OData.Query;
-    using Microsoft.AspNet.OData.Query.Expressions;
-    using Microsoft.AspNet.OData.Query.Validators;
-    using Microsoft.AspNet.OData.Routing;
     using Microsoft.AspNet.OData.Routing.Conventions;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.OData;
-    using static Microsoft.OData.ServiceLifetime;
+    using System.Reflection;
+    using static System.Linq.Expressions.Expression;
 
     static class IContainerBuilderExtensions
     {
-        internal static void InitializeAttributeRouting( this IServiceProvider serviceProvider ) => serviceProvider.GetServices<IODataRoutingConvention>();
-
-        internal static void AddDefaultWebApiServices( this IContainerBuilder builder )
-        {
-            builder.AddService<IODataPathHandler, DefaultODataPathHandler>( Singleton );
-            AddServicePrototypes( builder );
-            AddQueryValidators( builder );
-            AddSerializationProviders( builder );
-            AddDeserializerServices( builder );
-            AddSerializerServices( builder );
-            AddBinders( builder );
-            AddHttpRequestScope( builder );
-        }
-
-        static void AddServicePrototypes( IContainerBuilder builder )
-        {
-            builder.AddServicePrototype( new ODataMessageReaderSettings() { EnableMessageStreamDisposal = false, MessageQuotas = new ODataMessageQuotas { MaxReceivedMessageSize = long.MaxValue } } );
-            builder.AddServicePrototype( new ODataMessageWriterSettings() { EnableMessageStreamDisposal = false, MessageQuotas = new ODataMessageQuotas { MaxReceivedMessageSize = long.MaxValue } } );
-        }
-
-        static void AddQueryValidators( IContainerBuilder builder )
-        {
-            builder.AddService<CountQueryValidator>( Singleton );
-            builder.AddService<FilterQueryValidator>( Scoped );
-            builder.AddService<ODataQueryValidator>( Singleton );
-            builder.AddService<OrderByQueryValidator>( Singleton );
-            builder.AddService<SelectExpandQueryValidator>( Singleton );
-            builder.AddService<SkipQueryValidator>( Singleton );
-            builder.AddService<TopQueryValidator>( Singleton );
-        }
+        private static readonly Lazy<Action<IContainerBuilder>> addDefaultWebApiServices = new Lazy<Action<IContainerBuilder>>( NewAddDefaultWebApiServicesFunc );
 
-        static void AddSerializationProviders( IContainerBuilder builder )
-        {
-            builder.AddService<ODataSerializerProvider, DefaultODataSerializerProvider>( Singleton );
-            builder.AddService<ODataDeserializerProvider, DefaultODataDeserializerProvider>( Singleton );
-        }
-
-        static void AddDeserializerServices( IContainerBuilder builder )
-        {
-            builder.AddService<ODataResourceDeserializer>( Singleton );
-            builder.AddService<ODataEnumDeserializer>( Singleton );
-            builder.AddService<ODataPrimitiveDeserializer>( Singleton );
-            builder.AddService<ODataResourceSetDeserializer>( Singleton );
-            builder.AddService<ODataCollectionDeserializer>( Singleton );
-            builder.AddService<ODataEntityReferenceLinkDeserializer>( Singleton );
-            builder.AddService<ODataActionPayloadDeserializer>( Singleton );
-        }
+        internal static void InitializeAttributeRouting( this IServiceProvider serviceProvider ) => serviceProvider.GetServices<IODataRoutingConvention>();
 
-        static void AddSerializerServices( IContainerBuilder builder )
-        {
-            builder.AddService<ODataEnumSerializer>( Singleton );
-            builder.AddService<ODataPrimitiveSerializer>( Singleton );
-            builder.AddService<ODataDeltaFeedSerializer>( Singleton );
-            builder.AddService<ODataResourceSetSerializer>( Singleton );
-            builder.AddService<ODataCollectionSerializer>( Singleton );
-            builder.AddService<ODataResourceSerializer>( Singleton );
-            builder.AddService<ODataServiceDocumentSerializer>( Singleton );
-            builder.AddService<ODataEntityReferenceLinkSerializer>( Singleton );
-            builder.AddService<ODataEntityReferenceLinksSerializer>( Singleton );
-            builder.AddService<ODataErrorSerializer>( Singleton );
-            builder.AddService<ODataMetadataSerializer>( Singleton );
-            builder.AddService<ODataRawValueSerializer>( Singleton );
-        }
+        internal static void AddDefaultWebApiServices( this IContainerBuilder builder ) => addDefaultWebApiServices.Value( builder );
 
-        static void AddBinders( IContainerBuilder builder )
+        static Action<IContainerBuilder> NewAddDefaultWebApiServicesFunc()
         {
-            builder.AddService<ODataQuerySettings>( Scoped );
-            builder.AddService<FilterBinder>( Transient );
-        }
+            var type = Type.GetType( "Microsoft.AspNet.OData.Extensions.ContainerBuilderExtensions, Microsoft.AspNet.OData", throwOnError: true );
+            var method = type.GetRuntimeMethod( nameof( AddDefaultWebApiServices ), new[] { typeof( IContainerBuilder ) } );
+            var builder = Parameter( typeof( IContainerBuilder ), "builder" );
+            var body = Call( null, method, builder );
+            var lambda = Lambda<Action<IContainerBuilder>>( body, builder );
 
-        static void AddHttpRequestScope( IContainerBuilder builder )
-        {
-            builder.AddService<HttpRequestScope>( Scoped );
-            builder.AddService( Scoped, sp => sp.GetRequiredService<HttpRequestScope>().HttpRequest );
+            return lambda.Compile();
         }
     }
 }