Add overload taking multiple IJsonTypeResolvers and ensure we use JsonTypeInfoResolver.Combine

Author: Mpdreamz

src/Elastic.Clients.Elasticsearch/_Shared/Core/Configuration/ElasticsearchClientSettings.cs

@@ -9,7 +9,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.InteropServices;
-
+using System.Text.Json.Serialization.Metadata;
 using Elastic.Clients.Elasticsearch.Esql;
 using Elastic.Clients.Elasticsearch.Requests;
 using Elastic.Clients.Elasticsearch.Serialization;
@@ -86,10 +86,12 @@ public ElasticsearchClientSettings(InMemoryRequestInvoker inMemoryTransportClien
 	public ElasticsearchClientSettings(
 		NodePool nodePool,
 		IRequestInvoker requestInvoker,
-		SourceSerializerFactory sourceSerializer,
-		IPropertyMappingProvider propertyMappingProvider) : base(nodePool, requestInvoker, sourceSerializer, propertyMappingProvider)
+		SourceSerializerFactory? sourceSerializer,
+		IPropertyMappingProvider? propertyMappingProvider
+	) : base(nodePool, requestInvoker, sourceSerializer, propertyMappingProvider)
 	{
 	}
+
 }
 
 /// <inheritdoc cref="IElasticsearchClientSettings" />
