Skip to content

Commit 8d2af7e

Browse files
floberndflobernd
authored
Introduce RequestResponseConverter<T> and make all non-generated JsonConverters public (#8669)
1 parent f825424 commit 8d2af7e

File tree

100 files changed

+1747
-1466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1747
-1466
lines changed

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/BulkRequest.g.cs‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -124,35 +124,6 @@ public sealed partial class BulkRequestParameters : Elastic.Transport.RequestPar
124124
public Elastic.Clients.Elasticsearch.WaitForActiveShards? WaitForActiveShards { get => Q<Elastic.Clients.Elasticsearch.WaitForActiveShards?>("wait_for_active_shards"); set => Q("wait_for_active_shards", value); }
125125
}
126126

127-
internal sealed partial class BulkRequestConverter : System.Text.Json.Serialization.JsonConverter<Elastic.Clients.Elasticsearch.BulkRequest>
128-
{
129-
public override Elastic.Clients.Elasticsearch.BulkRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
130-
{
131-
reader.ValidateToken(System.Text.Json.JsonTokenType.StartObject);
132-
while (reader.Read() && reader.TokenType is System.Text.Json.JsonTokenType.PropertyName)
133-
{
134-
if (options.UnmappedMemberHandling is System.Text.Json.Serialization.JsonUnmappedMemberHandling.Skip)
135-
{
136-
reader.Skip();
137-
continue;
138-
}
139-
140-
throw new System.Text.Json.JsonException($"Unknown JSON property '{reader.GetString()}' for type '{typeToConvert.Name}'.");
141-
}
142-
143-
reader.ValidateToken(System.Text.Json.JsonTokenType.EndObject);
144-
return new Elastic.Clients.Elasticsearch.BulkRequest(Elastic.Clients.Elasticsearch.Serialization.JsonConstructorSentinel.Instance)
145-
{
146-
};
147-
}
148-
149-
public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clients.Elasticsearch.BulkRequest value, System.Text.Json.JsonSerializerOptions options)
150-
{
151-
writer.WriteStartObject();
152-
writer.WriteEndObject();
153-
}
154-
}
155-
156127
/// <summary>
157128
/// <para>
158129
/// Bulk index or delete documents.
@@ -352,7 +323,6 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien
352323
/// Refer to the linked documentation for step-by-step instructions using the index settings API.
353324
/// </para>
354325
/// </summary>
355-
[System.Text.Json.Serialization.JsonConverter(typeof(Elastic.Clients.Elasticsearch.BulkRequestConverter))]
356326
public partial class BulkRequest : Elastic.Clients.Elasticsearch.Requests.PlainRequest<Elastic.Clients.Elasticsearch.BulkRequestParameters>
357327
{
358328
public BulkRequest(Elastic.Clients.Elasticsearch.IndexName? index) : base(r => r.Optional("index", index))
@@ -1443,4 +1413,4 @@ public Elastic.Clients.Elasticsearch.BulkRequestDescriptor<TDocument> RequestCon
14431413
Instance.RequestConfiguration = configurationSelector.Invoke(Instance.RequestConfiguration is null ? new Elastic.Transport.RequestConfigurationDescriptor() : new Elastic.Transport.RequestConfigurationDescriptor(Instance.RequestConfiguration)) ?? Instance.RequestConfiguration;
14441414
return this;
14451415
}
1446-
}
1416+
}

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchRequest.g.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,6 @@ public sealed partial class MultiSearchRequestParameters : Elastic.Transport.Req
123123
public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
124124
}
125125

