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 #580 #978

Open
wants to merge 1 commit into
base: release-8.x
Choose a base branch
from
Open

fixes #580 #978

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
28 changes: 24 additions & 4 deletions src/Microsoft.AspNetCore.OData/Results/PageResultValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ public override JsonConverter CreateConverter(Type type, JsonSerializerOptions o

if (generaticType == typeof(PageResult<>))
{
return (JsonConverter)Activator.CreateInstance(typeof(PageResultConverter<>).MakeGenericType(new Type[] { entityType }));
return (JsonConverter)Activator.CreateInstance(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do the same thing for Newtonsoft.JSON.OData project class?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @mirgil. Did you see Sam's comment here? @xuzhg Can you point the contributor to the class in the Netwtonsoft project where they need to apply a similar change?

typeof(PageResultConverter<>).MakeGenericType(new Type[] { entityType }),
new object[] { options.PropertyNamingPolicy });
}

return null;
Expand All @@ -48,27 +50,45 @@ public override JsonConverter CreateConverter(Type type, JsonSerializerOptions o

internal class PageResultConverter<TEntity> : JsonConverter<PageResult<TEntity>>
{
private JsonNamingPolicy? _namingPolicy;
public PageResultConverter(JsonNamingPolicy? namingPolicy)
{
_namingPolicy = namingPolicy;
}

public override PageResult<TEntity> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
Contract.Assert(false, "PageResult{TEntity} should never be deserialized into");
throw new NotImplementedException();
}

private string GetConvertedName(string name)
{
if (_namingPolicy == null)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

        if (_namingPolicy == null)
        {
            return name;
        }

       return _namingPolicy.ConvertName(name);

{
return name;
}
else
{
return _namingPolicy.ConvertName(name);
}
}

public override void Write(Utf8JsonWriter writer, PageResult<TEntity> value, JsonSerializerOptions options)
{
writer.WriteStartObject();
writer.WritePropertyName("items");
writer.WritePropertyName(GetConvertedName("items"));
JsonSerializer.Serialize(writer, value.Items, options);

if (value.NextPageLink != null)
{
writer.WritePropertyName("nextpagelink");
writer.WritePropertyName(GetConvertedName("nextpagelink"));
writer.WriteStringValue(value.NextPageLink.OriginalString);
}

if (value.Count != null)
{
writer.WritePropertyName("count");
writer.WritePropertyName(GetConvertedName("count"));
writer.WriteNumberValue(value.Count.Value);
}

Expand Down