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

Rename IControllerAssemblyProvider to IAssemblyProvider and follow through resultant renames

This commit is contained in:
YishaiGalatzer 2014-10-11 13:26:07 -07:00
parent 7fabb80991
commit 13ee27c92c
17 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/MvcSample.Web/Startup.cs
View File

@ -41,7 +41,7 @@ namespace MvcSample.Web
// Setup services with a test AssemblyProvider so that only the
// sample's assemblies are loaded. This prevents loading controllers from other assemblies
// when the sample is used in the Functional Tests.
services.AddTransient<IControllerAssemblyProvider, TestAssemblyProvider<Startup>>();
services.AddTransient<IAssemblyProvider, TestAssemblyProvider<Startup>>();
services.ConfigureOptions<MvcOptions>(options =>
{
options.Filters.Add(typeof(PassThroughAttribute), order: 17);
@ -81,7 +81,7 @@ namespace MvcSample.Web
// Setup services with a test AssemblyProvider so that only the
// sample's assemblies are loaded. This prevents loading controllers from other assemblies
// when the sample is used in the Functional Tests.
services.AddTransient<IControllerAssemblyProvider, TestAssemblyProvider<Startup>>();
services.AddTransient<IAssemblyProvider, TestAssemblyProvider<Startup>>();
services.ConfigureOptions<MvcOptions>(options =>
{

2
samples/MvcSample.Web/TestAssemblyProvider.cs
View File

@ -17,7 +17,7 @@ namespace MvcSample.Web
/// This is a generic type because it needs to instantiated by a service provider to replace
/// a built-in MVC service.
/// </remarks>
public class TestAssemblyProvider<T> : IControllerAssemblyProvider
public class TestAssemblyProvider<T> : IAssemblyProvider
{
public TestAssemblyProvider()
{

8
src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs
View File

@ -21,17 +21,17 @@ namespace Microsoft.AspNet.Mvc
// the reflected model is null.
private const int DefaultAttributeRouteOrder = 0;
private readonly IControllerAssemblyProvider _controllerAssemblyProvider;
private readonly IAssemblyProvider _assemblyProvider;
private readonly IActionDiscoveryConventions _conventions;
private readonly IReadOnlyList<IFilter> _globalFilters;
private readonly IEnumerable<IGlobalModelConvention> _modelConventions;
public ControllerActionDescriptorProvider(IControllerAssemblyProvider controllerAssemblyProvider,
public ControllerActionDescriptorProvider(IAssemblyProvider assemblyProvider,
IActionDiscoveryConventions conventions,
IGlobalFilterProvider globalFilters,
IOptionsAccessor<MvcOptions> optionsAccessor)
{
_controllerAssemblyProvider = controllerAssemblyProvider;
_assemblyProvider = assemblyProvider;
_conventions = conventions;
_globalFilters = globalFilters.Filters;
_modelConventions = optionsAccessor.Options.ApplicationModelConventions;
@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Mvc
var applicationModel = new GlobalModel();
applicationModel.Filters.AddRange(_globalFilters);
var assemblies = _controllerAssemblyProvider.CandidateAssemblies;
var assemblies = _assemblyProvider.CandidateAssemblies;
var types = assemblies.SelectMany(a => a.DefinedTypes);
var controllerTypes = types.Where(_conventions.IsController);

4
src/Microsoft.AspNet.Mvc.Core/DefaultControllerAssemblyProvider.cs → src/Microsoft.AspNet.Mvc.Core/DefaultAssemblyProvider.cs
View File

@ -9,7 +9,7 @@ using Microsoft.Framework.Runtime;
namespace Microsoft.AspNet.Mvc
{
public class DefaultControllerAssemblyProvider : IControllerAssemblyProvider
public class DefaultAssemblyProvider : IAssemblyProvider
{
// List of Mvc assemblies that we'll use as roots for controller discovery.
private static readonly HashSet<string> _mvcAssemblyList = new HashSet<string>(StringComparer.Ordinal)
@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc
private readonly ILibraryManager _libraryManager;
public DefaultControllerAssemblyProvider(ILibraryManager libraryManager)
public DefaultAssemblyProvider(ILibraryManager libraryManager)
{
_libraryManager = libraryManager;
}

2
src/Microsoft.AspNet.Mvc.Core/IControllerAssemblyProvider.cs → src/Microsoft.AspNet.Mvc.Core/IAssemblyProvider.cs
View File

@ -6,7 +6,7 @@ using System.Reflection;
namespace Microsoft.AspNet.Mvc
{
public interface IControllerAssemblyProvider
public interface IAssemblyProvider
{
IEnumerable<Assembly> CandidateAssemblies { get; }
}

4
src/Microsoft.AspNet.Mvc.Core/ViewComponents/DefaultViewComponentSelector.cs
View File

@ -9,9 +9,9 @@ namespace Microsoft.AspNet.Mvc
{
public class DefaultViewComponentSelector : IViewComponentSelector
{
private readonly IControllerAssemblyProvider _assemblyProvider;
private readonly IAssemblyProvider _assemblyProvider;
public DefaultViewComponentSelector(IControllerAssemblyProvider assemblyProvider)
public DefaultViewComponentSelector(IAssemblyProvider assemblyProvider)
{
_assemblyProvider = assemblyProvider;
}

4
src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
View File

@ -37,12 +37,12 @@ namespace Microsoft.AspNet.Mvc.Razor
private readonly IMvcRazorHost _razorHost;
public RazorCompilationService(IServiceProvider serviceProvider,
IControllerAssemblyProvider _controllerAssemblyProvider,
IAssemblyProvider _assemblyProvider,
IMvcRazorHost razorHost)
{
_serviceProvider = serviceProvider;
_razorHost = razorHost;
_cache = new CompilerCache(_controllerAssemblyProvider.CandidateAssemblies);
_cache = new CompilerCache(_assemblyProvider.CandidateAssemblies);
}
/// <inheritdoc />

2
src/Microsoft.AspNet.Mvc/MvcServices.cs
View File

@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc
DefaultActionConstraintProvider>();
yield return describe.Transient<IActionInvokerFactory, ActionInvokerFactory>();
yield return describe.Transient<IControllerAssemblyProvider, DefaultControllerAssemblyProvider>();
yield return describe.Transient<IAssemblyProvider, DefaultAssemblyProvider>();
yield return describe.Transient<IActionDiscoveryConventions, DefaultActionDiscoveryConventions>();
// The host is designed to be discarded after consumption and is very inexpensive to initialize.

4
test/Microsoft.AspNet.Mvc.Core.Test/ActionAttributeTests.cs
View File

@ -196,7 +196,7 @@ namespace Microsoft.AspNet.Mvc
private ControllerActionDescriptorProvider GetActionDescriptorProvider(
IActionDiscoveryConventions actionDiscoveryConventions = null)
{
var controllerAssemblyProvider = new StaticControllerAssemblyProvider();
var assemblyProvider = new StaticAssemblyProvider();
if (actionDiscoveryConventions == null)
{
@ -208,7 +208,7 @@ namespace Microsoft.AspNet.Mvc
}
return new ControllerActionDescriptorProvider(
controllerAssemblyProvider,
assemblyProvider,
actionDiscoveryConventions,
new TestGlobalFilterProvider(),
new MockMvcOptionsAccessor());

8
test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs
View File

@ -1334,7 +1334,7 @@ namespace Microsoft.AspNet.Mvc.Test
{
var conventions = new StaticActionDiscoveryConventions(controllerTypeInfo);
var assemblyProvider = new Mock<IControllerAssemblyProvider>();
var assemblyProvider = new Mock<IAssemblyProvider>();
assemblyProvider
.SetupGet(ap => ap.CandidateAssemblies)
.Returns(new Assembly[] { controllerTypeInfo.Assembly });
@ -1353,7 +1353,7 @@ namespace Microsoft.AspNet.Mvc.Test
{
var conventions = new StaticActionDiscoveryConventions(controllerTypeInfo);
var assemblyProvider = new Mock<IControllerAssemblyProvider>();
var assemblyProvider = new Mock<IAssemblyProvider>();
assemblyProvider
.SetupGet(ap => ap.CandidateAssemblies)
.Returns(new Assembly[] { controllerTypeInfo.First().Assembly });
@ -1373,7 +1373,7 @@ namespace Microsoft.AspNet.Mvc.Test
{
var conventions = new StaticActionDiscoveryConventions(type);
var assemblyProvider = new Mock<IControllerAssemblyProvider>();
var assemblyProvider = new Mock<IAssemblyProvider>();
assemblyProvider
.SetupGet(ap => ap.CandidateAssemblies)
.Returns(new Assembly[] { type.Assembly });
@ -1389,7 +1389,7 @@ namespace Microsoft.AspNet.Mvc.Test
{
var conventions = new StaticActionDiscoveryConventions(controllerTypeInfos);
var assemblyProvider = new Mock<IControllerAssemblyProvider>();
var assemblyProvider = new Mock<IAssemblyProvider>();
assemblyProvider
.SetupGet(ap => ap.CandidateAssemblies)
.Returns(controllerTypeInfos.Select(cti => cti.Assembly).Distinct());

6
test/Microsoft.AspNet.Mvc.Core.Test/DefaultActionDiscoveryConventionsActionSelectionTests.cs
View File

@ -100,10 +100,10 @@ namespace Microsoft.AspNet.Mvc
private ControllerActionDescriptorProvider GetActionDescriptorProvider(DefaultActionDiscoveryConventions actionDiscoveryConventions)
{
var assemblies = new Assembly[] { typeof(DefaultActionDiscoveryConventionsActionSelectionTests).GetTypeInfo().Assembly, };
var controllerAssemblyProvider = new Mock<IControllerAssemblyProvider>();
controllerAssemblyProvider.SetupGet(x => x.CandidateAssemblies).Returns(assemblies);
var AssemblyProvider = new Mock<IAssemblyProvider>();
AssemblyProvider.SetupGet(x => x.CandidateAssemblies).Returns(assemblies);
return new ControllerActionDescriptorProvider(
controllerAssemblyProvider.Object,
AssemblyProvider.Object,
actionDiscoveryConventions,
new TestGlobalFilterProvider(),
new MockMvcOptionsAccessor());

6
test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerAssemblyProviderTests.cs → test/Microsoft.AspNet.Mvc.Core.Test/DefaultAssemblyProviderTests.cs
View File

@ -11,7 +11,7 @@ using Xunit;
namespace Microsoft.AspNet.Mvc.Core
{
public class DefaultControllerAssemblyProviderTests
public class DefaultAssemblyProviderTests
{
[Fact]
public void CandidateAssemblies_IgnoresMvcAssemblies()
@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.Core
CreateLibraryInfo("SomeRandomAssembly"),
})
.Verifiable();
var provider = new DefaultControllerAssemblyProvider(manager.Object);
var provider = new DefaultAssemblyProvider(manager.Object);
// Act
var candidates = provider.GetCandidateLibraries();
@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Mvc.Core
.Returns(new[] { CreateLibraryInfo("Bar") });
manager.Setup(f => f.GetReferencingLibraries("Microsoft.AspNet.Mvc"))
.Returns(new[] { CreateLibraryInfo("Baz") });
var provider = new DefaultControllerAssemblyProvider(manager.Object);
var provider = new DefaultAssemblyProvider(manager.Object);
// Act
var candidates = provider.GetCandidateLibraries();

4
test/Microsoft.AspNet.Mvc.Core.Test/StaticControllerAssemblyProvider.cs → test/Microsoft.AspNet.Mvc.Core.Test/StaticAssemblyProvider.cs
View File

@ -7,9 +7,9 @@ using System.Reflection;
namespace Microsoft.AspNet.Mvc
{
/// <summary>
/// An implementation of IControllerAssemblyProvider that provides just this assembly.
/// An implementation of IAssemblyProvider that provides just this assembly.
/// </summary>
public class StaticControllerAssemblyProvider : IControllerAssemblyProvider
public class StaticAssemblyProvider : IAssemblyProvider
{
public IEnumerable<Assembly> CandidateAssemblies
{

2
test/Microsoft.AspNet.Mvc.FunctionalTests/TestAssemblyProvider.cs
View File

@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
/// This is a generic type because it needs to instantiated by a service provider to replace
/// a built-in MVC service.
/// </remarks>
public class TestAssemblyProvider<T> : IControllerAssemblyProvider
public class TestAssemblyProvider<T> : IAssemblyProvider
{
public TestAssemblyProvider()
{

2
test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs
View File

@ -47,7 +47,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
var configuration = new TestConfigurationProvider();
configuration.Configuration.Set(
typeof(IControllerAssemblyProvider).FullName,
typeof(IAssemblyProvider).FullName,
providerType.AssemblyQualifiedName);
services.AddInstance(

4
test/Microsoft.AspNet.Mvc.Razor.Test/RazorCompilationServiceTest.cs
View File

@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
.Returns(GetGeneratorResult())
.Verifiable();
var ap = new Mock<IControllerAssemblyProvider>();
var ap = new Mock<IAssemblyProvider>();
ap.SetupGet(e => e.CandidateAssemblies)
.Returns(Enumerable.Empty<Assembly>())
.Verifiable();
@ -68,7 +68,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test
var host = new Mock<IMvcRazorHost>();
host.SetupAllProperties();
host.Setup(h => h.GenerateCode(It.IsAny<string>(), It.IsAny<Stream>()))
.Returns(GetGeneratorResult()); var assemblyProvider = new Mock<IControllerAssemblyProvider>();
.Returns(GetGeneratorResult()); var assemblyProvider = new Mock<IAssemblyProvider>();
assemblyProvider.SetupGet(e => e.CandidateAssemblies)
.Returns(Enumerable.Empty<Assembly>());

2
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
View File

@ -252,7 +252,7 @@ namespace System.Web.Http
private INestedProviderManager<ActionDescriptorProviderContext> CreateProvider()
{
var assemblyProvider = new Mock<IControllerAssemblyProvider>();
var assemblyProvider = new Mock<IAssemblyProvider>();
assemblyProvider
.SetupGet(ap => ap.CandidateAssemblies)
.Returns(new Assembly[] { typeof(ApiControllerActionDiscoveryTest).Assembly });