126-
internal sealed partial class MultiSearchRequestConverter : System.Text.Json.Serialization.JsonConverter<Elastic.Clients.Elasticsearch.MultiSearchRequest>
127-
{
128-
public override Elastic.Clients.Elasticsearch.MultiSearchRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
129-
{
130-
return new Elastic.Clients.Elasticsearch.MultiSearchRequest(Elastic.Clients.Elasticsearch.Serialization.JsonConstructorSentinel.Instance) { Searches = reader.ReadValue<System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.Core.MSearch.SearchRequestItem>>(options, static System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.Core.MSearch.SearchRequestItem> (ref System.Text.Json.Utf8JsonReader r, System.Text.Json.JsonSerializerOptions o) => r.ReadCollectionValue<Elastic.Clients.Elasticsearch.Core.MSearch.SearchRequestItem>(o, null)!) };
131-
}
132-
133-
public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clients.Elasticsearch.MultiSearchRequest value, System.Text.Json.JsonSerializerOptions options)
134-
{
135-
writer.WriteValue(options, value.Searches, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.Core.MSearch.SearchRequestItem> v) => w.WriteCollectionValue<Elastic.Clients.Elasticsearch.Core.MSearch.SearchRequestItem>(o, v, null));
136-
}
137-
}
138-
139126
/// <summary>
140127
/// <para>
141128
/// Run multiple searches.
@@ -159,7 +146,6 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien
159146
/// When sending requests to this endpoint the <c>Content-Type</c> header should be set to <c>application/x-ndjson</c>.
160147
/// </para>
161148
/// </summary>
162-
[System.Text.Json.Serialization.JsonConverter(typeof(Elastic.Clients.Elasticsearch.MultiSearchRequestConverter))]
163149
public partial class MultiSearchRequest : Elastic.Clients.Elasticsearch.Requests.PlainRequest<Elastic.Clients.Elasticsearch.MultiSearchRequestParameters>
164150
{
165151
[System.Obsolete("The request contains additional required properties that must be initialized. Please use an alternative constructor to ensure all required values are properly set.")]
@@ -876,4 +862,4 @@ public Elastic.Clients.Elasticsearch.MultiSearchRequestDescriptor<TDocument> Req
876862
Instance.RequestConfiguration = configurationSelector.Invoke(Instance.RequestConfiguration is null ? new Elastic.Transport.RequestConfigurationDescriptor() : new Elastic.Transport.RequestConfigurationDescriptor(Instance.RequestConfiguration)) ?? Instance.RequestConfiguration;
877863
return this;
878864
}
879-
}
865+
}

‎src/Elastic.Clients.Elasticsearch/_Generated/Api/MultiSearchTemplateRequest.g.cs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,6 @@ public sealed partial class MultiSearchTemplateRequestParameters : Elastic.Trans
6262
public bool? TypedKeys { get => Q<bool?>("typed_keys"); set => Q("typed_keys", value); }
6363
}
6464

65-
internal sealed partial class MultiSearchTemplateRequestConverter : System.Text.Json.Serialization.JsonConverter<Elastic.Clients.Elasticsearch.MultiSearchTemplateRequest>
66-
{
67-
public override Elastic.Clients.Elasticsearch.MultiSearchTemplateRequest Read(ref System.Text.Json.Utf8JsonReader reader, System.Type typeToConvert, System.Text.Json.JsonSerializerOptions options)
68-
{
69-
return new Elastic.Clients.Elasticsearch.MultiSearchTemplateRequest(Elastic.Clients.Elasticsearch.Serialization.JsonConstructorSentinel.Instance) { SearchTemplates = reader.ReadValue<System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.Core.MSearchTemplate.SearchTemplateRequestItem>>(options, static System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.Core.MSearchTemplate.SearchTemplateRequestItem> (ref System.Text.Json.Utf8JsonReader r, System.Text.Json.JsonSerializerOptions o) => r.ReadCollectionValue<Elastic.Clients.Elasticsearch.Core.MSearchTemplate.SearchTemplateRequestItem>(o, null)!) };
70-
}
71-
72-
public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clients.Elasticsearch.MultiSearchTemplateRequest value, System.Text.Json.JsonSerializerOptions options)
73-
{
74-
writer.WriteValue(options, value.SearchTemplates, static (System.Text.Json.Utf8JsonWriter w, System.Text.Json.JsonSerializerOptions o, System.Collections.Generic.ICollection<Elastic.Clients.Elasticsearch.Core.MSearchTemplate.SearchTemplateRequestItem> v) => w.WriteCollectionValue<Elastic.Clients.Elasticsearch.Core.MSearchTemplate.SearchTemplateRequestItem>(o, v, null));
75-
}
76-
}
77-
7865
/// <summary>
7966
/// <para>
8067
/// Run multiple templated searches.
@@ -94,7 +81,6 @@ public override void Write(System.Text.Json.Utf8JsonWriter writer, Elastic.Clien
9481
/// $ curl -H "Content-Type: application/x-ndjson" -XGET localhost:9200/_msearch/template --data-binary "@requests"; echo
9582
/// </code>
9683
/// </summary>
97-
[System.Text.Json.Serialization.JsonConverter(typeof(Elastic.Clients.Elasticsearch.MultiSearchTemplateRequestConverter))]
9884
public partial class MultiSearchTemplateRequest : Elastic.Clients.Elasticsearch.Requests.PlainRequest<Elastic.Clients.Elasticsearch.MultiSearchTemplateRequestParameters>
9985
{
10086
[System.Obsolete("The request contains additional required properties that must be initialized. Please use an alternative constructor to ensure all required values are properly set.")]
@@ -540,4 +526,4 @@ public Elastic.Clients.Elasticsearch.MultiSearchTemplateRequestDescriptor<TDocum
540526
Instance.RequestConfiguration = configurationSelector.Invoke(Instance.RequestConfiguration is null ? new Elastic.Transport.RequestConfigurationDescriptor() : new Elastic.Transport.RequestConfigurationDescriptor(Instance.RequestConfiguration)) ?? Instance.RequestConfiguration;
541527
return this;
542528
}
543-
}
529+
}

