From 7bd297c395bc0992693ef92eb902ba2a9fe5d66b Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 11 May 2016 16:48:55 -0700 Subject: [PATCH] Remove unused field --- .../Internal/ControllerActionInvoker.cs | 2 -- .../Internal/ControllerActionInvokerProvider.cs | 5 ----- .../Internal/FilterActionInvoker.cs | 10 ---------- .../Internal/ControllerActionInvokerTest.cs | 4 ---- 4 files changed, 21 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs index 522194bbc6..094769b01c 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs @@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal ControllerActionInvokerCache controllerActionInvokerCache, IControllerFactory controllerFactory, ControllerActionDescriptor descriptor, - IReadOnlyList inputFormatters, IControllerActionArgumentBinder argumentBinder, IReadOnlyList valueProviderFactories, ILogger logger, @@ -38,7 +37,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal : base( actionContext, controllerActionInvokerCache, - inputFormatters, valueProviderFactories, logger, diagnosticSource, diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs index c1dfed330b..ae102a62df 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvokerProvider.cs @@ -7,9 +7,7 @@ using System.Diagnostics; using System.Linq; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Controllers; -using Microsoft.AspNetCore.Mvc.Formatters; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; @@ -20,7 +18,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal private readonly IControllerActionArgumentBinder _argumentBinder; private readonly IControllerFactory _controllerFactory; private readonly ControllerActionInvokerCache _controllerActionInvokerCache; - private readonly IReadOnlyList _inputFormatters; private readonly IReadOnlyList _valueProviderFactories; private readonly int _maxModelValidationErrors; private readonly ILogger _logger; @@ -37,7 +34,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal _controllerFactory = controllerFactory; _controllerActionInvokerCache = controllerActionInvokerCache; _argumentBinder = argumentBinder; - _inputFormatters = optionsAccessor.Value.InputFormatters.ToArray(); _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray(); _maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors; _logger = loggerFactory.CreateLogger(); @@ -66,7 +62,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal _controllerActionInvokerCache, _controllerFactory, actionDescriptor, - _inputFormatters, _argumentBinder, _valueProviderFactories, _logger, diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterActionInvoker.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterActionInvoker.cs index 4861c03d56..0e30c8c691 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterActionInvoker.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterActionInvoker.cs @@ -9,9 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Core; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.Formatters; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Mvc.Internal @@ -19,7 +17,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal public abstract class FilterActionInvoker : IActionInvoker { private readonly ControllerActionInvokerCache _controllerActionInvokerCache; - private readonly IReadOnlyList _inputFormatters; private readonly IReadOnlyList _valueProviderFactories; private readonly DiagnosticSource _diagnosticSource; private readonly int _maxModelValidationErrors; @@ -44,7 +41,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal public FilterActionInvoker( ActionContext actionContext, ControllerActionInvokerCache controllerActionInvokerCache, - IReadOnlyList inputFormatters, IReadOnlyList valueProviderFactories, ILogger logger, DiagnosticSource diagnosticSource, @@ -60,11 +56,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal throw new ArgumentNullException(nameof(controllerActionInvokerCache)); } - if (inputFormatters == null) - { - throw new ArgumentNullException(nameof(inputFormatters)); - } - if (valueProviderFactories == null) { throw new ArgumentNullException(nameof(valueProviderFactories)); @@ -83,7 +74,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal Context = new ControllerContext(actionContext); _controllerActionInvokerCache = controllerActionInvokerCache; - _inputFormatters = inputFormatters; _valueProviderFactories = valueProviderFactories; Logger = logger; _diagnosticSource = diagnosticSource; diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs index c294271053..6176cef786 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs @@ -2051,7 +2051,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal new[] { filterProvider.Object }, new MockControllerFactory(this), actionDescriptor, - new IInputFormatter[0], actionArgumentsBinder.Object, new IValueProviderFactory[0], new NullLoggerFactory().CreateLogger(), @@ -2103,7 +2102,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal CreateFilterCache(), controllerFactory.Object, actionDescriptor, - new IInputFormatter[0], new ControllerArgumentBinder( metadataProvider, TestModelBinderFactory.CreateDefault(metadataProvider), @@ -2229,7 +2227,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal IFilterProvider[] filterProviders, MockControllerFactory controllerFactory, ControllerActionDescriptor descriptor, - IReadOnlyList inputFormatters, IControllerActionArgumentBinder controllerActionArgumentBinder, IReadOnlyList valueProviderFactories, ILogger logger, @@ -2240,7 +2237,6 @@ namespace Microsoft.AspNetCore.Mvc.Internal CreateFilterCache(filterProviders), controllerFactory, descriptor, - inputFormatters, controllerActionArgumentBinder, valueProviderFactories, logger,