From 7e1a6222aae163a182e39068540c375de91dc227 Mon Sep 17 00:00:00 2001 From: apxoht Date: Thu, 26 Nov 2015 19:50:50 +0200 Subject: [PATCH] Removed unused private method in DefaultActionSelector --- .../ControllerActionDescriptorBuilder.cs | 1 - .../Infrastructure/DefaultActionSelector.cs | 14 -------------- .../Infrastructure/ObjectResultExecutor.cs | 2 +- .../Infrastructure/DefaultActionSelectorTests.cs | 6 +++--- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorBuilder.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorBuilder.cs index 40ab48a376..a2dfa778f5 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorBuilder.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorBuilder.cs @@ -316,7 +316,6 @@ namespace Microsoft.AspNet.Mvc.Controllers ControllerModel controller, ActionModel action) { - var isVisible = action.ApiExplorer?.IsVisible ?? controller.ApiExplorer?.IsVisible ?? diff --git a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionSelector.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionSelector.cs index 4bcee52b14..92b363c0bc 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionSelector.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionSelector.cs @@ -235,20 +235,6 @@ namespace Microsoft.AspNet.Mvc.Infrastructure return matchingRouteConstraints.Count > 0; } - private IReadOnlyList GetActions() - { - var descriptors = _actionDescriptorsCollectionProvider.ActionDescriptors; - - if (descriptors == null) - { - throw new InvalidOperationException( - Resources.FormatPropertyOfTypeCannotBeNull("ActionDescriptors", - _actionDescriptorsCollectionProvider.GetType())); - } - - return descriptors.Items; - } - private IReadOnlyList GetConstraints(HttpContext httpContext, ActionDescriptor action) { if (action.ActionConstraints == null || action.ActionConstraints.Count == 0) diff --git a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ObjectResultExecutor.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ObjectResultExecutor.cs index 074b33b00d..d892514198 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ObjectResultExecutor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ObjectResultExecutor.cs @@ -101,7 +101,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure if (objectType == null || objectType == typeof(object)) { objectType = result.Value?.GetType(); - }; + } var formatterContext = new OutputFormatterWriteContext( context.HttpContext, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultActionSelectorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultActionSelectorTests.cs index c1b3c74de4..8714775416 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultActionSelectorTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultActionSelectorTests.cs @@ -642,9 +642,9 @@ namespace Microsoft.AspNet.Mvc.Infrastructure serviceContainer.AddSingleton(typeof(IEnumerable), list); - var actionCollectionDescriptorProvider = new DefaultActionDescriptorsCollectionProvider( + var actionDescriptorsCollectionProvider = new DefaultActionDescriptorsCollectionProvider( serviceContainer.BuildServiceProvider()); - var decisionTreeProvider = new ActionSelectorDecisionTreeProvider(actionCollectionDescriptorProvider); + var decisionTreeProvider = new ActionSelectorDecisionTreeProvider(actionDescriptorsCollectionProvider); var actionConstraintProviders = new[] { @@ -652,7 +652,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure }; var defaultActionSelector = new DefaultActionSelector( - actionCollectionDescriptorProvider, + actionDescriptorsCollectionProvider, decisionTreeProvider, actionConstraintProviders, NullLoggerFactory.Instance);