@@ -121,21 +123,23 @@ public abstract class ElasticsearchClientSettingsBase<TConnectionSettings> :
 
 	protected ElasticsearchClientSettingsBase(
 		NodePool nodePool,
-		IRequestInvoker requestInvoker,
+		IRequestInvoker? requestInvoker,
 		ElasticsearchClientSettings.SourceSerializerFactory? sourceSerializerFactory,
-		IPropertyMappingProvider propertyMappingProvider)
+		IPropertyMappingProvider? propertyMappingProvider
+	)
 		: base(nodePool, requestInvoker, null, ElasticsearchClientProductRegistration.DefaultForElasticsearchClientsElasticsearch)
 	{
 		var requestResponseSerializer = new DefaultRequestResponseSerializer(this);
 		var sourceSerializer = new DefaultSourceSerializer(this);
 
 		UseThisRequestResponseSerializer = requestResponseSerializer;
 
+		_propertyMappingProvider = propertyMappingProvider ?? new DefaultPropertyMappingProvider();
 		_sourceSerializer = sourceSerializerFactory?.Invoke(sourceSerializer, this) ?? sourceSerializer;
-		_propertyMappingProvider = propertyMappingProvider ?? sourceSerializer as IPropertyMappingProvider ?? new DefaultPropertyMappingProvider();
 		_defaultFieldNameInferrer = _sourceSerializer.TryGetJsonSerializerOptions(out var options)
 			? p => options.PropertyNamingPolicy?.ConvertName(p) ?? p
 			: p => p.ToCamelCase();
+
 		_defaultIndices = new FluentDictionary<Type, string>();
 		_defaultRelationNames = new FluentDictionary<Type, string>();
 		_inferrer = new Inferrer(this);
@@ -394,9 +398,12 @@ public abstract class ConnectionConfigurationBase<TConnectionConfiguration> :
 {
 	private bool _includeServerStackTraceOnError;
 
-	protected ConnectionConfigurationBase(NodePool nodePool, IRequestInvoker requestInvoker,
+	protected ConnectionConfigurationBase(
+		NodePool nodePool,
+		IRequestInvoker? requestInvoker,
 		Serializer? serializer,
-		ProductRegistration registration = null)
+		ProductRegistration? registration = null
+	)
 		: base(nodePool, requestInvoker, serializer, registration ?? new ElasticsearchProductRegistration(typeof(ElasticsearchClient)))
 	{
 		UserAgent(ConnectionConfiguration.DefaultUserAgent);

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

@@ -10,6 +10,7 @@
 using System.Text.Json.Serialization.Metadata;
 
 using Elastic.Transport;
+using Elastic.Transport.Products.Elasticsearch;
 
 namespace Elastic.Clients.Elasticsearch.Serialization;
 
@@ -37,7 +38,12 @@ public DefaultSourceSerializer(IElasticsearchClientSettings settings, Action<Jso
 	/// <param name="typeInfoResolver">A custom <see cref="IJsonTypeInfoResolver"/> to use.</param>
 	/// <param name="configureOptions">An optional <see cref="Action{T}"/> to customize the default <see cref="JsonSerializerOptions"/>.</param>
 	public DefaultSourceSerializer(IElasticsearchClientSettings settings, IJsonTypeInfoResolver typeInfoResolver, Action<JsonSerializerOptions>? configureOptions = null) :
-		base(new DefaultSourceSerializerOptionsProvider(settings, typeInfoResolver, configureOptions))
+		base(new DefaultSourceSerializerOptionsProvider(settings, [typeInfoResolver], configureOptions))
+	{
+	}
+
+	public DefaultSourceSerializer(IElasticsearchClientSettings settings, IJsonTypeInfoResolver[] typeInfoResolvers, Action<JsonSerializerOptions>? configureOptions = null) :
+		base(new DefaultSourceSerializerOptionsProvider(settings, typeInfoResolvers, configureOptions))
 	{
 	}
 }
@@ -68,11 +74,11 @@ public DefaultSourceSerializerOptionsProvider(IElasticsearchClientSettings setti
 	/// <param name="settings">The <see cref="IElasticsearchClientSettings"/> instance to which this serializer options will be linked.</param>
 	/// <param name="typeInfoResolver">A custom <see cref="IJsonTypeInfoResolver"/> to use.</param>
 	/// <param name="configureOptions">An optional <see cref="Action{T}"/> to customize the default <see cref="JsonSerializerOptions"/>.</param>
-	public DefaultSourceSerializerOptionsProvider(IElasticsearchClientSettings settings, IJsonTypeInfoResolver typeInfoResolver, Action<JsonSerializerOptions>? configureOptions = null) :
+	public DefaultSourceSerializerOptionsProvider(IElasticsearchClientSettings settings, IJsonTypeInfoResolver[] typeInfoResolvers, Action<JsonSerializerOptions>? configureOptions = null) :
 		base(
 			CreateDefaultBuiltInConverters(settings),
 			null,
-			options => MutateOptions(options, typeInfoResolver ?? throw new ArgumentNullException(nameof(typeInfoResolver)), configureOptions)
+			options => MutateOptions(options, typeInfoResolvers, configureOptions)
 		)
 	{
 	}
@@ -94,10 +100,13 @@ private static IReadOnlyCollection<JsonConverter> CreateDefaultBuiltInConverters
 
 	[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")]
-	private static void MutateOptions(JsonSerializerOptions options, IJsonTypeInfoResolver? typeInfoResolver, Action<JsonSerializerOptions>? configureOptions)
+	private static void MutateOptions(JsonSerializerOptions options, IJsonTypeInfoResolver[]? typeInfoResolvers, Action<JsonSerializerOptions>? configureOptions)
 	{
-		options.TypeInfoResolver = typeInfoResolver ?? new DefaultJsonTypeInfoResolver();
+		var resolvers = typeInfoResolvers ?? [];
 
+		options.TypeInfoResolver = JsonTypeInfoResolver.Combine(
+			[new DefaultJsonTypeInfoResolver(), ElasticsearchTransportSerializerContext.Default, .. resolvers]
+		);
 		options.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
 		options.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
 

src/Playground/Person.cs

@@ -6,15 +6,17 @@
 using System.Text.Json.Serialization;
 using Elastic.Clients.Elasticsearch;
 using Playground;
-using Elastic.Clients.Elasticsearch.QueryDsl;
 
 namespace Playground
 {
+	[JsonSerializable(typeof(Person))]
+	internal partial class PlaygroundJsonSerializerContext : JsonSerializerContext;
+
 	public class Person
 	{
 		public int Id { get; set; }
 
-		[System.Text.Json.Serialization.JsonPropertyName("id2")]
+		[JsonPropertyName("id2")]
 		public Guid SecondaryId { get; set; } = Guid.NewGuid();
 		public string? FirstName { get; init; }
 		public string? LastName { get; init; }
@@ -25,16 +27,14 @@ public class Person
 		public Id Idv3 => "testing";
 		//public Guid Routing { get; init; } = Guid.NewGuid();
 
-		[System.Text.Json.Serialization.JsonIgnore]
+		[JsonIgnore]
 		public string? Email { get; init; }
 
 		[DataMember(Name = "STEVE")]
 		[IgnoreDataMember]
 		public string Data { get; init; } = "NOTHING";
 
 		public DateTimeKind Enum { get; init; }
-
-		public Query? Q { get; init; }
 	}
 
 	public class PersonV3
@@ -45,5 +45,3 @@ public class PersonV3
 
 
 
-[JsonSerializable(typeof(Person))]
-internal partial class ExampleJsonSerializerContext : JsonSerializerContext;

src/Playground/Program.cs

@@ -4,13 +4,16 @@
 
 using System.Diagnostics.CodeAnalysis;
 using Elastic.Clients.Elasticsearch;
+using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 using Elastic.Transport.Extensions;
-using static System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes;
-
 using Playground;
 
-var settings = new ElasticsearchClientSettings(new Uri("https://primary.es.europe-west3.gcp.cloud.es.io"))
+var pool = new SingleNodePool(new Uri("https://primary.es.europe-west3.gcp.cloud.es.io"));
+var settings = new ElasticsearchClientSettings(pool,
+		sourceSerializer: (_, settings) =>
+			new DefaultSourceSerializer(settings, [PlaygroundJsonSerializerContext.Default])
+		)
 	.Authentication(new BasicAuthentication("elastic", "Oov35Wtxj5DzpZNzYAzFb0KZ"))
 	.DisableDirectStreaming()
 	.EnableDebugMode(cd =>