From 52388e89f87909c726645c2a60d3fd4f913faf94 Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Sat, 15 Aug 2015 01:25:49 -0700
Subject: [PATCH] Removed builder arg parameter from IStartupFilter - It broke
 the composition model by allowing you to reach out to the original app
 builder. This breaks the ability to properly wrap and have all configure
 methods see the wrapper.

---
 .../Internal/AutoRequestServicesStartupFilter.cs              | 4 ++--
 src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs        | 2 +-
 src/Microsoft.AspNet.Hosting/Startup/IStartupFilter.cs        | 3 +--
 test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs       | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNet.Hosting/Internal/AutoRequestServicesStartupFilter.cs b/src/Microsoft.AspNet.Hosting/Internal/AutoRequestServicesStartupFilter.cs
index 205440b5fe..2ae344670e 100644
--- a/src/Microsoft.AspNet.Hosting/Internal/AutoRequestServicesStartupFilter.cs
+++ b/src/Microsoft.AspNet.Hosting/Internal/AutoRequestServicesStartupFilter.cs
@@ -9,11 +9,11 @@ namespace Microsoft.AspNet.Hosting.Internal
 {
     public class AutoRequestServicesStartupFilter : IStartupFilter
     {
-        public Action<IApplicationBuilder> Configure(IApplicationBuilder app, Action<IApplicationBuilder> next)
+        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
         {
             return builder =>
             {
-                app.UseMiddleware<RequestServicesContainerMiddleware>();
+                builder.UseMiddleware<RequestServicesContainerMiddleware>();
                 next(builder);
             };
         }
diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs b/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
index 04b77d4113..79aa7774dd 100644
--- a/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
+++ b/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
@@ -151,7 +151,7 @@ namespace Microsoft.AspNet.Hosting.Internal
             var configure = Startup.ConfigureDelegate;
             foreach (var filter in startupFilters)
             {
-                configure = filter.Configure(builder, configure);
+                configure = filter.Configure(configure);
             }
 
             configure(builder);
diff --git a/src/Microsoft.AspNet.Hosting/Startup/IStartupFilter.cs b/src/Microsoft.AspNet.Hosting/Startup/IStartupFilter.cs
index 437a841e89..79bf34401e 100644
--- a/src/Microsoft.AspNet.Hosting/Startup/IStartupFilter.cs
+++ b/src/Microsoft.AspNet.Hosting/Startup/IStartupFilter.cs
@@ -8,7 +8,6 @@ namespace Microsoft.AspNet.Hosting.Startup
 {
     public interface IStartupFilter
     {
-        // TODO: replace with ConfigureDelegate?
-        Action<IApplicationBuilder> Configure(IApplicationBuilder app, Action<IApplicationBuilder> next);
+        Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next);
     }
 }
diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs
index 94b9afce84..c4b486ca45 100644
--- a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs
+++ b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs
@@ -78,11 +78,11 @@ namespace Microsoft.AspNet.TestHost
 
         public class RequestServicesFilter : IStartupFilter
         {
-            public Action<IApplicationBuilder> Configure(IApplicationBuilder app, Action<IApplicationBuilder> next)
+            public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
             {
                 return builder =>
                 {
-                    app.UseMiddleware<TestRequestServiceMiddleware>();
+                    builder.UseMiddleware<TestRequestServiceMiddleware>();
                     next(builder);
                 };
             }