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

Revert "Change MiddlewareFactory to type activate IMiddleware as a fallback (#988)" (#991) 

This reverts commit 44d5bf074f.
This commit is contained in:
David Fowler 2018-01-30 10:28:52 -08:00 committed by GitHub
parent 9f64c69a2a
commit 6cd313fcfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Http/MiddlewareFactory.cs
View File

@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Http
public IMiddleware Create(Type middlewareType) public IMiddleware Create(Type middlewareType)
{ {
return ActivatorUtilities.GetServiceOrCreateInstance(_serviceProvider, middlewareType) as IMiddleware; return _serviceProvider.GetRequiredService(middlewareType) as IMiddleware;
} }
public void Release(IMiddleware middleware) public void Release(IMiddleware middleware)

17
test/Microsoft.AspNetCore.Http.Abstractions.Tests/UseMiddlewareTest.cs
View File

@ -232,23 +232,6 @@ namespace Microsoft.AspNetCore.Http
Assert.Same(middlewareFactory.Created, middlewareFactory.Released); Assert.Same(middlewareFactory.Created, middlewareFactory.Released);
} }
[Fact]
public async Task UseMiddlewareWithIMiddlewareAndMiddlewareFactoryTypeActivates()
{
var mockServiceProvider = new DummyServiceProvider();
var builder = new ApplicationBuilder(mockServiceProvider);
builder.UseMiddleware(typeof(Middleware));
var app = builder.Build();
var context = new DefaultHttpContext();
var sp = new DummyServiceProvider();
var middlewareFactory = new MiddlewareFactory(sp);
sp.AddService(typeof(IMiddlewareFactory), middlewareFactory);
context.RequestServices = sp;
await app(context);
Assert.True(Assert.IsType<bool>(context.Items["before"]));
Assert.True(Assert.IsType<bool>(context.Items["after"]));
}
public class Middleware : IMiddleware public class Middleware : IMiddleware
{ {
public async Task InvokeAsync(HttpContext context, RequestDelegate next) public async Task InvokeAsync(HttpContext context, RequestDelegate next)