Rename and renamespace

benaadams · benaadams · commit 253eb92d31f0 · 2015-10-08T07:17:04.000-04:00
diff --git a/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs b/src/Microsoft.AspNet.Http/Authentication/DefaultAuthenticationManager.cs
@@ -39,7 +39,7 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     () => new HttpAuthenticationFeature(), 
@@ -49,7 +49,7 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature
 
         private IHttpResponseFeature HttpResponseFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _response); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }
         }
 
         public override IEnumerable<AuthenticationDescription> GetAuthenticationSchemes()
diff --git a/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs b/src/Microsoft.AspNet.Http/DefaultConnectionInfo.cs
@@ -37,7 +37,7 @@ private IHttpConnectionFeature HttpConnectionFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     () => new HttpConnectionFeature(), 
@@ -49,7 +49,7 @@ private ITlsConnectionFeature TlsConnectionFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features,
                     () => new TlsConnectionFeature(),
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpContext.cs b/src/Microsoft.AspNet.Http/DefaultHttpContext.cs
@@ -64,7 +64,7 @@ IItemsFeature ItemsFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     () => new ItemsFeature(), 
@@ -76,7 +76,7 @@ IServiceProvidersFeature ServiceProvidersFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     () => new ServiceProvidersFeature(), 
@@ -88,7 +88,7 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     () => new HttpAuthenticationFeature(), 
@@ -100,7 +100,7 @@ private IHttpRequestLifetimeFeature LifetimeFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     () => new HttpRequestLifetimeFeature(), 
@@ -110,7 +110,7 @@ private IHttpRequestLifetimeFeature LifetimeFeature
 
         private ISessionFeature SessionFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _session); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _session); }
             set
             {
                 _features.Set(value);
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs b/src/Microsoft.AspNet.Http/DefaultHttpRequest.cs
@@ -42,14 +42,14 @@ void IFeatureCache.CheckFeaturesRevision()
 
         private IHttpRequestFeature HttpRequestFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _request); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
         }
 
         private IQueryFeature QueryFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     (f) => new QueryFeature(f), 
@@ -61,7 +61,7 @@ private IFormFeature FormFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this,
                     _features,
                     this,
@@ -74,7 +74,7 @@ private IRequestCookiesFeature RequestCookiesFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     (f) => new RequestCookiesFeature(f), 
diff --git a/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs b/src/Microsoft.AspNet.Http/DefaultHttpResponse.cs
@@ -37,14 +37,14 @@ void IFeatureCache.CheckFeaturesRevision()
 
         private IHttpResponseFeature HttpResponseFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _response); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }
         }
 
         private IResponseCookiesFeature ResponseCookiesFeature
         {
             get
             {
-                return FeatureCacheHelpers.GetOrCreateAndCache(
+                return FeatureHelpers.GetOrCreateAndCache(
                     this, 
                     _features, 
                     (f) => new ResponseCookiesFeature(f), 
diff --git a/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs b/src/Microsoft.AspNet.Http/DefaultWebSocketManager.cs
@@ -35,12 +35,12 @@ void IFeatureCache.CheckFeaturesRevision()
 
         private IHttpRequestFeature HttpRequestFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _request); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
         }
 
         private IHttpWebSocketFeature WebSocketFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _webSockets); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _webSockets); }
         }
 
         public override bool IsWebSocketRequest
diff --git a/src/Microsoft.AspNet.Http/Features/FeatureHelpers.cs b/src/Microsoft.AspNet.Http/Features/FeatureHelpers.cs
@@ -1,9 +1,11 @@
-﻿using System;
-using Microsoft.AspNet.Http.Features;
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+using System;
+
+namespace Microsoft.AspNet.Http.Features
 {
-    internal sealed class FeatureCacheHelpers
+    internal sealed class FeatureHelpers
     {
         public static T GetAndCache<T>(
             IFeatureCache cache, 
diff --git a/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs b/src/Microsoft.AspNet.Http/Features/IFeatureCache.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Http
+namespace Microsoft.AspNet.Http.Features
 {
     internal interface IFeatureCache
     {
diff --git a/src/Microsoft.AspNet.Http/Features/QueryFeature.cs b/src/Microsoft.AspNet.Http/Features/QueryFeature.cs
@@ -59,7 +59,7 @@ void IFeatureCache.CheckFeaturesRevision()
 
         private IHttpRequestFeature HttpRequestFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _request); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
         }
 
         public IReadableStringCollection Query
diff --git a/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/RequestCookiesFeature.cs
@@ -56,7 +56,7 @@ void IFeatureCache.CheckFeaturesRevision()
 
         private IHttpRequestFeature HttpRequestFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _request); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }
         }
 
         public IReadableStringCollection Cookies
