diff --git a/samples/JsonPatchSample.Web/Controllers/HomeController.cs b/samples/JsonPatchSample.Web/Controllers/HomeController.cs index ce15653b27..e5f1febdd5 100644 --- a/samples/JsonPatchSample.Web/Controllers/HomeController.cs +++ b/samples/JsonPatchSample.Web/Controllers/HomeController.cs @@ -22,14 +22,14 @@ namespace JsonPatchSample.Web.Controllers if (!ModelState.IsValid) { - return HttpBadRequest(ModelState); + return BadRequest(ModelState); } return new ObjectResult(customer); } else { - return HttpBadRequest(ModelState); + return BadRequest(ModelState); } } @@ -44,7 +44,7 @@ namespace JsonPatchSample.Web.Controllers if (!ModelState.IsValid) { - return HttpBadRequest(ModelState); + return BadRequest(ModelState); } return new ObjectResult(customer); diff --git a/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs index 59816a7a07..69025ee49d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs @@ -6,10 +6,10 @@ using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Mvc { /// - /// A that when + /// A that when /// executed will produce a Bad Request (400) response. /// - public class BadRequestResult : HttpStatusCodeResult + public class BadRequestResult : StatusCodeResult { /// /// Creates a new instance. diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs b/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs index ae2e3cc89b..e44e9795e3 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs @@ -289,22 +289,22 @@ namespace Microsoft.AspNetCore.Mvc } /// - /// Creates a object that produces an empty OK (200) response. + /// Creates a object that produces an empty OK (200) response. /// - /// The created for the response. + /// The created for the response. [NonAction] - public virtual HttpOkResult Ok() + public virtual OkResult Ok() { - return new HttpOkResult(); + return new OkResult(); } /// - /// Creates an object that produces an OK (200) response. + /// Creates an object that produces an OK (200) response. /// /// The content value to format in the entity body. - /// The created for the response. + /// The created for the response. [NonAction] - public virtual HttpOkObjectResult Ok(object value) + public virtual OkObjectResult Ok(object value) { var disposableValue = value as IDisposable; if (disposableValue != null) @@ -312,7 +312,7 @@ namespace Microsoft.AspNetCore.Mvc Response.RegisterForDispose(disposableValue); } - return new HttpOkObjectResult(value); + return new OkObjectResult(value); } /// @@ -701,31 +701,31 @@ namespace Microsoft.AspNetCore.Mvc } /// - /// Creates an that produces an Unauthorized (401) response. + /// Creates an that produces an Unauthorized (401) response. /// - /// The created for the response. + /// The created for the response. [NonAction] - public virtual HttpUnauthorizedResult Unauthorized() + public virtual UnauthorizedResult Unauthorized() { - return new HttpUnauthorizedResult(); + return new UnauthorizedResult(); } /// - /// Creates an that produces a Not Found (404) response. + /// Creates an that produces a Not Found (404) response. /// - /// The created for the response. + /// The created for the response. [NonAction] - public virtual HttpNotFoundResult NotFound() + public virtual NotFoundResult NotFound() { - return new HttpNotFoundResult(); + return new NotFoundResult(); } /// - /// Creates an that produces a Not Found (404) response. + /// Creates an that produces a Not Found (404) response. /// - /// The created for the response. + /// The created for the response. [NonAction] - public virtual HttpNotFoundObjectResult NotFound(object value) + public virtual NotFoundObjectResult NotFound(object value) { var disposableValue = value as IDisposable; if (disposableValue != null) @@ -733,7 +733,7 @@ namespace Microsoft.AspNetCore.Mvc Response.RegisterForDispose(disposableValue); } - return new HttpNotFoundObjectResult(value); + return new NotFoundObjectResult(value); } /// diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/AuthorizationFilterAttribute.cs b/src/Microsoft.AspNetCore.Mvc.Core/Filters/AuthorizationFilterAttribute.cs index 10c9925aae..8b0b8ce38d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Filters/AuthorizationFilterAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Filters/AuthorizationFilterAttribute.cs @@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters throw new ArgumentNullException(nameof(context)); } - context.Result = new HttpUnauthorizedResult(); + context.Result = new UnauthorizedResult(); } } } diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs b/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs index 45df47ee4b..b9f7903df2 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs @@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters if (contentType == null) { // no contentType exists for the format, return 404 - context.Result = new HttpNotFoundResult(); + context.Result = new NotFoundResult(); return; } @@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters // type than requested e.g. OK if "text/*" requested and action supports "text/plain". if (!IsSuperSetOfAnySupportedMediaType(contentType, supportedMediaTypes)) { - context.Result = new HttpNotFoundResult(); + context.Result = new NotFoundResult(); } } } diff --git a/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs index 862165fb4f..09a700398e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Mvc { - public class NoContentResult : HttpStatusCodeResult + public class NoContentResult : StatusCodeResult { public NoContentResult() : base(StatusCodes.Status204NoContent) diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpNotFoundObjectResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs similarity index 76% rename from src/Microsoft.AspNetCore.Mvc.Core/HttpNotFoundObjectResult.cs rename to src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs index 28b657bb84..9260784017 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/HttpNotFoundObjectResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs @@ -8,13 +8,13 @@ namespace Microsoft.AspNetCore.Mvc /// /// An that when executed will produce a Not Found (404) response. /// - public class HttpNotFoundObjectResult : ObjectResult + public class NotFoundObjectResult : ObjectResult { /// - /// Creates a new instance. + /// Creates a new instance. /// /// The value to format in the entity body. - public HttpNotFoundObjectResult(object value) + public NotFoundObjectResult(object value) : base(value) { StatusCode = StatusCodes.Status404NotFound; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpNotFoundResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs similarity index 60% rename from src/Microsoft.AspNetCore.Mvc.Core/HttpNotFoundResult.cs rename to src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs index 3b2be91999..b4b7de1600 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/HttpNotFoundResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs @@ -6,15 +6,15 @@ using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Mvc { /// - /// Represents an that when + /// Represents an that when /// executed will produce a Not Found (404) response. /// - public class HttpNotFoundResult : HttpStatusCodeResult + public class NotFoundResult : StatusCodeResult { /// - /// Creates a new instance. + /// Creates a new instance. /// - public HttpNotFoundResult() : base(StatusCodes.Status404NotFound) + public NotFoundResult() : base(StatusCodes.Status404NotFound) { } } diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpOkObjectResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs similarity index 79% rename from src/Microsoft.AspNetCore.Mvc.Core/HttpOkObjectResult.cs rename to src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs index 7244bb01d3..2990ffc843 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/HttpOkObjectResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs @@ -9,13 +9,13 @@ namespace Microsoft.AspNetCore.Mvc /// An that when executed performs content negotiation, formats the entity body, and /// will produce a response if negotiation and formatting succeed. /// - public class HttpOkObjectResult : ObjectResult + public class OkObjectResult : ObjectResult { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The content to format into the entity body. - public HttpOkObjectResult(object value) + public OkObjectResult(object value) : base(value) { StatusCode = StatusCodes.Status200OK; diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpOkResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs similarity index 64% rename from src/Microsoft.AspNetCore.Mvc.Core/HttpOkResult.cs rename to src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs index 5e77c902c0..49cd649c99 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/HttpOkResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs @@ -6,15 +6,15 @@ using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Mvc { /// - /// An that when executed will produce an empty + /// An that when executed will produce an empty /// response. /// - public class HttpOkResult : HttpStatusCodeResult + public class OkResult : StatusCodeResult { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public HttpOkResult() + public OkResult() : base(StatusCodes.Status200OK) { } diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs b/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs index cee2a92219..003ecfaa54 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Mvc // body correctly. if (!string.Equals(filterContext.HttpContext.Request.Method, "GET", StringComparison.OrdinalIgnoreCase)) { - filterContext.Result = new HttpStatusCodeResult(StatusCodes.Status403Forbidden); + filterContext.Result = new StatusCodeResult(StatusCodes.Status403Forbidden); } else { diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpStatusCodeResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs similarity index 84% rename from src/Microsoft.AspNetCore.Mvc.Core/HttpStatusCodeResult.cs rename to src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs index b47140cd55..614d604a55 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/HttpStatusCodeResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs @@ -12,14 +12,14 @@ namespace Microsoft.AspNetCore.Mvc /// Represents an that when executed will /// produce an HTTP response with the given response status code. /// - public class HttpStatusCodeResult : ActionResult + public class StatusCodeResult : ActionResult { /// - /// Initializes a new instance of the class + /// Initializes a new instance of the class /// with the given . /// /// The HTTP status code of the response. - public HttpStatusCodeResult(int statusCode) + public StatusCodeResult(int statusCode) { StatusCode = statusCode; } @@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Mvc } var factory = context.HttpContext.RequestServices.GetRequiredService(); - var logger = factory.CreateLogger(); + var logger = factory.CreateLogger(); logger.HttpStatusCodeResultExecuting(StatusCode); diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpUnauthorizedResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs similarity index 59% rename from src/Microsoft.AspNetCore.Mvc.Core/HttpUnauthorizedResult.cs rename to src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs index ad3012359d..a92106ec84 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/HttpUnauthorizedResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs @@ -6,15 +6,15 @@ using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Mvc { /// - /// Represents an that when + /// Represents an that when /// executed will produce an Unauthorized (401) response. /// - public class HttpUnauthorizedResult : HttpStatusCodeResult + public class UnauthorizedResult : StatusCodeResult { /// - /// Creates a new instance. + /// Creates a new instance. /// - public HttpUnauthorizedResult() : base(StatusCodes.Status401Unauthorized) + public UnauthorizedResult() : base(StatusCodes.Status401Unauthorized) { } } diff --git a/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs b/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs index cb6a6b287f..445ded67d0 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs @@ -6,10 +6,10 @@ using Microsoft.AspNetCore.Http; namespace Microsoft.AspNetCore.Mvc { /// - /// A that when + /// A that when /// executed will produce a UnsupportedMediaType (415) response. /// - public class UnsupportedMediaTypeResult : HttpStatusCodeResult + public class UnsupportedMediaTypeResult : StatusCodeResult { /// /// Creates a new instance of . diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilter.cs b/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilter.cs index fdbf6cf2fb..d9db05ce91 100644 --- a/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilter.cs @@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Mvc.Cors.Internal { // If this was a preflight, there is no need to run anything else. // Also the response is always 200 so that anyone after mvc can handle the pre flight request. - context.Result = new HttpStatusCodeResult(StatusCodes.Status200OK); + context.Result = new StatusCodeResult(StatusCodes.Status200OK); } // Continue with other filters and action. diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs b/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs index a8a6d5d9dd..88e92b31ff 100644 --- a/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Mvc.Cors.Internal !StringValues.IsNullOrEmpty(accessControlRequestMethod)) { // Short circuit if the request is preflight as that should not result in action execution. - context.Result = new HttpStatusCodeResult(StatusCodes.Status200OK); + context.Result = new StatusCodeResult(StatusCodes.Status200OK); } // Let the action be executed. diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs index 2369081ccf..67caebc099 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ApiController.cs @@ -415,35 +415,35 @@ namespace System.Web.Http } /// - /// Creates an (404 Not Found). + /// Creates an (404 Not Found). /// - /// A . + /// A . [NonAction] - public virtual HttpNotFoundResult NotFound() + public virtual NotFoundResult NotFound() { - return new HttpNotFoundResult(); + return new NotFoundResult(); } /// - /// Creates an (200 OK). + /// Creates an (200 OK). /// - /// An . + /// An . [NonAction] - public virtual HttpOkResult Ok() + public virtual OkResult Ok() { - return new HttpOkResult(); + return new OkResult(); } /// - /// Creates an (200 OK) with the specified values. + /// Creates an (200 OK) with the specified values. /// /// The type of content in the entity body. /// The content value to negotiate and format in the entity body. - /// An with the specified values. + /// An with the specified values. [NonAction] - public virtual HttpOkObjectResult Ok(T content) + public virtual OkObjectResult Ok(T content) { - return new HttpOkObjectResult(content); + return new OkObjectResult(content); } /// @@ -531,14 +531,14 @@ namespace System.Web.Http } /// - /// Creates a with the specified status code. + /// Creates a with the specified status code. /// /// The HTTP status code for the response message - /// A with the specified status code. + /// A with the specified status code. [NonAction] - public virtual HttpStatusCodeResult StatusCode(HttpStatusCode status) + public virtual StatusCodeResult StatusCode(HttpStatusCode status) { - return new HttpStatusCodeResult((int)status); + return new StatusCodeResult((int)status); } /// diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs index a476a1dc15..ee83c08611 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/ConflictResult.cs @@ -9,7 +9,7 @@ namespace System.Web.Http /// /// An action result that returns an empty response. /// - public class ConflictResult : HttpStatusCodeResult + public class ConflictResult : StatusCodeResult { /// /// Initializes a new instance of the class. diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs index c2f88a6132..840f439645 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/InternalServerErrorResult.cs @@ -9,7 +9,7 @@ namespace System.Web.Http /// /// An action result that returns an empty response. /// - public class InternalServerErrorResult : HttpStatusCodeResult + public class InternalServerErrorResult : StatusCodeResult { /// /// Initializes a new instance of the class. diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs index 8551781d81..4a242750de 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs @@ -765,10 +765,10 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var controller = new TestableController(); // Act - var result = controller.HttpUnauthorized(); + var result = controller.Unauthorized(); // Assert - Assert.IsType(result); + Assert.IsType(result); Assert.Equal(StatusCodes.Status401Unauthorized, result.StatusCode); } @@ -779,10 +779,10 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var controller = new TestableController(); // Act - var result = controller.HttpNotFound(); + var result = controller.NotFound(); // Assert - Assert.IsType(result); + Assert.IsType(result); Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode); } @@ -793,10 +793,10 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var controller = new TestableController(); // Act - var result = controller.HttpNotFound("Test Content"); + var result = controller.NotFound("Test Content"); // Assert - Assert.IsType(result); + Assert.IsType(result); Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode); Assert.Equal("Test Content", result.Value); } @@ -814,10 +814,10 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var input = new DisposableObject(); // Act - var result = controller.HttpNotFound(input); + var result = controller.NotFound(input); // Assert - Assert.IsType(result); + Assert.IsType(result); Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode); Assert.Same(input, result.Value); mockHttpContext.Verify( @@ -835,7 +835,7 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var result = controller.Ok(); // Assert - Assert.IsType(result); + Assert.IsType(result); Assert.Equal(StatusCodes.Status200OK, result.StatusCode); } @@ -855,7 +855,7 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var result = controller.Ok(input); // Assert - Assert.IsType(result); + Assert.IsType(result); Assert.Equal(StatusCodes.Status200OK, result.StatusCode); Assert.Same(input, result.Value); mockHttpContext.Verify( @@ -870,7 +870,7 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var controller = new TestableController(); // Act - var result = controller.HttpBadRequest(); + var result = controller.BadRequest(); // Assert Assert.IsType(result); @@ -885,7 +885,7 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var obj = new object(); // Act - var result = controller.HttpBadRequest(obj); + var result = controller.BadRequest(obj); // Assert Assert.IsType(result); @@ -906,7 +906,7 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var input = new DisposableObject(); // Act - var result = controller.HttpBadRequest(input); + var result = controller.BadRequest(input); // Assert Assert.IsType(result); @@ -924,7 +924,7 @@ namespace Microsoft.AspNetCore.Mvc.Core.Test var controller = new TestableController(); // Act - var result = controller.HttpBadRequest(new ModelStateDictionary()); + var result = controller.BadRequest(new ModelStateDictionary()); // Assert Assert.IsType(result); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs index ab65033e62..01a659f326 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs @@ -149,7 +149,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters // Assert var actionResult = resourceExecutingContext.Result; - Assert.IsType(actionResult); + Assert.IsType(actionResult); } [Fact] @@ -230,7 +230,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters // Assert var actionResult = resourceExecutingContext.Result; - Assert.IsType(actionResult); + Assert.IsType(actionResult); } [Theory] @@ -255,7 +255,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters filter.OnResourceExecuting(resourceExecutingContext); // Assert - var result = Assert.IsType(resourceExecutingContext.Result); + var result = Assert.IsType(resourceExecutingContext.Result); } [Theory] diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs index 833364b14d..df65f759d1 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Mvc public void HttpNotFoundObjectResult_InitializesStatusCode() { // Arrange & act - var notFound = new HttpNotFoundObjectResult(null); + var notFound = new NotFoundObjectResult(null); // Assert Assert.Equal(StatusCodes.Status404NotFound, notFound.StatusCode); @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Mvc public void HttpNotFoundObjectResult_InitializesStatusCodeAndResponseContent() { // Arrange & act - var notFound = new HttpNotFoundObjectResult("Test Content"); + var notFound = new NotFoundObjectResult("Test Content"); // Assert Assert.Equal(StatusCodes.Status404NotFound, notFound.StatusCode); @@ -48,7 +48,7 @@ namespace Microsoft.AspNetCore.Mvc HttpContext = httpContext, }; - var result = new HttpNotFoundObjectResult("Test Content"); + var result = new NotFoundObjectResult("Test Content"); // Act await result.ExecuteResultAsync(actionContext); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs index 25494b017f..a70c66e334 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc public void HttpNotFoundResult_InitializesStatusCode() { // Arrange & act - var notFound = new HttpNotFoundResult(); + var notFound = new NotFoundResult(); // Assert Assert.Equal(StatusCodes.Status404NotFound, notFound.StatusCode); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs index d1927d6301..677767418a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Mvc public void HttpOkObjectResult_InitializesStatusCodeAndValue(object value) { // Arrange & Act - var result = new HttpOkObjectResult(value); + var result = new OkObjectResult(value); // Assert Assert.Equal(StatusCodes.Status200OK, result.StatusCode); @@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Mvc public async Task HttpOkObjectResult_SetsStatusCode(object value) { // Arrange - var result = new HttpOkObjectResult(value); + var result = new OkObjectResult(value); var httpContext = new DefaultHttpContext { diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs index d074ea520b..679632c61e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Mvc public void HttpOkResult_InitializesStatusCode() { // Arrange & Act - var result = new HttpOkResult(); + var result = new OkResult(); // Assert Assert.Equal(StatusCodes.Status200OK, result.StatusCode); @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Mvc httpContext.RequestServices = CreateServices().BuildServiceProvider(); var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor()); - var result = new HttpOkResult(); + var result = new OkResult(); // Act await result.ExecuteResultAsync(context); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs index 6fabcdc496..00539b7f21 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Mvc public void HttpStatusCodeResult_ExecuteResultSetsResponseStatusCode() { // Arrange - var result = new HttpStatusCodeResult(StatusCodes.Status404NotFound); + var result = new StatusCodeResult(StatusCodes.Status404NotFound); var httpContext = GetHttpContext(); var routeData = new RouteData(); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs index 5206780376..2f51646fac 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs @@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc public void HttpUnauthorizedResult_InitializesStatusCode() { // Arrange & act - var result = new HttpUnauthorizedResult(); + var result = new UnauthorizedResult(); // Assert Assert.Equal(StatusCodes.Status401Unauthorized, result.StatusCode); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizeFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizeFilterTest.cs index 018a05678b..f20b809746 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizeFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/AuthorizeFilterTest.cs @@ -219,7 +219,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal var authorizationContext = GetAuthorizationContext(services => services.AddSingleton(authorizationService.Object)); - authorizationContext.Result = new HttpUnauthorizedResult(); + authorizationContext.Result = new UnauthorizedResult(); // Act await authorizeFilter.OnAuthorizationAsync(authorizationContext); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs index 273b9db710..41c16d7fc2 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs @@ -119,7 +119,7 @@ namespace Microsoft.AspNetCore.Mvc // Assert Assert.NotNull(authContext.Result); - var result = Assert.IsType(authContext.Result); + var result = Assert.IsType(authContext.Result); Assert.Equal(StatusCodes.Status403Forbidden, result.StatusCode); } @@ -137,7 +137,7 @@ namespace Microsoft.AspNetCore.Mvc attr.OnAuthorization(authContext); // Assert - var result = Assert.IsType(authContext.Result); + var result = Assert.IsType(authContext.Result); Assert.Equal(StatusCodes.Status404NotFound, result.StatusCode); } @@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Mvc { protected override void HandleNonHttpsRequest(AuthorizationFilterContext filterContext) { - filterContext.Result = new HttpStatusCodeResult(StatusCodes.Status404NotFound); + filterContext.Result = new StatusCodeResult(StatusCodes.Status404NotFound); } } diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs index 1eed7008e4..174e8bcb98 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs @@ -242,7 +242,7 @@ namespace Microsoft.AspNetCore.Mvc // Assert Assert.NotNull(result); - var httpNotFoundResult = Assert.IsType(result); + var httpNotFoundResult = Assert.IsType(result); Assert.Equal(StatusCodes.Status404NotFound, httpNotFoundResult.StatusCode); } @@ -258,7 +258,7 @@ namespace Microsoft.AspNetCore.Mvc // Assert Assert.NotNull(result); - var httpNotFoundObjectResult = Assert.IsType(result); + var httpNotFoundObjectResult = Assert.IsType(result); Assert.Equal(StatusCodes.Status404NotFound, httpNotFoundObjectResult.StatusCode); Assert.Equal("Test Content", httpNotFoundObjectResult.Value); } @@ -688,22 +688,22 @@ namespace Microsoft.AspNetCore.Mvc public IActionResult HttpBadRequest_Action() { - return HttpBadRequest(); + return BadRequest(); } public IActionResult HttpBadRequestObject_Action(object error) { - return HttpBadRequest(error); + return BadRequest(error); } public IActionResult HttpNotFound_Action() { - return HttpNotFound(); + return NotFound(); } public IActionResult HttpNotFoundObject_Action(object value) { - return HttpNotFound(value); + return NotFound(value); } } diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs index 653ba37eed..e95ad29fe4 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/ApiControllerTest.cs @@ -278,7 +278,7 @@ namespace System.Web.Http var result = controller.NotFound(); // Assert - Assert.Equal(404, Assert.IsType(result).StatusCode); + Assert.Equal(404, Assert.IsType(result).StatusCode); } [Fact] @@ -291,7 +291,7 @@ namespace System.Web.Http var result = controller.Ok(); // Assert - Assert.Equal(200, Assert.IsType(result).StatusCode); + Assert.Equal(200, Assert.IsType(result).StatusCode); } @@ -306,7 +306,7 @@ namespace System.Web.Http var result = controller.Ok(product); // Assert - var okResult = Assert.IsType(result); + var okResult = Assert.IsType(result); Assert.Same(product, okResult.Value); } @@ -400,7 +400,7 @@ namespace System.Web.Http var result = controller.StatusCode(HttpStatusCode.ExpectationFailed); // Assert - Assert.Equal(StatusCodes.Status417ExpectationFailed, Assert.IsType(result).StatusCode); + Assert.Equal(StatusCodes.Status417ExpectationFailed, Assert.IsType(result).StatusCode); } private class Product diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/test/WebSites/BasicWebSite/Controllers/HomeController.cs index 66ff223950..ffe5ebb0ab 100644 --- a/test/WebSites/BasicWebSite/Controllers/HomeController.cs +++ b/test/WebSites/BasicWebSite/Controllers/HomeController.cs @@ -45,7 +45,7 @@ namespace BasicWebSite.Controllers public IActionResult NoContentResult() { - return new HttpStatusCodeResult(StatusCodes.Status204NoContent); + return new StatusCodeResult(StatusCodes.Status204NoContent); } [AcceptVerbs("GET", "POST")] diff --git a/test/WebSites/BasicWebSite/Controllers/SpecificFormattersController.cs b/test/WebSites/BasicWebSite/Controllers/SpecificFormattersController.cs index 103f3ef3e6..ce802de203 100644 --- a/test/WebSites/BasicWebSite/Controllers/SpecificFormattersController.cs +++ b/test/WebSites/BasicWebSite/Controllers/SpecificFormattersController.cs @@ -20,7 +20,7 @@ namespace BasicWebSite { if (!ModelState.IsValid) { - return HttpBadRequest(ModelState); + return BadRequest(ModelState); } return Ok(person); @@ -31,7 +31,7 @@ namespace BasicWebSite { if (!ModelState.IsValid) { - return HttpBadRequest(ModelState); + return BadRequest(ModelState); } return Ok(person); diff --git a/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs b/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs index 2625658818..8d81f010ca 100644 --- a/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs @@ -13,7 +13,7 @@ namespace FormatterWebSite.Controllers { if (!ModelState.IsValid) { - return new HttpStatusCodeResult(StatusCodes.Status400BadRequest); + return new StatusCodeResult(StatusCodes.Status400BadRequest); } return Content(test); diff --git a/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs b/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs index 1f0d510168..959b3ec569 100644 --- a/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs @@ -33,7 +33,7 @@ namespace FormatterWebSite.Controllers { if(!ModelState.IsValid) { - return HttpBadRequest(ModelState); + return BadRequest(ModelState); } return new ObjectResult(employee); diff --git a/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs b/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs index 31c7e2e2af..d40115fb86 100644 --- a/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs @@ -13,7 +13,7 @@ namespace FormatterWebSite.Controllers { if (!ModelState.IsValid) { - return HttpBadRequest(ModelState); + return BadRequest(ModelState); } return Content("Hello World!"); diff --git a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs index e84382dc99..fb1143fd39 100644 --- a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs +++ b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs @@ -25,7 +25,7 @@ namespace WebApiCompatShimWebSite }) }); - context.Result = new HttpStatusCodeResult(StatusCodes.Status200OK); + context.Result = new StatusCodeResult(StatusCodes.Status200OK); } } } \ No newline at end of file diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs b/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs index 6c96fc8f4f..4b65e47edb 100644 --- a/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs +++ b/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs @@ -40,7 +40,7 @@ namespace XmlFormattersWebSite.Controllers { if (!ModelState.IsValid) { - return HttpBadRequest(ModelState); + return BadRequest(ModelState); } return Content("Hello World!");