‎src/Elastic.Clients.Elasticsearch/_Shared/Api/BulkRequest.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
using Elastic.Clients.Elasticsearch.Serialization;
1313
using Elastic.Clients.Elasticsearch.Requests;
1414
using System.Runtime.InteropServices;
15+
using System.Text.Json.Serialization;
1516

1617
namespace Elastic.Clients.Elasticsearch;
1718

19+
[JsonConverter(typeof(JsonIncompatibleConverter))]
1820
public partial class BulkRequest : IStreamSerializable
1921
{
2022
private static readonly IRequestConfiguration RequestConfigSingleton = new RequestConfiguration

‎src/Elastic.Clients.Elasticsearch/_Shared/Api/MultiSearchRequest.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ public partial class MultiSearchResponse<TDocument>
2020
public int TotalResponses => Responses.Count > 0 ? Responses.Count : 0;
2121
}
2222

23-
public partial class MultiSearchRequest : IStreamSerializable
23+
[JsonConverter(typeof(JsonIncompatibleConverter))]
24+
public partial class MultiSearchRequest :
25+
IStreamSerializable
2426
{
2527
// Any request may contain aggregations so we force `typed_keys` in order to successfully
2628
// deserialize them.

‎src/Elastic.Clients.Elasticsearch/_Shared/Api/MultiSearchTemplateRequest.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ public partial class MultiSearchTemplateResponse<TDocument>
2020
public int TotalResponses => Responses.Count > 0 ? Responses.Count : 0;
2121
}
2222

23-
public partial class MultiSearchTemplateRequest : IStreamSerializable
23+
[JsonConverter(typeof(JsonIncompatibleConverter))]
24+
public partial class MultiSearchTemplateRequest :
25+
IStreamSerializable
2426
{
2527
internal override void BeforeRequest() => TypedKeys ??= true;
2628

‎src/Elastic.Clients.Elasticsearch/_Shared/Api/ResponseItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Elastic.Clients.Elasticsearch.Core.Bulk;
99

10-
[JsonConverter(typeof(BulkResponseItemConverter))]
10+
[JsonConverter(typeof(Json.BulkResponseItemConverter))]
1111
public abstract partial class ResponseItem
1212
{
1313
public abstract string Operation { get; }

‎src/Elastic.Clients.Elasticsearch/_Shared/Api/SearchRequest.cs‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using System;
66
using System.Collections.Generic;
7-
using System.Text.Json;
87
using System.Text.Json.Serialization;
98

109
using Elastic.Clients.Elasticsearch.Requests;
@@ -33,12 +32,12 @@ protected override (string ResolvedUrl, string UrlTemplate, Dictionary<string, s
3332
}
3433
}
3534

36-
[JsonConverter(typeof(SearchRequestOfTConverterFactory))]
35+
[JsonConverter(typeof(Json.SearchRequestOfTConverterFactory))]
3736
public partial class SearchRequest<TInferDocument> : SearchRequest
3837
{
3938
static SearchRequest()
4039
{
41-
DynamicallyAccessed.PublicConstructors(typeof(SearchRequestOfTConverter<TInferDocument>));
40+
DynamicallyAccessed.PublicConstructors(typeof(Json.SearchRequestOfTConverter<TInferDocument>));
4241
}
4342

4443
public SearchRequest(Indices? indices) : base(indices)
@@ -61,29 +60,3 @@ public SearchRequestDescriptor<TDocument> Pit(string id, Action<Core.Search.Poin
6160
return Pit(configure);
6261
}
6362
}
64-
65-
internal sealed class SearchRequestOfTConverterFactory :
66-
JsonConverterFactory
67-
{
68-
public override bool CanConvert(Type typeToConvert) =>
69-
typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SearchRequest<>);
70-
71-
public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
72-
{
73-
var args = typeToConvert.GetGenericArguments();
74-
75-
#pragma warning disable IL3050
76-
return (JsonConverter)Activator.CreateInstance(typeof(SearchRequestOfTConverter<>).MakeGenericType(args[0]));
77-
#pragma warning restore IL3050
78-
}
79-
}
80-
81-
internal sealed class SearchRequestOfTConverter<T> :
82-
JsonConverter<SearchRequest<T>>
83-
{
84-
public override SearchRequest<T>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
85-
throw new NotSupportedException();
86-
87-
public override void Write(Utf8JsonWriter writer, SearchRequest<T> value, JsonSerializerOptions options) =>
88-
writer.WriteValue(options, (SearchRequest)value);
89-
}

