From 9f202feafc335dd70ae640f2053b465be3879e82 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sat, 2 Feb 2019 22:31:49 -0800 Subject: [PATCH] Rename IHttpContextContainer to IDefaultHttpContextContainer (#7217) - Renamed since the property has to be a DefaultHttpContext --- src/Http/Http/src/DefaultHttpContextFactory.cs | 2 +- src/Http/Http/src/HttpContextFactory.cs | 2 +- ...ttpContextContainer.cs => IDefaultHttpContextContainer.cs} | 2 +- src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/Http/Http/src/{IHttpContextContainer.cs => IDefaultHttpContextContainer.cs} (77%) diff --git a/src/Http/Http/src/DefaultHttpContextFactory.cs b/src/Http/Http/src/DefaultHttpContextFactory.cs index 4c6d862c35..fccec7d739 100644 --- a/src/Http/Http/src/DefaultHttpContextFactory.cs +++ b/src/Http/Http/src/DefaultHttpContextFactory.cs @@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.Http private static DefaultHttpContext CreateHttpContext(IFeatureCollection featureCollection) { - if (featureCollection is IHttpContextContainer container) + if (featureCollection is IDefaultHttpContextContainer container) { return container.HttpContext; } diff --git a/src/Http/Http/src/HttpContextFactory.cs b/src/Http/Http/src/HttpContextFactory.cs index 4799e4b908..3c2796e9dd 100644 --- a/src/Http/Http/src/HttpContextFactory.cs +++ b/src/Http/Http/src/HttpContextFactory.cs @@ -68,7 +68,7 @@ namespace Microsoft.AspNetCore.Http private static DefaultHttpContext CreateHttpContext(IFeatureCollection featureCollection) { - if (featureCollection is IHttpContextContainer container) + if (featureCollection is IDefaultHttpContextContainer container) { return container.HttpContext; } diff --git a/src/Http/Http/src/IHttpContextContainer.cs b/src/Http/Http/src/IDefaultHttpContextContainer.cs similarity index 77% rename from src/Http/Http/src/IHttpContextContainer.cs rename to src/Http/Http/src/IDefaultHttpContextContainer.cs index ff63e34f45..63addddb67 100644 --- a/src/Http/Http/src/IHttpContextContainer.cs +++ b/src/Http/Http/src/IDefaultHttpContextContainer.cs @@ -4,7 +4,7 @@ using System.Text; namespace Microsoft.AspNetCore.Http { - public interface IHttpContextContainer + public interface IDefaultHttpContextContainer { DefaultHttpContext HttpContext { get; } } diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs index 4f0f456da8..1f518201f3 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs @@ -23,7 +23,7 @@ using Microsoft.Extensions.Primitives; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http { - public abstract partial class HttpProtocol : IHttpContextContainer, IHttpResponseControl + public abstract partial class HttpProtocol : IDefaultHttpContextContainer, IHttpResponseControl { private static readonly byte[] _bytesConnectionClose = Encoding.ASCII.GetBytes("\r\nConnection: close"); private static readonly byte[] _bytesConnectionKeepAlive = Encoding.ASCII.GetBytes("\r\nConnection: keep-alive"); @@ -274,7 +274,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http protected HttpResponseHeaders HttpResponseHeaders { get; } = new HttpResponseHeaders(); - DefaultHttpContext IHttpContextContainer.HttpContext + DefaultHttpContext IDefaultHttpContextContainer.HttpContext { get {