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

Remove unused field

This commit is contained in:
Ryan Nowak 2016-05-11 16:48:55 -07:00
parent 3c2bdfd368
commit 7bd297c395
4 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs
View File

@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
ControllerActionInvokerCache controllerActionInvokerCache, ControllerActionInvokerCache controllerActionInvokerCache,
IControllerFactory controllerFactory, IControllerFactory controllerFactory,
ControllerActionDescriptor descriptor, ControllerActionDescriptor descriptor,
IReadOnlyList<IInputFormatter> inputFormatters,
IControllerActionArgumentBinder argumentBinder, IControllerActionArgumentBinder argumentBinder,
IReadOnlyList<IValueProviderFactory> valueProviderFactories, IReadOnlyList<IValueProviderFactory> valueProviderFactories,
ILogger logger, ILogger logger,
@ -38,7 +37,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
: base( : base(
actionContext, actionContext,
controllerActionInvokerCache, controllerActionInvokerCache,
inputFormatters,
valueProviderFactories, valueProviderFactories,
logger, logger,
diagnosticSource, diagnosticSource,

5
src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs
View File

@ -7,9 +7,7 @@ using System.Diagnostics;
using System.Linq; using System.Linq;
using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Formatters;
using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -20,7 +18,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
private readonly IControllerActionArgumentBinder _argumentBinder; private readonly IControllerActionArgumentBinder _argumentBinder;
private readonly IControllerFactory _controllerFactory; private readonly IControllerFactory _controllerFactory;
private readonly ControllerActionInvokerCache _controllerActionInvokerCache; private readonly ControllerActionInvokerCache _controllerActionInvokerCache;
private readonly IReadOnlyList<IInputFormatter> _inputFormatters;
private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories; private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
private readonly int _maxModelValidationErrors; private readonly int _maxModelValidationErrors;
private readonly ILogger _logger; private readonly ILogger _logger;
@ -37,7 +34,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
_controllerFactory = controllerFactory; _controllerFactory = controllerFactory;
_controllerActionInvokerCache = controllerActionInvokerCache; _controllerActionInvokerCache = controllerActionInvokerCache;
_argumentBinder = argumentBinder; _argumentBinder = argumentBinder;
_inputFormatters = optionsAccessor.Value.InputFormatters.ToArray();
_valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray(); _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray();
_maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors; _maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors;
_logger = loggerFactory.CreateLogger<ControllerActionInvoker>(); _logger = loggerFactory.CreateLogger<ControllerActionInvoker>();
@ -66,7 +62,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
_controllerActionInvokerCache, _controllerActionInvokerCache,
_controllerFactory, _controllerFactory,
actionDescriptor, actionDescriptor,
_inputFormatters,
_argumentBinder, _argumentBinder,
_valueProviderFactories, _valueProviderFactories,
_logger, _logger,

10
src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterActionInvoker.cs
View File

@ -9,9 +9,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Abstractions;
using Microsoft.AspNetCore.Mvc.Core; using Microsoft.AspNetCore.Mvc.Core;
using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.Formatters;
using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding;
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Microsoft.AspNetCore.Mvc.Internal namespace Microsoft.AspNetCore.Mvc.Internal
@ -19,7 +17,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public abstract class FilterActionInvoker : IActionInvoker public abstract class FilterActionInvoker : IActionInvoker
{ {
private readonly ControllerActionInvokerCache _controllerActionInvokerCache; private readonly ControllerActionInvokerCache _controllerActionInvokerCache;
private readonly IReadOnlyList<IInputFormatter> _inputFormatters;
private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories; private readonly IReadOnlyList<IValueProviderFactory> _valueProviderFactories;
private readonly DiagnosticSource _diagnosticSource; private readonly DiagnosticSource _diagnosticSource;
private readonly int _maxModelValidationErrors; private readonly int _maxModelValidationErrors;
@ -44,7 +41,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
public FilterActionInvoker( public FilterActionInvoker(
ActionContext actionContext, ActionContext actionContext,
ControllerActionInvokerCache controllerActionInvokerCache, ControllerActionInvokerCache controllerActionInvokerCache,
IReadOnlyList<IInputFormatter> inputFormatters,
IReadOnlyList<IValueProviderFactory> valueProviderFactories, IReadOnlyList<IValueProviderFactory> valueProviderFactories,
ILogger logger, ILogger logger,
DiagnosticSource diagnosticSource, DiagnosticSource diagnosticSource,
@ -60,11 +56,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
throw new ArgumentNullException(nameof(controllerActionInvokerCache)); throw new ArgumentNullException(nameof(controllerActionInvokerCache));
} }
if (inputFormatters == null)
{
throw new ArgumentNullException(nameof(inputFormatters));
}
if (valueProviderFactories == null) if (valueProviderFactories == null)
{ {
throw new ArgumentNullException(nameof(valueProviderFactories)); throw new ArgumentNullException(nameof(valueProviderFactories));
@ -83,7 +74,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
Context = new ControllerContext(actionContext); Context = new ControllerContext(actionContext);
_controllerActionInvokerCache = controllerActionInvokerCache; _controllerActionInvokerCache = controllerActionInvokerCache;
_inputFormatters = inputFormatters;
_valueProviderFactories = valueProviderFactories; _valueProviderFactories = valueProviderFactories;
Logger = logger; Logger = logger;
_diagnosticSource = diagnosticSource; _diagnosticSource = diagnosticSource;

4
test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs
View File

@ -2051,7 +2051,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
new[] { filterProvider.Object }, new[] { filterProvider.Object },
new MockControllerFactory(this), new MockControllerFactory(this),
actionDescriptor, actionDescriptor,
new IInputFormatter[0],
actionArgumentsBinder.Object, actionArgumentsBinder.Object,
new IValueProviderFactory[0], new IValueProviderFactory[0],
new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(), new NullLoggerFactory().CreateLogger<ControllerActionInvoker>(),
@ -2103,7 +2102,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
CreateFilterCache(), CreateFilterCache(),
controllerFactory.Object, controllerFactory.Object,
actionDescriptor, actionDescriptor,
new IInputFormatter[0],
new ControllerArgumentBinder( new ControllerArgumentBinder(
metadataProvider, metadataProvider,
TestModelBinderFactory.CreateDefault(metadataProvider), TestModelBinderFactory.CreateDefault(metadataProvider),
@ -2229,7 +2227,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
IFilterProvider[] filterProviders, IFilterProvider[] filterProviders,
MockControllerFactory controllerFactory, MockControllerFactory controllerFactory,
ControllerActionDescriptor descriptor, ControllerActionDescriptor descriptor,
IReadOnlyList<IInputFormatter> inputFormatters,
IControllerActionArgumentBinder controllerActionArgumentBinder, IControllerActionArgumentBinder controllerActionArgumentBinder,
IReadOnlyList<IValueProviderFactory> valueProviderFactories, IReadOnlyList<IValueProviderFactory> valueProviderFactories,
ILogger logger, ILogger logger,
@ -2240,7 +2237,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal
CreateFilterCache(filterProviders), CreateFilterCache(filterProviders),
controllerFactory, controllerFactory,
descriptor, descriptor,
inputFormatters,
controllerActionArgumentBinder, controllerActionArgumentBinder,
valueProviderFactories, valueProviderFactories,
logger, logger,