Skip to content

Commit eeed2ad

Browse files
authored
Rename ErrorSerializerContext and update related references (#164)
Renamed `ErrorSerializerContext` to `ElasticsearchTransportSerializerContext` for improved clarity and consistency. Updated all references across serialization logic and tests to align with the new context name. This ensures correct deserialization behavior and avoids potential conflicts with outdated naming.
1 parent 1e87f20 commit eeed2ad

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

Playground/Program.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
var dynamicResponse = transport.Request<DynamicResponse>(HttpMethod.GET, "/");
2424
Console.WriteLine(dynamicResponse.Body.Get<string>("version.build_flavor"));
2525

26+
var body = PostData.String("{\"name\": \"test\"}");
27+
var indexResponse = transport.Request<EsResponse>(HttpMethod.POST, "/does-not-exist/_doc", body);
28+
Console.WriteLine(indexResponse.DebugInformation);
29+
2630
Console.WriteLine(registration.DefaultContentType ?? "NOT SPECIFIED");
2731

2832
public class EsResponse : ElasticsearchResponse;

src/Elastic.Transport/Components/Serialization/Converters/DynamicDictionaryConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ public override DynamicDictionary Read(ref Utf8JsonReader reader, Type typeToCon
1919
{
2020
if (reader.TokenType == JsonTokenType.StartArray)
2121
{
22-
var array = JsonSerializer.Deserialize<object[]>(ref reader, ErrorSerializerContext.Default.ObjectArray); // TODO: Test! This might not work without adding `object[]` to `ErrorSerializationContext`
22+
var array = JsonSerializer.Deserialize<object[]>(ref reader, ElasticsearchTransportSerializerContext.Default.ObjectArray); // TODO: Test! This might not work without adding `object[]` to `ErrorSerializationContext`
2323
var arrayDict = new Dictionary<string, object>();
2424
for (var i = 0; i < array.Length; i++)
2525
arrayDict[i.ToString(CultureInfo.InvariantCulture)] = new DynamicValue(array[i]);
2626
return DynamicDictionary.Create(arrayDict);
2727
}
2828
if (reader.TokenType != JsonTokenType.StartObject) throw new JsonException();
2929

30-
var dict = JsonSerializer.Deserialize<Dictionary<string, object>>(ref reader, ErrorSerializerContext.Default.DictionaryStringObject); // TODO: Test! This might not work without adding `Dictionary<string, object>` to `ErrorSerializationContext`
30+
var dict = JsonSerializer.Deserialize<Dictionary<string, object>>(ref reader, ElasticsearchTransportSerializerContext.Default.DictionaryStringObject); // TODO: Test! This might not work without adding `Dictionary<string, object>` to `ErrorSerializationContext`
3131
return DynamicDictionary.Create(dict);
3232
}
3333

src/Elastic.Transport/Components/Serialization/Converters/ExceptionConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public override void Write(Utf8JsonWriter writer, Exception value, JsonSerialize
7272
foreach (var kv in flattenedException)
7373
{
7474
writer.WritePropertyName(kv.Key);
75-
JsonSerializer.Serialize(writer, kv.Value, ErrorSerializerContext.Default.Object); // TODO: Test! This might not work without adding `KeyValuePair<string, object>` to `ErrorSerializationContext`
75+
JsonSerializer.Serialize(writer, kv.Value, ElasticsearchTransportSerializerContext.Default.Object); // TODO: Test! This might not work without adding `KeyValuePair<string, object>` to `ErrorSerializationContext`
7676
}
7777
writer.WriteEndObject();
7878
}

src/Elastic.Transport/Components/Serialization/LowLevelRequestResponseSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public LowLevelRequestResponseSerializer(IReadOnlyCollection<JsonConverter>? con
3838
{
3939
options.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
4040
#pragma warning disable IL2026, IL3050
41-
options.TypeInfoResolver = JsonTypeInfoResolver.Combine(new DefaultJsonTypeInfoResolver(), ErrorSerializerContext.Default);
41+
options.TypeInfoResolver = JsonTypeInfoResolver.Combine(new DefaultJsonTypeInfoResolver(), ElasticsearchTransportSerializerContext.Default);
4242
#pragma warning restore IL2026, IL3050
4343
})) { }
4444

src/Elastic.Transport/Products/Elasticsearch/ErrorSerializationContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ namespace Elastic.Transport.Products.Elasticsearch;
2121
[JsonSerializable(typeof(IReadOnlyDictionary<string, string>))]
2222
[JsonSerializable(typeof(string))]
2323
[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, UseStringEnumConverter = true)]
24-
public partial class ErrorSerializerContext : JsonSerializerContext;
24+
public partial class ElasticsearchTransportSerializerContext : JsonSerializerContext;

