From 6bf6c93cf8703706c7498bdb97cedbdea078c4d4 Mon Sep 17 00:00:00 2001 From: Florian Bernd Date: Fri, 5 Apr 2024 13:04:31 +0200 Subject: [PATCH] Improve serialization of "single-or-many" properties --- .../AsyncSearch/SubmitAsyncSearchRequest.g.cs | 24 +++--- .../_Generated/Api/Eql/EqlSearchRequest.g.cs | 16 ++-- .../_Generated/Api/SearchMvtRequest.g.cs | 8 +- .../_Generated/Api/SearchRequest.g.cs | 24 +++--- .../Aggregations/BucketSortAggregation.g.cs | 8 +- .../Aggregations/TopHitsAggregation.g.cs | 8 +- .../Aggregations/TopMetricsAggregation.g.cs | 16 ++-- .../_Generated/Types/Core/Reindex/Source.g.cs | 8 +- .../Types/Core/Search/FieldCollapse.g.cs | 8 +- .../Types/Core/Search/InnerHits.g.cs | 8 +- .../_Generated/Types/KnnQuery.g.cs | 8 +- .../_Generated/Types/QueryDsl/BoolQuery.g.cs | 32 ++++---- .../Core/Infer/Fields/FieldsConverter.cs | 76 +++++++------------ .../SingleOrManySerializationHelper.cs | 60 +++++---------- .../AsyncSearch/SubmitAsyncSearchRequest.g.cs | 24 +++--- .../_Generated/Api/Eql/EqlSearchRequest.g.cs | 16 ++-- .../_Generated/Api/SearchMvtRequest.g.cs | 8 +- .../_Generated/Api/SearchRequest.g.cs | 24 +++--- .../Aggregations/BucketSortAggregation.g.cs | 8 +- .../Aggregations/TopHitsAggregation.g.cs | 8 +- .../Aggregations/TopMetricsAggregation.g.cs | 16 ++-- .../_Generated/Types/Core/Reindex/Source.g.cs | 8 +- .../Types/Core/Search/FieldCollapse.g.cs | 8 +- .../Types/Core/Search/InnerHits.g.cs | 8 +- .../_Generated/Types/KnnQuery.g.cs | 8 +- .../_Generated/Types/QueryDsl/BoolQuery.g.cs | 32 ++++---- 26 files changed, 213 insertions(+), 259 deletions(-) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs index b6402bbc452..20eff988aac 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs @@ -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(action), options); } - if (KnnDescriptorActions.Length > 1) + if (KnnDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (KnnValue is not null) @@ -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(action), options); } - if (RescoreDescriptorActions.Length > 1) + if (RescoreDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (RescoreValue is not null) @@ -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(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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) @@ -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) @@ -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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs index 4369230c803..3ae5f61273d 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs @@ -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(action), options); } - if (FieldsDescriptorActions.Length > 1) + if (FieldsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FieldsValue is not null) @@ -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(action), options); } - if (FilterDescriptorActions.Length > 1) + if (FilterDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FilterValue is not null) @@ -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) @@ -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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs index a99f2f68fa6..27ecf5b819a 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs @@ -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(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs index 8596c68bef3..3ce5241b078 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs @@ -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(action), options); } - if (KnnDescriptorActions.Length > 1) + if (KnnDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (KnnValue is not null) @@ -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(action), options); } - if (RescoreDescriptorActions.Length > 1) + if (RescoreDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (RescoreValue is not null) @@ -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(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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) @@ -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) @@ -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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs index a21755cbcef..cd9ab6d677c 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs @@ -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(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs index e423e5a1dd3..cae957ce4b5 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs @@ -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(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs index 0c3c07976e2..78ab7c21d19 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs @@ -238,14 +238,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MetricsDescriptorActions is not null) { writer.WritePropertyName("metrics"); - if (MetricsDescriptorActions.Length > 1) + if (MetricsDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MetricsDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValueDescriptor(action), options); } - if (MetricsDescriptorActions.Length > 1) + if (MetricsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MetricsValue is not null) @@ -285,14 +285,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) @@ -477,14 +477,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MetricsDescriptorActions is not null) { writer.WritePropertyName("metrics"); - if (MetricsDescriptorActions.Length > 1) + if (MetricsDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MetricsDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Aggregations.TopMetricsValueDescriptor(action), options); } - if (MetricsDescriptorActions.Length > 1) + if (MetricsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MetricsValue is not null) @@ -524,14 +524,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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Reindex/Source.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Reindex/Source.g.cs index 041d861ac77..c7ffe5d858d 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Reindex/Source.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Reindex/Source.g.cs @@ -326,14 +326,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) @@ -606,14 +606,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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldCollapse.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldCollapse.g.cs index fdf23e9556c..1395c4cb758 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldCollapse.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/FieldCollapse.g.cs @@ -203,14 +203,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (InnerHitsDescriptorActions is not null) { writer.WritePropertyName("inner_hits"); - if (InnerHitsDescriptorActions.Length > 1) + if (InnerHitsDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in InnerHitsDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHitsDescriptor(action), options); } - if (InnerHitsDescriptorActions.Length > 1) + if (InnerHitsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (InnerHitsValue is not null) @@ -380,14 +380,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (InnerHitsDescriptorActions is not null) { writer.WritePropertyName("inner_hits"); - if (InnerHitsDescriptorActions.Length > 1) + if (InnerHitsDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in InnerHitsDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.InnerHitsDescriptor(action), options); } - if (InnerHitsDescriptorActions.Length > 1) + if (InnerHitsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (InnerHitsValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/InnerHits.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/InnerHits.g.cs index 4524227c6a4..7e668521777 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/InnerHits.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/InnerHits.g.cs @@ -448,14 +448,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) @@ -858,14 +858,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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnQuery.g.cs index 40c43c6e708..92dd32aeca2 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/KnnQuery.g.cs @@ -301,14 +301,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) @@ -583,14 +583,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) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/BoolQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/BoolQuery.g.cs index d0e01026cf4..aa315b37025 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/BoolQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/BoolQuery.g.cs @@ -304,14 +304,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) @@ -339,14 +339,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MustDescriptorActions is not null) { writer.WritePropertyName("must"); - if (MustDescriptorActions.Length > 1) + if (MustDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MustDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor(action), options); } - if (MustDescriptorActions.Length > 1) + if (MustDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MustValue is not null) @@ -368,14 +368,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MustNotDescriptorActions is not null) { writer.WritePropertyName("must_not"); - if (MustNotDescriptorActions.Length > 1) + if (MustNotDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MustNotDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor(action), options); } - if (MustNotDescriptorActions.Length > 1) + if (MustNotDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MustNotValue is not null) @@ -403,14 +403,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (ShouldDescriptorActions is not null) { writer.WritePropertyName("should"); - if (ShouldDescriptorActions.Length > 1) + if (ShouldDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in ShouldDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor(action), options); } - if (ShouldDescriptorActions.Length > 1) + if (ShouldDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (ShouldValue is not null) @@ -653,14 +653,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) @@ -688,14 +688,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MustDescriptorActions is not null) { writer.WritePropertyName("must"); - if (MustDescriptorActions.Length > 1) + if (MustDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MustDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor(action), options); } - if (MustDescriptorActions.Length > 1) + if (MustDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MustValue is not null) @@ -717,14 +717,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MustNotDescriptorActions is not null) { writer.WritePropertyName("must_not"); - if (MustNotDescriptorActions.Length > 1) + if (MustNotDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MustNotDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor(action), options); } - if (MustNotDescriptorActions.Length > 1) + if (MustNotDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MustNotValue is not null) @@ -752,14 +752,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (ShouldDescriptorActions is not null) { writer.WritePropertyName("should"); - if (ShouldDescriptorActions.Length > 1) + if (ShouldDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in ShouldDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor(action), options); } - if (ShouldDescriptorActions.Length > 1) + if (ShouldDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (ShouldValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Fields/FieldsConverter.cs b/src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Fields/FieldsConverter.cs index d7a9044dabf..daf9f6428ef 100644 --- a/src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Fields/FieldsConverter.cs +++ b/src/Elastic.Clients.Elasticsearch.Shared/Core/Infer/Fields/FieldsConverter.cs @@ -7,6 +7,8 @@ using System.Text.Json; using System.Text.Json.Serialization; +using Elastic.Clients.Elasticsearch.Serialization; + #if ELASTICSEARCH_SERVERLESS namespace Elastic.Clients.Elasticsearch.Serverless; #else @@ -17,24 +19,18 @@ internal sealed class FieldsConverter : JsonConverter { public override Fields? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - if (reader.TokenType == JsonTokenType.String) - { - Fields fields = reader.GetString(); - return fields; - } - else if (reader.TokenType == JsonTokenType.StartArray) + switch (reader.TokenType) { - var fields = new List(); - while (reader.Read() && reader.TokenType != JsonTokenType.EndArray) - { - var field = JsonSerializer.Deserialize(ref reader, options); - fields.Add(field); - } - return new Fields(fields); - } + case JsonTokenType.Null: + return null; - reader.Read(); - return null; + case JsonTokenType.StartArray: + var fields = JsonSerializer.Deserialize>(ref reader, options); + return new Fields(fields); + + default: + throw new JsonException("Unexpected token."); + } } public override void Write(Utf8JsonWriter writer, Fields value, JsonSerializerOptions options) @@ -45,12 +41,7 @@ public override void Write(Utf8JsonWriter writer, Fields value, JsonSerializerOp return; } - writer.WriteStartArray(); - foreach (var field in value.ListOfFields) - { - JsonSerializer.Serialize(writer, field, options); - } - writer.WriteEndArray(); + JsonSerializer.Serialize(writer, value.ListOfFields, options); } } @@ -58,25 +49,22 @@ internal sealed class SingleOrManyFieldsConverter : JsonConverter { public override Fields? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - if (reader.TokenType == JsonTokenType.String) + switch (reader.TokenType) { - Fields fields = reader.GetString(); - return fields; - } + case JsonTokenType.Null: + return null; - if (reader.TokenType == JsonTokenType.StartArray) - { - var fields = new List(); - while (reader.Read() && reader.TokenType != JsonTokenType.EndArray) - { + case JsonTokenType.String: var field = JsonSerializer.Deserialize(ref reader, options); - fields.Add(field); - } - return new Fields(fields); - } + return new Fields([field]); + + case JsonTokenType.StartArray: + var fields = JsonSerializer.Deserialize>(ref reader, options); + return new Fields(fields); - reader.Read(); - return null; + default: + throw new JsonException("Unexpected token."); + } } public override void Write(Utf8JsonWriter writer, Fields value, JsonSerializerOptions options) @@ -87,24 +75,12 @@ public override void Write(Utf8JsonWriter writer, Fields value, JsonSerializerOp return; } - //if (value.ListOfFields.Count == 0) - //{ - // writer.WriteStartObject(); - // writer.WriteEndObject(); - // return; - //} - if (value.ListOfFields.Count == 1) { JsonSerializer.Serialize(writer, value.ListOfFields[0], options); return; } - writer.WriteStartArray(); - foreach (var field in value.ListOfFields) - { - JsonSerializer.Serialize(writer, field, options); - } - writer.WriteEndArray(); + JsonSerializer.Serialize(writer, value.ListOfFields, options); } } diff --git a/src/Elastic.Clients.Elasticsearch.Shared/Serialization/SingleOrManySerializationHelper.cs b/src/Elastic.Clients.Elasticsearch.Shared/Serialization/SingleOrManySerializationHelper.cs index b2a47e52539..27e976980c7 100644 --- a/src/Elastic.Clients.Elasticsearch.Shared/Serialization/SingleOrManySerializationHelper.cs +++ b/src/Elastic.Clients.Elasticsearch.Shared/Serialization/SingleOrManySerializationHelper.cs @@ -16,59 +16,37 @@ internal static class SingleOrManySerializationHelper { public static IList Deserialize(ref Utf8JsonReader reader, JsonSerializerOptions options) { - if (reader.TokenType == JsonTokenType.StartObject) + switch (reader.TokenType) { - var singleItem = JsonSerializer.Deserialize(ref reader, options); - return new TItem[] { singleItem }; - } + case JsonTokenType.Null: + return [default]; - if (reader.TokenType == JsonTokenType.StartArray) - { - var list = new List(); - while (reader.Read() && reader.TokenType != JsonTokenType.EndArray) + case JsonTokenType.StartArray: + return JsonSerializer.Deserialize>(ref reader, options); + + default: { - var item = JsonSerializer.Deserialize(ref reader, options); - list.Add(item); + var item = (TItem)JsonSerializer.Deserialize(ref reader, typeof(TItem), options); + return [item]; } - return list; - } - - // Handles situations such as a single sort value which can be a string - // e.g. GET nuget-stats/_search - // { - // "sort": "version" - // } - if (reader.TokenType == JsonTokenType.String) - { - var item = (TItem)JsonSerializer.Deserialize(ref reader, typeof(TItem), options); - return new TItem[] { item }; } - - throw new JsonException("Unexpected token."); } public static void Serialize(ICollection value, Utf8JsonWriter writer, JsonSerializerOptions options) { - var count = value.Count; - - if (count == 0) + switch (value) { - writer.WriteStartObject(); - writer.WriteEndObject(); - return; - } + case null: + writer.WriteNullValue(); + break; - if (count == 1) - { - JsonSerializer.Serialize(writer, value.Single(), options); - return; - } + case { Count: 1 }: + JsonSerializer.Serialize(writer, value.First(), options); + break; - writer.WriteStartArray(); - foreach (var item in value) - { - JsonSerializer.Serialize(writer, item, options); + default: + JsonSerializer.Serialize(writer, value, options); + break; } - writer.WriteEndArray(); } } diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs index 30df4097441..69f73048c11 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs @@ -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.KnnQueryDescriptor(action), options); } - if (KnnDescriptorActions.Length > 1) + if (KnnDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (KnnValue is not null) @@ -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.Core.Search.RescoreDescriptor(action), options); } - if (RescoreDescriptorActions.Length > 1) + if (RescoreDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (RescoreValue is not null) @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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.KnnQueryDescriptor(action), options); } - if (KnnDescriptorActions.Length > 1) + if (KnnDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (KnnValue is not null) @@ -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.Core.Search.RescoreDescriptor(action), options); } - if (RescoreDescriptorActions.Length > 1) + if (RescoreDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (RescoreValue is not null) @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs index 809b306abea..0b5d91d630b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/Eql/EqlSearchRequest.g.cs @@ -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.QueryDsl.FieldAndFormatDescriptor(action), options); } - if (FieldsDescriptorActions.Length > 1) + if (FieldsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FieldsValue is not null) @@ -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.QueryDsl.QueryDescriptor(action), options); } - if (FilterDescriptorActions.Length > 1) + if (FilterDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FilterValue is not null) @@ -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.QueryDsl.FieldAndFormatDescriptor(action), options); } - if (FieldsDescriptorActions.Length > 1) + if (FieldsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FieldsValue is not null) @@ -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.QueryDsl.QueryDescriptor(action), options); } - if (FilterDescriptorActions.Length > 1) + if (FilterDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FilterValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchMvtRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchMvtRequest.g.cs index 31afdead96d..dcc19687c1c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchMvtRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchMvtRequest.g.cs @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs index c078f55aa7b..842831ae159 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs @@ -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.KnnQueryDescriptor(action), options); } - if (KnnDescriptorActions.Length > 1) + if (KnnDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (KnnValue is not null) @@ -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.Core.Search.RescoreDescriptor(action), options); } - if (RescoreDescriptorActions.Length > 1) + if (RescoreDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (RescoreValue is not null) @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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.KnnQueryDescriptor(action), options); } - if (KnnDescriptorActions.Length > 1) + if (KnnDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (KnnValue is not null) @@ -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.Core.Search.RescoreDescriptor(action), options); } - if (RescoreDescriptorActions.Length > 1) + if (RescoreDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (RescoreValue is not null) @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs index f874d86a413..4d8788a9535 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/BucketSortAggregation.g.cs @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs index 9af6b192925..ae092126610 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs index 1e224e11d27..01c54744d53 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs @@ -238,14 +238,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MetricsDescriptorActions is not null) { writer.WritePropertyName("metrics"); - if (MetricsDescriptorActions.Length > 1) + if (MetricsDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MetricsDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValueDescriptor(action), options); } - if (MetricsDescriptorActions.Length > 1) + if (MetricsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MetricsValue is not null) @@ -285,14 +285,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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -477,14 +477,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MetricsDescriptorActions is not null) { writer.WritePropertyName("metrics"); - if (MetricsDescriptorActions.Length > 1) + if (MetricsDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MetricsDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Aggregations.TopMetricsValueDescriptor(action), options); } - if (MetricsDescriptorActions.Length > 1) + if (MetricsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MetricsValue is not null) @@ -524,14 +524,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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs index cd0e776466b..7983b8f970a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Reindex/Source.g.cs @@ -326,14 +326,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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -606,14 +606,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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldCollapse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldCollapse.g.cs index a9c14add668..4c5323cfc58 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldCollapse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldCollapse.g.cs @@ -203,14 +203,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (InnerHitsDescriptorActions is not null) { writer.WritePropertyName("inner_hits"); - if (InnerHitsDescriptorActions.Length > 1) + if (InnerHitsDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in InnerHitsDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Core.Search.InnerHitsDescriptor(action), options); } - if (InnerHitsDescriptorActions.Length > 1) + if (InnerHitsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (InnerHitsValue is not null) @@ -380,14 +380,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (InnerHitsDescriptorActions is not null) { writer.WritePropertyName("inner_hits"); - if (InnerHitsDescriptorActions.Length > 1) + if (InnerHitsDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in InnerHitsDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Core.Search.InnerHitsDescriptor(action), options); } - if (InnerHitsDescriptorActions.Length > 1) + if (InnerHitsDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (InnerHitsValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs index 6f798b3d1b4..eff79da0f2d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/InnerHits.g.cs @@ -448,14 +448,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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) @@ -858,14 +858,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.SortOptionsDescriptor(action), options); } - if (SortDescriptorActions.Length > 1) + if (SortDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (SortValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs index caa139329c6..b630ba73846 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/KnnQuery.g.cs @@ -301,14 +301,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.QueryDsl.QueryDescriptor(action), options); } - if (FilterDescriptorActions.Length > 1) + if (FilterDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FilterValue is not null) @@ -583,14 +583,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.QueryDsl.QueryDescriptor(action), options); } - if (FilterDescriptorActions.Length > 1) + if (FilterDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FilterValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs index a66558094a1..93620586055 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/BoolQuery.g.cs @@ -304,14 +304,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.QueryDsl.QueryDescriptor(action), options); } - if (FilterDescriptorActions.Length > 1) + if (FilterDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FilterValue is not null) @@ -339,14 +339,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MustDescriptorActions is not null) { writer.WritePropertyName("must"); - if (MustDescriptorActions.Length > 1) + if (MustDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MustDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.QueryDsl.QueryDescriptor(action), options); } - if (MustDescriptorActions.Length > 1) + if (MustDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MustValue is not null) @@ -368,14 +368,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MustNotDescriptorActions is not null) { writer.WritePropertyName("must_not"); - if (MustNotDescriptorActions.Length > 1) + if (MustNotDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MustNotDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.QueryDsl.QueryDescriptor(action), options); } - if (MustNotDescriptorActions.Length > 1) + if (MustNotDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MustNotValue is not null) @@ -403,14 +403,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (ShouldDescriptorActions is not null) { writer.WritePropertyName("should"); - if (ShouldDescriptorActions.Length > 1) + if (ShouldDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in ShouldDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.QueryDsl.QueryDescriptor(action), options); } - if (ShouldDescriptorActions.Length > 1) + if (ShouldDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (ShouldValue is not null) @@ -653,14 +653,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.QueryDsl.QueryDescriptor(action), options); } - if (FilterDescriptorActions.Length > 1) + if (FilterDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (FilterValue is not null) @@ -688,14 +688,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MustDescriptorActions is not null) { writer.WritePropertyName("must"); - if (MustDescriptorActions.Length > 1) + if (MustDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MustDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.QueryDsl.QueryDescriptor(action), options); } - if (MustDescriptorActions.Length > 1) + if (MustDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MustValue is not null) @@ -717,14 +717,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (MustNotDescriptorActions is not null) { writer.WritePropertyName("must_not"); - if (MustNotDescriptorActions.Length > 1) + if (MustNotDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in MustNotDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.QueryDsl.QueryDescriptor(action), options); } - if (MustNotDescriptorActions.Length > 1) + if (MustNotDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (MustNotValue is not null) @@ -752,14 +752,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o else if (ShouldDescriptorActions is not null) { writer.WritePropertyName("should"); - if (ShouldDescriptorActions.Length > 1) + if (ShouldDescriptorActions.Length != 1) writer.WriteStartArray(); foreach (var action in ShouldDescriptorActions) { JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.QueryDsl.QueryDescriptor(action), options); } - if (ShouldDescriptorActions.Length > 1) + if (ShouldDescriptorActions.Length != 1) writer.WriteEndArray(); } else if (ShouldValue is not null)