Skip to content
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

Fixes #2861: Pass the IServiceProvider to ODataUriParser #2863

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes #2861: Pass the IServiceProvider to ODataUriParser #2863

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3acc028
Fixes #2861: Pass the IServiceProvider to ODataUriParser
xuzhg Nov 20, 2024
2811394
Update src/Microsoft.AspNet.OData.Shared/Formatter/Deserialization/OD…
xuzhg Nov 21, 2024
a4a71cb
Add a test to verify the injected ODataUriResolver
xuzhg Nov 22, 2024
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
23 changes: 21 additions & 2 deletions ...crosoft.AspNet.OData.Shared/Formatter/Deserialization/ODataResourceDeserializerHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,17 @@ internal static ODataDeserializerContext GenerateNestedReadContext(ODataNestedRe
{
try
{
path = new Routing.ODataPath(new ODataUriParser(readContext.Model, new Uri(navigationSource.Path.Path, UriKind.Relative)).ParsePath());
ODataUriParser parser;
if (readContext != null && readContext.InternalRequest != null && readContext.InternalRequest.RequestContainer != null)
xuzhg marked this conversation as resolved.
Show resolved Hide resolved
{
parser = new ODataUriParser(readContext.Model, new Uri(navigationSource.Path.Path, UriKind.Relative), readContext.InternalRequest.RequestContainer);
}
else
{
parser = new ODataUriParser(readContext.Model, new Uri(navigationSource.Path.Path, UriKind.Relative));
}

path = new Routing.ODataPath(parser.ParsePath());
}
catch (ODataException)
{
Expand Down Expand Up @@ -332,7 +342,16 @@ internal static Routing.ODataPath ApplyIdToPath(ODataDeserializerContext readCon

try
{
ODataUriParser parser = new ODataUriParser(readContext.Model, new Uri(serviceRoot), resourceWrapper.ResourceBase.Id);
ODataUriParser parser;
if (internalRequest.RequestContainer != null)
{
parser = new ODataUriParser(readContext.Model, new Uri(serviceRoot), resourceWrapper.ResourceBase.Id, internalRequest.RequestContainer);
}
else
{
parser = new ODataUriParser(readContext.Model, new Uri(serviceRoot), resourceWrapper.ResourceBase.Id);
}

odataPath = parser.ParsePath();
}
catch (ODataException)
Expand Down