From c321e40d44eacc64324db069bf96d8e5d4c41e7d Mon Sep 17 00:00:00 2001 From: Yishai Galatzer Date: Mon, 3 Mar 2014 00:39:12 -0800 Subject: [PATCH] Rename TypeMethodXXX to ReflectedXXX --- src/Microsoft.AspNet.Mvc.Core/ActionInvokerProvider.cs | 4 ++-- src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs | 2 +- ...edActionDescriptor.cs => ReflectedActionDescriptor.cs} | 2 +- ...orProvider.cs => ReflectedActionDescriptorProvider.cs} | 8 ++++---- ...hodBasedActionInvoker.cs => ReflectedActionInvoker.cs} | 8 ++++---- src/Microsoft.AspNet.Mvc/MvcServices.cs | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename src/Microsoft.AspNet.Mvc.Core/{TypeMethodBasedActionDescriptor.cs => ReflectedActionDescriptor.cs} (91%) rename src/Microsoft.AspNet.Mvc.Core/{TypeMethodBasedActionDescriptorProvider.cs => ReflectedActionDescriptorProvider.cs} (89%) rename src/Microsoft.AspNet.Mvc.Core/{TypeMethodBasedActionInvoker.cs => ReflectedActionInvoker.cs} (90%) diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ActionInvokerProvider.cs index 924d5a566c..7025a62901 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionInvokerProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionInvokerProvider.cs @@ -24,11 +24,11 @@ namespace Microsoft.AspNet.Mvc public void Invoke(ActionInvokerProviderContext context, Action callNext) { - var ad = context.ActionContext.ActionDescriptor as TypeMethodBasedActionDescriptor; + var ad = context.ActionContext.ActionDescriptor as ReflectedActionDescriptor; if (ad != null) { - context.Result = new TypeMethodBasedActionInvoker( + context.Result = new ReflectedActionInvoker( context.ActionContext, ad, _actionResultFactory, diff --git a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs index e18c8fa1b5..c90a5c2d0f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Core/DefaultControllerFactory.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc public object CreateController(HttpContext context, ActionDescriptor actionDescriptor) { - var typedAd = actionDescriptor as TypeMethodBasedActionDescriptor; + var typedAd = actionDescriptor as ReflectedActionDescriptor; if (typedAd == null) { diff --git a/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptor.cs similarity index 91% rename from src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptor.cs index f14174f949..e0d328a5d5 100644 --- a/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptor.cs @@ -5,7 +5,7 @@ using System.Reflection; namespace Microsoft.AspNet.Mvc { [DebuggerDisplay("CA {Path}:{Name}(RC-{RouteConstraints.Count})")] - public class TypeMethodBasedActionDescriptor : ActionDescriptor + public class ReflectedActionDescriptor : ActionDescriptor { public override string Path { diff --git a/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs similarity index 89% rename from src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptorProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs index 57802747ab..1ae6c5cd14 100644 --- a/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs @@ -5,14 +5,14 @@ using System.Reflection; namespace Microsoft.AspNet.Mvc { - public class TypeMethodBasedActionDescriptorProvider : IActionDescriptorProvider + public class ReflectedActionDescriptorProvider : IActionDescriptorProvider { private readonly IControllerAssemblyProvider _controllerAssemblyProvider; private readonly IActionDiscoveryConventions _conventions; private readonly IControllerDescriptorFactory _controllerDescriptorFactory; private readonly IParameterDescriptorFactory _parameterDescriptorFactory; - public TypeMethodBasedActionDescriptorProvider(IControllerAssemblyProvider controllerAssemblyProvider, + public ReflectedActionDescriptorProvider(IControllerAssemblyProvider controllerAssemblyProvider, IActionDiscoveryConventions conventions, IControllerDescriptorFactory controllerDescriptorFactory, IParameterDescriptorFactory parameterDescriptorFactory) @@ -60,9 +60,9 @@ namespace Microsoft.AspNet.Mvc } } - private TypeMethodBasedActionDescriptor BuildDescriptor(ControllerDescriptor controllerDescriptor, MethodInfo methodInfo, ActionInfo actionInfo) + private ReflectedActionDescriptor BuildDescriptor(ControllerDescriptor controllerDescriptor, MethodInfo methodInfo, ActionInfo actionInfo) { - var ad = new TypeMethodBasedActionDescriptor + var ad = new ReflectedActionDescriptor { RouteConstraints = new List { diff --git a/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs similarity index 90% rename from src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionInvoker.cs rename to src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs index 1844274027..f74c7b76dc 100644 --- a/src/Microsoft.AspNet.Mvc.Core/TypeMethodBasedActionInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ReflectedActionInvoker.cs @@ -6,16 +6,16 @@ using Microsoft.AspNet.Abstractions; namespace Microsoft.AspNet.Mvc { - public class TypeMethodBasedActionInvoker : IActionInvoker + public class ReflectedActionInvoker : IActionInvoker { private readonly ActionContext _actionContext; - private readonly TypeMethodBasedActionDescriptor _descriptor; + private readonly ReflectedActionDescriptor _descriptor; private readonly IActionResultFactory _actionResultFactory; private readonly IServiceProvider _serviceProvider; private readonly IControllerFactory _controllerFactory; - public TypeMethodBasedActionInvoker(ActionContext actionContext, - TypeMethodBasedActionDescriptor descriptor, + public ReflectedActionInvoker(ActionContext actionContext, + ReflectedActionDescriptor descriptor, IActionResultFactory actionResultFactory, IControllerFactory controllerFactory, IServiceProvider serviceProvider) diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs index 5701273bac..7476ab6c20 100644 --- a/src/Microsoft.AspNet.Mvc/MvcServices.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs @@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Mvc // This is temporary until DI has some magic for it Add, NestedProviderManager>(); Add, NestedProviderManager>(); - Add, TypeMethodBasedActionDescriptorProvider>(); + Add, ReflectedActionDescriptorProvider>(); Add, ActionInvokerProvider>(); }