diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpApplicationInformation.cs b/src/Microsoft.AspNet.HttpFeature/IHttpApplicationFeature.cs similarity index 95% rename from src/Microsoft.AspNet.HttpFeature/IHttpApplicationInformation.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpApplicationFeature.cs index 23292385c1..218b8732f6 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpApplicationInformation.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpApplicationFeature.cs @@ -21,7 +21,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpApplicationInformation + public interface IHttpApplicationFeature { string AppName { get; set; } string AppMode { get; set; } diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpBuffering.cs b/src/Microsoft.AspNet.HttpFeature/IHttpBufferingFeature.cs similarity index 95% rename from src/Microsoft.AspNet.HttpFeature/IHttpBuffering.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpBufferingFeature.cs index 815eeb7740..84c9f5b885 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpBuffering.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpBufferingFeature.cs @@ -20,7 +20,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpBuffering + public interface IHttpBufferingFeature { void DisableRequestBuffering(); void DisableResponseBuffering(); diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpConnection.cs b/src/Microsoft.AspNet.HttpFeature/IHttpConnectionFeature.cs similarity index 95% rename from src/Microsoft.AspNet.HttpFeature/IHttpConnection.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpConnectionFeature.cs index 6678d7ca62..1cb3cc12fa 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpConnection.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpConnectionFeature.cs @@ -21,7 +21,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpConnection + public interface IHttpConnectionFeature { IPAddress RemoteIpAddress { get; set; } IPAddress LocalIpAddress { get; set; } diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpRequestInformation.cs b/src/Microsoft.AspNet.HttpFeature/IHttpRequestFeature.cs similarity index 89% rename from src/Microsoft.AspNet.HttpFeature/IHttpRequestInformation.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpRequestFeature.cs index dbeaa70c48..cad2c7ccf0 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpRequestInformation.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpRequestFeature.cs @@ -23,7 +23,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpRequestInformation + public interface IHttpRequestFeature { string Protocol { get; set; } string Scheme { get; set; } @@ -33,11 +33,5 @@ namespace Microsoft.AspNet.HttpFeature string QueryString { get; set; } IDictionary Headers { get; set; } Stream Body { get; set; } - // FURI: Uri Uri { get; } - } - - public interface ICanHasSession - { - } } diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetime.cs b/src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetimeFeature.cs similarity index 94% rename from src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetime.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetimeFeature.cs index 8a242f4033..19956ea09f 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetime.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpRequestLifetimeFeature.cs @@ -21,7 +21,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpRequestLifetime + public interface IHttpRequestLifetimeFeature { CancellationToken OnRequestAborted { get; } void Abort(); diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpResponseInformation.cs b/src/Microsoft.AspNet.HttpFeature/IHttpResponseFeature.cs similarity index 96% rename from src/Microsoft.AspNet.HttpFeature/IHttpResponseInformation.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpResponseFeature.cs index 282fed1705..afd1cdebca 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpResponseInformation.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpResponseFeature.cs @@ -23,7 +23,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpResponseInformation + public interface IHttpResponseFeature { int StatusCode { get; set; } string ReasonPhrase { get; set; } diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpSendFile.cs b/src/Microsoft.AspNet.HttpFeature/IHttpSendFileFeature.cs similarity index 95% rename from src/Microsoft.AspNet.HttpFeature/IHttpSendFile.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpSendFileFeature.cs index 2b59f99714..f53ca06c07 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpSendFile.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpSendFileFeature.cs @@ -22,7 +22,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpSendFile + public interface IHttpSendFileFeature { Task SendFileAsync(string path, long offset, long? length, CancellationToken cancellation); } diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurity.cs b/src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurityFeature.cs similarity index 94% rename from src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurity.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurityFeature.cs index ace42ab0ea..8e7f9a5f1b 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurity.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpTransportLayerSecurityFeature.cs @@ -22,7 +22,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpTransportLayerSecurity + public interface IHttpTransportLayerSecurityFeature { X509Certificate ClientCertificate { get; set; } Task LoadAsync(); diff --git a/src/Microsoft.AspNet.HttpFeature/IHttpWebSocketAccept.cs b/src/Microsoft.AspNet.HttpFeature/IHttpWebSocketFeature.cs similarity index 95% rename from src/Microsoft.AspNet.HttpFeature/IHttpWebSocketAccept.cs rename to src/Microsoft.AspNet.HttpFeature/IHttpWebSocketFeature.cs index d13021e330..8b2013652f 100644 --- a/src/Microsoft.AspNet.HttpFeature/IHttpWebSocketAccept.cs +++ b/src/Microsoft.AspNet.HttpFeature/IHttpWebSocketFeature.cs @@ -23,7 +23,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature { [AssemblyNeutral] - public interface IHttpWebSocketAccept + public interface IHttpWebSocketFeature { bool IsWebSocketRequest { get; set; } Task AcceptAsync(); diff --git a/src/Microsoft.AspNet.HttpFeature/Microsoft.AspNet.HttpFeature.kproj b/src/Microsoft.AspNet.HttpFeature/Microsoft.AspNet.HttpFeature.kproj index 96973626c9..2fef2807ae 100644 --- a/src/Microsoft.AspNet.HttpFeature/Microsoft.AspNet.HttpFeature.kproj +++ b/src/Microsoft.AspNet.HttpFeature/Microsoft.AspNet.HttpFeature.kproj @@ -20,20 +20,21 @@ - - - - - - - - - + + + + + + + + + + - + diff --git a/src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthentication.cs b/src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthenticationFeature.cs similarity index 95% rename from src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthentication.cs rename to src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthenticationFeature.cs index e3eefb18a2..b18bd0ea3f 100644 --- a/src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthentication.cs +++ b/src/Microsoft.AspNet.HttpFeature/Security/IHttpAuthenticationFeature.cs @@ -21,7 +21,7 @@ using Microsoft.Net.Runtime; namespace Microsoft.AspNet.HttpFeature.Security { [AssemblyNeutral] - public interface IHttpAuthentication + public interface IHttpAuthenticationFeature { ClaimsPrincipal User { get; set; } IAuthenticationHandler Handler { get; set; } diff --git a/src/Microsoft.AspNet.Owin/ICanHasOwinEnvironment.cs b/src/Microsoft.AspNet.Owin/IOwinEnvironmentFeature.cs similarity index 94% rename from src/Microsoft.AspNet.Owin/ICanHasOwinEnvironment.cs rename to src/Microsoft.AspNet.Owin/IOwinEnvironmentFeature.cs index 45aa526a84..45455159e3 100644 --- a/src/Microsoft.AspNet.Owin/ICanHasOwinEnvironment.cs +++ b/src/Microsoft.AspNet.Owin/IOwinEnvironmentFeature.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; namespace Microsoft.AspNet.Owin { - public interface ICanHasOwinEnvironment + public interface IOwinEnvironmentFeature { IDictionary Environment { get; set; } } diff --git a/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.kproj b/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.kproj index 210e9491a3..37d5045224 100644 --- a/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.kproj +++ b/src/Microsoft.AspNet.Owin/Microsoft.AspNet.Owin.kproj @@ -20,7 +20,7 @@ - + diff --git a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs index 15119e747d..5ad850ead3 100644 --- a/src/Microsoft.AspNet.Owin/OwinEnvironment.cs +++ b/src/Microsoft.AspNet.Owin/OwinEnvironment.cs @@ -42,41 +42,41 @@ namespace Microsoft.AspNet.Owin _context = context; _entries = new Dictionary() { - { OwinConstants.RequestProtocol, new FeatureMap(feature => feature.Protocol, (feature, value) => feature.Protocol = Convert.ToString(value)) }, - { OwinConstants.RequestScheme, new FeatureMap(feature => feature.Scheme, (feature, value) => feature.Scheme = Convert.ToString(value)) }, - { OwinConstants.RequestMethod, new FeatureMap(feature => feature.Method, (feature, value) => feature.Method = Convert.ToString(value)) }, - { OwinConstants.RequestPathBase, new FeatureMap(feature => feature.PathBase, (feature, value) => feature.PathBase = Convert.ToString(value)) }, - { OwinConstants.RequestPath, new FeatureMap(feature => feature.Path, (feature, value) => feature.Path = Convert.ToString(value)) }, - { OwinConstants.RequestQueryString, new FeatureMap(feature => feature.QueryString, (feature, value) => feature.QueryString = Convert.ToString(value)) }, - { OwinConstants.RequestHeaders, new FeatureMap(feature => feature.Headers, (feature, value) => feature.Headers = (IDictionary)value) }, - { OwinConstants.RequestBody, new FeatureMap(feature => feature.Body, (feature, value) => feature.Body = (Stream)value) }, + { OwinConstants.RequestProtocol, new FeatureMap(feature => feature.Protocol, (feature, value) => feature.Protocol = Convert.ToString(value)) }, + { OwinConstants.RequestScheme, new FeatureMap(feature => feature.Scheme, (feature, value) => feature.Scheme = Convert.ToString(value)) }, + { OwinConstants.RequestMethod, new FeatureMap(feature => feature.Method, (feature, value) => feature.Method = Convert.ToString(value)) }, + { OwinConstants.RequestPathBase, new FeatureMap(feature => feature.PathBase, (feature, value) => feature.PathBase = Convert.ToString(value)) }, + { OwinConstants.RequestPath, new FeatureMap(feature => feature.Path, (feature, value) => feature.Path = Convert.ToString(value)) }, + { OwinConstants.RequestQueryString, new FeatureMap(feature => feature.QueryString, (feature, value) => feature.QueryString = Convert.ToString(value)) }, + { OwinConstants.RequestHeaders, new FeatureMap(feature => feature.Headers, (feature, value) => feature.Headers = (IDictionary)value) }, + { OwinConstants.RequestBody, new FeatureMap(feature => feature.Body, (feature, value) => feature.Body = (Stream)value) }, - { OwinConstants.ResponseStatusCode, new FeatureMap(feature => feature.StatusCode, (feature, value) => feature.StatusCode = Convert.ToInt32(value)) }, - { OwinConstants.ResponseReasonPhrase, new FeatureMap(feature => feature.ReasonPhrase, (feature, value) => feature.ReasonPhrase = Convert.ToString(value)) }, - { OwinConstants.ResponseHeaders, new FeatureMap(feature => feature.Headers, (feature, value) => feature.Headers = (IDictionary)value) }, - { OwinConstants.ResponseBody, new FeatureMap(feature => feature.Body, (feature, value) => feature.Body = (Stream)value) }, - { OwinConstants.CommonKeys.OnSendingHeaders, new FeatureMap(feature => new Action, object>(feature.OnSendingHeaders)) }, + { OwinConstants.ResponseStatusCode, new FeatureMap(feature => feature.StatusCode, (feature, value) => feature.StatusCode = Convert.ToInt32(value)) }, + { OwinConstants.ResponseReasonPhrase, new FeatureMap(feature => feature.ReasonPhrase, (feature, value) => feature.ReasonPhrase = Convert.ToString(value)) }, + { OwinConstants.ResponseHeaders, new FeatureMap(feature => feature.Headers, (feature, value) => feature.Headers = (IDictionary)value) }, + { OwinConstants.ResponseBody, new FeatureMap(feature => feature.Body, (feature, value) => feature.Body = (Stream)value) }, + { OwinConstants.CommonKeys.OnSendingHeaders, new FeatureMap(feature => new Action, object>(feature.OnSendingHeaders)) }, - { OwinConstants.CommonKeys.LocalPort, new FeatureMap(feature => feature.LocalPort.ToString(CultureInfo.InvariantCulture), + { OwinConstants.CommonKeys.LocalPort, new FeatureMap(feature => feature.LocalPort.ToString(CultureInfo.InvariantCulture), (feature, value) => feature.LocalPort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) }, - { OwinConstants.CommonKeys.RemotePort, new FeatureMap(feature => feature.RemotePort.ToString(CultureInfo.InvariantCulture), + { OwinConstants.CommonKeys.RemotePort, new FeatureMap(feature => feature.RemotePort.ToString(CultureInfo.InvariantCulture), (feature, value) => feature.RemotePort = Convert.ToInt32(value, CultureInfo.InvariantCulture)) }, - { OwinConstants.CommonKeys.LocalIpAddress, new FeatureMap(feature => feature.LocalIpAddress.ToString(), + { OwinConstants.CommonKeys.LocalIpAddress, new FeatureMap(feature => feature.LocalIpAddress.ToString(), (feature, value) => feature.LocalIpAddress = IPAddress.Parse(Convert.ToString(value))) }, - { OwinConstants.CommonKeys.RemoteIpAddress, new FeatureMap(feature => feature.RemoteIpAddress.ToString(), + { OwinConstants.CommonKeys.RemoteIpAddress, new FeatureMap(feature => feature.RemoteIpAddress.ToString(), (feature, value) => feature.RemoteIpAddress = IPAddress.Parse(Convert.ToString(value))) }, - { OwinConstants.CommonKeys.IsLocal, new FeatureMap(feature => feature.IsLocal, (feature, value) => feature.IsLocal = Convert.ToBoolean(value)) }, + { OwinConstants.CommonKeys.IsLocal, new FeatureMap(feature => feature.IsLocal, (feature, value) => feature.IsLocal = Convert.ToBoolean(value)) }, - { OwinConstants.SendFiles.SendAsync, new FeatureMap(feature => new SendFileFunc(feature.SendFileAsync)) }, + { OwinConstants.SendFiles.SendAsync, new FeatureMap(feature => new SendFileFunc(feature.SendFileAsync)) }, }; if (context.Request.IsSecure) { - _entries.Add(OwinConstants.CommonKeys.ClientCertificate, new FeatureMap(feature => feature.ClientCertificate, + _entries.Add(OwinConstants.CommonKeys.ClientCertificate, new FeatureMap(feature => feature.ClientCertificate, (feature, value) => feature.ClientCertificate = (X509Certificate)value)); - _entries.Add(OwinConstants.CommonKeys.LoadClientCertAsync, new FeatureMap(feature => new Func(feature.LoadAsync))); + _entries.Add(OwinConstants.CommonKeys.LoadClientCertAsync, new FeatureMap(feature => new Func(feature.LoadAsync))); } _context.Items[typeof(HttpContext).FullName] = _context; // Store for lookup when we transition back out of OWIN diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNet.Owin/OwinExtensions.cs index 05078d6c8e..4a4d80d177 100644 --- a/src/Microsoft.AspNet.Owin/OwinExtensions.cs +++ b/src/Microsoft.AspNet.Owin/OwinExtensions.cs @@ -83,7 +83,7 @@ namespace Microsoft.AspNet { var app = middleware(httpContext => { - return next(httpContext.GetFeature().Environment); + return next(httpContext.GetFeature().Environment); }); return env => diff --git a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs index be06f137d8..4c6483ffcb 100644 --- a/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs +++ b/src/Microsoft.AspNet.Owin/OwinFeatureCollection.cs @@ -34,12 +34,12 @@ namespace Microsoft.AspNet.Owin public class OwinFeatureCollection : IFeatureCollection, - IHttpRequestInformation, - IHttpResponseInformation, - IHttpConnection, - IHttpSendFile, - IHttpTransportLayerSecurity, - ICanHasOwinEnvironment + IHttpRequestFeature, + IHttpResponseFeature, + IHttpConnectionFeature, + IHttpSendFileFeature, + IHttpTransportLayerSecurityFeature, + IOwinEnvironmentFeature { public IDictionary Environment { get; set; } @@ -63,79 +63,79 @@ namespace Microsoft.AspNet.Owin Environment[key] = value; } - string IHttpRequestInformation.Protocol + string IHttpRequestFeature.Protocol { get { return Prop(OwinConstants.RequestProtocol); } set { Prop(OwinConstants.RequestProtocol, value); } } - string IHttpRequestInformation.Scheme + string IHttpRequestFeature.Scheme { get { return Prop(OwinConstants.RequestScheme); } set { Prop(OwinConstants.RequestScheme, value); } } - string IHttpRequestInformation.Method + string IHttpRequestFeature.Method { get { return Prop(OwinConstants.RequestMethod); } set { Prop(OwinConstants.RequestMethod, value); } } - string IHttpRequestInformation.PathBase + string IHttpRequestFeature.PathBase { get { return Prop(OwinConstants.RequestPathBase); } set { Prop(OwinConstants.RequestPathBase, value); } } - string IHttpRequestInformation.Path + string IHttpRequestFeature.Path { get { return Prop(OwinConstants.RequestPath); } set { Prop(OwinConstants.RequestPath, value); } } - string IHttpRequestInformation.QueryString + string IHttpRequestFeature.QueryString { get { return Prop(OwinConstants.RequestQueryString); } set { Prop(OwinConstants.RequestQueryString, value); } } - IDictionary IHttpRequestInformation.Headers + IDictionary IHttpRequestFeature.Headers { get { return Prop>(OwinConstants.RequestHeaders); } set { Prop(OwinConstants.RequestHeaders, value); } } - Stream IHttpRequestInformation.Body + Stream IHttpRequestFeature.Body { get { return Prop(OwinConstants.RequestBody); } set { Prop(OwinConstants.RequestBody, value); } } - int IHttpResponseInformation.StatusCode + int IHttpResponseFeature.StatusCode { get { return Prop(OwinConstants.ResponseStatusCode); } set { Prop(OwinConstants.ResponseStatusCode, value); } } - string IHttpResponseInformation.ReasonPhrase + string IHttpResponseFeature.ReasonPhrase { get { return Prop(OwinConstants.ResponseReasonPhrase); } set { Prop(OwinConstants.ResponseReasonPhrase, value); } } - IDictionary IHttpResponseInformation.Headers + IDictionary IHttpResponseFeature.Headers { get { return Prop>(OwinConstants.ResponseHeaders); } set { Prop(OwinConstants.ResponseHeaders, value); } } - Stream IHttpResponseInformation.Body + Stream IHttpResponseFeature.Body { get { return Prop(OwinConstants.ResponseBody); } set { Prop(OwinConstants.ResponseBody, value); } } - void IHttpResponseInformation.OnSendingHeaders(Action callback, object state) + void IHttpResponseFeature.OnSendingHeaders(Action callback, object state) { var register = Prop, object>>(OwinConstants.CommonKeys.OnSendingHeaders); if (register == null) @@ -145,31 +145,31 @@ namespace Microsoft.AspNet.Owin register(callback, state); } - IPAddress IHttpConnection.RemoteIpAddress + IPAddress IHttpConnectionFeature.RemoteIpAddress { get { return IPAddress.Parse(Prop(OwinConstants.CommonKeys.RemoteIpAddress)); } set { Prop(OwinConstants.CommonKeys.RemoteIpAddress, value.ToString()); } } - IPAddress IHttpConnection.LocalIpAddress + IPAddress IHttpConnectionFeature.LocalIpAddress { get { return IPAddress.Parse(Prop(OwinConstants.CommonKeys.LocalIpAddress)); } set { Prop(OwinConstants.CommonKeys.LocalIpAddress, value.ToString()); } } - int IHttpConnection.RemotePort + int IHttpConnectionFeature.RemotePort { get { return int.Parse(Prop(OwinConstants.CommonKeys.RemotePort)); } set { Prop(OwinConstants.CommonKeys.RemotePort, value.ToString(CultureInfo.InvariantCulture)); } } - int IHttpConnection.LocalPort + int IHttpConnectionFeature.LocalPort { get { return int.Parse(Prop(OwinConstants.CommonKeys.LocalPort)); } set { Prop(OwinConstants.CommonKeys.LocalPort, value.ToString(CultureInfo.InvariantCulture)); } } - bool IHttpConnection.IsLocal + bool IHttpConnectionFeature.IsLocal { get { return Prop(OwinConstants.CommonKeys.IsLocal); } set { Prop(OwinConstants.CommonKeys.LocalPort, value); } @@ -184,7 +184,7 @@ namespace Microsoft.AspNet.Owin } } - Task IHttpSendFile.SendFileAsync(string path, long offset, long? length, CancellationToken cancellation) + Task IHttpSendFileFeature.SendFileAsync(string path, long offset, long? length, CancellationToken cancellation) { object obj; if (Environment.TryGetValue(OwinConstants.SendFiles.SendAsync, out obj)) @@ -200,7 +200,7 @@ namespace Microsoft.AspNet.Owin get { object obj; - if (string.Equals("https", ((IHttpRequestInformation)this).Scheme, StringComparison.OrdinalIgnoreCase) + if (string.Equals("https", ((IHttpRequestFeature)this).Scheme, StringComparison.OrdinalIgnoreCase) && (Environment.TryGetValue(OwinConstants.CommonKeys.LoadClientCertAsync, out obj) || Environment.TryGetValue(OwinConstants.CommonKeys.ClientCertificate, out obj)) && obj != null) @@ -211,13 +211,13 @@ namespace Microsoft.AspNet.Owin } } - X509Certificate IHttpTransportLayerSecurity.ClientCertificate + X509Certificate IHttpTransportLayerSecurityFeature.ClientCertificate { get { return Prop(OwinConstants.CommonKeys.ClientCertificate); } set { Prop(OwinConstants.CommonKeys.ClientCertificate, value); } } - Task IHttpTransportLayerSecurity.LoadAsync() + Task IHttpTransportLayerSecurityFeature.LoadAsync() { throw new NotImplementedException(); } @@ -238,11 +238,11 @@ namespace Microsoft.AspNet.Owin if (key.GetTypeInfo().IsAssignableFrom(this.GetType().GetTypeInfo())) { // Check for conditional features - if (key == typeof(IHttpSendFile)) + if (key == typeof(IHttpSendFileFeature)) { return SupportsSendFile; } - else if (key == typeof(IHttpTransportLayerSecurity)) + else if (key == typeof(IHttpTransportLayerSecurityFeature)) { return SupportsClientCerts; } @@ -259,18 +259,18 @@ namespace Microsoft.AspNet.Owin { var keys = new List() { - typeof(IHttpRequestInformation), - typeof(IHttpResponseInformation), - typeof(IHttpConnection), - typeof(ICanHasOwinEnvironment), + typeof(IHttpRequestFeature), + typeof(IHttpResponseFeature), + typeof(IHttpConnectionFeature), + typeof(IOwinEnvironmentFeature), }; if (SupportsSendFile) { - keys.Add(typeof(IHttpSendFile)); + keys.Add(typeof(IHttpSendFileFeature)); } if (SupportsClientCerts) { - keys.Add(typeof(IHttpTransportLayerSecurity)); + keys.Add(typeof(IHttpTransportLayerSecurityFeature)); } return keys; } diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs index 1913a4fa07..ad4f3902a9 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpContext.cs @@ -36,10 +36,10 @@ namespace Microsoft.AspNet.PipelineCore private readonly HttpRequest _request; private readonly HttpResponse _response; - private FeatureReference _canHasItems; - private FeatureReference _canHasServiceProviders; - private FeatureReference _authentication; - private FeatureReference _lifetime; + private FeatureReference _items; + private FeatureReference _serviceProviders; + private FeatureReference _authentication; + private FeatureReference _lifetime; private IFeatureCollection _features; public DefaultHttpContext(IFeatureCollection features) @@ -48,27 +48,27 @@ namespace Microsoft.AspNet.PipelineCore _request = new DefaultHttpRequest(this, features); _response = new DefaultHttpResponse(this, features); - _canHasItems = FeatureReference.Default; - _canHasServiceProviders = FeatureReference.Default; - _authentication = FeatureReference.Default; + _items = FeatureReference.Default; + _serviceProviders = FeatureReference.Default; + _authentication = FeatureReference.Default; } - ICanHasItems CanHasItems + IItemsFeature ItemsFeature { - get { return _canHasItems.Fetch(_features) ?? _canHasItems.Update(_features, new DefaultCanHasItems()); } + get { return _items.Fetch(_features) ?? _items.Update(_features, new ItemsFeature()); } } - ICanHasServiceProviders CanHasServiceProviders + IServiceProvidersFeature ServiceProvidersFeature { - get { return _canHasServiceProviders.Fetch(_features) ?? _canHasServiceProviders.Update(_features, new DefaultCanHasServiceProviders()); } + get { return _serviceProviders.Fetch(_features) ?? _serviceProviders.Update(_features, new ServiceProvidersFeature()); } } - private IHttpAuthentication HttpAuthentication + private IHttpAuthenticationFeature HttpAuthenticationFeature { - get { return _authentication.Fetch(_features) ?? _authentication.Update(_features, new DefaultHttpAuthentication()); } + get { return _authentication.Fetch(_features) ?? _authentication.Update(_features, new HttpAuthenticationFeature()); } } - private IHttpRequestLifetime Lifetime + private IHttpRequestLifetimeFeature LifetimeFeature { get { return _lifetime.Fetch(_features); } } @@ -81,32 +81,32 @@ namespace Microsoft.AspNet.PipelineCore { get { - var user = HttpAuthentication.User; + var user = HttpAuthenticationFeature.User; if (user == null) { user = new ClaimsPrincipal(new ClaimsIdentity()); - HttpAuthentication.User = user; + HttpAuthenticationFeature.User = user; } return user; } - set { HttpAuthentication.User = value; } + set { HttpAuthenticationFeature.User = value; } } public override IDictionary Items { - get { return CanHasItems.Items; } + get { return ItemsFeature.Items; } } public override IServiceProvider ApplicationServices { - get { return CanHasServiceProviders.ApplicationServices; } - set { CanHasServiceProviders.ApplicationServices = value; } + get { return ServiceProvidersFeature.ApplicationServices; } + set { ServiceProvidersFeature.ApplicationServices = value; } } public override IServiceProvider RequestServices { - get { return CanHasServiceProviders.RequestServices; } - set { CanHasServiceProviders.RequestServices = value; } + get { return ServiceProvidersFeature.RequestServices; } + set { ServiceProvidersFeature.RequestServices = value; } } public int Revision { get { return _features.Revision; } } @@ -115,7 +115,7 @@ namespace Microsoft.AspNet.PipelineCore { get { - var lifetime = Lifetime; + var lifetime = LifetimeFeature; if (lifetime != null) { return lifetime.OnRequestAborted; @@ -126,7 +126,7 @@ namespace Microsoft.AspNet.PipelineCore public override void Abort() { - var lifetime = Lifetime; + var lifetime = LifetimeFeature; if (lifetime != null) { lifetime.Abort(); @@ -152,7 +152,7 @@ namespace Microsoft.AspNet.PipelineCore public override IEnumerable GetAuthenticationTypes() { - var handler = HttpAuthentication.Handler; + var handler = HttpAuthenticationFeature.Handler; if (handler == null) { return new AuthenticationDescription[0]; @@ -169,7 +169,7 @@ namespace Microsoft.AspNet.PipelineCore { throw new ArgumentNullException(); } - var handler = HttpAuthentication.Handler; + var handler = HttpAuthenticationFeature.Handler; var authenticateContext = new AuthenticateContext(authenticationTypes); if (handler != null) @@ -193,7 +193,7 @@ namespace Microsoft.AspNet.PipelineCore { throw new ArgumentNullException(); } - var handler = HttpAuthentication.Handler; + var handler = HttpAuthenticationFeature.Handler; var authenticateContext = new AuthenticateContext(authenticationTypes); if (handler != null) diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs index f9bd84289b..602f6bebfb 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpRequest.cs @@ -34,12 +34,12 @@ namespace Microsoft.AspNet.PipelineCore private readonly DefaultHttpContext _context; private readonly IFeatureCollection _features; - private FeatureReference _request = FeatureReference.Default; - private FeatureReference _connection = FeatureReference.Default; - private FeatureReference _transportLayerSecurity = FeatureReference.Default; - private FeatureReference _canHasQuery = FeatureReference.Default; - private FeatureReference _canHasForm = FeatureReference.Default; - private FeatureReference _canHasCookies = FeatureReference.Default; + private FeatureReference _request = FeatureReference.Default; + private FeatureReference _connection = FeatureReference.Default; + private FeatureReference _transportLayerSecurity = FeatureReference.Default; + private FeatureReference _query = FeatureReference.Default; + private FeatureReference _form = FeatureReference.Default; + private FeatureReference _cookies = FeatureReference.Default; public DefaultHttpRequest(DefaultHttpContext context, IFeatureCollection features) { @@ -47,54 +47,54 @@ namespace Microsoft.AspNet.PipelineCore _features = features; } - private IHttpRequestInformation HttpRequestInformation + private IHttpRequestFeature HttpRequestFeature { get { return _request.Fetch(_features); } } - private IHttpConnection HttpConnection + private IHttpConnectionFeature HttpConnectionFeature { get { return _connection.Fetch(_features); } } - private IHttpTransportLayerSecurity HttpTransportLayerSecurity + private IHttpTransportLayerSecurityFeature HttpTransportLayerSecurityFeature { get { return _transportLayerSecurity.Fetch(_features); } } - private ICanHasQuery CanHasQuery + private IQueryFeature QueryFeature { - get { return _canHasQuery.Fetch(_features) ?? _canHasQuery.Update(_features, new DefaultCanHasQuery(_features)); } + get { return _query.Fetch(_features) ?? _query.Update(_features, new QueryFeature(_features)); } } - private ICanHasForm CanHasForm + private IFormFeature FormFeature { - get { return _canHasForm.Fetch(_features) ?? _canHasForm.Update(_features, new DefaultCanHasForm(_features)); } + get { return _form.Fetch(_features) ?? _form.Update(_features, new FormFeature(_features)); } } - private ICanHasRequestCookies CanHasRequestCookies + private IRequestCookiesFeature RequestCookiesFeature { - get { return _canHasCookies.Fetch(_features) ?? _canHasCookies.Update(_features, new DefaultCanHasRequestCookies(_features)); } + get { return _cookies.Fetch(_features) ?? _cookies.Update(_features, new RequestCookiesFeature(_features)); } } public override HttpContext HttpContext { get { return _context; } } public override PathString PathBase { - get { return new PathString(HttpRequestInformation.PathBase); } - set { HttpRequestInformation.PathBase = value.Value; } + get { return new PathString(HttpRequestFeature.PathBase); } + set { HttpRequestFeature.PathBase = value.Value; } } public override PathString Path { - get { return new PathString(HttpRequestInformation.Path); } - set { HttpRequestInformation.Path = value.Value; } + get { return new PathString(HttpRequestFeature.Path); } + set { HttpRequestFeature.Path = value.Value; } } public override QueryString QueryString { - get { return new QueryString(HttpRequestInformation.QueryString); } - set { HttpRequestInformation.QueryString = value.Value; } + get { return new QueryString(HttpRequestFeature.QueryString); } + set { HttpRequestFeature.QueryString = value.Value; } } public override long? ContentLength @@ -111,20 +111,20 @@ namespace Microsoft.AspNet.PipelineCore public override Stream Body { - get { return HttpRequestInformation.Body; } - set { HttpRequestInformation.Body = value; } + get { return HttpRequestFeature.Body; } + set { HttpRequestFeature.Body = value; } } public override string Method { - get { return HttpRequestInformation.Method; } - set { HttpRequestInformation.Method = value; } + get { return HttpRequestFeature.Method; } + set { HttpRequestFeature.Method = value; } } public override string Scheme { - get { return HttpRequestInformation.Scheme; } - set { HttpRequestInformation.Scheme = value; } + get { return HttpRequestFeature.Scheme; } + set { HttpRequestFeature.Scheme = value; } } public override bool IsSecure @@ -140,28 +140,28 @@ namespace Microsoft.AspNet.PipelineCore public override IReadableStringCollection Query { - get { return CanHasQuery.Query; } + get { return QueryFeature.Query; } } public override Task GetFormAsync() { - return CanHasForm.GetFormAsync(); + return FormFeature.GetFormAsync(); } public override string Protocol { - get { return HttpRequestInformation.Protocol; } - set { HttpRequestInformation.Protocol = value; } + get { return HttpRequestFeature.Protocol; } + set { HttpRequestFeature.Protocol = value; } } public override IHeaderDictionary Headers { - get { return new HeaderDictionary(HttpRequestInformation.Headers); } + get { return new HeaderDictionary(HttpRequestFeature.Headers); } } public override IReadableStringCollection Cookies { - get { return CanHasRequestCookies.Cookies; } + get { return RequestCookiesFeature.Cookies; } } public override System.Threading.CancellationToken CallCanceled diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs b/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs index bb125bd88e..7075b69663 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs +++ b/src/Microsoft.AspNet.PipelineCore/DefaultHttpResponse.cs @@ -38,9 +38,9 @@ namespace Microsoft.AspNet.PipelineCore { private readonly DefaultHttpContext _context; private readonly IFeatureCollection _features; - private FeatureReference _response = FeatureReference.Default; - private FeatureReference _canHasCookies = FeatureReference.Default; - private FeatureReference _authentication = FeatureReference.Default; + private FeatureReference _response = FeatureReference.Default; + private FeatureReference _cookies = FeatureReference.Default; + private FeatureReference _authentication = FeatureReference.Default; public DefaultHttpResponse(DefaultHttpContext context, IFeatureCollection features) { @@ -48,38 +48,38 @@ namespace Microsoft.AspNet.PipelineCore _features = features; } - private IHttpResponseInformation HttpResponseInformation + private IHttpResponseFeature HttpResponseFeature { get { return _response.Fetch(_features); } } - private ICanHasResponseCookies CanHasResponseCookies + private IResponseCookiesFeature ResponseCookiesFeature { - get { return _canHasCookies.Fetch(_features) ?? _canHasCookies.Update(_features, new DefaultCanHasResponseCookies(_features)); } + get { return _cookies.Fetch(_features) ?? _cookies.Update(_features, new ResponseCookiesFeature(_features)); } } - private IHttpAuthentication HttpAuthentication + private IHttpAuthenticationFeature HttpAuthenticationFeature { - get { return _authentication.Fetch(_features) ?? _authentication.Update(_features, new DefaultHttpAuthentication()); } + get { return _authentication.Fetch(_features) ?? _authentication.Update(_features, new HttpAuthenticationFeature()); } } public override HttpContext HttpContext { get { return _context; } } public override int StatusCode { - get { return HttpResponseInformation.StatusCode; } - set { HttpResponseInformation.StatusCode = value; } + get { return HttpResponseFeature.StatusCode; } + set { HttpResponseFeature.StatusCode = value; } } public override IHeaderDictionary Headers { - get { return new HeaderDictionary(HttpResponseInformation.Headers); } + get { return new HeaderDictionary(HttpResponseFeature.Headers); } } public override Stream Body { - get { return HttpResponseInformation.Body; } - set { HttpResponseInformation.Body = value; } + get { return HttpResponseFeature.Body; } + set { HttpResponseFeature.Body = value; } } public override long? ContentLength @@ -105,34 +105,34 @@ namespace Microsoft.AspNet.PipelineCore { if (string.IsNullOrWhiteSpace(value)) { - HttpResponseInformation.Headers.Remove(Constants.Headers.ContentType); + HttpResponseFeature.Headers.Remove(Constants.Headers.ContentType); } else { - HttpResponseInformation.Headers[Constants.Headers.ContentType] = new[] { value }; + HttpResponseFeature.Headers[Constants.Headers.ContentType] = new[] { value }; } } } public override IResponseCookies Cookies { - get { return CanHasResponseCookies.Cookies; } + get { return ResponseCookiesFeature.Cookies; } } public override void OnSendingHeaders(Action callback, object state) { - HttpResponseInformation.OnSendingHeaders(callback, state); + HttpResponseFeature.OnSendingHeaders(callback, state); } public override void Redirect(string location, bool permanent) { if (permanent) { - HttpResponseInformation.StatusCode = 301; + HttpResponseFeature.StatusCode = 301; } else { - HttpResponseInformation.StatusCode = 302; + HttpResponseFeature.StatusCode = 302; } Headers.Set(Constants.Headers.Location, location); @@ -150,8 +150,8 @@ namespace Microsoft.AspNet.PipelineCore { throw new ArgumentNullException(); } - HttpResponseInformation.StatusCode = 401; - var handler = HttpAuthentication.Handler; + HttpResponseFeature.StatusCode = 401; + var handler = HttpAuthenticationFeature.Handler; var challengeContext = new ChallengeContext(authenticationTypes, properties == null ? null : properties.Dictionary); if (handler != null) @@ -173,7 +173,7 @@ namespace Microsoft.AspNet.PipelineCore { throw new ArgumentNullException(); } - var handler = HttpAuthentication.Handler; + var handler = HttpAuthenticationFeature.Handler; var signInContext = new SignInContext(identities, properties == null ? null : properties.Dictionary); if (handler != null) @@ -195,7 +195,7 @@ namespace Microsoft.AspNet.PipelineCore { throw new ArgumentNullException(); } - var handler = HttpAuthentication.Handler; + var handler = HttpAuthenticationFeature.Handler; var signOutContext = new SignOutContext(authenticationTypes); if (handler != null) diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasForm.cs b/src/Microsoft.AspNet.PipelineCore/FormFeature.cs similarity index 89% rename from src/Microsoft.AspNet.PipelineCore/DefaultCanHasForm.cs rename to src/Microsoft.AspNet.PipelineCore/FormFeature.cs index 6b4a6143bc..9613162d6f 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasForm.cs +++ b/src/Microsoft.AspNet.PipelineCore/FormFeature.cs @@ -26,14 +26,14 @@ using Microsoft.AspNet.PipelineCore.Infrastructure; namespace Microsoft.AspNet.PipelineCore { - public class DefaultCanHasForm : ICanHasForm + public class FormFeature : IFormFeature { private readonly IFeatureCollection _features; - private readonly FeatureReference _request = FeatureReference.Default; + private readonly FeatureReference _request = FeatureReference.Default; private Stream _bodyStream; private IReadableStringCollection _form; - public DefaultCanHasForm(IFeatureCollection features) + public FormFeature(IFeatureCollection features) { _features = features; } diff --git a/src/Microsoft.AspNet.PipelineCore/ICanHasForm.cs b/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs similarity index 96% rename from src/Microsoft.AspNet.PipelineCore/ICanHasForm.cs rename to src/Microsoft.AspNet.PipelineCore/IFormFeature.cs index 0003e6a773..f80d2c2713 100644 --- a/src/Microsoft.AspNet.PipelineCore/ICanHasForm.cs +++ b/src/Microsoft.AspNet.PipelineCore/IFormFeature.cs @@ -20,7 +20,7 @@ using Microsoft.AspNet.Abstractions; namespace Microsoft.AspNet.PipelineCore { - public interface ICanHasForm + public interface IFormFeature { Task GetFormAsync(); } diff --git a/src/Microsoft.AspNet.PipelineCore/ICanHasItems.cs b/src/Microsoft.AspNet.PipelineCore/IItemsFeature.cs similarity index 95% rename from src/Microsoft.AspNet.PipelineCore/ICanHasItems.cs rename to src/Microsoft.AspNet.PipelineCore/IItemsFeature.cs index 59be854c23..30762add7b 100644 --- a/src/Microsoft.AspNet.PipelineCore/ICanHasItems.cs +++ b/src/Microsoft.AspNet.PipelineCore/IItemsFeature.cs @@ -19,7 +19,7 @@ using System.Collections.Generic; namespace Microsoft.AspNet.PipelineCore { - public interface ICanHasItems + public interface IItemsFeature { IDictionary Items { get; } } diff --git a/src/Microsoft.AspNet.PipelineCore/ICanHasQuery.cs b/src/Microsoft.AspNet.PipelineCore/IQueryFeature.cs similarity index 95% rename from src/Microsoft.AspNet.PipelineCore/ICanHasQuery.cs rename to src/Microsoft.AspNet.PipelineCore/IQueryFeature.cs index af2e66ce45..6dcaa1836e 100644 --- a/src/Microsoft.AspNet.PipelineCore/ICanHasQuery.cs +++ b/src/Microsoft.AspNet.PipelineCore/IQueryFeature.cs @@ -19,7 +19,7 @@ using Microsoft.AspNet.Abstractions; namespace Microsoft.AspNet.PipelineCore { - public interface ICanHasQuery + public interface IQueryFeature { IReadableStringCollection Query { get; } } diff --git a/src/Microsoft.AspNet.PipelineCore/ICanHasRequestCookies.cs b/src/Microsoft.AspNet.PipelineCore/IRequestCookiesFeature.cs similarity index 94% rename from src/Microsoft.AspNet.PipelineCore/ICanHasRequestCookies.cs rename to src/Microsoft.AspNet.PipelineCore/IRequestCookiesFeature.cs index 976e2bdd99..8cfcd2cb40 100644 --- a/src/Microsoft.AspNet.PipelineCore/ICanHasRequestCookies.cs +++ b/src/Microsoft.AspNet.PipelineCore/IRequestCookiesFeature.cs @@ -19,7 +19,7 @@ using Microsoft.AspNet.Abstractions; namespace Microsoft.AspNet.PipelineCore { - public interface ICanHasRequestCookies + public interface IRequestCookiesFeature { IReadableStringCollection Cookies { get; } } diff --git a/src/Microsoft.AspNet.PipelineCore/ICanHasResponseCookies.cs b/src/Microsoft.AspNet.PipelineCore/IResponseCookiesFeature.cs similarity index 95% rename from src/Microsoft.AspNet.PipelineCore/ICanHasResponseCookies.cs rename to src/Microsoft.AspNet.PipelineCore/IResponseCookiesFeature.cs index 739f71a36a..02a10ff95a 100644 --- a/src/Microsoft.AspNet.PipelineCore/ICanHasResponseCookies.cs +++ b/src/Microsoft.AspNet.PipelineCore/IResponseCookiesFeature.cs @@ -20,7 +20,7 @@ using Microsoft.AspNet.PipelineCore.Collections; namespace Microsoft.AspNet.PipelineCore { - public interface ICanHasResponseCookies + public interface IResponseCookiesFeature { IResponseCookies Cookies { get; } } diff --git a/src/Microsoft.AspNet.PipelineCore/ICanHasServiceProviders.cs b/src/Microsoft.AspNet.PipelineCore/IServiceProvidersFeature.cs similarity index 94% rename from src/Microsoft.AspNet.PipelineCore/ICanHasServiceProviders.cs rename to src/Microsoft.AspNet.PipelineCore/IServiceProvidersFeature.cs index 17507634e8..ed6dc1d77b 100644 --- a/src/Microsoft.AspNet.PipelineCore/ICanHasServiceProviders.cs +++ b/src/Microsoft.AspNet.PipelineCore/IServiceProvidersFeature.cs @@ -19,7 +19,7 @@ using System; namespace Microsoft.AspNet.PipelineCore { - public interface ICanHasServiceProviders + public interface IServiceProvidersFeature { IServiceProvider ApplicationServices { get; set; } IServiceProvider RequestServices { get; set; } diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasItems.cs b/src/Microsoft.AspNet.PipelineCore/ItemsFeature.cs similarity index 91% rename from src/Microsoft.AspNet.PipelineCore/DefaultCanHasItems.cs rename to src/Microsoft.AspNet.PipelineCore/ItemsFeature.cs index fdf10565b0..c5933f1d0f 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasItems.cs +++ b/src/Microsoft.AspNet.PipelineCore/ItemsFeature.cs @@ -19,9 +19,9 @@ using System.Collections.Generic; namespace Microsoft.AspNet.PipelineCore { - public class DefaultCanHasItems : ICanHasItems + public class ItemsFeature : IItemsFeature { - public DefaultCanHasItems() + public ItemsFeature() { Items = new ItemsDictionary(); } diff --git a/src/Microsoft.AspNet.PipelineCore/Microsoft.AspNet.PipelineCore.kproj b/src/Microsoft.AspNet.PipelineCore/Microsoft.AspNet.PipelineCore.kproj index 9cf723fe9e..366ffd4df5 100644 --- a/src/Microsoft.AspNet.PipelineCore/Microsoft.AspNet.PipelineCore.kproj +++ b/src/Microsoft.AspNet.PipelineCore/Microsoft.AspNet.PipelineCore.kproj @@ -27,28 +27,28 @@ - - - - - - + + + + + + - - - - - - + + + + + + - + diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasQuery.cs b/src/Microsoft.AspNet.PipelineCore/QueryFeature.cs similarity index 87% rename from src/Microsoft.AspNet.PipelineCore/DefaultCanHasQuery.cs rename to src/Microsoft.AspNet.PipelineCore/QueryFeature.cs index 2c53a4ceb2..994fa4b0e8 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasQuery.cs +++ b/src/Microsoft.AspNet.PipelineCore/QueryFeature.cs @@ -24,14 +24,14 @@ using Microsoft.AspNet.PipelineCore.Infrastructure; namespace Microsoft.AspNet.PipelineCore { - public class DefaultCanHasQuery : ICanHasQuery + public class QueryFeature : IQueryFeature { private readonly IFeatureCollection _features; - private FeatureReference _request = FeatureReference.Default; + private FeatureReference _request = FeatureReference.Default; private string _queryString; private IReadableStringCollection _query; - public DefaultCanHasQuery(IFeatureCollection features) + public QueryFeature(IFeatureCollection features) { _features = features; } diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasRequestCookies.cs b/src/Microsoft.AspNet.PipelineCore/RequestCookiesFeature.cs similarity index 88% rename from src/Microsoft.AspNet.PipelineCore/DefaultCanHasRequestCookies.cs rename to src/Microsoft.AspNet.PipelineCore/RequestCookiesFeature.cs index b935db4cca..6d38678bbe 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasRequestCookies.cs +++ b/src/Microsoft.AspNet.PipelineCore/RequestCookiesFeature.cs @@ -25,15 +25,15 @@ using Microsoft.AspNet.PipelineCore.Infrastructure; namespace Microsoft.AspNet.PipelineCore { - public class DefaultCanHasRequestCookies : ICanHasRequestCookies + public class RequestCookiesFeature : IRequestCookiesFeature { private readonly IFeatureCollection _features; - private readonly FeatureReference _request = FeatureReference.Default; + private readonly FeatureReference _request = FeatureReference.Default; private string _cookiesHeader; private RequestCookiesCollection _cookiesCollection; private static readonly string[] ZeroHeaders = new string[0]; - public DefaultCanHasRequestCookies(IFeatureCollection features) + public RequestCookiesFeature(IFeatureCollection features) { _features = features; } diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasResponseCookies.cs b/src/Microsoft.AspNet.PipelineCore/ResponseCookiesFeature.cs similarity index 84% rename from src/Microsoft.AspNet.PipelineCore/DefaultCanHasResponseCookies.cs rename to src/Microsoft.AspNet.PipelineCore/ResponseCookiesFeature.cs index 99bcb5d6f9..0fa8afff85 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasResponseCookies.cs +++ b/src/Microsoft.AspNet.PipelineCore/ResponseCookiesFeature.cs @@ -23,13 +23,13 @@ using Microsoft.AspNet.PipelineCore.Infrastructure; namespace Microsoft.AspNet.PipelineCore { - public class DefaultCanHasResponseCookies : ICanHasResponseCookies + public class ResponseCookiesFeature : IResponseCookiesFeature { private readonly IFeatureCollection _features; - private readonly FeatureReference _request = FeatureReference.Default; + private readonly FeatureReference _request = FeatureReference.Default; private IResponseCookies _cookiesCollection; - public DefaultCanHasResponseCookies(IFeatureCollection features) + public ResponseCookiesFeature(IFeatureCollection features) { _features = features; } diff --git a/src/Microsoft.AspNet.PipelineCore/Security/DefaultHttpAuthentication.cs b/src/Microsoft.AspNet.PipelineCore/Security/HttpAuthenticationFeature.cs similarity index 90% rename from src/Microsoft.AspNet.PipelineCore/Security/DefaultHttpAuthentication.cs rename to src/Microsoft.AspNet.PipelineCore/Security/HttpAuthenticationFeature.cs index aef823d267..e203abeec2 100644 --- a/src/Microsoft.AspNet.PipelineCore/Security/DefaultHttpAuthentication.cs +++ b/src/Microsoft.AspNet.PipelineCore/Security/HttpAuthenticationFeature.cs @@ -20,9 +20,9 @@ using Microsoft.AspNet.HttpFeature.Security; namespace Microsoft.AspNet.PipelineCore.Security { - public class DefaultHttpAuthentication : IHttpAuthentication + public class HttpAuthenticationFeature : IHttpAuthenticationFeature { - public DefaultHttpAuthentication() + public HttpAuthenticationFeature() { } diff --git a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasServiceProviders.cs b/src/Microsoft.AspNet.PipelineCore/ServiceProvidersFeature.cs similarity index 92% rename from src/Microsoft.AspNet.PipelineCore/DefaultCanHasServiceProviders.cs rename to src/Microsoft.AspNet.PipelineCore/ServiceProvidersFeature.cs index f768aaa565..bc2b654f28 100644 --- a/src/Microsoft.AspNet.PipelineCore/DefaultCanHasServiceProviders.cs +++ b/src/Microsoft.AspNet.PipelineCore/ServiceProvidersFeature.cs @@ -19,7 +19,7 @@ using System; namespace Microsoft.AspNet.PipelineCore { - public class DefaultCanHasServiceProviders : ICanHasServiceProviders + public class ServiceProvidersFeature : IServiceProvidersFeature { public IServiceProvider ApplicationServices { get; set; } public IServiceProvider RequestServices { get; set; } diff --git a/test/Microsoft.AspNet.Abstractions.Tests/Fakes.cs b/test/Microsoft.AspNet.Abstractions.Tests/Fakes.cs index 225235c0ab..8e65358410 100644 --- a/test/Microsoft.AspNet.Abstractions.Tests/Fakes.cs +++ b/test/Microsoft.AspNet.Abstractions.Tests/Fakes.cs @@ -22,7 +22,7 @@ using Microsoft.AspNet.HttpFeature; namespace Microsoft.AspNet.Abstractions.Extensions { - public class FakeHttpRequestInfo : IHttpRequestInformation + public class FakeHttpRequestFeature : IHttpRequestFeature { public string Protocol { get; set; } public string Scheme { get; set; } @@ -34,7 +34,7 @@ namespace Microsoft.AspNet.Abstractions.Extensions public Stream Body { get; set; } } - public class FakeHttpResponseInfo : IHttpResponseInformation + public class FakeHttpResponseFeature : IHttpResponseFeature { public int StatusCode { get; set; } public string ReasonPhrase { get; set; } diff --git a/test/Microsoft.AspNet.Abstractions.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNet.Abstractions.Tests/MapPathMiddlewareTests.cs index 5bc4f85ec9..c7faa83160 100644 --- a/test/Microsoft.AspNet.Abstractions.Tests/MapPathMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Abstractions.Tests/MapPathMiddlewareTests.cs @@ -201,8 +201,8 @@ namespace Microsoft.AspNet.Abstractions.Extensions private HttpContext CreateRequest(string basePath, string requestPath) { HttpContext context = new DefaultHttpContext(new FeatureModel.FeatureCollection()); - context.SetFeature(new FakeHttpRequestInfo()); - context.SetFeature(new FakeHttpResponseInfo()); + context.SetFeature(new FakeHttpRequestFeature()); + context.SetFeature(new FakeHttpResponseFeature()); context.Request.PathBase = new PathString(basePath); context.Request.Path = new PathString(requestPath); return context; diff --git a/test/Microsoft.AspNet.Abstractions.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNet.Abstractions.Tests/MapPredicateMiddlewareTests.cs index ad4223f9de..80fe6c0e88 100644 --- a/test/Microsoft.AspNet.Abstractions.Tests/MapPredicateMiddlewareTests.cs +++ b/test/Microsoft.AspNet.Abstractions.Tests/MapPredicateMiddlewareTests.cs @@ -190,8 +190,8 @@ namespace Microsoft.AspNet.Abstractions.Extensions private HttpContext CreateRequest() { HttpContext context = new DefaultHttpContext(new FeatureModel.FeatureCollection()); - context.SetFeature(new FakeHttpRequestInfo()); - context.SetFeature(new FakeHttpResponseInfo()); + context.SetFeature(new FakeHttpRequestFeature()); + context.SetFeature(new FakeHttpResponseFeature()); return context; } } diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs index 69737309a9..aa1f4a59e1 100644 --- a/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs +++ b/test/Microsoft.AspNet.Owin.Tests/OwinEnvironmentTests.cs @@ -133,7 +133,7 @@ namespace Microsoft.AspNet.Owin } } - private class MoqHttpRequest : HttpRequest, IHttpRequestInformation + private class MoqHttpRequest : HttpRequest, IHttpRequestFeature { public override HttpContext HttpContext { @@ -225,25 +225,25 @@ namespace Microsoft.AspNet.Owin set { throw new NotImplementedException(); } } - string IHttpRequestInformation.PathBase + string IHttpRequestFeature.PathBase { get; set; } - string IHttpRequestInformation.Path + string IHttpRequestFeature.Path { get; set; } - string IHttpRequestInformation.QueryString + string IHttpRequestFeature.QueryString { get; set; } - IDictionary IHttpRequestInformation.Headers + IDictionary IHttpRequestFeature.Headers { get; set; diff --git a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs b/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs index b3bb3f68f4..b300605afa 100644 --- a/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs +++ b/test/Microsoft.AspNet.Owin.Tests/OwinFeatureCollectionTests.cs @@ -40,7 +40,7 @@ namespace Microsoft.AspNet.Owin }; var features = new FeatureObject(new OwinFeatureCollection(env)); - Assert.Equal(Get(features).Method, "POST"); + Assert.Equal(Get(features).Method, "POST"); } [Fact] @@ -56,8 +56,8 @@ namespace Microsoft.AspNet.Owin var keys = features.Keys.ToArray(); var values = features.Values.ToArray(); - Assert.Contains(typeof(IHttpRequestInformation), keys); - Assert.Contains(typeof(IHttpResponseInformation), keys); + Assert.Contains(typeof(IHttpRequestFeature), keys); + Assert.Contains(typeof(IHttpResponseFeature), keys); } } } diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpContextTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpContextTests.cs index db800a6fff..a2d913c9f8 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpContextTests.cs +++ b/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpContextTests.cs @@ -95,11 +95,11 @@ namespace Microsoft.AspNet.PipelineCore.Tests private HttpContext CreateContext() { var context = new DefaultHttpContext(new FeatureCollection()); - context.SetFeature(new FakeHttpResponse()); + context.SetFeature(new FakeHttpResponse()); return context; } - private class FakeHttpResponse : IHttpResponseInformation + private class FakeHttpResponse : IHttpResponseFeature { public int StatusCode { get; set; } diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpRequestTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpRequestTests.cs index c78982b0df..9ec72f8a89 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpRequestTests.cs +++ b/test/Microsoft.AspNet.PipelineCore.Tests/DefaultHttpRequestTests.cs @@ -124,11 +124,11 @@ namespace Microsoft.AspNet.PipelineCore.Tests private static DefaultHttpRequest CreateRequest(IDictionary headers) { - var requestInfo = new Mock(); + var requestInfo = new Mock(); requestInfo.SetupGet(r => r.Headers).Returns(headers); var features = new FeatureCollection(); - features.Add(typeof(IHttpRequestInformation), requestInfo.Object); + features.Add(typeof(IHttpRequestFeature), requestInfo.Object); var context = new DefaultHttpContext(features); return new DefaultHttpRequest(context, features); diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultCanHasFormTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/FormFeatureTests.cs similarity index 88% rename from test/Microsoft.AspNet.PipelineCore.Tests/DefaultCanHasFormTests.cs rename to test/Microsoft.AspNet.PipelineCore.Tests/FormFeatureTests.cs index 9d029071f2..31098e78cb 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultCanHasFormTests.cs +++ b/test/Microsoft.AspNet.PipelineCore.Tests/FormFeatureTests.cs @@ -25,7 +25,7 @@ using Xunit; namespace Microsoft.AspNet.PipelineCore.Tests { - public class DefaultCanHasFormTests + public class FormFeatureTests { [Fact] public async Task GetFormAsync_ReturnsParsedFormCollection() @@ -33,14 +33,14 @@ namespace Microsoft.AspNet.PipelineCore.Tests // Arrange var formContent = Encoding.UTF8.GetBytes("foo=bar&baz=2"); var features = new Mock(); - var request = new Mock(); + var request = new Mock(); request.SetupGet(r => r.Body).Returns(new MemoryStream(formContent)); object value = request.Object; - features.Setup(f => f.TryGetValue(typeof(IHttpRequestInformation), out value)) + features.Setup(f => f.TryGetValue(typeof(IHttpRequestFeature), out value)) .Returns(true); - var provider = new DefaultCanHasForm(features.Object); + var provider = new FormFeature(features.Object); // Act var formCollection = await provider.GetFormAsync(); @@ -57,14 +57,14 @@ namespace Microsoft.AspNet.PipelineCore.Tests var formContent1 = Encoding.UTF8.GetBytes("foo=bar&baz=2"); var formContent2 = Encoding.UTF8.GetBytes("collection2=value"); var features = new Mock(); - var request = new Mock(); + var request = new Mock(); request.SetupGet(r => r.Body).Returns(new MemoryStream(formContent1)); object value = request.Object; - features.Setup(f => f.TryGetValue(typeof(IHttpRequestInformation), out value)) + features.Setup(f => f.TryGetValue(typeof(IHttpRequestFeature), out value)) .Returns(true); - var provider = new DefaultCanHasForm(features.Object); + var provider = new FormFeature(features.Object); // Act - 1 var formCollection = await provider.GetFormAsync(); diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/Microsoft.AspNet.PipelineCore.Tests.kproj b/test/Microsoft.AspNet.PipelineCore.Tests/Microsoft.AspNet.PipelineCore.Tests.kproj index 2f35d88951..073aabb443 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/Microsoft.AspNet.PipelineCore.Tests.kproj +++ b/test/Microsoft.AspNet.PipelineCore.Tests/Microsoft.AspNet.PipelineCore.Tests.kproj @@ -22,8 +22,8 @@ - - + + diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultCanHasQueryTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/QueryFeatureTests.cs similarity index 87% rename from test/Microsoft.AspNet.PipelineCore.Tests/DefaultCanHasQueryTests.cs rename to test/Microsoft.AspNet.PipelineCore.Tests/QueryFeatureTests.cs index 55e02e7560..7ddf43d57e 100644 --- a/test/Microsoft.AspNet.PipelineCore.Tests/DefaultCanHasQueryTests.cs +++ b/test/Microsoft.AspNet.PipelineCore.Tests/QueryFeatureTests.cs @@ -22,21 +22,21 @@ using Xunit; namespace Microsoft.AspNet.PipelineCore.Tests { - public class DefaultCanHasQueryTests + public class QueryFeatureTests { [Fact] public void QueryReturnsParsedQueryCollection() { // Arrange var features = new Mock(); - var request = new Mock(); + var request = new Mock(); request.SetupGet(r => r.QueryString).Returns("foo=bar"); object value = request.Object; - features.Setup(f => f.TryGetValue(typeof(IHttpRequestInformation), out value)) + features.Setup(f => f.TryGetValue(typeof(IHttpRequestFeature), out value)) .Returns(true); - var provider = new DefaultCanHasQuery(features.Object); + var provider = new QueryFeature(features.Object); // Act var queryCollection = provider.Query;