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

Remove dead code in invoker (SetStage)

This commit is contained in:
Ryan Nowak 2015-10-02 22:36:16 -07:00
parent 761c7e6751
commit e54da5e6f6
1 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs
View File

@ -178,7 +178,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
_cursor = new FilterCursor(_filters); _cursor = new FilterCursor(_filters);
ActionContext.ModelState.MaxAllowedErrors = _maxModelValidationErrors; ActionContext.ModelState.MaxAllowedErrors = _maxModelValidationErrors;
await InvokeAllAuthorizationFiltersAsync(); await InvokeAllAuthorizationFiltersAsync();
// If Authorization Filters return a result, it's a short circuit because // If Authorization Filters return a result, it's a short circuit because
@ -242,7 +242,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
private Task InvokeAllAuthorizationFiltersAsync() private Task InvokeAllAuthorizationFiltersAsync()
{ {
_cursor.SetStage(FilterStage.AuthorizationFilters); _cursor.Reset();
_authorizationContext = new AuthorizationContext(ActionContext, _filters); _authorizationContext = new AuthorizationContext(ActionContext, _filters);
return InvokeAuthorizationFilterAsync(); return InvokeAuthorizationFilterAsync();
@ -292,7 +292,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
private Task InvokeAllResourceFiltersAsync() private Task InvokeAllResourceFiltersAsync()
{ {
_cursor.SetStage(FilterStage.ResourceFilters); _cursor.Reset();
var context = new ResourceExecutingContext(ActionContext, _filters); var context = new ResourceExecutingContext(ActionContext, _filters);
@ -453,7 +453,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
private Task InvokeAllExceptionFiltersAsync() private Task InvokeAllExceptionFiltersAsync()
{ {
_cursor.SetStage(FilterStage.ExceptionFilters); _cursor.Reset();
return InvokeExceptionFilterAsync(); return InvokeExceptionFilterAsync();
} }
@ -537,7 +537,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
private async Task InvokeAllActionFiltersAsync() private async Task InvokeAllActionFiltersAsync()
{ {
_cursor.SetStage(FilterStage.ActionFilters); _cursor.Reset();
Instance = CreateInstance(); Instance = CreateInstance();
@ -676,7 +676,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
private async Task InvokeAllResultFiltersAsync(IActionResult result) private async Task InvokeAllResultFiltersAsync(IActionResult result)
{ {
_cursor.SetStage(FilterStage.ResultFilters); _cursor.Reset();
_resultExecutingContext = new ResultExecutingContext(ActionContext, _filters, result, Instance); _resultExecutingContext = new ResultExecutingContext(ActionContext, _filters, result, Instance);
await InvokeResultFilterAsync(); await InvokeResultFilterAsync();
@ -761,7 +761,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
} }
else else
{ {
_cursor.SetStage(FilterStage.ActionResult); _cursor.Reset();
// The empty result is always flowed back as the 'executed' result // The empty result is always flowed back as the 'executed' result
if (_resultExecutingContext.Result == null) if (_resultExecutingContext.Result == null)
@ -818,18 +818,6 @@ namespace Microsoft.AspNet.Mvc.Controllers
} }
} }
private enum FilterStage
{
Undefined,
AuthorizationFilters,
ResourceFilters,
ExceptionFilters,
ActionFilters,
ActionMethod,
ResultFilters,
ActionResult
}
/// <summary> /// <summary>
/// A one-way cursor for filters. /// A one-way cursor for filters.
/// </summary> /// </summary>
@ -852,27 +840,23 @@ namespace Microsoft.AspNet.Mvc.Controllers
/// </remarks> /// </remarks>
private struct FilterCursor private struct FilterCursor
{ {
private FilterStage _stage;
private int _index; private int _index;
private readonly IFilterMetadata[] _filters; private readonly IFilterMetadata[] _filters;
public FilterCursor(FilterStage stage, int index, IFilterMetadata[] filters) public FilterCursor(int index, IFilterMetadata[] filters)
{ {
_stage = stage;
_index = index; _index = index;
_filters = filters; _filters = filters;
} }
public FilterCursor(IFilterMetadata[] filters) public FilterCursor(IFilterMetadata[] filters)
{ {
_stage = FilterStage.Undefined;
_index = 0; _index = 0;
_filters = filters; _filters = filters;
} }
public void SetStage(FilterStage stage) public void Reset()
{ {
_stage = stage;
_index = 0; _index = 0;
} }
@ -889,29 +873,22 @@ namespace Microsoft.AspNet.Mvc.Controllers
if (filter != null || filterAsync != null) if (filter != null || filterAsync != null)
{ {
return new FilterCursorItem<TFilter, TFilterAsync>(_stage, _index, filter, filterAsync); return new FilterCursorItem<TFilter, TFilterAsync>(_index, filter, filterAsync);
} }
} }
return default(FilterCursorItem<TFilter, TFilterAsync>); return default(FilterCursorItem<TFilter, TFilterAsync>);
} }
public bool StillAt<TFilter, TFilterAsync>(FilterCursorItem<TFilter, TFilterAsync> current)
{
return current.Stage == _stage && current.Index == _index;
}
} }
private struct FilterCursorItem<TFilter, TFilterAsync> private struct FilterCursorItem<TFilter, TFilterAsync>
{ {
public readonly FilterStage Stage;
public readonly int Index; public readonly int Index;
public readonly TFilter Filter; public readonly TFilter Filter;
public readonly TFilterAsync FilterAsync; public readonly TFilterAsync FilterAsync;
public FilterCursorItem(FilterStage stage, int index, TFilter filter, TFilterAsync filterAsync) public FilterCursorItem(int index, TFilter filter, TFilterAsync filterAsync)
{ {
Stage = stage;
Index = index; Index = index;
Filter = filter; Filter = filter;
FilterAsync = filterAsync; FilterAsync = filterAsync;