Generate sorting types (#6511) (#6512)

* Removal of manual handling for sorts

* Additional sort types

* Renamed container factory method args

* Improve container + additional property serialisation

* Simplify properties which are single or many

* Updated serialisation with tests passing

* Fix BOM and update test

Co-authored-by: Steve Gordon <[email protected]>

Author: github-actions[bot]

src/Elastic.Clients.Elasticsearch.JsonNetSerializer/ConnectionSettingsAwareSerializerBase.Customization.cs

@@ -13,7 +13,7 @@
 
 namespace Elastic.Clients.JsonNetSerializer
 {
-	public abstract partial class ConnectionSettingsAwareSerializer : SourceSerializer
+	public abstract partial class ConnectionSettingsAwareSerializer : Serializer
 	{
 		// Default buffer size of StreamWriter, which is private :(
 		internal const int DefaultBufferSize = 1024;

src/Elastic.Clients.Elasticsearch/Common/Configuration/ElasticsearchClientSettings.cs

@@ -22,7 +22,7 @@ public class ElasticsearchClientSettings : ElasticsearchClientSettingsBase<Elast
 		///     documents.
 		///     By default, the internal serializer will be used to serializer all types.
 		/// </summary>
-		public delegate SourceSerializer SourceSerializerFactory(Serializer builtIn,
+		public delegate Serializer SourceSerializerFactory(Serializer builtIn,
 			IElasticsearchClientSettings values);
 
 		/// <summary> The default user agent for Elastic.Clients.Elasticsearch </summary>

src/Elastic.Clients.Elasticsearch/Common/Infer/Field/FieldConverter.cs

@@ -28,12 +28,48 @@ internal sealed class FieldConverter : JsonConverter<Field>
 
 			case JsonTokenType.String:
 				return new Field(reader.GetString());
+
+			case JsonTokenType.StartObject:
+				return ReadObjectField(ref reader);
 		}
 
-		reader.Read();
 		return null;
 	}
 
+	private static Field ReadObjectField(ref Utf8JsonReader reader)
+	{
+		var field = string.Empty;
+		var format = string.Empty;
+
+		while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+		{
+			if (reader.TokenType == JsonTokenType.PropertyName)
+			{
+				var propertyName = reader.GetString();
+				reader.Read();
+
+				switch (propertyName)
+				{
+					case "field":
+						field = reader.GetString();
+						break;
+					case "format":
+						format = reader.GetString();
+						break;
+					default:
+						throw new JsonException("Unexpected property while reading `Field`.");
+				}
+			}
+		}
+
+		if (!string.IsNullOrEmpty(field) && !string.IsNullOrEmpty(format))
+		{
+			return new Field(field, format);
+		}
+
+		throw new JsonException("Unable to read `Field` from JSON.");
+	}
+
 	public override void Write(Utf8JsonWriter writer, Field value, JsonSerializerOptions options)
 	{
 		if (value is null)

src/Elastic.Clients.Elasticsearch/FutureGenerated/FieldType.cs

@@ -25,7 +25,7 @@ internal class CustomizedNamingPolicy : JsonNamingPolicy
 /// <summary>
 /// The built in internal serializer that the high level client Elastic.Clients.Elasticsearch uses.
 /// </summary>
-internal class DefaultRequestResponseSerializer : SystemTextJsonSourceSerializer
+internal class DefaultRequestResponseSerializer : SystemTextJsonSerializer
 {
 	private readonly IElasticsearchClientSettings _settings;
 
@@ -46,7 +46,6 @@ public DefaultRequestResponseSerializer(IElasticsearchClientSettings settings)
 					new IdConverter(settings),
 					new FieldConverter(settings),
 					new FieldValuesConverter(settings),
-					new SortCollectionConverter(settings),
 					new LazyDocumentConverter(settings),
 					new RelationNameConverter(settings),
 					new JoinFieldConverter(settings),
@@ -60,7 +59,7 @@ public DefaultRequestResponseSerializer(IElasticsearchClientSettings settings)
 					new IsADictionaryConverter(),
 					new ResponseItemConverterFactory(),
 					new UnionConverter(),
-					new SingleOrManyConverterFactory(),
+					new ExtraSerializationData(settings)
 				},
 			PropertyNamingPolicy = JsonNamingPolicy.CamelCase
 		};

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

@@ -7,10 +7,10 @@
 
 namespace Elastic.Clients.Elasticsearch;
 
-internal class DefaultSourceSerializer : SystemTextJsonSourceSerializer
+internal class DefaultSourceSerializer : SystemTextJsonSerializer
 {
-	public DefaultSourceSerializer(IElasticsearchClientSettings settings, JsonSerializerOptions? options = null) => Options =
-		options ?? new JsonSerializerOptions
+	public DefaultSourceSerializer(IElasticsearchClientSettings settings, JsonSerializerOptions? options = null) =>
+		Options = options ?? new JsonSerializerOptions
 		{
 			DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
 			Converters =

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

@@ -0,0 +1,23 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// 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;
+
+namespace Elastic.Clients.Elasticsearch;
+
+/// <summary>
+/// This actually does not ever get used as a converter. It's just an ugly hack to provide a way to
+/// access out settings in generated converters without requiring a mechanism to conditionally add them.
+/// </summary>
+internal sealed class ExtraSerializationData : JsonConverter<ExtraSerializationData>
+{
+	public ExtraSerializationData(IElasticsearchClientSettings settings) => Settings = settings;
+
+	public IElasticsearchClientSettings Settings { get; }
+
+	public override ExtraSerializationData? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotImplementedException();
+	public override void Write(Utf8JsonWriter writer, ExtraSerializationData value, JsonSerializerOptions options) => throw new NotImplementedException();
+}

src/Elastic.Clients.Elasticsearch/Serialization/ExtraSerializationData.cs

@@ -0,0 +1,20 @@
+// Licensed to Elasticsearch B.V under one or more agreements.
+// 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.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Elastic.Clients.Elasticsearch
+{
+	internal abstract class IEnumerableSingleOrManyConverter<TItem> : JsonConverter<IEnumerable<TItem>>
+	{
+		public override IEnumerable<TItem>? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
+			SingleOrManySerializationHelper.Deserialize<TItem>(ref reader, options);
+
+		public override void Write(Utf8JsonWriter writer, IEnumerable<TItem> value, JsonSerializerOptions options) => 
+			SingleOrManySerializationHelper.Serialize<TItem>(value, writer, options);
+	}
+}