huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small style cleanup

This commit is contained in:
David Fowler 2016-01-07 20:52:54 -08:00
parent ca8136b73c
commit 6bc8384ea9
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Microsoft.AspNet.Http.Abstractions/Extensions/UseMiddlewareExtensions.cs
View File

@ -95,7 +95,6 @@ namespace Microsoft.AspNet.Builder
private static Func<T, HttpContext, IServiceProvider, Task> Compile<T>(MethodInfo methodinfo, ParameterInfo[] parameters) private static Func<T, HttpContext, IServiceProvider, Task> Compile<T>(MethodInfo methodinfo, ParameterInfo[] parameters)
{ {
// If we call something like // If we call something like
// //
// public class Middleware // public class Middleware
@ -122,17 +121,6 @@ namespace Microsoft.AspNet.Builder
// return ((Middleware)instance).Invoke(httpContext, (ILoggerFactory)UseMiddlewareExtensions.GetService(provider, typeof(ILoggerFactory)); // 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 middleware = typeof(T);
var httpContextArg = Expression.Parameter(typeof(HttpContext), "httpContext"); var httpContextArg = Expression.Parameter(typeof(HttpContext), "httpContext");
@ -149,12 +137,15 @@ namespace Microsoft.AspNet.Builder
throw new NotSupportedException(Resources.FormatException_InvokeDoesNotSupportRefOrOutParams(InvokeMethodName)); throw new NotSupportedException(Resources.FormatException_InvokeDoesNotSupportRefOrOutParams(InvokeMethodName));
} }
var parameterTypeExpression = new Expression[] { var parameterTypeExpression = new Expression[]
providerArg, {
Expression.Constant(parameterType, typeof(Type)), providerArg,
Expression.Constant(methodinfo.DeclaringType, typeof(Type)) Expression.Constant(parameterType, typeof(Type)),
}; Expression.Constant(methodinfo.DeclaringType, typeof(Type))
methodArguments[i] = Expression.Convert(Expression.Call(GetServiceInfo, parameterTypeExpression), parameterType); };
var getServiceCall = Expression.Call(GetServiceInfo, parameterTypeExpression);
methodArguments[i] = Expression.Convert(getServiceCall, parameterType);
} }
Expression middlewareInstanceArg = instanceArg; Expression middlewareInstanceArg = instanceArg;