Minor adjustments

Author: flobernd

src/Elastic.Clients.Elasticsearch/_Shared/Core/LazyJsonConverter.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -14,13 +15,13 @@ public sealed class LazyJsonConverter : JsonConverter<LazyJson>
 {
 	private IElasticsearchClientSettings? _settings;
 
+	[UnconditionalSuppressMessage("AOT", "IL3050:Calling members annotated with 'RequiresDynamicCodeAttribute'", Justification = "Always using explicit TypeInfoResolver")]
+	[UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute'", Justification = "Always using explicit TypeInfoResolver")]
 	public override LazyJson Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 	{
 		InitializeSettings(options);
 
-#pragma warning disable IL2026, IL3050 // The `TypeInfoResolver` for `RequestResponseConverter` knows how to handle `JsonElement`.
 		return new LazyJson(JsonSerializer.Deserialize<JsonElement>(ref reader, options), _settings!);
-#pragma warning restore IL2026, IL3050
 	}
 
 	private void InitializeSettings(JsonSerializerOptions options)

src/Elastic.Clients.Elasticsearch/_Shared/Next/JsonWriterExtensions.cs

@@ -250,13 +250,28 @@ public static void WriteUnionValue<T1, T2>(this Utf8JsonWriter writer, JsonSeria
 		);
 	}
 
-	public static void WriteSpanValue<T>(this Utf8JsonWriter writer, JsonSerializerOptions options, ReadOnlySpan<T> span,
+	public static void WriteMemoryValue<T>(this Utf8JsonWriter writer, JsonSerializerOptions options, ReadOnlyMemory<T> memory,
 		JsonWriteFunc<T>? writeElement)
 	{
-		writeElement ??= static (w, o, v) => WriteValue(w, o, v);
+		if (writeElement is null)
+		{
+			var converter = options.GetConverter<T>(null);
+
+			writeElement = (w, o, v) =>
+			{
+				if ((v is null) && !converter.HandleNull)
+				{
+					w.WriteNullValue();
+					return;
+				}
+
+				converter.Write(w, v, o);
+			};
+		}
 
 		writer.WriteStartArray();
 
+		var span = memory.Span;
 		foreach (var element in span)
 		{
 			writeElement(writer, options, element);

src/Elastic.Clients.Elasticsearch/_Shared/Next/VectorConverters.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Buffers;
 using System.Buffers.Binary;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -57,7 +58,7 @@ public override void Write(Utf8JsonWriter writer, ReadOnlyMemory<float> value, J
 		switch (_encoding)
 		{
 			case FloatVectorDataEncoding.Legacy:
-				writer.WriteSpanValue(options, value.Span, null);
+				writer.WriteMemoryValue(options, value, null);
 				break;
 
 			case FloatVectorDataEncoding.Base64:
@@ -69,6 +70,7 @@ public override void Write(Utf8JsonWriter writer, ReadOnlyMemory<float> value, J
 		}
 	}
 
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private static ReadOnlyMemory<float> ReadBase64VectorData(ref Utf8JsonReader reader)
 	{
 		var bytes = reader.GetBytesFromBase64();
@@ -98,6 +100,7 @@ private static ReadOnlyMemory<float> ReadBase64VectorData(ref Utf8JsonReader rea
 		return new(result);
 	}
 
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private static void WriteBase64VectorData(Utf8JsonWriter writer, ReadOnlyMemory<float> value)
 	{
 		if (value.IsEmpty)
@@ -192,7 +195,7 @@ public override void Write(Utf8JsonWriter writer, ReadOnlyMemory<byte> value, Js
 		switch (_encoding)
 		{
 			case ByteVectorDataEncoding.Legacy:
-				writer.WriteSpanValue(options, value.Span, (w, _, b) => w.WriteNumberValue(unchecked((sbyte)b)));
+				writer.WriteMemoryValue(options, value, (w, _, b) => w.WriteNumberValue(unchecked((sbyte)b)));
 				break;
 
 			case ByteVectorDataEncoding.Hex:
@@ -208,6 +211,7 @@ public override void Write(Utf8JsonWriter writer, ReadOnlyMemory<byte> value, Js
 		}
 	}
 
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private static ReadOnlyMemory<byte> ReadStringVectorData(ref Utf8JsonReader reader)
 	{
 		if (reader.TryGetBytesFromBase64(out var result))
@@ -218,6 +222,7 @@ private static ReadOnlyMemory<byte> ReadStringVectorData(ref Utf8JsonReader read
 		return ReadHexVectorData(ref reader);
 	}
 
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private static ReadOnlyMemory<byte> ReadHexVectorData(ref Utf8JsonReader reader)
 	{
 #if NET5_0_OR_GREATER
@@ -229,6 +234,7 @@ private static ReadOnlyMemory<byte> ReadHexVectorData(ref Utf8JsonReader reader)
 		return new(data);
 	}
 
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private static void WriteHexVectorData(Utf8JsonWriter writer, ReadOnlyMemory<byte> value)
 	{
 		if (value.IsEmpty)
@@ -267,7 +273,8 @@ private static void WriteHexVectorData(Utf8JsonWriter writer, ReadOnlyMemory<byt
 	}
 
 #if !NET5_0_OR_GREATER
-	public static byte[] FromHex(string data)
+	[MethodImpl(MethodImplOptions.AggressiveInlining)]
+	private static byte[] FromHex(string data)
 	{
 		if (data.Length is 0)
 		{