Code clean up

Author: commonsensesoftware

examples/AspNetCore/OData/ODataOpenApiExample/Program.cs

@@ -16,7 +16,7 @@
                 .AddOData(
                     options =>
                     {
-                        options.Count().Select().OrderBy();
+                        options.Count().Select().OrderBy().SetMaxTop( 3 );
                         options.RouteOptions.EnableKeyInParenthesis = false;
                         options.RouteOptions.EnableNonParenthesisForEmptyParameterFunction = true;
                         options.RouteOptions.EnablePropertyNameCaseInsensitive = true;

examples/AspNetCore/OData/ODataOpenApiExample/V3/SuppliersController.cs

@@ -29,7 +29,8 @@ public class SuppliersController : ODataController
     /// <returns>All available suppliers.</returns>
     /// <response code="200">Suppliers successfully retrieved.</response>
     [HttpGet]
-    [EnableQuery]
+    //[EnableQuery]
+    [EnableQuery( MaxTop = 2 )]
     [Produces( "application/json" )]
     [ProducesResponseType( typeof( ODataValue<IEnumerable<Supplier>> ), Status200OK )]
     public IQueryable<Supplier> Get() => suppliers;

examples/AspNetCore/WebApi/MinimalOpenApiExample/MinimalOpenApiExample.csproj

@@ -5,6 +5,7 @@
  </PropertyGroup>
 
  <ItemGroup>
+  <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
   <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0-*" />
  </ItemGroup>
 

examples/AspNetCore/WebApi/MinimalOpenApiExample/Program.cs

@@ -56,6 +56,7 @@
                      .HasApiVersion( 1.0 );
 
 ordersV1.MapGet( "/{id:int}", ( int id ) => new OrderV1() { Id = id, Customer = "John Doe" } )
+        .WithOpenApi()
         .Produces<OrderV1>()
         .Produces( 404 );
 

src/AspNetCore/WebApi/src/Asp.Versioning.Http/ApiVersioningFeature.cs

@@ -5,6 +5,7 @@ namespace Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 
 /// <summary>
 /// Represents the API versioning feature.
@@ -33,11 +34,10 @@ public IReadOnlyList<string> RawRequestedApiVersions
         {
             if ( rawApiVersions is null )
             {
-                var reader =
-                    context.RequestServices.GetService<IApiVersionReader>() ??
-                    ApiVersionReader.Combine(
-                        new QueryStringApiVersionReader(),
-                        new UrlSegmentApiVersionReader() );
+                var reader = context.RequestServices.GetService<IApiVersionReader>()
+                             ?? ApiVersionReader.Combine(
+                                 new QueryStringApiVersionReader(),
+                                 new UrlSegmentApiVersionReader() );
 
                 rawApiVersions = reader.Read( context.Request );
             }
@@ -58,11 +58,7 @@ public string? RawRequestedApiVersion
             {
                 0 => default,
                 1 => values[0],
-#pragma warning disable CA1065 // Do not raise exceptions in unexpected locations; existing behavior via IApiVersionReader.Read
-                _ => throw new AmbiguousApiVersionException(
-                        string.Format( CultureInfo.CurrentCulture, CommonSR.MultipleDifferentApiVersionsRequested, string.Join( ", ", values ) ),
-                        values ),
-#pragma warning restore CA1065
+                _ => throw NewAmbiguousApiVersionException( values ),
             };
         }
         set
@@ -88,7 +84,8 @@ public ApiVersion? RequestedApiVersion
                 return apiVersion;
             }
 
-            var parser = context.RequestServices.GetRequiredService<IApiVersionParser>();
+            var parser = context.RequestServices.GetService<IApiVersionParser>()
+                         ?? ApiVersionParser.Default;
 
             try
             {
@@ -105,10 +102,20 @@ public ApiVersion? RequestedApiVersion
         {
             apiVersion = value;
 
-            if ( apiVersion is not null && ( rawApiVersions is null || rawApiVersions.Count == 0 ) )
+            if ( apiVersion is not null &&
+               ( rawApiVersions is null || rawApiVersions.Count == 0 ) )
             {
                 rawApiVersions = new[] { apiVersion.ToString() };
             }
         }
     }
+
+    [MethodImpl( MethodImplOptions.AggressiveInlining )]
+    private static AmbiguousApiVersionException NewAmbiguousApiVersionException( IReadOnlyList<string> values ) =>
+        new(
+            string.Format(
+                CultureInfo.CurrentCulture,
+                CommonSR.MultipleDifferentApiVersionsRequested,
+                string.Join( ", ", values.ToArray(), 0, values.Count ) ),
+            values );
 }