diff --git a/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs b/src/Microsoft.AspNet.Http/Features/ResponseCookiesFeature.cs
@@ -29,7 +29,7 @@ void IFeatureCache.CheckFeaturesRevision()
 
         private IHttpResponseFeature HttpResponseFeature
         {
-            get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _response); }
+            get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }
         }
 
         public IResponseCookies Cookies

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature`
`39`	`39`	`{`
`40`	`40`	`get`
`41`	`41`	`{`
`42`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`42`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`43`	`43`	`this,`
`44`	`44`	`_features,`
`45`	`45`	`() => new HttpAuthenticationFeature(),`
`@@ -49,7 +49,7 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature`
`49`	`49`
`50`	`50`	`private IHttpResponseFeature HttpResponseFeature`
`51`	`51`	`{`
`52`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _response); }`
	`52`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`public override IEnumerable<AuthenticationDescription> GetAuthenticationSchemes()`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ private IHttpConnectionFeature HttpConnectionFeature`
`37`	`37`	`{`
`38`	`38`	`get`
`39`	`39`	`{`
`40`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`40`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`41`	`41`	`this,`
`42`	`42`	`_features,`
`43`	`43`	`() => new HttpConnectionFeature(),`
`@@ -49,7 +49,7 @@ private ITlsConnectionFeature TlsConnectionFeature`
`49`	`49`	`{`
`50`	`50`	`get`
`51`	`51`	`{`
`52`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`52`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`53`	`53`	`this,`
`54`	`54`	`_features,`
`55`	`55`	`() => new TlsConnectionFeature(),`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ IItemsFeature ItemsFeature`
`64`	`64`	`{`
`65`	`65`	`get`
`66`	`66`	`{`
`67`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`67`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`68`	`68`	`this,`
`69`	`69`	`_features,`
`70`	`70`	`() => new ItemsFeature(),`
`@@ -76,7 +76,7 @@ IServiceProvidersFeature ServiceProvidersFeature`
`76`	`76`	`{`
`77`	`77`	`get`
`78`	`78`	`{`
`79`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`79`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`80`	`80`	`this,`
`81`	`81`	`_features,`
`82`	`82`	`() => new ServiceProvidersFeature(),`
`@@ -88,7 +88,7 @@ private IHttpAuthenticationFeature HttpAuthenticationFeature`
`88`	`88`	`{`
`89`	`89`	`get`
`90`	`90`	`{`
`91`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`91`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`92`	`92`	`this,`
`93`	`93`	`_features,`
`94`	`94`	`() => new HttpAuthenticationFeature(),`
`@@ -100,7 +100,7 @@ private IHttpRequestLifetimeFeature LifetimeFeature`
`100`	`100`	`{`
`101`	`101`	`get`
`102`	`102`	`{`
`103`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`103`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`104`	`104`	`this,`
`105`	`105`	`_features,`
`106`	`106`	`() => new HttpRequestLifetimeFeature(),`
`@@ -110,7 +110,7 @@ private IHttpRequestLifetimeFeature LifetimeFeature`
`110`	`110`
`111`	`111`	`private ISessionFeature SessionFeature`
`112`	`112`	`{`
`113`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _session); }`
	`113`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _session); }`
`114`	`114`	`set`
`115`	`115`	`{`
`116`	`116`	`_features.Set(value);`
Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@ void IFeatureCache.CheckFeaturesRevision()`
`42`	`42`
`43`	`43`	`private IHttpRequestFeature HttpRequestFeature`
`44`	`44`	`{`
`45`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _request); }`
	`45`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`private IQueryFeature QueryFeature`
`49`	`49`	`{`
`50`	`50`	`get`
`51`	`51`	`{`
`52`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`52`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`53`	`53`	`this,`
`54`	`54`	`_features,`
`55`	`55`	`(f) => new QueryFeature(f),`
`@@ -61,7 +61,7 @@ private IFormFeature FormFeature`
`61`	`61`	`{`
`62`	`62`	`get`
`63`	`63`	`{`
`64`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`64`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`65`	`65`	`this,`
`66`	`66`	`_features,`
`67`	`67`	`this,`
`@@ -74,7 +74,7 @@ private IRequestCookiesFeature RequestCookiesFeature`
`74`	`74`	`{`
`75`	`75`	`get`
`76`	`76`	`{`
`77`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`77`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`78`	`78`	`this,`
`79`	`79`	`_features,`
`80`	`80`	`(f) => new RequestCookiesFeature(f),`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,14 @@ void IFeatureCache.CheckFeaturesRevision()`
`37`	`37`
`38`	`38`	`private IHttpResponseFeature HttpResponseFeature`
`39`	`39`	`{`
`40`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _response); }`
	`40`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`private IResponseCookiesFeature ResponseCookiesFeature`
`44`	`44`	`{`
`45`	`45`	`get`
`46`	`46`	`{`
`47`		`- return FeatureCacheHelpers.GetOrCreateAndCache(`
	`47`	`+ return FeatureHelpers.GetOrCreateAndCache(`
`48`	`48`	`this,`
`49`	`49`	`_features,`
`50`	`50`	`(f) => new ResponseCookiesFeature(f),`
Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ void IFeatureCache.CheckFeaturesRevision()`
`35`	`35`
`36`	`36`	`private IHttpRequestFeature HttpRequestFeature`
`37`	`37`	`{`
`38`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _request); }`
	`38`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`private IHttpWebSocketFeature WebSocketFeature`
`42`	`42`	`{`
`43`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _webSockets); }`
	`43`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _webSockets); }`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public override bool IsWebSocketRequest`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.`
`3`	`3`
`4`		`-namespace Microsoft.AspNet.Http`
	`4`	`+namespace Microsoft.AspNet.Http.Features`
`5`	`5`	`{`
`6`	`6`	`internal interface IFeatureCache`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ void IFeatureCache.CheckFeaturesRevision()`
`59`	`59`
`60`	`60`	`private IHttpRequestFeature HttpRequestFeature`
`61`	`61`	`{`
`62`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _request); }`
	`62`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public IReadableStringCollection Query`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ void IFeatureCache.CheckFeaturesRevision()`
`56`	`56`
`57`	`57`	`private IHttpRequestFeature HttpRequestFeature`
`58`	`58`	`{`
`59`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _request); }`
	`59`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _request); }`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public IReadableStringCollection Cookies`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void IFeatureCache.CheckFeaturesRevision()`
`29`	`29`
`30`	`30`	`private IHttpResponseFeature HttpResponseFeature`
`31`	`31`	`{`
`32`		`- get { return FeatureCacheHelpers.GetAndCache(this, _features, ref _response); }`
	`32`	`+ get { return FeatureHelpers.GetAndCache(this, _features, ref _response); }`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public IResponseCookies Cookies`