Fix issues from improved code analysis

Chris Martinez · commonsensesoftware · commit 2709f16e853a · 2021-02-08T18:59:21.000-08:00
diff --git a/src/Common/CollectionExtensions.cs b/src/Common/CollectionExtensions.cs
@@ -57,7 +57,7 @@ internal static void AddRange<T>( this ICollection<T> collection, IEnumerable<T>
             }
         }
 
-        internal static string EnsureZeroOrOneApiVersions( this ICollection<string> apiVersions )
+        internal static string? EnsureZeroOrOneApiVersions( this ICollection<string> apiVersions )
         {
             if ( apiVersions.Count < 2 )
             {
diff --git a/src/Common/Versioning/ApiVersionFormatProvider.cs b/src/Common/Versioning/ApiVersionFormatProvider.cs
@@ -489,7 +489,7 @@ protected virtual string FormatStatusPart( ApiVersion apiVersion, string format,
         /// <returns>A <see cref="string">string</see> representing the formatted argument.</returns>
         public virtual string Format( string? format, object? arg, IFormatProvider? formatProvider )
         {
-            if ( !( arg is ApiVersion value ) )
+            if ( arg is not ApiVersion value )
             {
                 return GetDefaultFormat( format, arg, formatProvider );
             }
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/ApiVersionModelMetadata.cs b/src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/ApiVersionModelMetadata.cs
@@ -68,7 +68,7 @@ public ApiVersionModelMetadata( IModelMetadataProvider modelMetadataProvider, st
         public override string EditFormatString => inner.EditFormatString;
 
         /// <inheritdoc />
-        public override ModelMetadata ElementMetadata => inner.ElementMetadata;
+        public override ModelMetadata? ElementMetadata => inner.ElementMetadata;
 
         /// <inheritdoc />
         public override IEnumerable<KeyValuePair<EnumGroupAndName, string>> EnumGroupedDisplayNamesAndValues => inner.EnumGroupedDisplayNamesAndValues;
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/ApiVersionParameterDescriptionContext.cs b/src/Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer/ApiVersionParameterDescriptionContext.cs
@@ -173,8 +173,12 @@ where constraints.OfType<ApiVersionRouteConstraint>().Any()
             parameter.DefaultValue = ApiVersion.ToString();
             parameter.ModelMetadata = ModelMetadata;
             parameter.Type = ModelMetadata.ModelType;
-            parameter.RouteInfo.IsOptional = false;
-            parameter.RouteInfo.DefaultValue = parameter.DefaultValue;
+
+            if ( parameter.RouteInfo != null )
+            {
+                parameter.RouteInfo.IsOptional = false;
+                parameter.RouteInfo.DefaultValue = parameter.DefaultValue;
+            }
 
             if ( parameter.ParameterDescriptor == null )
             {
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Abstractions/ActionDescriptorExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Abstractions/ActionDescriptorExtensions.cs
@@ -96,9 +96,9 @@ public static ApiVersionMapping MappingTo( this ActionDescriptor action, ApiVers
 
         internal static string ExpandSignature( this ActionDescriptor action )
         {
-            if ( !( action is ControllerActionDescriptor controllerAction ) )
+            if ( action is not ControllerActionDescriptor controllerAction )
             {
-                return action.DisplayName;
+                return action.DisplayName ?? string.Empty;
             }
 
             var signature = new StringBuilder();
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Microsoft.Extensions.DependencyInjection/IServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Microsoft.Extensions.DependencyInjection/IServiceCollectionExtensions.cs
@@ -96,7 +96,7 @@ static object CreateInstance( this IServiceProvider services, ServiceDescriptor
                 return descriptor.ImplementationFactory( services );
             }
 
-            return ActivatorUtilities.GetServiceOrCreateInstance( services, descriptor.ImplementationType );
+            return ActivatorUtilities.GetServiceOrCreateInstance( services, descriptor.ImplementationType! );
         }
 
         // REF: https://github.com/dotnet/runtime/blob/master/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs#L125
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionMatcherPolicy.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionMatcherPolicy.cs
@@ -158,7 +158,7 @@ static bool MatchesApiVersion( CandidateSet candidates, ApiVersion? apiVersion )
                     return true;
                 case 1:
                     ref var candidate = ref candidates[bestMatches[0]];
-                    var action = candidate.Endpoint.Metadata.GetMetadata<ActionDescriptor>();
+                    var action = candidate.Endpoint.Metadata.GetMetadata<ActionDescriptor>()!;
                     var model = action.GetApiVersionModel();
 
                     if ( model.IsApiVersionNeutral )
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionRouteConstraint.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionRouteConstraint.cs
@@ -23,7 +23,7 @@ public sealed class ApiVersionRouteConstraint : IRouteConstraint
         /// <param name="values">The current <see cref="RouteValueDictionary">collection</see> of route values.</param>
         /// <param name="routeDirection">The <see cref="RouteDirection">route direction</see> to match.</param>
         /// <returns>True if the route constraint is matched; otherwise, false.</returns>
-        public bool Match( HttpContext httpContext, IRouter route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection )
+        public bool Match( HttpContext? httpContext, IRouter? route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection )
         {
             if ( values == null )
             {
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionUrlHelper.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionUrlHelper.cs
@@ -46,7 +46,7 @@ public ApiVersionUrlHelper( ActionContext actionContext, IUrlHelper url )
         public ActionContext ActionContext { get; }
 
         /// <inheritdoc />
-        public virtual string Action( UrlActionContext actionContext )
+        public virtual string? Action( UrlActionContext actionContext )
         {
             if ( actionContext == null )
             {
@@ -58,20 +58,20 @@ public virtual string Action( UrlActionContext actionContext )
         }
 
         /// <inheritdoc />
-        public virtual string Content( string contentPath ) => Url.Content( contentPath );
+        public virtual string? Content( string? contentPath ) => Url.Content( contentPath );
 
         /// <inheritdoc />
 #pragma warning disable CA1054 // URI-like parameters should not be strings
-        public virtual bool IsLocalUrl( string url ) => Url.IsLocalUrl( url );
+        public virtual bool IsLocalUrl( string? url ) => Url.IsLocalUrl( url );
 #pragma warning restore CA1054
 
         /// <inheritdoc />
-        public virtual string Link( string routeName, object values ) =>
+        public virtual string? Link( string? routeName, object? values ) =>
             Url.Link( routeName, AddApiVersionRouteValueIfNecessary( values ) );
 
         /// <inheritdoc />
 #pragma warning disable CA1055 // URI-like return values should not be strings
-        public virtual string RouteUrl( UrlRouteContext routeContext )
+        public virtual string? RouteUrl( UrlRouteContext routeContext )
 #pragma warning restore CA1055
         {
             if ( routeContext == null )
@@ -83,7 +83,7 @@ public virtual string RouteUrl( UrlRouteContext routeContext )
             return Url.RouteUrl( routeContext );
         }
 
-        object AddApiVersionRouteValueIfNecessary( object current )
+        object? AddApiVersionRouteValueIfNecessary( object? current )
         {
             var key = RouteParameter;
 
@@ -99,7 +99,7 @@ object AddApiVersionRouteValueIfNecessary( object current )
                 return current;
             }
 
-            if ( !( current is RouteValueDictionary values ) )
+            if ( current is not RouteValueDictionary values )
             {
                 values = current == null ? new RouteValueDictionary() : new RouteValueDictionary( current );
             }
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ClientErrorBuilder.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ClientErrorBuilder.cs
@@ -36,9 +36,9 @@ internal RequestHandler Build()
             var method = request.Method;
             var requestedVersion = feature.RawRequestedApiVersion;
             var parsedVersion = feature.RequestedApiVersion;
-            var actionNames = new Lazy<string>( () => Join( NewLine, Candidates.Select( a => a.DisplayName ) ) );
+            var actionNames = new Lazy<string>( () => Join( NewLine, Candidates!.Select( a => a.DisplayName ) ) );
             var allowedMethods = new Lazy<HashSet<string>>( () => AllowedMethodsFromCandidates( Candidates!, parsedVersion ) );
-            var apiVersions = new Lazy<ApiVersionModel>( Candidates.Select( a => a.GetApiVersionModel() ).Aggregate );
+            var apiVersions = new Lazy<ApiVersionModel>( Candidates!.Select( a => a.GetApiVersionModel() ).Aggregate );
             var handlerContext = new RequestHandlerContext( ErrorResponseProvider, ApiVersionReporter!, apiVersions );
             var url = new Uri( request.GetDisplayUrl() ).SafeFullPath();
 
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/DefaultApiVersionRoutePolicy.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Routing/DefaultApiVersionRoutePolicy.cs
@@ -97,7 +97,7 @@ public DefaultApiVersionRoutePolicy(
         /// <param name="context">The current <see cref="RouteContext">route context</see>.</param>
         /// <param name="selectionResult">The current <see cref="ActionSelectionResult">action selection result</see>.</param>
         /// <returns>The single, matching <see cref="ActionDescriptor">action</see> conforming to the policy.</returns>
-        protected virtual ActionDescriptor OnSingleMatch( RouteContext context, ActionSelectionResult selectionResult )
+        protected virtual ActionDescriptor? OnSingleMatch( RouteContext context, ActionSelectionResult selectionResult )
         {
             if ( selectionResult == null )
             {
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ActionSelectionResult.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ActionSelectionResult.cs
@@ -21,7 +21,7 @@ public class ActionSelectionResult
         /// <remarks>This property returns the first occurrence of a single match in the earliest iteration. If
         /// no matches exist in any iteration or multiple matches exist, this property returns <c>null</c>.</remarks>
         [CLSCompliant( false )]
-        public ActionDescriptor BestMatch => MatchingActions.FirstOrDefault();
+        public ActionDescriptor? BestMatch => MatchingActions.FirstOrDefault();
 
         /// <summary>
         /// Gets a read-only collection of candidate actions.
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ApiVersionActionSelector.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ApiVersionActionSelector.cs
@@ -324,7 +324,7 @@ protected virtual IReadOnlyList<ActionDescriptor> EvaluateActionConstraints( Rou
             for ( var i = 0; i < actions.Count; i++ )
             {
                 var action = actions[i];
-                var constraints = actionConstraintCache.GetActionConstraints( context.HttpContext, action );
+                var constraints = actionConstraintCache.GetActionConstraints( context.HttpContext, action ) ?? Array.Empty<IActionConstraint>();
                 candidates.Add( new ActionSelectorCandidate( action, constraints ) );
             }
 
@@ -399,7 +399,7 @@ protected virtual IReadOnlyList<ActionDescriptor> EvaluateActionConstraints( Rou
                         if ( !constraint.Accept( constraintContext ) )
                         {
                             isMatch = false;
-                            Logger.ConstraintMismatch( candidate.Action.DisplayName, candidate.Action.Id, constraint );
+                            Logger.ConstraintMismatch( candidate.Action.DisplayName!, candidate.Action.Id, constraint );
                             break;
                         }
                     }
@@ -476,10 +476,11 @@ public static ActionSelectionTable<Endpoint> Create( IEnumerable<Endpoint> endpo
                 return CreateCore(
                     version: 0,
                     items: endpoints.Where( e => e.GetType() == typeof( Endpoint ) ),
-                    getRouteKeys: e => e.Metadata.GetMetadata<ActionDescriptor>().RouteValues.Keys,
+                    getRouteKeys: e => e.Metadata.GetMetadata<ActionDescriptor>()?.RouteValues.Keys ?? Enumerable.Empty<string>(),
                     getRouteValue: ( e, key ) =>
                     {
-                        e.Metadata.GetMetadata<ActionDescriptor>().RouteValues.TryGetValue( key, out var value );
+                        var value = default( string? );
+                        e.Metadata.GetMetadata<ActionDescriptor>()?.RouteValues.TryGetValue( key, out value );
                         return Convert.ToString( value, InvariantCulture ) ?? string.Empty;
                     } );
             }
@@ -595,7 +596,7 @@ internal InnerCache CurrentCache
 
                     if ( !item.IsReusable )
                     {
-                        item.Constraint = null;
+                        item.Constraint = default!;
                         allActionConstraintsCached = false;
                     }
                 }
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/DefaultErrorResponseProvider.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/DefaultErrorResponseProvider.cs
@@ -60,7 +60,7 @@ static TError NewInnerError<TError>( ErrorResponseContext context, Func<ErrorRes
                 return default!;
             }
 
-            var environment = (IWebHostEnvironment) context.Request.HttpContext.RequestServices.GetService( typeof( IWebHostEnvironment ) );
+            var environment = (IWebHostEnvironment?) context.Request.HttpContext.RequestServices.GetService( typeof( IWebHostEnvironment ) );
 
             if ( environment?.IsDevelopment() == true )
             {
diff --git a/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ILoggerExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Versioning/Versioning/ILoggerExtensions.cs
@@ -45,7 +45,7 @@ internal static void ConstraintMismatch( this ILogger logger, string actionName,
 
         internal static void ApiVersionInvalid( this ILogger logger, string? apiVersion ) => apiVersionInvalid( logger, apiVersion, null );
 
-        internal static void NoActionsMatched( this ILogger logger, IDictionary<string, object> routeValueDictionary )
+        internal static void NoActionsMatched( this ILogger logger, IDictionary<string, object?> routeValueDictionary )
         {
             if ( !logger.IsEnabled( Debug ) )
             {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ internal static void AddRange<T>( this ICollection<T> collection, IEnumerable<T>`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- internal static string EnsureZeroOrOneApiVersions( this ICollection<string> apiVersions )`
	`60`	`+ internal static string? EnsureZeroOrOneApiVersions( this ICollection<string> apiVersions )`
`61`	`61`	`{`
`62`	`62`	`if ( apiVersions.Count < 2 )`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ protected virtual string FormatStatusPart( ApiVersion apiVersion, string format,`
`489`	`489`	`/// <returns>A <see cref="string">string</see> representing the formatted argument.</returns>`
`490`	`490`	`public virtual string Format( string? format, object? arg, IFormatProvider? formatProvider )`
`491`	`491`	`{`
`492`		`- if ( !( arg is ApiVersion value ) )`
	`492`	`+ if ( arg is not ApiVersion value )`
`493`	`493`	`{`
`494`	`494`	`return GetDefaultFormat( format, arg, formatProvider );`
`495`	`495`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,9 @@ public static ApiVersionMapping MappingTo( this ActionDescriptor action, ApiVers`
`96`	`96`
`97`	`97`	`internal static string ExpandSignature( this ActionDescriptor action )`
`98`	`98`	`{`
`99`		`- if ( !( action is ControllerActionDescriptor controllerAction ) )`
	`99`	`+ if ( action is not ControllerActionDescriptor controllerAction )`
`100`	`100`	`{`
`101`		`- return action.DisplayName;`
	`101`	`+ return action.DisplayName ?? string.Empty;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`var signature = new StringBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static object CreateInstance( this IServiceProvider services, ServiceDescriptor`
`96`	`96`	`return descriptor.ImplementationFactory( services );`
`97`	`97`	`}`
`98`	`98`
`99`		`- return ActivatorUtilities.GetServiceOrCreateInstance( services, descriptor.ImplementationType );`
	`99`	`+ return ActivatorUtilities.GetServiceOrCreateInstance( services, descriptor.ImplementationType! );`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`// REF: https://github.com/dotnet/runtime/blob/master/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs#L125`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public sealed class ApiVersionRouteConstraint : IRouteConstraint`
`23`	`23`	`/// <param name="values">The current <see cref="RouteValueDictionary">collection</see> of route values.</param>`
`24`	`24`	`/// <param name="routeDirection">The <see cref="RouteDirection">route direction</see> to match.</param>`
`25`	`25`	`/// <returns>True if the route constraint is matched; otherwise, false.</returns>`
`26`		`- public bool Match( HttpContext httpContext, IRouter route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection )`
	`26`	`+ public bool Match( HttpContext? httpContext, IRouter? route, string routeKey, RouteValueDictionary values, RouteDirection routeDirection )`
`27`	`27`	`{`
`28`	`28`	`if ( values == null )`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public ApiVersionUrlHelper( ActionContext actionContext, IUrlHelper url )`
`46`	`46`	`public ActionContext ActionContext { get; }`
`47`	`47`
`48`	`48`	`/// <inheritdoc />`
`49`		`- public virtual string Action( UrlActionContext actionContext )`
	`49`	`+ public virtual string? Action( UrlActionContext actionContext )`
`50`	`50`	`{`
`51`	`51`	`if ( actionContext == null )`
`52`	`52`	`{`
`@@ -58,20 +58,20 @@ public virtual string Action( UrlActionContext actionContext )`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`/// <inheritdoc />`
`61`		`- public virtual string Content( string contentPath ) => Url.Content( contentPath );`
	`61`	`+ public virtual string? Content( string? contentPath ) => Url.Content( contentPath );`
`62`	`62`
`63`	`63`	`/// <inheritdoc />`
`64`	`64`	`#pragma warning disable CA1054 // URI-like parameters should not be strings`
`65`		`- public virtual bool IsLocalUrl( string url ) => Url.IsLocalUrl( url );`
	`65`	`+ public virtual bool IsLocalUrl( string? url ) => Url.IsLocalUrl( url );`
`66`	`66`	`#pragma warning restore CA1054`
`67`	`67`
`68`	`68`	`/// <inheritdoc />`
`69`		`- public virtual string Link( string routeName, object values ) =>`
	`69`	`+ public virtual string? Link( string? routeName, object? values ) =>`
`70`	`70`	`Url.Link( routeName, AddApiVersionRouteValueIfNecessary( values ) );`
`71`	`71`
`72`	`72`	`/// <inheritdoc />`
`73`	`73`	`#pragma warning disable CA1055 // URI-like return values should not be strings`
`74`		`- public virtual string RouteUrl( UrlRouteContext routeContext )`
	`74`	`+ public virtual string? RouteUrl( UrlRouteContext routeContext )`
`75`	`75`	`#pragma warning restore CA1055`
`76`	`76`	`{`
`77`	`77`	`if ( routeContext == null )`
`@@ -83,7 +83,7 @@ public virtual string RouteUrl( UrlRouteContext routeContext )`
`83`	`83`	`return Url.RouteUrl( routeContext );`
`84`	`84`	`}`
`85`	`85`
`86`		`- object AddApiVersionRouteValueIfNecessary( object current )`
	`86`	`+ object? AddApiVersionRouteValueIfNecessary( object? current )`
`87`	`87`	`{`
`88`	`88`	`var key = RouteParameter;`
`89`	`89`
`@@ -99,7 +99,7 @@ object AddApiVersionRouteValueIfNecessary( object current )`
`99`	`99`	`return current;`
`100`	`100`	`}`
`101`	`101`
`102`		`- if ( !( current is RouteValueDictionary values ) )`
	`102`	`+ if ( current is not RouteValueDictionary values )`
`103`	`103`	`{`
`104`	`104`	`values = current == null ? new RouteValueDictionary() : new RouteValueDictionary( current );`
`105`	`105`	`}`