Skip to content

Commit c182754

Browse files
github-actions[bot]flobernd
github-actions[bot]
and
flobernd
authored
Improve serialization of "single-or-many" properties (#8090) (#8094)
Co-authored-by: Florian Bernd <git@flobernd.de>
1 parent 8602253 commit c182754

File tree

26 files changed

+213
-259
lines changed

26 files changed

+213
-259
lines changed

‎src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/AsyncSearch/SubmitAsyncSearchRequest.g.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,14 +1745,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
17451745
else if (KnnDescriptorActions is not null)
17461746
{
17471747
writer.WritePropertyName("knn");
1748-
if (KnnDescriptorActions.Length > 1)
1748+
if (KnnDescriptorActions.Length != 1)
17491749
writer.WriteStartArray();
17501750
foreach (var action in KnnDescriptorActions)
17511751
{
17521752
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.KnnQueryDescriptor<TDocument>(action), options);
17531753
}
17541754

1755-
if (KnnDescriptorActions.Length > 1)
1755+
if (KnnDescriptorActions.Length != 1)
17561756
writer.WriteEndArray();
17571757
}
17581758
else if (KnnValue is not null)
@@ -1834,14 +1834,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
18341834
else if (RescoreDescriptorActions is not null)
18351835
{
18361836
writer.WritePropertyName("rescore");
1837-
if (RescoreDescriptorActions.Length > 1)
1837+
if (RescoreDescriptorActions.Length != 1)
18381838
writer.WriteStartArray();
18391839
foreach (var action in RescoreDescriptorActions)
18401840
{
18411841
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreDescriptor<TDocument>(action), options);
18421842
}
18431843

1844-
if (RescoreDescriptorActions.Length > 1)
1844+
if (RescoreDescriptorActions.Length != 1)
18451845
writer.WriteEndArray();
18461846
}
18471847
else if (RescoreValue is not null)
@@ -1909,14 +1909,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
19091909
else if (SortDescriptorActions is not null)
19101910
{
19111911
writer.WritePropertyName("sort");
1912-
if (SortDescriptorActions.Length > 1)
1912+
if (SortDescriptorActions.Length != 1)
19131913
writer.WriteStartArray();
19141914
foreach (var action in SortDescriptorActions)
19151915
{
19161916
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
19171917
}
19181918

1919-
if (SortDescriptorActions.Length > 1)
1919+
if (SortDescriptorActions.Length != 1)
19201920
writer.WriteEndArray();
19211921
}
19221922
else if (SortValue is not null)
@@ -2791,14 +2791,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
27912791
else if (KnnDescriptorActions is not null)
27922792
{
27932793
writer.WritePropertyName("knn");
2794-
if (KnnDescriptorActions.Length > 1)
2794+
if (KnnDescriptorActions.Length != 1)
27952795
writer.WriteStartArray();
27962796
foreach (var action in KnnDescriptorActions)
27972797
{
27982798
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.KnnQueryDescriptor(action), options);
27992799
}
28002800

2801-
if (KnnDescriptorActions.Length > 1)
2801+
if (KnnDescriptorActions.Length != 1)
28022802
writer.WriteEndArray();
28032803
}
28042804
else if (KnnValue is not null)
@@ -2880,14 +2880,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
28802880
else if (RescoreDescriptorActions is not null)
28812881
{
28822882
writer.WritePropertyName("rescore");
2883-
if (RescoreDescriptorActions.Length > 1)
2883+
if (RescoreDescriptorActions.Length != 1)
28842884
writer.WriteStartArray();
28852885
foreach (var action in RescoreDescriptorActions)
28862886
{
28872887
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreDescriptor(action), options);
28882888
}
28892889

2890-
if (RescoreDescriptorActions.Length > 1)
2890+
if (RescoreDescriptorActions.Length != 1)
28912891
writer.WriteEndArray();
28922892
}
28932893
else if (RescoreValue is not null)
@@ -2955,14 +2955,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
29552955
else if (SortDescriptorActions is not null)
29562956
{
29572957
writer.WritePropertyName("sort");
2958-
if (SortDescriptorActions.Length > 1)
2958+
if (SortDescriptorActions.Length != 1)
29592959
writer.WriteStartArray();
29602960
foreach (var action in SortDescriptorActions)
29612961
{
29622962
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
29632963
}
29642964

2965-
if (SortDescriptorActions.Length > 1)
2965+
if (SortDescriptorActions.Length != 1)
29662966
writer.WriteEndArray();
29672967
}
29682968
else if (SortValue is not null)

‎src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/Eql/EqlSearchRequest.g.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -437,14 +437,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
437437
else if (FieldsDescriptorActions is not null)
438438
{
439439
writer.WritePropertyName("fields");
440-
if (FieldsDescriptorActions.Length > 1)
440+
if (FieldsDescriptorActions.Length != 1)
441441
writer.WriteStartArray();
442442
foreach (var action in FieldsDescriptorActions)
443443
{
444444
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormatDescriptor<TDocument>(action), options);
445445
}
446446

