#122 - Rename IBuilder to IApplicationBuilder.

Tratcher · Tratcher · commit 335895d9b490 · 2014-09-10T11:45:02.000-07:00
diff --git a/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/MapExtensions.cs
@@ -17,7 +17,7 @@ public static class MapExtensions
         /// <param name="pathMatch">The path to match</param>
         /// <param name="configuration">The branch to take for positive path matches</param>
         /// <returns></returns>
-        public static IBuilder Map([NotNull] this IBuilder app, [NotNull] string pathMatch, [NotNull] Action<IBuilder> configuration)
+        public static IApplicationBuilder Map([NotNull] this IApplicationBuilder app, [NotNull] string pathMatch, [NotNull] Action<IApplicationBuilder> configuration)
         {
             return Map(app, new PathString(pathMatch), configuration);
         }
@@ -30,15 +30,15 @@ public static IBuilder Map([NotNull] this IBuilder app, [NotNull] string pathMat
         /// <param name="pathMatch">The path to match</param>
         /// <param name="configuration">The branch to take for positive path matches</param>
         /// <returns></returns>
-        public static IBuilder Map([NotNull] this IBuilder app, PathString pathMatch, [NotNull] Action<IBuilder> configuration)
+        public static IApplicationBuilder Map([NotNull] this IApplicationBuilder app, PathString pathMatch, [NotNull] Action<IApplicationBuilder> configuration)
         {
             if (pathMatch.HasValue && pathMatch.Value.EndsWith("/", StringComparison.Ordinal))
             {
                 throw new ArgumentException("The path must not end with a '/'", "pathMatch");
             }
 
             // create branch
-            IBuilder branchBuilder = app.New();
+            var branchBuilder = app.New();
             configuration(branchBuilder);
             var branch = branchBuilder.Build();
 
diff --git a/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/MapWhenExtensions.cs
@@ -23,10 +23,10 @@ public static class MapWhenExtensions
         /// <param name="predicate">Invoked with the request environment to determine if the branch should be taken</param>
         /// <param name="configuration">Configures a branch to take</param>
         /// <returns></returns>
-        public static IBuilder MapWhen([NotNull] this IBuilder app, [NotNull] Predicate predicate, [NotNull] Action<IBuilder> configuration)
+        public static IApplicationBuilder MapWhen([NotNull] this IApplicationBuilder app, [NotNull] Predicate predicate, [NotNull] Action<IApplicationBuilder> configuration)
         {
             // create branch
-            IBuilder branchBuilder = app.New();
+            var branchBuilder = app.New();
             configuration(branchBuilder);
             var branch = branchBuilder.Build();
 
@@ -46,10 +46,10 @@ public static IBuilder MapWhen([NotNull] this IBuilder app, [NotNull] Predicate
         /// <param name="predicate">Invoked asynchronously with the request environment to determine if the branch should be taken</param>
         /// <param name="configuration">Configures a branch to take</param>
         /// <returns></returns>
-        public static IBuilder MapWhenAsync([NotNull] this IBuilder app, [NotNull] PredicateAsync predicate, [NotNull] Action<IBuilder> configuration)
+        public static IApplicationBuilder MapWhenAsync([NotNull] this IApplicationBuilder app, [NotNull] PredicateAsync predicate, [NotNull] Action<IApplicationBuilder> configuration)
         {
             // create branch
-            IBuilder branchBuilder = app.New();
+            var branchBuilder = app.New();
             configuration(branchBuilder);
             var branch = branchBuilder.Build();
 
diff --git a/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/RunExtensions.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Builder
 {
     public static class RunExtensions
     {
-        public static void Run([NotNull] this IBuilder app, [NotNull] RequestDelegate handler)
+        public static void Run([NotNull] this IApplicationBuilder app, [NotNull] RequestDelegate handler)
         {
             app.Use(_ => handler);
         }
diff --git a/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs b/src/Microsoft.AspNet.Http/Extensions/UseExtensions.cs
@@ -15,7 +15,7 @@ public static class UseExtensions
         /// <param name="app"></param>
         /// <param name="middleware">A function that handles the request or calls the given next function.</param>
         /// <returns></returns>
-        public static IBuilder Use(this IBuilder app, Func<HttpContext, Func<Task>, Task> middleware)
+        public static IApplicationBuilder Use(this IApplicationBuilder app, Func<HttpContext, Func<Task>, Task> middleware)
         {
             return app.Use(next =>
             {
diff --git a/src/Microsoft.AspNet.Http/IApplicationBuilder.cs b/src/Microsoft.AspNet.Http/IApplicationBuilder.cs
@@ -6,17 +6,17 @@
 
 namespace Microsoft.AspNet.Builder
 {
-    public interface IBuilder
+    public interface IApplicationBuilder
     {
         IServiceProvider ApplicationServices { get; set; }
 
         IServerInformation Server { get; set; }
 
         IDictionary<string, object> Properties { get; set; }
 
-        IBuilder Use(Func<RequestDelegate, RequestDelegate> middleware);
+        IApplicationBuilder Use(Func<RequestDelegate, RequestDelegate> middleware);
 
-        IBuilder New();
+        IApplicationBuilder New();
 
         RequestDelegate Build();
     }
diff --git a/src/Microsoft.AspNet.Owin/OwinExtensions.cs b/src/Microsoft.AspNet.Owin/OwinExtensions.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Builder
 
     public static class OwinExtensions
     {
-        public static AddMiddleware UseOwin(this IBuilder builder)
+        public static AddMiddleware UseOwin(this IApplicationBuilder builder)
         {
             AddMiddleware add = middleware =>
             {
@@ -58,17 +58,17 @@ public static AddMiddleware UseOwin(this IBuilder builder)
             return add;
         }
 
-        public static IBuilder UseOwin(this IBuilder builder, Action<AddMiddleware> pipeline)
+        public static IApplicationBuilder UseOwin(this IApplicationBuilder builder, Action<AddMiddleware> pipeline)
         {
             pipeline(builder.UseOwin());
             return builder;
         }
 
-        public static IBuilder UseBuilder(this AddMiddleware app)
+        public static IApplicationBuilder UseBuilder(this AddMiddleware app)
         {
             // Adapt WebSockets by default.
             app(OwinWebSocketAcceptAdapter.AdaptWebSockets);
-            var builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
 
             CreateMiddleware middleware = CreateMiddlewareFactory(exit =>
             {
@@ -111,7 +111,7 @@ private static CreateMiddleware CreateMiddlewareFactory(Func<RequestDelegate, Re
             };
         }
 
-        public static AddMiddleware UseBuilder(this AddMiddleware app, Action<IBuilder> pipeline)
+        public static AddMiddleware UseBuilder(this AddMiddleware app, Action<IApplicationBuilder> pipeline)
         {
             var builder = app.UseBuilder();
             pipeline(builder);
diff --git a/src/Microsoft.AspNet.PipelineCore/ApplicationBuilder.cs b/src/Microsoft.AspNet.PipelineCore/ApplicationBuilder.cs
@@ -5,22 +5,21 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Http.Infrastructure;
 
 namespace Microsoft.AspNet.Builder
 {
-    public class Builder : IBuilder
+    public class ApplicationBuilder : IApplicationBuilder
     {
         private readonly IList<Func<RequestDelegate, RequestDelegate>> _components = new List<Func<RequestDelegate, RequestDelegate>>();
 
-        public Builder(IServiceProvider serviceProvider)
+        public ApplicationBuilder(IServiceProvider serviceProvider)
         {
             Properties = new Dictionary<string, object>();
             ApplicationServices = serviceProvider;
         }
 
-        private Builder(Builder builder)
+        private ApplicationBuilder(ApplicationBuilder builder)
         {
             Properties = builder.Properties;
         }
@@ -62,15 +61,15 @@ private void SetProperty<T>(string key, T value)
             Properties[key] = value;
         }
 
-        public IBuilder Use(Func<RequestDelegate, RequestDelegate> middleware)
+        public IApplicationBuilder Use(Func<RequestDelegate, RequestDelegate> middleware)
         {
             _components.Add(middleware);
             return this;
         }
 
-        public IBuilder New()
+        public IApplicationBuilder New()
         {
-            return new Builder(this);
+            return new ApplicationBuilder(this);
         }
 
         public RequestDelegate Build()
diff --git a/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Tests/MapPathMiddlewareTests.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Builder.Extensions
 {
     public class MapPathMiddlewareTests
     {
-        private static readonly Action<IBuilder> ActionNotImplemented = new Action<IBuilder>(_ => { throw new NotImplementedException(); });
+        private static readonly Action<IApplicationBuilder> ActionNotImplemented = new Action<IApplicationBuilder>(_ => { throw new NotImplementedException(); });
 
         private static Task Success(HttpContext context)
         {
@@ -23,7 +23,7 @@ private static Task Success(HttpContext context)
             return Task.FromResult<object>(null);
         }
 
-        private static void UseSuccess(IBuilder app)
+        private static void UseSuccess(IApplicationBuilder app)
         {
             app.Run(Success);
         }
@@ -33,16 +33,16 @@ private static Task NotImplemented(HttpContext context)
             throw new NotImplementedException();
         }
 
-        private static void UseNotImplemented(IBuilder app)
+        private static void UseNotImplemented(IApplicationBuilder app)
         {
             app.Run(NotImplemented);
         }
 
         [Fact]
         public void NullArguments_ArgumentNullException()
         {
-            var builder = new Builder(serviceProvider: null);
-            var noMiddleware = new Builder(serviceProvider: null).Build();
+            var builder = new ApplicationBuilder(serviceProvider: null);
+            var noMiddleware = new ApplicationBuilder(serviceProvider: null).Build();
             var noOptions = new MapOptions();
             // TODO: [NotNull] Assert.Throws<ArgumentNullException>(() => builder.Map(null, ActionNotImplemented));
             // TODO: [NotNull] Assert.Throws<ArgumentNullException>(() => builder.Map("/foo", (Action<IBuilder>)null));
@@ -61,7 +61,7 @@ public void NullArguments_ArgumentNullException()
         public void PathMatchFunc_BranchTaken(string matchPath, string basePath, string requestPath)
         {
             HttpContext context = CreateRequest(basePath, requestPath);
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.Map(matchPath, UseSuccess);
             var app = builder.Build();
             app.Invoke(context).Wait();
@@ -82,7 +82,7 @@ public void PathMatchFunc_BranchTaken(string matchPath, string basePath, string
         public void PathMatchAction_BranchTaken(string matchPath, string basePath, string requestPath)
         {
             HttpContext context = CreateRequest(basePath, requestPath);
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.Map(matchPath, subBuilder => subBuilder.Run(Success));
             var app = builder.Build();
             app.Invoke(context).Wait();
@@ -98,7 +98,7 @@ public void PathMatchAction_BranchTaken(string matchPath, string basePath, strin
         [InlineData("/foo/cho/")]
         public void MatchPathWithTrailingSlashThrowsException(string matchPath)
         {
-            Should.Throw<ArgumentException>(() => new Builder(serviceProvider: null).Map(matchPath, map => { }).Build());
+            Should.Throw<ArgumentException>(() => new ApplicationBuilder(serviceProvider: null).Map(matchPath, map => { }).Build());
         }
 
         [Theory]
@@ -112,7 +112,7 @@ public void MatchPathWithTrailingSlashThrowsException(string matchPath)
         public void PathMismatchFunc_PassedThrough(string matchPath, string basePath, string requestPath)
         {
             HttpContext context = CreateRequest(basePath, requestPath);
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.Map(matchPath, UseNotImplemented);
             builder.Run(Success);
             var app = builder.Build();
@@ -134,7 +134,7 @@ public void PathMismatchFunc_PassedThrough(string matchPath, string basePath, st
         public void PathMismatchAction_PassedThrough(string matchPath, string basePath, string requestPath)
         {
             HttpContext context = CreateRequest(basePath, requestPath);
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.Map(matchPath, UseNotImplemented);
             builder.Run(Success);
             var app = builder.Build();
@@ -148,7 +148,7 @@ public void PathMismatchAction_PassedThrough(string matchPath, string basePath,
         [Fact]
         public void ChainedRoutes_Success()
         {
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.Map("/route1", map =>
             {
                 map.Map((string)"/subroute1", UseSuccess);
diff --git a/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs b/test/Microsoft.AspNet.Http.Tests/MapPredicateMiddlewareTests.cs
@@ -26,7 +26,7 @@ private static Task Success(HttpContext context)
             return Task.FromResult<object>(null);
         }
 
-        private static void UseSuccess(IBuilder app)
+        private static void UseSuccess(IApplicationBuilder app)
         {
             app.Run(Success);
         }
@@ -36,7 +36,7 @@ private static Task NotImplemented(HttpContext context)
             throw new NotImplementedException();
         }
 
-        private static void UseNotImplemented(IBuilder app)
+        private static void UseNotImplemented(IApplicationBuilder app)
         {
             app.Run(NotImplemented);
         }
@@ -64,8 +64,8 @@ private Task<bool> FalsePredicateAsync(HttpContext context)
         [Fact]
         public void NullArguments_ArgumentNullException()
         {
-            var builder = new Builder(serviceProvider: null);
-            var noMiddleware = new Builder(serviceProvider: null).Build();
+            var builder = new ApplicationBuilder(serviceProvider: null);
+            var noMiddleware = new ApplicationBuilder(serviceProvider: null).Build();
             var noOptions = new MapWhenOptions();
             // TODO: [NotNull] Assert.Throws<ArgumentNullException>(() => builder.MapWhen(null, UseNotImplemented));
             // TODO: [NotNull] Assert.Throws<ArgumentNullException>(() => builder.MapWhen(NotImplementedPredicate, (Action<IBuilder>)null));
@@ -82,7 +82,7 @@ public void NullArguments_ArgumentNullException()
         public void PredicateTrue_BranchTaken()
         {
             HttpContext context = CreateRequest();
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.MapWhen(TruePredicate, UseSuccess);
             var app = builder.Build();
             app.Invoke(context).Wait();
@@ -94,7 +94,7 @@ public void PredicateTrue_BranchTaken()
         public void PredicateTrueAction_BranchTaken()
         {
             HttpContext context = CreateRequest();
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.MapWhen(TruePredicate, UseSuccess);
             var app = builder.Build();
             app.Invoke(context).Wait();
@@ -106,7 +106,7 @@ public void PredicateTrueAction_BranchTaken()
         public void PredicateFalseAction_PassThrough()
         {
             HttpContext context = CreateRequest();
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.MapWhen(FalsePredicate, UseNotImplemented);
             builder.Run(Success);
             var app = builder.Build();
@@ -119,7 +119,7 @@ public void PredicateFalseAction_PassThrough()
         public void PredicateAsyncTrueAction_BranchTaken()
         {
             HttpContext context = CreateRequest();
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.MapWhenAsync(TruePredicateAsync, UseSuccess);
             var app = builder.Build();
             app.Invoke(context).Wait();
@@ -131,7 +131,7 @@ public void PredicateAsyncTrueAction_BranchTaken()
         public void PredicateAsyncFalseAction_PassThrough()
         {
             HttpContext context = CreateRequest();
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.MapWhenAsync(FalsePredicateAsync, UseNotImplemented);
             builder.Run(Success);
             var app = builder.Build();
@@ -143,7 +143,7 @@ public void PredicateAsyncFalseAction_PassThrough()
         [Fact]
         public void ChainedPredicates_Success()
         {
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.MapWhen(TruePredicate, map1 =>
             {
                 map1.MapWhen((Predicate)FalsePredicate, UseNotImplemented);
@@ -160,7 +160,7 @@ public void ChainedPredicates_Success()
         [Fact]
         public void ChainedPredicatesAsync_Success()
         {
-            IBuilder builder = new Builder(serviceProvider: null);
+            var builder = new ApplicationBuilder(serviceProvider: null);
             builder.MapWhenAsync(TruePredicateAsync, map1 =>
             {
                 map1.MapWhenAsync((PredicateAsync)FalsePredicateAsync, UseNotImplemented);
diff --git a/test/Microsoft.AspNet.PipelineCore.Tests/ApplicationBuilderTests.cs b/test/Microsoft.AspNet.PipelineCore.Tests/ApplicationBuilderTests.cs
@@ -6,12 +6,12 @@
 
 namespace Microsoft.AspNet.Builder.Tests
 {
-    public class BuilderTests
+    public class ApplicationBuilderTests
     {
         [Fact]
         public void BuildReturnsCallableDelegate()
         {
-            var builder = new Builder(null);
+            var builder = new ApplicationBuilder(null);
             var app = builder.Build();
 
             var mockHttpContext = new Moq.Mock<HttpContext>();

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static class MapExtensions`
`17`	`17`	`/// <param name="pathMatch">The path to match</param>`
`18`	`18`	`/// <param name="configuration">The branch to take for positive path matches</param>`
`19`	`19`	`/// <returns></returns>`
`20`		`- public static IBuilder Map([NotNull] this IBuilder app, [NotNull] string pathMatch, [NotNull] Action<IBuilder> configuration)`
	`20`	`+ public static IApplicationBuilder Map([NotNull] this IApplicationBuilder app, [NotNull] string pathMatch, [NotNull] Action<IApplicationBuilder> configuration)`
`21`	`21`	`{`
`22`	`22`	`return Map(app, new PathString(pathMatch), configuration);`
`23`	`23`	`}`
`@@ -30,15 +30,15 @@ public static IBuilder Map([NotNull] this IBuilder app, [NotNull] string pathMat`
`30`	`30`	`/// <param name="pathMatch">The path to match</param>`
`31`	`31`	`/// <param name="configuration">The branch to take for positive path matches</param>`
`32`	`32`	`/// <returns></returns>`
`33`		`- public static IBuilder Map([NotNull] this IBuilder app, PathString pathMatch, [NotNull] Action<IBuilder> configuration)`
	`33`	`+ public static IApplicationBuilder Map([NotNull] this IApplicationBuilder app, PathString pathMatch, [NotNull] Action<IApplicationBuilder> configuration)`
`34`	`34`	`{`
`35`	`35`	`if (pathMatch.HasValue && pathMatch.Value.EndsWith("/", StringComparison.Ordinal))`
`36`	`36`	`{`
`37`	`37`	`throw new ArgumentException("The path must not end with a '/'", "pathMatch");`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// create branch`
`41`		`- IBuilder branchBuilder = app.New();`
	`41`	`+ var branchBuilder = app.New();`
`42`	`42`	`configuration(branchBuilder);`
`43`	`43`	`var branch = branchBuilder.Build();`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Builder`
`8`	`8`	`{`
`9`	`9`	`public static class RunExtensions`
`10`	`10`	`{`
`11`		`- public static void Run([NotNull] this IBuilder app, [NotNull] RequestDelegate handler)`
	`11`	`+ public static void Run([NotNull] this IApplicationBuilder app, [NotNull] RequestDelegate handler)`
`12`	`12`	`{`
`13`	`13`	`app.Use(_ => handler);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class UseExtensions`
`15`	`15`	`/// <param name="app"></param>`
`16`	`16`	`/// <param name="middleware">A function that handles the request or calls the given next function.</param>`
`17`	`17`	`/// <returns></returns>`
`18`		`- public static IBuilder Use(this IBuilder app, Func<HttpContext, Func<Task>, Task> middleware)`
	`18`	`+ public static IApplicationBuilder Use(this IApplicationBuilder app, Func<HttpContext, Func<Task>, Task> middleware)`
`19`	`19`	`{`
`20`	`20`	`return app.Use(next =>`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,17 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.AspNet.Builder`
`8`	`8`	`{`
`9`		`- public interface IBuilder`
	`9`	`+ public interface IApplicationBuilder`
`10`	`10`	`{`
`11`	`11`	`IServiceProvider ApplicationServices { get; set; }`
`12`	`12`
`13`	`13`	`IServerInformation Server { get; set; }`
`14`	`14`
`15`	`15`	`IDictionary<string, object> Properties { get; set; }`
`16`	`16`
`17`		`- IBuilder Use(Func<RequestDelegate, RequestDelegate> middleware);`
	`17`	`+ IApplicationBuilder Use(Func<RequestDelegate, RequestDelegate> middleware);`
`18`	`18`
`19`		`- IBuilder New();`
	`19`	`+ IApplicationBuilder New();`
`20`	`20`
`21`	`21`	`RequestDelegate Build();`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Builder`
`23`	`23`
`24`	`24`	`public static class OwinExtensions`
`25`	`25`	`{`
`26`		`- public static AddMiddleware UseOwin(this IBuilder builder)`
	`26`	`+ public static AddMiddleware UseOwin(this IApplicationBuilder builder)`
`27`	`27`	`{`
`28`	`28`	`AddMiddleware add = middleware =>`
`29`	`29`	`{`
`@@ -58,17 +58,17 @@ public static AddMiddleware UseOwin(this IBuilder builder)`
`58`	`58`	`return add;`
`59`	`59`	`}`
`60`	`60`
`61`		`- public static IBuilder UseOwin(this IBuilder builder, Action<AddMiddleware> pipeline)`
	`61`	`+ public static IApplicationBuilder UseOwin(this IApplicationBuilder builder, Action<AddMiddleware> pipeline)`
`62`	`62`	`{`
`63`	`63`	`pipeline(builder.UseOwin());`
`64`	`64`	`return builder;`
`65`	`65`	`}`
`66`	`66`
`67`		`- public static IBuilder UseBuilder(this AddMiddleware app)`
	`67`	`+ public static IApplicationBuilder UseBuilder(this AddMiddleware app)`
`68`	`68`	`{`
`69`	`69`	`// Adapt WebSockets by default.`
`70`	`70`	`app(OwinWebSocketAcceptAdapter.AdaptWebSockets);`
`71`		`- var builder = new Builder(serviceProvider: null);`
	`71`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`72`	`72`
`73`	`73`	`CreateMiddleware middleware = CreateMiddlewareFactory(exit =>`
`74`	`74`	`{`
`@@ -111,7 +111,7 @@ private static CreateMiddleware CreateMiddlewareFactory(Func<RequestDelegate, Re`
`111`	`111`	`};`
`112`	`112`	`}`
`113`	`113`
`114`		`- public static AddMiddleware UseBuilder(this AddMiddleware app, Action<IBuilder> pipeline)`
	`114`	`+ public static AddMiddleware UseBuilder(this AddMiddleware app, Action<IApplicationBuilder> pipeline)`
`115`	`115`	`{`
`116`	`116`	`var builder = app.UseBuilder();`
`117`	`117`	`pipeline(builder);`
Original file line number	Diff line number	Diff line change
`@@ -5,22 +5,21 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Threading.Tasks;`
`8`		`-using Microsoft.AspNet.Http;`
`9`	`8`	`using Microsoft.AspNet.Http.Infrastructure;`
`10`	`9`
`11`	`10`	`namespace Microsoft.AspNet.Builder`
`12`	`11`	`{`
`13`		`- public class Builder : IBuilder`
	`12`	`+ public class ApplicationBuilder : IApplicationBuilder`
`14`	`13`	`{`
`15`	`14`	`private readonly IList<Func<RequestDelegate, RequestDelegate>> _components = new List<Func<RequestDelegate, RequestDelegate>>();`
`16`	`15`
`17`		`- public Builder(IServiceProvider serviceProvider)`
	`16`	`+ public ApplicationBuilder(IServiceProvider serviceProvider)`
`18`	`17`	`{`
`19`	`18`	`Properties = new Dictionary<string, object>();`
`20`	`19`	`ApplicationServices = serviceProvider;`
`21`	`20`	`}`
`22`	`21`
`23`		`- private Builder(Builder builder)`
	`22`	`+ private ApplicationBuilder(ApplicationBuilder builder)`
`24`	`23`	`{`
`25`	`24`	`Properties = builder.Properties;`
`26`	`25`	`}`
`@@ -62,15 +61,15 @@ private void SetProperty<T>(string key, T value)`
`62`	`61`	`Properties[key] = value;`
`63`	`62`	`}`
`64`	`63`
`65`		`- public IBuilder Use(Func<RequestDelegate, RequestDelegate> middleware)`
	`64`	`+ public IApplicationBuilder Use(Func<RequestDelegate, RequestDelegate> middleware)`
`66`	`65`	`{`
`67`	`66`	`_components.Add(middleware);`
`68`	`67`	`return this;`
`69`	`68`	`}`
`70`	`69`
`71`		`- public IBuilder New()`
	`70`	`+ public IApplicationBuilder New()`
`72`	`71`	`{`
`73`		`- return new Builder(this);`
	`72`	`+ return new ApplicationBuilder(this);`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`public RequestDelegate Build()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Builder.Extensions`
`13`	`13`	`{`
`14`	`14`	`public class MapPathMiddlewareTests`
`15`	`15`	`{`
`16`		`- private static readonly Action<IBuilder> ActionNotImplemented = new Action<IBuilder>(_ => { throw new NotImplementedException(); });`
	`16`	`+ private static readonly Action<IApplicationBuilder> ActionNotImplemented = new Action<IApplicationBuilder>(_ => { throw new NotImplementedException(); });`
`17`	`17`
`18`	`18`	`private static Task Success(HttpContext context)`
`19`	`19`	`{`
`@@ -23,7 +23,7 @@ private static Task Success(HttpContext context)`
`23`	`23`	`return Task.FromResult<object>(null);`
`24`	`24`	`}`
`25`	`25`
`26`		`- private static void UseSuccess(IBuilder app)`
	`26`	`+ private static void UseSuccess(IApplicationBuilder app)`
`27`	`27`	`{`
`28`	`28`	`app.Run(Success);`
`29`	`29`	`}`
`@@ -33,16 +33,16 @@ private static Task NotImplemented(HttpContext context)`
`33`	`33`	`throw new NotImplementedException();`
`34`	`34`	`}`
`35`	`35`
`36`		`- private static void UseNotImplemented(IBuilder app)`
	`36`	`+ private static void UseNotImplemented(IApplicationBuilder app)`
`37`	`37`	`{`
`38`	`38`	`app.Run(NotImplemented);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`[Fact]`
`42`	`42`	`public void NullArguments_ArgumentNullException()`
`43`	`43`	`{`
`44`		`- var builder = new Builder(serviceProvider: null);`
`45`		`- var noMiddleware = new Builder(serviceProvider: null).Build();`
	`44`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
	`45`	`+ var noMiddleware = new ApplicationBuilder(serviceProvider: null).Build();`
`46`	`46`	`var noOptions = new MapOptions();`
`47`	`47`	`// TODO: [NotNull] Assert.Throws<ArgumentNullException>(() => builder.Map(null, ActionNotImplemented));`
`48`	`48`	`// TODO: [NotNull] Assert.Throws<ArgumentNullException>(() => builder.Map("/foo", (Action<IBuilder>)null));`
`@@ -61,7 +61,7 @@ public void NullArguments_ArgumentNullException()`
`61`	`61`	`public void PathMatchFunc_BranchTaken(string matchPath, string basePath, string requestPath)`
`62`	`62`	`{`
`63`	`63`	`HttpContext context = CreateRequest(basePath, requestPath);`
`64`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`64`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`65`	`65`	`builder.Map(matchPath, UseSuccess);`
`66`	`66`	`var app = builder.Build();`
`67`	`67`	`app.Invoke(context).Wait();`
`@@ -82,7 +82,7 @@ public void PathMatchFunc_BranchTaken(string matchPath, string basePath, string`
`82`	`82`	`public void PathMatchAction_BranchTaken(string matchPath, string basePath, string requestPath)`
`83`	`83`	`{`
`84`	`84`	`HttpContext context = CreateRequest(basePath, requestPath);`
`85`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`85`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`86`	`86`	`builder.Map(matchPath, subBuilder => subBuilder.Run(Success));`
`87`	`87`	`var app = builder.Build();`
`88`	`88`	`app.Invoke(context).Wait();`
`@@ -98,7 +98,7 @@ public void PathMatchAction_BranchTaken(string matchPath, string basePath, strin`
`98`	`98`	`[InlineData("/foo/cho/")]`
`99`	`99`	`public void MatchPathWithTrailingSlashThrowsException(string matchPath)`
`100`	`100`	`{`
`101`		`- Should.Throw<ArgumentException>(() => new Builder(serviceProvider: null).Map(matchPath, map => { }).Build());`
	`101`	`+ Should.Throw<ArgumentException>(() => new ApplicationBuilder(serviceProvider: null).Map(matchPath, map => { }).Build());`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`[Theory]`
`@@ -112,7 +112,7 @@ public void MatchPathWithTrailingSlashThrowsException(string matchPath)`
`112`	`112`	`public void PathMismatchFunc_PassedThrough(string matchPath, string basePath, string requestPath)`
`113`	`113`	`{`
`114`	`114`	`HttpContext context = CreateRequest(basePath, requestPath);`
`115`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`115`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`116`	`116`	`builder.Map(matchPath, UseNotImplemented);`
`117`	`117`	`builder.Run(Success);`
`118`	`118`	`var app = builder.Build();`
`@@ -134,7 +134,7 @@ public void PathMismatchFunc_PassedThrough(string matchPath, string basePath, st`
`134`	`134`	`public void PathMismatchAction_PassedThrough(string matchPath, string basePath, string requestPath)`
`135`	`135`	`{`
`136`	`136`	`HttpContext context = CreateRequest(basePath, requestPath);`
`137`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`137`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`138`	`138`	`builder.Map(matchPath, UseNotImplemented);`
`139`	`139`	`builder.Run(Success);`
`140`	`140`	`var app = builder.Build();`
`@@ -148,7 +148,7 @@ public void PathMismatchAction_PassedThrough(string matchPath, string basePath,`
`148`	`148`	`[Fact]`
`149`	`149`	`public void ChainedRoutes_Success()`
`150`	`150`	`{`
`151`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`151`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`152`	`152`	`builder.Map("/route1", map =>`
`153`	`153`	`{`
`154`	`154`	`map.Map((string)"/subroute1", UseSuccess);`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ private static Task Success(HttpContext context)`
`26`	`26`	`return Task.FromResult<object>(null);`
`27`	`27`	`}`
`28`	`28`
`29`		`- private static void UseSuccess(IBuilder app)`
	`29`	`+ private static void UseSuccess(IApplicationBuilder app)`
`30`	`30`	`{`
`31`	`31`	`app.Run(Success);`
`32`	`32`	`}`
`@@ -36,7 +36,7 @@ private static Task NotImplemented(HttpContext context)`
`36`	`36`	`throw new NotImplementedException();`
`37`	`37`	`}`
`38`	`38`
`39`		`- private static void UseNotImplemented(IBuilder app)`
	`39`	`+ private static void UseNotImplemented(IApplicationBuilder app)`
`40`	`40`	`{`
`41`	`41`	`app.Run(NotImplemented);`
`42`	`42`	`}`
`@@ -64,8 +64,8 @@ private Task<bool> FalsePredicateAsync(HttpContext context)`
`64`	`64`	`[Fact]`
`65`	`65`	`public void NullArguments_ArgumentNullException()`
`66`	`66`	`{`
`67`		`- var builder = new Builder(serviceProvider: null);`
`68`		`- var noMiddleware = new Builder(serviceProvider: null).Build();`
	`67`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
	`68`	`+ var noMiddleware = new ApplicationBuilder(serviceProvider: null).Build();`
`69`	`69`	`var noOptions = new MapWhenOptions();`
`70`	`70`	`// TODO: [NotNull] Assert.Throws<ArgumentNullException>(() => builder.MapWhen(null, UseNotImplemented));`
`71`	`71`	`// TODO: [NotNull] Assert.Throws<ArgumentNullException>(() => builder.MapWhen(NotImplementedPredicate, (Action<IBuilder>)null));`
`@@ -82,7 +82,7 @@ public void NullArguments_ArgumentNullException()`
`82`	`82`	`public void PredicateTrue_BranchTaken()`
`83`	`83`	`{`
`84`	`84`	`HttpContext context = CreateRequest();`
`85`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`85`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`86`	`86`	`builder.MapWhen(TruePredicate, UseSuccess);`
`87`	`87`	`var app = builder.Build();`
`88`	`88`	`app.Invoke(context).Wait();`
`@@ -94,7 +94,7 @@ public void PredicateTrue_BranchTaken()`
`94`	`94`	`public void PredicateTrueAction_BranchTaken()`
`95`	`95`	`{`
`96`	`96`	`HttpContext context = CreateRequest();`
`97`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`97`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`98`	`98`	`builder.MapWhen(TruePredicate, UseSuccess);`
`99`	`99`	`var app = builder.Build();`
`100`	`100`	`app.Invoke(context).Wait();`
`@@ -106,7 +106,7 @@ public void PredicateTrueAction_BranchTaken()`
`106`	`106`	`public void PredicateFalseAction_PassThrough()`
`107`	`107`	`{`
`108`	`108`	`HttpContext context = CreateRequest();`
`109`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`109`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`110`	`110`	`builder.MapWhen(FalsePredicate, UseNotImplemented);`
`111`	`111`	`builder.Run(Success);`
`112`	`112`	`var app = builder.Build();`
`@@ -119,7 +119,7 @@ public void PredicateFalseAction_PassThrough()`
`119`	`119`	`public void PredicateAsyncTrueAction_BranchTaken()`
`120`	`120`	`{`
`121`	`121`	`HttpContext context = CreateRequest();`
`122`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`122`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`123`	`123`	`builder.MapWhenAsync(TruePredicateAsync, UseSuccess);`
`124`	`124`	`var app = builder.Build();`
`125`	`125`	`app.Invoke(context).Wait();`
`@@ -131,7 +131,7 @@ public void PredicateAsyncTrueAction_BranchTaken()`
`131`	`131`	`public void PredicateAsyncFalseAction_PassThrough()`
`132`	`132`	`{`
`133`	`133`	`HttpContext context = CreateRequest();`
`134`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`134`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`135`	`135`	`builder.MapWhenAsync(FalsePredicateAsync, UseNotImplemented);`
`136`	`136`	`builder.Run(Success);`
`137`	`137`	`var app = builder.Build();`
`@@ -143,7 +143,7 @@ public void PredicateAsyncFalseAction_PassThrough()`
`143`	`143`	`[Fact]`
`144`	`144`	`public void ChainedPredicates_Success()`
`145`	`145`	`{`
`146`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`146`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`147`	`147`	`builder.MapWhen(TruePredicate, map1 =>`
`148`	`148`	`{`
`149`	`149`	`map1.MapWhen((Predicate)FalsePredicate, UseNotImplemented);`
`@@ -160,7 +160,7 @@ public void ChainedPredicates_Success()`
`160`	`160`	`[Fact]`
`161`	`161`	`public void ChainedPredicatesAsync_Success()`
`162`	`162`	`{`
`163`		`- IBuilder builder = new Builder(serviceProvider: null);`
	`163`	`+ var builder = new ApplicationBuilder(serviceProvider: null);`
`164`	`164`	`builder.MapWhenAsync(TruePredicateAsync, map1 =>`
`165`	`165`	`{`
`166`	`166`	`map1.MapWhenAsync((PredicateAsync)FalsePredicateAsync, UseNotImplemented);`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.AspNet.Builder.Tests`
`8`	`8`	`{`
`9`		`- public class BuilderTests`
	`9`	`+ public class ApplicationBuilderTests`
`10`	`10`	`{`
`11`	`11`	`[Fact]`
`12`	`12`	`public void BuildReturnsCallableDelegate()`
`13`	`13`	`{`
`14`		`- var builder = new Builder(null);`
	`14`	`+ var builder = new ApplicationBuilder(null);`
`15`	`15`	`var app = builder.Build();`
`16`	`16`
`17`	`17`	`var mockHttpContext = new Moq.Mock<HttpContext>();`