Skip to content

[Backport 8.13] Improve serialization of "single-or-many" properties #8094

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 1 commit into from
Apr 5, 2024
Merged

[Backport 8.13] Improve serialization of "single-or-many" properties #8094

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
24 changes: 12 additions & 12 deletions ...Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1745,14 +1745,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (KnnDescriptorActions is not null)
{
writer.WritePropertyName("knn");
if (KnnDescriptorActions.Length > 1)
if (KnnDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in KnnDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.KnnQueryDescriptor<TDocument>(action), options);
}

if (KnnDescriptorActions.Length > 1)
if (KnnDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (KnnValue is not null)
Expand Down Expand Up @@ -1834,14 +1834,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (RescoreDescriptorActions is not null)
{
writer.WritePropertyName("rescore");
if (RescoreDescriptorActions.Length > 1)
if (RescoreDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in RescoreDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreDescriptor<TDocument>(action), options);
}

if (RescoreDescriptorActions.Length > 1)
if (RescoreDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (RescoreValue is not null)
Expand Down Expand Up @@ -1909,14 +1909,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down Expand Up @@ -2791,14 +2791,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (KnnDescriptorActions is not null)
{
writer.WritePropertyName("knn");
if (KnnDescriptorActions.Length > 1)
if (KnnDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in KnnDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.KnnQueryDescriptor(action), options);
}

if (KnnDescriptorActions.Length > 1)
if (KnnDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (KnnValue is not null)
Expand Down Expand Up @@ -2880,14 +2880,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (RescoreDescriptorActions is not null)
{
writer.WritePropertyName("rescore");
if (RescoreDescriptorActions.Length > 1)
if (RescoreDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in RescoreDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreDescriptor(action), options);
}

if (RescoreDescriptorActions.Length > 1)
if (RescoreDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (RescoreValue is not null)
Expand Down Expand Up @@ -2955,14 +2955,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down
16 changes: 8 additions & 8 deletions src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,14 +437,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (FieldsDescriptorActions is not null)
{
writer.WritePropertyName("fields");
if (FieldsDescriptorActions.Length > 1)
if (FieldsDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in FieldsDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormatDescriptor<TDocument>(action), options);
}

if (FieldsDescriptorActions.Length > 1)
if (FieldsDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (FieldsValue is not null)
Expand All @@ -466,14 +466,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (FilterDescriptorActions is not null)
{
writer.WritePropertyName("filter");
if (FilterDescriptorActions.Length > 1)
if (FilterDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in FilterDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor<TDocument>(action), options);
}

if (FilterDescriptorActions.Length > 1)
if (FilterDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (FilterValue is not null)
Expand Down Expand Up @@ -842,14 +842,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (FieldsDescriptorActions is not null)
{
writer.WritePropertyName("fields");
if (FieldsDescriptorActions.Length > 1)
if (FieldsDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in FieldsDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormatDescriptor(action), options);
}

if (FieldsDescriptorActions.Length > 1)
if (FieldsDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (FieldsValue is not null)
Expand All @@ -871,14 +871,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (FilterDescriptorActions is not null)
{
writer.WritePropertyName("filter");
if (FilterDescriptorActions.Length > 1)
if (FilterDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in FilterDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor(action), options);
}

if (FilterDescriptorActions.Length > 1)
if (FilterDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (FilterValue is not null)
Expand Down
8 changes: 4 additions & 4 deletions src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,14 +474,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down Expand Up @@ -842,14 +842,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down
24 changes: 12 additions & 12 deletions src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,14 +1851,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (KnnDescriptorActions is not null)
{
writer.WritePropertyName("knn");
if (KnnDescriptorActions.Length > 1)
if (KnnDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in KnnDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.KnnQueryDescriptor<TDocument>(action), options);
}

if (KnnDescriptorActions.Length > 1)
if (KnnDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (KnnValue is not null)
Expand Down Expand Up @@ -1956,14 +1956,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (RescoreDescriptorActions is not null)
{
writer.WritePropertyName("rescore");
if (RescoreDescriptorActions.Length > 1)
if (RescoreDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in RescoreDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreDescriptor<TDocument>(action), options);
}

if (RescoreDescriptorActions.Length > 1)
if (RescoreDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (RescoreValue is not null)
Expand Down Expand Up @@ -2031,14 +2031,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down Expand Up @@ -2970,14 +2970,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (KnnDescriptorActions is not null)
{
writer.WritePropertyName("knn");
if (KnnDescriptorActions.Length > 1)
if (KnnDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in KnnDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.KnnQueryDescriptor(action), options);
}

if (KnnDescriptorActions.Length > 1)
if (KnnDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (KnnValue is not null)
Expand Down Expand Up @@ -3075,14 +3075,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (RescoreDescriptorActions is not null)
{
writer.WritePropertyName("rescore");
if (RescoreDescriptorActions.Length > 1)
if (RescoreDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in RescoreDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreDescriptor(action), options);
}

if (RescoreDescriptorActions.Length > 1)
if (RescoreDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (RescoreValue is not null)
Expand Down Expand Up @@ -3150,14 +3150,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down
8 changes: 4 additions & 4 deletions ...Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down Expand Up @@ -365,14 +365,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down
8 changes: 4 additions & 4 deletions ...ic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,14 +434,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down Expand Up @@ -791,14 +791,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
else if (SortDescriptorActions is not null)
{
writer.WritePropertyName("sort");
if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteStartArray();
foreach (var action in SortDescriptorActions)
{
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
}

if (SortDescriptorActions.Length > 1)
if (SortDescriptorActions.Length != 1)
writer.WriteEndArray();
}
else if (SortValue is not null)
Expand Down
Loading