‎src/Elastic.Clients.Elasticsearch/_Shared/Api/SearchRequestConverter.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Licensed to Elasticsearch B.V under one or more agreements.
2+
// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System;
6+
using System.Text.Json;
7+
using System.Text.Json.Serialization;
8+
9+
using Elastic.Clients.Elasticsearch.Serialization;
10+
11+
namespace Elastic.Clients.Elasticsearch.Json;
12+
13+
public sealed class SearchRequestOfTConverterFactory :
14+
JsonConverterFactory
15+
{
16+
public override bool CanConvert(Type typeToConvert) =>
17+
typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SearchRequest<>);
18+
19+
public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
20+
{
21+
var args = typeToConvert.GetGenericArguments();
22+
23+
#pragma warning disable IL3050
24+
return (JsonConverter)Activator.CreateInstance(typeof(SearchRequestOfTConverter<>).MakeGenericType(args[0]));
25+
#pragma warning restore IL3050
26+
}
27+
}
28+
29+
public sealed class SearchRequestOfTConverter<T> :
30+
JsonConverter<SearchRequest<T>>
31+
{
32+
public override SearchRequest<T>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
33+
throw new NotSupportedException();
34+
35+
public override void Write(Utf8JsonWriter writer, SearchRequest<T> value, JsonSerializerOptions options) =>
36+
writer.WriteValue(options, (SearchRequest)value);
37+
}

‎src/Elastic.Clients.Elasticsearch/_Shared/Core/DateTime/DateMath/DateMath.cs‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
using System.Collections.Generic;
77
using System.Globalization;
88
using System.Text;
9-
using System.Text.Json;
109
using System.Text.Json.Serialization;
1110
using System.Text.RegularExpressions;
1211

1312
namespace Elastic.Clients.Elasticsearch;
1413

15-
[JsonConverter(typeof(DateMathConverter))]
14+
[JsonConverter(typeof(Json.DateMathConverter))]
1615
public abstract class DateMath
1716
{
1817
private static readonly Regex DateMathRegex =
@@ -174,26 +173,3 @@ private static void AppendTwoDigitNumber(StringBuilder result, int val)
174173
result.Append((char)('0' + (val % 10)));
175174
}
176175
}
177-
178-
internal sealed class DateMathConverter : JsonConverter<DateMath>
179-
{
180-
public override DateMath? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
181-
{
182-
if (reader.TokenType != JsonTokenType.String)
183-
return null;
184-
185-
// TODO: Performance - Review potential to avoid allocation on DateTime path and use Span<byte>
186-
187-
var value = reader.GetString();
188-
189-
if (!value.Contains("|") && DateTime.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var dateTime))
190-
return DateMath.Anchored(dateTime);
191-
192-
return DateMath.Anchored(value);
193-
}
194-
195-
public override void Write(Utf8JsonWriter writer, DateMath value, JsonSerializerOptions options)
196-
{
197-
writer.WriteStringValue(value.ToString());
198-
}
199-
}

0 commit comments

Comments
 (0)