From 6bc8384ea95a2bf8b1a6a42a2b35306f17fefb00 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Thu, 7 Jan 2016 20:52:54 -0800 Subject: [PATCH] Small style cleanup --- .../Extensions/UseMiddlewareExtensions.cs | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs b/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs index 6cb4c1b004..628b0365e6 100644 --- a/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs +++ b/src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs @@ -95,7 +95,6 @@ namespace Microsoft.AspNet.Builder private static Func Compile(MethodInfo methodinfo, ParameterInfo[] parameters) { - // If we call something like // // public class Middleware @@ -122,17 +121,6 @@ namespace Microsoft.AspNet.Builder // return ((Middleware)instance).Invoke(httpContext, (ILoggerFactory)UseMiddlewareExtensions.GetService(provider, typeof(ILoggerFactory)); // } - // context => - // { - // var serviceProvider = context.RequestServices ?? applicationServices; - // if (serviceProvider == null) - // { - // throw new InvalidOperationException(Resources.FormatException_UseMiddlewareIServiceProviderNotAvailable(nameof(IServiceProvider))); - // } - // - // return Invoke(httpContext, serviceProvider); - // } - var middleware = typeof(T); var httpContextArg = Expression.Parameter(typeof(HttpContext), "httpContext"); @@ -149,12 +137,15 @@ namespace Microsoft.AspNet.Builder throw new NotSupportedException(Resources.FormatException_InvokeDoesNotSupportRefOrOutParams(InvokeMethodName)); } - var parameterTypeExpression = new Expression[] { - providerArg, - Expression.Constant(parameterType, typeof(Type)), - Expression.Constant(methodinfo.DeclaringType, typeof(Type)) - }; - methodArguments[i] = Expression.Convert(Expression.Call(GetServiceInfo, parameterTypeExpression), parameterType); + var parameterTypeExpression = new Expression[] + { + providerArg, + Expression.Constant(parameterType, typeof(Type)), + Expression.Constant(methodinfo.DeclaringType, typeof(Type)) + }; + + var getServiceCall = Expression.Call(GetServiceInfo, parameterTypeExpression); + methodArguments[i] = Expression.Convert(getServiceCall, parameterType); } Expression middlewareInstanceArg = instanceArg;