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

React to DI changes

This commit is contained in:
Hao Kung 2015-03-04 18:08:36 -08:00
parent ae23f7c7bc
commit 20848da93f
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Microsoft.Framework.WebEncoders/EncoderServices.cs
View File

@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections.Generic;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.OptionsModel; using Microsoft.Framework.OptionsModel;
@ -10,15 +9,17 @@ namespace Microsoft.Framework.WebEncoders
{ {
public static class EncoderServices public static class EncoderServices
{ {
public static IEnumerable<IServiceDescriptor> GetDefaultServices() public static IServiceCollection GetDefaultServices()
{ {
var describe = new ServiceDescriber(); var services = new ServiceCollection();
// Register the default encoders // Register the default encoders
// We want to call the 'Default' property getters lazily since they perform static caching // We want to call the 'Default' property getters lazily since they perform static caching
yield return describe.Singleton<IHtmlEncoder>(CreateFactory(() => HtmlEncoder.Default, filter => new HtmlEncoder(filter))); services.AddSingleton<IHtmlEncoder>(CreateFactory(() => HtmlEncoder.Default, filter => new HtmlEncoder(filter)));
yield return describe.Singleton<IJavaScriptStringEncoder>(CreateFactory(() => JavaScriptStringEncoder.Default, filter => new JavaScriptStringEncoder(filter))); services.AddSingleton<IJavaScriptStringEncoder>(CreateFactory(() => JavaScriptStringEncoder.Default, filter => new JavaScriptStringEncoder(filter)));
yield return describe.Singleton<IUrlEncoder>(CreateFactory(() => UrlEncoder.Default, filter => new UrlEncoder(filter))); services.AddSingleton<IUrlEncoder>(CreateFactory(() => UrlEncoder.Default, filter => new UrlEncoder(filter)));
return services;
} }
private static Func<IServiceProvider, T> CreateFactory<T>(Func<T> defaultFactory, Func<ICodePointFilter, T> customFilterFactory) private static Func<IServiceProvider, T> CreateFactory<T>(Func<T> defaultFactory, Func<ICodePointFilter, T> customFilterFactory)

9
test/Microsoft.AspNet.Http.Extensions.Tests/UseWithServicesTests.cs
View File

@ -2,13 +2,12 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using Xunit;
using Microsoft.AspNet.Builder;
using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback;
using Microsoft.AspNet.Http.Core;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http.Core;
using Microsoft.Framework.DependencyInjection;
using Xunit;
namespace Microsoft.AspNet.Http.Extensions.Tests namespace Microsoft.AspNet.Http.Extensions.Tests
{ {

1
test/Microsoft.Framework.WebEncoders.Tests/EncoderServiceCollectionExtensionsTests.cs
View File

@ -4,7 +4,6 @@
using System; using System;
using Xunit; using Xunit;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback;
namespace Microsoft.Framework.WebEncoders namespace Microsoft.Framework.WebEncoders
{ {