447-
if (FieldsDescriptorActions.Length > 1)
447+
if (FieldsDescriptorActions.Length != 1)
448448
writer.WriteEndArray();
449449
}
450450
else if (FieldsValue is not null)
@@ -466,14 +466,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
466466
else if (FilterDescriptorActions is not null)
467467
{
468468
writer.WritePropertyName("filter");
469-
if (FilterDescriptorActions.Length > 1)
469+
if (FilterDescriptorActions.Length != 1)
470470
writer.WriteStartArray();
471471
foreach (var action in FilterDescriptorActions)
472472
{
473473
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor<TDocument>(action), options);
474474
}
475475

476-
if (FilterDescriptorActions.Length > 1)
476+
if (FilterDescriptorActions.Length != 1)
477477
writer.WriteEndArray();
478478
}
479479
else if (FilterValue is not null)
@@ -842,14 +842,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
842842
else if (FieldsDescriptorActions is not null)
843843
{
844844
writer.WritePropertyName("fields");
845-
if (FieldsDescriptorActions.Length > 1)
845+
if (FieldsDescriptorActions.Length != 1)
846846
writer.WriteStartArray();
847847
foreach (var action in FieldsDescriptorActions)
848848
{
849849
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.FieldAndFormatDescriptor(action), options);
850850
}
851851

852-
if (FieldsDescriptorActions.Length > 1)
852+
if (FieldsDescriptorActions.Length != 1)
853853
writer.WriteEndArray();
854854
}
855855
else if (FieldsValue is not null)
@@ -871,14 +871,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
871871
else if (FilterDescriptorActions is not null)
872872
{
873873
writer.WritePropertyName("filter");
874-
if (FilterDescriptorActions.Length > 1)
874+
if (FilterDescriptorActions.Length != 1)
875875
writer.WriteStartArray();
876876
foreach (var action in FilterDescriptorActions)
877877
{
878878
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.QueryDsl.QueryDescriptor(action), options);
879879
}
880880

881-
if (FilterDescriptorActions.Length > 1)
881+
if (FilterDescriptorActions.Length != 1)
882882
writer.WriteEndArray();
883883
}
884884
else if (FilterValue is not null)

‎src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchMvtRequest.g.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -474,14 +474,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
474474
else if (SortDescriptorActions is not null)
475475
{
476476
writer.WritePropertyName("sort");
477-
if (SortDescriptorActions.Length > 1)
477+
if (SortDescriptorActions.Length != 1)
478478
writer.WriteStartArray();
479479
foreach (var action in SortDescriptorActions)
480480
{
481481
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
482482
}
483483

484-
if (SortDescriptorActions.Length > 1)
484+
if (SortDescriptorActions.Length != 1)
485485
writer.WriteEndArray();
486486
}
487487
else if (SortValue is not null)
@@ -842,14 +842,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
842842
else if (SortDescriptorActions is not null)
843843
{
844844
writer.WritePropertyName("sort");
845-
if (SortDescriptorActions.Length > 1)
845+
if (SortDescriptorActions.Length != 1)
846846
writer.WriteStartArray();
847847
foreach (var action in SortDescriptorActions)
848848
{
849849
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
850850
}
851851

852-
if (SortDescriptorActions.Length > 1)
852+
if (SortDescriptorActions.Length != 1)
853853
writer.WriteEndArray();
854854
}
855855
else if (SortValue is not null)

‎src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,14 +1851,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
18511851
else if (KnnDescriptorActions is not null)
18521852
{
18531853
writer.WritePropertyName("knn");
1854-
if (KnnDescriptorActions.Length > 1)
1854+
if (KnnDescriptorActions.Length != 1)
18551855
writer.WriteStartArray();
18561856
foreach (var action in KnnDescriptorActions)
18571857
{
18581858
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.KnnQueryDescriptor<TDocument>(action), options);
18591859
}
18601860

1861-
if (KnnDescriptorActions.Length > 1)
1861+
if (KnnDescriptorActions.Length != 1)
18621862
writer.WriteEndArray();
18631863
}
18641864
else if (KnnValue is not null)
@@ -1956,14 +1956,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
19561956
else if (RescoreDescriptorActions is not null)
19571957
{
19581958
writer.WritePropertyName("rescore");
1959-
if (RescoreDescriptorActions.Length > 1)
1959+
if (RescoreDescriptorActions.Length != 1)
19601960
writer.WriteStartArray();
19611961
foreach (var action in RescoreDescriptorActions)
19621962
{
19631963
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreDescriptor<TDocument>(action), options);
19641964
}
19651965

