From 088f2f81cce16bffe826123ce0063d52b5903296 Mon Sep 17 00:00:00 2001
From: Hao Kung <haok@microsoft.com>
Date: Wed, 2 Sep 2015 14:26:42 -0700
Subject: [PATCH] React to options

---
 .../ElmCaptureMiddleware.cs                   |  2 +-
 .../ElmExtensions.cs                          |  2 +-
 .../ElmPageMiddleware.cs                      |  2 +-
 .../ElmMiddlewareTest.cs                      | 19 +++++++------------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs
index 10fbcd0ac5..5127ca4785 100644
--- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Elm/ElmCaptureMiddleware.cs
@@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Diagnostics.Elm
         public ElmCaptureMiddleware(RequestDelegate next, ILoggerFactory factory, IOptions<ElmOptions> options)
         {
             _next = next;
-            _options = options.Options;
+            _options = options.Value;
             _logger = factory.CreateLogger<ElmCaptureMiddleware>();
         }
 
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs
index 3dd826b3c4..10a2c4255c 100644
--- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Elm/ElmExtensions.cs
@@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Builder
             var factory = builder.ApplicationServices.GetRequiredService<ILoggerFactory>();
             var store = builder.ApplicationServices.GetRequiredService<ElmStore>();
             var options = builder.ApplicationServices.GetService<IOptions<ElmOptions>>();
-            factory.AddProvider(new ElmLoggerProvider(store, options?.Options ?? new ElmOptions()));
+            factory.AddProvider(new ElmLoggerProvider(store, options?.Value ?? new ElmOptions()));
 
             return builder.UseMiddleware<ElmCaptureMiddleware>();
         }
diff --git a/src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs
index 33f94e9585..05650772ec 100644
--- a/src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs
+++ b/src/Microsoft.AspNet.Diagnostics.Elm/ElmPageMiddleware.cs
@@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Diagnostics.Elm
         public ElmPageMiddleware(RequestDelegate next, IOptions<ElmOptions> options, ElmStore store)
         {
             _next = next;
-            _options = options.Options;
+            _options = options.Value;
             _store = store;
         }
 
diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
index 3da25074b4..e9fdcba463 100644
--- a/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
+++ b/test/Microsoft.AspNet.Diagnostics.Tests/ElmMiddlewareTest.cs
@@ -44,9 +44,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
             var factory = new LoggerFactory();
             var optionsMock = new Mock<IOptions<ElmOptions>>();
             optionsMock
-                .SetupGet(o => o.Options)
+                .SetupGet(o => o.Value)
                 .Returns(new ElmOptions());
-            factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Options));
+            factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Value));
 
             RequestDelegate next = _ =>
             {
@@ -81,9 +81,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
             var factory = new LoggerFactory();
             var optionsMock = new Mock<IOptions<ElmOptions>>();
             optionsMock
-                .SetupGet(o => o.Options)
+                .SetupGet(o => o.Value)
                 .Returns(new ElmOptions());
-            factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Options));
+            factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Value));
 
             RequestDelegate next = _ =>
             {
@@ -129,9 +129,9 @@ namespace Microsoft.AspNet.Diagnostics.Tests
             var factory = new LoggerFactory();
             var optionsMock = new Mock<IOptions<ElmOptions>>();
             optionsMock
-                .SetupGet(o => o.Options)
+                .SetupGet(o => o.Value)
                 .Returns(new ElmOptions());
-            factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Options));
+            factory.AddProvider(new ElmLoggerProvider(elmStore, optionsMock.Object.Value));
 
             RequestDelegate next = _ =>
             {
@@ -311,18 +311,13 @@ namespace Microsoft.AspNet.Diagnostics.Tests
                 _innerOptions = innerOptions;
             }
 
-            public ElmOptions Options
+            public ElmOptions Value
             {
                 get
                 {
                     return _innerOptions;
                 }
             }
-
-            public ElmOptions GetNamedOptions(string name)
-            {
-                return _innerOptions;
-            }
         }
     }
 }