diff --git a/src/Microsoft.AspNet.Abstractions/HttpResponse.cs b/src/Microsoft.AspNet.Abstractions/HttpResponse.cs index add21b64b8..6f6662e737 100644 --- a/src/Microsoft.AspNet.Abstractions/HttpResponse.cs +++ b/src/Microsoft.AspNet.Abstractions/HttpResponse.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Abstractions public abstract long? ContentLength { get; set; } public abstract string ContentType { get; set; } - public abstract IResponseCookiesCollection Cookies { get; } + public abstract IResponseCookies Cookies { get; } public abstract void OnSendingHeaders(Action callback, object state); diff --git a/src/Microsoft.AspNet.Abstractions/IResponseCookiesCollection.cs b/src/Microsoft.AspNet.Abstractions/IResponseCookies.cs similarity index 95% rename from src/Microsoft.AspNet.Abstractions/IResponseCookiesCollection.cs rename to src/Microsoft.AspNet.Abstractions/IResponseCookies.cs index 8e38bb92dd..4358ad69ce 100644 --- a/src/Microsoft.AspNet.Abstractions/IResponseCookiesCollection.cs +++ b/src/Microsoft.AspNet.Abstractions/IResponseCookies.cs @@ -4,7 +4,7 @@ namespace Microsoft.AspNet.Abstractions /// /// A wrapper for the response Set-Cookie header /// - public interface IResponseCookiesCollection + public interface IResponseCookies { /// /// Add a new cookie and value diff --git a/src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookiesCollection.cs b/src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookies.cs similarity index 97% rename from src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookiesCollection.cs rename to src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookies.cs index 7d7189ff7f..9963a7373f 100644 --- a/src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookiesCollection.cs +++ b/src/Microsoft.AspNet.PipelineCore/Collections/ResponseCookies.cs @@ -10,13 +10,13 @@ namespace Microsoft.AspNet.PipelineCore.Collections /// /// A wrapper for the response Set-Cookie header /// - public class ResponseCookiesCollection : IResponseCookiesCollection + public class ResponseCookies : IResponseCookies { /// /// Create a new wrapper /// /// - public ResponseCookiesCollection(IHeaderDictionary headers) + public ResponseCookies(IHeaderDictionary headers) { if (headers == null) { diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasResponseCookies.cs b/src/Microsoft.AspNet.PipelineCore/DefaultCanHasResponseCookies.cs index c0b51b27cb..b695832694 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasResponseCookies.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultCanHasResponseCookies.cs @@ -10,21 +10,21 @@ namespace Microsoft.AspNet.PipelineCore { private readonly IFeatureCollection _features; private readonly FeatureReference _request = FeatureReference.Default; - private IResponseCookiesCollection _cookiesCollection; + private IResponseCookies _cookiesCollection; public DefaultCanHasResponseCookies(IFeatureCollection features) { _features = features; } - public IResponseCookiesCollection Cookies + public IResponseCookies Cookies { get { if (_cookiesCollection == null) { var headers = _request.Fetch(_features).Headers; - _cookiesCollection = new ResponseCookiesCollection(new HeaderDictionary(headers)); + _cookiesCollection = new ResponseCookies(new HeaderDictionary(headers)); } return _cookiesCollection; diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs index 7f1fc3229a..f1f57ff4a1 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs @@ -86,7 +86,7 @@ namespace Microsoft.AspNet.PipelineCore } } - public override IResponseCookiesCollection Cookies + public override IResponseCookies Cookies { get { return CanHasResponseCookies.Cookies; } } diff --git a/src/Microsoft.AspNet.PipelineCore/ICanHasResponseCookies.cs b/src/Microsoft.AspNet.PipelineCore/ICanHasResponseCookies.cs index 23c73d4d2a..87f0ecc87e 100644 --- a/src/Microsoft.AspNet.PipelineCore/ICanHasResponseCookies.cs +++ b/src/Microsoft.AspNet.PipelineCore/ICanHasResponseCookies.cs @@ -5,6 +5,6 @@ namespace Microsoft.AspNet.PipelineCore { public interface ICanHasResponseCookies { - IResponseCookiesCollection Cookies { get; } + IResponseCookies Cookies { get; } } } \ No newline at end of file