From a5cd9bd252c8dbb710d2307dc21fc36b3e4c1d54 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 7 Nov 2022 12:54:13 +0000 Subject: [PATCH 1/5] FieldSort is marked for use on requests --- .../_Generated/Types/FieldSort.g.cs | 302 +++++++++++++++++- 1 file changed, 295 insertions(+), 7 deletions(-) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs index 943fc9ccdc6..9a8abbe3a0e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/FieldSort.g.cs @@ -29,29 +29,317 @@ public sealed partial class FieldSort { [JsonInclude] [JsonPropertyName("format")] - public string? Format { get; init; } + public string? Format { get; set; } [JsonInclude] [JsonPropertyName("missing")] - public FieldValue? Missing { get; init; } + public FieldValue? Missing { get; set; } [JsonInclude] [JsonPropertyName("mode")] - public Elastic.Clients.Elasticsearch.SortMode? Mode { get; init; } + public Elastic.Clients.Elasticsearch.SortMode? Mode { get; set; } [JsonInclude] [JsonPropertyName("nested")] - public Elastic.Clients.Elasticsearch.NestedSortValue? Nested { get; init; } + public Elastic.Clients.Elasticsearch.NestedSortValue? Nested { get; set; } [JsonInclude] [JsonPropertyName("numeric_type")] - public Elastic.Clients.Elasticsearch.FieldSortNumericType? NumericType { get; init; } + public Elastic.Clients.Elasticsearch.FieldSortNumericType? NumericType { get; set; } [JsonInclude] [JsonPropertyName("order")] - public Elastic.Clients.Elasticsearch.SortOrder? Order { get; init; } + public Elastic.Clients.Elasticsearch.SortOrder? Order { get; set; } [JsonInclude] [JsonPropertyName("unmapped_type")] - public Elastic.Clients.Elasticsearch.Mapping.FieldType? UnmappedType { get; init; } + public Elastic.Clients.Elasticsearch.Mapping.FieldType? UnmappedType { get; set; } +} + +public sealed partial class FieldSortDescriptor : SerializableDescriptor> +{ + internal FieldSortDescriptor(Action> configure) => configure.Invoke(this); + public FieldSortDescriptor() : base() + { + } + + private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; } + + private NestedSortValueDescriptor NestedDescriptor { get; set; } + + private Action> NestedDescriptorAction { get; set; } + + private string? FormatValue { get; set; } + + private FieldValue? MissingValue { get; set; } + + private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; } + + private Elastic.Clients.Elasticsearch.FieldSortNumericType? NumericTypeValue { get; set; } + + private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; } + + private Elastic.Clients.Elasticsearch.Mapping.FieldType? UnmappedTypeValue { get; set; } + + public FieldSortDescriptor Nested(Elastic.Clients.Elasticsearch.NestedSortValue? nested) + { + NestedDescriptor = null; + NestedDescriptorAction = null; + NestedValue = nested; + return Self; + } + + public FieldSortDescriptor Nested(NestedSortValueDescriptor descriptor) + { + NestedValue = null; + NestedDescriptorAction = null; + NestedDescriptor = descriptor; + return Self; + } + + public FieldSortDescriptor Nested(Action> configure) + { + NestedValue = null; + NestedDescriptor = null; + NestedDescriptorAction = configure; + return Self; + } + + public FieldSortDescriptor Format(string? format) + { + FormatValue = format; + return Self; + } + + public FieldSortDescriptor Missing(FieldValue? missing) + { + MissingValue = missing; + return Self; + } + + public FieldSortDescriptor Mode(Elastic.Clients.Elasticsearch.SortMode? mode) + { + ModeValue = mode; + return Self; + } + + public FieldSortDescriptor NumericType(Elastic.Clients.Elasticsearch.FieldSortNumericType? numericType) + { + NumericTypeValue = numericType; + return Self; + } + + public FieldSortDescriptor Order(Elastic.Clients.Elasticsearch.SortOrder? order) + { + OrderValue = order; + return Self; + } + + public FieldSortDescriptor UnmappedType(Elastic.Clients.Elasticsearch.Mapping.FieldType? unmappedType) + { + UnmappedTypeValue = unmappedType; + return Self; + } + + protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) + { + writer.WriteStartObject(); + if (NestedDescriptor is not null) + { + writer.WritePropertyName("nested"); + JsonSerializer.Serialize(writer, NestedDescriptor, options); + } + else if (NestedDescriptorAction is not null) + { + writer.WritePropertyName("nested"); + JsonSerializer.Serialize(writer, new NestedSortValueDescriptor(NestedDescriptorAction), options); + } + else if (NestedValue is not null) + { + writer.WritePropertyName("nested"); + JsonSerializer.Serialize(writer, NestedValue, options); + } + + if (!string.IsNullOrEmpty(FormatValue)) + { + writer.WritePropertyName("format"); + writer.WriteStringValue(FormatValue); + } + + if (MissingValue is not null) + { + writer.WritePropertyName("missing"); + JsonSerializer.Serialize(writer, MissingValue, options); + } + + if (ModeValue is not null) + { + writer.WritePropertyName("mode"); + JsonSerializer.Serialize(writer, ModeValue, options); + } + + if (NumericTypeValue is not null) + { + writer.WritePropertyName("numeric_type"); + JsonSerializer.Serialize(writer, NumericTypeValue, options); + } + + if (OrderValue is not null) + { + writer.WritePropertyName("order"); + JsonSerializer.Serialize(writer, OrderValue, options); + } + + if (UnmappedTypeValue is not null) + { + writer.WritePropertyName("unmapped_type"); + JsonSerializer.Serialize(writer, UnmappedTypeValue, options); + } + + writer.WriteEndObject(); + } +} + +public sealed partial class FieldSortDescriptor : SerializableDescriptor +{ + internal FieldSortDescriptor(Action configure) => configure.Invoke(this); + public FieldSortDescriptor() : base() + { + } + + private Elastic.Clients.Elasticsearch.NestedSortValue? NestedValue { get; set; } + + private NestedSortValueDescriptor NestedDescriptor { get; set; } + + private Action NestedDescriptorAction { get; set; } + + private string? FormatValue { get; set; } + + private FieldValue? MissingValue { get; set; } + + private Elastic.Clients.Elasticsearch.SortMode? ModeValue { get; set; } + + private Elastic.Clients.Elasticsearch.FieldSortNumericType? NumericTypeValue { get; set; } + + private Elastic.Clients.Elasticsearch.SortOrder? OrderValue { get; set; } + + private Elastic.Clients.Elasticsearch.Mapping.FieldType? UnmappedTypeValue { get; set; } + + public FieldSortDescriptor Nested(Elastic.Clients.Elasticsearch.NestedSortValue? nested) + { + NestedDescriptor = null; + NestedDescriptorAction = null; + NestedValue = nested; + return Self; + } + + public FieldSortDescriptor Nested(NestedSortValueDescriptor descriptor) + { + NestedValue = null; + NestedDescriptorAction = null; + NestedDescriptor = descriptor; + return Self; + } + + public FieldSortDescriptor Nested(Action configure) + { + NestedValue = null; + NestedDescriptor = null; + NestedDescriptorAction = configure; + return Self; + } + + public FieldSortDescriptor Format(string? format) + { + FormatValue = format; + return Self; + } + + public FieldSortDescriptor Missing(FieldValue? missing) + { + MissingValue = missing; + return Self; + } + + public FieldSortDescriptor Mode(Elastic.Clients.Elasticsearch.SortMode? mode) + { + ModeValue = mode; + return Self; + } + + public FieldSortDescriptor NumericType(Elastic.Clients.Elasticsearch.FieldSortNumericType? numericType) + { + NumericTypeValue = numericType; + return Self; + } + + public FieldSortDescriptor Order(Elastic.Clients.Elasticsearch.SortOrder? order) + { + OrderValue = order; + return Self; + } + + public FieldSortDescriptor UnmappedType(Elastic.Clients.Elasticsearch.Mapping.FieldType? unmappedType) + { + UnmappedTypeValue = unmappedType; + return Self; + } + + protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) + { + writer.WriteStartObject(); + if (NestedDescriptor is not null) + { + writer.WritePropertyName("nested"); + JsonSerializer.Serialize(writer, NestedDescriptor, options); + } + else if (NestedDescriptorAction is not null) + { + writer.WritePropertyName("nested"); + JsonSerializer.Serialize(writer, new NestedSortValueDescriptor(NestedDescriptorAction), options); + } + else if (NestedValue is not null) + { + writer.WritePropertyName("nested"); + JsonSerializer.Serialize(writer, NestedValue, options); + } + + if (!string.IsNullOrEmpty(FormatValue)) + { + writer.WritePropertyName("format"); + writer.WriteStringValue(FormatValue); + } + + if (MissingValue is not null) + { + writer.WritePropertyName("missing"); + JsonSerializer.Serialize(writer, MissingValue, options); + } + + if (ModeValue is not null) + { + writer.WritePropertyName("mode"); + JsonSerializer.Serialize(writer, ModeValue, options); + } + + if (NumericTypeValue is not null) + { + writer.WritePropertyName("numeric_type"); + JsonSerializer.Serialize(writer, NumericTypeValue, options); + } + + if (OrderValue is not null) + { + writer.WritePropertyName("order"); + JsonSerializer.Serialize(writer, OrderValue, options); + } + + if (UnmappedTypeValue is not null) + { + writer.WritePropertyName("unmapped_type"); + JsonSerializer.Serialize(writer, UnmappedTypeValue, options); + } + + writer.WriteEndObject(); + } } \ No newline at end of file From 97cbb6a21f43c081744855f4a044d62aefadbc76 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 7 Nov 2022 16:13:29 +0000 Subject: [PATCH 2/5] Sort descriptor methods --- .../Types/SortConverter.cs | 11 ++ .../AsyncSearch/AsyncSearchSubmitRequest.g.cs | 174 ++++++++++++++--- .../_Generated/Api/SearchRequest.g.cs | 174 ++++++++++++++--- .../Aggregations/TopHitsAggregation.g.cs | 176 +++++++++++++++--- .../Aggregations/TopMetricsAggregation.g.cs | 176 +++++++++++++++--- .../Types/Core/MSearch/MultisearchBody.g.cs | 174 ++++++++++++++--- .../_Generated/Types/Core/Reindex/Source.g.cs | 174 ++++++++++++++--- .../Types/Core/Search/InnerHits.g.cs | 174 ++++++++++++++--- .../_Generated/Types/SortConverter.g.cs | 31 --- .../Search/Search/BasicSortUsageTests.cs | 20 ++ 10 files changed, 1055 insertions(+), 229 deletions(-) create mode 100644 src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs delete mode 100644 src/Elastic.Clients.Elasticsearch/_Generated/Types/SortConverter.g.cs diff --git a/src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs b/src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs new file mode 100644 index 00000000000..cca4b48064f --- /dev/null +++ b/src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs @@ -0,0 +1,11 @@ +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information. + +using Elastic.Clients.Elasticsearch.Serialization; + +namespace Elastic.Clients.Elasticsearch; + +internal sealed class SortConverter : ICollectionSingleOrManyConverter +{ +} diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs index 941e98f0d5f..3227b29e67f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/AsyncSearch/AsyncSearchSubmitRequest.g.cs @@ -895,6 +895,14 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Ela private Action> SliceDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action> SortDescriptorAction { get; set; } + + private Action>[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private bool? ExplainValue { get; set; } @@ -925,8 +933,6 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Ela private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private ICollection? StatsValue { get; set; } private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; } @@ -1223,6 +1229,42 @@ public AsyncSearchSubmitRequestDescriptor Slice(Action Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public AsyncSearchSubmitRequestDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public AsyncSearchSubmitRequestDescriptor Sort(Action> configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public AsyncSearchSubmitRequestDescriptor Sort(params Action>[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public AsyncSearchSubmitRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -1319,12 +1361,6 @@ public AsyncSearchSubmitRequestDescriptor Size(int? size) return Self; } - public AsyncSearchSubmitRequestDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public AsyncSearchSubmitRequestDescriptor Stats(ICollection? stats) { StatsValue = stats; @@ -1599,6 +1635,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, SliceValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -1687,12 +1752,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StatsValue is not null) { writer.WritePropertyName("stats"); @@ -1869,6 +1928,14 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private Action SliceDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action SortDescriptorAction { get; set; } + + private Action[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private bool? ExplainValue { get; set; } @@ -1899,8 +1966,6 @@ public AsyncSearchSubmitRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private ICollection? StatsValue { get; set; } private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; } @@ -2197,6 +2262,42 @@ public AsyncSearchSubmitRequestDescriptor Slice(Action c return Self; } + public AsyncSearchSubmitRequestDescriptor Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public AsyncSearchSubmitRequestDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public AsyncSearchSubmitRequestDescriptor Sort(Action configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public AsyncSearchSubmitRequestDescriptor Sort(params Action[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public AsyncSearchSubmitRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -2293,12 +2394,6 @@ public AsyncSearchSubmitRequestDescriptor Size(int? size) return Self; } - public AsyncSearchSubmitRequestDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public AsyncSearchSubmitRequestDescriptor Stats(ICollection? stats) { StatsValue = stats; @@ -2573,6 +2668,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, SliceValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -2661,12 +2785,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StatsValue is not null) { writer.WritePropertyName("stats"); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs index eb98dab046e..766dfec3dc7 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs @@ -878,6 +878,14 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private Action> SliceDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action> SortDescriptorAction { get; set; } + + private Action>[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private bool? ExplainValue { get; set; } @@ -908,8 +916,6 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch. private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private ICollection? StatsValue { get; set; } private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; } @@ -1206,6 +1212,42 @@ public SearchRequestDescriptor Slice(Action Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public SearchRequestDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public SearchRequestDescriptor Sort(Action> configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public SearchRequestDescriptor Sort(params Action>[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public SearchRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -1302,12 +1344,6 @@ public SearchRequestDescriptor Size(int? size) return Self; } - public SearchRequestDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public SearchRequestDescriptor Stats(ICollection? stats) { StatsValue = stats; @@ -1582,6 +1618,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, SliceValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -1670,12 +1735,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StatsValue is not null) { writer.WritePropertyName("stats"); @@ -1853,6 +1912,14 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? in private Action SliceDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action SortDescriptorAction { get; set; } + + private Action[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private bool? ExplainValue { get; set; } @@ -1883,8 +1950,6 @@ public SearchRequestDescriptor Indices(Elastic.Clients.Elasticsearch.Indices? in private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private ICollection? StatsValue { get; set; } private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; } @@ -2181,6 +2246,42 @@ public SearchRequestDescriptor Slice(Action configure) return Self; } + public SearchRequestDescriptor Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public SearchRequestDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public SearchRequestDescriptor Sort(Action configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public SearchRequestDescriptor Sort(params Action[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public SearchRequestDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -2277,12 +2378,6 @@ public SearchRequestDescriptor Size(int? size) return Self; } - public SearchRequestDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public SearchRequestDescriptor Stats(ICollection? stats) { StatsValue = stats; @@ -2557,6 +2652,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, SliceValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -2645,12 +2769,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StatsValue is not null) { writer.WritePropertyName("stats"); 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 48931f7cd40..308e6e27480 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopHitsAggregation.g.cs @@ -316,7 +316,7 @@ public override void Write(Utf8JsonWriter writer, TopHitsAggregation value, Json if (value.Sort is not null) { writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(value.Sort, writer, options); + JsonSerializer.Serialize(writer, value.Sort, options); } if (value.StoredFields is not null) @@ -406,6 +406,14 @@ public TopHitsAggregationDescriptor() : base() private Action> HighlightDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action> SortDescriptorAction { get; set; } + + private Action>[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private Elastic.Clients.Elasticsearch.Fields? DocvalueFieldsValue { get; set; } @@ -428,8 +436,6 @@ public TopHitsAggregationDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; } private bool? TrackScoresValue { get; set; } @@ -460,6 +466,42 @@ public TopHitsAggregationDescriptor Highlight(Action Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public TopHitsAggregationDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public TopHitsAggregationDescriptor Sort(Action> configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public TopHitsAggregationDescriptor Sort(params Action>[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public TopHitsAggregationDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -532,12 +574,6 @@ public TopHitsAggregationDescriptor Size(int? size) return Self; } - public TopHitsAggregationDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public TopHitsAggregationDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) { StoredFieldsValue = storedFields; @@ -577,6 +613,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, HighlightValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -637,12 +702,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StoredFieldsValue is not null) { writer.WritePropertyName("stored_fields"); @@ -685,6 +744,14 @@ public TopHitsAggregationDescriptor() : base() private Action HighlightDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action SortDescriptorAction { get; set; } + + private Action[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private Elastic.Clients.Elasticsearch.Fields? DocvalueFieldsValue { get; set; } @@ -707,8 +774,6 @@ public TopHitsAggregationDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; } private bool? TrackScoresValue { get; set; } @@ -739,6 +804,42 @@ public TopHitsAggregationDescriptor Highlight(Action? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public TopHitsAggregationDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public TopHitsAggregationDescriptor Sort(Action configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public TopHitsAggregationDescriptor Sort(params Action[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public TopHitsAggregationDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -817,12 +918,6 @@ public TopHitsAggregationDescriptor Size(int? size) return Self; } - public TopHitsAggregationDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public TopHitsAggregationDescriptor StoredFields(Elastic.Clients.Elasticsearch.Fields? storedFields) { StoredFieldsValue = storedFields; @@ -862,6 +957,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, HighlightValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -922,12 +1046,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StoredFieldsValue is not null) { writer.WritePropertyName("stored_fields"); 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 46c579f5bf9..42b5f20a42c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TopMetricsAggregation.g.cs @@ -172,7 +172,7 @@ public override void Write(Utf8JsonWriter writer, TopMetricsAggregation value, J if (value.Sort is not null) { writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(value.Sort, writer, options); + JsonSerializer.Serialize(writer, value.Sort, options); } writer.WriteEndObject(); @@ -228,6 +228,14 @@ public TopMetricsAggregationDescriptor() : base() private Action>[] MetricsDescriptorActions { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action> SortDescriptorAction { get; set; } + + private Action>[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } private Dictionary? MetaValue { get; set; } @@ -238,8 +246,6 @@ public TopMetricsAggregationDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - public TopMetricsAggregationDescriptor Metrics(ICollection? metrics) { MetricsDescriptor = null; @@ -276,6 +282,42 @@ public TopMetricsAggregationDescriptor Metrics(params Action Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public TopMetricsAggregationDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public TopMetricsAggregationDescriptor Sort(Action> configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public TopMetricsAggregationDescriptor Sort(params Action>[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public TopMetricsAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field) { FieldValue = field; @@ -312,12 +354,6 @@ public TopMetricsAggregationDescriptor Size(int? size) return Self; } - public TopMetricsAggregationDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { writer.WriteStartObject(); @@ -354,6 +390,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, MetricsValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (FieldValue is not null) { writer.WritePropertyName("field"); @@ -378,12 +443,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - writer.WriteEndObject(); if (MetaValue is not null) { @@ -410,6 +469,14 @@ public TopMetricsAggregationDescriptor() : base() private Action[] MetricsDescriptorActions { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action SortDescriptorAction { get; set; } + + private Action[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Field? FieldValue { get; set; } private Dictionary? MetaValue { get; set; } @@ -420,8 +487,6 @@ public TopMetricsAggregationDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - public TopMetricsAggregationDescriptor Metrics(ICollection? metrics) { MetricsDescriptor = null; @@ -458,6 +523,42 @@ public TopMetricsAggregationDescriptor Metrics(params Action? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public TopMetricsAggregationDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public TopMetricsAggregationDescriptor Sort(Action configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public TopMetricsAggregationDescriptor Sort(params Action[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public TopMetricsAggregationDescriptor Field(Elastic.Clients.Elasticsearch.Field? field) { FieldValue = field; @@ -500,12 +601,6 @@ public TopMetricsAggregationDescriptor Size(int? size) return Self; } - public TopMetricsAggregationDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { writer.WriteStartObject(); @@ -542,6 +637,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, MetricsValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (FieldValue is not null) { writer.WritePropertyName("field"); @@ -566,12 +690,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - writer.WriteEndObject(); if (MetaValue is not null) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs index fe6018905ef..3fd1aa0adea 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/MSearch/MultisearchBody.g.cs @@ -549,6 +549,14 @@ public MultisearchBodyDescriptor() : base() private Action>[] RescoreDescriptorActions { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action> SortDescriptorAction { get; set; } + + private Action>[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private Dictionary? AggregationsValue { get; set; } @@ -581,8 +589,6 @@ public MultisearchBodyDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private ICollection? StatsValue { get; set; } private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; } @@ -831,6 +837,42 @@ public MultisearchBodyDescriptor Rescore(params Action Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public MultisearchBodyDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public MultisearchBodyDescriptor Sort(Action> configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public MultisearchBodyDescriptor Sort(params Action>[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public MultisearchBodyDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -933,12 +975,6 @@ public MultisearchBodyDescriptor Size(int? size) return Self; } - public MultisearchBodyDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public MultisearchBodyDescriptor Stats(ICollection? stats) { StatsValue = stats; @@ -1181,6 +1217,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, RescoreValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -1275,12 +1340,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StatsValue is not null) { writer.WritePropertyName("stats"); @@ -1404,6 +1463,14 @@ public MultisearchBodyDescriptor() : base() private Action[] RescoreDescriptorActions { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action SortDescriptorAction { get; set; } + + private Action[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private Dictionary? AggregationsValue { get; set; } @@ -1436,8 +1503,6 @@ public MultisearchBodyDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private ICollection? StatsValue { get; set; } private Elastic.Clients.Elasticsearch.Fields? StoredFieldsValue { get; set; } @@ -1686,6 +1751,42 @@ public MultisearchBodyDescriptor Rescore(params Action? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public MultisearchBodyDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public MultisearchBodyDescriptor Sort(Action configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public MultisearchBodyDescriptor Sort(params Action[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public MultisearchBodyDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -1788,12 +1889,6 @@ public MultisearchBodyDescriptor Size(int? size) return Self; } - public MultisearchBodyDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public MultisearchBodyDescriptor Stats(ICollection? stats) { StatsValue = stats; @@ -2036,6 +2131,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, RescoreValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -2130,12 +2254,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StatsValue is not null) { writer.WritePropertyName("stats"); 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 4fad0b161fa..f5debb0b798 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 @@ -80,6 +80,14 @@ public SourceDescriptor() : base() private Action> SliceDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action> SortDescriptorAction { get; set; } + + private Action>[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Fields? SourceFieldsValue { get; set; } private Elastic.Clients.Elasticsearch.Indices IndexValue { get; set; } @@ -94,8 +102,6 @@ public SourceDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) { QueryDescriptor = null; @@ -144,6 +150,42 @@ public SourceDescriptor Slice(Action Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public SourceDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public SourceDescriptor Sort(Action> configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public SourceDescriptor Sort(params Action>[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public SourceDescriptor SourceFields(Elastic.Clients.Elasticsearch.Fields? sourceFields) { SourceFieldsValue = sourceFields; @@ -192,12 +234,6 @@ public SourceDescriptor Size(int? size) return Self; } - public SourceDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { writer.WriteStartObject(); @@ -233,6 +269,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, SliceValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceFieldsValue is not null) { writer.WritePropertyName("_source"); @@ -269,12 +334,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - writer.WriteEndObject(); } } @@ -298,6 +357,14 @@ public SourceDescriptor() : base() private Action SliceDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action SortDescriptorAction { get; set; } + + private Action[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Fields? SourceFieldsValue { get; set; } private Elastic.Clients.Elasticsearch.Indices IndexValue { get; set; } @@ -312,8 +379,6 @@ public SourceDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - public SourceDescriptor Query(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? query) { QueryDescriptor = null; @@ -362,6 +427,42 @@ public SourceDescriptor Slice(Action configure) return Self; } + public SourceDescriptor Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public SourceDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public SourceDescriptor Sort(Action configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public SourceDescriptor Sort(params Action[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public SourceDescriptor SourceFields(Elastic.Clients.Elasticsearch.Fields? sourceFields) { SourceFieldsValue = sourceFields; @@ -410,12 +511,6 @@ public SourceDescriptor Size(int? size) return Self; } - public SourceDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { writer.WriteStartObject(); @@ -451,6 +546,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, SliceValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceFieldsValue is not null) { writer.WritePropertyName("_source"); @@ -487,12 +611,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - writer.WriteEndObject(); } } \ No newline at end of file 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 c9a7c659656..0ee668575a7 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 @@ -120,6 +120,14 @@ public InnerHitsDescriptor() : base() private Action> HighlightDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action> SortDescriptorAction { get; set; } + + private Action>[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private bool? ExplainValue { get; set; } @@ -138,8 +146,6 @@ public InnerHitsDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private Elastic.Clients.Elasticsearch.Fields? StoredFieldValue { get; set; } private bool? TrackScoresValue { get; set; } @@ -230,6 +236,42 @@ public InnerHitsDescriptor Highlight(Action Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public InnerHitsDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public InnerHitsDescriptor Sort(Action> configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public InnerHitsDescriptor Sort(params Action>[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public InnerHitsDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -284,12 +326,6 @@ public InnerHitsDescriptor Size(int? size) return Self; } - public InnerHitsDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public InnerHitsDescriptor StoredField(Elastic.Clients.Elasticsearch.Fields? storedField) { StoredFieldValue = storedField; @@ -374,6 +410,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, HighlightValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -428,12 +493,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StoredFieldValue is not null) { writer.WritePropertyName("stored_field"); @@ -483,6 +542,14 @@ public InnerHitsDescriptor() : base() private Action HighlightDescriptorAction { get; set; } + private ICollection? SortValue { get; set; } + + private SortOptionsDescriptor SortDescriptor { get; set; } + + private Action SortDescriptorAction { get; set; } + + private Action[] SortDescriptorActions { get; set; } + private Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? SourceValue { get; set; } private bool? ExplainValue { get; set; } @@ -501,8 +568,6 @@ public InnerHitsDescriptor() : base() private int? SizeValue { get; set; } - private ICollection? SortValue { get; set; } - private Elastic.Clients.Elasticsearch.Fields? StoredFieldValue { get; set; } private bool? TrackScoresValue { get; set; } @@ -593,6 +658,42 @@ public InnerHitsDescriptor Highlight(Action configure) return Self; } + public InnerHitsDescriptor Sort(ICollection? sort) + { + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortValue = sort; + return Self; + } + + public InnerHitsDescriptor Sort(SortOptionsDescriptor descriptor) + { + SortValue = null; + SortDescriptorAction = null; + SortDescriptorActions = null; + SortDescriptor = descriptor; + return Self; + } + + public InnerHitsDescriptor Sort(Action configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorActions = null; + SortDescriptorAction = configure; + return Self; + } + + public InnerHitsDescriptor Sort(params Action[] configure) + { + SortValue = null; + SortDescriptor = null; + SortDescriptorAction = null; + SortDescriptorActions = configure; + return Self; + } + public InnerHitsDescriptor Source(Elastic.Clients.Elasticsearch.Core.Search.SourceConfig? source) { SourceValue = source; @@ -647,12 +748,6 @@ public InnerHitsDescriptor Size(int? size) return Self; } - public InnerHitsDescriptor Sort(ICollection? sort) - { - SortValue = sort; - return Self; - } - public InnerHitsDescriptor StoredField(Elastic.Clients.Elasticsearch.Fields? storedField) { StoredFieldValue = storedField; @@ -737,6 +832,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o JsonSerializer.Serialize(writer, HighlightValue, options); } + if (SortDescriptor is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, SortDescriptor, options); + } + else if (SortDescriptorAction is not null) + { + writer.WritePropertyName("sort"); + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(SortDescriptorAction), options); + } + else if (SortDescriptorActions is not null) + { + writer.WritePropertyName("sort"); + if (SortDescriptorActions.Length > 1) + writer.WriteStartArray(); + foreach (var action in SortDescriptorActions) + { + JsonSerializer.Serialize(writer, new SortOptionsDescriptor(action), options); + } + + if (SortDescriptorActions.Length > 1) + writer.WriteEndArray(); + } + else if (SortValue is not null) + { + writer.WritePropertyName("sort"); + SingleOrManySerializationHelper.Serialize(SortValue, writer, options); + } + if (SourceValue is not null) { writer.WritePropertyName("_source"); @@ -791,12 +915,6 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteNumberValue(SizeValue.Value); } - if (SortValue is not null) - { - writer.WritePropertyName("sort"); - SingleOrManySerializationHelper.Serialize(SortValue, writer, options); - } - if (StoredFieldValue is not null) { writer.WritePropertyName("stored_field"); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortConverter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortConverter.g.cs deleted file mode 100644 index 0f943f9f5a6..00000000000 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortConverter.g.cs +++ /dev/null @@ -1,31 +0,0 @@ -// Licensed to Elasticsearch B.V under one or more agreements. -// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information. -// -// ███╗ ██╗ ██████╗ ████████╗██╗ ██████╗███████╗ -// ████╗ ██║██╔═══██╗╚══██╔══╝██║██╔════╝██╔════╝ -// ██╔██╗ ██║██║ ██║ ██║ ██║██║ █████╗ -// ██║╚██╗██║██║ ██║ ██║ ██║██║ ██╔══╝ -// ██║ ╚████║╚██████╔╝ ██║ ██║╚██████╗███████╗ -// ╚═╝ ╚═══╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝ -// ------------------------------------------------ -// -// This file is automatically generated. -// Please do not edit these files manually. -// -// ------------------------------------------------ - -using Elastic.Clients.Elasticsearch.Fluent; -using Elastic.Clients.Elasticsearch.Serialization; -using Elastic.Transport; -using System; -using System.Collections.Generic; -using System.Linq.Expressions; -using System.Text.Json; -using System.Text.Json.Serialization; - -#nullable restore -namespace Elastic.Clients.Elasticsearch; -internal sealed class SortConverter : ICollectionSingleOrManyConverter -{ -} \ No newline at end of file diff --git a/tests/Tests/Search/Search/BasicSortUsageTests.cs b/tests/Tests/Search/Search/BasicSortUsageTests.cs index 51b3bde9eec..4988b178fe6 100644 --- a/tests/Tests/Search/Search/BasicSortUsageTests.cs +++ b/tests/Tests/Search/Search/BasicSortUsageTests.cs @@ -28,3 +28,23 @@ public BasicSortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base( Sort = new [] { SortOptions.Field("startedOn") } }; } + +public class BasicScoreSortUsageTests : SearchUsageTestBase +{ + public BasicScoreSortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { } + + protected override object ExpectJson => + new + { + sort = new { _score = new { order = "desc" }} + }; + + protected override Action> Fluent => s => s + .Sort(s => s.Score(sc => sc.Order(SortOrder.Desc))); + + protected override SearchRequest Initializer => + new() + { + Sort = new[] { SortOptions.Score(new() { Order = SortOrder.Desc }) } + }; +} From 469322c91936af267b397a55b4be9625976dd1ea Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Mon, 7 Nov 2022 17:00:43 +0000 Subject: [PATCH 3/5] Generate more descriptive parameter names for container descriptor methods --- .../InferenceConfigContainer.g.cs | 8 +- .../Types/Core/Search/FieldSuggester.g.cs | 12 +- .../Core/Search/SmoothingModelContainer.g.cs | 12 +- .../Ml/InferenceConfigCreateContainer.g.cs | 36 ++-- .../Ml/InferenceConfigUpdateContainer.g.cs | 36 ++-- .../Types/Ml/TokenizationConfigContainer.g.cs | 12 +- .../QueryDsl/FunctionScoreContainer.g.cs | 12 +- .../Types/QueryDsl/IntervalsContainer.g.cs | 24 +-- .../Types/QueryDsl/IntervalsQuery.g.cs | 24 +-- .../Types/QueryDsl/QueryContainer.g.cs | 184 +++++++++--------- .../_Generated/Types/QueryDsl/SpanQuery.g.cs | 36 ++-- .../_Generated/Types/SortOptions.g.cs | 12 +- .../PivotGroupByContainer.g.cs | 12 +- 13 files changed, 210 insertions(+), 210 deletions(-) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs index ab1a605f7e7..6e0ee555fa9 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs @@ -134,9 +134,9 @@ private InferenceConfigContainerDescriptor Set(object variant, string return Self; } - public InferenceConfigContainerDescriptor Classification(Ml.ClassificationInferenceOptions variant) => Set(variant, "classification"); + public InferenceConfigContainerDescriptor Classification(Ml.ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); public InferenceConfigContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigContainerDescriptor Regression(Ml.RegressionInferenceOptions variant) => Set(variant, "regression"); + public InferenceConfigContainerDescriptor Regression(Ml.RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); public InferenceConfigContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -195,9 +195,9 @@ private InferenceConfigContainerDescriptor Set(object variant, string variantNam return Self; } - public InferenceConfigContainerDescriptor Classification(Ml.ClassificationInferenceOptions variant) => Set(variant, "classification"); + public InferenceConfigContainerDescriptor Classification(Ml.ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); public InferenceConfigContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigContainerDescriptor Regression(Ml.RegressionInferenceOptions variant) => Set(variant, "regression"); + public InferenceConfigContainerDescriptor Regression(Ml.RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); public InferenceConfigContainerDescriptor Regression(Action configure) => Set(configure, "regression"); public InferenceConfigContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs index 95431daef41..ee5068b840a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs @@ -235,11 +235,11 @@ public FieldSuggesterDescriptor Text(string? text) return Self; } - public FieldSuggesterDescriptor Completion(CompletionSuggester variant) => Set(variant, "completion"); + public FieldSuggesterDescriptor Completion(CompletionSuggester completionSuggester) => Set(completionSuggester, "completion"); public FieldSuggesterDescriptor Completion(Action> configure) => Set(configure, "completion"); - public FieldSuggesterDescriptor Phrase(PhraseSuggester variant) => Set(variant, "phrase"); + public FieldSuggesterDescriptor Phrase(PhraseSuggester phraseSuggester) => Set(phraseSuggester, "phrase"); public FieldSuggesterDescriptor Phrase(Action> configure) => Set(configure, "phrase"); - public FieldSuggesterDescriptor Term(TermSuggester variant) => Set(variant, "term"); + public FieldSuggesterDescriptor Term(TermSuggester termSuggester) => Set(termSuggester, "term"); public FieldSuggesterDescriptor Term(Action> configure) => Set(configure, "term"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -340,13 +340,13 @@ public FieldSuggesterDescriptor Text(string? text) return Self; } - public FieldSuggesterDescriptor Completion(CompletionSuggester variant) => Set(variant, "completion"); + public FieldSuggesterDescriptor Completion(CompletionSuggester completionSuggester) => Set(completionSuggester, "completion"); public FieldSuggesterDescriptor Completion(Action configure) => Set(configure, "completion"); public FieldSuggesterDescriptor Completion(Action> configure) => Set(configure, "completion"); - public FieldSuggesterDescriptor Phrase(PhraseSuggester variant) => Set(variant, "phrase"); + public FieldSuggesterDescriptor Phrase(PhraseSuggester phraseSuggester) => Set(phraseSuggester, "phrase"); public FieldSuggesterDescriptor Phrase(Action configure) => Set(configure, "phrase"); public FieldSuggesterDescriptor Phrase(Action> configure) => Set(configure, "phrase"); - public FieldSuggesterDescriptor Term(TermSuggester variant) => Set(variant, "term"); + public FieldSuggesterDescriptor Term(TermSuggester termSuggester) => Set(termSuggester, "term"); public FieldSuggesterDescriptor Term(Action configure) => Set(configure, "term"); public FieldSuggesterDescriptor Term(Action> configure) => Set(configure, "term"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs index 2a57620e859..64e102f1635 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs @@ -145,11 +145,11 @@ private SmoothingModelContainerDescriptor Set(object variant, string return Self; } - public SmoothingModelContainerDescriptor Laplace(LaplaceSmoothingModel variant) => Set(variant, "laplace"); + public SmoothingModelContainerDescriptor Laplace(LaplaceSmoothingModel laplaceSmoothingModel) => Set(laplaceSmoothingModel, "laplace"); public SmoothingModelContainerDescriptor Laplace(Action configure) => Set(configure, "laplace"); - public SmoothingModelContainerDescriptor LinearInterpolation(LinearInterpolationSmoothingModel variant) => Set(variant, "linear_interpolation"); + public SmoothingModelContainerDescriptor LinearInterpolation(LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => Set(linearInterpolationSmoothingModel, "linear_interpolation"); public SmoothingModelContainerDescriptor LinearInterpolation(Action configure) => Set(configure, "linear_interpolation"); - public SmoothingModelContainerDescriptor StupidBackoff(StupidBackoffSmoothingModel variant) => Set(variant, "stupid_backoff"); + public SmoothingModelContainerDescriptor StupidBackoff(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Set(stupidBackoffSmoothingModel, "stupid_backoff"); public SmoothingModelContainerDescriptor StupidBackoff(Action configure) => Set(configure, "stupid_backoff"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -208,11 +208,11 @@ private SmoothingModelContainerDescriptor Set(object variant, string variantName return Self; } - public SmoothingModelContainerDescriptor Laplace(LaplaceSmoothingModel variant) => Set(variant, "laplace"); + public SmoothingModelContainerDescriptor Laplace(LaplaceSmoothingModel laplaceSmoothingModel) => Set(laplaceSmoothingModel, "laplace"); public SmoothingModelContainerDescriptor Laplace(Action configure) => Set(configure, "laplace"); - public SmoothingModelContainerDescriptor LinearInterpolation(LinearInterpolationSmoothingModel variant) => Set(variant, "linear_interpolation"); + public SmoothingModelContainerDescriptor LinearInterpolation(LinearInterpolationSmoothingModel linearInterpolationSmoothingModel) => Set(linearInterpolationSmoothingModel, "linear_interpolation"); public SmoothingModelContainerDescriptor LinearInterpolation(Action configure) => Set(configure, "linear_interpolation"); - public SmoothingModelContainerDescriptor StupidBackoff(StupidBackoffSmoothingModel variant) => Set(variant, "stupid_backoff"); + public SmoothingModelContainerDescriptor StupidBackoff(StupidBackoffSmoothingModel stupidBackoffSmoothingModel) => Set(stupidBackoffSmoothingModel, "stupid_backoff"); public SmoothingModelContainerDescriptor StupidBackoff(Action configure) => Set(configure, "stupid_backoff"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs index f3c65bff7f3..f433709986f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs @@ -211,23 +211,23 @@ private InferenceConfigCreateContainerDescriptor Set(object variant, return Self; } - public InferenceConfigCreateContainerDescriptor Classification(ClassificationInferenceOptions variant) => Set(variant, "classification"); + public InferenceConfigCreateContainerDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); public InferenceConfigCreateContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigCreateContainerDescriptor FillMask(FillMaskInferenceOptions variant) => Set(variant, "fill_mask"); + public InferenceConfigCreateContainerDescriptor FillMask(FillMaskInferenceOptions fillMaskInferenceOptions) => Set(fillMaskInferenceOptions, "fill_mask"); public InferenceConfigCreateContainerDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); - public InferenceConfigCreateContainerDescriptor Ner(NerInferenceOptions variant) => Set(variant, "ner"); + public InferenceConfigCreateContainerDescriptor Ner(NerInferenceOptions nerInferenceOptions) => Set(nerInferenceOptions, "ner"); public InferenceConfigCreateContainerDescriptor Ner(Action configure) => Set(configure, "ner"); - public InferenceConfigCreateContainerDescriptor PassThrough(PassThroughInferenceOptions variant) => Set(variant, "pass_through"); + public InferenceConfigCreateContainerDescriptor PassThrough(PassThroughInferenceOptions passThroughInferenceOptions) => Set(passThroughInferenceOptions, "pass_through"); public InferenceConfigCreateContainerDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); - public InferenceConfigCreateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions variant) => Set(variant, "question_answering"); + public InferenceConfigCreateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => Set(questionAnsweringInferenceOptions, "question_answering"); public InferenceConfigCreateContainerDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); - public InferenceConfigCreateContainerDescriptor Regression(RegressionInferenceOptions variant) => Set(variant, "regression"); + public InferenceConfigCreateContainerDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); public InferenceConfigCreateContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); - public InferenceConfigCreateContainerDescriptor TextClassification(TextClassificationInferenceOptions variant) => Set(variant, "text_classification"); + public InferenceConfigCreateContainerDescriptor TextClassification(TextClassificationInferenceOptions textClassificationInferenceOptions) => Set(textClassificationInferenceOptions, "text_classification"); public InferenceConfigCreateContainerDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); - public InferenceConfigCreateContainerDescriptor TextEmbedding(TextEmbeddingInferenceOptions variant) => Set(variant, "text_embedding"); + public InferenceConfigCreateContainerDescriptor TextEmbedding(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => Set(textEmbeddingInferenceOptions, "text_embedding"); public InferenceConfigCreateContainerDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); - public InferenceConfigCreateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions variant) => Set(variant, "zero_shot_classification"); + public InferenceConfigCreateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Set(zeroShotClassificationInferenceOptions, "zero_shot_classification"); public InferenceConfigCreateContainerDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -286,24 +286,24 @@ private InferenceConfigCreateContainerDescriptor Set(object variant, string vari return Self; } - public InferenceConfigCreateContainerDescriptor Classification(ClassificationInferenceOptions variant) => Set(variant, "classification"); + public InferenceConfigCreateContainerDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); public InferenceConfigCreateContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigCreateContainerDescriptor FillMask(FillMaskInferenceOptions variant) => Set(variant, "fill_mask"); + public InferenceConfigCreateContainerDescriptor FillMask(FillMaskInferenceOptions fillMaskInferenceOptions) => Set(fillMaskInferenceOptions, "fill_mask"); public InferenceConfigCreateContainerDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); - public InferenceConfigCreateContainerDescriptor Ner(NerInferenceOptions variant) => Set(variant, "ner"); + public InferenceConfigCreateContainerDescriptor Ner(NerInferenceOptions nerInferenceOptions) => Set(nerInferenceOptions, "ner"); public InferenceConfigCreateContainerDescriptor Ner(Action configure) => Set(configure, "ner"); - public InferenceConfigCreateContainerDescriptor PassThrough(PassThroughInferenceOptions variant) => Set(variant, "pass_through"); + public InferenceConfigCreateContainerDescriptor PassThrough(PassThroughInferenceOptions passThroughInferenceOptions) => Set(passThroughInferenceOptions, "pass_through"); public InferenceConfigCreateContainerDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); - public InferenceConfigCreateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions variant) => Set(variant, "question_answering"); + public InferenceConfigCreateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceOptions questionAnsweringInferenceOptions) => Set(questionAnsweringInferenceOptions, "question_answering"); public InferenceConfigCreateContainerDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); - public InferenceConfigCreateContainerDescriptor Regression(RegressionInferenceOptions variant) => Set(variant, "regression"); + public InferenceConfigCreateContainerDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); public InferenceConfigCreateContainerDescriptor Regression(Action configure) => Set(configure, "regression"); public InferenceConfigCreateContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); - public InferenceConfigCreateContainerDescriptor TextClassification(TextClassificationInferenceOptions variant) => Set(variant, "text_classification"); + public InferenceConfigCreateContainerDescriptor TextClassification(TextClassificationInferenceOptions textClassificationInferenceOptions) => Set(textClassificationInferenceOptions, "text_classification"); public InferenceConfigCreateContainerDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); - public InferenceConfigCreateContainerDescriptor TextEmbedding(TextEmbeddingInferenceOptions variant) => Set(variant, "text_embedding"); + public InferenceConfigCreateContainerDescriptor TextEmbedding(TextEmbeddingInferenceOptions textEmbeddingInferenceOptions) => Set(textEmbeddingInferenceOptions, "text_embedding"); public InferenceConfigCreateContainerDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); - public InferenceConfigCreateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions variant) => Set(variant, "zero_shot_classification"); + public InferenceConfigCreateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceOptions zeroShotClassificationInferenceOptions) => Set(zeroShotClassificationInferenceOptions, "zero_shot_classification"); public InferenceConfigCreateContainerDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs index 58e158d1e19..0cfb9558314 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs @@ -211,23 +211,23 @@ private InferenceConfigUpdateContainerDescriptor Set(object variant, return Self; } - public InferenceConfigUpdateContainerDescriptor Classification(ClassificationInferenceOptions variant) => Set(variant, "classification"); + public InferenceConfigUpdateContainerDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); public InferenceConfigUpdateContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigUpdateContainerDescriptor FillMask(FillMaskInferenceUpdateOptions variant) => Set(variant, "fill_mask"); + public InferenceConfigUpdateContainerDescriptor FillMask(FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => Set(fillMaskInferenceUpdateOptions, "fill_mask"); public InferenceConfigUpdateContainerDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); - public InferenceConfigUpdateContainerDescriptor Ner(NerInferenceUpdateOptions variant) => Set(variant, "ner"); + public InferenceConfigUpdateContainerDescriptor Ner(NerInferenceUpdateOptions nerInferenceUpdateOptions) => Set(nerInferenceUpdateOptions, "ner"); public InferenceConfigUpdateContainerDescriptor Ner(Action configure) => Set(configure, "ner"); - public InferenceConfigUpdateContainerDescriptor PassThrough(PassThroughInferenceUpdateOptions variant) => Set(variant, "pass_through"); + public InferenceConfigUpdateContainerDescriptor PassThrough(PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => Set(passThroughInferenceUpdateOptions, "pass_through"); public InferenceConfigUpdateContainerDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); - public InferenceConfigUpdateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions variant) => Set(variant, "question_answering"); + public InferenceConfigUpdateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => Set(questionAnsweringInferenceUpdateOptions, "question_answering"); public InferenceConfigUpdateContainerDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); - public InferenceConfigUpdateContainerDescriptor Regression(RegressionInferenceOptions variant) => Set(variant, "regression"); + public InferenceConfigUpdateContainerDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); public InferenceConfigUpdateContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); - public InferenceConfigUpdateContainerDescriptor TextClassification(TextClassificationInferenceUpdateOptions variant) => Set(variant, "text_classification"); + public InferenceConfigUpdateContainerDescriptor TextClassification(TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => Set(textClassificationInferenceUpdateOptions, "text_classification"); public InferenceConfigUpdateContainerDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); - public InferenceConfigUpdateContainerDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions variant) => Set(variant, "text_embedding"); + public InferenceConfigUpdateContainerDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => Set(textEmbeddingInferenceUpdateOptions, "text_embedding"); public InferenceConfigUpdateContainerDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); - public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions variant) => Set(variant, "zero_shot_classification"); + public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Set(zeroShotClassificationInferenceUpdateOptions, "zero_shot_classification"); public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -286,24 +286,24 @@ private InferenceConfigUpdateContainerDescriptor Set(object variant, string vari return Self; } - public InferenceConfigUpdateContainerDescriptor Classification(ClassificationInferenceOptions variant) => Set(variant, "classification"); + public InferenceConfigUpdateContainerDescriptor Classification(ClassificationInferenceOptions classificationInferenceOptions) => Set(classificationInferenceOptions, "classification"); public InferenceConfigUpdateContainerDescriptor Classification(Action configure) => Set(configure, "classification"); - public InferenceConfigUpdateContainerDescriptor FillMask(FillMaskInferenceUpdateOptions variant) => Set(variant, "fill_mask"); + public InferenceConfigUpdateContainerDescriptor FillMask(FillMaskInferenceUpdateOptions fillMaskInferenceUpdateOptions) => Set(fillMaskInferenceUpdateOptions, "fill_mask"); public InferenceConfigUpdateContainerDescriptor FillMask(Action configure) => Set(configure, "fill_mask"); - public InferenceConfigUpdateContainerDescriptor Ner(NerInferenceUpdateOptions variant) => Set(variant, "ner"); + public InferenceConfigUpdateContainerDescriptor Ner(NerInferenceUpdateOptions nerInferenceUpdateOptions) => Set(nerInferenceUpdateOptions, "ner"); public InferenceConfigUpdateContainerDescriptor Ner(Action configure) => Set(configure, "ner"); - public InferenceConfigUpdateContainerDescriptor PassThrough(PassThroughInferenceUpdateOptions variant) => Set(variant, "pass_through"); + public InferenceConfigUpdateContainerDescriptor PassThrough(PassThroughInferenceUpdateOptions passThroughInferenceUpdateOptions) => Set(passThroughInferenceUpdateOptions, "pass_through"); public InferenceConfigUpdateContainerDescriptor PassThrough(Action configure) => Set(configure, "pass_through"); - public InferenceConfigUpdateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions variant) => Set(variant, "question_answering"); + public InferenceConfigUpdateContainerDescriptor QuestionAnswering(QuestionAnsweringInferenceUpdateOptions questionAnsweringInferenceUpdateOptions) => Set(questionAnsweringInferenceUpdateOptions, "question_answering"); public InferenceConfigUpdateContainerDescriptor QuestionAnswering(Action configure) => Set(configure, "question_answering"); - public InferenceConfigUpdateContainerDescriptor Regression(RegressionInferenceOptions variant) => Set(variant, "regression"); + public InferenceConfigUpdateContainerDescriptor Regression(RegressionInferenceOptions regressionInferenceOptions) => Set(regressionInferenceOptions, "regression"); public InferenceConfigUpdateContainerDescriptor Regression(Action configure) => Set(configure, "regression"); public InferenceConfigUpdateContainerDescriptor Regression(Action> configure) => Set(configure, "regression"); - public InferenceConfigUpdateContainerDescriptor TextClassification(TextClassificationInferenceUpdateOptions variant) => Set(variant, "text_classification"); + public InferenceConfigUpdateContainerDescriptor TextClassification(TextClassificationInferenceUpdateOptions textClassificationInferenceUpdateOptions) => Set(textClassificationInferenceUpdateOptions, "text_classification"); public InferenceConfigUpdateContainerDescriptor TextClassification(Action configure) => Set(configure, "text_classification"); - public InferenceConfigUpdateContainerDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions variant) => Set(variant, "text_embedding"); + public InferenceConfigUpdateContainerDescriptor TextEmbedding(TextEmbeddingInferenceUpdateOptions textEmbeddingInferenceUpdateOptions) => Set(textEmbeddingInferenceUpdateOptions, "text_embedding"); public InferenceConfigUpdateContainerDescriptor TextEmbedding(Action configure) => Set(configure, "text_embedding"); - public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions variant) => Set(variant, "zero_shot_classification"); + public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(ZeroShotClassificationInferenceUpdateOptions zeroShotClassificationInferenceUpdateOptions) => Set(zeroShotClassificationInferenceUpdateOptions, "zero_shot_classification"); public InferenceConfigUpdateContainerDescriptor ZeroShotClassification(Action configure) => Set(configure, "zero_shot_classification"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs index a0c716d1faa..c25c3a7d3e5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs @@ -145,11 +145,11 @@ private TokenizationConfigContainerDescriptor Set(object variant, str return Self; } - public TokenizationConfigContainerDescriptor Bert(NlpBertTokenizationConfig variant) => Set(variant, "bert"); + public TokenizationConfigContainerDescriptor Bert(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "bert"); public TokenizationConfigContainerDescriptor Bert(Action configure) => Set(configure, "bert"); - public TokenizationConfigContainerDescriptor Mpnet(NlpBertTokenizationConfig variant) => Set(variant, "mpnet"); + public TokenizationConfigContainerDescriptor Mpnet(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "mpnet"); public TokenizationConfigContainerDescriptor Mpnet(Action configure) => Set(configure, "mpnet"); - public TokenizationConfigContainerDescriptor Roberta(NlpRobertaTokenizationConfig variant) => Set(variant, "roberta"); + public TokenizationConfigContainerDescriptor Roberta(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Set(nlpRobertaTokenizationConfig, "roberta"); public TokenizationConfigContainerDescriptor Roberta(Action configure) => Set(configure, "roberta"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -208,11 +208,11 @@ private TokenizationConfigContainerDescriptor Set(object variant, string variant return Self; } - public TokenizationConfigContainerDescriptor Bert(NlpBertTokenizationConfig variant) => Set(variant, "bert"); + public TokenizationConfigContainerDescriptor Bert(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "bert"); public TokenizationConfigContainerDescriptor Bert(Action configure) => Set(configure, "bert"); - public TokenizationConfigContainerDescriptor Mpnet(NlpBertTokenizationConfig variant) => Set(variant, "mpnet"); + public TokenizationConfigContainerDescriptor Mpnet(NlpBertTokenizationConfig nlpBertTokenizationConfig) => Set(nlpBertTokenizationConfig, "mpnet"); public TokenizationConfigContainerDescriptor Mpnet(Action configure) => Set(configure, "mpnet"); - public TokenizationConfigContainerDescriptor Roberta(NlpRobertaTokenizationConfig variant) => Set(variant, "roberta"); + public TokenizationConfigContainerDescriptor Roberta(NlpRobertaTokenizationConfig nlpRobertaTokenizationConfig) => Set(nlpRobertaTokenizationConfig, "roberta"); public TokenizationConfigContainerDescriptor Roberta(Action configure) => Set(configure, "roberta"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs index ce6366a2b13..9b05309897e 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs @@ -231,11 +231,11 @@ public FunctionScoreContainerDescriptor Weight(double? weight) return Self; } - public FunctionScoreContainerDescriptor FieldValueFactor(FieldValueFactorScoreFunction variant) => Set(variant, "field_value_factor"); + public FunctionScoreContainerDescriptor FieldValueFactor(FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor"); public FunctionScoreContainerDescriptor FieldValueFactor(Action> configure) => Set(configure, "field_value_factor"); - public FunctionScoreContainerDescriptor RandomScore(RandomScoreFunction variant) => Set(variant, "random_score"); + public FunctionScoreContainerDescriptor RandomScore(RandomScoreFunction randomScoreFunction) => Set(randomScoreFunction, "random_score"); public FunctionScoreContainerDescriptor RandomScore(Action> configure) => Set(configure, "random_score"); - public FunctionScoreContainerDescriptor ScriptScore(ScriptScoreFunction variant) => Set(variant, "script_score"); + public FunctionScoreContainerDescriptor ScriptScore(ScriptScoreFunction scriptScoreFunction) => Set(scriptScoreFunction, "script_score"); public FunctionScoreContainerDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -354,13 +354,13 @@ public FunctionScoreContainerDescriptor Weight(double? weight) return Self; } - public FunctionScoreContainerDescriptor FieldValueFactor(FieldValueFactorScoreFunction variant) => Set(variant, "field_value_factor"); + public FunctionScoreContainerDescriptor FieldValueFactor(FieldValueFactorScoreFunction fieldValueFactorScoreFunction) => Set(fieldValueFactorScoreFunction, "field_value_factor"); public FunctionScoreContainerDescriptor FieldValueFactor(Action configure) => Set(configure, "field_value_factor"); public FunctionScoreContainerDescriptor FieldValueFactor(Action> configure) => Set(configure, "field_value_factor"); - public FunctionScoreContainerDescriptor RandomScore(RandomScoreFunction variant) => Set(variant, "random_score"); + public FunctionScoreContainerDescriptor RandomScore(RandomScoreFunction randomScoreFunction) => Set(randomScoreFunction, "random_score"); public FunctionScoreContainerDescriptor RandomScore(Action configure) => Set(configure, "random_score"); public FunctionScoreContainerDescriptor RandomScore(Action> configure) => Set(configure, "random_score"); - public FunctionScoreContainerDescriptor ScriptScore(ScriptScoreFunction variant) => Set(variant, "script_score"); + public FunctionScoreContainerDescriptor ScriptScore(ScriptScoreFunction scriptScoreFunction) => Set(scriptScoreFunction, "script_score"); public FunctionScoreContainerDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs index c433d8b52bd..e51c653ac6c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs @@ -178,17 +178,17 @@ private IntervalsContainerDescriptor Set(object variant, string varia return Self; } - public IntervalsContainerDescriptor AllOf(IntervalsAllOf variant) => Set(variant, "all_of"); + public IntervalsContainerDescriptor AllOf(IntervalsAllOf intervalsAllOf) => Set(intervalsAllOf, "all_of"); public IntervalsContainerDescriptor AllOf(Action> configure) => Set(configure, "all_of"); - public IntervalsContainerDescriptor AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of"); + public IntervalsContainerDescriptor AnyOf(IntervalsAnyOf intervalsAnyOf) => Set(intervalsAnyOf, "any_of"); public IntervalsContainerDescriptor AnyOf(Action> configure) => Set(configure, "any_of"); - public IntervalsContainerDescriptor Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy"); + public IntervalsContainerDescriptor Fuzzy(IntervalsFuzzy intervalsFuzzy) => Set(intervalsFuzzy, "fuzzy"); public IntervalsContainerDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public IntervalsContainerDescriptor Match(IntervalsMatch variant) => Set(variant, "match"); + public IntervalsContainerDescriptor Match(IntervalsMatch intervalsMatch) => Set(intervalsMatch, "match"); public IntervalsContainerDescriptor Match(Action> configure) => Set(configure, "match"); - public IntervalsContainerDescriptor Prefix(IntervalsPrefix variant) => Set(variant, "prefix"); + public IntervalsContainerDescriptor Prefix(IntervalsPrefix intervalsPrefix) => Set(intervalsPrefix, "prefix"); public IntervalsContainerDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public IntervalsContainerDescriptor Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard"); + public IntervalsContainerDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard"); public IntervalsContainerDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -247,22 +247,22 @@ private IntervalsContainerDescriptor Set(object variant, string variantName) return Self; } - public IntervalsContainerDescriptor AllOf(IntervalsAllOf variant) => Set(variant, "all_of"); + public IntervalsContainerDescriptor AllOf(IntervalsAllOf intervalsAllOf) => Set(intervalsAllOf, "all_of"); public IntervalsContainerDescriptor AllOf(Action configure) => Set(configure, "all_of"); public IntervalsContainerDescriptor AllOf(Action> configure) => Set(configure, "all_of"); - public IntervalsContainerDescriptor AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of"); + public IntervalsContainerDescriptor AnyOf(IntervalsAnyOf intervalsAnyOf) => Set(intervalsAnyOf, "any_of"); public IntervalsContainerDescriptor AnyOf(Action configure) => Set(configure, "any_of"); public IntervalsContainerDescriptor AnyOf(Action> configure) => Set(configure, "any_of"); - public IntervalsContainerDescriptor Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy"); + public IntervalsContainerDescriptor Fuzzy(IntervalsFuzzy intervalsFuzzy) => Set(intervalsFuzzy, "fuzzy"); public IntervalsContainerDescriptor Fuzzy(Action configure) => Set(configure, "fuzzy"); public IntervalsContainerDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public IntervalsContainerDescriptor Match(IntervalsMatch variant) => Set(variant, "match"); + public IntervalsContainerDescriptor Match(IntervalsMatch intervalsMatch) => Set(intervalsMatch, "match"); public IntervalsContainerDescriptor Match(Action configure) => Set(configure, "match"); public IntervalsContainerDescriptor Match(Action> configure) => Set(configure, "match"); - public IntervalsContainerDescriptor Prefix(IntervalsPrefix variant) => Set(variant, "prefix"); + public IntervalsContainerDescriptor Prefix(IntervalsPrefix intervalsPrefix) => Set(intervalsPrefix, "prefix"); public IntervalsContainerDescriptor Prefix(Action configure) => Set(configure, "prefix"); public IntervalsContainerDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public IntervalsContainerDescriptor Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard"); + public IntervalsContainerDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard"); public IntervalsContainerDescriptor Wildcard(Action configure) => Set(configure, "wildcard"); public IntervalsContainerDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs index acb20d807d1..33f63c0af54 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs @@ -291,17 +291,17 @@ public IntervalsQueryDescriptor Field(Expression AllOf(IntervalsAllOf variant) => Set(variant, "all_of"); + public IntervalsQueryDescriptor AllOf(IntervalsAllOf intervalsAllOf) => Set(intervalsAllOf, "all_of"); public IntervalsQueryDescriptor AllOf(Action> configure) => Set(configure, "all_of"); - public IntervalsQueryDescriptor AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of"); + public IntervalsQueryDescriptor AnyOf(IntervalsAnyOf intervalsAnyOf) => Set(intervalsAnyOf, "any_of"); public IntervalsQueryDescriptor AnyOf(Action> configure) => Set(configure, "any_of"); - public IntervalsQueryDescriptor Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy"); + public IntervalsQueryDescriptor Fuzzy(IntervalsFuzzy intervalsFuzzy) => Set(intervalsFuzzy, "fuzzy"); public IntervalsQueryDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public IntervalsQueryDescriptor Match(IntervalsMatch variant) => Set(variant, "match"); + public IntervalsQueryDescriptor Match(IntervalsMatch intervalsMatch) => Set(intervalsMatch, "match"); public IntervalsQueryDescriptor Match(Action> configure) => Set(configure, "match"); - public IntervalsQueryDescriptor Prefix(IntervalsPrefix variant) => Set(variant, "prefix"); + public IntervalsQueryDescriptor Prefix(IntervalsPrefix intervalsPrefix) => Set(intervalsPrefix, "prefix"); public IntervalsQueryDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public IntervalsQueryDescriptor Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard"); + public IntervalsQueryDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard"); public IntervalsQueryDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -418,22 +418,22 @@ public IntervalsQueryDescriptor Field(Expression Set(variant, "all_of"); + public IntervalsQueryDescriptor AllOf(IntervalsAllOf intervalsAllOf) => Set(intervalsAllOf, "all_of"); public IntervalsQueryDescriptor AllOf(Action configure) => Set(configure, "all_of"); public IntervalsQueryDescriptor AllOf(Action> configure) => Set(configure, "all_of"); - public IntervalsQueryDescriptor AnyOf(IntervalsAnyOf variant) => Set(variant, "any_of"); + public IntervalsQueryDescriptor AnyOf(IntervalsAnyOf intervalsAnyOf) => Set(intervalsAnyOf, "any_of"); public IntervalsQueryDescriptor AnyOf(Action configure) => Set(configure, "any_of"); public IntervalsQueryDescriptor AnyOf(Action> configure) => Set(configure, "any_of"); - public IntervalsQueryDescriptor Fuzzy(IntervalsFuzzy variant) => Set(variant, "fuzzy"); + public IntervalsQueryDescriptor Fuzzy(IntervalsFuzzy intervalsFuzzy) => Set(intervalsFuzzy, "fuzzy"); public IntervalsQueryDescriptor Fuzzy(Action configure) => Set(configure, "fuzzy"); public IntervalsQueryDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public IntervalsQueryDescriptor Match(IntervalsMatch variant) => Set(variant, "match"); + public IntervalsQueryDescriptor Match(IntervalsMatch intervalsMatch) => Set(intervalsMatch, "match"); public IntervalsQueryDescriptor Match(Action configure) => Set(configure, "match"); public IntervalsQueryDescriptor Match(Action> configure) => Set(configure, "match"); - public IntervalsQueryDescriptor Prefix(IntervalsPrefix variant) => Set(variant, "prefix"); + public IntervalsQueryDescriptor Prefix(IntervalsPrefix intervalsPrefix) => Set(intervalsPrefix, "prefix"); public IntervalsQueryDescriptor Prefix(Action configure) => Set(configure, "prefix"); public IntervalsQueryDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public IntervalsQueryDescriptor Wildcard(IntervalsWildcard variant) => Set(variant, "wildcard"); + public IntervalsQueryDescriptor Wildcard(IntervalsWildcard intervalsWildcard) => Set(intervalsWildcard, "wildcard"); public IntervalsQueryDescriptor Wildcard(Action configure) => Set(configure, "wildcard"); public IntervalsQueryDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs index 1b955b97cf8..ba5c4e662be 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs @@ -618,96 +618,96 @@ private QueryContainerDescriptor Set(object variant, string variantNa return Self; } - public QueryContainerDescriptor Bool(BoolQuery query) => Set(query, "bool"); + public QueryContainerDescriptor Bool(BoolQuery boolQuery) => Set(boolQuery, "bool"); public QueryContainerDescriptor Bool(Action> configure) => Set(configure, "bool"); - public QueryContainerDescriptor Boosting(BoostingQuery query) => Set(query, "boosting"); + public QueryContainerDescriptor Boosting(BoostingQuery boostingQuery) => Set(boostingQuery, "boosting"); public QueryContainerDescriptor Boosting(Action> configure) => Set(configure, "boosting"); - public QueryContainerDescriptor CombinedFields(CombinedFieldsQuery query) => Set(query, "combined_fields"); + public QueryContainerDescriptor CombinedFields(CombinedFieldsQuery combinedFieldsQuery) => Set(combinedFieldsQuery, "combined_fields"); public QueryContainerDescriptor CombinedFields(Action> configure) => Set(configure, "combined_fields"); - public QueryContainerDescriptor ConstantScore(ConstantScoreQuery query) => Set(query, "constant_score"); + public QueryContainerDescriptor ConstantScore(ConstantScoreQuery constantScoreQuery) => Set(constantScoreQuery, "constant_score"); public QueryContainerDescriptor ConstantScore(Action> configure) => Set(configure, "constant_score"); - public QueryContainerDescriptor DisMax(DisMaxQuery query) => Set(query, "dis_max"); + public QueryContainerDescriptor DisMax(DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max"); public QueryContainerDescriptor DisMax(Action> configure) => Set(configure, "dis_max"); - public QueryContainerDescriptor Exists(ExistsQuery query) => Set(query, "exists"); + public QueryContainerDescriptor Exists(ExistsQuery existsQuery) => Set(existsQuery, "exists"); public QueryContainerDescriptor Exists(Action> configure) => Set(configure, "exists"); - public QueryContainerDescriptor FieldMaskingSpan(SpanFieldMaskingQuery query) => Set(query, "field_masking_span"); + public QueryContainerDescriptor FieldMaskingSpan(SpanFieldMaskingQuery spanFieldMaskingQuery) => Set(spanFieldMaskingQuery, "field_masking_span"); public QueryContainerDescriptor FieldMaskingSpan(Action> configure) => Set(configure, "field_masking_span"); - public QueryContainerDescriptor FunctionScore(FunctionScoreQuery query) => Set(query, "function_score"); + public QueryContainerDescriptor FunctionScore(FunctionScoreQuery functionScoreQuery) => Set(functionScoreQuery, "function_score"); public QueryContainerDescriptor FunctionScore(Action> configure) => Set(configure, "function_score"); - public QueryContainerDescriptor Fuzzy(FuzzyQuery query) => Set(query, "fuzzy"); + public QueryContainerDescriptor Fuzzy(FuzzyQuery fuzzyQuery) => Set(fuzzyQuery, "fuzzy"); public QueryContainerDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public QueryContainerDescriptor HasChild(HasChildQuery query) => Set(query, "has_child"); + public QueryContainerDescriptor HasChild(HasChildQuery hasChildQuery) => Set(hasChildQuery, "has_child"); public QueryContainerDescriptor HasChild(Action> configure) => Set(configure, "has_child"); - public QueryContainerDescriptor HasParent(HasParentQuery query) => Set(query, "has_parent"); + public QueryContainerDescriptor HasParent(HasParentQuery hasParentQuery) => Set(hasParentQuery, "has_parent"); public QueryContainerDescriptor HasParent(Action> configure) => Set(configure, "has_parent"); - public QueryContainerDescriptor Ids(IdsQuery query) => Set(query, "ids"); + public QueryContainerDescriptor Ids(IdsQuery idsQuery) => Set(idsQuery, "ids"); public QueryContainerDescriptor Ids(Action configure) => Set(configure, "ids"); - public QueryContainerDescriptor Intervals(IntervalsQuery query) => Set(query, "intervals"); + public QueryContainerDescriptor Intervals(IntervalsQuery intervalsQuery) => Set(intervalsQuery, "intervals"); public QueryContainerDescriptor Intervals(Action> configure) => Set(configure, "intervals"); - public QueryContainerDescriptor Match(MatchQuery query) => Set(query, "match"); + public QueryContainerDescriptor Match(MatchQuery matchQuery) => Set(matchQuery, "match"); public QueryContainerDescriptor Match(Action> configure) => Set(configure, "match"); - public QueryContainerDescriptor MatchAll(MatchAllQuery query) => Set(query, "match_all"); + public QueryContainerDescriptor MatchAll(MatchAllQuery matchAllQuery) => Set(matchAllQuery, "match_all"); public QueryContainerDescriptor MatchAll(Action configure) => Set(configure, "match_all"); - public QueryContainerDescriptor MatchBoolPrefix(MatchBoolPrefixQuery query) => Set(query, "match_bool_prefix"); + public QueryContainerDescriptor MatchBoolPrefix(MatchBoolPrefixQuery matchBoolPrefixQuery) => Set(matchBoolPrefixQuery, "match_bool_prefix"); public QueryContainerDescriptor MatchBoolPrefix(Action> configure) => Set(configure, "match_bool_prefix"); - public QueryContainerDescriptor MatchNone(MatchNoneQuery query) => Set(query, "match_none"); + public QueryContainerDescriptor MatchNone(MatchNoneQuery matchNoneQuery) => Set(matchNoneQuery, "match_none"); public QueryContainerDescriptor MatchNone(Action configure) => Set(configure, "match_none"); - public QueryContainerDescriptor MatchPhrase(MatchPhraseQuery query) => Set(query, "match_phrase"); + public QueryContainerDescriptor MatchPhrase(MatchPhraseQuery matchPhraseQuery) => Set(matchPhraseQuery, "match_phrase"); public QueryContainerDescriptor MatchPhrase(Action> configure) => Set(configure, "match_phrase"); - public QueryContainerDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery query) => Set(query, "match_phrase_prefix"); + public QueryContainerDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => Set(matchPhrasePrefixQuery, "match_phrase_prefix"); public QueryContainerDescriptor MatchPhrasePrefix(Action> configure) => Set(configure, "match_phrase_prefix"); - public QueryContainerDescriptor MoreLikeThis(MoreLikeThisQuery query) => Set(query, "more_like_this"); + public QueryContainerDescriptor MoreLikeThis(MoreLikeThisQuery moreLikeThisQuery) => Set(moreLikeThisQuery, "more_like_this"); public QueryContainerDescriptor MoreLikeThis(Action> configure) => Set(configure, "more_like_this"); - public QueryContainerDescriptor MultiMatch(MultiMatchQuery query) => Set(query, "multi_match"); + public QueryContainerDescriptor MultiMatch(MultiMatchQuery multiMatchQuery) => Set(multiMatchQuery, "multi_match"); public QueryContainerDescriptor MultiMatch(Action> configure) => Set(configure, "multi_match"); - public QueryContainerDescriptor Nested(NestedQuery query) => Set(query, "nested"); + public QueryContainerDescriptor Nested(NestedQuery nestedQuery) => Set(nestedQuery, "nested"); public QueryContainerDescriptor Nested(Action> configure) => Set(configure, "nested"); - public QueryContainerDescriptor ParentId(ParentIdQuery query) => Set(query, "parent_id"); + public QueryContainerDescriptor ParentId(ParentIdQuery parentIdQuery) => Set(parentIdQuery, "parent_id"); public QueryContainerDescriptor ParentId(Action configure) => Set(configure, "parent_id"); - public QueryContainerDescriptor Percolate(PercolateQuery query) => Set(query, "percolate"); + public QueryContainerDescriptor Percolate(PercolateQuery percolateQuery) => Set(percolateQuery, "percolate"); public QueryContainerDescriptor Percolate(Action> configure) => Set(configure, "percolate"); - public QueryContainerDescriptor Prefix(PrefixQuery query) => Set(query, "prefix"); + public QueryContainerDescriptor Prefix(PrefixQuery prefixQuery) => Set(prefixQuery, "prefix"); public QueryContainerDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public QueryContainerDescriptor QueryString(QueryStringQuery query) => Set(query, "query_string"); + public QueryContainerDescriptor QueryString(QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string"); public QueryContainerDescriptor QueryString(Action> configure) => Set(configure, "query_string"); - public QueryContainerDescriptor Range(RangeQuery query) => Set(query, "range"); - public QueryContainerDescriptor RankFeature(RankFeatureQuery query) => Set(query, "rank_feature"); + public QueryContainerDescriptor Range(RangeQuery rangeQuery) => Set(rangeQuery, "range"); + public QueryContainerDescriptor RankFeature(RankFeatureQuery rankFeatureQuery) => Set(rankFeatureQuery, "rank_feature"); public QueryContainerDescriptor RankFeature(Action> configure) => Set(configure, "rank_feature"); - public QueryContainerDescriptor Regexp(RegexpQuery query) => Set(query, "regexp"); + public QueryContainerDescriptor Regexp(RegexpQuery regexpQuery) => Set(regexpQuery, "regexp"); public QueryContainerDescriptor Regexp(Action> configure) => Set(configure, "regexp"); - public QueryContainerDescriptor Script(ScriptQuery query) => Set(query, "script"); + public QueryContainerDescriptor Script(ScriptQuery scriptQuery) => Set(scriptQuery, "script"); public QueryContainerDescriptor Script(Action configure) => Set(configure, "script"); - public QueryContainerDescriptor ScriptScore(ScriptScoreQuery query) => Set(query, "script_score"); + public QueryContainerDescriptor ScriptScore(ScriptScoreQuery scriptScoreQuery) => Set(scriptScoreQuery, "script_score"); public QueryContainerDescriptor ScriptScore(Action> configure) => Set(configure, "script_score"); - public QueryContainerDescriptor Shape(ShapeQuery query) => Set(query, "shape"); + public QueryContainerDescriptor Shape(ShapeQuery shapeQuery) => Set(shapeQuery, "shape"); public QueryContainerDescriptor Shape(Action> configure) => Set(configure, "shape"); - public QueryContainerDescriptor SimpleQueryString(SimpleQueryStringQuery query) => Set(query, "simple_query_string"); + public QueryContainerDescriptor SimpleQueryString(SimpleQueryStringQuery simpleQueryStringQuery) => Set(simpleQueryStringQuery, "simple_query_string"); public QueryContainerDescriptor SimpleQueryString(Action> configure) => Set(configure, "simple_query_string"); - public QueryContainerDescriptor SpanContaining(SpanContainingQuery query) => Set(query, "span_containing"); + public QueryContainerDescriptor SpanContaining(SpanContainingQuery spanContainingQuery) => Set(spanContainingQuery, "span_containing"); public QueryContainerDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); - public QueryContainerDescriptor SpanFirst(SpanFirstQuery query) => Set(query, "span_first"); + public QueryContainerDescriptor SpanFirst(SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); public QueryContainerDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); - public QueryContainerDescriptor SpanMulti(SpanMultiTermQuery query) => Set(query, "span_multi"); + public QueryContainerDescriptor SpanMulti(SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); public QueryContainerDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); - public QueryContainerDescriptor SpanNear(SpanNearQuery query) => Set(query, "span_near"); + public QueryContainerDescriptor SpanNear(SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); public QueryContainerDescriptor SpanNear(Action> configure) => Set(configure, "span_near"); - public QueryContainerDescriptor SpanNot(SpanNotQuery query) => Set(query, "span_not"); + public QueryContainerDescriptor SpanNot(SpanNotQuery spanNotQuery) => Set(spanNotQuery, "span_not"); public QueryContainerDescriptor SpanNot(Action> configure) => Set(configure, "span_not"); - public QueryContainerDescriptor SpanOr(SpanOrQuery query) => Set(query, "span_or"); + public QueryContainerDescriptor SpanOr(SpanOrQuery spanOrQuery) => Set(spanOrQuery, "span_or"); public QueryContainerDescriptor SpanOr(Action> configure) => Set(configure, "span_or"); - public QueryContainerDescriptor SpanTerm(SpanTermQuery query) => Set(query, "span_term"); + public QueryContainerDescriptor SpanTerm(SpanTermQuery spanTermQuery) => Set(spanTermQuery, "span_term"); public QueryContainerDescriptor SpanTerm(Action> configure) => Set(configure, "span_term"); - public QueryContainerDescriptor SpanWithin(SpanWithinQuery query) => Set(query, "span_within"); + public QueryContainerDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within"); public QueryContainerDescriptor SpanWithin(Action> configure) => Set(configure, "span_within"); - public QueryContainerDescriptor Term(TermQuery query) => Set(query, "term"); + public QueryContainerDescriptor Term(TermQuery termQuery) => Set(termQuery, "term"); public QueryContainerDescriptor Term(Action> configure) => Set(configure, "term"); - public QueryContainerDescriptor Terms(TermsQuery query) => Set(query, "terms"); + public QueryContainerDescriptor Terms(TermsQuery termsQuery) => Set(termsQuery, "terms"); public QueryContainerDescriptor Terms(Action> configure) => Set(configure, "terms"); - public QueryContainerDescriptor TermsSet(TermsSetQuery query) => Set(query, "terms_set"); + public QueryContainerDescriptor TermsSet(TermsSetQuery termsSetQuery) => Set(termsSetQuery, "terms_set"); public QueryContainerDescriptor TermsSet(Action> configure) => Set(configure, "terms_set"); - public QueryContainerDescriptor Wildcard(WildcardQuery query) => Set(query, "wildcard"); + public QueryContainerDescriptor Wildcard(WildcardQuery wildcardQuery) => Set(wildcardQuery, "wildcard"); public QueryContainerDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); - public QueryContainerDescriptor Wrapper(WrapperQuery query) => Set(query, "wrapper"); + public QueryContainerDescriptor Wrapper(WrapperQuery wrapperQuery) => Set(wrapperQuery, "wrapper"); public QueryContainerDescriptor Wrapper(Action configure) => Set(configure, "wrapper"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -766,135 +766,135 @@ private QueryContainerDescriptor Set(object variant, string variantName) return Self; } - public QueryContainerDescriptor Bool(BoolQuery query) => Set(query, "bool"); + public QueryContainerDescriptor Bool(BoolQuery boolQuery) => Set(boolQuery, "bool"); public QueryContainerDescriptor Bool(Action configure) => Set(configure, "bool"); public QueryContainerDescriptor Bool(Action> configure) => Set(configure, "bool"); - public QueryContainerDescriptor Boosting(BoostingQuery query) => Set(query, "boosting"); + public QueryContainerDescriptor Boosting(BoostingQuery boostingQuery) => Set(boostingQuery, "boosting"); public QueryContainerDescriptor Boosting(Action configure) => Set(configure, "boosting"); public QueryContainerDescriptor Boosting(Action> configure) => Set(configure, "boosting"); - public QueryContainerDescriptor CombinedFields(CombinedFieldsQuery query) => Set(query, "combined_fields"); + public QueryContainerDescriptor CombinedFields(CombinedFieldsQuery combinedFieldsQuery) => Set(combinedFieldsQuery, "combined_fields"); public QueryContainerDescriptor CombinedFields(Action configure) => Set(configure, "combined_fields"); public QueryContainerDescriptor CombinedFields(Action> configure) => Set(configure, "combined_fields"); - public QueryContainerDescriptor ConstantScore(ConstantScoreQuery query) => Set(query, "constant_score"); + public QueryContainerDescriptor ConstantScore(ConstantScoreQuery constantScoreQuery) => Set(constantScoreQuery, "constant_score"); public QueryContainerDescriptor ConstantScore(Action configure) => Set(configure, "constant_score"); public QueryContainerDescriptor ConstantScore(Action> configure) => Set(configure, "constant_score"); - public QueryContainerDescriptor DisMax(DisMaxQuery query) => Set(query, "dis_max"); + public QueryContainerDescriptor DisMax(DisMaxQuery disMaxQuery) => Set(disMaxQuery, "dis_max"); public QueryContainerDescriptor DisMax(Action configure) => Set(configure, "dis_max"); public QueryContainerDescriptor DisMax(Action> configure) => Set(configure, "dis_max"); - public QueryContainerDescriptor Exists(ExistsQuery query) => Set(query, "exists"); + public QueryContainerDescriptor Exists(ExistsQuery existsQuery) => Set(existsQuery, "exists"); public QueryContainerDescriptor Exists(Action configure) => Set(configure, "exists"); public QueryContainerDescriptor Exists(Action> configure) => Set(configure, "exists"); - public QueryContainerDescriptor FieldMaskingSpan(SpanFieldMaskingQuery query) => Set(query, "field_masking_span"); + public QueryContainerDescriptor FieldMaskingSpan(SpanFieldMaskingQuery spanFieldMaskingQuery) => Set(spanFieldMaskingQuery, "field_masking_span"); public QueryContainerDescriptor FieldMaskingSpan(Action configure) => Set(configure, "field_masking_span"); public QueryContainerDescriptor FieldMaskingSpan(Action> configure) => Set(configure, "field_masking_span"); - public QueryContainerDescriptor FunctionScore(FunctionScoreQuery query) => Set(query, "function_score"); + public QueryContainerDescriptor FunctionScore(FunctionScoreQuery functionScoreQuery) => Set(functionScoreQuery, "function_score"); public QueryContainerDescriptor FunctionScore(Action configure) => Set(configure, "function_score"); public QueryContainerDescriptor FunctionScore(Action> configure) => Set(configure, "function_score"); - public QueryContainerDescriptor Fuzzy(FuzzyQuery query) => Set(query, "fuzzy"); + public QueryContainerDescriptor Fuzzy(FuzzyQuery fuzzyQuery) => Set(fuzzyQuery, "fuzzy"); public QueryContainerDescriptor Fuzzy(Action configure) => Set(configure, "fuzzy"); public QueryContainerDescriptor Fuzzy(Action> configure) => Set(configure, "fuzzy"); - public QueryContainerDescriptor HasChild(HasChildQuery query) => Set(query, "has_child"); + public QueryContainerDescriptor HasChild(HasChildQuery hasChildQuery) => Set(hasChildQuery, "has_child"); public QueryContainerDescriptor HasChild(Action configure) => Set(configure, "has_child"); public QueryContainerDescriptor HasChild(Action> configure) => Set(configure, "has_child"); - public QueryContainerDescriptor HasParent(HasParentQuery query) => Set(query, "has_parent"); + public QueryContainerDescriptor HasParent(HasParentQuery hasParentQuery) => Set(hasParentQuery, "has_parent"); public QueryContainerDescriptor HasParent(Action configure) => Set(configure, "has_parent"); public QueryContainerDescriptor HasParent(Action> configure) => Set(configure, "has_parent"); - public QueryContainerDescriptor Ids(IdsQuery query) => Set(query, "ids"); + public QueryContainerDescriptor Ids(IdsQuery idsQuery) => Set(idsQuery, "ids"); public QueryContainerDescriptor Ids(Action configure) => Set(configure, "ids"); - public QueryContainerDescriptor Intervals(IntervalsQuery query) => Set(query, "intervals"); + public QueryContainerDescriptor Intervals(IntervalsQuery intervalsQuery) => Set(intervalsQuery, "intervals"); public QueryContainerDescriptor Intervals(Action configure) => Set(configure, "intervals"); public QueryContainerDescriptor Intervals(Action> configure) => Set(configure, "intervals"); - public QueryContainerDescriptor Match(MatchQuery query) => Set(query, "match"); + public QueryContainerDescriptor Match(MatchQuery matchQuery) => Set(matchQuery, "match"); public QueryContainerDescriptor Match(Action configure) => Set(configure, "match"); public QueryContainerDescriptor Match(Action> configure) => Set(configure, "match"); - public QueryContainerDescriptor MatchAll(MatchAllQuery query) => Set(query, "match_all"); + public QueryContainerDescriptor MatchAll(MatchAllQuery matchAllQuery) => Set(matchAllQuery, "match_all"); public QueryContainerDescriptor MatchAll(Action configure) => Set(configure, "match_all"); - public QueryContainerDescriptor MatchBoolPrefix(MatchBoolPrefixQuery query) => Set(query, "match_bool_prefix"); + public QueryContainerDescriptor MatchBoolPrefix(MatchBoolPrefixQuery matchBoolPrefixQuery) => Set(matchBoolPrefixQuery, "match_bool_prefix"); public QueryContainerDescriptor MatchBoolPrefix(Action configure) => Set(configure, "match_bool_prefix"); public QueryContainerDescriptor MatchBoolPrefix(Action> configure) => Set(configure, "match_bool_prefix"); - public QueryContainerDescriptor MatchNone(MatchNoneQuery query) => Set(query, "match_none"); + public QueryContainerDescriptor MatchNone(MatchNoneQuery matchNoneQuery) => Set(matchNoneQuery, "match_none"); public QueryContainerDescriptor MatchNone(Action configure) => Set(configure, "match_none"); - public QueryContainerDescriptor MatchPhrase(MatchPhraseQuery query) => Set(query, "match_phrase"); + public QueryContainerDescriptor MatchPhrase(MatchPhraseQuery matchPhraseQuery) => Set(matchPhraseQuery, "match_phrase"); public QueryContainerDescriptor MatchPhrase(Action configure) => Set(configure, "match_phrase"); public QueryContainerDescriptor MatchPhrase(Action> configure) => Set(configure, "match_phrase"); - public QueryContainerDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery query) => Set(query, "match_phrase_prefix"); + public QueryContainerDescriptor MatchPhrasePrefix(MatchPhrasePrefixQuery matchPhrasePrefixQuery) => Set(matchPhrasePrefixQuery, "match_phrase_prefix"); public QueryContainerDescriptor MatchPhrasePrefix(Action configure) => Set(configure, "match_phrase_prefix"); public QueryContainerDescriptor MatchPhrasePrefix(Action> configure) => Set(configure, "match_phrase_prefix"); - public QueryContainerDescriptor MoreLikeThis(MoreLikeThisQuery query) => Set(query, "more_like_this"); + public QueryContainerDescriptor MoreLikeThis(MoreLikeThisQuery moreLikeThisQuery) => Set(moreLikeThisQuery, "more_like_this"); public QueryContainerDescriptor MoreLikeThis(Action configure) => Set(configure, "more_like_this"); public QueryContainerDescriptor MoreLikeThis(Action> configure) => Set(configure, "more_like_this"); - public QueryContainerDescriptor MultiMatch(MultiMatchQuery query) => Set(query, "multi_match"); + public QueryContainerDescriptor MultiMatch(MultiMatchQuery multiMatchQuery) => Set(multiMatchQuery, "multi_match"); public QueryContainerDescriptor MultiMatch(Action configure) => Set(configure, "multi_match"); public QueryContainerDescriptor MultiMatch(Action> configure) => Set(configure, "multi_match"); - public QueryContainerDescriptor Nested(NestedQuery query) => Set(query, "nested"); + public QueryContainerDescriptor Nested(NestedQuery nestedQuery) => Set(nestedQuery, "nested"); public QueryContainerDescriptor Nested(Action configure) => Set(configure, "nested"); public QueryContainerDescriptor Nested(Action> configure) => Set(configure, "nested"); - public QueryContainerDescriptor ParentId(ParentIdQuery query) => Set(query, "parent_id"); + public QueryContainerDescriptor ParentId(ParentIdQuery parentIdQuery) => Set(parentIdQuery, "parent_id"); public QueryContainerDescriptor ParentId(Action configure) => Set(configure, "parent_id"); - public QueryContainerDescriptor Percolate(PercolateQuery query) => Set(query, "percolate"); + public QueryContainerDescriptor Percolate(PercolateQuery percolateQuery) => Set(percolateQuery, "percolate"); public QueryContainerDescriptor Percolate(Action configure) => Set(configure, "percolate"); public QueryContainerDescriptor Percolate(Action> configure) => Set(configure, "percolate"); - public QueryContainerDescriptor Prefix(PrefixQuery query) => Set(query, "prefix"); + public QueryContainerDescriptor Prefix(PrefixQuery prefixQuery) => Set(prefixQuery, "prefix"); public QueryContainerDescriptor Prefix(Action configure) => Set(configure, "prefix"); public QueryContainerDescriptor Prefix(Action> configure) => Set(configure, "prefix"); - public QueryContainerDescriptor QueryString(QueryStringQuery query) => Set(query, "query_string"); + public QueryContainerDescriptor QueryString(QueryStringQuery queryStringQuery) => Set(queryStringQuery, "query_string"); public QueryContainerDescriptor QueryString(Action configure) => Set(configure, "query_string"); public QueryContainerDescriptor QueryString(Action> configure) => Set(configure, "query_string"); - public QueryContainerDescriptor Range(RangeQuery query) => Set(query, "range"); - public QueryContainerDescriptor RankFeature(RankFeatureQuery query) => Set(query, "rank_feature"); + public QueryContainerDescriptor Range(RangeQuery rangeQuery) => Set(rangeQuery, "range"); + public QueryContainerDescriptor RankFeature(RankFeatureQuery rankFeatureQuery) => Set(rankFeatureQuery, "rank_feature"); public QueryContainerDescriptor RankFeature(Action configure) => Set(configure, "rank_feature"); public QueryContainerDescriptor RankFeature(Action> configure) => Set(configure, "rank_feature"); - public QueryContainerDescriptor Regexp(RegexpQuery query) => Set(query, "regexp"); + public QueryContainerDescriptor Regexp(RegexpQuery regexpQuery) => Set(regexpQuery, "regexp"); public QueryContainerDescriptor Regexp(Action configure) => Set(configure, "regexp"); public QueryContainerDescriptor Regexp(Action> configure) => Set(configure, "regexp"); - public QueryContainerDescriptor Script(ScriptQuery query) => Set(query, "script"); + public QueryContainerDescriptor Script(ScriptQuery scriptQuery) => Set(scriptQuery, "script"); public QueryContainerDescriptor Script(Action configure) => Set(configure, "script"); - public QueryContainerDescriptor ScriptScore(ScriptScoreQuery query) => Set(query, "script_score"); + public QueryContainerDescriptor ScriptScore(ScriptScoreQuery scriptScoreQuery) => Set(scriptScoreQuery, "script_score"); public QueryContainerDescriptor ScriptScore(Action configure) => Set(configure, "script_score"); public QueryContainerDescriptor ScriptScore(Action> configure) => Set(configure, "script_score"); - public QueryContainerDescriptor Shape(ShapeQuery query) => Set(query, "shape"); + public QueryContainerDescriptor Shape(ShapeQuery shapeQuery) => Set(shapeQuery, "shape"); public QueryContainerDescriptor Shape(Action configure) => Set(configure, "shape"); public QueryContainerDescriptor Shape(Action> configure) => Set(configure, "shape"); - public QueryContainerDescriptor SimpleQueryString(SimpleQueryStringQuery query) => Set(query, "simple_query_string"); + public QueryContainerDescriptor SimpleQueryString(SimpleQueryStringQuery simpleQueryStringQuery) => Set(simpleQueryStringQuery, "simple_query_string"); public QueryContainerDescriptor SimpleQueryString(Action configure) => Set(configure, "simple_query_string"); public QueryContainerDescriptor SimpleQueryString(Action> configure) => Set(configure, "simple_query_string"); - public QueryContainerDescriptor SpanContaining(SpanContainingQuery query) => Set(query, "span_containing"); + public QueryContainerDescriptor SpanContaining(SpanContainingQuery spanContainingQuery) => Set(spanContainingQuery, "span_containing"); public QueryContainerDescriptor SpanContaining(Action configure) => Set(configure, "span_containing"); public QueryContainerDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); - public QueryContainerDescriptor SpanFirst(SpanFirstQuery query) => Set(query, "span_first"); + public QueryContainerDescriptor SpanFirst(SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); public QueryContainerDescriptor SpanFirst(Action configure) => Set(configure, "span_first"); public QueryContainerDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); - public QueryContainerDescriptor SpanMulti(SpanMultiTermQuery query) => Set(query, "span_multi"); + public QueryContainerDescriptor SpanMulti(SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); public QueryContainerDescriptor SpanMulti(Action configure) => Set(configure, "span_multi"); public QueryContainerDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); - public QueryContainerDescriptor SpanNear(SpanNearQuery query) => Set(query, "span_near"); + public QueryContainerDescriptor SpanNear(SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); public QueryContainerDescriptor SpanNear(Action configure) => Set(configure, "span_near"); public QueryContainerDescriptor SpanNear(Action> configure) => Set(configure, "span_near"); - public QueryContainerDescriptor SpanNot(SpanNotQuery query) => Set(query, "span_not"); + public QueryContainerDescriptor SpanNot(SpanNotQuery spanNotQuery) => Set(spanNotQuery, "span_not"); public QueryContainerDescriptor SpanNot(Action configure) => Set(configure, "span_not"); public QueryContainerDescriptor SpanNot(Action> configure) => Set(configure, "span_not"); - public QueryContainerDescriptor SpanOr(SpanOrQuery query) => Set(query, "span_or"); + public QueryContainerDescriptor SpanOr(SpanOrQuery spanOrQuery) => Set(spanOrQuery, "span_or"); public QueryContainerDescriptor SpanOr(Action configure) => Set(configure, "span_or"); public QueryContainerDescriptor SpanOr(Action> configure) => Set(configure, "span_or"); - public QueryContainerDescriptor SpanTerm(SpanTermQuery query) => Set(query, "span_term"); + public QueryContainerDescriptor SpanTerm(SpanTermQuery spanTermQuery) => Set(spanTermQuery, "span_term"); public QueryContainerDescriptor SpanTerm(Action configure) => Set(configure, "span_term"); public QueryContainerDescriptor SpanTerm(Action> configure) => Set(configure, "span_term"); - public QueryContainerDescriptor SpanWithin(SpanWithinQuery query) => Set(query, "span_within"); + public QueryContainerDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within"); public QueryContainerDescriptor SpanWithin(Action configure) => Set(configure, "span_within"); public QueryContainerDescriptor SpanWithin(Action> configure) => Set(configure, "span_within"); - public QueryContainerDescriptor Term(TermQuery query) => Set(query, "term"); + public QueryContainerDescriptor Term(TermQuery termQuery) => Set(termQuery, "term"); public QueryContainerDescriptor Term(Action configure) => Set(configure, "term"); public QueryContainerDescriptor Term(Action> configure) => Set(configure, "term"); - public QueryContainerDescriptor Terms(TermsQuery query) => Set(query, "terms"); + public QueryContainerDescriptor Terms(TermsQuery termsQuery) => Set(termsQuery, "terms"); public QueryContainerDescriptor Terms(Action configure) => Set(configure, "terms"); public QueryContainerDescriptor Terms(Action> configure) => Set(configure, "terms"); - public QueryContainerDescriptor TermsSet(TermsSetQuery query) => Set(query, "terms_set"); + public QueryContainerDescriptor TermsSet(TermsSetQuery termsSetQuery) => Set(termsSetQuery, "terms_set"); public QueryContainerDescriptor TermsSet(Action configure) => Set(configure, "terms_set"); public QueryContainerDescriptor TermsSet(Action> configure) => Set(configure, "terms_set"); - public QueryContainerDescriptor Wildcard(WildcardQuery query) => Set(query, "wildcard"); + public QueryContainerDescriptor Wildcard(WildcardQuery wildcardQuery) => Set(wildcardQuery, "wildcard"); public QueryContainerDescriptor Wildcard(Action configure) => Set(configure, "wildcard"); public QueryContainerDescriptor Wildcard(Action> configure) => Set(configure, "wildcard"); - public QueryContainerDescriptor Wrapper(WrapperQuery query) => Set(query, "wrapper"); + public QueryContainerDescriptor Wrapper(WrapperQuery wrapperQuery) => Set(wrapperQuery, "wrapper"); public QueryContainerDescriptor Wrapper(Action configure) => Set(configure, "wrapper"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs index ec2b64fab82..a5b5e734bf5 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs @@ -211,23 +211,23 @@ private SpanQueryDescriptor Set(object variant, string variantName) return Self; } - public SpanQueryDescriptor FieldMaskingSpan(SpanFieldMaskingQuery variant) => Set(variant, "field_masking_span"); + public SpanQueryDescriptor FieldMaskingSpan(SpanFieldMaskingQuery spanFieldMaskingQuery) => Set(spanFieldMaskingQuery, "field_masking_span"); public SpanQueryDescriptor FieldMaskingSpan(Action> configure) => Set(configure, "field_masking_span"); - public SpanQueryDescriptor SpanContaining(SpanContainingQuery variant) => Set(variant, "span_containing"); + public SpanQueryDescriptor SpanContaining(SpanContainingQuery spanContainingQuery) => Set(spanContainingQuery, "span_containing"); public SpanQueryDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); - public SpanQueryDescriptor SpanFirst(SpanFirstQuery variant) => Set(variant, "span_first"); + public SpanQueryDescriptor SpanFirst(SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); public SpanQueryDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); - public SpanQueryDescriptor SpanMulti(SpanMultiTermQuery variant) => Set(variant, "span_multi"); + public SpanQueryDescriptor SpanMulti(SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); public SpanQueryDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); - public SpanQueryDescriptor SpanNear(SpanNearQuery variant) => Set(variant, "span_near"); + public SpanQueryDescriptor SpanNear(SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); public SpanQueryDescriptor SpanNear(Action> configure) => Set(configure, "span_near"); - public SpanQueryDescriptor SpanNot(SpanNotQuery variant) => Set(variant, "span_not"); + public SpanQueryDescriptor SpanNot(SpanNotQuery spanNotQuery) => Set(spanNotQuery, "span_not"); public SpanQueryDescriptor SpanNot(Action> configure) => Set(configure, "span_not"); - public SpanQueryDescriptor SpanOr(SpanOrQuery variant) => Set(variant, "span_or"); + public SpanQueryDescriptor SpanOr(SpanOrQuery spanOrQuery) => Set(spanOrQuery, "span_or"); public SpanQueryDescriptor SpanOr(Action> configure) => Set(configure, "span_or"); - public SpanQueryDescriptor SpanTerm(SpanTermQuery variant) => Set(variant, "span_term"); + public SpanQueryDescriptor SpanTerm(SpanTermQuery spanTermQuery) => Set(spanTermQuery, "span_term"); public SpanQueryDescriptor SpanTerm(Action> configure) => Set(configure, "span_term"); - public SpanQueryDescriptor SpanWithin(SpanWithinQuery variant) => Set(variant, "span_within"); + public SpanQueryDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within"); public SpanQueryDescriptor SpanWithin(Action> configure) => Set(configure, "span_within"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -286,31 +286,31 @@ private SpanQueryDescriptor Set(object variant, string variantName) return Self; } - public SpanQueryDescriptor FieldMaskingSpan(SpanFieldMaskingQuery variant) => Set(variant, "field_masking_span"); + public SpanQueryDescriptor FieldMaskingSpan(SpanFieldMaskingQuery spanFieldMaskingQuery) => Set(spanFieldMaskingQuery, "field_masking_span"); public SpanQueryDescriptor FieldMaskingSpan(Action configure) => Set(configure, "field_masking_span"); public SpanQueryDescriptor FieldMaskingSpan(Action> configure) => Set(configure, "field_masking_span"); - public SpanQueryDescriptor SpanContaining(SpanContainingQuery variant) => Set(variant, "span_containing"); + public SpanQueryDescriptor SpanContaining(SpanContainingQuery spanContainingQuery) => Set(spanContainingQuery, "span_containing"); public SpanQueryDescriptor SpanContaining(Action configure) => Set(configure, "span_containing"); public SpanQueryDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); - public SpanQueryDescriptor SpanFirst(SpanFirstQuery variant) => Set(variant, "span_first"); + public SpanQueryDescriptor SpanFirst(SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); public SpanQueryDescriptor SpanFirst(Action configure) => Set(configure, "span_first"); public SpanQueryDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); - public SpanQueryDescriptor SpanMulti(SpanMultiTermQuery variant) => Set(variant, "span_multi"); + public SpanQueryDescriptor SpanMulti(SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); public SpanQueryDescriptor SpanMulti(Action configure) => Set(configure, "span_multi"); public SpanQueryDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); - public SpanQueryDescriptor SpanNear(SpanNearQuery variant) => Set(variant, "span_near"); + public SpanQueryDescriptor SpanNear(SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); public SpanQueryDescriptor SpanNear(Action configure) => Set(configure, "span_near"); public SpanQueryDescriptor SpanNear(Action> configure) => Set(configure, "span_near"); - public SpanQueryDescriptor SpanNot(SpanNotQuery variant) => Set(variant, "span_not"); + public SpanQueryDescriptor SpanNot(SpanNotQuery spanNotQuery) => Set(spanNotQuery, "span_not"); public SpanQueryDescriptor SpanNot(Action configure) => Set(configure, "span_not"); public SpanQueryDescriptor SpanNot(Action> configure) => Set(configure, "span_not"); - public SpanQueryDescriptor SpanOr(SpanOrQuery variant) => Set(variant, "span_or"); + public SpanQueryDescriptor SpanOr(SpanOrQuery spanOrQuery) => Set(spanOrQuery, "span_or"); public SpanQueryDescriptor SpanOr(Action configure) => Set(configure, "span_or"); public SpanQueryDescriptor SpanOr(Action> configure) => Set(configure, "span_or"); - public SpanQueryDescriptor SpanTerm(SpanTermQuery variant) => Set(variant, "span_term"); + public SpanQueryDescriptor SpanTerm(SpanTermQuery spanTermQuery) => Set(spanTermQuery, "span_term"); public SpanQueryDescriptor SpanTerm(Action configure) => Set(configure, "span_term"); public SpanQueryDescriptor SpanTerm(Action> configure) => Set(configure, "span_term"); - public SpanQueryDescriptor SpanWithin(SpanWithinQuery variant) => Set(variant, "span_within"); + public SpanQueryDescriptor SpanWithin(SpanWithinQuery spanWithinQuery) => Set(spanWithinQuery, "span_within"); public SpanQueryDescriptor SpanWithin(Action configure) => Set(configure, "span_within"); public SpanQueryDescriptor SpanWithin(Action> configure) => Set(configure, "span_within"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs index 045ce6653a4..c2f32a17ece 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs @@ -97,11 +97,11 @@ private SortOptionsDescriptor Set(object variant, string variantName) return Self; } - public SortOptionsDescriptor Doc(ScoreSort variant) => Set(variant, "_doc"); + public SortOptionsDescriptor Doc(ScoreSort scoreSort) => Set(scoreSort, "_doc"); public SortOptionsDescriptor Doc(Action configure) => Set(configure, "_doc"); - public SortOptionsDescriptor Score(ScoreSort variant) => Set(variant, "_score"); + public SortOptionsDescriptor Score(ScoreSort scoreSort) => Set(scoreSort, "_score"); public SortOptionsDescriptor Score(Action configure) => Set(configure, "_score"); - public SortOptionsDescriptor Script(ScriptSort variant) => Set(variant, "_script"); + public SortOptionsDescriptor Script(ScriptSort scriptSort) => Set(scriptSort, "_script"); public SortOptionsDescriptor Script(Action> configure) => Set(configure, "_script"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -160,11 +160,11 @@ private SortOptionsDescriptor Set(object variant, string variantName) return Self; } - public SortOptionsDescriptor Doc(ScoreSort variant) => Set(variant, "_doc"); + public SortOptionsDescriptor Doc(ScoreSort scoreSort) => Set(scoreSort, "_doc"); public SortOptionsDescriptor Doc(Action configure) => Set(configure, "_doc"); - public SortOptionsDescriptor Score(ScoreSort variant) => Set(variant, "_score"); + public SortOptionsDescriptor Score(ScoreSort scoreSort) => Set(scoreSort, "_score"); public SortOptionsDescriptor Score(Action configure) => Set(configure, "_score"); - public SortOptionsDescriptor Script(ScriptSort variant) => Set(variant, "_script"); + public SortOptionsDescriptor Script(ScriptSort scriptSort) => Set(scriptSort, "_script"); public SortOptionsDescriptor Script(Action configure) => Set(configure, "_script"); public SortOptionsDescriptor Script(Action> configure) => Set(configure, "_script"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs index 6601e55d1a3..5f46ff8966a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs @@ -145,11 +145,11 @@ private PivotGroupByContainerDescriptor Set(object variant, string va return Self; } - public PivotGroupByContainerDescriptor DateHistogram(Aggregations.DateHistogramAggregation variant) => Set(variant, "date_histogram"); + public PivotGroupByContainerDescriptor DateHistogram(Aggregations.DateHistogramAggregation dateHistogramAggregation) => Set(dateHistogramAggregation, "date_histogram"); public PivotGroupByContainerDescriptor DateHistogram(Action> configure) => Set(configure, "date_histogram"); - public PivotGroupByContainerDescriptor Histogram(Aggregations.HistogramAggregation variant) => Set(variant, "histogram"); + public PivotGroupByContainerDescriptor Histogram(Aggregations.HistogramAggregation histogramAggregation) => Set(histogramAggregation, "histogram"); public PivotGroupByContainerDescriptor Histogram(Action> configure) => Set(configure, "histogram"); - public PivotGroupByContainerDescriptor Terms(Aggregations.TermsAggregation variant) => Set(variant, "terms"); + public PivotGroupByContainerDescriptor Terms(Aggregations.TermsAggregation termsAggregation) => Set(termsAggregation, "terms"); public PivotGroupByContainerDescriptor Terms(Action> configure) => Set(configure, "terms"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { @@ -208,13 +208,13 @@ private PivotGroupByContainerDescriptor Set(object variant, string variantName) return Self; } - public PivotGroupByContainerDescriptor DateHistogram(Aggregations.DateHistogramAggregation variant) => Set(variant, "date_histogram"); + public PivotGroupByContainerDescriptor DateHistogram(Aggregations.DateHistogramAggregation dateHistogramAggregation) => Set(dateHistogramAggregation, "date_histogram"); public PivotGroupByContainerDescriptor DateHistogram(Action configure) => Set(configure, "date_histogram"); public PivotGroupByContainerDescriptor DateHistogram(Action> configure) => Set(configure, "date_histogram"); - public PivotGroupByContainerDescriptor Histogram(Aggregations.HistogramAggregation variant) => Set(variant, "histogram"); + public PivotGroupByContainerDescriptor Histogram(Aggregations.HistogramAggregation histogramAggregation) => Set(histogramAggregation, "histogram"); public PivotGroupByContainerDescriptor Histogram(Action configure) => Set(configure, "histogram"); public PivotGroupByContainerDescriptor Histogram(Action> configure) => Set(configure, "histogram"); - public PivotGroupByContainerDescriptor Terms(Aggregations.TermsAggregation variant) => Set(variant, "terms"); + public PivotGroupByContainerDescriptor Terms(Aggregations.TermsAggregation termsAggregation) => Set(termsAggregation, "terms"); public PivotGroupByContainerDescriptor Terms(Action configure) => Set(configure, "terms"); public PivotGroupByContainerDescriptor Terms(Action> configure) => Set(configure, "terms"); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) From 543e75d74289159f965074846cf02a0a9a55fb8a Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 8 Nov 2022 14:02:16 +0000 Subject: [PATCH 4/5] Support fluent container additional properties --- .../InferenceConfigContainer.g.cs | 14 +-- .../Types/Core/Search/FieldSuggester.g.cs | 14 +-- .../Core/Search/SmoothingModelContainer.g.cs | 14 +-- .../Ml/InferenceConfigCreateContainer.g.cs | 14 +-- .../Ml/InferenceConfigUpdateContainer.g.cs | 14 +-- .../Types/Ml/TokenizationConfigContainer.g.cs | 14 +-- .../QueryDsl/FunctionScoreContainer.g.cs | 14 +-- .../Types/QueryDsl/IntervalsContainer.g.cs | 14 +-- .../Types/QueryDsl/IntervalsFilter.g.cs | 14 +-- .../Types/QueryDsl/IntervalsQuery.g.cs | 16 +-- .../Types/QueryDsl/QueryContainer.g.cs | 14 +-- .../_Generated/Types/QueryDsl/SpanQuery.g.cs | 14 +-- .../_Generated/Types/SortOptions.g.cs | 117 +++++++++++++++++- .../PivotGroupByContainer.g.cs | 14 +-- .../Search/Search/BasicSortUsageTests.cs | 2 +- 15 files changed, 194 insertions(+), 109 deletions(-) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs index 6e0ee555fa9..8221ec5e71a 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/InferenceConfigContainer.g.cs @@ -151,12 +151,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -213,12 +212,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs index ee5068b840a..06a9f5e4732 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/FieldSuggester.g.cs @@ -272,12 +272,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -380,12 +379,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs index 64e102f1635..20e25f39849 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/SmoothingModelContainer.g.cs @@ -164,12 +164,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -227,12 +226,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs index f433709986f..96b00c47696 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigCreateContainer.g.cs @@ -242,12 +242,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -318,12 +317,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs index 0cfb9558314..e624ddb53e6 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/InferenceConfigUpdateContainer.g.cs @@ -242,12 +242,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -318,12 +317,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs index c25c3a7d3e5..180b27b60a7 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Ml/TokenizationConfigContainer.g.cs @@ -164,12 +164,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -227,12 +226,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs index 9b05309897e..ba311d2746c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/FunctionScoreContainer.g.cs @@ -272,12 +272,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -397,12 +396,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs index e51c653ac6c..a189af2dcb3 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsContainer.g.cs @@ -203,12 +203,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -278,12 +277,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs index ba3a57f902a..fb17b05b9ed 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsFilter.g.cs @@ -120,12 +120,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -177,12 +176,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs index 33f63c0af54..c6fc05086b9 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/IntervalsQuery.g.cs @@ -330,12 +330,12 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); writer.WriteEndObject(); } @@ -463,12 +463,12 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); writer.WriteEndObject(); } diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs index ba5c4e662be..920937cd22b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/QueryContainer.g.cs @@ -722,12 +722,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -909,12 +908,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs index a5b5e734bf5..1b7c33a261d 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs @@ -242,12 +242,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -326,12 +325,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs index c2f32a17ece..963a246e5e2 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/SortOptions.g.cs @@ -78,9 +78,15 @@ public SortOptionsDescriptor() : base() private Descriptor Descriptor { get; set; } + private Elastic.Clients.Elasticsearch.Field AdditionalPropertyName { get; set; } + + private Elastic.Clients.Elasticsearch.FieldSort AdditionalPropertyValue { get; set; } + private SortOptionsDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { + AdditionalPropertyValue = null; + AdditionalPropertyName = null; ContainedVariantName = variantName; ContainsVariant = true; var descriptor = (T)Activator.CreateInstance(typeof(T), true); @@ -91,18 +97,50 @@ private SortOptionsDescriptor Set(Action descriptorAction, stri private SortOptionsDescriptor Set(object variant, string variantName) { + AdditionalPropertyValue = null; + AdditionalPropertyName = null; Variant = variant; ContainedVariantName = variantName; ContainsVariant = true; return Self; } + private SortOptionsDescriptor Set(Action descriptorAction, Elastic.Clients.Elasticsearch.Field variantName) + where T : Descriptor + { + var descriptor = (T)Activator.CreateInstance(typeof(T), true); + descriptorAction?.Invoke(descriptor); + Descriptor = descriptor; + ContainedVariantName = null; + Variant = null; + AdditionalPropertyValue = null; + AdditionalPropertyName = variantName; + ContainsVariant = true; + return Self; + } + + private SortOptionsDescriptor Set(Elastic.Clients.Elasticsearch.FieldSort variant, Elastic.Clients.Elasticsearch.Field variantName) + { + ContainedVariantName = null; + Variant = null; + AdditionalPropertyValue = variant; + AdditionalPropertyName = variantName; + ContainsVariant = true; + return Self; + } + public SortOptionsDescriptor Doc(ScoreSort scoreSort) => Set(scoreSort, "_doc"); public SortOptionsDescriptor Doc(Action configure) => Set(configure, "_doc"); public SortOptionsDescriptor Score(ScoreSort scoreSort) => Set(scoreSort, "_score"); public SortOptionsDescriptor Score(Action configure) => Set(configure, "_score"); public SortOptionsDescriptor Script(ScriptSort scriptSort) => Set(scriptSort, "_script"); public SortOptionsDescriptor Script(Action> configure) => Set(configure, "_script"); + public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field) => Set(FieldSort.Empty, field); + public SortOptionsDescriptor Field(Expression> field) => Set(FieldSort.Empty, field); + public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field, Elastic.Clients.Elasticsearch.FieldSort sort) => Set(sort, field); + public SortOptionsDescriptor Field(Expression> field, Elastic.Clients.Elasticsearch.FieldSort sort) => Set(sort, field); + public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field, Action> configure) => Set(configure, field); + public SortOptionsDescriptor Field(Expression> field, Action> configure) => Set(configure, field); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -111,17 +149,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o return; } + var fieldName = ContainedVariantName; + if (AdditionalPropertyName is IUrlParameter urlParameter) + { + fieldName = urlParameter.GetString(settings); + } + + if ((Variant is not null && Variant.Equals(FieldSort.Empty)) || (AdditionalPropertyValue is not null && AdditionalPropertyValue.Equals(FieldSort.Empty))) + { + writer.WriteStringValue(fieldName); + return; + } + writer.WriteStartObject(); writer.WritePropertyName(ContainedVariantName); if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); + writer.WriteEndObject(); + return; } - else + + if (AdditionalPropertyValue is not null) { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + JsonSerializer.Serialize(writer, AdditionalPropertyValue, options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -141,9 +197,15 @@ public SortOptionsDescriptor() : base() private Descriptor Descriptor { get; set; } + private Elastic.Clients.Elasticsearch.Field AdditionalPropertyName { get; set; } + + private Elastic.Clients.Elasticsearch.FieldSort AdditionalPropertyValue { get; set; } + private SortOptionsDescriptor Set(Action descriptorAction, string variantName) where T : Descriptor { + AdditionalPropertyValue = null; + AdditionalPropertyName = null; ContainedVariantName = variantName; ContainsVariant = true; var descriptor = (T)Activator.CreateInstance(typeof(T), true); @@ -154,12 +216,38 @@ private SortOptionsDescriptor Set(Action descriptorAction, string variantN private SortOptionsDescriptor Set(object variant, string variantName) { + AdditionalPropertyValue = null; + AdditionalPropertyName = null; Variant = variant; ContainedVariantName = variantName; ContainsVariant = true; return Self; } + private SortOptionsDescriptor Set(Action descriptorAction, Elastic.Clients.Elasticsearch.Field variantName) + where T : Descriptor + { + var descriptor = (T)Activator.CreateInstance(typeof(T), true); + descriptorAction?.Invoke(descriptor); + Descriptor = descriptor; + ContainedVariantName = null; + Variant = null; + AdditionalPropertyValue = null; + AdditionalPropertyName = variantName; + ContainsVariant = true; + return Self; + } + + private SortOptionsDescriptor Set(Elastic.Clients.Elasticsearch.FieldSort variant, Elastic.Clients.Elasticsearch.Field variantName) + { + ContainedVariantName = null; + Variant = null; + AdditionalPropertyValue = variant; + AdditionalPropertyName = variantName; + ContainsVariant = true; + return Self; + } + public SortOptionsDescriptor Doc(ScoreSort scoreSort) => Set(scoreSort, "_doc"); public SortOptionsDescriptor Doc(Action configure) => Set(configure, "_doc"); public SortOptionsDescriptor Score(ScoreSort scoreSort) => Set(scoreSort, "_score"); @@ -167,6 +255,9 @@ private SortOptionsDescriptor Set(object variant, string variantName) public SortOptionsDescriptor Script(ScriptSort scriptSort) => Set(scriptSort, "_script"); public SortOptionsDescriptor Script(Action configure) => Set(configure, "_script"); public SortOptionsDescriptor Script(Action> configure) => Set(configure, "_script"); + public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field) => Set(FieldSort.Empty, field); + public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field, Elastic.Clients.Elasticsearch.FieldSort sort) => Set(sort, field); + public SortOptionsDescriptor Field(Elastic.Clients.Elasticsearch.Field field, Action configure) => Set(configure, field); protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions options, IElasticsearchClientSettings settings) { if (!ContainsVariant) @@ -175,17 +266,35 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o return; } + var fieldName = ContainedVariantName; + if (AdditionalPropertyName is IUrlParameter urlParameter) + { + fieldName = urlParameter.GetString(settings); + } + + if ((Variant is not null && Variant.Equals(FieldSort.Empty)) || (AdditionalPropertyValue is not null && AdditionalPropertyValue.Equals(FieldSort.Empty))) + { + writer.WriteStringValue(fieldName); + return; + } + writer.WriteStartObject(); writer.WritePropertyName(ContainedVariantName); if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); + writer.WriteEndObject(); + return; } - else + + if (AdditionalPropertyValue is not null) { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + JsonSerializer.Serialize(writer, AdditionalPropertyValue, options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs index 5f46ff8966a..b2f7e13536b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/TransformManagement/PivotGroupByContainer.g.cs @@ -164,12 +164,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } @@ -230,12 +229,11 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (Variant is not null) { JsonSerializer.Serialize(writer, Variant, Variant.GetType(), options); - } - else - { - JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); + writer.WriteEndObject(); + return; } + JsonSerializer.Serialize(writer, Descriptor, Descriptor.GetType(), options); writer.WriteEndObject(); } } \ No newline at end of file diff --git a/tests/Tests/Search/Search/BasicSortUsageTests.cs b/tests/Tests/Search/Search/BasicSortUsageTests.cs index 4988b178fe6..700c97f952e 100644 --- a/tests/Tests/Search/Search/BasicSortUsageTests.cs +++ b/tests/Tests/Search/Search/BasicSortUsageTests.cs @@ -20,7 +20,7 @@ public BasicSortUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base( }; protected override Action> Fluent => s => s - .Sort(new[] { SortOptions.Field("startedOn") }); + .Sort(s => s.Field(f => f.StartedOn)); protected override SearchRequest Initializer => new() From ebe0b2b27ab7d6fb6bbf5110c6c350e6fad828dd Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Tue, 8 Nov 2022 14:25:36 +0000 Subject: [PATCH 5/5] Remove BOM --- src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs b/src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs index cca4b48064f..375c1d1b5b2 100644 --- a/src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs +++ b/src/Elastic.Clients.Elasticsearch/Types/SortConverter.cs @@ -1,4 +1,4 @@ -// Licensed to Elasticsearch B.V under one or more agreements. +// Licensed to Elasticsearch B.V under one or more agreements. // Elasticsearch B.V licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information.