From eaa2a367593bb99730faa52d96ece91f047d2520 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Sat, 3 Jul 2021 11:20:03 +0100
Subject: [PATCH] Apply code suggestions from Visual Studio

Applies a number of Visual Studio suggestions and errors found while
working on #34063.
---
 src/Http/Routing/src/ModelEndpointDataSource.cs             | 2 +-
 .../Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs    | 6 +++---
 .../src/EndpointMetadataApiDescriptionProvider.cs           | 2 +-
 src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Http/Routing/src/ModelEndpointDataSource.cs b/src/Http/Routing/src/ModelEndpointDataSource.cs
index c9212c457b4d..5ac84828a259 100644
--- a/src/Http/Routing/src/ModelEndpointDataSource.cs
+++ b/src/Http/Routing/src/ModelEndpointDataSource.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Routing
 {
     internal class ModelEndpointDataSource : EndpointDataSource
     {
-        private List<DefaultEndpointConventionBuilder> _endpointConventionBuilders;
+        private readonly List<DefaultEndpointConventionBuilder> _endpointConventionBuilders;
 
         public ModelEndpointDataSource()
         {
diff --git a/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
index ea388cdfbb36..a2f5a827523a 100644
--- a/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
+++ b/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
@@ -338,7 +338,7 @@ private ApiParameterRouteInfo CreateRouteInfo(TemplatePart routeParameter)
             };
         }
 
-        private IEnumerable<string?> GetHttpMethods(ControllerActionDescriptor action)
+        private static IEnumerable<string?> GetHttpMethods(ControllerActionDescriptor action)
         {
             if (action.ActionConstraints != null && action.ActionConstraints.Count > 0)
             {
@@ -350,7 +350,7 @@ private ApiParameterRouteInfo CreateRouteInfo(TemplatePart routeParameter)
             }
         }
 
-        private RouteTemplate? ParseTemplate(ControllerActionDescriptor action)
+        private static RouteTemplate? ParseTemplate(ControllerActionDescriptor action)
         {
             if (action.AttributeRouteInfo?.Template != null)
             {
@@ -445,7 +445,7 @@ internal static MediaTypeCollection GetDeclaredContentTypes(IReadOnlyList<IApiRe
             return contentTypes;
         }
 
-        private IApiRequestMetadataProvider[]? GetRequestMetadataAttributes(ControllerActionDescriptor action)
+        private static IApiRequestMetadataProvider[]? GetRequestMetadataAttributes(ControllerActionDescriptor action)
         {
             if (action.FilterDescriptors == null)
             {
diff --git a/src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs
index b646cdcca1b0..9f539a3dc36c 100644
--- a/src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs
+++ b/src/Mvc/Mvc.ApiExplorer/src/EndpointMetadataApiDescriptionProvider.cs
@@ -321,7 +321,7 @@ private static ApiResponseType CreateDefaultApiResponseType(Type responseType)
         }
 
         private static EndpointModelMetadata CreateModelMetadata(Type type) =>
-            new EndpointModelMetadata(ModelMetadataIdentity.ForType(type));
+            new(ModelMetadataIdentity.ForType(type));
 
         private static void AddResponseContentTypes(IList<ApiResponseFormat> apiResponseFormats, IReadOnlyList<string> contentTypes)
         {
diff --git a/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs b/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs
index 03e96036692b..56b7a45614a7 100644
--- a/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs
+++ b/src/Mvc/Mvc.Core/src/Routing/ActionEndpointFactory.cs
@@ -304,7 +304,7 @@ private static (RoutePattern resolvedRoutePattern, IDictionary<string, string?>
             return (attributeRoutePattern, resolvedRequiredValues ?? action.RouteValues);
         }
 
-        private void AddActionDataToBuilder(
+        private static void AddActionDataToBuilder(
             EndpointBuilder builder,
             HashSet<string> routeNames,
             ActionDescriptor action,