1966-
if (RescoreDescriptorActions.Length > 1)
1966+
if (RescoreDescriptorActions.Length != 1)
19671967
writer.WriteEndArray();
19681968
}
19691969
else if (RescoreValue is not null)
@@ -2031,14 +2031,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
20312031
else if (SortDescriptorActions is not null)
20322032
{
20332033
writer.WritePropertyName("sort");
2034-
if (SortDescriptorActions.Length > 1)
2034+
if (SortDescriptorActions.Length != 1)
20352035
writer.WriteStartArray();
20362036
foreach (var action in SortDescriptorActions)
20372037
{
20382038
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
20392039
}
20402040

2041-
if (SortDescriptorActions.Length > 1)
2041+
if (SortDescriptorActions.Length != 1)
20422042
writer.WriteEndArray();
20432043
}
20442044
else if (SortValue is not null)
@@ -2970,14 +2970,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
29702970
else if (KnnDescriptorActions is not null)
29712971
{
29722972
writer.WritePropertyName("knn");
2973-
if (KnnDescriptorActions.Length > 1)
2973+
if (KnnDescriptorActions.Length != 1)
29742974
writer.WriteStartArray();
29752975
foreach (var action in KnnDescriptorActions)
29762976
{
29772977
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.KnnQueryDescriptor(action), options);
29782978
}
29792979

2980-
if (KnnDescriptorActions.Length > 1)
2980+
if (KnnDescriptorActions.Length != 1)
29812981
writer.WriteEndArray();
29822982
}
29832983
else if (KnnValue is not null)
@@ -3075,14 +3075,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
30753075
else if (RescoreDescriptorActions is not null)
30763076
{
30773077
writer.WritePropertyName("rescore");
3078-
if (RescoreDescriptorActions.Length > 1)
3078+
if (RescoreDescriptorActions.Length != 1)
30793079
writer.WriteStartArray();
30803080
foreach (var action in RescoreDescriptorActions)
30813081
{
30823082
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.Core.Search.RescoreDescriptor(action), options);
30833083
}
30843084

3085-
if (RescoreDescriptorActions.Length > 1)
3085+
if (RescoreDescriptorActions.Length != 1)
30863086
writer.WriteEndArray();
30873087
}
30883088
else if (RescoreValue is not null)
@@ -3150,14 +3150,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
31503150
else if (SortDescriptorActions is not null)
31513151
{
31523152
writer.WritePropertyName("sort");
3153-
if (SortDescriptorActions.Length > 1)
3153+
if (SortDescriptorActions.Length != 1)
31543154
writer.WriteStartArray();
31553155
foreach (var action in SortDescriptorActions)
31563156
{
31573157
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
31583158
}
31593159

3160-
if (SortDescriptorActions.Length > 1)
3160+
if (SortDescriptorActions.Length != 1)
31613161
writer.WriteEndArray();
31623162
}
31633163
else if (SortValue is not null)

‎src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/BucketSortAggregation.g.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
203203
else if (SortDescriptorActions is not null)
204204
{
205205
writer.WritePropertyName("sort");
206-
if (SortDescriptorActions.Length > 1)
206+
if (SortDescriptorActions.Length != 1)
207207
writer.WriteStartArray();
208208
foreach (var action in SortDescriptorActions)
209209
{
210210
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
211211
}
212212

213-
if (SortDescriptorActions.Length > 1)
213+
if (SortDescriptorActions.Length != 1)
214214
writer.WriteEndArray();
215215
}
216216
else if (SortValue is not null)
@@ -365,14 +365,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
365365
else if (SortDescriptorActions is not null)
366366
{
367367
writer.WritePropertyName("sort");
368-
if (SortDescriptorActions.Length > 1)
368+
if (SortDescriptorActions.Length != 1)
369369
writer.WriteStartArray();
370370
foreach (var action in SortDescriptorActions)
371371
{
372372
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
373373
}
374374

375-
if (SortDescriptorActions.Length > 1)
375+
if (SortDescriptorActions.Length != 1)
376376
writer.WriteEndArray();
377377
}
378378
else if (SortValue is not null)

‎src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TopHitsAggregation.g.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,14 +434,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
434434
else if (SortDescriptorActions is not null)
435435
{
436436
writer.WritePropertyName("sort");
437-
if (SortDescriptorActions.Length > 1)
437+
if (SortDescriptorActions.Length != 1)
438438
writer.WriteStartArray();
439439
foreach (var action in SortDescriptorActions)
440440
{
441441
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor<TDocument>(action), options);
442442
}
443443

444-
if (SortDescriptorActions.Length > 1)
444+
if (SortDescriptorActions.Length != 1)
445445
writer.WriteEndArray();
446446
}
447447
else if (SortValue is not null)
@@ -791,14 +791,14 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o
791791
else if (SortDescriptorActions is not null)
792792
{
793793
writer.WritePropertyName("sort");
794-
if (SortDescriptorActions.Length > 1)
794+
if (SortDescriptorActions.Length != 1)
795795
writer.WriteStartArray();
796796
foreach (var action in SortDescriptorActions)
797797
{
798798
JsonSerializer.Serialize(writer, new Elastic.Clients.Elasticsearch.Serverless.SortOptionsDescriptor(action), options);
799799
}
800800

801-
if (SortDescriptorActions.Length > 1)
801+
if (SortDescriptorActions.Length != 1)
802802
writer.WriteEndArray();
803803
}
804804
else if (SortValue is not null)

0 commit comments

Comments
 (0)