From 23da05887eee60254d3ebeafc25a0704f217b43f Mon Sep 17 00:00:00 2001 From: Florian Bernd Date: Thu, 18 Apr 2024 11:03:49 +0200 Subject: [PATCH] Fix serializer indentation --- .../Serialization/SystemTextJsonSerializer.cs | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Elastic.Clients.Elasticsearch.Shared/Serialization/SystemTextJsonSerializer.cs b/src/Elastic.Clients.Elasticsearch.Shared/Serialization/SystemTextJsonSerializer.cs index 3d3e3f8b6f2..5397867e0a7 100644 --- a/src/Elastic.Clients.Elasticsearch.Shared/Serialization/SystemTextJsonSerializer.cs +++ b/src/Elastic.Clients.Elasticsearch.Shared/Serialization/SystemTextJsonSerializer.cs @@ -58,7 +58,7 @@ public SystemTextJsonSerializer(IElasticsearchClientSettings settings) /// be used when serializing. /// /// - protected abstract JsonSerializerOptions CreateJsonSerializerOptions(); + protected abstract JsonSerializerOptions? CreateJsonSerializerOptions(); /// public override T Deserialize(Stream stream) @@ -72,7 +72,7 @@ public override T Deserialize(Stream stream) } /// - public override object Deserialize(Type type, Stream stream) + public override object? Deserialize(Type type, Stream stream) { Initialize(); @@ -90,7 +90,7 @@ public override ValueTask DeserializeAsync(Stream stream, CancellationToke } /// - public override ValueTask DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default) + public override ValueTask DeserializeAsync(Type type, Stream stream, CancellationToken cancellationToken = default) { Initialize(); return JsonSerializer.DeserializeAsync(stream, type, Options, cancellationToken); @@ -101,8 +101,7 @@ public override void Serialize(T data, Stream writableStream, SerializationFormatting formatting = SerializationFormatting.None) { Initialize(); - using var writer = new Utf8JsonWriter(writableStream); - JsonSerializer.Serialize(writer, data, typeof(T), formatting == SerializationFormatting.Indented && IndentedOptions is not null ? IndentedOptions : Options); + JsonSerializer.Serialize(writableStream, data, formatting == SerializationFormatting.Indented && IndentedOptions is not null ? IndentedOptions : Options); } /// @@ -117,7 +116,7 @@ public override Task SerializeAsync(T data, Stream stream, private static bool TryReturnDefault(Stream stream, out T deserialize) { deserialize = default; - return stream == null || stream == Stream.Null || (stream.CanSeek && stream.Length == 0); + return stream is null || stream == Stream.Null || (stream.CanSeek && stream.Length == 0); } /// @@ -152,12 +151,12 @@ protected void Initialize() private void LinkOptionsAndSettings() { - if (!ElasticsearchClient.SettingsTable.TryGetValue(Options, out _)) + if (!ElasticsearchClient.SettingsTable.TryGetValue(Options!, out _)) { ElasticsearchClient.SettingsTable.Add(Options, Settings); } - if (!ElasticsearchClient.SettingsTable.TryGetValue(IndentedOptions, out _)) + if (!ElasticsearchClient.SettingsTable.TryGetValue(IndentedOptions!, out _)) { ElasticsearchClient.SettingsTable.Add(IndentedOptions, Settings); }