Apply CodeQL and Copilot suggestions

Author: commonsensesoftware

src/Abstractions/src/Asp.Versioning.Abstractions/DeprecationPolicy.cs

@@ -61,5 +61,5 @@ public DeprecationPolicy() { }
     /// </summary>
     /// <param name="dateTime">The <see cref="DateTimeOffset">date and time</see> to evaluate.</param>
     /// <returns>True if the policy is effective; otherwise, false.</returns>
-    public bool IsEffective( DateTimeOffset dateTime ) => Date is { } date ? date <= dateTime : true;
+    public bool IsEffective( DateTimeOffset dateTime ) => Date is null || Date <= dateTime;
 }

src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/ApiExplorer/ODataApiExplorer.cs

@@ -549,16 +549,9 @@ private void PopulateActionDescriptions(
         var metadata = actionDescriptor.ApiVersionMetadata;
         var model = metadata.Map( ApiVersionMapping.Explicit );
         var deprecationPolicy = DeprecationPolicyManager.ResolvePolicyOrDefault( metadata.Name, apiVersion );
-        bool deprecated;
-
-        if ( model.IsApiVersionNeutral )
-        {
-            deprecated = deprecationPolicy != null && deprecationPolicy.IsEffective( DateTimeOffset.Now );
-        }
-        else
-        {
-            deprecated = model.DeprecatedApiVersions.Contains( apiVersion );
-        }
+        var deprecated = model.IsApiVersionNeutral
+            ? deprecationPolicy != null && deprecationPolicy.IsEffective( DateTimeOffset.Now )
+            : model.DeprecatedApiVersions.Contains( apiVersion );
 
         PopulateMediaTypeFormatters( actionDescriptor, routeBuilderContext.ParameterDescriptions, route, responseType, requestFormatters, responseFormatters );
 

src/AspNet/WebApi/src/Asp.Versioning.WebApi.ApiExplorer/ApiExplorer/VersionedApiExplorer.cs

@@ -877,16 +877,9 @@ private void PopulateActionDescriptions(
         var metadata = actionDescriptor.ApiVersionMetadata;
         var model = metadata.Map( Explicit );
         var deprecationPolicy = DeprecationPolicyManager.ResolvePolicyOrDefault( metadata.Name, apiVersion );
-        bool deprecated;
-
-        if ( model.IsApiVersionNeutral )
-        {
-            deprecated = deprecationPolicy != null && deprecationPolicy.IsEffective( DateTimeOffset.Now );
-        }
-        else
-        {
-            deprecated = model.DeprecatedApiVersions.Contains( apiVersion );
-        }
+        var deprecated = model.IsApiVersionNeutral
+            ? deprecationPolicy != null && deprecationPolicy.IsEffective( DateTimeOffset.Now )
+            : model.DeprecatedApiVersions.Contains( apiVersion );
 
         for ( var i = 0; i < supportedMethods.Count; i++ )
         {

src/AspNet/WebApi/src/Asp.Versioning.WebApi/Dispatcher/HttpResponseExceptionFactory.cs

@@ -73,7 +73,7 @@ internal HttpResponseException NewUnmatchedException(
         {
             if ( couldMatch )
             {
-                properties ??= request.ApiVersionProperties;
+                properties = request.ApiVersionProperties;
 
                 if ( properties.RequestedApiVersion is ApiVersion apiVersion )
                 {

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs

@@ -317,8 +317,7 @@ private ApiVersion[] FlattenApiVersions( IList<ApiDescription> descriptions )
         for ( var i = 0; i < descriptions.Count; i++ )
         {
             var action = descriptions[i].ActionDescriptor;
-            var model = action.ApiVersionMetadata.Map( Explicit | Implicit );
-            var declaredVersions = model.DeclaredApiVersions;
+            var declaredVersions = action.ApiVersionMetadata.Map( Explicit | Implicit ).DeclaredApiVersions;
 
             if ( versions is null && declaredVersions.Count > 0 )
             {

src/AspNetCore/WebApi/src/Asp.Versioning.OpenApi/Reflection/Class.cs

@@ -27,7 +27,6 @@ private static Func<IServiceProvider, string, object> NewFactory()
             var constructor = Type.OpenApiDocumentService.GetConstructors().Single();
             var serviceProvider = Parameter( typeof( IServiceProvider ), "serviceProvider" );
             var documentName = Parameter( typeof( string ), "documentName" );
-            var getService = typeof( IServiceProvider ).GetMethod( nameof( IServiceProvider.GetService ), [typeof( System.Type )] )!;
             var getRequiredService = typeof( ServiceProviderServiceExtensions ).GetMethod(
                 nameof( ServiceProviderServiceExtensions.GetRequiredService ),
                 [typeof( IServiceProvider ), typeof( System.Type )] )!;
@@ -60,7 +59,6 @@ private static Func<IServiceProvider, string, object> NewFactory()
             var constructor = Type.OpenApiSchemaService.GetConstructors().Single();
             var serviceProvider = Parameter( typeof( IServiceProvider ), "serviceProvider" );
             var documentName = Parameter( typeof( string ), "documentName" );
-            var getService = typeof( IServiceProvider ).GetMethod( nameof( IServiceProvider.GetService ), [typeof( System.Type )] )!;
             var getRequiredService = typeof( ServiceProviderServiceExtensions ).GetMethod(
                 nameof( ServiceProviderServiceExtensions.GetRequiredService ),
                 [typeof( IServiceProvider ), typeof( System.Type )] )!;
@@ -87,10 +85,6 @@ private static Func<IServiceProvider, object> NewFactory()
         {
             var constructor = Type.OpenApiDocumentProvider.GetConstructors().Single();
             var serviceProvider = Parameter( typeof( IServiceProvider ), "serviceProvider" );
-            var getService = typeof( IServiceProvider ).GetMethod( nameof( IServiceProvider.GetService ), [typeof( System.Type )] )!;
-            var getRequiredService = typeof( ServiceProviderServiceExtensions ).GetMethod(
-                nameof( ServiceProviderServiceExtensions.GetRequiredService ),
-                [typeof( IServiceProvider ), typeof( System.Type )] )!;
             var body = Expression.New( constructor, serviceProvider );
             var lambda = Lambda<Func<IServiceProvider, object>>( body, serviceProvider );
 

src/AspNetCore/WebApi/src/Asp.Versioning.OpenApi/Transformers/XmlComments.cs

@@ -21,17 +21,7 @@ public class XmlComments
     /// Initializes a new instance of the <see cref="XmlComments"/> class.
     /// </summary>
     /// <param name="path">The file path of the XML comments to read.</param>
-    protected XmlComments( string path )
-    {
-        if ( File.Exists( path ) )
-        {
-            Xml = XDocument.Load( path );
-        }
-        else
-        {
-            Xml = new XDocument();
-        }
-    }
+    protected XmlComments( string path ) => Xml = File.Exists( path ) ? XDocument.Load( path ) : new();
 
     /// <summary>
     /// Creates and returns new <see cref="XmlComments"/> from the specified file.

src/AspNetCore/WebApi/src/Asp.Versioning.OpenApi/Transformers/XmlCommentsFile.cs

@@ -52,7 +52,7 @@ public XmlCommentsFile( Assembly[] assemblies, IHostEnvironment environment )
 
             for ( var j = start; j < paths.Count; j++ )
             {
-                var path = FilePath.Combine( paths[j], fileName );
+                var path = FilePath.Join( paths[j], fileName );
 
                 if ( File.Exists( path ) )
                 {