Stardardizing option initialization using lambdas

JunTaoLuo · JunTaoLuo · commit fe41412eeb78 · 2015-12-21T16:44:01.000-08:00
diff --git a/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs b/src/Microsoft.AspNet.WebSockets.Server/WebSocketMiddlewareExtensions.cs
@@ -1,6 +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.
 
+using System;
 using Microsoft.AspNet.WebSockets.Server;
 
 namespace Microsoft.AspNet.Builder
@@ -9,11 +10,28 @@ public static class WebSocketMiddlewareExtensions
     {
         public static IApplicationBuilder UseWebSockets(this IApplicationBuilder builder)
         {
-            return builder.UseWebSockets(new WebSocketOptions());
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return builder.UseWebSockets(options => { });
         }
 
-        public static IApplicationBuilder UseWebSockets(this IApplicationBuilder builder, WebSocketOptions options) // TODO: [NotNull]
+        public static IApplicationBuilder UseWebSockets(this IApplicationBuilder builder, Action<WebSocketOptions> configureOptions)
         {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+            if (configureOptions == null)
+            {
+                throw new ArgumentNullException(nameof(configureOptions));
+            }
+
+            var options = new WebSocketOptions();
+            configureOptions(options);
+
             return builder.Use(next => new WebSocketMiddleware(next, options).Invoke);
         }
     }
diff --git a/test/AutobahnTestServer/Startup.cs b/test/AutobahnTestServer/Startup.cs
@@ -8,7 +8,6 @@
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.WebSockets.Server;
 
 namespace AutobahnTestServer
 {
@@ -19,9 +18,9 @@ public void Configure(IApplicationBuilder app)
             app.Map("/Managed", managedWebSocketsApp =>
             {
                 // Comment this out to test native server implementations
-                managedWebSocketsApp.UseWebSockets(new WebSocketOptions()
+                managedWebSocketsApp.UseWebSockets(options =>
                 {
-                    ReplaceFeature = true,
+                    options.ReplaceFeature = true;
                 });
 
                 managedWebSocketsApp.Use(async (context, next) =>

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`using Microsoft.AspNet.Builder;`
`9`	`9`	`using Microsoft.AspNet.Hosting;`
`10`	`10`	`using Microsoft.AspNet.Http;`
`11`		`-using Microsoft.AspNet.WebSockets.Server;`
`12`	`11`
`13`	`12`	`namespace AutobahnTestServer`
`14`	`13`	`{`
`@@ -19,9 +18,9 @@ public void Configure(IApplicationBuilder app)`
`19`	`18`	`app.Map("/Managed", managedWebSocketsApp =>`
`20`	`19`	`{`
`21`	`20`	`// Comment this out to test native server implementations`
`22`		`- managedWebSocketsApp.UseWebSockets(new WebSocketOptions()`
	`21`	`+ managedWebSocketsApp.UseWebSockets(options =>`
`23`	`22`	`{`
`24`		`- ReplaceFeature = true,`
	`23`	`+ options.ReplaceFeature = true;`
`25`	`24`	`});`
`26`	`25`
`27`	`26`	`managedWebSocketsApp.Use(async (context, next) =>`