Skip to content

Fix OData Controller Specification #1154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
commonsensesoftware wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix OData Controller Specification #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...pNetCore/OData/src/Asp.Versioning.OData/ApplicationModels/ODataControllerSpecification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -16,7 +17,7 @@ public bool IsSatisfiedBy( ControllerModel controller )
{
ArgumentNullException.ThrowIfNull( controller );

if ( ODataControllerSpecification.IsSatisfiedBy( controller ) )
if ( Matches( controller ) )
{
return true;
}
Expand All @@ -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;
}
Expand All @@ -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;

Expand Down
3 changes: 2 additions & 1 deletion src/AspNetCore/OData/src/Asp.Versioning.OData/OData/ODataApplicationModelProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> );
Expand All @@ -93,7 +94,7 @@ private static
metadataControllers.Add( controller );
continue;
}
else if ( !ODataControllerSpecification.IsSatisfiedBy( controller ) )
else if ( !specification.IsSatisfiedBy( controller ) )
{
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions src/AspNetCore/OData/src/Asp.Versioning.OData/Routing/VersionedAttributeRoutingConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
Loading