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

* Remove ServiceProvider

This commit is contained in:
ryanbrandenburg 2016-03-14 17:05:41 -07:00
parent dd18606f4f
commit 1ae1cdb10b
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
View File

@ -30,17 +30,6 @@ namespace Microsoft.AspNetCore.Mvc
private IObjectModelValidator _objectValidator;
private IUrlHelper _url;
/// <summary>
/// Gets the request-specific <see cref="IServiceProvider"/>.
/// </summary>
public IServiceProvider Resolver
{
get
{
return HttpContext?.RequestServices;
}
}
/// <summary>
/// Gets the <see cref="Http.HttpContext"/> for the executing action.
/// </summary>
@ -136,7 +125,7 @@ namespace Microsoft.AspNetCore.Mvc
{
if (_metadataProvider == null)
{
_metadataProvider = Resolver?.GetRequiredService<IModelMetadataProvider>();
_metadataProvider = HttpContext?.RequestServices?.GetRequiredService<IModelMetadataProvider>();
}
return _metadataProvider;
@ -161,7 +150,7 @@ namespace Microsoft.AspNetCore.Mvc
{
if (_url == null)
{
var factory = Resolver?.GetRequiredService<IUrlHelperFactory>();
var factory = HttpContext?.RequestServices?.GetRequiredService<IUrlHelperFactory>();
_url = factory?.GetUrlHelper(ControllerContext);
}
@ -187,7 +176,7 @@ namespace Microsoft.AspNetCore.Mvc
{
if (_objectValidator == null)
{
_objectValidator = Resolver?.GetRequiredService<IObjectModelValidator>();
_objectValidator = HttpContext?.RequestServices?.GetRequiredService<IObjectModelValidator>();
}
return _objectValidator;
@ -1429,7 +1418,7 @@ namespace Microsoft.AspNetCore.Mvc
{
throw new ArgumentNullException(nameof(model));
}
ObjectValidator.Validate(
ControllerContext,
new CompositeModelValidatorProvider(ControllerContext.ValidatorProviders),

2
src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
View File

@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Mvc
{
if (_tempData == null)
{
var factory = Resolver?.GetRequiredService<ITempDataDictionaryFactory>();
var factory = HttpContext?.RequestServices?.GetRequiredService<ITempDataDictionaryFactory>();
_tempData = factory?.GetTempData(HttpContext);
}

2
test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
View File

@ -1409,7 +1409,7 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test
controller.ControllerContext.HttpContext = httpContext.Object;
// Act
var innerServiceProvider = controller.Resolver;
var innerServiceProvider = controller.HttpContext?.RequestServices;
// Assert
Assert.Same(serviceProvider, innerServiceProvider);

2
test/WebSites/BasicWebSite/Controllers/OrderController.cs
View File

@ -16,7 +16,7 @@ namespace BasicWebSite
var queryType = typeof(IEnumerable<>).MakeGenericType(elementType);
var services = (IEnumerable<object>)Resolver.GetService(queryType);
var services = (IEnumerable<object>)HttpContext?.RequestServices.GetService(queryType);
foreach (var service in services)
{
if (actualType != null && service.GetType().AssemblyQualifiedName == actualType)