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

Make ServiceCollectionExtensions consistent

This commit is contained in:
jacalvar 2016-02-24 23:20:35 -08:00
parent e8f642df19
commit b2b623816b
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Microsoft.Extensions.WebEncoders/EncoderServiceCollectionExtensions.cs
View File

@ -9,6 +9,9 @@ using Microsoft.Extensions.WebEncoders;
namespace Microsoft.Extensions.DependencyInjection namespace Microsoft.Extensions.DependencyInjection
{ {
/// <summary>
/// Extension methods for setting up web encoding services in an <see cref="IServiceCollection" />.
/// </summary>
public static class EncoderServiceCollectionExtensions public static class EncoderServiceCollectionExtensions
{ {
/// <summary> /// <summary>
@ -17,24 +20,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// </summary> /// </summary>
/// <param name="services">The <see cref="IServiceCollection"/>.</param> /// <param name="services">The <see cref="IServiceCollection"/>.</param>
/// <returns>The <see cref="IServiceCollection"/> instance after the encoders have been added.</returns> /// <returns>The <see cref="IServiceCollection"/> instance after the encoders have been added.</returns>
public static IServiceCollection AddWebEncoders(this IServiceCollection services) public static void AddWebEncoders(this IServiceCollection services)
{
if (services == null)
{
throw new ArgumentNullException(nameof(services));
}
return AddWebEncoders(services, configureOptions: null);
}
/// <summary>
/// Adds <see cref="HtmlEncoder"/>, <see cref="JavaScriptEncoder"/> and <see cref="UrlEncoder"/>
/// to the specified <paramref name="services" />.
/// </summary>
/// <param name="services">The <see cref="IServiceCollection"/>.</param>
/// <param name="configureOptions">A callback to configure <see cref="WebEncoderOptions"/>.</param>
/// <returns>The <see cref="IServiceCollection"/> instance after the encoders have been added.</returns>
public static IServiceCollection AddWebEncoders(this IServiceCollection services, Action<WebEncoderOptions> configureOptions)
{ {
if (services == null) if (services == null)
{ {
@ -51,13 +37,28 @@ namespace Microsoft.Extensions.DependencyInjection
CreateFactory(() => JavaScriptEncoder.Default, settings => JavaScriptEncoder.Create(settings))); CreateFactory(() => JavaScriptEncoder.Default, settings => JavaScriptEncoder.Create(settings)));
services.TryAddSingleton( services.TryAddSingleton(
CreateFactory(() => UrlEncoder.Default, settings => UrlEncoder.Create(settings))); CreateFactory(() => UrlEncoder.Default, settings => UrlEncoder.Create(settings)));
}
if (configureOptions != null) /// <summary>
/// Adds <see cref="HtmlEncoder"/>, <see cref="JavaScriptEncoder"/> and <see cref="UrlEncoder"/>
/// to the specified <paramref name="services" />.
/// </summary>
/// <param name="services">The <see cref="IServiceCollection"/>.</param>
/// <param name="setupAction">An <see cref="Action{WebEncoderOptions}"/> to configure the provided <see cref="WebEncoderOptions"/>.</param>
public static void AddWebEncoders(this IServiceCollection services, Action<WebEncoderOptions> setupAction)
{
if (services == null)
{ {
services.Configure(configureOptions); throw new ArgumentNullException(nameof(services));
} }
return services; if (setupAction == null)
{
throw new ArgumentNullException(nameof(setupAction));
}
services.AddWebEncoders();
services.Configure(setupAction);
} }
private static Func<IServiceProvider, TService> CreateFactory<TService>( private static Func<IServiceProvider, TService> CreateFactory<TService>(