Revert "Code clean up"

This reverts commit 0d1b9fa.

Author: Chris Martinez

examples/AspNetCore/OData/ODataOpenApiExample/Program.cs

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

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

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

examples/AspNetCore/WebApi/MinimalOpenApiExample/MinimalOpenApiExample.csproj

@@ -5,7 +5,6 @@
  </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,7 +56,6 @@
                      .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,7 +5,6 @@ namespace Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using System.Globalization;
-using System.Runtime.CompilerServices;
 
 /// <summary>
 /// Represents the API versioning feature.
@@ -34,10 +33,11 @@ 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,7 +58,11 @@ public string? RawRequestedApiVersion
             {
                 0 => default,
                 1 => values[0],
-                _ => throw NewAmbiguousApiVersionException( values ),
+#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
             };
         }
         set
@@ -84,8 +88,7 @@ public ApiVersion? RequestedApiVersion
                 return apiVersion;
             }
 
-            var parser = context.RequestServices.GetService<IApiVersionParser>()
-                         ?? ApiVersionParser.Default;
+            var parser = context.RequestServices.GetRequiredService<IApiVersionParser>();
 
             try
             {
@@ -102,20 +105,10 @@ 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 );
 }