Temp

Author: flobernd

src/Elastic.Clients.Elasticsearch/_Shared/Core/DateTime/DateMath/DateMathOperation.cs

@@ -6,11 +6,9 @@
 using System.Runtime.Serialization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Elastic.Clients.Elasticsearch.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
-[StringEnum]
 [JsonConverter(typeof(DateMathOperationConverter))]
 public enum DateMathOperation
 {

src/Elastic.Clients.Elasticsearch/_Shared/Core/DateTime/DateMath/DateMathTimeUnit.cs

@@ -6,11 +6,9 @@
 using System.Runtime.Serialization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Elastic.Clients.Elasticsearch.Serialization;
 
 namespace Elastic.Clients.Elasticsearch;
 
-[StringEnum]
 [JsonConverter(typeof(DateMathTimeUnitConverter))]
 public enum DateMathTimeUnit
 {

src/Elastic.Clients.Elasticsearch/_Shared/Core/Extensions/ExceptionExtensions.cs

@@ -6,7 +6,9 @@
 using System.Diagnostics;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Text.Json;
 using System.Text.Json.Serialization;
+
 using Elastic.Clients.Elasticsearch.Serialization;
 using Elastic.Transport;
 
@@ -116,3 +118,36 @@ public bool EqualsMarker(PropertyName other) => _type != null
 
 	public static bool operator !=(PropertyName left, PropertyName right) => !Equals(left, right);
 }
+
+internal sealed class PropertyNameConverter :
+	JsonConverter<PropertyName>
+{
+	public override PropertyName Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		reader.ValidateToken(JsonTokenType.String);
+
+		return new PropertyName(reader.GetString()!);
+	}
+
+	public override void Write(Utf8JsonWriter writer, PropertyName value, JsonSerializerOptions options)
+	{
+		var settings = options.GetContext<IElasticsearchClientSettings>();
+		var fieldName = settings.Inferrer.PropertyName(value);
+
+		writer.WriteStringValue(fieldName);
+	}
+
+	public override PropertyName ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+	{
+		reader.ValidateToken(JsonTokenType.PropertyName);
+
+		return new PropertyName(reader.GetString()!);
+	}
+
+	public override void WriteAsPropertyName(Utf8JsonWriter writer, PropertyName value, JsonSerializerOptions options)
+	{
+		var settings = options.GetContext<IElasticsearchClientSettings>();
+
+		writer.WritePropertyName(settings.Inferrer.PropertyName(value));
+	}
+}

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

@@ -143,8 +143,6 @@ private static IReadOnlyCollection<JsonConverter> CreateDefaultBuiltInConverters
 		// For context aware JsonConverter/JsonConverterFactory implementations.
 		new ContextProvider<IElasticsearchClientSettings>(settings),
 
-		new SelfSerializableConverterFactory(settings), // For descriptors
-		new KeyValuePairConverterFactory(settings),
 		new ObjectToInferredTypesConverter(),
 
 		// Marker types
@@ -163,11 +161,7 @@ private static IReadOnlyCollection<JsonConverter> CreateDefaultBuiltInConverters
 
 		new SingleOrManyFieldsMarkerConverter(),
 
-		// Explicitly registered before `IsADictionaryConverterFactory` as we want this specialised converter to match
 		new FieldValuesConverter(),
-		new IsADictionaryConverterFactory(),
-		new ResponseItemConverterFactory(),
-		new DictionaryResponseConverterFactory(settings),
 
 		// TODO: Remove after https://github.com/elastic/elasticsearch-specification/issues/2238 is implemented
 		new StringifiedBoolConverter(),