Skip to content

Replace ReferenceLoopHandling with direct method call #3618

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

Merged
merged 2 commits into from
Mar 21, 2019
Merged

Replace ReferenceLoopHandling with direct method call #3618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d169fef
Replace ReferenceLoopHandling with direct method call
russcam Mar 20, 2019
8267f1a
Remove null conditional operator
russcam Mar 20, 2019
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
5 changes: 5 additions & 0 deletions src/Nest/CommonAbstractions/Infer/Field/FieldJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ internal class FieldJsonConverter : JsonConverter
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
var field = (Field)value;
WriteField(writer, field, serializer);
}

internal static void WriteField(JsonWriter writer, Field field, JsonSerializer serializer)
{
if (field == null)
{
writer.WriteNull();
Expand Down
9 changes: 1 addition & 8 deletions src/Nest/CommonAbstractions/Infer/Fields/FieldsJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,8 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
writer.WriteStartArray();
if (fields != null)
{
// overridden Equals() method means a Fields with only one Field
// results in Equality, which triggers Json.NET's Reference loop detection
var referenceLoopHandling = serializer.ReferenceLoopHandling;
serializer.ReferenceLoopHandling = ReferenceLoopHandling.Serialize;

foreach (var field in fields.ListOfFields)
serializer.Serialize(writer, field);

serializer.ReferenceLoopHandling = referenceLoopHandling;
FieldJsonConverter.WriteField(writer, field, serializer);
}
writer.WriteEndArray();
}
Expand Down