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

Rename UseServices -> UsePerRequestServices

This commit is contained in:
Hao Kung 2014-10-09 14:05:59 -07:00
parent 684aaed9bd
commit babb296f35
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Microsoft.AspNet.RequestContainer/ContainerExtensions.cs
View File

@ -31,33 +31,33 @@ namespace Microsoft.AspNet.Builder
}); });
} }
public static IApplicationBuilder UseServices(this IApplicationBuilder builder) public static IApplicationBuilder UsePerRequestServices(this IApplicationBuilder builder)
{ {
return builder.UseMiddleware(typeof(ContainerMiddleware)); return builder.UseMiddleware(typeof(ContainerMiddleware));
} }
public static IApplicationBuilder UseServices(this IApplicationBuilder builder, IServiceProvider applicationServices) public static IApplicationBuilder UsePerRequestServices(this IApplicationBuilder builder, IServiceProvider applicationServices)
{ {
builder.ApplicationServices = applicationServices; builder.ApplicationServices = applicationServices;
return builder.UseMiddleware(typeof(ContainerMiddleware)); return builder.UseMiddleware(typeof(ContainerMiddleware));
} }
public static IApplicationBuilder UseServices(this IApplicationBuilder builder, IEnumerable<IServiceDescriptor> applicationServices) public static IApplicationBuilder UsePerRequestServices(this IApplicationBuilder builder, IEnumerable<IServiceDescriptor> applicationServices)
{ {
return builder.UseServices(services => services.Add(applicationServices)); return builder.UsePerRequestServices(services => services.Add(applicationServices));
} }
public static IApplicationBuilder UseServices(this IApplicationBuilder builder, Action<ServiceCollection> configureServices) public static IApplicationBuilder UsePerRequestServices(this IApplicationBuilder builder, Action<ServiceCollection> configureServices)
{ {
return builder.UseServices(serviceCollection => return builder.UsePerRequestServices(serviceCollection =>
{ {
configureServices(serviceCollection); configureServices(serviceCollection);
return serviceCollection.BuildServiceProvider(builder.ApplicationServices); return serviceCollection.BuildServiceProvider(builder.ApplicationServices);
}); });
} }
public static IApplicationBuilder UseServices(this IApplicationBuilder builder, Func<ServiceCollection, IServiceProvider> configureServices) public static IApplicationBuilder UsePerRequestServices(this IApplicationBuilder builder, Func<ServiceCollection, IServiceProvider> configureServices)
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();

4
test/Microsoft.AspNet.Hosting.Tests/UseServicesFacts.cs
View File

@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Hosting.Tests
var baseServiceProvider = new ServiceCollection().BuildServiceProvider(); var baseServiceProvider = new ServiceCollection().BuildServiceProvider();
var builder = new ApplicationBuilder(baseServiceProvider); var builder = new ApplicationBuilder(baseServiceProvider);
builder.UseServices(serviceCollection => { }); builder.UsePerRequestServices(serviceCollection => { });
var optionsAccessor = builder.ApplicationServices.GetService<IOptionsAccessor<object>>(); var optionsAccessor = builder.ApplicationServices.GetService<IOptionsAccessor<object>>();
Assert.NotNull(optionsAccessor); Assert.NotNull(optionsAccessor);
@ -32,7 +32,7 @@ namespace Microsoft.AspNet.Hosting.Tests
var builder = new ApplicationBuilder(baseServiceProvider); var builder = new ApplicationBuilder(baseServiceProvider);
IServiceProvider serviceProvider = null; IServiceProvider serviceProvider = null;
builder.UseServices(serviceCollection => builder.UsePerRequestServices(serviceCollection =>
{ {
serviceProvider = serviceCollection.BuildServiceProvider(builder.ApplicationServices); serviceProvider = serviceCollection.BuildServiceProvider(builder.ApplicationServices);
return serviceProvider; return serviceProvider;