The OData specification should internally match entire controllers or a subset of their actions. Fixes #1118

Author: commonsensesoftware

src/AspNetCore/OData/src/Asp.Versioning.OData/ApplicationModels/ODataControllerSpecification.cs

@@ -3,6 +3,7 @@
 namespace Asp.Versioning.ApplicationModels;
 
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.OData.Edm;
 using Microsoft.AspNetCore.OData.Routing.Attributes;
 
 /// <summary>
@@ -16,7 +17,7 @@ public bool IsSatisfiedBy( ControllerModel controller )
     {
         ArgumentNullException.ThrowIfNull( controller );
 
-        if ( ODataControllerSpecification.IsSatisfiedBy( controller ) )
+        if ( Matches( controller ) )
         {
             return true;
         }
@@ -25,7 +26,7 @@ public bool IsSatisfiedBy( ControllerModel controller )
 
         for ( var i = 0; i < actions.Count; i++ )
         {
-            if ( IsSatisfiedBy( actions[i] ) )
+            if ( Matches( actions[i] ) )
             {
                 return true;
             }
@@ -34,7 +35,7 @@ public bool IsSatisfiedBy( ControllerModel controller )
         return false;
     }
 
-    internal static bool IsSatisfiedBy( ICommonModel model )
+    internal static bool Matches( ICommonModel model )
     {
         var attributes = model.Attributes;
 

src/AspNetCore/OData/src/Asp.Versioning.OData/OData/ODataApplicationModelProvider.cs

@@ -79,6 +79,7 @@ private static
         CollateApiVersions( ApplicationModel application )
     {
         var controllers = application.Controllers;
+        var specification = new ODataControllerSpecification();
         var metadataControllers = default( List<ControllerModel> );
         var supported = default( SortedSet<ApiVersion> );
         var deprecated = default( SortedSet<ApiVersion> );
@@ -93,7 +94,7 @@ private static
                 metadataControllers.Add( controller );
                 continue;
             }
-            else if ( !ODataControllerSpecification.IsSatisfiedBy( controller ) )
+            else if ( !specification.IsSatisfiedBy( controller ) )
             {
                 continue;
             }

src/AspNetCore/OData/src/Asp.Versioning.OData/Routing/VersionedAttributeRoutingConvention.cs

@@ -95,12 +95,12 @@ public override bool AppliesToAction( ODataControllerActionContext context )
 
     private static bool IsODataController( ODataControllerActionContext context )
     {
-        if ( ODataControllerSpecification.IsSatisfiedBy( context.Controller ) )
+        if ( ODataControllerSpecification.Matches( context.Controller ) )
         {
             return true;
         }
 
-        return ODataControllerSpecification.IsSatisfiedBy( context.Action );
+        return ODataControllerSpecification.Matches( context.Action );
     }
 
     private static IEdmModel? FindModel( ODataControllerActionContext context )