src/Elastic.Transport/Products/Elasticsearch/Failures/Error.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public override Error Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
5252

5353
if (reader.ValueTextEquals("root_cause"))
5454
{
55-
var value = JsonSerializer.Deserialize<IReadOnlyCollection<ErrorCause>>(ref reader, ErrorSerializerContext.Default.IReadOnlyCollectionErrorCause);
55+
var value = JsonSerializer.Deserialize<IReadOnlyCollection<ErrorCause>>(ref reader, ElasticsearchTransportSerializerContext.Default.IReadOnlyCollectionErrorCause);
5656
error.RootCause = value;
5757
continue;
5858
}
5959

6060
if (reader.ValueTextEquals("caused_by"))
6161
{
62-
var value = JsonSerializer.Deserialize<ErrorCause>(ref reader, ErrorSerializerContext.Default.ErrorCause);
62+
var value = JsonSerializer.Deserialize<ErrorCause>(ref reader, ElasticsearchTransportSerializerContext.Default.ErrorCause);
6363
error.CausedBy = value;
6464
continue;
6565
}
@@ -73,49 +73,49 @@ public override Error Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe
7373

7474
if (reader.ValueTextEquals("headers"))
7575
{
76-
var value = JsonSerializer.Deserialize<IReadOnlyDictionary<string, string>>(ref reader, ErrorSerializerContext.Default.IReadOnlyDictionaryStringString); // TODO: Test! This might not work without adding `IReadOnlyDictionary<string, string>` to `ErrorSerializationContext`
76+
var value = JsonSerializer.Deserialize<IReadOnlyDictionary<string, string>>(ref reader, ElasticsearchTransportSerializerContext.Default.IReadOnlyDictionaryStringString); // TODO: Test! This might not work without adding `IReadOnlyDictionary<string, string>` to `ErrorSerializationContext`
7777
error.Headers = value;
7878
continue;
7979
}
8080

8181
if (reader.ValueTextEquals("stack_trace"))
8282
{
83-
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
83+
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
8484
error.StackTrace = value;
8585
continue;
8686
}
8787

8888
if (reader.ValueTextEquals("type"))
8989
{
90-
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
90+
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
9191
error.Type = value;
9292
continue;
9393
}
9494

9595
if (reader.ValueTextEquals("index"))
9696
{
97-
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
97+
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
9898
error.Index = value;
9999
continue;
100100
}
101101

102102
if (reader.ValueTextEquals("index_uuid"))
103103
{
104-
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
104+
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
105105
error.IndexUUID = value;
106106
continue;
107107
}
108108

109109
if (reader.ValueTextEquals("reason"))
110110
{
111-
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
111+
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
112112
error.Reason = value;
113113
continue;
114114
}
115115

116116
additional ??= new Dictionary<string, object>();
117117
var key = reader.GetString();
118-
var additionaValue = JsonSerializer.Deserialize<object>(ref reader, ErrorSerializerContext.Default.Object);
118+
var additionaValue = JsonSerializer.Deserialize<object>(ref reader, ElasticsearchTransportSerializerContext.Default.Object);
119119
additional.Add(key, additionaValue);
120120
}
121121

0 commit comments

Comments
 (0)