From 9bf94d36677d55be10437dc1b1b11761ffca5ae2 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Thu, 29 Jun 2017 11:44:46 -0700 Subject: [PATCH] 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. --- src/Microsoft.AspNetCore.Http/HttpContextFactory.cs | 11 +++-------- .../breakingchanges.netcore.json | 12 ++++++++++++ .../HttpContextFactoryTests.cs | 5 ++--- 3 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Http/breakingchanges.netcore.json diff --git a/src/Microsoft.AspNetCore.Http/HttpContextFactory.cs b/src/Microsoft.AspNetCore.Http/HttpContextFactory.cs index 80619206a3..8236a388a5 100644 --- a/src/Microsoft.AspNetCore.Http/HttpContextFactory.cs +++ b/src/Microsoft.AspNetCore.Http/HttpContextFactory.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNetCore.Http.Features; -using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Http @@ -13,17 +12,13 @@ namespace Microsoft.AspNetCore.Http private readonly IHttpContextAccessor _httpContextAccessor; private readonly FormOptions _formOptions; - public HttpContextFactory(ObjectPoolProvider poolProvider, IOptions formOptions) - : this(poolProvider, formOptions, httpContextAccessor: null) + public HttpContextFactory(IOptions formOptions) + : this(formOptions, httpContextAccessor: null) { } - public HttpContextFactory(ObjectPoolProvider poolProvider, IOptions formOptions, IHttpContextAccessor httpContextAccessor) + public HttpContextFactory(IOptions formOptions, IHttpContextAccessor httpContextAccessor) { - if (poolProvider == null) - { - throw new ArgumentNullException(nameof(poolProvider)); - } if (formOptions == null) { throw new ArgumentNullException(nameof(formOptions)); diff --git a/src/Microsoft.AspNetCore.Http/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Http/breakingchanges.netcore.json new file mode 100644 index 0000000000..67515e0af1 --- /dev/null +++ b/src/Microsoft.AspNetCore.Http/breakingchanges.netcore.json @@ -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 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 formOptions, Microsoft.AspNetCore.Http.IHttpContextAccessor httpContextAccessor)", + "Kind": "Removal" + } + ] diff --git a/test/Microsoft.AspNetCore.Http.Tests/HttpContextFactoryTests.cs b/test/Microsoft.AspNetCore.Http.Tests/HttpContextFactoryTests.cs index 40dff9bf5f..ba983198e7 100644 --- a/test/Microsoft.AspNetCore.Http.Tests/HttpContextFactoryTests.cs +++ b/test/Microsoft.AspNetCore.Http.Tests/HttpContextFactoryTests.cs @@ -4,7 +4,6 @@ using System; using System.IO; using Microsoft.AspNetCore.Http.Features; -using Microsoft.Extensions.ObjectPool; using Microsoft.Extensions.Options; using Xunit; @@ -17,7 +16,7 @@ namespace Microsoft.AspNetCore.Http { // Arrange 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 var context = contextFactory.Create(new FeatureCollection()); @@ -30,7 +29,7 @@ namespace Microsoft.AspNetCore.Http public void AllowsCreatingContextWithoutSettingAccessor() { // Arrange - var contextFactory = new HttpContextFactory(new DefaultObjectPoolProvider(), Options.Create(new FormOptions())); + var contextFactory = new HttpContextFactory(Options.Create(new FormOptions())); // Act & Assert var context = contextFactory.Create(new FeatureCollection());