Fix CodeQL violations

Author: Chris Martinez

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ApiExplorer/PartialODataDescriptionProvider.cs

@@ -23,7 +23,7 @@ namespace Asp.Versioning.ApiExplorer;
 [CLSCompliant( false )]
 public class PartialODataDescriptionProvider : IApiDescriptionProvider
 {
-    private static int? beforeOData;
+    private static readonly int BeforeOData = ODataOrder() + 10;
     private readonly IOptionsFactory<ODataOptions> odataOptionsFactory;
     private readonly IOptions<ODataApiExplorerOptions> options;
     private bool markedAdHoc;
@@ -42,8 +42,6 @@ public PartialODataDescriptionProvider(
     {
         this.odataOptionsFactory = odataOptionsFactory ?? throw new ArgumentNullException( nameof( odataOptionsFactory ) );
         this.options = options ?? throw new ArgumentNullException( nameof( options ) );
-        beforeOData ??= ODataOrder( odataOptionsFactory, options ) + 10;
-        Order = beforeOData.Value;
     }
 
     /// <summary>
@@ -84,7 +82,7 @@ protected ODataApiExplorerOptions Options
     /// Gets or sets the order precedence of the current API description provider.
     /// </summary>
     /// <value>The order precedence of the current API description provider.</value>
-    public int Order { get; protected set; }
+    public int Order { get; protected set; } = BeforeOData;
 
     /// <inheritdoc />
     public virtual void OnProvidersExecuting( ApiDescriptionProviderContext context )
@@ -102,9 +100,9 @@ public virtual void OnProvidersExecuting( ApiDescriptionProviderContext context
         {
             var model = models[i];
             var version = model.GetApiVersion();
-            var options = odataOptionsFactory.Create( Opts.DefaultName );
+            var odata = odataOptionsFactory.Create( Opts.DefaultName );
 
-            options.AddRouteComponents( model );
+            odata.AddRouteComponents( model );
 
             for ( var j = 0; j < results.Count; j++ )
             {
@@ -139,12 +137,18 @@ public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )
     }
 
     [MethodImpl( MethodImplOptions.AggressiveInlining )]
-    private static int ODataOrder( IOptionsFactory<ODataOptions> factory, IOptions<ODataApiExplorerOptions> options ) =>
+    private static int ODataOrder() =>
         new ODataApiDescriptionProvider(
             new StubModelMetadataProvider(),
             new StubModelTypeBuilder(),
-            factory,
-            options ).Order;
+            new OptionsFactory<ODataOptions>(
+                Enumerable.Empty<IConfigureOptions<ODataOptions>>(),
+                Enumerable.Empty<IPostConfigureOptions<ODataOptions>>() ),
+            Opts.Create(
+                new ODataApiExplorerOptions(
+                    new(
+                        new StubODataApiVersionCollectionProvider(),
+                        Enumerable.Empty<IModelConfiguration>() ) ) ) ).Order;
 
     [MethodImpl( MethodImplOptions.AggressiveInlining )]
     private static void MarkAsAdHoc( ODataModelBuilder builder, IEdmModel model ) =>
@@ -206,6 +210,15 @@ public Type NewStructuredType( IEdmModel model, IEdmStructuredType structuredTyp
             throw new NotImplementedException();
     }
 
+    private sealed class StubODataApiVersionCollectionProvider : IODataApiVersionCollectionProvider
+    {
+        public IReadOnlyList<ApiVersion> ApiVersions
+        {
+            get => throw new NotImplementedException();
+            set => throw new NotImplementedException();
+        }
+    }
+
     private static class ODataMetadata
     {
         private const string ArbitrarySegment = "52459ff8-bca1-4a26-b7f2-08c7da04472d";

src/Common/src/Common.OData.ApiExplorer/Conventions/ImplicitModelBoundSettingsConvention.cs

@@ -75,9 +75,8 @@ public void Apply( ODataModelBuilder builder, ApiVersion apiVersion, string? rou
 
     private void OnModelCreating( ODataModelBuilder builder )
     {
-        foreach ( var type in types )
+        foreach ( var entityType in types.Select( builder.AddEntityType ) )
         {
-            var entityType = builder.AddEntityType( type );
             builder.AddEntitySet( entityType.Name, entityType );
         }
     }