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

Remove unused parameter in ctor of HttpContextFactory (#881) 

- We removed the use of the ObjectPoolProvider in 1.x, this change
just removes it from the ctor.
This commit is contained in:
David Fowler 2017-06-29 11:44:46 -07:00 committed by GitHub
parent 163836fe1f
commit 9bf94d3667
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.AspNetCore.Http/HttpContextFactory.cs
View File

@ -3,7 +3,6 @@
using System; using System;
using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features;
using Microsoft.Extensions.ObjectPool;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
namespace Microsoft.AspNetCore.Http namespace Microsoft.AspNetCore.Http
@ -13,17 +12,13 @@ namespace Microsoft.AspNetCore.Http
private readonly IHttpContextAccessor _httpContextAccessor; private readonly IHttpContextAccessor _httpContextAccessor;
private readonly FormOptions _formOptions; private readonly FormOptions _formOptions;
public HttpContextFactory(ObjectPoolProvider poolProvider, IOptions<FormOptions> formOptions) public HttpContextFactory(IOptions<FormOptions> formOptions)
: this(poolProvider, formOptions, httpContextAccessor: null) : this(formOptions, httpContextAccessor: null)
{ {
} }
public HttpContextFactory(ObjectPoolProvider poolProvider, IOptions<FormOptions> formOptions, IHttpContextAccessor httpContextAccessor) public HttpContextFactory(IOptions<FormOptions> formOptions, IHttpContextAccessor httpContextAccessor)
{ {
if (poolProvider == null)
{
throw new ArgumentNullException(nameof(poolProvider));
}
if (formOptions == null) if (formOptions == null)
{ {
throw new ArgumentNullException(nameof(formOptions)); throw new ArgumentNullException(nameof(formOptions));

12
src/Microsoft.AspNetCore.Http/breakingchanges.netcore.json Normal file
View File

@ -0,0 +1,12 @@
 [
{
"TypeId": "public class Microsoft.AspNetCore.Http.HttpContextFactory : Microsoft.AspNetCore.Http.IHttpContextFactory",
"MemberId": "public .ctor(Microsoft.Extensions.ObjectPool.ObjectPoolProvider poolProvider, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Http.Features.FormOptions> formOptions)",
"Kind": "Removal"
},
{
"TypeId": "public class Microsoft.AspNetCore.Http.HttpContextFactory : Microsoft.AspNetCore.Http.IHttpContextFactory",
"MemberId": "public .ctor(Microsoft.Extensions.ObjectPool.ObjectPoolProvider poolProvider, Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Http.Features.FormOptions> formOptions, Microsoft.AspNetCore.Http.IHttpContextAccessor httpContextAccessor)",
"Kind": "Removal"
}
]

5
test/Microsoft.AspNetCore.Http.Tests/HttpContextFactoryTests.cs
View File

@ -4,7 +4,6 @@
using System; using System;
using System.IO; using System.IO;
using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features;
using Microsoft.Extensions.ObjectPool;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Xunit; using Xunit;
@ -17,7 +16,7 @@ namespace Microsoft.AspNetCore.Http
{ {
// Arrange // Arrange
var accessor = new HttpContextAccessor(); var accessor = new HttpContextAccessor();
var contextFactory = new HttpContextFactory(new DefaultObjectPoolProvider(), Options.Create(new FormOptions()), accessor); var contextFactory = new HttpContextFactory(Options.Create(new FormOptions()), accessor);
// Act // Act
var context = contextFactory.Create(new FeatureCollection()); var context = contextFactory.Create(new FeatureCollection());
@ -30,7 +29,7 @@ namespace Microsoft.AspNetCore.Http
public void AllowsCreatingContextWithoutSettingAccessor() public void AllowsCreatingContextWithoutSettingAccessor()
{ {
// Arrange // Arrange
var contextFactory = new HttpContextFactory(new DefaultObjectPoolProvider(), Options.Create(new FormOptions())); var contextFactory = new HttpContextFactory(Options.Create(new FormOptions()));
// Act & Assert // Act & Assert
var context = contextFactory.Create(new FeatureCollection()); var context = contextFactory.Create(new FeatureCollection());