Temp

Author: flobernd

src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/DocumentPath/DocumentPath.cs

@@ -22,16 +22,10 @@ internal sealed class DefaultRequestResponseSerializer : SystemTextJsonSerialize
 {
 	private readonly IElasticsearchClientSettings _settings;
 
-#if !NET8_0_OR_GREATER
-	private readonly object _lock = new();
-#endif
-
 	public DefaultRequestResponseSerializer(IElasticsearchClientSettings settings) :
 		base(new DefaultRequestResponseSerializerOptionsProvider(settings))
 	{
 		_settings = settings;
-
-		LinkSettings(settings);
 	}
 
 	public override void Serialize<T>(T data, Stream writableStream,
@@ -95,36 +89,6 @@ public override T Deserialize<T>(Stream stream)
 	}
 
 	protected override bool SupportsFastPath(Type type) => !typeof(IStreamSerializable).IsAssignableFrom(type);
-
-	/// <summary>
-	/// Links the <see cref="JsonSerializerOptions"/> of this serializer to the given <see cref="IElasticsearchClientSettings"/>.
-	/// </summary>
-	private void LinkSettings(IElasticsearchClientSettings settings)
-	{
-		var options = GetJsonSerializerOptions(SerializationFormatting.None);
-		var indentedOptions = GetJsonSerializerOptions(SerializationFormatting.Indented);
-
-		//options.MakeReadOnly();
-		//indentedOptions.MakeReadOnly();
-
-#if NET8_0_OR_GREATER
-		ElasticsearchClient.SettingsTable.TryAdd(options, settings);
-		ElasticsearchClient.SettingsTable.TryAdd(indentedOptions, settings);
-#else
-		lock (_lock)
-		{
-			if (!ElasticsearchClient.SettingsTable.TryGetValue(options, out _))
-			{
-				ElasticsearchClient.SettingsTable.Add(options, settings);
-			}
-
-			if (!ElasticsearchClient.SettingsTable.TryGetValue(indentedOptions, out _))
-			{
-				ElasticsearchClient.SettingsTable.Add(indentedOptions, settings);
-			}
-		}
-#endif
-	}
 }
 
 /// <summary>

src/Elastic.Clients.Elasticsearch/_Shared/Core/Infer/Timestamp/Timestamp.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
@@ -17,49 +18,19 @@ namespace Elastic.Clients.Elasticsearch.Serialization;
 public class DefaultSourceSerializer :
 	SystemTextJsonSerializer
 {
-#if !NET8_0_OR_GREATER
-	private readonly object _lock = new();
-#endif
-
 	/// <summary>
 	/// Constructs a new <see cref="DefaultSourceSerializer"/> instance that accepts an <see cref="Action{T}"/> that can
 	/// be provided to customize the default <see cref="JsonSerializerOptions"/>.
 	/// </summary>
-	/// <param name="settings">An <see cref="IElasticsearchClientSettings"/> instance to which this serializers
+	/// <param name="settings">An <see cref="IElasticsearchClientSettings"/> instance to which this serializer
 	/// <see cref="JsonSerializerOptions"/> will be linked.
 	/// </param>
 	/// <param name="configureOptions">
 	/// An optional <see cref="Action{T}"/> to customize the configuration of the default <see cref="JsonSerializerOptions"/>.
 	/// </param>
 	public DefaultSourceSerializer(IElasticsearchClientSettings settings, Action<JsonSerializerOptions>? configureOptions = null) :
-		base(new DefaultSourceSerializerOptionsProvider(configureOptions)) =>
-		LinkSettings(settings);
-
-	/// <summary>
-	/// Links the <see cref="JsonSerializerOptions"/> of this serializer to the given <see cref="IElasticsearchClientSettings"/>.
-	/// </summary>
-	private void LinkSettings(IElasticsearchClientSettings settings)
+		base(new DefaultSourceSerializerOptionsProvider(settings, configureOptions))
 	{
-		var options = GetJsonSerializerOptions(SerializationFormatting.None);
-		var indentedOptions = GetJsonSerializerOptions(SerializationFormatting.Indented);
-
-#if NET8_0_OR_GREATER
-		ElasticsearchClient.SettingsTable.TryAdd(options, settings);
-		ElasticsearchClient.SettingsTable.TryAdd(indentedOptions, settings);
-#else
-		lock (_lock)
-		{
-			if (!ElasticsearchClient.SettingsTable.TryGetValue(options, out _))
-			{
-				ElasticsearchClient.SettingsTable.Add(options, settings);
-			}
-
-			if (!ElasticsearchClient.SettingsTable.TryGetValue(indentedOptions, out _))
-			{
-				ElasticsearchClient.SettingsTable.Add(indentedOptions, settings);
-			}
-		}
-#endif
 	}
 }
 
