From e384b7d4d0c4558466c3657104600cd6670f43b4 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 15 Dec 2015 11:07:16 -0800 Subject: [PATCH] Remove ErrorPageOptions --- .../DeveloperExceptionPageExtensions.cs | 6 ++-- .../DeveloperExceptionPageMiddleware.cs | 4 +-- .../DeveloperExceptionPageOptions.cs | 31 +------------------ .../Views/CompilationErrorModel.cs | 2 +- .../Views/ErrorPageModel.cs | 2 +- .../DeveloperExceptionPageMiddlewareTest.cs | 8 ++--- 6 files changed, 12 insertions(+), 41 deletions(-) diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs index 6a374be753..28d652cb50 100644 --- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs +++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageExtensions.cs @@ -30,11 +30,11 @@ namespace Microsoft.AspNet.Builder /// Captures synchronous and asynchronous instances from the pipeline and generates HTML error responses. /// /// The . - /// A callback to configure . + /// A callback to configure . /// A reference to the after the operation has completed. public static IApplicationBuilder UseDeveloperExceptionPage( this IApplicationBuilder builder, - Action configureOptions) + Action configureOptions) { if (builder == null) { @@ -46,7 +46,7 @@ namespace Microsoft.AspNet.Builder throw new ArgumentNullException(nameof(configureOptions)); } - var options = new ErrorPageOptions(); + var options = new DeveloperExceptionPageOptions(); configureOptions(options); return builder.UseMiddleware(options); } diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs index dd37e91f7d..47133d8724 100644 --- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs +++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageMiddleware.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Diagnostics public class DeveloperExceptionPageMiddleware { private readonly RequestDelegate _next; - private readonly ErrorPageOptions _options; + private readonly DeveloperExceptionPageOptions _options; private static readonly bool IsMono = Type.GetType("Mono.Runtime") != null; private readonly ILogger _logger; private readonly IFileProvider _fileProvider; @@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Diagnostics /// public DeveloperExceptionPageMiddleware( RequestDelegate next, - ErrorPageOptions options, + DeveloperExceptionPageOptions options, ILoggerFactory loggerFactory, IApplicationEnvironment appEnvironment, DiagnosticSource diagnosticSource) diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs index 59813d9d53..a6d112f6bd 100644 --- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs +++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/DeveloperExceptionPageOptions.cs @@ -6,36 +6,7 @@ using Microsoft.AspNet.FileProviders; namespace Microsoft.AspNet.Diagnostics { /// - /// Options for the ErrorPageMiddleware. - /// - public class ErrorPageOptions - { - /// - /// Create an instance with the default options settings. - /// - public ErrorPageOptions() - { - SourceCodeLineCount = 6; - } - - /// - /// Determines how many lines of code to include before and after the line of code - /// present in an exception's stack frame. Only applies when symbols are available and - /// source code referenced by the exception stack trace is present on the server. - /// - public int SourceCodeLineCount { get; set; } - - /// - /// Provides files containing source code used to display contextual information of an exception. - /// - /// - /// If null will use a . - /// - public IFileProvider FileProvider { get; set; } - } - - /// - /// Options for the DeveloperExceptionPageMiddleware. + /// Options for the . /// public class DeveloperExceptionPageOptions { diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs index 46676c7e47..cd92acb378 100644 --- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs +++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/CompilationErrorModel.cs @@ -13,7 +13,7 @@ namespace Microsoft.AspNet.Diagnostics.Views /// /// Options for what output to display. /// - public ErrorPageOptions Options { get; set; } + public DeveloperExceptionPageOptions Options { get; set; } /// /// Detailed information about each parse or compilation error. diff --git a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs index ce641bc17e..20f7e1f83c 100644 --- a/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs +++ b/src/Microsoft.AspNet.Diagnostics/DeveloperExceptionPage/Views/ErrorPageModel.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Diagnostics.Views /// /// Options for what output to display. /// - public ErrorPageOptions Options { get; set; } + public DeveloperExceptionPageOptions Options { get; set; } /// /// Detailed information about each exception in the stack. diff --git a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs b/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs index 6ba071931c..7bd1840cb3 100644 --- a/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs +++ b/test/Microsoft.AspNet.Diagnostics.Tests/DeveloperExceptionPageMiddlewareTest.cs @@ -293,17 +293,17 @@ namespace Microsoft.AspNet.Diagnostics private DeveloperExceptionPageMiddleware GetErrorPageMiddleware( IFileProvider fileProvider = null, int sourceCodeLineCount = 6) { - var errorPageOptions = new ErrorPageOptions(); - errorPageOptions.SourceCodeLineCount = sourceCodeLineCount; + var options = new DeveloperExceptionPageOptions(); + options.SourceCodeLineCount = sourceCodeLineCount; if (fileProvider != null) { - errorPageOptions.FileProvider = fileProvider; + options.FileProvider = fileProvider; } var middleware = new DeveloperExceptionPageMiddleware( (httpContext) => { return Task.FromResult(0); }, - errorPageOptions, + options, new LoggerFactory(), new TestApplicationEnvironment(), new DiagnosticListener("Microsoft.Aspnet"));