Skip to content

Rename ErrorSerializerContext and update related references #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2025
Merged

Rename ErrorSerializerContext and update related references #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Playground/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
var dynamicResponse = transport.Request<DynamicResponse>(HttpMethod.GET, "/");
Console.WriteLine(dynamicResponse.Body.Get<string>("version.build_flavor"));

var body = PostData.String("{\"name\": \"test\"}");
var indexResponse = transport.Request<EsResponse>(HttpMethod.POST, "/does-not-exist/_doc", body);
Console.WriteLine(indexResponse.DebugInformation);

Console.WriteLine(registration.DefaultContentType ?? "NOT SPECIFIED");

public class EsResponse : ElasticsearchResponse;
4 changes: 2 additions & 2 deletions src/Elastic.Transport/Components/Serialization/Converters/DynamicDictionaryConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ public override DynamicDictionary Read(ref Utf8JsonReader reader, Type typeToCon
{
if (reader.TokenType == JsonTokenType.StartArray)
{
var array = JsonSerializer.Deserialize<object[]>(ref reader, ErrorSerializerContext.Default.ObjectArray); // TODO: Test! This might not work without adding `object[]` to `ErrorSerializationContext`
var array = JsonSerializer.Deserialize<object[]>(ref reader, ElasticsearchTransportSerializerContext.Default.ObjectArray); // TODO: Test! This might not work without adding `object[]` to `ErrorSerializationContext`
var arrayDict = new Dictionary<string, object>();
for (var i = 0; i < array.Length; i++)
arrayDict[i.ToString(CultureInfo.InvariantCulture)] = new DynamicValue(array[i]);
return DynamicDictionary.Create(arrayDict);
}
if (reader.TokenType != JsonTokenType.StartObject) throw new JsonException();

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`
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`
return DynamicDictionary.Create(dict);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Transport/Components/Serialization/Converters/ExceptionConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public override void Write(Utf8JsonWriter writer, Exception value, JsonSerialize
foreach (var kv in flattenedException)
{
writer.WritePropertyName(kv.Key);
JsonSerializer.Serialize(writer, kv.Value, ErrorSerializerContext.Default.Object); // TODO: Test! This might not work without adding `KeyValuePair<string, object>` to `ErrorSerializationContext`
JsonSerializer.Serialize(writer, kv.Value, ElasticsearchTransportSerializerContext.Default.Object); // TODO: Test! This might not work without adding `KeyValuePair<string, object>` to `ErrorSerializationContext`
}
writer.WriteEndObject();
}
Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Transport/Components/Serialization/LowLevelRequestResponseSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public LowLevelRequestResponseSerializer(IReadOnlyCollection<JsonConverter>? con
{
options.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
#pragma warning disable IL2026, IL3050
options.TypeInfoResolver = JsonTypeInfoResolver.Combine(new DefaultJsonTypeInfoResolver(), ErrorSerializerContext.Default);
options.TypeInfoResolver = JsonTypeInfoResolver.Combine(new DefaultJsonTypeInfoResolver(), ElasticsearchTransportSerializerContext.Default);
#pragma warning restore IL2026, IL3050
})) { }

Expand Down
2 changes: 1 addition & 1 deletion src/Elastic.Transport/Products/Elasticsearch/ErrorSerializationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ namespace Elastic.Transport.Products.Elasticsearch;
[JsonSerializable(typeof(IReadOnlyDictionary<string, string>))]
[JsonSerializable(typeof(string))]
[JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Default, UseStringEnumConverter = true)]
public partial class ErrorSerializerContext : JsonSerializerContext;
public partial class ElasticsearchTransportSerializerContext : JsonSerializerContext;
18 changes: 9 additions & 9 deletions src/Elastic.Transport/Products/Elasticsearch/Failures/Error.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ public override Error Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSe

if (reader.ValueTextEquals("root_cause"))
{
var value = JsonSerializer.Deserialize<IReadOnlyCollection<ErrorCause>>(ref reader, ErrorSerializerContext.Default.IReadOnlyCollectionErrorCause);
var value = JsonSerializer.Deserialize<IReadOnlyCollection<ErrorCause>>(ref reader, ElasticsearchTransportSerializerContext.Default.IReadOnlyCollectionErrorCause);
error.RootCause = value;
continue;
}

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

if (reader.ValueTextEquals("headers"))
{
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`
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`
error.Headers = value;
continue;
}

if (reader.ValueTextEquals("stack_trace"))
{
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
error.StackTrace = value;
continue;
}

if (reader.ValueTextEquals("type"))
{
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
error.Type = value;
continue;
}

if (reader.ValueTextEquals("index"))
{
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
error.Index = value;
continue;
}

if (reader.ValueTextEquals("index_uuid"))
{
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
error.IndexUUID = value;
continue;
}

if (reader.ValueTextEquals("reason"))
{
var value = JsonSerializer.Deserialize<string>(ref reader, ErrorSerializerContext.Default.String);
var value = JsonSerializer.Deserialize<string>(ref reader, ElasticsearchTransportSerializerContext.Default.String);
error.Reason = value;
continue;
}

additional ??= new Dictionary<string, object>();
var key = reader.GetString();
var additionaValue = JsonSerializer.Deserialize<object>(ref reader, ErrorSerializerContext.Default.Object);
var additionaValue = JsonSerializer.Deserialize<object>(ref reader, ElasticsearchTransportSerializerContext.Default.Object);
additional.Add(key, additionaValue);
}

Expand Down
Loading