@@ -69,27 +40,29 @@ private void LinkSettings(IElasticsearchClientSettings settings)
 public class DefaultSourceSerializerOptionsProvider :
 	TransportSerializerOptionsProvider
 {
+	public DefaultSourceSerializerOptionsProvider(IElasticsearchClientSettings settings, Action<JsonSerializerOptions>? configureOptions = null) :
+		base(CreateDefaultBuiltInConverters(settings), null, options => MutateOptions(options, configureOptions))
+	{
+	}
+
+	public DefaultSourceSerializerOptionsProvider(IElasticsearchClientSettings settings, bool registerDefaultConverters, Action<JsonSerializerOptions>? configureOptions = null) :
+		base(registerDefaultConverters ? CreateDefaultBuiltInConverters(settings) : [], null, options => MutateOptions(options, configureOptions))
+	{
+	}
+
 	/// <summary>
 	/// Returns an array of the built-in <see cref="JsonConverter"/>s that are used registered with the source serializer by default.
 	/// </summary>
-	private static JsonConverter[] DefaultBuiltInConverters =>
+	private static IReadOnlyCollection<JsonConverter> CreateDefaultBuiltInConverters(IElasticsearchClientSettings settings) =>
 	[
+		// For context aware JsonConverter/JsonConverterFactory implementations.
+		new ContextProvider<IElasticsearchClientSettings>(settings),
+
 		new JsonStringEnumConverter(),
 		new DoubleWithFractionalPortionConverter(),
-		new SingleWithFractionalPortionConverter(),
-		// TODO: Add RequestResponseSerializer
+		new SingleWithFractionalPortionConverter()
 	];
 
-	public DefaultSourceSerializerOptionsProvider(Action<JsonSerializerOptions>? configureOptions = null) :
-		base(DefaultBuiltInConverters, null, options => MutateOptions(options, configureOptions))
-	{
-	}
-
-	public DefaultSourceSerializerOptionsProvider(bool registerDefaultConverters = true, Action<JsonSerializerOptions>? configureOptions = null) :
-		base(registerDefaultConverters ? DefaultBuiltInConverters : [], null, options => MutateOptions(options, configureOptions))
-	{
-	}
-
 	private static void MutateOptions(JsonSerializerOptions options, Action<JsonSerializerOptions>? configureOptions)
 	{
 		options.TypeInfoResolver = new DefaultJsonTypeInfoResolver();

src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultRequestResponseSerializer.cs

@@ -0,0 +1,51 @@
+using System;
+
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+using Elastic.Clients.Elasticsearch.Serialization;
+
+namespace Elastic.Clients.Elasticsearch;
+
+[JsonConverter(typeof(GeoBoundsConverter))]
+public sealed partial class GeoBounds
+{
+}
+
+internal sealed class GeoBoundsConverter :
+	JsonConverter<GeoBounds>
+{
+	public override GeoBounds? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		throw new InvalidOperationException();
+	}
+
+	public override void Write(Utf8JsonWriter writer, GeoBounds value, JsonSerializerOptions options)
+	{
+		if (value.TryGetCoordinates(out var coordinates))
+		{
+			writer.WriteValue(options, coordinates);
+			return;
+		}
+
+		if (value.TryGetTopLeftBottomRight(out var topLeftBottomRight))
+		{
+			writer.WriteValue(options, topLeftBottomRight);
+			return;
+		}
+
+		if (value.TryGetTopRightBottomLeft(out var topRightBottomLeft))
+		{
+			writer.WriteValue(options, topRightBottomLeft);
+			return;
+		}
+
+		if (value.TryGetWkt(out var wkt))
+		{
+			writer.WriteValue(options, wkt);
+			return;
+		}
+
+		throw new JsonException($"Unrecognized '{typeof(GeoBounds)}' variant.");
+	}
+}

src/Elastic.Clients.Elasticsearch/_Shared/Serialization/DefaultSourceSerializer.cs

@@ -2,10 +2,56 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+using Elastic.Clients.Elasticsearch.Serialization;
+
 namespace Elastic.Clients.Elasticsearch;
 
+[JsonConverter(typeof(GeoLocationConverter))]
 public partial class GeoLocation
 {
 	public static bool IsValidLatitude(double latitude) => latitude >= -90 && latitude <= 90;
+
 	public static bool IsValidLongitude(double longitude) => longitude >= -180 && longitude <= 180;
 }
+
+internal sealed class GeoLocationConverter :
+	JsonConverter<GeoLocation>
+{
+	public override GeoLocation? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		throw new InvalidOperationException();
+	}
+
+	public override void Write(Utf8JsonWriter writer, GeoLocation value, JsonSerializerOptions options)
+	{
+		if (value.TryGetCoordinates(out var coordinates))
+		{
+			writer.WriteCollectionValue(options, coordinates, null);
+			return;
+		}
+
+		if (value.TryGetGeoHash(out var geoHash))
+		{
+			writer.WriteValue(options, geoHash);
+			return;
+		}
+
+		if (value.TryGetLatitudeLongitude(out var latitudeLongitude))
+		{
+			writer.WriteValue(options, latitudeLongitude);
+			return;
+		}
+
+		if (value.TryGetText(out var text))
+		{
+			writer.WriteValue(options, text);
+			return;
+		}
+
+		throw new JsonException($"Unrecognized '{typeof(GeoLocation)}' variant.");
+	}
+}