From 0b771f888d53a09f88e9c713d808a80bbc5e7332 Mon Sep 17 00:00:00 2001 From: Florian Bernd Date: Thu, 4 Apr 2024 11:36:51 +0200 Subject: [PATCH] Fix source (de-)serialization (#8076) Closes #8075 --- .../_Generated/Api/SearchRequest.g.cs | 2 +- .../_Generated/Api/TermVectorsRequest.g.cs | 3 ++- .../_Generated/Api/UpdateRequest.g.cs | 6 ++++-- .../Client/ElasticsearchClient.AsyncSearch.g.cs | 14 +++++++------- .../Aggregations/DateHistogramAggregation.g.cs | 16 ++++++++-------- .../Types/Aggregations/HistogramAggregation.g.cs | 16 ++++++++-------- .../Aggregations/MultiTermsAggregation.g.cs | 16 ++++++++-------- .../Types/Aggregations/TermsAggregation.g.cs | 2 +- .../_Generated/Types/Core/Get/GetResult.g.cs | 1 + .../Core/Search/CompletionSuggestOption.g.cs | 1 + .../_Generated/Types/Core/Search/Hit.g.cs | 1 + .../_Generated/Types/Enrich/EnrichSummary.g.cs | 2 +- .../_Generated/Types/Eql/HitsEvent.g.cs | 1 + .../_Generated/Types/QueryDsl/SpanQuery.g.cs | 10 +++++----- .../Api/ScriptsPainlessExecuteResponse.g.cs | 1 + .../_Generated/Api/SearchRequest.g.cs | 2 +- .../_Generated/Api/TermVectorsRequest.g.cs | 3 ++- .../_Generated/Api/UpdateRequest.g.cs | 6 ++++-- .../Aggregations/DateHistogramAggregation.g.cs | 16 ++++++++-------- .../Types/Aggregations/HistogramAggregation.g.cs | 16 ++++++++-------- .../Aggregations/MultiTermsAggregation.g.cs | 16 ++++++++-------- .../Types/Aggregations/TermsAggregation.g.cs | 4 ++-- .../_Generated/Types/Core/Get/GetResult.g.cs | 1 + .../Core/Search/CompletionSuggestOption.g.cs | 1 + .../_Generated/Types/Core/Search/Hit.g.cs | 1 + .../_Generated/Types/Enrich/EnrichSummary.g.cs | 2 +- .../_Generated/Types/Eql/HitsEvent.g.cs | 1 + .../_Generated/Types/QueryDsl/SpanQuery.g.cs | 10 +++++----- 28 files changed, 93 insertions(+), 78 deletions(-) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs index 88f54cfbc76..00964457f2f 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/SearchRequest.g.cs @@ -3231,4 +3231,4 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteEndObject(); } -} +} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsRequest.g.cs index e2c112551e1..8710f9a0974 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/TermVectorsRequest.g.cs @@ -178,6 +178,7 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName ind /// An artificial document (a document not present in the index) for which you want to retrieve term vectors. /// [JsonInclude, JsonPropertyName("doc")] + [SourceConverter] public TDocument? Doc { get; set; } /// @@ -297,7 +298,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (DocValue is not null) { writer.WritePropertyName("doc"); - JsonSerializer.Serialize(writer, DocValue, options); + SourceSerialization.Serialize(DocValue, writer, settings.SourceSerializer); } if (FilterDescriptor is not null) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateRequest.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateRequest.g.cs index fcaac5ce875..e514bb0c2c1 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Api/UpdateRequest.g.cs @@ -180,6 +180,7 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E /// A partial update to an existing document. /// [JsonInclude, JsonPropertyName("doc")] + [SourceConverter] public TPartialDocument? Doc { get; set; } /// @@ -210,6 +211,7 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.Serverless.IndexName index, E /// If the document does not already exist, the contents of 'upsert' are inserted as a
new document. If the document exists, the 'script' is executed. /// [JsonInclude, JsonPropertyName("upsert")] + [SourceConverter] public TDocument? Upsert { get; set; } } @@ -339,7 +341,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (DocValue is not null) { writer.WritePropertyName("doc"); - JsonSerializer.Serialize(writer, DocValue, options); + SourceSerialization.Serialize(DocValue, writer, settings.SourceSerializer); } if (DocAsUpsertValue.HasValue) @@ -369,7 +371,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (UpsertValue is not null) { writer.WritePropertyName("upsert"); - JsonSerializer.Serialize(writer, UpsertValue, options); + SourceSerialization.Serialize(UpsertValue, writer, settings.SourceSerializer); } writer.WriteEndObject(); diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs index 98edbcf13d5..82c6850e44b 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Client/ElasticsearchClient.AsyncSearch.g.cs @@ -116,31 +116,31 @@ public virtual Task> GetAsync(GetAs /// public virtual Task> GetAsync(Elastic.Clients.Elasticsearch.Serverless.Id id, CancellationToken cancellationToken = default) { - var descriptor = new GetAsyncSearchRequestDescriptor(id); + var descriptor = new GetAsyncSearchRequestDescriptor(id); descriptor.BeforeRequest(); - return DoRequestAsync, GetAsyncSearchRequestParameters>(descriptor, cancellationToken); + return DoRequestAsync, GetAsyncSearchResponse, GetAsyncSearchRequestParameters>(descriptor, cancellationToken); } /// /// Retrieves the results of a previously submitted async search request given its ID. /// Learn more about this API in the Elasticsearch documentation. /// - public virtual Task> GetAsync(GetAsyncSearchRequestDescriptor descriptor, CancellationToken cancellationToken = default) + public virtual Task> GetAsync(GetAsyncSearchRequestDescriptor descriptor, CancellationToken cancellationToken = default) { descriptor.BeforeRequest(); - return DoRequestAsync, GetAsyncSearchRequestParameters>(descriptor, cancellationToken); + return DoRequestAsync, GetAsyncSearchResponse, GetAsyncSearchRequestParameters>(descriptor, cancellationToken); } /// /// Retrieves the results of a previously submitted async search request given its ID. /// Learn more about this API in the Elasticsearch documentation. /// - public virtual Task> GetAsync(Elastic.Clients.Elasticsearch.Serverless.Id id, Action configureRequest, CancellationToken cancellationToken = default) + public virtual Task> GetAsync(Elastic.Clients.Elasticsearch.Serverless.Id id, Action> configureRequest, CancellationToken cancellationToken = default) { - var descriptor = new GetAsyncSearchRequestDescriptor(id); + var descriptor = new GetAsyncSearchRequestDescriptor(id); configureRequest?.Invoke(descriptor); descriptor.BeforeRequest(); - return DoRequestAsync, GetAsyncSearchRequestParameters>(descriptor, cancellationToken); + return DoRequestAsync, GetAsyncSearchResponse, GetAsyncSearchRequestParameters>(descriptor, cancellationToken); } /// diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs index 9f171e25bdf..11c615e8be2 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs @@ -79,8 +79,8 @@ public sealed partial class DateHistogramAggregation /// The sort order of the returned buckets. /// [JsonInclude, JsonPropertyName("order")] - [SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary))] - public ICollection>? Order { get; set; } + [SingleOrManyCollectionConverter(typeof(KeyValuePair))] + public ICollection>? Order { get; set; } [JsonInclude, JsonPropertyName("params")] public IDictionary? Params { get; set; } [JsonInclude, JsonPropertyName("script")] @@ -113,7 +113,7 @@ public DateHistogramAggregationDescriptor() : base() private DateTimeOffset? MissingValue { get; set; } private string? NameValue { get; set; } private Elastic.Clients.Elasticsearch.Serverless.Duration? OffsetValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private IDictionary? ParamsValue { get; set; } private Elastic.Clients.Elasticsearch.Serverless.Script? ScriptValue { get; set; } private string? TimeZoneValue { get; set; } @@ -214,7 +214,7 @@ public DateHistogramAggregationDescriptor Offset(Elastic.Clients.Elas /// /// The sort order of the returned buckets. /// - public DateHistogramAggregationDescriptor Order(ICollection>? order) + public DateHistogramAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -301,7 +301,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ParamsValue is not null) @@ -343,7 +343,7 @@ public DateHistogramAggregationDescriptor() : base() private DateTimeOffset? MissingValue { get; set; } private string? NameValue { get; set; } private Elastic.Clients.Elasticsearch.Serverless.Duration? OffsetValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private IDictionary? ParamsValue { get; set; } private Elastic.Clients.Elasticsearch.Serverless.Script? ScriptValue { get; set; } private string? TimeZoneValue { get; set; } @@ -444,7 +444,7 @@ public DateHistogramAggregationDescriptor Offset(Elastic.Clients.Elasticsearch.S /// /// The sort order of the returned buckets. /// - public DateHistogramAggregationDescriptor Order(ICollection>? order) + public DateHistogramAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -531,7 +531,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ParamsValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregation.g.cs index 113d4cbc833..a77b77a39be 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/HistogramAggregation.g.cs @@ -69,8 +69,8 @@ public sealed partial class HistogramAggregation /// The sort order of the returned buckets.
By default, the returned buckets are sorted by their key ascending. /// [JsonInclude, JsonPropertyName("order")] - [SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary))] - public ICollection>? Order { get; set; } + [SingleOrManyCollectionConverter(typeof(KeyValuePair))] + public ICollection>? Order { get; set; } [JsonInclude, JsonPropertyName("script")] public Elastic.Clients.Elasticsearch.Serverless.Script? Script { get; set; } @@ -94,7 +94,7 @@ public HistogramAggregationDescriptor() : base() private double? MissingValue { get; set; } private string? NameValue { get; set; } private double? OffsetValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private Elastic.Clients.Elasticsearch.Serverless.Script? ScriptValue { get; set; } /// @@ -181,7 +181,7 @@ public HistogramAggregationDescriptor Offset(double? offset) /// /// The sort order of the returned buckets.
By default, the returned buckets are sorted by their key ascending. /// - public HistogramAggregationDescriptor Order(ICollection>? order) + public HistogramAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -247,7 +247,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ScriptValue is not null) @@ -276,7 +276,7 @@ public HistogramAggregationDescriptor() : base() private double? MissingValue { get; set; } private string? NameValue { get; set; } private double? OffsetValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private Elastic.Clients.Elasticsearch.Serverless.Script? ScriptValue { get; set; } /// @@ -363,7 +363,7 @@ public HistogramAggregationDescriptor Offset(double? offset) /// /// The sort order of the returned buckets.
By default, the returned buckets are sorted by their key ascending. /// - public HistogramAggregationDescriptor Order(ICollection>? order) + public HistogramAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -429,7 +429,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ScriptValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs index a42a13fed17..ba485830223 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs @@ -49,8 +49,8 @@ public sealed partial class MultiTermsAggregation /// Specifies the sort order of the buckets.
Defaults to sorting by descending document count. /// [JsonInclude, JsonPropertyName("order")] - [SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary))] - public ICollection>? Order { get; set; } + [SingleOrManyCollectionConverter(typeof(KeyValuePair))] + public ICollection>? Order { get; set; } /// /// The minimum number of documents in a bucket on each shard for it to be returned. @@ -97,7 +97,7 @@ public MultiTermsAggregationDescriptor() : base() private IDictionary? MetaValue { get; set; } private long? MinDocCountValue { get; set; } private string? NameValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private long? ShardMinDocCountValue { get; set; } private int? ShardSizeValue { get; set; } private bool? ShowTermDocCountErrorValue { get; set; } @@ -140,7 +140,7 @@ public MultiTermsAggregationDescriptor Name(string? name) /// /// Specifies the sort order of the buckets.
Defaults to sorting by descending document count. /// - public MultiTermsAggregationDescriptor Order(ICollection>? order) + public MultiTermsAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -251,7 +251,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ShardMinDocCountValue.HasValue) @@ -325,7 +325,7 @@ public MultiTermsAggregationDescriptor() : base() private IDictionary? MetaValue { get; set; } private long? MinDocCountValue { get; set; } private string? NameValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private long? ShardMinDocCountValue { get; set; } private int? ShardSizeValue { get; set; } private bool? ShowTermDocCountErrorValue { get; set; } @@ -368,7 +368,7 @@ public MultiTermsAggregationDescriptor Name(string? name) /// /// Specifies the sort order of the buckets.
Defaults to sorting by descending document count. /// - public MultiTermsAggregationDescriptor Order(ICollection>? order) + public MultiTermsAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -479,7 +479,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ShardMinDocCountValue.HasValue) diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TermsAggregation.g.cs index dbe88928bd1..dc5ddfd9d0e 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TermsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Aggregations/TermsAggregation.g.cs @@ -724,4 +724,4 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteEndObject(); } -} +} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Get/GetResult.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Get/GetResult.g.cs index f79aacff7bc..7354ae69e72 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Get/GetResult.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Get/GetResult.g.cs @@ -44,6 +44,7 @@ public sealed partial class GetResult [JsonInclude, JsonPropertyName("_seq_no")] public long? SeqNo { get; init; } [JsonInclude, JsonPropertyName("_source")] + [SourceConverter] public TDocument? Source { get; init; } [JsonInclude, JsonPropertyName("_version")] public long? Version { get; init; } diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs index 69edb9550d4..822c13b2570 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs @@ -46,6 +46,7 @@ public sealed partial class CompletionSuggestOption [JsonInclude, JsonPropertyName("_score")] public double? Score0 { get; init; } [JsonInclude, JsonPropertyName("_source")] + [SourceConverter] public TDocument? Source { get; init; } [JsonInclude, JsonPropertyName("text")] public string Text { get; init; } diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Hit.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Hit.g.cs index 272dc3723a1..6692c62bc58 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Hit.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Core/Search/Hit.g.cs @@ -64,6 +64,7 @@ public sealed partial class Hit [JsonInclude, JsonPropertyName("sort")] public IReadOnlyCollection? Sort { get; init; } [JsonInclude, JsonPropertyName("_source")] + [SourceConverter] public TDocument? Source { get; init; } [JsonInclude, JsonPropertyName("_version")] public long? Version { get; init; } diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enrich/EnrichSummary.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enrich/EnrichSummary.g.cs index 8246da96754..2c54b1e3465 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enrich/EnrichSummary.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Enrich/EnrichSummary.g.cs @@ -30,5 +30,5 @@ namespace Elastic.Clients.Elasticsearch.Serverless.Enrich; public sealed partial class EnrichSummary { [JsonInclude, JsonPropertyName("config")] - public IReadOnlyDictionary Config { get; init; } + public KeyValuePair Config { get; init; } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Eql/HitsEvent.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Eql/HitsEvent.g.cs index cf07a5c7a40..b89b9827c87 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Eql/HitsEvent.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/Eql/HitsEvent.g.cs @@ -49,5 +49,6 @@ public sealed partial class HitsEvent /// Original JSON body passed for the event at index time. /// [JsonInclude, JsonPropertyName("_source")] + [SourceConverter] public TEvent Source { get; init; } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanQuery.g.cs b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanQuery.g.cs index 707dd1a9ba8..2eb5c91f5de 100644 --- a/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch.Serverless/_Generated/Types/QueryDsl/SpanQuery.g.cs @@ -49,7 +49,7 @@ internal SpanQuery(string variantName, object variant) public static SpanQuery FieldMaskingSpan(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFieldMaskingQuery spanFieldMaskingQuery) => new SpanQuery("field_masking_span", spanFieldMaskingQuery); public static SpanQuery SpanContaining(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanContainingQuery spanContainingQuery) => new SpanQuery("span_containing", spanContainingQuery); public static SpanQuery SpanFirst(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery spanFirstQuery) => new SpanQuery("span_first", spanFirstQuery); - public static SpanQuery SpanGap(IReadOnlyDictionary integer) => new SpanQuery("span_gap", integer); + public static SpanQuery SpanGap(KeyValuePair integer) => new SpanQuery("span_gap", integer); public static SpanQuery SpanMulti(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery spanMultiTermQuery) => new SpanQuery("span_multi", spanMultiTermQuery); public static SpanQuery SpanNear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery spanNearQuery) => new SpanQuery("span_near", spanNearQuery); public static SpanQuery SpanNot(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNotQuery spanNotQuery) => new SpanQuery("span_not", spanNotQuery); @@ -118,7 +118,7 @@ public override SpanQuery Read(ref Utf8JsonReader reader, Type typeToConvert, Js if (propertyName == "span_gap") { - variantValue = JsonSerializer.Deserialize?>(ref reader, options); + variantValue = JsonSerializer.Deserialize?>(ref reader, options); variantNameValue = propertyName; continue; } @@ -191,7 +191,7 @@ public override void Write(Utf8JsonWriter writer, SpanQuery value, JsonSerialize JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery)value.Variant, options); break; case "span_gap": - JsonSerializer.Serialize>(writer, (IReadOnlyDictionary)value.Variant, options); + JsonSerializer.Serialize>(writer, (KeyValuePair)value.Variant, options); break; case "span_multi": JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery)value.Variant, options); @@ -255,7 +255,7 @@ private SpanQueryDescriptor Set(object variant, string variantName) public SpanQueryDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); public SpanQueryDescriptor SpanFirst(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); public SpanQueryDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); - public SpanQueryDescriptor SpanGap(IReadOnlyDictionary integer) => Set(integer, "span_gap"); + public SpanQueryDescriptor SpanGap(KeyValuePair integer) => Set(integer, "span_gap"); public SpanQueryDescriptor SpanMulti(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); public SpanQueryDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); public SpanQueryDescriptor SpanNear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); @@ -326,7 +326,7 @@ private SpanQueryDescriptor Set(object variant, string variantName) public SpanQueryDescriptor SpanContaining(Action configure) => Set(configure, "span_containing"); public SpanQueryDescriptor SpanFirst(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); public SpanQueryDescriptor SpanFirst(Action configure) => Set(configure, "span_first"); - public SpanQueryDescriptor SpanGap(IReadOnlyDictionary integer) => Set(integer, "span_gap"); + public SpanQueryDescriptor SpanGap(KeyValuePair integer) => Set(integer, "span_gap"); public SpanQueryDescriptor SpanMulti(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); public SpanQueryDescriptor SpanMulti(Action configure) => Set(configure, "span_multi"); public SpanQueryDescriptor SpanNear(Elastic.Clients.Elasticsearch.Serverless.QueryDsl.SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptsPainlessExecuteResponse.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptsPainlessExecuteResponse.g.cs index 2e5fd8e0c4e..d2c5569f64c 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptsPainlessExecuteResponse.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/ScriptsPainlessExecuteResponse.g.cs @@ -29,5 +29,6 @@ namespace Elastic.Clients.Elasticsearch; public sealed partial class ScriptsPainlessExecuteResponse : ElasticsearchResponse { [JsonInclude, JsonPropertyName("result")] + [SourceConverter] public TResult Result { get; init; } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs index d870b94b26a..ae317919acc 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/SearchRequest.g.cs @@ -3231,4 +3231,4 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteEndObject(); } -} +} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsRequest.g.cs index 93b65a90fb9..7fb40edfa5f 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/TermVectorsRequest.g.cs @@ -178,6 +178,7 @@ public TermVectorsRequest(Elastic.Clients.Elasticsearch.IndexName index) : base( /// An artificial document (a document not present in the index) for which you want to retrieve term vectors. /// [JsonInclude, JsonPropertyName("doc")] + [SourceConverter] public TDocument? Doc { get; set; } /// @@ -297,7 +298,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (DocValue is not null) { writer.WritePropertyName("doc"); - JsonSerializer.Serialize(writer, DocValue, options); + SourceSerialization.Serialize(DocValue, writer, settings.SourceSerializer); } if (FilterDescriptor is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs index a94f1a0b685..afbe6d246fd 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Api/UpdateRequest.g.cs @@ -180,6 +180,7 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie /// A partial update to an existing document. /// [JsonInclude, JsonPropertyName("doc")] + [SourceConverter] public TPartialDocument? Doc { get; set; } /// @@ -210,6 +211,7 @@ public UpdateRequest(Elastic.Clients.Elasticsearch.IndexName index, Elastic.Clie /// If the document does not already exist, the contents of 'upsert' are inserted as a
new document. If the document exists, the 'script' is executed. /// [JsonInclude, JsonPropertyName("upsert")] + [SourceConverter] public TDocument? Upsert { get; set; } } @@ -339,7 +341,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (DocValue is not null) { writer.WritePropertyName("doc"); - JsonSerializer.Serialize(writer, DocValue, options); + SourceSerialization.Serialize(DocValue, writer, settings.SourceSerializer); } if (DocAsUpsertValue.HasValue) @@ -369,7 +371,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (UpsertValue is not null) { writer.WritePropertyName("upsert"); - JsonSerializer.Serialize(writer, UpsertValue, options); + SourceSerialization.Serialize(UpsertValue, writer, settings.SourceSerializer); } writer.WriteEndObject(); diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs index dedd40b2c64..2b510f83b16 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/DateHistogramAggregation.g.cs @@ -79,8 +79,8 @@ public sealed partial class DateHistogramAggregation /// The sort order of the returned buckets. /// [JsonInclude, JsonPropertyName("order")] - [SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary))] - public ICollection>? Order { get; set; } + [SingleOrManyCollectionConverter(typeof(KeyValuePair))] + public ICollection>? Order { get; set; } [JsonInclude, JsonPropertyName("params")] public IDictionary? Params { get; set; } [JsonInclude, JsonPropertyName("script")] @@ -113,7 +113,7 @@ public DateHistogramAggregationDescriptor() : base() private DateTimeOffset? MissingValue { get; set; } private string? NameValue { get; set; } private Elastic.Clients.Elasticsearch.Duration? OffsetValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private IDictionary? ParamsValue { get; set; } private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; } private string? TimeZoneValue { get; set; } @@ -214,7 +214,7 @@ public DateHistogramAggregationDescriptor Offset(Elastic.Clients.Elas /// /// The sort order of the returned buckets. /// - public DateHistogramAggregationDescriptor Order(ICollection>? order) + public DateHistogramAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -301,7 +301,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ParamsValue is not null) @@ -343,7 +343,7 @@ public DateHistogramAggregationDescriptor() : base() private DateTimeOffset? MissingValue { get; set; } private string? NameValue { get; set; } private Elastic.Clients.Elasticsearch.Duration? OffsetValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private IDictionary? ParamsValue { get; set; } private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; } private string? TimeZoneValue { get; set; } @@ -444,7 +444,7 @@ public DateHistogramAggregationDescriptor Offset(Elastic.Clients.Elasticsearch.D /// /// The sort order of the returned buckets. /// - public DateHistogramAggregationDescriptor Order(ICollection>? order) + public DateHistogramAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -531,7 +531,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ParamsValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs index 1a1dd073ba6..bc9808bf7ff 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/HistogramAggregation.g.cs @@ -69,8 +69,8 @@ public sealed partial class HistogramAggregation /// The sort order of the returned buckets.
By default, the returned buckets are sorted by their key ascending. /// [JsonInclude, JsonPropertyName("order")] - [SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary))] - public ICollection>? Order { get; set; } + [SingleOrManyCollectionConverter(typeof(KeyValuePair))] + public ICollection>? Order { get; set; } [JsonInclude, JsonPropertyName("script")] public Elastic.Clients.Elasticsearch.Script? Script { get; set; } @@ -94,7 +94,7 @@ public HistogramAggregationDescriptor() : base() private double? MissingValue { get; set; } private string? NameValue { get; set; } private double? OffsetValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; } /// @@ -181,7 +181,7 @@ public HistogramAggregationDescriptor Offset(double? offset) /// /// The sort order of the returned buckets.
By default, the returned buckets are sorted by their key ascending. /// - public HistogramAggregationDescriptor Order(ICollection>? order) + public HistogramAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -247,7 +247,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ScriptValue is not null) @@ -276,7 +276,7 @@ public HistogramAggregationDescriptor() : base() private double? MissingValue { get; set; } private string? NameValue { get; set; } private double? OffsetValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private Elastic.Clients.Elasticsearch.Script? ScriptValue { get; set; } /// @@ -363,7 +363,7 @@ public HistogramAggregationDescriptor Offset(double? offset) /// /// The sort order of the returned buckets.
By default, the returned buckets are sorted by their key ascending. /// - public HistogramAggregationDescriptor Order(ICollection>? order) + public HistogramAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -429,7 +429,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ScriptValue is not null) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs index 9141fb3dbe9..bbf38f75716 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/MultiTermsAggregation.g.cs @@ -49,8 +49,8 @@ public sealed partial class MultiTermsAggregation /// Specifies the sort order of the buckets.
Defaults to sorting by descending document count. /// [JsonInclude, JsonPropertyName("order")] - [SingleOrManyCollectionConverter(typeof(IReadOnlyDictionary))] - public ICollection>? Order { get; set; } + [SingleOrManyCollectionConverter(typeof(KeyValuePair))] + public ICollection>? Order { get; set; } /// /// The minimum number of documents in a bucket on each shard for it to be returned. @@ -97,7 +97,7 @@ public MultiTermsAggregationDescriptor() : base() private IDictionary? MetaValue { get; set; } private long? MinDocCountValue { get; set; } private string? NameValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private long? ShardMinDocCountValue { get; set; } private int? ShardSizeValue { get; set; } private bool? ShowTermDocCountErrorValue { get; set; } @@ -140,7 +140,7 @@ public MultiTermsAggregationDescriptor Name(string? name) /// /// Specifies the sort order of the buckets.
Defaults to sorting by descending document count. /// - public MultiTermsAggregationDescriptor Order(ICollection>? order) + public MultiTermsAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -251,7 +251,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ShardMinDocCountValue.HasValue) @@ -325,7 +325,7 @@ public MultiTermsAggregationDescriptor() : base() private IDictionary? MetaValue { get; set; } private long? MinDocCountValue { get; set; } private string? NameValue { get; set; } - private ICollection>? OrderValue { get; set; } + private ICollection>? OrderValue { get; set; } private long? ShardMinDocCountValue { get; set; } private int? ShardSizeValue { get; set; } private bool? ShowTermDocCountErrorValue { get; set; } @@ -368,7 +368,7 @@ public MultiTermsAggregationDescriptor Name(string? name) /// /// Specifies the sort order of the buckets.
Defaults to sorting by descending document count. /// - public MultiTermsAggregationDescriptor Order(ICollection>? order) + public MultiTermsAggregationDescriptor Order(ICollection>? order) { OrderValue = order; return Self; @@ -479,7 +479,7 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o if (OrderValue is not null) { writer.WritePropertyName("order"); - SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); + SingleOrManySerializationHelper.Serialize>(OrderValue, writer, options); } if (ShardMinDocCountValue.HasValue) diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs index 7ca5ffbc9c3..18d819e1f95 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Aggregations/TermsAggregation.g.cs @@ -85,7 +85,7 @@ public sealed partial class TermsAggregation /// Specifies the sort order of the buckets.
Defaults to sorting by descending document count. /// [JsonInclude, JsonPropertyName("order")] - [JsonConverter(typeof(SingleOrManyCollectionConverter>))] + [SingleOrManyCollectionConverter(typeof(KeyValuePair))] public ICollection>? Order { get; set; } [JsonInclude, JsonPropertyName("script")] public Elastic.Clients.Elasticsearch.Script? Script { get; set; } @@ -724,4 +724,4 @@ protected override void Serialize(Utf8JsonWriter writer, JsonSerializerOptions o writer.WriteEndObject(); } -} +} \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Get/GetResult.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Get/GetResult.g.cs index a831345349e..ad4e94dc650 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Get/GetResult.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Get/GetResult.g.cs @@ -44,6 +44,7 @@ public sealed partial class GetResult [JsonInclude, JsonPropertyName("_seq_no")] public long? SeqNo { get; init; } [JsonInclude, JsonPropertyName("_source")] + [SourceConverter] public TDocument? Source { get; init; } [JsonInclude, JsonPropertyName("_version")] public long? Version { get; init; } diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs index dee2194a8f6..3e0c73771fb 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/CompletionSuggestOption.g.cs @@ -46,6 +46,7 @@ public sealed partial class CompletionSuggestOption [JsonInclude, JsonPropertyName("_score")] public double? Score0 { get; init; } [JsonInclude, JsonPropertyName("_source")] + [SourceConverter] public TDocument? Source { get; init; } [JsonInclude, JsonPropertyName("text")] public string Text { get; init; } diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Hit.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Hit.g.cs index 3429c70092f..c31f0c89c0b 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Hit.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Core/Search/Hit.g.cs @@ -64,6 +64,7 @@ public sealed partial class Hit [JsonInclude, JsonPropertyName("sort")] public IReadOnlyCollection? Sort { get; init; } [JsonInclude, JsonPropertyName("_source")] + [SourceConverter] public TDocument? Source { get; init; } [JsonInclude, JsonPropertyName("_version")] public long? Version { get; init; } diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enrich/EnrichSummary.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enrich/EnrichSummary.g.cs index 7d5d1fe4fc5..9298d4e11d3 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enrich/EnrichSummary.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enrich/EnrichSummary.g.cs @@ -30,5 +30,5 @@ namespace Elastic.Clients.Elasticsearch.Enrich; public sealed partial class EnrichSummary { [JsonInclude, JsonPropertyName("config")] - public IReadOnlyDictionary Config { get; init; } + public KeyValuePair Config { get; init; } } \ No newline at end of file diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs index dd051df2614..a1e2230a388 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Eql/HitsEvent.g.cs @@ -49,5 +49,6 @@ public sealed partial class HitsEvent /// Original JSON body passed for the event at index time. /// [JsonInclude, JsonPropertyName("_source")] + [SourceConverter] public TEvent Source { get; init; } } \ 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 0f97e5d6383..00162dc6ceb 100644 --- a/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs +++ b/src/Elastic.Clients.Elasticsearch/_Generated/Types/QueryDsl/SpanQuery.g.cs @@ -49,7 +49,7 @@ internal SpanQuery(string variantName, object variant) public static SpanQuery FieldMaskingSpan(Elastic.Clients.Elasticsearch.QueryDsl.SpanFieldMaskingQuery spanFieldMaskingQuery) => new SpanQuery("field_masking_span", spanFieldMaskingQuery); public static SpanQuery SpanContaining(Elastic.Clients.Elasticsearch.QueryDsl.SpanContainingQuery spanContainingQuery) => new SpanQuery("span_containing", spanContainingQuery); public static SpanQuery SpanFirst(Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery spanFirstQuery) => new SpanQuery("span_first", spanFirstQuery); - public static SpanQuery SpanGap(IReadOnlyDictionary integer) => new SpanQuery("span_gap", integer); + public static SpanQuery SpanGap(KeyValuePair integer) => new SpanQuery("span_gap", integer); public static SpanQuery SpanMulti(Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery spanMultiTermQuery) => new SpanQuery("span_multi", spanMultiTermQuery); public static SpanQuery SpanNear(Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery spanNearQuery) => new SpanQuery("span_near", spanNearQuery); public static SpanQuery SpanNot(Elastic.Clients.Elasticsearch.QueryDsl.SpanNotQuery spanNotQuery) => new SpanQuery("span_not", spanNotQuery); @@ -118,7 +118,7 @@ public override SpanQuery Read(ref Utf8JsonReader reader, Type typeToConvert, Js if (propertyName == "span_gap") { - variantValue = JsonSerializer.Deserialize?>(ref reader, options); + variantValue = JsonSerializer.Deserialize?>(ref reader, options); variantNameValue = propertyName; continue; } @@ -191,7 +191,7 @@ public override void Write(Utf8JsonWriter writer, SpanQuery value, JsonSerialize JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery)value.Variant, options); break; case "span_gap": - JsonSerializer.Serialize>(writer, (IReadOnlyDictionary)value.Variant, options); + JsonSerializer.Serialize>(writer, (KeyValuePair)value.Variant, options); break; case "span_multi": JsonSerializer.Serialize(writer, (Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery)value.Variant, options); @@ -255,7 +255,7 @@ private SpanQueryDescriptor Set(object variant, string variantName) public SpanQueryDescriptor SpanContaining(Action> configure) => Set(configure, "span_containing"); public SpanQueryDescriptor SpanFirst(Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); public SpanQueryDescriptor SpanFirst(Action> configure) => Set(configure, "span_first"); - public SpanQueryDescriptor SpanGap(IReadOnlyDictionary integer) => Set(integer, "span_gap"); + public SpanQueryDescriptor SpanGap(KeyValuePair integer) => Set(integer, "span_gap"); public SpanQueryDescriptor SpanMulti(Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); public SpanQueryDescriptor SpanMulti(Action> configure) => Set(configure, "span_multi"); public SpanQueryDescriptor SpanNear(Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near"); @@ -326,7 +326,7 @@ private SpanQueryDescriptor Set(object variant, string variantName) public SpanQueryDescriptor SpanContaining(Action configure) => Set(configure, "span_containing"); public SpanQueryDescriptor SpanFirst(Elastic.Clients.Elasticsearch.QueryDsl.SpanFirstQuery spanFirstQuery) => Set(spanFirstQuery, "span_first"); public SpanQueryDescriptor SpanFirst(Action configure) => Set(configure, "span_first"); - public SpanQueryDescriptor SpanGap(IReadOnlyDictionary integer) => Set(integer, "span_gap"); + public SpanQueryDescriptor SpanGap(KeyValuePair integer) => Set(integer, "span_gap"); public SpanQueryDescriptor SpanMulti(Elastic.Clients.Elasticsearch.QueryDsl.SpanMultiTermQuery spanMultiTermQuery) => Set(spanMultiTermQuery, "span_multi"); public SpanQueryDescriptor SpanMulti(Action configure) => Set(configure, "span_multi"); public SpanQueryDescriptor SpanNear(Elastic.Clients.Elasticsearch.QueryDsl.SpanNearQuery spanNearQuery) => Set(spanNearQuery, "span_near");